Cosmetic fixes:
1. Attr: all public static constants declared final 2. Tag: f-bounded type declaration 3. Tag::renderOpenTag: StringBuilder used 4. ContainerTag::with, condWith: Iterable and PECS arguments used
This commit is contained in:
lan
@@ -4,115 +4,115 @@ public class Attr {
|
||||
|
||||
private Attr() {}
|
||||
|
||||
public static String HIDDEN = "hidden";
|
||||
public static String HIGH = "high";
|
||||
public static String HREF = "href";
|
||||
public static String HREFLANG = "hreflang";
|
||||
public static String HTTP_EQUIV = "http-equiv";
|
||||
public static String ICON = "icon";
|
||||
public static String ID = "id";
|
||||
public static String ISMAP = "ismap";
|
||||
public static String ITEMPROP = "itemprop";
|
||||
public static String KEYTYPE = "keytype";
|
||||
public static String KIND = "kind";
|
||||
public static String LABEL = "label";
|
||||
public static String LANG = "lang";
|
||||
public static String LANGUAGE = "language";
|
||||
public static String LIST = "list";
|
||||
public static String LOOP = "loop";
|
||||
public static String LOW = "low";
|
||||
public static String MANIFEST = "manifest";
|
||||
public static String MAX = "max";
|
||||
public static String MAXLENGTH = "maxlength";
|
||||
public static String MEDIA = "media";
|
||||
public static String METHOD = "method";
|
||||
public static String MIN = "min";
|
||||
public static String MULTIPLE = "multiple";
|
||||
public static String NAME = "name";
|
||||
public static String NOVALIDATE = "novalidate";
|
||||
public static String OPEN = "open";
|
||||
public static String OPTIMUM = "optimum";
|
||||
public static String PATTERN = "pattern";
|
||||
public static String PING = "ping";
|
||||
public static String PLACEHOLDER = "placeholder";
|
||||
public static String POSTER = "poster";
|
||||
public static String PRELOAD = "preload";
|
||||
public static String PUBDATE = "pubdate";
|
||||
public static String RADIOGROUP = "radiogroup";
|
||||
public static String READONLY = "readonly";
|
||||
public static String REL = "rel";
|
||||
public static String REQUIRED = "required";
|
||||
public static String REVERSED = "reversed";
|
||||
public static String ROLE = "role";
|
||||
public static String ROWS = "rows";
|
||||
public static String ROWSPAN = "rowspan";
|
||||
public static String SANDBOX = "sandbox";
|
||||
public static String SPELLCHECK = "spellcheck";
|
||||
public static String SCOPE = "scope";
|
||||
public static String SCOPED = "scoped";
|
||||
public static String SEAMLESS = "seamless";
|
||||
public static String SELECTED = "selected";
|
||||
public static String SHAPE = "shape";
|
||||
public static String SIZE = "size";
|
||||
public static String SIZES = "sizes";
|
||||
public static String SPAN = "span";
|
||||
public static String SRC = "src";
|
||||
public static String SRCDOC = "srcdoc";
|
||||
public static String SRCLANG = "srclang";
|
||||
public static String SRCSET = "srcset";
|
||||
public static String START = "start";
|
||||
public static String STEP = "step";
|
||||
public static String STYLE = "style";
|
||||
public static String SUMMARY = "summary";
|
||||
public static String TABINDEX = "tabindex";
|
||||
public static String TARGET = "target";
|
||||
public static String TITLE = "title";
|
||||
public static String TYPE = "type";
|
||||
public static String USEMAP = "usemap";
|
||||
public static String VALUE = "value";
|
||||
public static String WIDTH = "width";
|
||||
public static String WRAP = "wrap";
|
||||
public static String BORDER = "border";
|
||||
public static String BUFFERED = "buffered";
|
||||
public static String CHALLENGE = "challenge";
|
||||
public static String CHARSET = "charset";
|
||||
public static String CHECKED = "checked";
|
||||
public static String CITE = "cite";
|
||||
public static String CLASS = "class";
|
||||
public static String COLOR = "color";
|
||||
public static String COLS = "cols";
|
||||
public static String COLSPAN = "colspan";
|
||||
public static String CONTENT = "content";
|
||||
public static String CONTENTEDITABLE = "contenteditable";
|
||||
public static String CONTEXTMENU = "contextmenu";
|
||||
public static String CONTROLS = "controls";
|
||||
public static String COORDS = "coords";
|
||||
public static String DATA = "data";
|
||||
public static String DATETIME = "datetime";
|
||||
public static String DEFAULT = "default";
|
||||
public static String DEFER = "defer";
|
||||
public static String DIR = "dir";
|
||||
public static String DIRNAME = "dirname";
|
||||
public static String DISABLED = "disabled";
|
||||
public static String DOWNLOAD = "download";
|
||||
public static String DRAGGABLE = "draggable";
|
||||
public static String DROPZONE = "dropzone";
|
||||
public static String ENCTYPE = "enctype";
|
||||
public static String FOR = "for";
|
||||
public static String FORM = "form";
|
||||
public static String FORMACTION = "formaction";
|
||||
public static String HEADERS = "headers";
|
||||
public static String HEIGHT = "height";
|
||||
public static String ACCEPT = "accept";
|
||||
public static String ACCEPT_CHARSET = "accept-charset";
|
||||
public static String ACCESSKEY = "accesskey";
|
||||
public static String ACTION = "action";
|
||||
public static String ALIGN = "align";
|
||||
public static String ALT = "alt";
|
||||
public static String ASYNC = "async";
|
||||
public static String AUTOCOMPLETE = "autocomplete";
|
||||
public static String AUTOFOCUS = "autofocus";
|
||||
public static String AUTOPLAY = "autoplay";
|
||||
public static String AUTOSAVE = "autosave";
|
||||
public static final String HIDDEN = "hidden";
|
||||
public static final String HIGH = "high";
|
||||
public static final String HREF = "href";
|
||||
public static final String HREFLANG = "hreflang";
|
||||
public static final String HTTP_EQUIV = "http-equiv";
|
||||
public static final String ICON = "icon";
|
||||
public static final String ID = "id";
|
||||
public static final String ISMAP = "ismap";
|
||||
public static final String ITEMPROP = "itemprop";
|
||||
public static final String KEYTYPE = "keytype";
|
||||
public static final String KIND = "kind";
|
||||
public static final String LABEL = "label";
|
||||
public static final String LANG = "lang";
|
||||
public static final String LANGUAGE = "language";
|
||||
public static final String LIST = "list";
|
||||
public static final String LOOP = "loop";
|
||||
public static final String LOW = "low";
|
||||
public static final String MANIFEST = "manifest";
|
||||
public static final String MAX = "max";
|
||||
public static final String MAXLENGTH = "maxlength";
|
||||
public static final String MEDIA = "media";
|
||||
public static final String METHOD = "method";
|
||||
public static final String MIN = "min";
|
||||
public static final String MULTIPLE = "multiple";
|
||||
public static final String NAME = "name";
|
||||
public static final String NOVALIDATE = "novalidate";
|
||||
public static final String OPEN = "open";
|
||||
public static final String OPTIMUM = "optimum";
|
||||
public static final String PATTERN = "pattern";
|
||||
public static final String PING = "ping";
|
||||
public static final String PLACEHOLDER = "placeholder";
|
||||
public static final String POSTER = "poster";
|
||||
public static final String PRELOAD = "preload";
|
||||
public static final String PUBDATE = "pubdate";
|
||||
public static final String RADIOGROUP = "radiogroup";
|
||||
public static final String READONLY = "readonly";
|
||||
public static final String REL = "rel";
|
||||
public static final String REQUIRED = "required";
|
||||
public static final String REVERSED = "reversed";
|
||||
public static final String ROLE = "role";
|
||||
public static final String ROWS = "rows";
|
||||
public static final String ROWSPAN = "rowspan";
|
||||
public static final String SANDBOX = "sandbox";
|
||||
public static final String SPELLCHECK = "spellcheck";
|
||||
public static final String SCOPE = "scope";
|
||||
public static final String SCOPED = "scoped";
|
||||
public static final String SEAMLESS = "seamless";
|
||||
public static final String SELECTED = "selected";
|
||||
public static final String SHAPE = "shape";
|
||||
public static final String SIZE = "size";
|
||||
public static final String SIZES = "sizes";
|
||||
public static final String SPAN = "span";
|
||||
public static final String SRC = "src";
|
||||
public static final String SRCDOC = "srcdoc";
|
||||
public static final String SRCLANG = "srclang";
|
||||
public static final String SRCSET = "srcset";
|
||||
public static final String START = "start";
|
||||
public static final String STEP = "step";
|
||||
public static final String STYLE = "style";
|
||||
public static final String SUMMARY = "summary";
|
||||
public static final String TABINDEX = "tabindex";
|
||||
public static final String TARGET = "target";
|
||||
public static final String TITLE = "title";
|
||||
public static final String TYPE = "type";
|
||||
public static final String USEMAP = "usemap";
|
||||
public static final String VALUE = "value";
|
||||
public static final String WIDTH = "width";
|
||||
public static final String WRAP = "wrap";
|
||||
public static final String BORDER = "border";
|
||||
public static final String BUFFERED = "buffered";
|
||||
public static final String CHALLENGE = "challenge";
|
||||
public static final String CHARSET = "charset";
|
||||
public static final String CHECKED = "checked";
|
||||
public static final String CITE = "cite";
|
||||
public static final String CLASS = "class";
|
||||
public static final String COLOR = "color";
|
||||
public static final String COLS = "cols";
|
||||
public static final String COLSPAN = "colspan";
|
||||
public static final String CONTENT = "content";
|
||||
public static final String CONTENTEDITABLE = "contenteditable";
|
||||
public static final String CONTEXTMENU = "contextmenu";
|
||||
public static final String CONTROLS = "controls";
|
||||
public static final String COORDS = "coords";
|
||||
public static final String DATA = "data";
|
||||
public static final String DATETIME = "datetime";
|
||||
public static final String DEFAULT = "default";
|
||||
public static final String DEFER = "defer";
|
||||
public static final String DIR = "dir";
|
||||
public static final String DIRNAME = "dirname";
|
||||
public static final String DISABLED = "disabled";
|
||||
public static final String DOWNLOAD = "download";
|
||||
public static final String DRAGGABLE = "draggable";
|
||||
public static final String DROPZONE = "dropzone";
|
||||
public static final String ENCTYPE = "enctype";
|
||||
public static final String FOR = "for";
|
||||
public static final String FORM = "form";
|
||||
public static final String FORMACTION = "formaction";
|
||||
public static final String HEADERS = "headers";
|
||||
public static final String HEIGHT = "height";
|
||||
public static final String ACCEPT = "accept";
|
||||
public static final String ACCEPT_CHARSET = "accept-charset";
|
||||
public static final String ACCESSKEY = "accesskey";
|
||||
public static final String ACTION = "action";
|
||||
public static final String ALIGN = "align";
|
||||
public static final String ALT = "alt";
|
||||
public static final String ASYNC = "async";
|
||||
public static final String AUTOCOMPLETE = "autocomplete";
|
||||
public static final String AUTOFOCUS = "autofocus";
|
||||
public static final String AUTOPLAY = "autoplay";
|
||||
public static final String AUTOSAVE = "autosave";
|
||||
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@ public class ContainerTag extends Tag<ContainerTag> {
|
||||
* @param children DomContent-objects to be appended
|
||||
* @return itself for easy chaining
|
||||
*/
|
||||
public ContainerTag with(List<DomContent> children) {
|
||||
public ContainerTag with(Iterable<? extends DomContent> children) {
|
||||
if (children != null) {
|
||||
for (DomContent child : children) {
|
||||
this.with(child);
|
||||
@@ -52,7 +52,7 @@ public class ContainerTag extends Tag<ContainerTag> {
|
||||
* Call with-method based on condition
|
||||
* {@link #with(List children)}
|
||||
*/
|
||||
public ContainerTag condWith(boolean condition, List<DomContent> children) {
|
||||
public ContainerTag condWith(boolean condition, Iterable<? extends DomContent> children) {
|
||||
return condition ? this.with(children) : this;
|
||||
}
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ package j2html.tags;
|
||||
import j2html.attributes.*;
|
||||
import java.util.*;
|
||||
|
||||
public abstract class Tag<T> extends DomContent {
|
||||
public abstract class Tag<T extends Tag<T>> extends DomContent {
|
||||
|
||||
protected String tagName;
|
||||
private ArrayList<Attribute> attributes;
|
||||
@@ -14,11 +14,12 @@ public abstract class Tag<T> extends DomContent {
|
||||
}
|
||||
|
||||
String renderOpenTag() {
|
||||
String tagAttributes = "";
|
||||
StringBuilder sb = new StringBuilder("<").append( tagName );
|
||||
for (Attribute attribute : attributes) {
|
||||
tagAttributes += attribute.render();
|
||||
sb.append( attribute.render() );
|
||||
}
|
||||
return "<" + tagName + tagAttributes + ">";
|
||||
sb.append( ">" );
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
String renderCloseTag() {
|
||||
|
||||
Reference in New Issue
Block a user