Implementation of Attributes-per-Tag via Interfaces (#156)

Author: pointbazaar

src/main/java/j2html/TagCreator.java

@@ -114,6 +114,7 @@ public abstract class Attr {
     public static final String VALUE = "value";
     public static final String WIDTH = "width";
     public static final String WRAP = "wrap";
+    public static final String TRANSLATE = "translate";
 
     public static ShortForm shortFormFromAttrsString(String attrs) {
         if (!attrs.contains(".") && !attrs.contains(("#"))) {

src/main/java/j2html/attributes/Attr.java

@@ -6,7 +6,8 @@
 import java.util.List;
 import java.util.stream.Stream;
 
-public class ContainerTag extends Tag<ContainerTag> {
+public class ContainerTag<T extends ContainerTag<T>> extends Tag<T> {
+//public class ContainerTag extends Tag<ContainerTag> {
 
     private List<DomContent> children;
 
@@ -22,15 +23,15 @@ public ContainerTag(String tagName) {
      * @param child DomContent-object to be appended
      * @return itself for easy chaining
      */
-    public ContainerTag with(DomContent child) {
+    public T with(DomContent child) {
         if (this == child) {
             throw new RuntimeException("Cannot append a tag to itself.");
         }
         if (child == null) {
-            return this; // in some cases, like when using iff(), we ignore null children
+            return (T)this; // in some cases, like when using iff(), we ignore null children
         }
         children.add(child);
-        return this;
+        return (T)this;
     }
 
 
@@ -42,8 +43,8 @@ public ContainerTag with(DomContent child) {
      * @param child     DomContent-object to be appended if condition met
      * @return itself for easy chaining
      */
-    public ContainerTag condWith(boolean condition, DomContent child) {
-        return condition ? this.with(child) : this;
+    public T condWith(boolean condition, DomContent child) {
+        return condition ? this.with(child) : (T)this;
     }
 
 
@@ -53,13 +54,13 @@ public ContainerTag condWith(boolean condition, DomContent child) {
      * @param children DomContent-objects to be appended
      * @return itself for easy chaining
      */
-    public ContainerTag with(Iterable<? extends DomContent> children) {
+    public T with(Iterable<? extends DomContent> children) {
         if (children != null) {
             for (DomContent child : children) {
                 this.with(child);
             }
         }
-        return this;
+        return (T)this;
     }
 
 
@@ -71,8 +72,8 @@ public ContainerTag with(Iterable<? extends DomContent> children) {
      * @param children  DomContent-objects to be appended if condition met
      * @return itself for easy chaining
      */
-    public ContainerTag condWith(boolean condition, Iterable<? extends DomContent> children) {
-        return condition ? this.with(children) : this;
+    public T condWith(boolean condition, Iterable<? extends DomContent> children) {
+        return condition ? this.with(children) : (T)this;
     }
 
 
@@ -82,11 +83,11 @@ public ContainerTag condWith(boolean condition, Iterable<? extends DomContent> c
      * @param children DomContent-objects to be appended
      * @return itself for easy chaining
      */
-    public ContainerTag with(DomContent... children) {
+    public T with(DomContent... children) {
         for (DomContent child : children) {
             with(child);
         }
-        return this;
+        return (T)this;
     }
 
 
@@ -96,9 +97,9 @@ public ContainerTag with(DomContent... children) {
      * @param children Stream of DomContent-objects to be appended
      * @return itself for easy chaining
      */
-    public ContainerTag with(Stream<DomContent> children) {
+    public T with(Stream<DomContent> children) {
         children.forEach(this::with);
-        return this;
+        return (T)this;
     }
 
 
@@ -110,8 +111,8 @@ public ContainerTag with(Stream<DomContent> children) {
      * @param children  DomContent-objects to be appended if condition met
      * @return itself for easy chaining
      */
-    public ContainerTag condWith(boolean condition, DomContent... children) {
-        return condition ? this.with(children) : this;
+    public T condWith(boolean condition, DomContent... children) {
+        return condition ? this.with(children) : (T)this;
     }
 
 
@@ -121,7 +122,7 @@ public ContainerTag condWith(boolean condition, DomContent... children) {
      * @param text the text to be appended
      * @return itself for easy chaining
      */
-    public ContainerTag withText(String text) {
+    public T withText(String text) {
         return with(new Text(text));
     }
 

src/main/java/j2html/tags/ContainerTag.java

@@ -4,7 +4,8 @@
 import j2html.attributes.Attribute;
 import java.io.IOException;
 
-public class EmptyTag extends Tag<EmptyTag> {
+public class EmptyTag<T extends EmptyTag<T>> extends Tag<T> {
+//public class EmptyTag extends Tag<EmptyTag> {
 
     public EmptyTag(String tagName) {
         super(tagName);

src/main/java/j2html/tags/EmptyTag.java

@@ -157,203 +157,82 @@ public T withClasses(String... classes) {
         return attr(Attr.CLASS, sb.toString().trim());
     }
 
-    public T isAutoComplete() {
-        return attr(Attr.AUTOCOMPLETE, null);
-    }
-
-    public T isAutoFocus() {
-        return attr(Attr.AUTOFOCUS, null);
-    }
-
-    public T isHidden() {
-        return attr(Attr.HIDDEN, null);
-    }
-
-    public T isRequired() {
-        return attr(Attr.REQUIRED, null);
-    }
-
-    public T withAlt(String alt) {
-        return attr(Attr.ALT, alt);
-    }
-
-    public T withAction(String action) {
-        return attr(Attr.ACTION, action);
-    }
-
-    public T withCharset(String charset) {
-        return attr(Attr.CHARSET, charset);
-    }
-
-    public T withClass(String className) {
-        return attr(Attr.CLASS, className);
-    }
-
-    public T withContent(String content) {
-        return attr(Attr.CONTENT, content);
-    }
-
-    public T withDir(String dir) {
-        return attr(Attr.DIR, dir);
-    }
-
-    public T withHref(String href) {
-        return attr(Attr.HREF, href);
-    }
-
-    public T withId(String id) {
-        return attr(Attr.ID, id);
-    }
-
-    public T withData(String dataAttr, String value) {
-        return attr(Attr.DATA + "-" + dataAttr, value);
-    }
-
-    public T withLang(String lang) {
-        return attr(Attr.LANG, lang);
-    }
-
-    public T withMethod(String method) {
-        return attr(Attr.METHOD, method);
-    }
-
-    public T withName(String name) {
-        return attr(Attr.NAME, name);
-    }
-
-    public T withPlaceholder(String placeholder) {
-        return attr(Attr.PLACEHOLDER, placeholder);
-    }
-
-    public T withTarget(String target) {
-        return attr(Attr.TARGET, target);
-    }
-
-    public T withTitle(String title) {
-        return attr(Attr.TITLE, title);
-    }
-
-    public T withType(String type) {
-        return attr(Attr.TYPE, type);
-    }
-
-    public T withRel(String rel) {
-        return attr(Attr.REL, rel);
-    }
-
-    public T withRole(String role) {
-        return attr(Attr.ROLE, role);
-    }
+    /*
+    Tag.java contains all Global Attributes, Attributes which are
+    valid on all HTML Tags. Reference:
+    https://www.w3schools.com/tags/ref_standardattributes.asp
+    Attributes:
+
+    accesskey
+    class
+    contenteditable
+    data-*
+    dir
+    draggable
+    hidden
+    id
+    lang
+    spellcheck
+    style
+    tabindex
+    title
+    translate
+     */
 
-    public T withSrc(String src) {
-        return attr(Attr.SRC, src);
-    }
+    public T withAccesskey(String accesskey){ return attr(Attr.ACCESSKEY, accesskey); }
 
-    public T withStyle(String style) {
-        return attr(Attr.STYLE, style);
-    }
+    public T withClass(String className) { return attr(Attr.CLASS, className); }
 
-    public T withStep(String step) {
-        return attr(Attr.STEP, step);
-    }
+    public T isContenteditable(){ return attr(Attr.CONTENTEDITABLE, "true"); }
 
-    public T withValue(String value) {
-        return attr(Attr.VALUE, value);
-    }
+    public T withData(String dataAttr, String value) { return attr(Attr.DATA + "-" + dataAttr, value); }
 
-    public T withCondAutoComplete(boolean condition) {
-        return condAttr(condition, Attr.AUTOCOMPLETE, null);
-    }
+    public T withDir(String dir) { return attr(Attr.DIR, dir); }
 
-    public T withCondAutoFocus(boolean condition) {
-        return condAttr(condition, Attr.AUTOFOCUS, null);
-    }
+    public T isDraggable(){ return attr(Attr.DRAGGABLE, "true"); }
 
-    public T withCondHidden(boolean condition) {
-        return condAttr(condition, Attr.HIDDEN, null);
-    }
+    public T isHidden() { return attr(Attr.HIDDEN, null); }
 
-    public T withCondRequired(boolean condition) {
-        return condAttr(condition, Attr.REQUIRED, null);
-    }
+    public T withId(String id) { return attr(Attr.ID, id); }
 
-    public T withCondAlt(boolean condition, String alt) {
-        return condAttr(condition, Attr.ALT, alt);
-    }
+    public T withLang(String lang) { return attr(Attr.LANG, lang); }
 
-    public T withCondAction(boolean condition, String action) {
-        return condAttr(condition, Attr.ACTION, action);
-    }
+    public T isSpellcheck(){ return attr(Attr.SPELLCHECK, "true"); }
 
-    public T withCharset(boolean condition, String charset) {
-        return condAttr(condition, Attr.CHARSET, charset);
-    }
+    public T withStyle(String style) { return attr(Attr.STYLE, style); }
 
-    public T withCondClass(boolean condition, String className) {
-        return condAttr(condition, Attr.CLASS, className);
-    }
+    public T withTabindex(int index){ return attr(Attr.TABINDEX, index); }
 
-    public T withCondContent(boolean condition, String content) {
-        return condAttr(condition, Attr.CONTENT, content);
-    }
+    public T withTitle(String title) { return attr(Attr.TITLE, title); }
 
-    public T withCondDir(boolean condition, String dir) {
-        return condAttr(condition, Attr.DIR, dir);
-    }
+    public T isTranslate(){ return attr(Attr.TRANSLATE, "yes"); }
 
-    public T withCondHref(boolean condition, String href) {
-        return condAttr(condition, Attr.HREF, href);
-    }
+    // ----- start of withCond$ATTR variants -----
+    public T withCondAccessKey(boolean condition, String accesskey){ return condAttr(condition, Attr.ACCESSKEY, accesskey); }
 
-    public T withCondId(boolean condition, String id) {
-        return condAttr(condition, Attr.ID, id);
-    }
+    public T withCondClass(boolean condition, String className) { return condAttr(condition, Attr.CLASS, className); }
 
-    public T withCondData(boolean condition, String dataAttr, String value) {
-        return condAttr(condition, Attr.DATA + "-" + dataAttr, value);
-    }
+    public T withCondContenteditable(boolean condition){ return attr(Attr.CONTENTEDITABLE, (condition)?"true":"false");}
 
-    public T withCondLang(boolean condition, String lang) {
-        return condAttr(condition, Attr.LANG, lang);
-    }
+    public T withCondData(boolean condition, String dataAttr, String value) { return condAttr(condition, Attr.DATA + "-" + dataAttr, value); }
 
-    public T withCondMethod(boolean condition, String method) {
-        return condAttr(condition, Attr.METHOD, method);
-    }
+    public T withCondDir(boolean condition, String dir) { return condAttr(condition, Attr.DIR, dir); }
 
-    public T withCondName(boolean condition, String name) {
-        return condAttr(condition, Attr.NAME, name);
-    }
+    public T withCondDraggable(boolean condition){ return attr(Attr.DRAGGABLE, (condition)?"true":"false"); }
 
-    public T withCondPlaceholder(boolean condition, String placeholder) {
-        return condAttr(condition, Attr.PLACEHOLDER, placeholder);
-    }
+    public T withCondHidden(boolean condition) { return condAttr(condition, Attr.HIDDEN, null); }
 
-    public T withCondTarget(boolean condition, String target) {
-        return condAttr(condition, Attr.TARGET, target);
-    }
+    public T withCondId(boolean condition, String id) { return condAttr(condition, Attr.ID, id); }
 
-    public T withCondTitle(boolean condition, String title) {
-        return condAttr(condition, Attr.TITLE, title);
-    }
+    public T withCondLang(boolean condition, String lang) { return condAttr(condition, Attr.LANG, lang); }
 
-    public T withCondType(boolean condition, String type) {
-        return condAttr(condition, Attr.TYPE, type);
-    }
+    public T withCondSpellcheck(boolean condition){ return attr(Attr.SPELLCHECK, (condition)?"true":"false"); }
 
-    public T withCondRel(boolean condition, String rel) {
-        return condAttr(condition, Attr.REL, rel);
-    }
+    public T withCondStyle(boolean condition, String style) { return condAttr(condition, Attr.STYLE, style); }
 
-    public T withCondSrc(boolean condition, String src) {
-        return condAttr(condition, Attr.SRC, src);
-    }
+    public T withCondTabindex(boolean condition, int index){ return condAttr(condition, Attr.TABINDEX, index+""); }
 
-    public T withCondStyle(boolean condition, String style) {
-        return condAttr(condition, Attr.STYLE, style);
-    }
+    public T withCondTitle(boolean condition, String title) { return condAttr(condition, Attr.TITLE, title); }
 
-    public T withCondValue(boolean condition, String value) {
-        return condAttr(condition, Attr.VALUE, value);
-    }
+    public T withCondTranslate(boolean condition){ return attr(Attr.TRANSLATE, (condition)?"yes":"no"); }
 }