From 91e22a8274c1b961dec3ef5bebb131c3b6c1ef6c Mon Sep 17 00:00:00 2001 From: pointbazaar Date: Sun, 16 Aug 2020 18:33:10 +0200 Subject: [PATCH 01/19] concept for implementation of attributes per tag via interfaces and default methods. Drawback: 'get()' method that does nothing, typecasting and many classes and interfaces --- src/main/java/j2html/TagCreator.java | 108 +++++++++--------- src/main/java/j2html/tags/Tag.java | 8 -- .../java/j2html/tags/attributes/IAccept.java | 13 +++ .../j2html/tags/attributes/IDisabled.java | 14 +++ .../j2html/tags/attributes/IDownload.java | 12 ++ .../java/j2html/tags/attributes/IForm.java | 12 ++ .../j2html/tags/attributes/IFormAction.java | 12 ++ .../j2html/tags/attributes/IInstance.java | 19 +++ .../java/j2html/tags/attributes/IType.java | 12 ++ .../java/j2html/tags/attributes/IValue.java | 12 ++ .../java/j2html/tags/specialized/ATag.java | 15 +++ .../j2html/tags/specialized/ButtonTag.java | 19 +++ .../j2html/tags/specialized/InputTag.java | 34 ++++++ .../j2html/tags/specialized/SelectTag.java | 15 +++ .../j2html/tags/specialized/TextAreaTag.java | 18 +++ src/test/java/j2html/tags/TagTest.java | 2 +- 16 files changed, 261 insertions(+), 64 deletions(-) create mode 100644 src/main/java/j2html/tags/attributes/IAccept.java create mode 100644 src/main/java/j2html/tags/attributes/IDisabled.java create mode 100644 src/main/java/j2html/tags/attributes/IDownload.java create mode 100644 src/main/java/j2html/tags/attributes/IForm.java create mode 100644 src/main/java/j2html/tags/attributes/IFormAction.java create mode 100644 src/main/java/j2html/tags/attributes/IInstance.java create mode 100644 src/main/java/j2html/tags/attributes/IType.java create mode 100644 src/main/java/j2html/tags/attributes/IValue.java create mode 100644 src/main/java/j2html/tags/specialized/ATag.java create mode 100644 src/main/java/j2html/tags/specialized/ButtonTag.java create mode 100644 src/main/java/j2html/tags/specialized/InputTag.java create mode 100644 src/main/java/j2html/tags/specialized/SelectTag.java create mode 100644 src/main/java/j2html/tags/specialized/TextAreaTag.java diff --git a/src/main/java/j2html/TagCreator.java b/src/main/java/j2html/TagCreator.java index 10bd91b7..402e9fef 100644 --- a/src/main/java/j2html/TagCreator.java +++ b/src/main/java/j2html/TagCreator.java @@ -8,9 +8,7 @@ import j2html.tags.InlineStaticResource; import j2html.tags.Text; import j2html.tags.UnescapedText; -import j2html.tags.specialized.BodyTag; -import j2html.tags.specialized.HeadTag; -import j2html.tags.specialized.HtmlTag; +import j2html.tags.specialized.*; import java.util.Collection; import java.util.List; @@ -267,12 +265,12 @@ public static EmptyTag img(Attr.ShortForm shortAttr) { return Attr.addTo(new EmptyTag("img"), shortAttr); } - public static EmptyTag input() { - return new EmptyTag("input"); + public static InputTag input() { + return new InputTag(); } - public static EmptyTag input(Attr.ShortForm shortAttr) { - return Attr.addTo(new EmptyTag("input"), shortAttr); + public static InputTag input(Attr.ShortForm shortAttr) { + return (InputTag)Attr.addTo(new InputTag(), shortAttr); } public static EmptyTag keygen() { @@ -332,28 +330,28 @@ public static EmptyTag wbr(Attr.ShortForm shortAttr) { } // ContainerTags, generated in class j2html.tags.TagCreatorCodeGenerator - public static ContainerTag a() { - return new ContainerTag("a"); + public static ATag a() { + return new ATag(); } - public static ContainerTag a(String text) { - return new ContainerTag("a").withText(text); + public static ATag a(String text) { + return (ATag)new ATag().withText(text); } - public static ContainerTag a(DomContent... dc) { - return new ContainerTag("a").with(dc); + public static ATag a(DomContent... dc) { + return (ATag)new ATag().with(dc); } - public static ContainerTag a(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("a"), shortAttr); + public static ATag a(Attr.ShortForm shortAttr) { + return (ATag)Attr.addTo(new ATag(), shortAttr); } - public static ContainerTag a(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("a").withText(text), shortAttr); + public static ATag a(Attr.ShortForm shortAttr, String text) { + return (ATag)Attr.addTo(new ATag().withText(text), shortAttr); } - public static ContainerTag a(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("a").with(dc), shortAttr); + public static ATag a(Attr.ShortForm shortAttr, DomContent... dc) { + return (ATag)Attr.addTo(new ATag().with(dc), shortAttr); } public static ContainerTag abbr() { @@ -596,28 +594,28 @@ public static BodyTag body(Attr.ShortForm shortAttr, DomContent... dc) { return (BodyTag)Attr.addTo(new BodyTag().with(dc), shortAttr); } - public static ContainerTag button() { - return new ContainerTag("button"); + public static ButtonTag button() { + return new ButtonTag(); } - public static ContainerTag button(String text) { - return new ContainerTag("button").withText(text); + public static ButtonTag button(String text) { + return (ButtonTag)new ButtonTag().withText(text); } - public static ContainerTag button(DomContent... dc) { - return new ContainerTag("button").with(dc); + public static ButtonTag button(DomContent... dc) { + return (ButtonTag)new ButtonTag().with(dc); } - public static ContainerTag button(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("button"), shortAttr); + public static ButtonTag button(Attr.ShortForm shortAttr) { + return (ButtonTag)Attr.addTo(new ButtonTag(), shortAttr); } - public static ContainerTag button(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("button").withText(text), shortAttr); + public static ButtonTag button(Attr.ShortForm shortAttr, String text) { + return (ButtonTag)Attr.addTo(new ButtonTag().withText(text), shortAttr); } - public static ContainerTag button(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("button").with(dc), shortAttr); + public static ButtonTag button(Attr.ShortForm shortAttr, DomContent... dc) { + return (ButtonTag)Attr.addTo(new ButtonTag().with(dc), shortAttr); } public static ContainerTag canvas() { @@ -2068,28 +2066,28 @@ public static ContainerTag section(Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo(new ContainerTag("section").with(dc), shortAttr); } - public static ContainerTag select() { - return new ContainerTag("select"); + public static SelectTag select() { + return new SelectTag(); } - public static ContainerTag select(String text) { - return new ContainerTag("select").withText(text); + public static SelectTag select(String text) { + return (SelectTag)new SelectTag().withText(text); } - public static ContainerTag select(DomContent... dc) { - return new ContainerTag("select").with(dc); + public static SelectTag select(DomContent... dc) { + return (SelectTag)new SelectTag().with(dc); } - public static ContainerTag select(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("select"), shortAttr); + public static SelectTag select(Attr.ShortForm shortAttr) { + return (SelectTag)Attr.addTo(new SelectTag(), shortAttr); } - public static ContainerTag select(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("select").withText(text), shortAttr); + public static SelectTag select(Attr.ShortForm shortAttr, String text) { + return (SelectTag)Attr.addTo(new SelectTag().withText(text), shortAttr); } - public static ContainerTag select(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("select").with(dc), shortAttr); + public static SelectTag select(Attr.ShortForm shortAttr, DomContent... dc) { + return (SelectTag)Attr.addTo(new SelectTag().with(dc), shortAttr); } public static ContainerTag small() { @@ -2332,28 +2330,28 @@ public static ContainerTag td(Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo(new ContainerTag("td").with(dc), shortAttr); } - public static ContainerTag textarea() { - return new ContainerTag("textarea"); + public static TextAreaTag textarea() { + return new TextAreaTag(); } - public static ContainerTag textarea(String text) { - return new ContainerTag("textarea").withText(text); + public static TextAreaTag textarea(String text) { + return (TextAreaTag)new TextAreaTag().withText(text); } - public static ContainerTag textarea(DomContent... dc) { - return new ContainerTag("textarea").with(dc); + public static TextAreaTag textarea(DomContent... dc) { + return (TextAreaTag)new TextAreaTag().with(dc); } - public static ContainerTag textarea(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("textarea"), shortAttr); + public static TextAreaTag textarea(Attr.ShortForm shortAttr) { + return (TextAreaTag)Attr.addTo(new TextAreaTag(), shortAttr); } - public static ContainerTag textarea(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("textarea").withText(text), shortAttr); + public static TextAreaTag textarea(Attr.ShortForm shortAttr, String text) { + return (TextAreaTag)Attr.addTo(new TextAreaTag().withText(text), shortAttr); } - public static ContainerTag textarea(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("textarea").with(dc), shortAttr); + public static TextAreaTag textarea(Attr.ShortForm shortAttr, DomContent... dc) { + return (TextAreaTag)Attr.addTo(new TextAreaTag().with(dc), shortAttr); } public static ContainerTag tfoot() { diff --git a/src/main/java/j2html/tags/Tag.java b/src/main/java/j2html/tags/Tag.java index 13e87a09..9b20d360 100644 --- a/src/main/java/j2html/tags/Tag.java +++ b/src/main/java/j2html/tags/Tag.java @@ -233,10 +233,6 @@ 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); } @@ -257,10 +253,6 @@ public T withStep(String step) { return attr(Attr.STEP, step); } - public T withValue(String value) { - return attr(Attr.VALUE, value); - } - public T withCondAutoComplete(boolean condition) { return condAttr(condition, Attr.AUTOCOMPLETE, null); } diff --git a/src/main/java/j2html/tags/attributes/IAccept.java b/src/main/java/j2html/tags/attributes/IAccept.java new file mode 100644 index 00000000..f4ca0a45 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IAccept.java @@ -0,0 +1,13 @@ +package j2html.tags.attributes; + +import j2html.tags.EmptyTag; +import j2html.tags.Tag; + + +public interface IAccept extends IInstance { + + public default T withAccept(String accept){ + get().attr("accept", accept); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IDisabled.java b/src/main/java/j2html/tags/attributes/IDisabled.java new file mode 100644 index 00000000..c67e9935 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IDisabled.java @@ -0,0 +1,14 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IDisabled extends IInstance { + + public default T withDisabled(boolean isDisabled){ + if(isDisabled){ + get().attr("disabled"); + } + return get(); + } + +} diff --git a/src/main/java/j2html/tags/attributes/IDownload.java b/src/main/java/j2html/tags/attributes/IDownload.java new file mode 100644 index 00000000..e10b01f4 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IDownload.java @@ -0,0 +1,12 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + + +public interface IDownload extends IInstance { + + public default T withDownload(){ + get().attr("download"); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IForm.java b/src/main/java/j2html/tags/attributes/IForm.java new file mode 100644 index 00000000..f47af0fd --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IForm.java @@ -0,0 +1,12 @@ +package j2html.tags.attributes; + +import j2html.tags.EmptyTag; +import j2html.tags.Tag; + +public interface IForm extends IInstance { + + public default T withForm(String formId){ + get().attr("form",formId); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IFormAction.java b/src/main/java/j2html/tags/attributes/IFormAction.java new file mode 100644 index 00000000..e8c3c96f --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IFormAction.java @@ -0,0 +1,12 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + + +public interface IFormAction extends IInstance { + + public default T withFormAction(String formAction){ + get().attr("formaction", formAction); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IInstance.java b/src/main/java/j2html/tags/attributes/IInstance.java new file mode 100644 index 00000000..d0e89e5a --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IInstance.java @@ -0,0 +1,19 @@ +package j2html.tags.attributes; + +public interface IInstance { + + //to get the actual instance + // (every implementing class would have to implement: { return this; } + // public T get(); + + // this method shows up in autocomplete. + // this is really undesireable as it does not do anything. + default T get(){ + //we know that the implementing class will supply + //its own type as the type argument. + //therefore every instance of IInstance can assume it + //is also of type T + + return (T)this; + } +} diff --git a/src/main/java/j2html/tags/attributes/IType.java b/src/main/java/j2html/tags/attributes/IType.java new file mode 100644 index 00000000..daf4226f --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IType.java @@ -0,0 +1,12 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + + +public interface IType extends IInstance { + + public default T withType(String type){ + get().attr("type", type); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IValue.java b/src/main/java/j2html/tags/attributes/IValue.java new file mode 100644 index 00000000..208ac5eb --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IValue.java @@ -0,0 +1,12 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + + +public interface IValue extends IInstance { + + public default T withValue(String value){ + get().attr("value", value); + return get(); + } +} diff --git a/src/main/java/j2html/tags/specialized/ATag.java b/src/main/java/j2html/tags/specialized/ATag.java new file mode 100644 index 00000000..dfc8dbb7 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/ATag.java @@ -0,0 +1,15 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; + +public final class ATag extends ContainerTag + implements + IType, + IDownload +{ + + public ATag() { + super("a"); + } +} diff --git a/src/main/java/j2html/tags/specialized/ButtonTag.java b/src/main/java/j2html/tags/specialized/ButtonTag.java new file mode 100644 index 00000000..1bb12ad6 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/ButtonTag.java @@ -0,0 +1,19 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; +import j2html.tags.EmptyTag; +import j2html.tags.attributes.*; + +public final class ButtonTag extends ContainerTag + implements + IForm, + IDisabled, + IFormAction, + IType, + IValue +{ + + public ButtonTag() { + super("button"); + } +} diff --git a/src/main/java/j2html/tags/specialized/InputTag.java b/src/main/java/j2html/tags/specialized/InputTag.java new file mode 100644 index 00000000..73345509 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/InputTag.java @@ -0,0 +1,34 @@ +package j2html.tags.specialized; + +import j2html.tags.EmptyTag; +import j2html.tags.attributes.*; + +public final class InputTag extends EmptyTag + implements + IAccept, + IForm, + IDisabled, + IFormAction, + IType, + IValue +{ + + /* + Attributes implemented are those not found in EmptyTag Base Class and present in + https://www.w3schools.com/tags/tag_input.asp + + When using InputTag, the attributes specific to InputTag (present in this class) must be set first, + otherwise the type is watered down to EmptyTag. + */ + + public InputTag() { + super("input"); + } + + public InputTag withChecked(boolean checked){ + if(checked){ + attr("checked"); + } + return this; + } +} diff --git a/src/main/java/j2html/tags/specialized/SelectTag.java b/src/main/java/j2html/tags/specialized/SelectTag.java new file mode 100644 index 00000000..84e0cb1d --- /dev/null +++ b/src/main/java/j2html/tags/specialized/SelectTag.java @@ -0,0 +1,15 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; + +public final class SelectTag extends ContainerTag + implements + IDisabled, + IForm +{ + + public SelectTag() { + super("select"); + } +} diff --git a/src/main/java/j2html/tags/specialized/TextAreaTag.java b/src/main/java/j2html/tags/specialized/TextAreaTag.java new file mode 100644 index 00000000..cc5d64a2 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/TextAreaTag.java @@ -0,0 +1,18 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; +import j2html.tags.attributes.IDisabled; +import j2html.tags.attributes.IDownload; +import j2html.tags.attributes.IForm; +import j2html.tags.attributes.IType; + +public final class TextAreaTag extends ContainerTag + implements + IDisabled, + IForm +{ + + public TextAreaTag() { + super("textarea"); + } +} diff --git a/src/test/java/j2html/tags/TagTest.java b/src/test/java/j2html/tags/TagTest.java index 4b71fdb9..ed5dc311 100644 --- a/src/test/java/j2html/tags/TagTest.java +++ b/src/test/java/j2html/tags/TagTest.java @@ -46,7 +46,7 @@ public void testOpenTag() throws Exception { assertThat(testTag.renderOpenTag(), is("")); ContainerTag complexTestTag = new ContainerTag("input"); - complexTestTag.withType("password").withId("password").withName("password").withPlaceholder("Password").isRequired(); + complexTestTag.attr("type","password").withId("password").withName("password").withPlaceholder("Password").isRequired(); String expectedResult = ""; assertThat(complexTestTag.renderOpenTag(), is(expectedResult)); } From f78522fb49fea80ae995c8bc74108f26e8bb9718 Mon Sep 17 00:00:00 2001 From: pointbazaar Date: Sun, 23 Aug 2020 14:52:10 +0200 Subject: [PATCH 02/19] work on the class generator to generate the .java files for the different tags, and change TagCreatorCodeGenerator to reflect those changes. --- .gitignore | 1 + .../AttributeInterfaceCodeGenerator.java | 18 +++ .../SpecializedTagClassCodeGenerator.java | 127 ++++++++++++++++++ .../TagCreatorCodeGenerator.java | 63 +++++---- .../java/j2html/tags/specialized/ATag.java | 6 +- .../java/j2html/tags/specialized/AbbrTag.java | 9 ++ .../j2html/tags/specialized/AddressTag.java | 9 ++ .../java/j2html/tags/specialized/AreaTag.java | 9 ++ .../j2html/tags/specialized/ArticleTag.java | 9 ++ .../j2html/tags/specialized/AsideTag.java | 9 ++ .../j2html/tags/specialized/AudioTag.java | 9 ++ .../java/j2html/tags/specialized/BTag.java | 9 ++ .../java/j2html/tags/specialized/BaseTag.java | 9 ++ .../java/j2html/tags/specialized/BdiTag.java | 9 ++ .../java/j2html/tags/specialized/BdoTag.java | 9 ++ .../tags/specialized/BlockquoteTag.java | 9 ++ .../java/j2html/tags/specialized/BodyTag.java | 2 +- .../java/j2html/tags/specialized/BrTag.java | 9 ++ .../j2html/tags/specialized/ButtonTag.java | 14 +- .../j2html/tags/specialized/CanvasTag.java | 9 ++ .../j2html/tags/specialized/CaptionTag.java | 9 ++ .../java/j2html/tags/specialized/CiteTag.java | 9 ++ .../java/j2html/tags/specialized/CodeTag.java | 9 ++ .../java/j2html/tags/specialized/ColTag.java | 9 ++ .../j2html/tags/specialized/ColgroupTag.java | 9 ++ .../j2html/tags/specialized/DatalistTag.java | 9 ++ .../java/j2html/tags/specialized/DdTag.java | 9 ++ .../java/j2html/tags/specialized/DelTag.java | 9 ++ .../j2html/tags/specialized/DetailsTag.java | 9 ++ .../java/j2html/tags/specialized/DfnTag.java | 9 ++ .../j2html/tags/specialized/DialogTag.java | 9 ++ .../java/j2html/tags/specialized/DivTag.java | 9 ++ .../java/j2html/tags/specialized/DlTag.java | 9 ++ .../java/j2html/tags/specialized/DtTag.java | 9 ++ .../java/j2html/tags/specialized/EmTag.java | 9 ++ .../j2html/tags/specialized/EmbedTag.java | 9 ++ .../j2html/tags/specialized/FieldsetTag.java | 9 ++ .../tags/specialized/FigcaptionTag.java | 9 ++ .../j2html/tags/specialized/FigureTag.java | 9 ++ .../j2html/tags/specialized/FooterTag.java | 9 ++ .../java/j2html/tags/specialized/FormTag.java | 9 ++ .../java/j2html/tags/specialized/H1Tag.java | 9 ++ .../java/j2html/tags/specialized/H2Tag.java | 9 ++ .../java/j2html/tags/specialized/H3Tag.java | 9 ++ .../java/j2html/tags/specialized/H4Tag.java | 9 ++ .../java/j2html/tags/specialized/H5Tag.java | 9 ++ .../java/j2html/tags/specialized/H6Tag.java | 9 ++ .../java/j2html/tags/specialized/HeadTag.java | 3 +- .../j2html/tags/specialized/HeaderTag.java | 9 ++ .../java/j2html/tags/specialized/HrTag.java | 9 ++ .../java/j2html/tags/specialized/HtmlTag.java | 10 +- .../java/j2html/tags/specialized/ITag.java | 9 ++ .../j2html/tags/specialized/IframeTag.java | 9 ++ .../java/j2html/tags/specialized/ImgTag.java | 9 ++ .../j2html/tags/specialized/InputTag.java | 7 +- .../java/j2html/tags/specialized/InsTag.java | 9 ++ .../java/j2html/tags/specialized/KbdTag.java | 9 ++ .../j2html/tags/specialized/KeygenTag.java | 9 ++ .../j2html/tags/specialized/LabelTag.java | 9 ++ .../j2html/tags/specialized/LegendTag.java | 9 ++ .../java/j2html/tags/specialized/LiTag.java | 9 ++ .../java/j2html/tags/specialized/LinkTag.java | 9 ++ .../java/j2html/tags/specialized/MainTag.java | 9 ++ .../java/j2html/tags/specialized/MapTag.java | 9 ++ .../java/j2html/tags/specialized/MarkTag.java | 9 ++ .../java/j2html/tags/specialized/MenuTag.java | 9 ++ .../j2html/tags/specialized/MenuitemTag.java | 9 ++ .../java/j2html/tags/specialized/MetaTag.java | 9 ++ .../j2html/tags/specialized/MeterTag.java | 9 ++ .../java/j2html/tags/specialized/NavTag.java | 9 ++ .../j2html/tags/specialized/NoscriptTag.java | 9 ++ .../j2html/tags/specialized/ObjectTag.java | 9 ++ .../java/j2html/tags/specialized/OlTag.java | 9 ++ .../j2html/tags/specialized/OptgroupTag.java | 9 ++ .../j2html/tags/specialized/OptionTag.java | 9 ++ .../j2html/tags/specialized/OutputTag.java | 9 ++ .../java/j2html/tags/specialized/PTag.java | 9 ++ .../j2html/tags/specialized/ParamTag.java | 9 ++ .../java/j2html/tags/specialized/PreTag.java | 9 ++ .../j2html/tags/specialized/ProgressTag.java | 9 ++ .../java/j2html/tags/specialized/QTag.java | 9 ++ .../java/j2html/tags/specialized/RpTag.java | 9 ++ .../java/j2html/tags/specialized/RtTag.java | 9 ++ .../java/j2html/tags/specialized/RubyTag.java | 9 ++ .../java/j2html/tags/specialized/STag.java | 9 ++ .../java/j2html/tags/specialized/SampTag.java | 9 ++ .../j2html/tags/specialized/ScriptTag.java | 9 ++ .../j2html/tags/specialized/SectionTag.java | 9 ++ .../j2html/tags/specialized/SelectTag.java | 8 +- .../j2html/tags/specialized/SmallTag.java | 9 ++ .../j2html/tags/specialized/SourceTag.java | 9 ++ .../java/j2html/tags/specialized/SpanTag.java | 9 ++ .../j2html/tags/specialized/StrongTag.java | 9 ++ .../j2html/tags/specialized/StyleTag.java | 9 ++ .../java/j2html/tags/specialized/SubTag.java | 9 ++ .../j2html/tags/specialized/SummaryTag.java | 9 ++ .../java/j2html/tags/specialized/SupTag.java | 9 ++ .../j2html/tags/specialized/TableTag.java | 9 ++ .../j2html/tags/specialized/TbodyTag.java | 9 ++ .../java/j2html/tags/specialized/TdTag.java | 9 ++ .../j2html/tags/specialized/TextAreaTag.java | 5 +- .../j2html/tags/specialized/TextareaTag.java | 9 ++ .../j2html/tags/specialized/TfootTag.java | 9 ++ .../java/j2html/tags/specialized/ThTag.java | 9 ++ .../j2html/tags/specialized/TheadTag.java | 9 ++ .../java/j2html/tags/specialized/TimeTag.java | 9 ++ .../j2html/tags/specialized/TitleTag.java | 9 ++ .../java/j2html/tags/specialized/TrTag.java | 9 ++ .../j2html/tags/specialized/TrackTag.java | 9 ++ .../java/j2html/tags/specialized/UTag.java | 9 ++ .../java/j2html/tags/specialized/UlTag.java | 9 ++ .../java/j2html/tags/specialized/VarTag.java | 9 ++ .../j2html/tags/specialized/VideoTag.java | 9 ++ .../java/j2html/tags/specialized/WbrTag.java | 9 ++ 114 files changed, 1128 insertions(+), 54 deletions(-) create mode 100644 src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java create mode 100644 src/main/java/j2html/tags/generators/SpecializedTagClassCodeGenerator.java rename src/main/java/j2html/tags/{ => generators}/TagCreatorCodeGenerator.java (61%) create mode 100644 src/main/java/j2html/tags/specialized/AbbrTag.java create mode 100644 src/main/java/j2html/tags/specialized/AddressTag.java create mode 100644 src/main/java/j2html/tags/specialized/AreaTag.java create mode 100644 src/main/java/j2html/tags/specialized/ArticleTag.java create mode 100644 src/main/java/j2html/tags/specialized/AsideTag.java create mode 100644 src/main/java/j2html/tags/specialized/AudioTag.java create mode 100644 src/main/java/j2html/tags/specialized/BTag.java create mode 100644 src/main/java/j2html/tags/specialized/BaseTag.java create mode 100644 src/main/java/j2html/tags/specialized/BdiTag.java create mode 100644 src/main/java/j2html/tags/specialized/BdoTag.java create mode 100644 src/main/java/j2html/tags/specialized/BlockquoteTag.java create mode 100644 src/main/java/j2html/tags/specialized/BrTag.java create mode 100644 src/main/java/j2html/tags/specialized/CanvasTag.java create mode 100644 src/main/java/j2html/tags/specialized/CaptionTag.java create mode 100644 src/main/java/j2html/tags/specialized/CiteTag.java create mode 100644 src/main/java/j2html/tags/specialized/CodeTag.java create mode 100644 src/main/java/j2html/tags/specialized/ColTag.java create mode 100644 src/main/java/j2html/tags/specialized/ColgroupTag.java create mode 100644 src/main/java/j2html/tags/specialized/DatalistTag.java create mode 100644 src/main/java/j2html/tags/specialized/DdTag.java create mode 100644 src/main/java/j2html/tags/specialized/DelTag.java create mode 100644 src/main/java/j2html/tags/specialized/DetailsTag.java create mode 100644 src/main/java/j2html/tags/specialized/DfnTag.java create mode 100644 src/main/java/j2html/tags/specialized/DialogTag.java create mode 100644 src/main/java/j2html/tags/specialized/DivTag.java create mode 100644 src/main/java/j2html/tags/specialized/DlTag.java create mode 100644 src/main/java/j2html/tags/specialized/DtTag.java create mode 100644 src/main/java/j2html/tags/specialized/EmTag.java create mode 100644 src/main/java/j2html/tags/specialized/EmbedTag.java create mode 100644 src/main/java/j2html/tags/specialized/FieldsetTag.java create mode 100644 src/main/java/j2html/tags/specialized/FigcaptionTag.java create mode 100644 src/main/java/j2html/tags/specialized/FigureTag.java create mode 100644 src/main/java/j2html/tags/specialized/FooterTag.java create mode 100644 src/main/java/j2html/tags/specialized/FormTag.java create mode 100644 src/main/java/j2html/tags/specialized/H1Tag.java create mode 100644 src/main/java/j2html/tags/specialized/H2Tag.java create mode 100644 src/main/java/j2html/tags/specialized/H3Tag.java create mode 100644 src/main/java/j2html/tags/specialized/H4Tag.java create mode 100644 src/main/java/j2html/tags/specialized/H5Tag.java create mode 100644 src/main/java/j2html/tags/specialized/H6Tag.java create mode 100644 src/main/java/j2html/tags/specialized/HeaderTag.java create mode 100644 src/main/java/j2html/tags/specialized/HrTag.java create mode 100644 src/main/java/j2html/tags/specialized/ITag.java create mode 100644 src/main/java/j2html/tags/specialized/IframeTag.java create mode 100644 src/main/java/j2html/tags/specialized/ImgTag.java create mode 100644 src/main/java/j2html/tags/specialized/InsTag.java create mode 100644 src/main/java/j2html/tags/specialized/KbdTag.java create mode 100644 src/main/java/j2html/tags/specialized/KeygenTag.java create mode 100644 src/main/java/j2html/tags/specialized/LabelTag.java create mode 100644 src/main/java/j2html/tags/specialized/LegendTag.java create mode 100644 src/main/java/j2html/tags/specialized/LiTag.java create mode 100644 src/main/java/j2html/tags/specialized/LinkTag.java create mode 100644 src/main/java/j2html/tags/specialized/MainTag.java create mode 100644 src/main/java/j2html/tags/specialized/MapTag.java create mode 100644 src/main/java/j2html/tags/specialized/MarkTag.java create mode 100644 src/main/java/j2html/tags/specialized/MenuTag.java create mode 100644 src/main/java/j2html/tags/specialized/MenuitemTag.java create mode 100644 src/main/java/j2html/tags/specialized/MetaTag.java create mode 100644 src/main/java/j2html/tags/specialized/MeterTag.java create mode 100644 src/main/java/j2html/tags/specialized/NavTag.java create mode 100644 src/main/java/j2html/tags/specialized/NoscriptTag.java create mode 100644 src/main/java/j2html/tags/specialized/ObjectTag.java create mode 100644 src/main/java/j2html/tags/specialized/OlTag.java create mode 100644 src/main/java/j2html/tags/specialized/OptgroupTag.java create mode 100644 src/main/java/j2html/tags/specialized/OptionTag.java create mode 100644 src/main/java/j2html/tags/specialized/OutputTag.java create mode 100644 src/main/java/j2html/tags/specialized/PTag.java create mode 100644 src/main/java/j2html/tags/specialized/ParamTag.java create mode 100644 src/main/java/j2html/tags/specialized/PreTag.java create mode 100644 src/main/java/j2html/tags/specialized/ProgressTag.java create mode 100644 src/main/java/j2html/tags/specialized/QTag.java create mode 100644 src/main/java/j2html/tags/specialized/RpTag.java create mode 100644 src/main/java/j2html/tags/specialized/RtTag.java create mode 100644 src/main/java/j2html/tags/specialized/RubyTag.java create mode 100644 src/main/java/j2html/tags/specialized/STag.java create mode 100644 src/main/java/j2html/tags/specialized/SampTag.java create mode 100644 src/main/java/j2html/tags/specialized/ScriptTag.java create mode 100644 src/main/java/j2html/tags/specialized/SectionTag.java create mode 100644 src/main/java/j2html/tags/specialized/SmallTag.java create mode 100644 src/main/java/j2html/tags/specialized/SourceTag.java create mode 100644 src/main/java/j2html/tags/specialized/SpanTag.java create mode 100644 src/main/java/j2html/tags/specialized/StrongTag.java create mode 100644 src/main/java/j2html/tags/specialized/StyleTag.java create mode 100644 src/main/java/j2html/tags/specialized/SubTag.java create mode 100644 src/main/java/j2html/tags/specialized/SummaryTag.java create mode 100644 src/main/java/j2html/tags/specialized/SupTag.java create mode 100644 src/main/java/j2html/tags/specialized/TableTag.java create mode 100644 src/main/java/j2html/tags/specialized/TbodyTag.java create mode 100644 src/main/java/j2html/tags/specialized/TdTag.java create mode 100644 src/main/java/j2html/tags/specialized/TextareaTag.java create mode 100644 src/main/java/j2html/tags/specialized/TfootTag.java create mode 100644 src/main/java/j2html/tags/specialized/ThTag.java create mode 100644 src/main/java/j2html/tags/specialized/TheadTag.java create mode 100644 src/main/java/j2html/tags/specialized/TimeTag.java create mode 100644 src/main/java/j2html/tags/specialized/TitleTag.java create mode 100644 src/main/java/j2html/tags/specialized/TrTag.java create mode 100644 src/main/java/j2html/tags/specialized/TrackTag.java create mode 100644 src/main/java/j2html/tags/specialized/UTag.java create mode 100644 src/main/java/j2html/tags/specialized/UlTag.java create mode 100644 src/main/java/j2html/tags/specialized/VarTag.java create mode 100644 src/main/java/j2html/tags/specialized/VideoTag.java create mode 100644 src/main/java/j2html/tags/specialized/WbrTag.java diff --git a/.gitignore b/.gitignore index a5e3074b..560af530 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # Created by https://www.gitignore.io +src/main/java/j2html/Experiment.java ### Intellij ### # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm diff --git a/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java b/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java new file mode 100644 index 00000000..fbca8590 --- /dev/null +++ b/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java @@ -0,0 +1,18 @@ +package j2html.tags.generators; + +import java.util.Arrays; +import java.util.List; + +public final class AttributeInterfaceCodeGenerator { + + public static void main(String[] args){ + + //TODO + } + + static List attributes() { + return Arrays.asList( + "" + ); + } +} diff --git a/src/main/java/j2html/tags/generators/SpecializedTagClassCodeGenerator.java b/src/main/java/j2html/tags/generators/SpecializedTagClassCodeGenerator.java new file mode 100644 index 00000000..ca902aab --- /dev/null +++ b/src/main/java/j2html/tags/generators/SpecializedTagClassCodeGenerator.java @@ -0,0 +1,127 @@ +package j2html.tags.generators; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Arrays; +import java.util.List; +import java.util.Optional; + +import static j2html.tags.generators.TagCreatorCodeGenerator.containerTags; +import static j2html.tags.generators.TagCreatorCodeGenerator.emptyTags; + +class SpecializedTagClassCodeGenerator { + + public static void main(String[] args) { + try{ + //the delete argument serves to give the possibility + //to delete the classes that were written before + mainInner(false); + }catch (Exception ignored){} + } + + public static String classNameFromTag(String tageNameLowerCase){ + String res = tageNameLowerCase.substring(0,1).toUpperCase()+tageNameLowerCase.substring(1); + return res + "Tag"; + } + + private static Path makePath(String tagLowerCase){ + final String filename = classNameFromTag(tagLowerCase)+".java"; + return Paths.get("src/main/java/j2html/tags/specialized/"+filename); + } + + private static String getPackage(){ + return "package j2html.tags.specialized;\n"; + } + + private static String getClassTemplate( + final String className, + final Optional optExtends, + final List imports, + final String tag + ){ + + final StringBuilder sb = new StringBuilder(); + + sb.append(getPackage()); + sb.append("\n"); + + for(String importName : imports){ + sb.append("import ").append(importName).append(";\n"); + } + sb.append("\n"); + sb.append("public final class ") + .append(className); + + if(optExtends.isPresent()) { + sb.append(" extends ").append(optExtends.get()) + .append(" "); + } + + sb.append(" {\n"); + + //class contents + sb.append("public ") + .append(className) + .append("() {") + .append("super(\"").append(tag).append("\");") + .append("}\n"); + + sb.append("}\n"); + + return sb.toString(); + } + + public static void mainInner(final boolean delete) throws IOException { + System.out.println("// EmptyTags, generated in " + SpecializedTagClassCodeGenerator.class); + + for (final String tag : emptyTags()) { + final String className = classNameFromTag(tag); + final Path path = makePath(tag); + + final String classString = + getClassTemplate( + className, + Optional.of("EmptyTag"), + Arrays.asList( + "j2html.tags.EmptyTag", + "j2html.tags.attributes.*" + ), + tag + ); + + /* + public InputTag() { + super("input"); + } + */ + + if(delete){ + Files.delete(path); + }else { + Files.write(path, classString.getBytes()); + } + } + + System.out.println("// ContainerTags, generated in " + SpecializedTagClassCodeGenerator.class); + + for (final String tag : containerTags()) { + final Path path = makePath(tag); + final String className = classNameFromTag(tag); + final String classString = + getClassTemplate( + className, + Optional.of("ContainerTag"), + Arrays.asList("j2html.tags.ContainerTag"), + tag + ); + + if(delete){ + Files.delete(path); + }else { + Files.write(path, classString.getBytes()); + } + } + } +} diff --git a/src/main/java/j2html/tags/TagCreatorCodeGenerator.java b/src/main/java/j2html/tags/generators/TagCreatorCodeGenerator.java similarity index 61% rename from src/main/java/j2html/tags/TagCreatorCodeGenerator.java rename to src/main/java/j2html/tags/generators/TagCreatorCodeGenerator.java index 3f7415fe..51934ab7 100644 --- a/src/main/java/j2html/tags/TagCreatorCodeGenerator.java +++ b/src/main/java/j2html/tags/generators/TagCreatorCodeGenerator.java @@ -1,4 +1,4 @@ -package j2html.tags; +package j2html.tags.generators; import java.util.Arrays; import java.util.List; @@ -6,33 +6,51 @@ class TagCreatorCodeGenerator { public static void main(String[] args) { + System.out.println("// EmptyTags, generated in " + TagCreatorCodeGenerator.class); + for (String tag : emptyTags()) { - String emptyA1 = "public static EmptyTag " + tag + "()"; - String emptyA2 = "{ return new EmptyTag(\"" + tag + "\"); }"; + final String className = SpecializedTagClassCodeGenerator.classNameFromTag(tag); + final String publicstaticTypeMethod = "public static "+className+" "+tag+" "; + final String castReturn = " return ("+className+") "; + final String construct = " new "+className+"(\"" + tag + "\")"; + + String emptyA1 = publicstaticTypeMethod + "()"; + String emptyA2 = "{ return "+construct+"; }"; // Attr shorthands - String emptyB1 = "public static EmptyTag " + tag + "(Attr.ShortForm shortAttr)"; - String emptyB2 = "{ return Attr.addTo(new EmptyTag(\"" + tag + "\"), shortAttr); }"; + String emptyB1 = publicstaticTypeMethod + "(Attr.ShortForm shortAttr)"; + String emptyB2 = "{ "+castReturn+" Attr.addTo("+construct+", shortAttr); }"; // Print System.out.println(String.format("%-80s%1s", emptyA1, emptyA2)); System.out.println(String.format("%-80s%1s", emptyB1, emptyB2)); System.out.println(""); } + System.out.println("// ContainerTags, generated in " + TagCreatorCodeGenerator.class); + for (String tag : containerTags()) { - String containerA1 = "public static ContainerTag " + tag + "()"; - String containerA2 = "{ return new ContainerTag(\"" + tag + "\"); }"; - String containerB1 = "public static ContainerTag " + tag + "(String text)"; - String containerB2 = "{ return new ContainerTag(\"" + tag + "\").withText(text); }"; - String containerC1 = "public static ContainerTag " + tag + "(DomContent... dc)"; - String containerC2 = "{ return new ContainerTag(\"" + tag + "\").with(dc); }"; + final String className = SpecializedTagClassCodeGenerator.classNameFromTag(tag); + final String publicstaticTypeMethod = "public static "+className+" "+tag+" "; + final String castReturn = " return ("+className+") "; + final String construct = " new "+className+"(\"" + tag + "\")"; + + String containerA1 = publicstaticTypeMethod+ "()"; + String containerA2 = "{ "+castReturn + construct + "; }"; + + String containerB1 = publicstaticTypeMethod + "(String text)"; + String containerB2 = "{ "+castReturn + construct + ".withText(text); }"; + + String containerC1 = publicstaticTypeMethod + "(DomContent... dc)"; + String containerC2 = "{ "+castReturn + construct+".with(dc); }"; // Attr shorthands - String containerD1 = "public static ContainerTag " + tag + "(Attr.ShortForm shortAttr)"; - String containerD2 = "{ return Attr.addTo(new ContainerTag(\"" + tag + "\"), shortAttr); }"; - String containerE1 = "public static ContainerTag " + tag + "(Attr.ShortForm shortAttr, String text)"; - String containerE2 = "{ return Attr.addTo(new ContainerTag(\"" + tag + "\").withText(text), shortAttr); }"; - String containerF1 = "public static ContainerTag " + tag + "(Attr.ShortForm shortAttr, DomContent... dc)"; - String containerF2 = "{ return Attr.addTo(new ContainerTag(\"" + tag + "\").with(dc), shortAttr); }"; + String containerD1 = publicstaticTypeMethod + "(Attr.ShortForm shortAttr)"; + String containerD2 = "{ "+castReturn+" Attr.addTo("+construct+", shortAttr); }"; + + String containerE1 = publicstaticTypeMethod + "(Attr.ShortForm shortAttr, String text)"; + String containerE2 = "{ "+castReturn+" Attr.addTo("+construct+".withText(text), shortAttr); }"; + + String containerF1 = publicstaticTypeMethod + "(Attr.ShortForm shortAttr, DomContent... dc)"; + String containerF2 = "{ "+castReturn+" Attr.addTo("+construct+".with(dc), shortAttr); }"; // Print System.out.println(String.format("%-80s%1s", containerA1, containerA2)); System.out.println(String.format("%-80s%1s", containerB1, containerB2)); @@ -45,7 +63,7 @@ public static void main(String[] args) { } // This is a method that contains all ContainerTags, there is nothing below it - private static List emptyTags() { + static List emptyTags() { return Arrays.asList( "area", "base", @@ -55,7 +73,6 @@ private static List emptyTags() { "embed", "hr", "img", - "input", "keygen", "link", "meta", @@ -66,9 +83,9 @@ private static List emptyTags() { ); } - private static List containerTags() { + static List containerTags() { return Arrays.asList( - "a", + // "a" ATag is managed manually "abbr", "address", "article", @@ -78,7 +95,7 @@ private static List containerTags() { "bdi", "bdo", "blockquote", - "button", + //"body" BodyTag is managed manually "canvas", "caption", "cite", @@ -105,6 +122,7 @@ private static List containerTags() { "h4", "h5", "h6", + //"head", HeadTag is managed manually "header", "i", "iframe", @@ -137,7 +155,6 @@ private static List containerTags() { "samp", "script", "section", - "select", "small", "span", "strong", diff --git a/src/main/java/j2html/tags/specialized/ATag.java b/src/main/java/j2html/tags/specialized/ATag.java index dfc8dbb7..f99464d2 100644 --- a/src/main/java/j2html/tags/specialized/ATag.java +++ b/src/main/java/j2html/tags/specialized/ATag.java @@ -1,14 +1,14 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.IDownload; +import j2html.tags.attributes.IType; public final class ATag extends ContainerTag - implements +implements IType, IDownload { - public ATag() { super("a"); } diff --git a/src/main/java/j2html/tags/specialized/AbbrTag.java b/src/main/java/j2html/tags/specialized/AbbrTag.java new file mode 100644 index 00000000..b79d3344 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/AbbrTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class AbbrTag extends ContainerTag { + public AbbrTag() { + super("abbr"); + } +} diff --git a/src/main/java/j2html/tags/specialized/AddressTag.java b/src/main/java/j2html/tags/specialized/AddressTag.java new file mode 100644 index 00000000..da04c9c5 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/AddressTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class AddressTag extends ContainerTag { + public AddressTag() { + super("address"); + } +} diff --git a/src/main/java/j2html/tags/specialized/AreaTag.java b/src/main/java/j2html/tags/specialized/AreaTag.java new file mode 100644 index 00000000..48d0ff7a --- /dev/null +++ b/src/main/java/j2html/tags/specialized/AreaTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.EmptyTag; + +public final class AreaTag extends EmptyTag { + public AreaTag() { + super("area"); + } +} diff --git a/src/main/java/j2html/tags/specialized/ArticleTag.java b/src/main/java/j2html/tags/specialized/ArticleTag.java new file mode 100644 index 00000000..a53c82fe --- /dev/null +++ b/src/main/java/j2html/tags/specialized/ArticleTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class ArticleTag extends ContainerTag { + public ArticleTag() { + super("article"); + } +} diff --git a/src/main/java/j2html/tags/specialized/AsideTag.java b/src/main/java/j2html/tags/specialized/AsideTag.java new file mode 100644 index 00000000..967ebdf3 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/AsideTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class AsideTag extends ContainerTag { + public AsideTag() { + super("aside"); + } +} diff --git a/src/main/java/j2html/tags/specialized/AudioTag.java b/src/main/java/j2html/tags/specialized/AudioTag.java new file mode 100644 index 00000000..380773c9 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/AudioTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class AudioTag extends ContainerTag { + public AudioTag() { + super("audio"); + } +} diff --git a/src/main/java/j2html/tags/specialized/BTag.java b/src/main/java/j2html/tags/specialized/BTag.java new file mode 100644 index 00000000..11878e0f --- /dev/null +++ b/src/main/java/j2html/tags/specialized/BTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class BTag extends ContainerTag { + public BTag() { + super("b"); + } +} diff --git a/src/main/java/j2html/tags/specialized/BaseTag.java b/src/main/java/j2html/tags/specialized/BaseTag.java new file mode 100644 index 00000000..8d54bfd4 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/BaseTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.EmptyTag; + +public final class BaseTag extends EmptyTag { + public BaseTag() { + super("base"); + } +} diff --git a/src/main/java/j2html/tags/specialized/BdiTag.java b/src/main/java/j2html/tags/specialized/BdiTag.java new file mode 100644 index 00000000..4febece7 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/BdiTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class BdiTag extends ContainerTag { + public BdiTag() { + super("bdi"); + } +} diff --git a/src/main/java/j2html/tags/specialized/BdoTag.java b/src/main/java/j2html/tags/specialized/BdoTag.java new file mode 100644 index 00000000..d1a93c58 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/BdoTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class BdoTag extends ContainerTag { + public BdoTag() { + super("bdo"); + } +} diff --git a/src/main/java/j2html/tags/specialized/BlockquoteTag.java b/src/main/java/j2html/tags/specialized/BlockquoteTag.java new file mode 100644 index 00000000..90dff4fa --- /dev/null +++ b/src/main/java/j2html/tags/specialized/BlockquoteTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class BlockquoteTag extends ContainerTag { + public BlockquoteTag() { + super("blockquote"); + } +} diff --git a/src/main/java/j2html/tags/specialized/BodyTag.java b/src/main/java/j2html/tags/specialized/BodyTag.java index 321683b5..a021f88b 100644 --- a/src/main/java/j2html/tags/specialized/BodyTag.java +++ b/src/main/java/j2html/tags/specialized/BodyTag.java @@ -4,7 +4,7 @@ public final class BodyTag extends ContainerTag { - public BodyTag(){ + public BodyTag() { super("body"); } } diff --git a/src/main/java/j2html/tags/specialized/BrTag.java b/src/main/java/j2html/tags/specialized/BrTag.java new file mode 100644 index 00000000..ae1fc63e --- /dev/null +++ b/src/main/java/j2html/tags/specialized/BrTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.EmptyTag; + +public final class BrTag extends EmptyTag { + public BrTag() { + super("br"); + } +} diff --git a/src/main/java/j2html/tags/specialized/ButtonTag.java b/src/main/java/j2html/tags/specialized/ButtonTag.java index 1bb12ad6..59a678a4 100644 --- a/src/main/java/j2html/tags/specialized/ButtonTag.java +++ b/src/main/java/j2html/tags/specialized/ButtonTag.java @@ -1,18 +1,16 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.EmptyTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.IDisabled; +import j2html.tags.attributes.IForm; +import j2html.tags.attributes.IType; public final class ButtonTag extends ContainerTag - implements - IForm, - IDisabled, - IFormAction, +implements IType, - IValue + IDisabled, + IForm { - public ButtonTag() { super("button"); } diff --git a/src/main/java/j2html/tags/specialized/CanvasTag.java b/src/main/java/j2html/tags/specialized/CanvasTag.java new file mode 100644 index 00000000..d38f80dc --- /dev/null +++ b/src/main/java/j2html/tags/specialized/CanvasTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class CanvasTag extends ContainerTag { + public CanvasTag() { + super("canvas"); + } +} diff --git a/src/main/java/j2html/tags/specialized/CaptionTag.java b/src/main/java/j2html/tags/specialized/CaptionTag.java new file mode 100644 index 00000000..b2a2bf82 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/CaptionTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class CaptionTag extends ContainerTag { + public CaptionTag() { + super("caption"); + } +} diff --git a/src/main/java/j2html/tags/specialized/CiteTag.java b/src/main/java/j2html/tags/specialized/CiteTag.java new file mode 100644 index 00000000..f6273ed7 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/CiteTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class CiteTag extends ContainerTag { + public CiteTag() { + super("cite"); + } +} diff --git a/src/main/java/j2html/tags/specialized/CodeTag.java b/src/main/java/j2html/tags/specialized/CodeTag.java new file mode 100644 index 00000000..2c798635 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/CodeTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class CodeTag extends ContainerTag { + public CodeTag() { + super("code"); + } +} diff --git a/src/main/java/j2html/tags/specialized/ColTag.java b/src/main/java/j2html/tags/specialized/ColTag.java new file mode 100644 index 00000000..a4352771 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/ColTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.EmptyTag; + +public final class ColTag extends EmptyTag { + public ColTag() { + super("col"); + } +} diff --git a/src/main/java/j2html/tags/specialized/ColgroupTag.java b/src/main/java/j2html/tags/specialized/ColgroupTag.java new file mode 100644 index 00000000..65ee29bf --- /dev/null +++ b/src/main/java/j2html/tags/specialized/ColgroupTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class ColgroupTag extends ContainerTag { + public ColgroupTag() { + super("colgroup"); + } +} diff --git a/src/main/java/j2html/tags/specialized/DatalistTag.java b/src/main/java/j2html/tags/specialized/DatalistTag.java new file mode 100644 index 00000000..e422ba5a --- /dev/null +++ b/src/main/java/j2html/tags/specialized/DatalistTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class DatalistTag extends ContainerTag { + public DatalistTag() { + super("datalist"); + } +} diff --git a/src/main/java/j2html/tags/specialized/DdTag.java b/src/main/java/j2html/tags/specialized/DdTag.java new file mode 100644 index 00000000..d66824a4 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/DdTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class DdTag extends ContainerTag { + public DdTag() { + super("dd"); + } +} diff --git a/src/main/java/j2html/tags/specialized/DelTag.java b/src/main/java/j2html/tags/specialized/DelTag.java new file mode 100644 index 00000000..b7034300 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/DelTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class DelTag extends ContainerTag { + public DelTag() { + super("del"); + } +} diff --git a/src/main/java/j2html/tags/specialized/DetailsTag.java b/src/main/java/j2html/tags/specialized/DetailsTag.java new file mode 100644 index 00000000..ed2833b9 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/DetailsTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class DetailsTag extends ContainerTag { + public DetailsTag() { + super("details"); + } +} diff --git a/src/main/java/j2html/tags/specialized/DfnTag.java b/src/main/java/j2html/tags/specialized/DfnTag.java new file mode 100644 index 00000000..fbcbb85c --- /dev/null +++ b/src/main/java/j2html/tags/specialized/DfnTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class DfnTag extends ContainerTag { + public DfnTag() { + super("dfn"); + } +} diff --git a/src/main/java/j2html/tags/specialized/DialogTag.java b/src/main/java/j2html/tags/specialized/DialogTag.java new file mode 100644 index 00000000..eb20f958 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/DialogTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class DialogTag extends ContainerTag { + public DialogTag() { + super("dialog"); + } +} diff --git a/src/main/java/j2html/tags/specialized/DivTag.java b/src/main/java/j2html/tags/specialized/DivTag.java new file mode 100644 index 00000000..a25c8031 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/DivTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class DivTag extends ContainerTag { + public DivTag() { + super("div"); + } +} diff --git a/src/main/java/j2html/tags/specialized/DlTag.java b/src/main/java/j2html/tags/specialized/DlTag.java new file mode 100644 index 00000000..681c411a --- /dev/null +++ b/src/main/java/j2html/tags/specialized/DlTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class DlTag extends ContainerTag { + public DlTag() { + super("dl"); + } +} diff --git a/src/main/java/j2html/tags/specialized/DtTag.java b/src/main/java/j2html/tags/specialized/DtTag.java new file mode 100644 index 00000000..44231f79 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/DtTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class DtTag extends ContainerTag { + public DtTag() { + super("dt"); + } +} diff --git a/src/main/java/j2html/tags/specialized/EmTag.java b/src/main/java/j2html/tags/specialized/EmTag.java new file mode 100644 index 00000000..4cc2882b --- /dev/null +++ b/src/main/java/j2html/tags/specialized/EmTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class EmTag extends ContainerTag { + public EmTag() { + super("em"); + } +} diff --git a/src/main/java/j2html/tags/specialized/EmbedTag.java b/src/main/java/j2html/tags/specialized/EmbedTag.java new file mode 100644 index 00000000..7c6b913b --- /dev/null +++ b/src/main/java/j2html/tags/specialized/EmbedTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.EmptyTag; + +public final class EmbedTag extends EmptyTag { + public EmbedTag() { + super("embed"); + } +} diff --git a/src/main/java/j2html/tags/specialized/FieldsetTag.java b/src/main/java/j2html/tags/specialized/FieldsetTag.java new file mode 100644 index 00000000..271b1c10 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/FieldsetTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class FieldsetTag extends ContainerTag { + public FieldsetTag() { + super("fieldset"); + } +} diff --git a/src/main/java/j2html/tags/specialized/FigcaptionTag.java b/src/main/java/j2html/tags/specialized/FigcaptionTag.java new file mode 100644 index 00000000..a843277e --- /dev/null +++ b/src/main/java/j2html/tags/specialized/FigcaptionTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class FigcaptionTag extends ContainerTag { + public FigcaptionTag() { + super("figcaption"); + } +} diff --git a/src/main/java/j2html/tags/specialized/FigureTag.java b/src/main/java/j2html/tags/specialized/FigureTag.java new file mode 100644 index 00000000..1e33e6a8 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/FigureTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class FigureTag extends ContainerTag { + public FigureTag() { + super("figure"); + } +} diff --git a/src/main/java/j2html/tags/specialized/FooterTag.java b/src/main/java/j2html/tags/specialized/FooterTag.java new file mode 100644 index 00000000..14cacb50 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/FooterTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class FooterTag extends ContainerTag { + public FooterTag() { + super("footer"); + } +} diff --git a/src/main/java/j2html/tags/specialized/FormTag.java b/src/main/java/j2html/tags/specialized/FormTag.java new file mode 100644 index 00000000..d46ba0b5 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/FormTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class FormTag extends ContainerTag { + public FormTag() { + super("form"); + } +} diff --git a/src/main/java/j2html/tags/specialized/H1Tag.java b/src/main/java/j2html/tags/specialized/H1Tag.java new file mode 100644 index 00000000..012ed5a0 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/H1Tag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class H1Tag extends ContainerTag { + public H1Tag() { + super("h1"); + } +} diff --git a/src/main/java/j2html/tags/specialized/H2Tag.java b/src/main/java/j2html/tags/specialized/H2Tag.java new file mode 100644 index 00000000..fd97fc4d --- /dev/null +++ b/src/main/java/j2html/tags/specialized/H2Tag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class H2Tag extends ContainerTag { + public H2Tag() { + super("h2"); + } +} diff --git a/src/main/java/j2html/tags/specialized/H3Tag.java b/src/main/java/j2html/tags/specialized/H3Tag.java new file mode 100644 index 00000000..bdf0a3b0 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/H3Tag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class H3Tag extends ContainerTag { + public H3Tag() { + super("h3"); + } +} diff --git a/src/main/java/j2html/tags/specialized/H4Tag.java b/src/main/java/j2html/tags/specialized/H4Tag.java new file mode 100644 index 00000000..b3354b20 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/H4Tag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class H4Tag extends ContainerTag { + public H4Tag() { + super("h4"); + } +} diff --git a/src/main/java/j2html/tags/specialized/H5Tag.java b/src/main/java/j2html/tags/specialized/H5Tag.java new file mode 100644 index 00000000..7265c292 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/H5Tag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class H5Tag extends ContainerTag { + public H5Tag() { + super("h5"); + } +} diff --git a/src/main/java/j2html/tags/specialized/H6Tag.java b/src/main/java/j2html/tags/specialized/H6Tag.java new file mode 100644 index 00000000..9791865d --- /dev/null +++ b/src/main/java/j2html/tags/specialized/H6Tag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class H6Tag extends ContainerTag { + public H6Tag() { + super("h6"); + } +} diff --git a/src/main/java/j2html/tags/specialized/HeadTag.java b/src/main/java/j2html/tags/specialized/HeadTag.java index b7c531f2..1d19edc1 100644 --- a/src/main/java/j2html/tags/specialized/HeadTag.java +++ b/src/main/java/j2html/tags/specialized/HeadTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.Tag; public final class HeadTag extends ContainerTag { - public HeadTag(){ + public HeadTag() { super("head"); } } diff --git a/src/main/java/j2html/tags/specialized/HeaderTag.java b/src/main/java/j2html/tags/specialized/HeaderTag.java new file mode 100644 index 00000000..234d6363 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/HeaderTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class HeaderTag extends ContainerTag { + public HeaderTag() { + super("header"); + } +} diff --git a/src/main/java/j2html/tags/specialized/HrTag.java b/src/main/java/j2html/tags/specialized/HrTag.java new file mode 100644 index 00000000..9cff496f --- /dev/null +++ b/src/main/java/j2html/tags/specialized/HrTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.EmptyTag; + +public final class HrTag extends EmptyTag { + public HrTag() { + super("hr"); + } +} diff --git a/src/main/java/j2html/tags/specialized/HtmlTag.java b/src/main/java/j2html/tags/specialized/HtmlTag.java index 19bb4fc5..21f1e1ce 100644 --- a/src/main/java/j2html/tags/specialized/HtmlTag.java +++ b/src/main/java/j2html/tags/specialized/HtmlTag.java @@ -11,32 +11,32 @@ public final class HtmlTag extends Tag { private final Optional head; private final Optional body; - public HtmlTag(){ + public HtmlTag() { super("html"); head = Optional.empty(); body = Optional.empty(); } - public HtmlTag(HeadTag head){ + public HtmlTag(HeadTag head) { super("html"); this.head = Optional.of(head); this.body = Optional.empty(); } - public HtmlTag(BodyTag body){ + public HtmlTag(BodyTag body) { super("html"); this.head = Optional.empty(); this.body = Optional.of(body); } - public HtmlTag(HeadTag head, BodyTag body){ + public HtmlTag(HeadTag head, BodyTag body) { super("html"); this.head = Optional.of(head); this.body = Optional.of(body); } - private ContainerTag makeContainerTagForRendering(){ + private ContainerTag makeContainerTagForRendering() { return new ContainerTag("html").with( this.head.orElse(null), this.body.orElse(null) diff --git a/src/main/java/j2html/tags/specialized/ITag.java b/src/main/java/j2html/tags/specialized/ITag.java new file mode 100644 index 00000000..227381a1 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/ITag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class ITag extends ContainerTag { + public ITag() { + super("i"); + } +} diff --git a/src/main/java/j2html/tags/specialized/IframeTag.java b/src/main/java/j2html/tags/specialized/IframeTag.java new file mode 100644 index 00000000..502f281c --- /dev/null +++ b/src/main/java/j2html/tags/specialized/IframeTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class IframeTag extends ContainerTag { + public IframeTag() { + super("iframe"); + } +} diff --git a/src/main/java/j2html/tags/specialized/ImgTag.java b/src/main/java/j2html/tags/specialized/ImgTag.java new file mode 100644 index 00000000..d0170299 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/ImgTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.EmptyTag; + +public final class ImgTag extends EmptyTag { + public ImgTag() { + super("img"); + } +} diff --git a/src/main/java/j2html/tags/specialized/InputTag.java b/src/main/java/j2html/tags/specialized/InputTag.java index 73345509..a0f94f59 100644 --- a/src/main/java/j2html/tags/specialized/InputTag.java +++ b/src/main/java/j2html/tags/specialized/InputTag.java @@ -10,8 +10,7 @@ public final class InputTag extends EmptyTag IDisabled, IFormAction, IType, - IValue -{ + IValue { /* Attributes implemented are those not found in EmptyTag Base Class and present in @@ -25,8 +24,8 @@ public InputTag() { super("input"); } - public InputTag withChecked(boolean checked){ - if(checked){ + public InputTag withChecked(boolean checked) { + if (checked) { attr("checked"); } return this; diff --git a/src/main/java/j2html/tags/specialized/InsTag.java b/src/main/java/j2html/tags/specialized/InsTag.java new file mode 100644 index 00000000..18d3432c --- /dev/null +++ b/src/main/java/j2html/tags/specialized/InsTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class InsTag extends ContainerTag { + public InsTag() { + super("ins"); + } +} diff --git a/src/main/java/j2html/tags/specialized/KbdTag.java b/src/main/java/j2html/tags/specialized/KbdTag.java new file mode 100644 index 00000000..9e85ba53 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/KbdTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class KbdTag extends ContainerTag { + public KbdTag() { + super("kbd"); + } +} diff --git a/src/main/java/j2html/tags/specialized/KeygenTag.java b/src/main/java/j2html/tags/specialized/KeygenTag.java new file mode 100644 index 00000000..0bbcedcf --- /dev/null +++ b/src/main/java/j2html/tags/specialized/KeygenTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.EmptyTag; + +public final class KeygenTag extends EmptyTag { + public KeygenTag() { + super("keygen"); + } +} diff --git a/src/main/java/j2html/tags/specialized/LabelTag.java b/src/main/java/j2html/tags/specialized/LabelTag.java new file mode 100644 index 00000000..c6a8741b --- /dev/null +++ b/src/main/java/j2html/tags/specialized/LabelTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class LabelTag extends ContainerTag { + public LabelTag() { + super("label"); + } +} diff --git a/src/main/java/j2html/tags/specialized/LegendTag.java b/src/main/java/j2html/tags/specialized/LegendTag.java new file mode 100644 index 00000000..6fc9be43 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/LegendTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class LegendTag extends ContainerTag { + public LegendTag() { + super("legend"); + } +} diff --git a/src/main/java/j2html/tags/specialized/LiTag.java b/src/main/java/j2html/tags/specialized/LiTag.java new file mode 100644 index 00000000..319194d1 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/LiTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class LiTag extends ContainerTag { + public LiTag() { + super("li"); + } +} diff --git a/src/main/java/j2html/tags/specialized/LinkTag.java b/src/main/java/j2html/tags/specialized/LinkTag.java new file mode 100644 index 00000000..38915d61 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/LinkTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.EmptyTag; + +public final class LinkTag extends EmptyTag { + public LinkTag() { + super("link"); + } +} diff --git a/src/main/java/j2html/tags/specialized/MainTag.java b/src/main/java/j2html/tags/specialized/MainTag.java new file mode 100644 index 00000000..4439c778 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/MainTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class MainTag extends ContainerTag { + public MainTag() { + super("main"); + } +} diff --git a/src/main/java/j2html/tags/specialized/MapTag.java b/src/main/java/j2html/tags/specialized/MapTag.java new file mode 100644 index 00000000..c62ee22b --- /dev/null +++ b/src/main/java/j2html/tags/specialized/MapTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class MapTag extends ContainerTag { + public MapTag() { + super("map"); + } +} diff --git a/src/main/java/j2html/tags/specialized/MarkTag.java b/src/main/java/j2html/tags/specialized/MarkTag.java new file mode 100644 index 00000000..3983e754 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/MarkTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class MarkTag extends ContainerTag { + public MarkTag() { + super("mark"); + } +} diff --git a/src/main/java/j2html/tags/specialized/MenuTag.java b/src/main/java/j2html/tags/specialized/MenuTag.java new file mode 100644 index 00000000..7dbd759c --- /dev/null +++ b/src/main/java/j2html/tags/specialized/MenuTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class MenuTag extends ContainerTag { + public MenuTag() { + super("menu"); + } +} diff --git a/src/main/java/j2html/tags/specialized/MenuitemTag.java b/src/main/java/j2html/tags/specialized/MenuitemTag.java new file mode 100644 index 00000000..92c2a01f --- /dev/null +++ b/src/main/java/j2html/tags/specialized/MenuitemTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class MenuitemTag extends ContainerTag { + public MenuitemTag() { + super("menuitem"); + } +} diff --git a/src/main/java/j2html/tags/specialized/MetaTag.java b/src/main/java/j2html/tags/specialized/MetaTag.java new file mode 100644 index 00000000..0ec6c83a --- /dev/null +++ b/src/main/java/j2html/tags/specialized/MetaTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.EmptyTag; + +public final class MetaTag extends EmptyTag { + public MetaTag() { + super("meta"); + } +} diff --git a/src/main/java/j2html/tags/specialized/MeterTag.java b/src/main/java/j2html/tags/specialized/MeterTag.java new file mode 100644 index 00000000..e161e9d7 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/MeterTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class MeterTag extends ContainerTag { + public MeterTag() { + super("meter"); + } +} diff --git a/src/main/java/j2html/tags/specialized/NavTag.java b/src/main/java/j2html/tags/specialized/NavTag.java new file mode 100644 index 00000000..0eac5627 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/NavTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class NavTag extends ContainerTag { + public NavTag() { + super("nav"); + } +} diff --git a/src/main/java/j2html/tags/specialized/NoscriptTag.java b/src/main/java/j2html/tags/specialized/NoscriptTag.java new file mode 100644 index 00000000..3eb4c702 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/NoscriptTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class NoscriptTag extends ContainerTag { + public NoscriptTag() { + super("noscript"); + } +} diff --git a/src/main/java/j2html/tags/specialized/ObjectTag.java b/src/main/java/j2html/tags/specialized/ObjectTag.java new file mode 100644 index 00000000..5110394c --- /dev/null +++ b/src/main/java/j2html/tags/specialized/ObjectTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class ObjectTag extends ContainerTag { + public ObjectTag() { + super("object"); + } +} diff --git a/src/main/java/j2html/tags/specialized/OlTag.java b/src/main/java/j2html/tags/specialized/OlTag.java new file mode 100644 index 00000000..6d5d2a21 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/OlTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class OlTag extends ContainerTag { + public OlTag() { + super("ol"); + } +} diff --git a/src/main/java/j2html/tags/specialized/OptgroupTag.java b/src/main/java/j2html/tags/specialized/OptgroupTag.java new file mode 100644 index 00000000..1a6cb426 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/OptgroupTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class OptgroupTag extends ContainerTag { + public OptgroupTag() { + super("optgroup"); + } +} diff --git a/src/main/java/j2html/tags/specialized/OptionTag.java b/src/main/java/j2html/tags/specialized/OptionTag.java new file mode 100644 index 00000000..f52849b1 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/OptionTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class OptionTag extends ContainerTag { + public OptionTag() { + super("option"); + } +} diff --git a/src/main/java/j2html/tags/specialized/OutputTag.java b/src/main/java/j2html/tags/specialized/OutputTag.java new file mode 100644 index 00000000..0d3eaf99 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/OutputTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class OutputTag extends ContainerTag { + public OutputTag() { + super("output"); + } +} diff --git a/src/main/java/j2html/tags/specialized/PTag.java b/src/main/java/j2html/tags/specialized/PTag.java new file mode 100644 index 00000000..86f31058 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/PTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class PTag extends ContainerTag { + public PTag() { + super("p"); + } +} diff --git a/src/main/java/j2html/tags/specialized/ParamTag.java b/src/main/java/j2html/tags/specialized/ParamTag.java new file mode 100644 index 00000000..17b6e0d0 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/ParamTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.EmptyTag; + +public final class ParamTag extends EmptyTag { + public ParamTag() { + super("param"); + } +} diff --git a/src/main/java/j2html/tags/specialized/PreTag.java b/src/main/java/j2html/tags/specialized/PreTag.java new file mode 100644 index 00000000..b38dcbe0 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/PreTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class PreTag extends ContainerTag { + public PreTag() { + super("pre"); + } +} diff --git a/src/main/java/j2html/tags/specialized/ProgressTag.java b/src/main/java/j2html/tags/specialized/ProgressTag.java new file mode 100644 index 00000000..159a5b5a --- /dev/null +++ b/src/main/java/j2html/tags/specialized/ProgressTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class ProgressTag extends ContainerTag { + public ProgressTag() { + super("progress"); + } +} diff --git a/src/main/java/j2html/tags/specialized/QTag.java b/src/main/java/j2html/tags/specialized/QTag.java new file mode 100644 index 00000000..b9a51809 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/QTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class QTag extends ContainerTag { + public QTag() { + super("q"); + } +} diff --git a/src/main/java/j2html/tags/specialized/RpTag.java b/src/main/java/j2html/tags/specialized/RpTag.java new file mode 100644 index 00000000..a4a1c7d7 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/RpTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class RpTag extends ContainerTag { + public RpTag() { + super("rp"); + } +} diff --git a/src/main/java/j2html/tags/specialized/RtTag.java b/src/main/java/j2html/tags/specialized/RtTag.java new file mode 100644 index 00000000..e4e6625f --- /dev/null +++ b/src/main/java/j2html/tags/specialized/RtTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class RtTag extends ContainerTag { + public RtTag() { + super("rt"); + } +} diff --git a/src/main/java/j2html/tags/specialized/RubyTag.java b/src/main/java/j2html/tags/specialized/RubyTag.java new file mode 100644 index 00000000..26f08537 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/RubyTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class RubyTag extends ContainerTag { + public RubyTag() { + super("ruby"); + } +} diff --git a/src/main/java/j2html/tags/specialized/STag.java b/src/main/java/j2html/tags/specialized/STag.java new file mode 100644 index 00000000..a7886a8b --- /dev/null +++ b/src/main/java/j2html/tags/specialized/STag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class STag extends ContainerTag { + public STag() { + super("s"); + } +} diff --git a/src/main/java/j2html/tags/specialized/SampTag.java b/src/main/java/j2html/tags/specialized/SampTag.java new file mode 100644 index 00000000..a56d7438 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/SampTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class SampTag extends ContainerTag { + public SampTag() { + super("samp"); + } +} diff --git a/src/main/java/j2html/tags/specialized/ScriptTag.java b/src/main/java/j2html/tags/specialized/ScriptTag.java new file mode 100644 index 00000000..5ca20c10 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/ScriptTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class ScriptTag extends ContainerTag { + public ScriptTag() { + super("script"); + } +} diff --git a/src/main/java/j2html/tags/specialized/SectionTag.java b/src/main/java/j2html/tags/specialized/SectionTag.java new file mode 100644 index 00000000..12477f91 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/SectionTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class SectionTag extends ContainerTag { + public SectionTag() { + super("section"); + } +} diff --git a/src/main/java/j2html/tags/specialized/SelectTag.java b/src/main/java/j2html/tags/specialized/SelectTag.java index 84e0cb1d..a2ea5a24 100644 --- a/src/main/java/j2html/tags/specialized/SelectTag.java +++ b/src/main/java/j2html/tags/specialized/SelectTag.java @@ -1,14 +1,14 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.IDisabled; +import j2html.tags.attributes.IType; public final class SelectTag extends ContainerTag - implements +implements IDisabled, - IForm + IType { - public SelectTag() { super("select"); } diff --git a/src/main/java/j2html/tags/specialized/SmallTag.java b/src/main/java/j2html/tags/specialized/SmallTag.java new file mode 100644 index 00000000..17c193b9 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/SmallTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class SmallTag extends ContainerTag { + public SmallTag() { + super("small"); + } +} diff --git a/src/main/java/j2html/tags/specialized/SourceTag.java b/src/main/java/j2html/tags/specialized/SourceTag.java new file mode 100644 index 00000000..a7d6255d --- /dev/null +++ b/src/main/java/j2html/tags/specialized/SourceTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.EmptyTag; + +public final class SourceTag extends EmptyTag { + public SourceTag() { + super("source"); + } +} diff --git a/src/main/java/j2html/tags/specialized/SpanTag.java b/src/main/java/j2html/tags/specialized/SpanTag.java new file mode 100644 index 00000000..57924ae8 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/SpanTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class SpanTag extends ContainerTag { + public SpanTag() { + super("span"); + } +} diff --git a/src/main/java/j2html/tags/specialized/StrongTag.java b/src/main/java/j2html/tags/specialized/StrongTag.java new file mode 100644 index 00000000..f98b0b99 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/StrongTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class StrongTag extends ContainerTag { + public StrongTag() { + super("strong"); + } +} diff --git a/src/main/java/j2html/tags/specialized/StyleTag.java b/src/main/java/j2html/tags/specialized/StyleTag.java new file mode 100644 index 00000000..750491af --- /dev/null +++ b/src/main/java/j2html/tags/specialized/StyleTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class StyleTag extends ContainerTag { + public StyleTag() { + super("style"); + } +} diff --git a/src/main/java/j2html/tags/specialized/SubTag.java b/src/main/java/j2html/tags/specialized/SubTag.java new file mode 100644 index 00000000..d37da0df --- /dev/null +++ b/src/main/java/j2html/tags/specialized/SubTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class SubTag extends ContainerTag { + public SubTag() { + super("sub"); + } +} diff --git a/src/main/java/j2html/tags/specialized/SummaryTag.java b/src/main/java/j2html/tags/specialized/SummaryTag.java new file mode 100644 index 00000000..9fcbe1dc --- /dev/null +++ b/src/main/java/j2html/tags/specialized/SummaryTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class SummaryTag extends ContainerTag { + public SummaryTag() { + super("summary"); + } +} diff --git a/src/main/java/j2html/tags/specialized/SupTag.java b/src/main/java/j2html/tags/specialized/SupTag.java new file mode 100644 index 00000000..b7465c5c --- /dev/null +++ b/src/main/java/j2html/tags/specialized/SupTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class SupTag extends ContainerTag { + public SupTag() { + super("sup"); + } +} diff --git a/src/main/java/j2html/tags/specialized/TableTag.java b/src/main/java/j2html/tags/specialized/TableTag.java new file mode 100644 index 00000000..e02a00fa --- /dev/null +++ b/src/main/java/j2html/tags/specialized/TableTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class TableTag extends ContainerTag { + public TableTag() { + super("table"); + } +} diff --git a/src/main/java/j2html/tags/specialized/TbodyTag.java b/src/main/java/j2html/tags/specialized/TbodyTag.java new file mode 100644 index 00000000..f4460004 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/TbodyTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class TbodyTag extends ContainerTag { + public TbodyTag() { + super("tbody"); + } +} diff --git a/src/main/java/j2html/tags/specialized/TdTag.java b/src/main/java/j2html/tags/specialized/TdTag.java new file mode 100644 index 00000000..ce59453f --- /dev/null +++ b/src/main/java/j2html/tags/specialized/TdTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class TdTag extends ContainerTag { + public TdTag() { + super("td"); + } +} diff --git a/src/main/java/j2html/tags/specialized/TextAreaTag.java b/src/main/java/j2html/tags/specialized/TextAreaTag.java index cc5d64a2..b0a67d31 100644 --- a/src/main/java/j2html/tags/specialized/TextAreaTag.java +++ b/src/main/java/j2html/tags/specialized/TextAreaTag.java @@ -2,15 +2,12 @@ import j2html.tags.ContainerTag; import j2html.tags.attributes.IDisabled; -import j2html.tags.attributes.IDownload; import j2html.tags.attributes.IForm; -import j2html.tags.attributes.IType; public final class TextAreaTag extends ContainerTag implements IDisabled, - IForm -{ + IForm { public TextAreaTag() { super("textarea"); diff --git a/src/main/java/j2html/tags/specialized/TextareaTag.java b/src/main/java/j2html/tags/specialized/TextareaTag.java new file mode 100644 index 00000000..60388429 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/TextareaTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class TextareaTag extends ContainerTag { + public TextareaTag() { + super("textarea"); + } +} diff --git a/src/main/java/j2html/tags/specialized/TfootTag.java b/src/main/java/j2html/tags/specialized/TfootTag.java new file mode 100644 index 00000000..1131019f --- /dev/null +++ b/src/main/java/j2html/tags/specialized/TfootTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class TfootTag extends ContainerTag { + public TfootTag() { + super("tfoot"); + } +} diff --git a/src/main/java/j2html/tags/specialized/ThTag.java b/src/main/java/j2html/tags/specialized/ThTag.java new file mode 100644 index 00000000..eebe79fa --- /dev/null +++ b/src/main/java/j2html/tags/specialized/ThTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class ThTag extends ContainerTag { + public ThTag() { + super("th"); + } +} diff --git a/src/main/java/j2html/tags/specialized/TheadTag.java b/src/main/java/j2html/tags/specialized/TheadTag.java new file mode 100644 index 00000000..0ab1e3b0 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/TheadTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class TheadTag extends ContainerTag { + public TheadTag() { + super("thead"); + } +} diff --git a/src/main/java/j2html/tags/specialized/TimeTag.java b/src/main/java/j2html/tags/specialized/TimeTag.java new file mode 100644 index 00000000..cf554c2e --- /dev/null +++ b/src/main/java/j2html/tags/specialized/TimeTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class TimeTag extends ContainerTag { + public TimeTag() { + super("time"); + } +} diff --git a/src/main/java/j2html/tags/specialized/TitleTag.java b/src/main/java/j2html/tags/specialized/TitleTag.java new file mode 100644 index 00000000..52cb450e --- /dev/null +++ b/src/main/java/j2html/tags/specialized/TitleTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class TitleTag extends ContainerTag { + public TitleTag() { + super("title"); + } +} diff --git a/src/main/java/j2html/tags/specialized/TrTag.java b/src/main/java/j2html/tags/specialized/TrTag.java new file mode 100644 index 00000000..a822b4c2 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/TrTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class TrTag extends ContainerTag { + public TrTag() { + super("tr"); + } +} diff --git a/src/main/java/j2html/tags/specialized/TrackTag.java b/src/main/java/j2html/tags/specialized/TrackTag.java new file mode 100644 index 00000000..f1eed372 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/TrackTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.EmptyTag; + +public final class TrackTag extends EmptyTag { + public TrackTag() { + super("track"); + } +} diff --git a/src/main/java/j2html/tags/specialized/UTag.java b/src/main/java/j2html/tags/specialized/UTag.java new file mode 100644 index 00000000..cade9b63 --- /dev/null +++ b/src/main/java/j2html/tags/specialized/UTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class UTag extends ContainerTag { + public UTag() { + super("u"); + } +} diff --git a/src/main/java/j2html/tags/specialized/UlTag.java b/src/main/java/j2html/tags/specialized/UlTag.java new file mode 100644 index 00000000..f0d6c83e --- /dev/null +++ b/src/main/java/j2html/tags/specialized/UlTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class UlTag extends ContainerTag { + public UlTag() { + super("ul"); + } +} diff --git a/src/main/java/j2html/tags/specialized/VarTag.java b/src/main/java/j2html/tags/specialized/VarTag.java new file mode 100644 index 00000000..a6432c5e --- /dev/null +++ b/src/main/java/j2html/tags/specialized/VarTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class VarTag extends ContainerTag { + public VarTag() { + super("var"); + } +} diff --git a/src/main/java/j2html/tags/specialized/VideoTag.java b/src/main/java/j2html/tags/specialized/VideoTag.java new file mode 100644 index 00000000..ba5fbd2c --- /dev/null +++ b/src/main/java/j2html/tags/specialized/VideoTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.ContainerTag; + +public final class VideoTag extends ContainerTag { + public VideoTag() { + super("video"); + } +} diff --git a/src/main/java/j2html/tags/specialized/WbrTag.java b/src/main/java/j2html/tags/specialized/WbrTag.java new file mode 100644 index 00000000..a076d01b --- /dev/null +++ b/src/main/java/j2html/tags/specialized/WbrTag.java @@ -0,0 +1,9 @@ +package j2html.tags.specialized; + +import j2html.tags.EmptyTag; + +public final class WbrTag extends EmptyTag { + public WbrTag() { + super("wbr"); + } +} From da752db55691caff4640e21db94a0152ec1364f4 Mon Sep 17 00:00:00 2001 From: pointbazaar Date: Sun, 23 Aug 2020 17:51:17 +0200 Subject: [PATCH 03/19] work on the generator --- src/main/java/j2html/TagCreator.java | 118 +++++---- .../AttributeInterfaceCodeGenerator.java | 246 +++++++++++++++++- .../SpecializedTagClassCodeGenerator.java | 1 - 3 files changed, 309 insertions(+), 56 deletions(-) diff --git a/src/main/java/j2html/TagCreator.java b/src/main/java/j2html/TagCreator.java index 402e9fef..738e9819 100644 --- a/src/main/java/j2html/TagCreator.java +++ b/src/main/java/j2html/TagCreator.java @@ -207,6 +207,71 @@ public static ContainerTag scriptWithInlineFile_min(String path) { public static DomContent document() { return rawHtml(""); } + // -- start of manually managed tags -- + + // EmptyTags + + //ContainerTags + public static HtmlTag html() { + return new HtmlTag(); + } + + public static HtmlTag html(Attr.ShortForm shortAttr) { + return Attr.addTo(new HtmlTag(), shortAttr); + } + + public static HtmlTag html(HeadTag head){ + return new HtmlTag(head); + } + + public static HtmlTag html(BodyTag body){ + return new HtmlTag(body); + } + + public static HtmlTag html(HeadTag head, BodyTag body){ + return new HtmlTag(head, body); + } + + public static HtmlTag html(Attr.ShortForm shortAttr, HeadTag head){ + return Attr.addTo(new HtmlTag(head), shortAttr); + } + + public static HtmlTag html(Attr.ShortForm shortAttr, BodyTag body){ + return Attr.addTo(new HtmlTag(body), shortAttr); + } + + public static HtmlTag html(Attr.ShortForm shortAttr, HeadTag head, BodyTag body){ + return Attr.addTo(new HtmlTag(head, body), shortAttr); + } + + + public static BodyTag body() { + return new BodyTag(); + } + + public static BodyTag body(String text) { + return (BodyTag)new BodyTag().withText(text); + } + + public static BodyTag body(DomContent... dc) { + return (BodyTag)new BodyTag().with(dc); + } + + public static BodyTag body(Attr.ShortForm shortAttr) { + return (BodyTag)Attr.addTo(new BodyTag(), shortAttr); + } + + public static BodyTag body(Attr.ShortForm shortAttr, String text) { + return (BodyTag)Attr.addTo(new BodyTag().withText(text), shortAttr); + } + + public static BodyTag body(Attr.ShortForm shortAttr, DomContent... dc) { + return (BodyTag)Attr.addTo(new BodyTag().with(dc), shortAttr); + } + + // -- end of manually managed tags -- + + // EmptyTags, generated in class j2html.tags.TagCreatorCodeGenerator public static EmptyTag area() { @@ -570,29 +635,6 @@ public static ContainerTag blockquote(Attr.ShortForm shortAttr, DomContent... dc return Attr.addTo(new ContainerTag("blockquote").with(dc), shortAttr); } - public static BodyTag body() { - return new BodyTag(); - } - - public static BodyTag body(String text) { - return (BodyTag)new BodyTag().withText(text); - } - - public static BodyTag body(DomContent... dc) { - return (BodyTag)new BodyTag().with(dc); - } - - public static BodyTag body(Attr.ShortForm shortAttr) { - return (BodyTag)Attr.addTo(new BodyTag(), shortAttr); - } - - public static BodyTag body(Attr.ShortForm shortAttr, String text) { - return (BodyTag)Attr.addTo(new BodyTag().withText(text), shortAttr); - } - - public static BodyTag body(Attr.ShortForm shortAttr, DomContent... dc) { - return (BodyTag)Attr.addTo(new BodyTag().with(dc), shortAttr); - } public static ButtonTag button() { return new ButtonTag(); @@ -1290,37 +1332,7 @@ public static ContainerTag header(Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo(new ContainerTag("header").with(dc), shortAttr); } - public static HtmlTag html() { - return new HtmlTag(); - } - - public static HtmlTag html(Attr.ShortForm shortAttr) { - return Attr.addTo(new HtmlTag(), shortAttr); - } - - public static HtmlTag html(HeadTag head){ - return new HtmlTag(head); - } - - public static HtmlTag html(BodyTag body){ - return new HtmlTag(body); - } - - public static HtmlTag html(HeadTag head, BodyTag body){ - return new HtmlTag(head, body); - } - - public static HtmlTag html(Attr.ShortForm shortAttr, HeadTag head){ - return Attr.addTo(new HtmlTag(head), shortAttr); - } - public static HtmlTag html(Attr.ShortForm shortAttr, BodyTag body){ - return Attr.addTo(new HtmlTag(body), shortAttr); - } - - public static HtmlTag html(Attr.ShortForm shortAttr, HeadTag head, BodyTag body){ - return Attr.addTo(new HtmlTag(head, body), shortAttr); - } public static ContainerTag i() { return new ContainerTag("i"); diff --git a/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java b/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java index fbca8590..39dada4c 100644 --- a/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java +++ b/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java @@ -1,18 +1,260 @@ package j2html.tags.generators; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.Arrays; import java.util.List; +import java.util.Optional; public final class AttributeInterfaceCodeGenerator { public static void main(String[] args){ + try { + final boolean delete = false; - //TODO + for (final String attr : attributes()) { + final Path path = makePath(attr); + final String interfaceName = interfaceNameFromAttribute(attr)+""; + + /* + IFormAction extends IInstance + + default T withFormAction(String formAction){ + get().attr("formaction", formAction); + return get(); + } + */ + + final String interfaceStr = getInterfaceTemplate( + interfaceName, + Optional.of("IInstance"), + Arrays.asList("j2html.tags.Tag"), + interfaceNameFromAttribute(attr).substring(1) + ); + + if (delete) { + Files.delete(path); + }else{ + Files.write(path, interfaceStr.getBytes()); + } + } + }catch (Exception ignored){} + } + + private static String getPackage(){ + return "package j2html.tags.attributes;\n"; + } + + private static String getInterfaceTemplate( + final String interfaceName, + final Optional optExtends, + final List imports, + final String interfaceNameSimple + ){ + + final StringBuilder sb = new StringBuilder(); + + sb.append(getPackage()); + sb.append("\n"); + + for(String importName : imports){ + sb.append("import ").append(importName).append(";\n"); + } + sb.append("\n"); + sb.append("public interface ") + .append(interfaceName); + + if(optExtends.isPresent()) { + sb.append(" extends ").append(optExtends.get()) + .append(" "); + } + + sb.append(" {\n"); + + //interface contents + /* + IFormAction extends IInstance + + default T withFormAction(String formAction){ + get().attr("formaction", formAction); + return get(); + } + */ + final String paramName = interfaceNameSimple.toLowerCase(); + sb.append("default ") + .append("T ").append("with").append(interfaceNameSimple) + .append("(final String ").append(paramName).append(") {") + + .append("get().attr(\"").append(paramName).append("\", "+paramName+");\n") + .append("return get();\n") + + .append("}\n"); + + sb.append("}\n"); + + return sb.toString(); + } + + private static String interfaceNameFromAttribute(String tageNameLowerCase){ + String res = tageNameLowerCase.substring(0,1).toUpperCase()+tageNameLowerCase.substring(1); + return "I" + res; } - static List attributes() { + private static Path makePath(String tagLowerCase){ + final String filename = interfaceNameFromAttribute(tagLowerCase)+".java"; + return Paths.get("src/main/java/j2html/tags/attributes/"+filename); + } + + private static List attributes() { return Arrays.asList( + //"accept", implemented manually + //"accept-charset", contains dashes, TODO + "accesskey", + "action", + //"align", not supported in HTML5 + "alt", + "async", + "autocomplete", + "autofocus", + "autoplay", + //"bgcolor", not supported in HTMTL5 + //"border", not supported in HTML5 + "charset", + "checked", + "cite", + //"class" already implemented in Tag.java + "cols", + "colspan", + "content", + //"contenteditable" global attribute, should be in Tag.java + "controls", + "coords", + "data", + "datetime", + "default", + "defer", + "dir", + "dirname", + //"disabled", manually implemented + //"download" manually implemented + //"draggable" global attribute, should be in Tag.java + "enctype", + "for", + //"form" manually implemented, + //"formaction" manually implemented + "headers", + "height", + "hidden", + "high", + "href", + "hreflang", + "http-equiv", + //"id" global attribute, should be in Tag.java + "ismap", + "kind", + "label", + //"lang" global attribute, should be in Tag.java + "list", + "loop", + "low", + "max", + "maxlength", + "media", + "method", + "min", + "multiple", + "muted", + "name", + "novalidate", + "onabort", + "onafterprint", + "onbeforeprint", + "onbeforeunload", + "onblur", + "oncanplay", + "oncanplaythrough", + /* a bunch of event attributes that are on all visible elements (so should be in Tag.java) + "onchange", "" + + */ + "ondurationchange", + "onemptied", + "onended", + "onerror", + //"onfocus" global attribute + "onhashchange", + // ... a bunch of event attributes visible on all elements + "onload", + "onloadeddata", + "onloadedmetadata", + "onloadstart", + // ... a bunch of event attributes visible on all elements + "onoffline", + "ononline", + "onpagehide", + "onpageshow", + //"onpaste" global attribute + "onpause", + "onplay", + "onplaying", + "onpopstate", + "onprogress", + "onratechange", + "onreset", + "onresize", + "onscroll", + "onsearch", + "onseeked", + "onseeking", + "onselect", + "onstalled", + "onstorage", + "onsubmit", + "onsuspend", + "ontimeupdate", + "ontoggle", + "onunload", + "onvolumechanged", + "onwaiting", + "onwheel", + "open", + "optimum", + "pattern", + "placeholder", + "poster", + "preload", + "readonly", + "rel", + "required", + "reversed", + "rows", + "rowspan", + "sandbox", + "scope", + "selected", + "shape", + "size", + "sizes", + "span", + "spellcheck", + "src", + "srcdoc", + "srclang", + "srcset", + "start", + "step", + //"style", global attribute + //"tabindex", global attribute + "target", + //"title", global attribute + //"translate" global attribute + "type", + "usemap", + "value", + "width", + "wrap" ); } } diff --git a/src/main/java/j2html/tags/generators/SpecializedTagClassCodeGenerator.java b/src/main/java/j2html/tags/generators/SpecializedTagClassCodeGenerator.java index ca902aab..4179254d 100644 --- a/src/main/java/j2html/tags/generators/SpecializedTagClassCodeGenerator.java +++ b/src/main/java/j2html/tags/generators/SpecializedTagClassCodeGenerator.java @@ -20,7 +20,6 @@ public static void main(String[] args) { mainInner(false); }catch (Exception ignored){} } - public static String classNameFromTag(String tageNameLowerCase){ String res = tageNameLowerCase.substring(0,1).toUpperCase()+tageNameLowerCase.substring(1); return res + "Tag"; From 77c26726a365c6b6d33d4873c589a5d1751d85c9 Mon Sep 17 00:00:00 2001 From: pointbazaar Date: Sun, 23 Aug 2020 18:24:40 +0200 Subject: [PATCH 04/19] generate some attribute specific interfaces --- src/main/java/j2html/TagCreator.java | 46 ++--- .../java/j2html/tags/attributes/IAccept.java | 7 +- .../j2html/tags/attributes/IAccesskey.java | 10 ++ .../java/j2html/tags/attributes/IAction.java | 10 ++ .../java/j2html/tags/attributes/IAlt.java | 10 ++ .../java/j2html/tags/attributes/IAsync.java | 10 ++ .../j2html/tags/attributes/IAutocomplete.java | 10 ++ .../j2html/tags/attributes/IAutofocus.java | 10 ++ .../j2html/tags/attributes/IAutoplay.java | 10 ++ .../java/j2html/tags/attributes/ICharset.java | 10 ++ .../java/j2html/tags/attributes/IChecked.java | 10 ++ .../java/j2html/tags/attributes/ICite.java | 10 ++ .../java/j2html/tags/attributes/ICols.java | 10 ++ .../java/j2html/tags/attributes/IColspan.java | 10 ++ .../java/j2html/tags/attributes/IContent.java | 10 ++ .../j2html/tags/attributes/IControls.java | 10 ++ .../java/j2html/tags/attributes/ICoords.java | 10 ++ .../java/j2html/tags/attributes/IData.java | 10 ++ .../j2html/tags/attributes/IDatetime.java | 10 ++ .../java/j2html/tags/attributes/IDefault.java | 10 ++ .../java/j2html/tags/attributes/IDefer.java | 10 ++ .../java/j2html/tags/attributes/IDir.java | 10 ++ .../java/j2html/tags/attributes/IDirname.java | 10 ++ .../j2html/tags/attributes/IDisabled.java | 4 +- .../j2html/tags/attributes/IDownload.java | 2 +- .../java/j2html/tags/attributes/IEnctype.java | 10 ++ .../java/j2html/tags/attributes/IFor.java | 10 ++ .../java/j2html/tags/attributes/IForm.java | 6 +- .../j2html/tags/attributes/IFormAction.java | 2 +- .../j2html/tags/attributes/IFormaction.java | 10 ++ .../java/j2html/tags/attributes/IHeaders.java | 10 ++ .../java/j2html/tags/attributes/IHeight.java | 10 ++ .../java/j2html/tags/attributes/IHidden.java | 10 ++ .../java/j2html/tags/attributes/IHigh.java | 10 ++ .../java/j2html/tags/attributes/IHref.java | 10 ++ .../j2html/tags/attributes/IHreflang.java | 10 ++ .../j2html/tags/attributes/IInstance.java | 4 +- .../java/j2html/tags/attributes/IIsmap.java | 10 ++ .../java/j2html/tags/attributes/IKind.java | 10 ++ .../java/j2html/tags/attributes/ILabel.java | 10 ++ .../java/j2html/tags/attributes/IList.java | 10 ++ .../java/j2html/tags/attributes/ILoop.java | 10 ++ .../java/j2html/tags/attributes/ILow.java | 10 ++ .../java/j2html/tags/attributes/IMax.java | 10 ++ .../j2html/tags/attributes/IMaxlength.java | 10 ++ .../java/j2html/tags/attributes/IMedia.java | 10 ++ .../java/j2html/tags/attributes/IMethod.java | 10 ++ .../java/j2html/tags/attributes/IMin.java | 10 ++ .../j2html/tags/attributes/IMultiple.java | 10 ++ .../java/j2html/tags/attributes/IMuted.java | 10 ++ .../java/j2html/tags/attributes/IName.java | 10 ++ .../j2html/tags/attributes/INovalidate.java | 10 ++ .../java/j2html/tags/attributes/IOnabort.java | 10 ++ .../j2html/tags/attributes/IOnafterprint.java | 10 ++ .../tags/attributes/IOnbeforeprint.java | 10 ++ .../tags/attributes/IOnbeforeunload.java | 10 ++ .../java/j2html/tags/attributes/IOnblur.java | 10 ++ .../j2html/tags/attributes/IOncanplay.java | 10 ++ .../tags/attributes/IOncanplaythrough.java | 10 ++ .../tags/attributes/IOndurationchange.java | 10 ++ .../j2html/tags/attributes/IOnemptied.java | 10 ++ .../java/j2html/tags/attributes/IOnended.java | 10 ++ .../java/j2html/tags/attributes/IOnerror.java | 10 ++ .../j2html/tags/attributes/IOnhashchange.java | 10 ++ .../java/j2html/tags/attributes/IOnload.java | 10 ++ .../j2html/tags/attributes/IOnloadeddata.java | 10 ++ .../tags/attributes/IOnloadedmetadata.java | 10 ++ .../j2html/tags/attributes/IOnloadstart.java | 10 ++ .../j2html/tags/attributes/IOnoffline.java | 10 ++ .../j2html/tags/attributes/IOnonline.java | 10 ++ .../j2html/tags/attributes/IOnpagehide.java | 10 ++ .../j2html/tags/attributes/IOnpageshow.java | 10 ++ .../java/j2html/tags/attributes/IOnpause.java | 10 ++ .../java/j2html/tags/attributes/IOnplay.java | 10 ++ .../j2html/tags/attributes/IOnplaying.java | 10 ++ .../j2html/tags/attributes/IOnpopstate.java | 10 ++ .../j2html/tags/attributes/IOnprogress.java | 10 ++ .../j2html/tags/attributes/IOnratechange.java | 10 ++ .../java/j2html/tags/attributes/IOnreset.java | 10 ++ .../j2html/tags/attributes/IOnresize.java | 10 ++ .../j2html/tags/attributes/IOnscroll.java | 10 ++ .../j2html/tags/attributes/IOnsearch.java | 10 ++ .../j2html/tags/attributes/IOnseeked.java | 10 ++ .../j2html/tags/attributes/IOnseeking.java | 10 ++ .../j2html/tags/attributes/IOnselect.java | 10 ++ .../j2html/tags/attributes/IOnstalled.java | 10 ++ .../j2html/tags/attributes/IOnstorage.java | 10 ++ .../j2html/tags/attributes/IOnsubmit.java | 10 ++ .../j2html/tags/attributes/IOnsuspend.java | 10 ++ .../j2html/tags/attributes/IOntimeupdate.java | 10 ++ .../j2html/tags/attributes/IOntoggle.java | 10 ++ .../j2html/tags/attributes/IOnunload.java | 10 ++ .../tags/attributes/IOnvolumechanged.java | 10 ++ .../j2html/tags/attributes/IOnwaiting.java | 10 ++ .../java/j2html/tags/attributes/IOnwheel.java | 10 ++ .../java/j2html/tags/attributes/IOpen.java | 10 ++ .../java/j2html/tags/attributes/IOptimum.java | 10 ++ .../java/j2html/tags/attributes/IPattern.java | 10 ++ .../j2html/tags/attributes/IPlaceholder.java | 10 ++ .../java/j2html/tags/attributes/IPoster.java | 10 ++ .../java/j2html/tags/attributes/IPreload.java | 10 ++ .../j2html/tags/attributes/IReadonly.java | 10 ++ .../java/j2html/tags/attributes/IRel.java | 10 ++ .../j2html/tags/attributes/IRequired.java | 10 ++ .../j2html/tags/attributes/IReversed.java | 10 ++ .../java/j2html/tags/attributes/IRows.java | 10 ++ .../java/j2html/tags/attributes/IRowspan.java | 10 ++ .../java/j2html/tags/attributes/ISandbox.java | 10 ++ .../java/j2html/tags/attributes/IScope.java | 10 ++ .../j2html/tags/attributes/ISelected.java | 10 ++ .../java/j2html/tags/attributes/IShape.java | 10 ++ .../java/j2html/tags/attributes/ISize.java | 10 ++ .../java/j2html/tags/attributes/ISizes.java | 10 ++ .../java/j2html/tags/attributes/ISpan.java | 10 ++ .../j2html/tags/attributes/ISpellcheck.java | 10 ++ .../java/j2html/tags/attributes/ISrc.java | 10 ++ .../java/j2html/tags/attributes/ISrcdoc.java | 10 ++ .../java/j2html/tags/attributes/ISrclang.java | 10 ++ .../java/j2html/tags/attributes/ISrcset.java | 10 ++ .../java/j2html/tags/attributes/IStart.java | 10 ++ .../java/j2html/tags/attributes/IStep.java | 10 ++ .../java/j2html/tags/attributes/ITarget.java | 10 ++ .../java/j2html/tags/attributes/IType.java | 6 +- .../java/j2html/tags/attributes/IUsemap.java | 10 ++ .../java/j2html/tags/attributes/IValue.java | 6 +- .../java/j2html/tags/attributes/IWidth.java | 10 ++ .../java/j2html/tags/attributes/IWrap.java | 10 ++ .../AttributeInterfaceCodeGenerator.java | 160 +----------------- .../tags/generators/AttributesList.java | 159 +++++++++++++++++ 129 files changed, 1384 insertions(+), 198 deletions(-) create mode 100644 src/main/java/j2html/tags/attributes/IAccesskey.java create mode 100644 src/main/java/j2html/tags/attributes/IAction.java create mode 100644 src/main/java/j2html/tags/attributes/IAlt.java create mode 100644 src/main/java/j2html/tags/attributes/IAsync.java create mode 100644 src/main/java/j2html/tags/attributes/IAutocomplete.java create mode 100644 src/main/java/j2html/tags/attributes/IAutofocus.java create mode 100644 src/main/java/j2html/tags/attributes/IAutoplay.java create mode 100644 src/main/java/j2html/tags/attributes/ICharset.java create mode 100644 src/main/java/j2html/tags/attributes/IChecked.java create mode 100644 src/main/java/j2html/tags/attributes/ICite.java create mode 100644 src/main/java/j2html/tags/attributes/ICols.java create mode 100644 src/main/java/j2html/tags/attributes/IColspan.java create mode 100644 src/main/java/j2html/tags/attributes/IContent.java create mode 100644 src/main/java/j2html/tags/attributes/IControls.java create mode 100644 src/main/java/j2html/tags/attributes/ICoords.java create mode 100644 src/main/java/j2html/tags/attributes/IData.java create mode 100644 src/main/java/j2html/tags/attributes/IDatetime.java create mode 100644 src/main/java/j2html/tags/attributes/IDefault.java create mode 100644 src/main/java/j2html/tags/attributes/IDefer.java create mode 100644 src/main/java/j2html/tags/attributes/IDir.java create mode 100644 src/main/java/j2html/tags/attributes/IDirname.java create mode 100644 src/main/java/j2html/tags/attributes/IEnctype.java create mode 100644 src/main/java/j2html/tags/attributes/IFor.java create mode 100644 src/main/java/j2html/tags/attributes/IFormaction.java create mode 100644 src/main/java/j2html/tags/attributes/IHeaders.java create mode 100644 src/main/java/j2html/tags/attributes/IHeight.java create mode 100644 src/main/java/j2html/tags/attributes/IHidden.java create mode 100644 src/main/java/j2html/tags/attributes/IHigh.java create mode 100644 src/main/java/j2html/tags/attributes/IHref.java create mode 100644 src/main/java/j2html/tags/attributes/IHreflang.java create mode 100644 src/main/java/j2html/tags/attributes/IIsmap.java create mode 100644 src/main/java/j2html/tags/attributes/IKind.java create mode 100644 src/main/java/j2html/tags/attributes/ILabel.java create mode 100644 src/main/java/j2html/tags/attributes/IList.java create mode 100644 src/main/java/j2html/tags/attributes/ILoop.java create mode 100644 src/main/java/j2html/tags/attributes/ILow.java create mode 100644 src/main/java/j2html/tags/attributes/IMax.java create mode 100644 src/main/java/j2html/tags/attributes/IMaxlength.java create mode 100644 src/main/java/j2html/tags/attributes/IMedia.java create mode 100644 src/main/java/j2html/tags/attributes/IMethod.java create mode 100644 src/main/java/j2html/tags/attributes/IMin.java create mode 100644 src/main/java/j2html/tags/attributes/IMultiple.java create mode 100644 src/main/java/j2html/tags/attributes/IMuted.java create mode 100644 src/main/java/j2html/tags/attributes/IName.java create mode 100644 src/main/java/j2html/tags/attributes/INovalidate.java create mode 100644 src/main/java/j2html/tags/attributes/IOnabort.java create mode 100644 src/main/java/j2html/tags/attributes/IOnafterprint.java create mode 100644 src/main/java/j2html/tags/attributes/IOnbeforeprint.java create mode 100644 src/main/java/j2html/tags/attributes/IOnbeforeunload.java create mode 100644 src/main/java/j2html/tags/attributes/IOnblur.java create mode 100644 src/main/java/j2html/tags/attributes/IOncanplay.java create mode 100644 src/main/java/j2html/tags/attributes/IOncanplaythrough.java create mode 100644 src/main/java/j2html/tags/attributes/IOndurationchange.java create mode 100644 src/main/java/j2html/tags/attributes/IOnemptied.java create mode 100644 src/main/java/j2html/tags/attributes/IOnended.java create mode 100644 src/main/java/j2html/tags/attributes/IOnerror.java create mode 100644 src/main/java/j2html/tags/attributes/IOnhashchange.java create mode 100644 src/main/java/j2html/tags/attributes/IOnload.java create mode 100644 src/main/java/j2html/tags/attributes/IOnloadeddata.java create mode 100644 src/main/java/j2html/tags/attributes/IOnloadedmetadata.java create mode 100644 src/main/java/j2html/tags/attributes/IOnloadstart.java create mode 100644 src/main/java/j2html/tags/attributes/IOnoffline.java create mode 100644 src/main/java/j2html/tags/attributes/IOnonline.java create mode 100644 src/main/java/j2html/tags/attributes/IOnpagehide.java create mode 100644 src/main/java/j2html/tags/attributes/IOnpageshow.java create mode 100644 src/main/java/j2html/tags/attributes/IOnpause.java create mode 100644 src/main/java/j2html/tags/attributes/IOnplay.java create mode 100644 src/main/java/j2html/tags/attributes/IOnplaying.java create mode 100644 src/main/java/j2html/tags/attributes/IOnpopstate.java create mode 100644 src/main/java/j2html/tags/attributes/IOnprogress.java create mode 100644 src/main/java/j2html/tags/attributes/IOnratechange.java create mode 100644 src/main/java/j2html/tags/attributes/IOnreset.java create mode 100644 src/main/java/j2html/tags/attributes/IOnresize.java create mode 100644 src/main/java/j2html/tags/attributes/IOnscroll.java create mode 100644 src/main/java/j2html/tags/attributes/IOnsearch.java create mode 100644 src/main/java/j2html/tags/attributes/IOnseeked.java create mode 100644 src/main/java/j2html/tags/attributes/IOnseeking.java create mode 100644 src/main/java/j2html/tags/attributes/IOnselect.java create mode 100644 src/main/java/j2html/tags/attributes/IOnstalled.java create mode 100644 src/main/java/j2html/tags/attributes/IOnstorage.java create mode 100644 src/main/java/j2html/tags/attributes/IOnsubmit.java create mode 100644 src/main/java/j2html/tags/attributes/IOnsuspend.java create mode 100644 src/main/java/j2html/tags/attributes/IOntimeupdate.java create mode 100644 src/main/java/j2html/tags/attributes/IOntoggle.java create mode 100644 src/main/java/j2html/tags/attributes/IOnunload.java create mode 100644 src/main/java/j2html/tags/attributes/IOnvolumechanged.java create mode 100644 src/main/java/j2html/tags/attributes/IOnwaiting.java create mode 100644 src/main/java/j2html/tags/attributes/IOnwheel.java create mode 100644 src/main/java/j2html/tags/attributes/IOpen.java create mode 100644 src/main/java/j2html/tags/attributes/IOptimum.java create mode 100644 src/main/java/j2html/tags/attributes/IPattern.java create mode 100644 src/main/java/j2html/tags/attributes/IPlaceholder.java create mode 100644 src/main/java/j2html/tags/attributes/IPoster.java create mode 100644 src/main/java/j2html/tags/attributes/IPreload.java create mode 100644 src/main/java/j2html/tags/attributes/IReadonly.java create mode 100644 src/main/java/j2html/tags/attributes/IRel.java create mode 100644 src/main/java/j2html/tags/attributes/IRequired.java create mode 100644 src/main/java/j2html/tags/attributes/IReversed.java create mode 100644 src/main/java/j2html/tags/attributes/IRows.java create mode 100644 src/main/java/j2html/tags/attributes/IRowspan.java create mode 100644 src/main/java/j2html/tags/attributes/ISandbox.java create mode 100644 src/main/java/j2html/tags/attributes/IScope.java create mode 100644 src/main/java/j2html/tags/attributes/ISelected.java create mode 100644 src/main/java/j2html/tags/attributes/IShape.java create mode 100644 src/main/java/j2html/tags/attributes/ISize.java create mode 100644 src/main/java/j2html/tags/attributes/ISizes.java create mode 100644 src/main/java/j2html/tags/attributes/ISpan.java create mode 100644 src/main/java/j2html/tags/attributes/ISpellcheck.java create mode 100644 src/main/java/j2html/tags/attributes/ISrc.java create mode 100644 src/main/java/j2html/tags/attributes/ISrcdoc.java create mode 100644 src/main/java/j2html/tags/attributes/ISrclang.java create mode 100644 src/main/java/j2html/tags/attributes/ISrcset.java create mode 100644 src/main/java/j2html/tags/attributes/IStart.java create mode 100644 src/main/java/j2html/tags/attributes/IStep.java create mode 100644 src/main/java/j2html/tags/attributes/ITarget.java create mode 100644 src/main/java/j2html/tags/attributes/IUsemap.java create mode 100644 src/main/java/j2html/tags/attributes/IWidth.java create mode 100644 src/main/java/j2html/tags/attributes/IWrap.java create mode 100644 src/main/java/j2html/tags/generators/AttributesList.java diff --git a/src/main/java/j2html/TagCreator.java b/src/main/java/j2html/TagCreator.java index 738e9819..abbd10a0 100644 --- a/src/main/java/j2html/TagCreator.java +++ b/src/main/java/j2html/TagCreator.java @@ -269,6 +269,30 @@ public static BodyTag body(Attr.ShortForm shortAttr, DomContent... dc) { return (BodyTag)Attr.addTo(new BodyTag().with(dc), shortAttr); } + public static HeadTag head() { + return new HeadTag(); + } + + public static HeadTag head(String text) { + return (HeadTag)new HeadTag().withText(text); + } + + public static HeadTag head(DomContent... dc) { + return (HeadTag)new HeadTag().with(dc); + } + + public static HeadTag head(Attr.ShortForm shortAttr) { + return (HeadTag)Attr.addTo(new HeadTag(), shortAttr); + } + + public static HeadTag head(Attr.ShortForm shortAttr, String text) { + return (HeadTag)Attr.addTo(new HeadTag().withText(text), shortAttr); + } + + public static HeadTag head(Attr.ShortForm shortAttr, DomContent... dc) { + return (HeadTag)Attr.addTo(new HeadTag().with(dc), shortAttr); + } + // -- end of manually managed tags -- @@ -1284,29 +1308,7 @@ public static ContainerTag h6(Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo(new ContainerTag("h6").with(dc), shortAttr); } - public static HeadTag head() { - return new HeadTag(); - } - - public static HeadTag head(String text) { - return (HeadTag)new HeadTag().withText(text); - } - - public static HeadTag head(DomContent... dc) { - return (HeadTag)new HeadTag().with(dc); - } - public static HeadTag head(Attr.ShortForm shortAttr) { - return (HeadTag)Attr.addTo(new HeadTag(), shortAttr); - } - - public static HeadTag head(Attr.ShortForm shortAttr, String text) { - return (HeadTag)Attr.addTo(new HeadTag().withText(text), shortAttr); - } - - public static HeadTag head(Attr.ShortForm shortAttr, DomContent... dc) { - return (HeadTag)Attr.addTo(new HeadTag().with(dc), shortAttr); - } public static ContainerTag header() { return new ContainerTag("header"); diff --git a/src/main/java/j2html/tags/attributes/IAccept.java b/src/main/java/j2html/tags/attributes/IAccept.java index f4ca0a45..dee0b127 100644 --- a/src/main/java/j2html/tags/attributes/IAccept.java +++ b/src/main/java/j2html/tags/attributes/IAccept.java @@ -1,13 +1,10 @@ package j2html.tags.attributes; -import j2html.tags.EmptyTag; import j2html.tags.Tag; - public interface IAccept extends IInstance { - - public default T withAccept(String accept){ - get().attr("accept", accept); + default T withAccept(final String accept_) { + get().attr("accept", accept_); return get(); } } diff --git a/src/main/java/j2html/tags/attributes/IAccesskey.java b/src/main/java/j2html/tags/attributes/IAccesskey.java new file mode 100644 index 00000000..5bd764ab --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IAccesskey.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IAccesskey extends IInstance { + default T withAccesskey(final String accesskey_) { + get().attr("accesskey", accesskey_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IAction.java b/src/main/java/j2html/tags/attributes/IAction.java new file mode 100644 index 00000000..bc2611b4 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IAction.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IAction extends IInstance { + default T withAction(final String action_) { + get().attr("action", action_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IAlt.java b/src/main/java/j2html/tags/attributes/IAlt.java new file mode 100644 index 00000000..d27967fb --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IAlt.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IAlt extends IInstance { + default T withAlt(final String alt_) { + get().attr("alt", alt_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IAsync.java b/src/main/java/j2html/tags/attributes/IAsync.java new file mode 100644 index 00000000..cd00ae17 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IAsync.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IAsync extends IInstance { + default T withAsync(final String async_) { + get().attr("async", async_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IAutocomplete.java b/src/main/java/j2html/tags/attributes/IAutocomplete.java new file mode 100644 index 00000000..407ef04e --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IAutocomplete.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IAutocomplete extends IInstance { + default T withAutocomplete(final String autocomplete_) { + get().attr("autocomplete", autocomplete_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IAutofocus.java b/src/main/java/j2html/tags/attributes/IAutofocus.java new file mode 100644 index 00000000..38cb872d --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IAutofocus.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IAutofocus extends IInstance { + default T withAutofocus(final String autofocus_) { + get().attr("autofocus", autofocus_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IAutoplay.java b/src/main/java/j2html/tags/attributes/IAutoplay.java new file mode 100644 index 00000000..313b5a42 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IAutoplay.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IAutoplay extends IInstance { + default T withAutoplay(final String autoplay_) { + get().attr("autoplay", autoplay_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/ICharset.java b/src/main/java/j2html/tags/attributes/ICharset.java new file mode 100644 index 00000000..4a813024 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/ICharset.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface ICharset extends IInstance { + default T withCharset(final String charset_) { + get().attr("charset", charset_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IChecked.java b/src/main/java/j2html/tags/attributes/IChecked.java new file mode 100644 index 00000000..7422833d --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IChecked.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IChecked extends IInstance { + default T withChecked(final String checked_) { + get().attr("checked", checked_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/ICite.java b/src/main/java/j2html/tags/attributes/ICite.java new file mode 100644 index 00000000..a12629e9 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/ICite.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface ICite extends IInstance { + default T withCite(final String cite_) { + get().attr("cite", cite_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/ICols.java b/src/main/java/j2html/tags/attributes/ICols.java new file mode 100644 index 00000000..360b4376 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/ICols.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface ICols extends IInstance { + default T withCols(final String cols_) { + get().attr("cols", cols_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IColspan.java b/src/main/java/j2html/tags/attributes/IColspan.java new file mode 100644 index 00000000..0352c2aa --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IColspan.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IColspan extends IInstance { + default T withColspan(final String colspan_) { + get().attr("colspan", colspan_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IContent.java b/src/main/java/j2html/tags/attributes/IContent.java new file mode 100644 index 00000000..8b2488cd --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IContent.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IContent extends IInstance { + default T withContent(final String content_) { + get().attr("content", content_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IControls.java b/src/main/java/j2html/tags/attributes/IControls.java new file mode 100644 index 00000000..b8d726db --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IControls.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IControls extends IInstance { + default T withControls(final String controls_) { + get().attr("controls", controls_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/ICoords.java b/src/main/java/j2html/tags/attributes/ICoords.java new file mode 100644 index 00000000..4cc331c1 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/ICoords.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface ICoords extends IInstance { + default T withCoords(final String coords_) { + get().attr("coords", coords_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IData.java b/src/main/java/j2html/tags/attributes/IData.java new file mode 100644 index 00000000..be87d711 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IData.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IData extends IInstance { + default T withData(final String data_) { + get().attr("data", data_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IDatetime.java b/src/main/java/j2html/tags/attributes/IDatetime.java new file mode 100644 index 00000000..c95e5558 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IDatetime.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IDatetime extends IInstance { + default T withDatetime(final String datetime_) { + get().attr("datetime", datetime_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IDefault.java b/src/main/java/j2html/tags/attributes/IDefault.java new file mode 100644 index 00000000..6677f46d --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IDefault.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IDefault extends IInstance { + default T withDefault(final String default_) { + get().attr("default", default_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IDefer.java b/src/main/java/j2html/tags/attributes/IDefer.java new file mode 100644 index 00000000..3ffdbdcb --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IDefer.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IDefer extends IInstance { + default T withDefer(final String defer_) { + get().attr("defer", defer_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IDir.java b/src/main/java/j2html/tags/attributes/IDir.java new file mode 100644 index 00000000..32438877 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IDir.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IDir extends IInstance { + default T withDir(final String dir_) { + get().attr("dir", dir_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IDirname.java b/src/main/java/j2html/tags/attributes/IDirname.java new file mode 100644 index 00000000..4d870470 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IDirname.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IDirname extends IInstance { + default T withDirname(final String dirname_) { + get().attr("dirname", dirname_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IDisabled.java b/src/main/java/j2html/tags/attributes/IDisabled.java index c67e9935..d6e54f87 100644 --- a/src/main/java/j2html/tags/attributes/IDisabled.java +++ b/src/main/java/j2html/tags/attributes/IDisabled.java @@ -4,8 +4,8 @@ public interface IDisabled extends IInstance { - public default T withDisabled(boolean isDisabled){ - if(isDisabled){ + default T withDisabled(boolean isDisabled) { + if (isDisabled) { get().attr("disabled"); } return get(); diff --git a/src/main/java/j2html/tags/attributes/IDownload.java b/src/main/java/j2html/tags/attributes/IDownload.java index e10b01f4..b0dabe3d 100644 --- a/src/main/java/j2html/tags/attributes/IDownload.java +++ b/src/main/java/j2html/tags/attributes/IDownload.java @@ -5,7 +5,7 @@ public interface IDownload extends IInstance { - public default T withDownload(){ + default T withDownload() { get().attr("download"); return get(); } diff --git a/src/main/java/j2html/tags/attributes/IEnctype.java b/src/main/java/j2html/tags/attributes/IEnctype.java new file mode 100644 index 00000000..bf3dcb48 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IEnctype.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IEnctype extends IInstance { + default T withEnctype(final String enctype_) { + get().attr("enctype", enctype_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IFor.java b/src/main/java/j2html/tags/attributes/IFor.java new file mode 100644 index 00000000..a14cc461 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IFor.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IFor extends IInstance { + default T withFor(final String for_) { + get().attr("for", for_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IForm.java b/src/main/java/j2html/tags/attributes/IForm.java index f47af0fd..aca53b78 100644 --- a/src/main/java/j2html/tags/attributes/IForm.java +++ b/src/main/java/j2html/tags/attributes/IForm.java @@ -1,12 +1,10 @@ package j2html.tags.attributes; -import j2html.tags.EmptyTag; import j2html.tags.Tag; public interface IForm extends IInstance { - - public default T withForm(String formId){ - get().attr("form",formId); + default T withForm(final String form_) { + get().attr("form", form_); return get(); } } diff --git a/src/main/java/j2html/tags/attributes/IFormAction.java b/src/main/java/j2html/tags/attributes/IFormAction.java index e8c3c96f..78678d08 100644 --- a/src/main/java/j2html/tags/attributes/IFormAction.java +++ b/src/main/java/j2html/tags/attributes/IFormAction.java @@ -5,7 +5,7 @@ public interface IFormAction extends IInstance { - public default T withFormAction(String formAction){ + default T withFormAction(String formAction) { get().attr("formaction", formAction); return get(); } diff --git a/src/main/java/j2html/tags/attributes/IFormaction.java b/src/main/java/j2html/tags/attributes/IFormaction.java new file mode 100644 index 00000000..f306d5b9 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IFormaction.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IFormaction extends IInstance { + default T withFormaction(final String formaction_) { + get().attr("formaction", formaction_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IHeaders.java b/src/main/java/j2html/tags/attributes/IHeaders.java new file mode 100644 index 00000000..8d9cc129 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IHeaders.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IHeaders extends IInstance { + default T withHeaders(final String headers_) { + get().attr("headers", headers_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IHeight.java b/src/main/java/j2html/tags/attributes/IHeight.java new file mode 100644 index 00000000..3afc8d41 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IHeight.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IHeight extends IInstance { + default T withHeight(final String height_) { + get().attr("height", height_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IHidden.java b/src/main/java/j2html/tags/attributes/IHidden.java new file mode 100644 index 00000000..dfe71376 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IHidden.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IHidden extends IInstance { + default T withHidden(final String hidden_) { + get().attr("hidden", hidden_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IHigh.java b/src/main/java/j2html/tags/attributes/IHigh.java new file mode 100644 index 00000000..7ef98cf6 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IHigh.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IHigh extends IInstance { + default T withHigh(final String high_) { + get().attr("high", high_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IHref.java b/src/main/java/j2html/tags/attributes/IHref.java new file mode 100644 index 00000000..2ffc018f --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IHref.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IHref extends IInstance { + default T withHref(final String href_) { + get().attr("href", href_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IHreflang.java b/src/main/java/j2html/tags/attributes/IHreflang.java new file mode 100644 index 00000000..32e2d82c --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IHreflang.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IHreflang extends IInstance { + default T withHreflang(final String hreflang_) { + get().attr("hreflang", hreflang_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IInstance.java b/src/main/java/j2html/tags/attributes/IInstance.java index d0e89e5a..255e7027 100644 --- a/src/main/java/j2html/tags/attributes/IInstance.java +++ b/src/main/java/j2html/tags/attributes/IInstance.java @@ -8,12 +8,12 @@ public interface IInstance { // this method shows up in autocomplete. // this is really undesireable as it does not do anything. - default T get(){ + default T get() { //we know that the implementing class will supply //its own type as the type argument. //therefore every instance of IInstance can assume it //is also of type T - return (T)this; + return (T) this; } } diff --git a/src/main/java/j2html/tags/attributes/IIsmap.java b/src/main/java/j2html/tags/attributes/IIsmap.java new file mode 100644 index 00000000..fdae2e61 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IIsmap.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IIsmap extends IInstance { + default T withIsmap(final String ismap_) { + get().attr("ismap", ismap_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IKind.java b/src/main/java/j2html/tags/attributes/IKind.java new file mode 100644 index 00000000..9b105ba0 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IKind.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IKind extends IInstance { + default T withKind(final String kind_) { + get().attr("kind", kind_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/ILabel.java b/src/main/java/j2html/tags/attributes/ILabel.java new file mode 100644 index 00000000..a2f29828 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/ILabel.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface ILabel extends IInstance { + default T withLabel(final String label_) { + get().attr("label", label_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IList.java b/src/main/java/j2html/tags/attributes/IList.java new file mode 100644 index 00000000..29db3712 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IList.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IList extends IInstance { + default T withList(final String list_) { + get().attr("list", list_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/ILoop.java b/src/main/java/j2html/tags/attributes/ILoop.java new file mode 100644 index 00000000..d2d8bc6f --- /dev/null +++ b/src/main/java/j2html/tags/attributes/ILoop.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface ILoop extends IInstance { + default T withLoop(final String loop_) { + get().attr("loop", loop_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/ILow.java b/src/main/java/j2html/tags/attributes/ILow.java new file mode 100644 index 00000000..47192c26 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/ILow.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface ILow extends IInstance { + default T withLow(final String low_) { + get().attr("low", low_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IMax.java b/src/main/java/j2html/tags/attributes/IMax.java new file mode 100644 index 00000000..925b15ad --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IMax.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IMax extends IInstance { + default T withMax(final String max_) { + get().attr("max", max_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IMaxlength.java b/src/main/java/j2html/tags/attributes/IMaxlength.java new file mode 100644 index 00000000..c8002685 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IMaxlength.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IMaxlength extends IInstance { + default T withMaxlength(final String maxlength_) { + get().attr("maxlength", maxlength_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IMedia.java b/src/main/java/j2html/tags/attributes/IMedia.java new file mode 100644 index 00000000..5c52ed54 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IMedia.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IMedia extends IInstance { + default T withMedia(final String media_) { + get().attr("media", media_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IMethod.java b/src/main/java/j2html/tags/attributes/IMethod.java new file mode 100644 index 00000000..f599a1bc --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IMethod.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IMethod extends IInstance { + default T withMethod(final String method_) { + get().attr("method", method_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IMin.java b/src/main/java/j2html/tags/attributes/IMin.java new file mode 100644 index 00000000..6b87d43d --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IMin.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IMin extends IInstance { + default T withMin(final String min_) { + get().attr("min", min_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IMultiple.java b/src/main/java/j2html/tags/attributes/IMultiple.java new file mode 100644 index 00000000..f861bfc1 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IMultiple.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IMultiple extends IInstance { + default T withMultiple(final String multiple_) { + get().attr("multiple", multiple_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IMuted.java b/src/main/java/j2html/tags/attributes/IMuted.java new file mode 100644 index 00000000..4b1a72e4 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IMuted.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IMuted extends IInstance { + default T withMuted(final String muted_) { + get().attr("muted", muted_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IName.java b/src/main/java/j2html/tags/attributes/IName.java new file mode 100644 index 00000000..564ec01a --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IName.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IName extends IInstance { + default T withName(final String name_) { + get().attr("name", name_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/INovalidate.java b/src/main/java/j2html/tags/attributes/INovalidate.java new file mode 100644 index 00000000..fefc7174 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/INovalidate.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface INovalidate extends IInstance { + default T withNovalidate(final String novalidate_) { + get().attr("novalidate", novalidate_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnabort.java b/src/main/java/j2html/tags/attributes/IOnabort.java new file mode 100644 index 00000000..7046c355 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnabort.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnabort extends IInstance { + default T withOnabort(final String onabort_) { + get().attr("onabort", onabort_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnafterprint.java b/src/main/java/j2html/tags/attributes/IOnafterprint.java new file mode 100644 index 00000000..d4a39d02 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnafterprint.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnafterprint extends IInstance { + default T withOnafterprint(final String onafterprint_) { + get().attr("onafterprint", onafterprint_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnbeforeprint.java b/src/main/java/j2html/tags/attributes/IOnbeforeprint.java new file mode 100644 index 00000000..c66490c7 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnbeforeprint.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnbeforeprint extends IInstance { + default T withOnbeforeprint(final String onbeforeprint_) { + get().attr("onbeforeprint", onbeforeprint_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnbeforeunload.java b/src/main/java/j2html/tags/attributes/IOnbeforeunload.java new file mode 100644 index 00000000..5d02d863 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnbeforeunload.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnbeforeunload extends IInstance { + default T withOnbeforeunload(final String onbeforeunload_) { + get().attr("onbeforeunload", onbeforeunload_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnblur.java b/src/main/java/j2html/tags/attributes/IOnblur.java new file mode 100644 index 00000000..ed3e2dfd --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnblur.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnblur extends IInstance { + default T withOnblur(final String onblur_) { + get().attr("onblur", onblur_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOncanplay.java b/src/main/java/j2html/tags/attributes/IOncanplay.java new file mode 100644 index 00000000..80a8eb43 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOncanplay.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOncanplay extends IInstance { + default T withOncanplay(final String oncanplay_) { + get().attr("oncanplay", oncanplay_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOncanplaythrough.java b/src/main/java/j2html/tags/attributes/IOncanplaythrough.java new file mode 100644 index 00000000..57f7ad25 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOncanplaythrough.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOncanplaythrough extends IInstance { + default T withOncanplaythrough(final String oncanplaythrough_) { + get().attr("oncanplaythrough", oncanplaythrough_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOndurationchange.java b/src/main/java/j2html/tags/attributes/IOndurationchange.java new file mode 100644 index 00000000..867da2a0 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOndurationchange.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOndurationchange extends IInstance { + default T withOndurationchange(final String ondurationchange_) { + get().attr("ondurationchange", ondurationchange_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnemptied.java b/src/main/java/j2html/tags/attributes/IOnemptied.java new file mode 100644 index 00000000..71a904a6 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnemptied.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnemptied extends IInstance { + default T withOnemptied(final String onemptied_) { + get().attr("onemptied", onemptied_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnended.java b/src/main/java/j2html/tags/attributes/IOnended.java new file mode 100644 index 00000000..42a6db4b --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnended.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnended extends IInstance { + default T withOnended(final String onended_) { + get().attr("onended", onended_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnerror.java b/src/main/java/j2html/tags/attributes/IOnerror.java new file mode 100644 index 00000000..029d60b2 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnerror.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnerror extends IInstance { + default T withOnerror(final String onerror_) { + get().attr("onerror", onerror_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnhashchange.java b/src/main/java/j2html/tags/attributes/IOnhashchange.java new file mode 100644 index 00000000..1b6a73b7 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnhashchange.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnhashchange extends IInstance { + default T withOnhashchange(final String onhashchange_) { + get().attr("onhashchange", onhashchange_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnload.java b/src/main/java/j2html/tags/attributes/IOnload.java new file mode 100644 index 00000000..9f98a5df --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnload.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnload extends IInstance { + default T withOnload(final String onload_) { + get().attr("onload", onload_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnloadeddata.java b/src/main/java/j2html/tags/attributes/IOnloadeddata.java new file mode 100644 index 00000000..c8e72ee2 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnloadeddata.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnloadeddata extends IInstance { + default T withOnloadeddata(final String onloadeddata_) { + get().attr("onloadeddata", onloadeddata_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnloadedmetadata.java b/src/main/java/j2html/tags/attributes/IOnloadedmetadata.java new file mode 100644 index 00000000..031050eb --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnloadedmetadata.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnloadedmetadata extends IInstance { + default T withOnloadedmetadata(final String onloadedmetadata_) { + get().attr("onloadedmetadata", onloadedmetadata_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnloadstart.java b/src/main/java/j2html/tags/attributes/IOnloadstart.java new file mode 100644 index 00000000..27f7f41e --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnloadstart.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnloadstart extends IInstance { + default T withOnloadstart(final String onloadstart_) { + get().attr("onloadstart", onloadstart_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnoffline.java b/src/main/java/j2html/tags/attributes/IOnoffline.java new file mode 100644 index 00000000..b56dbf57 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnoffline.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnoffline extends IInstance { + default T withOnoffline(final String onoffline_) { + get().attr("onoffline", onoffline_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnonline.java b/src/main/java/j2html/tags/attributes/IOnonline.java new file mode 100644 index 00000000..6b3420b0 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnonline.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnonline extends IInstance { + default T withOnonline(final String ononline_) { + get().attr("ononline", ononline_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnpagehide.java b/src/main/java/j2html/tags/attributes/IOnpagehide.java new file mode 100644 index 00000000..144b2f51 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnpagehide.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnpagehide extends IInstance { + default T withOnpagehide(final String onpagehide_) { + get().attr("onpagehide", onpagehide_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnpageshow.java b/src/main/java/j2html/tags/attributes/IOnpageshow.java new file mode 100644 index 00000000..486bc7dc --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnpageshow.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnpageshow extends IInstance { + default T withOnpageshow(final String onpageshow_) { + get().attr("onpageshow", onpageshow_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnpause.java b/src/main/java/j2html/tags/attributes/IOnpause.java new file mode 100644 index 00000000..178ed334 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnpause.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnpause extends IInstance { + default T withOnpause(final String onpause_) { + get().attr("onpause", onpause_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnplay.java b/src/main/java/j2html/tags/attributes/IOnplay.java new file mode 100644 index 00000000..4ab2777e --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnplay.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnplay extends IInstance { + default T withOnplay(final String onplay_) { + get().attr("onplay", onplay_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnplaying.java b/src/main/java/j2html/tags/attributes/IOnplaying.java new file mode 100644 index 00000000..d42ffa48 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnplaying.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnplaying extends IInstance { + default T withOnplaying(final String onplaying_) { + get().attr("onplaying", onplaying_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnpopstate.java b/src/main/java/j2html/tags/attributes/IOnpopstate.java new file mode 100644 index 00000000..8417921d --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnpopstate.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnpopstate extends IInstance { + default T withOnpopstate(final String onpopstate_) { + get().attr("onpopstate", onpopstate_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnprogress.java b/src/main/java/j2html/tags/attributes/IOnprogress.java new file mode 100644 index 00000000..96ccec78 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnprogress.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnprogress extends IInstance { + default T withOnprogress(final String onprogress_) { + get().attr("onprogress", onprogress_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnratechange.java b/src/main/java/j2html/tags/attributes/IOnratechange.java new file mode 100644 index 00000000..7a07dc7e --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnratechange.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnratechange extends IInstance { + default T withOnratechange(final String onratechange_) { + get().attr("onratechange", onratechange_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnreset.java b/src/main/java/j2html/tags/attributes/IOnreset.java new file mode 100644 index 00000000..0c6a062d --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnreset.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnreset extends IInstance { + default T withOnreset(final String onreset_) { + get().attr("onreset", onreset_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnresize.java b/src/main/java/j2html/tags/attributes/IOnresize.java new file mode 100644 index 00000000..d900224e --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnresize.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnresize extends IInstance { + default T withOnresize(final String onresize_) { + get().attr("onresize", onresize_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnscroll.java b/src/main/java/j2html/tags/attributes/IOnscroll.java new file mode 100644 index 00000000..9b5e70ba --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnscroll.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnscroll extends IInstance { + default T withOnscroll(final String onscroll_) { + get().attr("onscroll", onscroll_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnsearch.java b/src/main/java/j2html/tags/attributes/IOnsearch.java new file mode 100644 index 00000000..d10de27f --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnsearch.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnsearch extends IInstance { + default T withOnsearch(final String onsearch_) { + get().attr("onsearch", onsearch_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnseeked.java b/src/main/java/j2html/tags/attributes/IOnseeked.java new file mode 100644 index 00000000..97407dd8 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnseeked.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnseeked extends IInstance { + default T withOnseeked(final String onseeked_) { + get().attr("onseeked", onseeked_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnseeking.java b/src/main/java/j2html/tags/attributes/IOnseeking.java new file mode 100644 index 00000000..a39352c5 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnseeking.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnseeking extends IInstance { + default T withOnseeking(final String onseeking_) { + get().attr("onseeking", onseeking_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnselect.java b/src/main/java/j2html/tags/attributes/IOnselect.java new file mode 100644 index 00000000..9a4ea380 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnselect.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnselect extends IInstance { + default T withOnselect(final String onselect_) { + get().attr("onselect", onselect_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnstalled.java b/src/main/java/j2html/tags/attributes/IOnstalled.java new file mode 100644 index 00000000..aed9e870 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnstalled.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnstalled extends IInstance { + default T withOnstalled(final String onstalled_) { + get().attr("onstalled", onstalled_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnstorage.java b/src/main/java/j2html/tags/attributes/IOnstorage.java new file mode 100644 index 00000000..de3f1353 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnstorage.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnstorage extends IInstance { + default T withOnstorage(final String onstorage_) { + get().attr("onstorage", onstorage_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnsubmit.java b/src/main/java/j2html/tags/attributes/IOnsubmit.java new file mode 100644 index 00000000..4aca1d77 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnsubmit.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnsubmit extends IInstance { + default T withOnsubmit(final String onsubmit_) { + get().attr("onsubmit", onsubmit_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnsuspend.java b/src/main/java/j2html/tags/attributes/IOnsuspend.java new file mode 100644 index 00000000..fc27803b --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnsuspend.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnsuspend extends IInstance { + default T withOnsuspend(final String onsuspend_) { + get().attr("onsuspend", onsuspend_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOntimeupdate.java b/src/main/java/j2html/tags/attributes/IOntimeupdate.java new file mode 100644 index 00000000..10414531 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOntimeupdate.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOntimeupdate extends IInstance { + default T withOntimeupdate(final String ontimeupdate_) { + get().attr("ontimeupdate", ontimeupdate_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOntoggle.java b/src/main/java/j2html/tags/attributes/IOntoggle.java new file mode 100644 index 00000000..36052c96 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOntoggle.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOntoggle extends IInstance { + default T withOntoggle(final String ontoggle_) { + get().attr("ontoggle", ontoggle_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnunload.java b/src/main/java/j2html/tags/attributes/IOnunload.java new file mode 100644 index 00000000..9c5278e1 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnunload.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnunload extends IInstance { + default T withOnunload(final String onunload_) { + get().attr("onunload", onunload_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnvolumechanged.java b/src/main/java/j2html/tags/attributes/IOnvolumechanged.java new file mode 100644 index 00000000..2c130b4c --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnvolumechanged.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnvolumechanged extends IInstance { + default T withOnvolumechanged(final String onvolumechanged_) { + get().attr("onvolumechanged", onvolumechanged_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnwaiting.java b/src/main/java/j2html/tags/attributes/IOnwaiting.java new file mode 100644 index 00000000..356695a2 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnwaiting.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnwaiting extends IInstance { + default T withOnwaiting(final String onwaiting_) { + get().attr("onwaiting", onwaiting_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOnwheel.java b/src/main/java/j2html/tags/attributes/IOnwheel.java new file mode 100644 index 00000000..9172dacc --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOnwheel.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOnwheel extends IInstance { + default T withOnwheel(final String onwheel_) { + get().attr("onwheel", onwheel_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOpen.java b/src/main/java/j2html/tags/attributes/IOpen.java new file mode 100644 index 00000000..29991c74 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOpen.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOpen extends IInstance { + default T withOpen(final String open_) { + get().attr("open", open_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IOptimum.java b/src/main/java/j2html/tags/attributes/IOptimum.java new file mode 100644 index 00000000..334ca3f9 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOptimum.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOptimum extends IInstance { + default T withOptimum(final String optimum_) { + get().attr("optimum", optimum_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IPattern.java b/src/main/java/j2html/tags/attributes/IPattern.java new file mode 100644 index 00000000..caaffa68 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IPattern.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IPattern extends IInstance { + default T withPattern(final String pattern_) { + get().attr("pattern", pattern_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IPlaceholder.java b/src/main/java/j2html/tags/attributes/IPlaceholder.java new file mode 100644 index 00000000..18457506 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IPlaceholder.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IPlaceholder extends IInstance { + default T withPlaceholder(final String placeholder_) { + get().attr("placeholder", placeholder_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IPoster.java b/src/main/java/j2html/tags/attributes/IPoster.java new file mode 100644 index 00000000..5d775e53 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IPoster.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IPoster extends IInstance { + default T withPoster(final String poster_) { + get().attr("poster", poster_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IPreload.java b/src/main/java/j2html/tags/attributes/IPreload.java new file mode 100644 index 00000000..fb4cb226 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IPreload.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IPreload extends IInstance { + default T withPreload(final String preload_) { + get().attr("preload", preload_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IReadonly.java b/src/main/java/j2html/tags/attributes/IReadonly.java new file mode 100644 index 00000000..77115ca3 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IReadonly.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IReadonly extends IInstance { + default T withReadonly(final String readonly_) { + get().attr("readonly", readonly_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IRel.java b/src/main/java/j2html/tags/attributes/IRel.java new file mode 100644 index 00000000..6d857a1e --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IRel.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IRel extends IInstance { + default T withRel(final String rel_) { + get().attr("rel", rel_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IRequired.java b/src/main/java/j2html/tags/attributes/IRequired.java new file mode 100644 index 00000000..c065bae5 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IRequired.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IRequired extends IInstance { + default T withRequired(final String required_) { + get().attr("required", required_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IReversed.java b/src/main/java/j2html/tags/attributes/IReversed.java new file mode 100644 index 00000000..7adb9ef8 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IReversed.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IReversed extends IInstance { + default T withReversed(final String reversed_) { + get().attr("reversed", reversed_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IRows.java b/src/main/java/j2html/tags/attributes/IRows.java new file mode 100644 index 00000000..c4bf997d --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IRows.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IRows extends IInstance { + default T withRows(final String rows_) { + get().attr("rows", rows_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IRowspan.java b/src/main/java/j2html/tags/attributes/IRowspan.java new file mode 100644 index 00000000..58c69fd7 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IRowspan.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IRowspan extends IInstance { + default T withRowspan(final String rowspan_) { + get().attr("rowspan", rowspan_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/ISandbox.java b/src/main/java/j2html/tags/attributes/ISandbox.java new file mode 100644 index 00000000..dc266b09 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/ISandbox.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface ISandbox extends IInstance { + default T withSandbox(final String sandbox_) { + get().attr("sandbox", sandbox_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IScope.java b/src/main/java/j2html/tags/attributes/IScope.java new file mode 100644 index 00000000..b518e006 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IScope.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IScope extends IInstance { + default T withScope(final String scope_) { + get().attr("scope", scope_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/ISelected.java b/src/main/java/j2html/tags/attributes/ISelected.java new file mode 100644 index 00000000..1743741f --- /dev/null +++ b/src/main/java/j2html/tags/attributes/ISelected.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface ISelected extends IInstance { + default T withSelected(final String selected_) { + get().attr("selected", selected_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IShape.java b/src/main/java/j2html/tags/attributes/IShape.java new file mode 100644 index 00000000..2760f215 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IShape.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IShape extends IInstance { + default T withShape(final String shape_) { + get().attr("shape", shape_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/ISize.java b/src/main/java/j2html/tags/attributes/ISize.java new file mode 100644 index 00000000..7c2674d5 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/ISize.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface ISize extends IInstance { + default T withSize(final String size_) { + get().attr("size", size_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/ISizes.java b/src/main/java/j2html/tags/attributes/ISizes.java new file mode 100644 index 00000000..24d0484d --- /dev/null +++ b/src/main/java/j2html/tags/attributes/ISizes.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface ISizes extends IInstance { + default T withSizes(final String sizes_) { + get().attr("sizes", sizes_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/ISpan.java b/src/main/java/j2html/tags/attributes/ISpan.java new file mode 100644 index 00000000..e973144e --- /dev/null +++ b/src/main/java/j2html/tags/attributes/ISpan.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface ISpan extends IInstance { + default T withSpan(final String span_) { + get().attr("span", span_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/ISpellcheck.java b/src/main/java/j2html/tags/attributes/ISpellcheck.java new file mode 100644 index 00000000..b4cc28d2 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/ISpellcheck.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface ISpellcheck extends IInstance { + default T withSpellcheck(final String spellcheck_) { + get().attr("spellcheck", spellcheck_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/ISrc.java b/src/main/java/j2html/tags/attributes/ISrc.java new file mode 100644 index 00000000..4adca54a --- /dev/null +++ b/src/main/java/j2html/tags/attributes/ISrc.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface ISrc extends IInstance { + default T withSrc(final String src_) { + get().attr("src", src_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/ISrcdoc.java b/src/main/java/j2html/tags/attributes/ISrcdoc.java new file mode 100644 index 00000000..5dda59c7 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/ISrcdoc.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface ISrcdoc extends IInstance { + default T withSrcdoc(final String srcdoc_) { + get().attr("srcdoc", srcdoc_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/ISrclang.java b/src/main/java/j2html/tags/attributes/ISrclang.java new file mode 100644 index 00000000..20bf6886 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/ISrclang.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface ISrclang extends IInstance { + default T withSrclang(final String srclang_) { + get().attr("srclang", srclang_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/ISrcset.java b/src/main/java/j2html/tags/attributes/ISrcset.java new file mode 100644 index 00000000..30d3b069 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/ISrcset.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface ISrcset extends IInstance { + default T withSrcset(final String srcset_) { + get().attr("srcset", srcset_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IStart.java b/src/main/java/j2html/tags/attributes/IStart.java new file mode 100644 index 00000000..6af66055 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IStart.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IStart extends IInstance { + default T withStart(final String start_) { + get().attr("start", start_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IStep.java b/src/main/java/j2html/tags/attributes/IStep.java new file mode 100644 index 00000000..5ed2d895 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IStep.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IStep extends IInstance { + default T withStep(final String step_) { + get().attr("step", step_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/ITarget.java b/src/main/java/j2html/tags/attributes/ITarget.java new file mode 100644 index 00000000..b8b9e0cb --- /dev/null +++ b/src/main/java/j2html/tags/attributes/ITarget.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface ITarget extends IInstance { + default T withTarget(final String target_) { + get().attr("target", target_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IType.java b/src/main/java/j2html/tags/attributes/IType.java index daf4226f..3a0c96aa 100644 --- a/src/main/java/j2html/tags/attributes/IType.java +++ b/src/main/java/j2html/tags/attributes/IType.java @@ -2,11 +2,9 @@ import j2html.tags.Tag; - public interface IType extends IInstance { - - public default T withType(String type){ - get().attr("type", type); + default T withType(final String type_) { + get().attr("type", type_); return get(); } } diff --git a/src/main/java/j2html/tags/attributes/IUsemap.java b/src/main/java/j2html/tags/attributes/IUsemap.java new file mode 100644 index 00000000..8bbb00c6 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IUsemap.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IUsemap extends IInstance { + default T withUsemap(final String usemap_) { + get().attr("usemap", usemap_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IValue.java b/src/main/java/j2html/tags/attributes/IValue.java index 208ac5eb..60af4b60 100644 --- a/src/main/java/j2html/tags/attributes/IValue.java +++ b/src/main/java/j2html/tags/attributes/IValue.java @@ -2,11 +2,9 @@ import j2html.tags.Tag; - public interface IValue extends IInstance { - - public default T withValue(String value){ - get().attr("value", value); + default T withValue(final String value_) { + get().attr("value", value_); return get(); } } diff --git a/src/main/java/j2html/tags/attributes/IWidth.java b/src/main/java/j2html/tags/attributes/IWidth.java new file mode 100644 index 00000000..66f4ba83 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IWidth.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IWidth extends IInstance { + default T withWidth(final String width_) { + get().attr("width", width_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/attributes/IWrap.java b/src/main/java/j2html/tags/attributes/IWrap.java new file mode 100644 index 00000000..076b15e7 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IWrap.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IWrap extends IInstance { + default T withWrap(final String wrap_) { + get().attr("wrap", wrap_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java b/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java index 39dada4c..91045a26 100644 --- a/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java +++ b/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java @@ -7,6 +7,8 @@ import java.util.List; import java.util.Optional; +import static j2html.tags.generators.AttributesList.attributes; + public final class AttributeInterfaceCodeGenerator { public static void main(String[] args){ @@ -81,12 +83,15 @@ default T withFormAction(String formAction){ return get(); } */ - final String paramName = interfaceNameSimple.toLowerCase(); + //IMPORTANT: '_' added as suffix to mitigate problems + //where attributes are java keywords. Just to make it consistent and avoid special cases. + final String attrName = interfaceNameSimple.toLowerCase(); + final String paramName = attrName+"_"; sb.append("default ") .append("T ").append("with").append(interfaceNameSimple) .append("(final String ").append(paramName).append(") {") - .append("get().attr(\"").append(paramName).append("\", "+paramName+");\n") + .append("get().attr(\"").append(attrName).append("\", "+paramName+");\n") .append("return get();\n") .append("}\n"); @@ -106,155 +111,4 @@ private static Path makePath(String tagLowerCase){ return Paths.get("src/main/java/j2html/tags/attributes/"+filename); } - private static List attributes() { - return Arrays.asList( - //"accept", implemented manually - //"accept-charset", contains dashes, TODO - "accesskey", - "action", - //"align", not supported in HTML5 - "alt", - "async", - "autocomplete", - "autofocus", - "autoplay", - //"bgcolor", not supported in HTMTL5 - //"border", not supported in HTML5 - "charset", - "checked", - "cite", - //"class" already implemented in Tag.java - "cols", - "colspan", - "content", - //"contenteditable" global attribute, should be in Tag.java - "controls", - "coords", - "data", - "datetime", - "default", - "defer", - "dir", - "dirname", - //"disabled", manually implemented - //"download" manually implemented - //"draggable" global attribute, should be in Tag.java - "enctype", - "for", - //"form" manually implemented, - //"formaction" manually implemented - "headers", - "height", - "hidden", - "high", - "href", - "hreflang", - "http-equiv", - //"id" global attribute, should be in Tag.java - "ismap", - "kind", - "label", - //"lang" global attribute, should be in Tag.java - "list", - "loop", - "low", - "max", - "maxlength", - "media", - "method", - "min", - "multiple", - "muted", - "name", - "novalidate", - "onabort", - "onafterprint", - "onbeforeprint", - "onbeforeunload", - "onblur", - "oncanplay", - "oncanplaythrough", - /* a bunch of event attributes that are on all visible elements (so should be in Tag.java) - "onchange", - "" - - */ - "ondurationchange", - "onemptied", - "onended", - "onerror", - //"onfocus" global attribute - "onhashchange", - // ... a bunch of event attributes visible on all elements - "onload", - "onloadeddata", - "onloadedmetadata", - "onloadstart", - // ... a bunch of event attributes visible on all elements - "onoffline", - "ononline", - "onpagehide", - "onpageshow", - //"onpaste" global attribute - "onpause", - "onplay", - "onplaying", - "onpopstate", - "onprogress", - "onratechange", - "onreset", - "onresize", - "onscroll", - "onsearch", - "onseeked", - "onseeking", - "onselect", - "onstalled", - "onstorage", - "onsubmit", - "onsuspend", - "ontimeupdate", - "ontoggle", - "onunload", - "onvolumechanged", - "onwaiting", - "onwheel", - "open", - "optimum", - "pattern", - "placeholder", - "poster", - "preload", - "readonly", - "rel", - "required", - "reversed", - "rows", - "rowspan", - "sandbox", - "scope", - "selected", - "shape", - "size", - "sizes", - "span", - "spellcheck", - "src", - "srcdoc", - "srclang", - "srcset", - "start", - "step", - //"style", global attribute - //"tabindex", global attribute - "target", - //"title", global attribute - //"translate" global attribute - "type", - "usemap", - "value", - "width", - "wrap" - ); - } } diff --git a/src/main/java/j2html/tags/generators/AttributesList.java b/src/main/java/j2html/tags/generators/AttributesList.java new file mode 100644 index 00000000..a3276260 --- /dev/null +++ b/src/main/java/j2html/tags/generators/AttributesList.java @@ -0,0 +1,159 @@ +package j2html.tags.generators; + +import java.util.Arrays; +import java.util.List; + +public final class AttributesList { + + static List attributes() { + return Arrays.asList( + "accept", + //"accept-charset", contains dashes, TODO + "accesskey", + "action", + //"align", not supported in HTML5 + "alt", + "async", + "autocomplete", + "autofocus", + "autoplay", + //"bgcolor", not supported in HTMTL5 + //"border", not supported in HTML5 + "charset", + "checked", + "cite", + //"class" already implemented in Tag.java + "cols", + "colspan", + "content", + //"contenteditable" global attribute, should be in Tag.java + "controls", + "coords", + "data", + "datetime", + "default", + "defer", + "dir", + "dirname", + //"disabled", manually implemented + //"download" manually implemented + //"draggable" global attribute, should be in Tag.java + "enctype", + "for", + "form", + "formaction", + "headers", + "height", + "hidden", + "high", + "href", + "hreflang", + //"http-equiv", // '-' is problematic in code generation + //"id" global attribute, should be in Tag.java + "ismap", + "kind", + "label", + //"lang" global attribute, should be in Tag.java + "list", + "loop", + "low", + "max", + "maxlength", + "media", + "method", + "min", + "multiple", + "muted", + "name", + "novalidate", + "onabort", + "onafterprint", + "onbeforeprint", + "onbeforeunload", + "onblur", + "oncanplay", + "oncanplaythrough", + /* a bunch of event attributes that are on all visible elements (so should be in Tag.java) + "onchange", + "" + + */ + "ondurationchange", + "onemptied", + "onended", + "onerror", + //"onfocus" global attribute + "onhashchange", + // ... a bunch of event attributes visible on all elements + "onload", + "onloadeddata", + "onloadedmetadata", + "onloadstart", + // ... a bunch of event attributes visible on all elements + "onoffline", + "ononline", + "onpagehide", + "onpageshow", + //"onpaste" global attribute + "onpause", + "onplay", + "onplaying", + "onpopstate", + "onprogress", + "onratechange", + "onreset", + "onresize", + "onscroll", + "onsearch", + "onseeked", + "onseeking", + "onselect", + "onstalled", + "onstorage", + "onsubmit", + "onsuspend", + "ontimeupdate", + "ontoggle", + "onunload", + "onvolumechanged", + "onwaiting", + "onwheel", + "open", + "optimum", + "pattern", + "placeholder", + "poster", + "preload", + "readonly", + "rel", + "required", + "reversed", + "rows", + "rowspan", + "sandbox", + "scope", + "selected", + "shape", + "size", + "sizes", + "span", + "spellcheck", + "src", + "srcdoc", + "srclang", + "srcset", + "start", + "step", + //"style", global attribute + //"tabindex", global attribute + "target", + //"title", global attribute + //"translate" global attribute + "type", + "usemap", + "value", + "width", + "wrap" + ); + } +} From 10c315abce9d72bc8382912194a8109ce8e5df53 Mon Sep 17 00:00:00 2001 From: pointbazaar Date: Sun, 23 Aug 2020 18:44:15 +0200 Subject: [PATCH 05/19] generate TagCreator.java to use the special tags that were generated. This is a step to make it more typesafe. the constructing methods now return a custom type for each tag being constructed. --- src/main/java/j2html/TagCreator.java | 2983 ++++------------- .../generators/TagCreatorCodeGenerator.java | 11 +- .../java/j2html/tags/specialized/ATag.java | 8 +- .../java/j2html/tags/specialized/AreaTag.java | 1 + .../java/j2html/tags/specialized/BaseTag.java | 1 + .../java/j2html/tags/specialized/BrTag.java | 1 + .../j2html/tags/specialized/ButtonTag.java | 10 +- .../java/j2html/tags/specialized/ColTag.java | 1 + .../j2html/tags/specialized/EmbedTag.java | 1 + .../java/j2html/tags/specialized/HrTag.java | 1 + .../java/j2html/tags/specialized/ImgTag.java | 1 + .../j2html/tags/specialized/InputTag.java | 25 +- .../j2html/tags/specialized/KeygenTag.java | 1 + .../java/j2html/tags/specialized/LinkTag.java | 1 + .../java/j2html/tags/specialized/MetaTag.java | 1 + .../j2html/tags/specialized/ParamTag.java | 1 + .../j2html/tags/specialized/SelectTag.java | 8 +- .../j2html/tags/specialized/SourceTag.java | 1 + .../j2html/tags/specialized/TrackTag.java | 1 + .../java/j2html/tags/specialized/WbrTag.java | 1 + .../java/j2html/tags/ComplexRenderTest.java | 24 +- .../j2html/tags/ConvenienceMethodTest.java | 4 +- src/test/java/j2html/tags/TagTest.java | 2 +- 23 files changed, 720 insertions(+), 2369 deletions(-) diff --git a/src/main/java/j2html/TagCreator.java b/src/main/java/j2html/TagCreator.java index abbd10a0..fa192e43 100644 --- a/src/main/java/j2html/TagCreator.java +++ b/src/main/java/j2html/TagCreator.java @@ -297,2315 +297,692 @@ public static HeadTag head(Attr.ShortForm shortAttr, DomContent... dc) { - // EmptyTags, generated in class j2html.tags.TagCreatorCodeGenerator - public static EmptyTag area() { - return new EmptyTag("area"); - } - - public static EmptyTag area(Attr.ShortForm shortAttr) { - return Attr.addTo(new EmptyTag("area"), shortAttr); - } - - public static EmptyTag base() { - return new EmptyTag("base"); - } - - public static EmptyTag base(Attr.ShortForm shortAttr) { - return Attr.addTo(new EmptyTag("base"), shortAttr); - } - - public static EmptyTag br() { - return new EmptyTag("br"); - } - - public static EmptyTag br(Attr.ShortForm shortAttr) { - return Attr.addTo(new EmptyTag("br"), shortAttr); - } - - public static EmptyTag col() { - return new EmptyTag("col"); - } - - public static EmptyTag col(Attr.ShortForm shortAttr) { - return Attr.addTo(new EmptyTag("col"), shortAttr); - } - - public static EmptyTag embed() { - return new EmptyTag("embed"); - } - - public static EmptyTag embed(Attr.ShortForm shortAttr) { - return Attr.addTo(new EmptyTag("embed"), shortAttr); - } - - public static EmptyTag hr() { - return new EmptyTag("hr"); - } - - public static EmptyTag hr(Attr.ShortForm shortAttr) { - return Attr.addTo(new EmptyTag("hr"), shortAttr); - } - - public static EmptyTag img() { - return new EmptyTag("img"); - } - - public static EmptyTag img(Attr.ShortForm shortAttr) { - return Attr.addTo(new EmptyTag("img"), shortAttr); - } - - public static InputTag input() { - return new InputTag(); - } - - public static InputTag input(Attr.ShortForm shortAttr) { - return (InputTag)Attr.addTo(new InputTag(), shortAttr); - } - - public static EmptyTag keygen() { - return new EmptyTag("keygen"); - } - - public static EmptyTag keygen(Attr.ShortForm shortAttr) { - return Attr.addTo(new EmptyTag("keygen"), shortAttr); - } - - public static EmptyTag link() { - return new EmptyTag("link"); - } - - public static EmptyTag link(Attr.ShortForm shortAttr) { - return Attr.addTo(new EmptyTag("link"), shortAttr); - } - - public static EmptyTag meta() { - return new EmptyTag("meta"); - } - - public static EmptyTag meta(Attr.ShortForm shortAttr) { - return Attr.addTo(new EmptyTag("meta"), shortAttr); - } - - public static EmptyTag param() { - return new EmptyTag("param"); - } - - public static EmptyTag param(Attr.ShortForm shortAttr) { - return Attr.addTo(new EmptyTag("param"), shortAttr); - } - - public static EmptyTag source() { - return new EmptyTag("source"); - } - - public static EmptyTag source(Attr.ShortForm shortAttr) { - return Attr.addTo(new EmptyTag("source"), shortAttr); - } - - public static EmptyTag track() { - return new EmptyTag("track"); - } - - public static EmptyTag track(Attr.ShortForm shortAttr) { - return Attr.addTo(new EmptyTag("track"), shortAttr); - } - - public static EmptyTag wbr() { - return new EmptyTag("wbr"); - } - - public static EmptyTag wbr(Attr.ShortForm shortAttr) { - return Attr.addTo(new EmptyTag("wbr"), shortAttr); - } - - // ContainerTags, generated in class j2html.tags.TagCreatorCodeGenerator - public static ATag a() { - return new ATag(); - } - - public static ATag a(String text) { - return (ATag)new ATag().withText(text); - } - - public static ATag a(DomContent... dc) { - return (ATag)new ATag().with(dc); - } - - public static ATag a(Attr.ShortForm shortAttr) { - return (ATag)Attr.addTo(new ATag(), shortAttr); - } - - public static ATag a(Attr.ShortForm shortAttr, String text) { - return (ATag)Attr.addTo(new ATag().withText(text), shortAttr); - } - - public static ATag a(Attr.ShortForm shortAttr, DomContent... dc) { - return (ATag)Attr.addTo(new ATag().with(dc), shortAttr); - } - - public static ContainerTag abbr() { - return new ContainerTag("abbr"); - } - - public static ContainerTag abbr(String text) { - return new ContainerTag("abbr").withText(text); - } - - public static ContainerTag abbr(DomContent... dc) { - return new ContainerTag("abbr").with(dc); - } - - public static ContainerTag abbr(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("abbr"), shortAttr); - } - - public static ContainerTag abbr(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("abbr").withText(text), shortAttr); - } - - public static ContainerTag abbr(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("abbr").with(dc), shortAttr); - } - - public static ContainerTag address() { - return new ContainerTag("address"); - } - - public static ContainerTag address(String text) { - return new ContainerTag("address").withText(text); - } - - public static ContainerTag address(DomContent... dc) { - return new ContainerTag("address").with(dc); - } - - public static ContainerTag address(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("address"), shortAttr); - } - - public static ContainerTag address(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("address").withText(text), shortAttr); - } - - public static ContainerTag address(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("address").with(dc), shortAttr); - } - - public static ContainerTag article() { - return new ContainerTag("article"); - } - - public static ContainerTag article(String text) { - return new ContainerTag("article").withText(text); - } - - public static ContainerTag article(DomContent... dc) { - return new ContainerTag("article").with(dc); - } - - public static ContainerTag article(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("article"), shortAttr); - } - - public static ContainerTag article(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("article").withText(text), shortAttr); - } - - public static ContainerTag article(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("article").with(dc), shortAttr); - } - - public static ContainerTag aside() { - return new ContainerTag("aside"); - } - - public static ContainerTag aside(String text) { - return new ContainerTag("aside").withText(text); - } - - public static ContainerTag aside(DomContent... dc) { - return new ContainerTag("aside").with(dc); - } - - public static ContainerTag aside(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("aside"), shortAttr); - } - - public static ContainerTag aside(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("aside").withText(text), shortAttr); - } - - public static ContainerTag aside(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("aside").with(dc), shortAttr); - } - - public static ContainerTag audio() { - return new ContainerTag("audio"); - } - - public static ContainerTag audio(String text) { - return new ContainerTag("audio").withText(text); - } - - public static ContainerTag audio(DomContent... dc) { - return new ContainerTag("audio").with(dc); - } - - public static ContainerTag audio(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("audio"), shortAttr); - } - - public static ContainerTag audio(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("audio").withText(text), shortAttr); - } - - public static ContainerTag audio(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("audio").with(dc), shortAttr); - } - - public static ContainerTag b() { - return new ContainerTag("b"); - } - - public static ContainerTag b(String text) { - return new ContainerTag("b").withText(text); - } - - public static ContainerTag b(DomContent... dc) { - return new ContainerTag("b").with(dc); - } - - public static ContainerTag b(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("b"), shortAttr); - } - - public static ContainerTag b(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("b").withText(text), shortAttr); - } - - public static ContainerTag b(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("b").with(dc), shortAttr); - } - - public static ContainerTag bdi() { - return new ContainerTag("bdi"); - } - - public static ContainerTag bdi(String text) { - return new ContainerTag("bdi").withText(text); - } - - public static ContainerTag bdi(DomContent... dc) { - return new ContainerTag("bdi").with(dc); - } - - public static ContainerTag bdi(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("bdi"), shortAttr); - } - - public static ContainerTag bdi(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("bdi").withText(text), shortAttr); - } - - public static ContainerTag bdi(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("bdi").with(dc), shortAttr); - } - - public static ContainerTag bdo() { - return new ContainerTag("bdo"); - } - - public static ContainerTag bdo(String text) { - return new ContainerTag("bdo").withText(text); - } - - public static ContainerTag bdo(DomContent... dc) { - return new ContainerTag("bdo").with(dc); - } - - public static ContainerTag bdo(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("bdo"), shortAttr); - } - - public static ContainerTag bdo(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("bdo").withText(text), shortAttr); - } - - public static ContainerTag bdo(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("bdo").with(dc), shortAttr); - } - - public static ContainerTag blockquote() { - return new ContainerTag("blockquote"); - } - - public static ContainerTag blockquote(String text) { - return new ContainerTag("blockquote").withText(text); - } - - public static ContainerTag blockquote(DomContent... dc) { - return new ContainerTag("blockquote").with(dc); - } - - public static ContainerTag blockquote(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("blockquote"), shortAttr); - } - - public static ContainerTag blockquote(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("blockquote").withText(text), shortAttr); - } - - public static ContainerTag blockquote(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("blockquote").with(dc), shortAttr); - } - - - public static ButtonTag button() { - return new ButtonTag(); - } - - public static ButtonTag button(String text) { - return (ButtonTag)new ButtonTag().withText(text); - } - - public static ButtonTag button(DomContent... dc) { - return (ButtonTag)new ButtonTag().with(dc); - } - - public static ButtonTag button(Attr.ShortForm shortAttr) { - return (ButtonTag)Attr.addTo(new ButtonTag(), shortAttr); - } - - public static ButtonTag button(Attr.ShortForm shortAttr, String text) { - return (ButtonTag)Attr.addTo(new ButtonTag().withText(text), shortAttr); - } - - public static ButtonTag button(Attr.ShortForm shortAttr, DomContent... dc) { - return (ButtonTag)Attr.addTo(new ButtonTag().with(dc), shortAttr); - } - - public static ContainerTag canvas() { - return new ContainerTag("canvas"); - } - - public static ContainerTag canvas(String text) { - return new ContainerTag("canvas").withText(text); - } - - public static ContainerTag canvas(DomContent... dc) { - return new ContainerTag("canvas").with(dc); - } - - public static ContainerTag canvas(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("canvas"), shortAttr); - } - - public static ContainerTag canvas(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("canvas").withText(text), shortAttr); - } - - public static ContainerTag canvas(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("canvas").with(dc), shortAttr); - } - - public static ContainerTag caption() { - return new ContainerTag("caption"); - } - - public static ContainerTag caption(String text) { - return new ContainerTag("caption").withText(text); - } - - public static ContainerTag caption(DomContent... dc) { - return new ContainerTag("caption").with(dc); - } - - public static ContainerTag caption(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("caption"), shortAttr); - } - - public static ContainerTag caption(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("caption").withText(text), shortAttr); - } - - public static ContainerTag caption(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("caption").with(dc), shortAttr); - } - - public static ContainerTag cite() { - return new ContainerTag("cite"); - } - - public static ContainerTag cite(String text) { - return new ContainerTag("cite").withText(text); - } - - public static ContainerTag cite(DomContent... dc) { - return new ContainerTag("cite").with(dc); - } - - public static ContainerTag cite(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("cite"), shortAttr); - } - - public static ContainerTag cite(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("cite").withText(text), shortAttr); - } - - public static ContainerTag cite(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("cite").with(dc), shortAttr); - } - - public static ContainerTag code() { - return new ContainerTag("code"); - } - - public static ContainerTag code(String text) { - return new ContainerTag("code").withText(text); - } - - public static ContainerTag code(DomContent... dc) { - return new ContainerTag("code").with(dc); - } - - public static ContainerTag code(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("code"), shortAttr); - } - - public static ContainerTag code(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("code").withText(text), shortAttr); - } - - public static ContainerTag code(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("code").with(dc), shortAttr); - } - - public static ContainerTag colgroup() { - return new ContainerTag("colgroup"); - } - - public static ContainerTag colgroup(String text) { - return new ContainerTag("colgroup").withText(text); - } - - public static ContainerTag colgroup(DomContent... dc) { - return new ContainerTag("colgroup").with(dc); - } - - public static ContainerTag colgroup(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("colgroup"), shortAttr); - } - - public static ContainerTag colgroup(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("colgroup").withText(text), shortAttr); - } - - public static ContainerTag colgroup(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("colgroup").with(dc), shortAttr); - } - - public static ContainerTag datalist() { - return new ContainerTag("datalist"); - } - - public static ContainerTag datalist(String text) { - return new ContainerTag("datalist").withText(text); - } - - public static ContainerTag datalist(DomContent... dc) { - return new ContainerTag("datalist").with(dc); - } - - public static ContainerTag datalist(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("datalist"), shortAttr); - } - - public static ContainerTag datalist(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("datalist").withText(text), shortAttr); - } - - public static ContainerTag datalist(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("datalist").with(dc), shortAttr); - } - - public static ContainerTag dd() { - return new ContainerTag("dd"); - } - - public static ContainerTag dd(String text) { - return new ContainerTag("dd").withText(text); - } - - public static ContainerTag dd(DomContent... dc) { - return new ContainerTag("dd").with(dc); - } - - public static ContainerTag dd(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("dd"), shortAttr); - } - - public static ContainerTag dd(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("dd").withText(text), shortAttr); - } - - public static ContainerTag dd(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("dd").with(dc), shortAttr); - } - - public static ContainerTag del() { - return new ContainerTag("del"); - } - - public static ContainerTag del(String text) { - return new ContainerTag("del").withText(text); - } - - public static ContainerTag del(DomContent... dc) { - return new ContainerTag("del").with(dc); - } - - public static ContainerTag del(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("del"), shortAttr); - } - - public static ContainerTag del(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("del").withText(text), shortAttr); - } - - public static ContainerTag del(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("del").with(dc), shortAttr); - } - - public static ContainerTag details() { - return new ContainerTag("details"); - } - - public static ContainerTag details(String text) { - return new ContainerTag("details").withText(text); - } - - public static ContainerTag details(DomContent... dc) { - return new ContainerTag("details").with(dc); - } - - public static ContainerTag details(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("details"), shortAttr); - } - - public static ContainerTag details(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("details").withText(text), shortAttr); - } - - public static ContainerTag details(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("details").with(dc), shortAttr); - } - - public static ContainerTag dfn() { - return new ContainerTag("dfn"); - } - - public static ContainerTag dfn(String text) { - return new ContainerTag("dfn").withText(text); - } - - public static ContainerTag dfn(DomContent... dc) { - return new ContainerTag("dfn").with(dc); - } - - public static ContainerTag dfn(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("dfn"), shortAttr); - } - - public static ContainerTag dfn(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("dfn").withText(text), shortAttr); - } - - public static ContainerTag dfn(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("dfn").with(dc), shortAttr); - } - - public static ContainerTag dialog() { - return new ContainerTag("dialog"); - } - - public static ContainerTag dialog(String text) { - return new ContainerTag("dialog").withText(text); - } - - public static ContainerTag dialog(DomContent... dc) { - return new ContainerTag("dialog").with(dc); - } - - public static ContainerTag dialog(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("dialog"), shortAttr); - } - - public static ContainerTag dialog(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("dialog").withText(text), shortAttr); - } - - public static ContainerTag dialog(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("dialog").with(dc), shortAttr); - } - - public static ContainerTag div() { - return new ContainerTag("div"); - } - - public static ContainerTag div(String text) { - return new ContainerTag("div").withText(text); - } - - public static ContainerTag div(DomContent... dc) { - return new ContainerTag("div").with(dc); - } - - public static ContainerTag div(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("div"), shortAttr); - } - - public static ContainerTag div(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("div").withText(text), shortAttr); - } - - public static ContainerTag div(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("div").with(dc), shortAttr); - } - - public static ContainerTag dl() { - return new ContainerTag("dl"); - } - - public static ContainerTag dl(String text) { - return new ContainerTag("dl").withText(text); - } - - public static ContainerTag dl(DomContent... dc) { - return new ContainerTag("dl").with(dc); - } - - public static ContainerTag dl(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("dl"), shortAttr); - } - - public static ContainerTag dl(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("dl").withText(text), shortAttr); - } - - public static ContainerTag dl(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("dl").with(dc), shortAttr); - } - - public static ContainerTag dt() { - return new ContainerTag("dt"); - } - - public static ContainerTag dt(String text) { - return new ContainerTag("dt").withText(text); - } - - public static ContainerTag dt(DomContent... dc) { - return new ContainerTag("dt").with(dc); - } - - public static ContainerTag dt(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("dt"), shortAttr); - } - - public static ContainerTag dt(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("dt").withText(text), shortAttr); - } - - public static ContainerTag dt(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("dt").with(dc), shortAttr); - } - - public static ContainerTag em() { - return new ContainerTag("em"); - } - - public static ContainerTag em(String text) { - return new ContainerTag("em").withText(text); - } - - public static ContainerTag em(DomContent... dc) { - return new ContainerTag("em").with(dc); - } - - public static ContainerTag em(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("em"), shortAttr); - } - - public static ContainerTag em(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("em").withText(text), shortAttr); - } - - public static ContainerTag em(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("em").with(dc), shortAttr); - } - - public static ContainerTag fieldset() { - return new ContainerTag("fieldset"); - } - - public static ContainerTag fieldset(String text) { - return new ContainerTag("fieldset").withText(text); - } - - public static ContainerTag fieldset(DomContent... dc) { - return new ContainerTag("fieldset").with(dc); - } - - public static ContainerTag fieldset(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("fieldset"), shortAttr); - } - - public static ContainerTag fieldset(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("fieldset").withText(text), shortAttr); - } - - public static ContainerTag fieldset(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("fieldset").with(dc), shortAttr); - } - - public static ContainerTag figcaption() { - return new ContainerTag("figcaption"); - } - - public static ContainerTag figcaption(String text) { - return new ContainerTag("figcaption").withText(text); - } - - public static ContainerTag figcaption(DomContent... dc) { - return new ContainerTag("figcaption").with(dc); - } - - public static ContainerTag figcaption(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("figcaption"), shortAttr); - } - - public static ContainerTag figcaption(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("figcaption").withText(text), shortAttr); - } - - public static ContainerTag figcaption(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("figcaption").with(dc), shortAttr); - } - - public static ContainerTag figure() { - return new ContainerTag("figure"); - } - - public static ContainerTag figure(String text) { - return new ContainerTag("figure").withText(text); - } - - public static ContainerTag figure(DomContent... dc) { - return new ContainerTag("figure").with(dc); - } - - public static ContainerTag figure(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("figure"), shortAttr); - } - - public static ContainerTag figure(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("figure").withText(text), shortAttr); - } - - public static ContainerTag figure(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("figure").with(dc), shortAttr); - } - - public static ContainerTag footer() { - return new ContainerTag("footer"); - } - - public static ContainerTag footer(String text) { - return new ContainerTag("footer").withText(text); - } - - public static ContainerTag footer(DomContent... dc) { - return new ContainerTag("footer").with(dc); - } - - public static ContainerTag footer(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("footer"), shortAttr); - } - - public static ContainerTag footer(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("footer").withText(text), shortAttr); - } - - public static ContainerTag footer(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("footer").with(dc), shortAttr); - } - - public static ContainerTag form() { - return new ContainerTag("form"); - } - - public static ContainerTag form(String text) { - return new ContainerTag("form").withText(text); - } - - public static ContainerTag form(DomContent... dc) { - return new ContainerTag("form").with(dc); - } - - public static ContainerTag form(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("form"), shortAttr); - } - - public static ContainerTag form(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("form").withText(text), shortAttr); - } - - public static ContainerTag form(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("form").with(dc), shortAttr); - } - - public static ContainerTag h1() { - return new ContainerTag("h1"); - } - - public static ContainerTag h1(String text) { - return new ContainerTag("h1").withText(text); - } - - public static ContainerTag h1(DomContent... dc) { - return new ContainerTag("h1").with(dc); - } - - public static ContainerTag h1(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("h1"), shortAttr); - } - - public static ContainerTag h1(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("h1").withText(text), shortAttr); - } - - public static ContainerTag h1(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("h1").with(dc), shortAttr); - } - - public static ContainerTag h2() { - return new ContainerTag("h2"); - } - - public static ContainerTag h2(String text) { - return new ContainerTag("h2").withText(text); - } - - public static ContainerTag h2(DomContent... dc) { - return new ContainerTag("h2").with(dc); - } - - public static ContainerTag h2(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("h2"), shortAttr); - } - - public static ContainerTag h2(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("h2").withText(text), shortAttr); - } - - public static ContainerTag h2(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("h2").with(dc), shortAttr); - } - - public static ContainerTag h3() { - return new ContainerTag("h3"); - } - - public static ContainerTag h3(String text) { - return new ContainerTag("h3").withText(text); - } - - public static ContainerTag h3(DomContent... dc) { - return new ContainerTag("h3").with(dc); - } - - public static ContainerTag h3(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("h3"), shortAttr); - } - - public static ContainerTag h3(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("h3").withText(text), shortAttr); - } - - public static ContainerTag h3(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("h3").with(dc), shortAttr); - } - - public static ContainerTag h4() { - return new ContainerTag("h4"); - } - - public static ContainerTag h4(String text) { - return new ContainerTag("h4").withText(text); - } - - public static ContainerTag h4(DomContent... dc) { - return new ContainerTag("h4").with(dc); - } - - public static ContainerTag h4(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("h4"), shortAttr); - } - - public static ContainerTag h4(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("h4").withText(text), shortAttr); - } - - public static ContainerTag h4(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("h4").with(dc), shortAttr); - } - - public static ContainerTag h5() { - return new ContainerTag("h5"); - } - - public static ContainerTag h5(String text) { - return new ContainerTag("h5").withText(text); - } - - public static ContainerTag h5(DomContent... dc) { - return new ContainerTag("h5").with(dc); - } - - public static ContainerTag h5(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("h5"), shortAttr); - } - - public static ContainerTag h5(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("h5").withText(text), shortAttr); - } - - public static ContainerTag h5(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("h5").with(dc), shortAttr); - } - - public static ContainerTag h6() { - return new ContainerTag("h6"); - } - - public static ContainerTag h6(String text) { - return new ContainerTag("h6").withText(text); - } - - public static ContainerTag h6(DomContent... dc) { - return new ContainerTag("h6").with(dc); - } - - public static ContainerTag h6(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("h6"), shortAttr); - } - - public static ContainerTag h6(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("h6").withText(text), shortAttr); - } - - public static ContainerTag h6(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("h6").with(dc), shortAttr); - } - - - - public static ContainerTag header() { - return new ContainerTag("header"); - } - - public static ContainerTag header(String text) { - return new ContainerTag("header").withText(text); - } - - public static ContainerTag header(DomContent... dc) { - return new ContainerTag("header").with(dc); - } - - public static ContainerTag header(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("header"), shortAttr); - } - - public static ContainerTag header(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("header").withText(text), shortAttr); - } - - public static ContainerTag header(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("header").with(dc), shortAttr); - } - - - - public static ContainerTag i() { - return new ContainerTag("i"); - } - - public static ContainerTag i(String text) { - return new ContainerTag("i").withText(text); - } - - public static ContainerTag i(DomContent... dc) { - return new ContainerTag("i").with(dc); - } - - public static ContainerTag i(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("i"), shortAttr); - } - - public static ContainerTag i(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("i").withText(text), shortAttr); - } - - public static ContainerTag i(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("i").with(dc), shortAttr); - } - - public static ContainerTag iframe() { - return new ContainerTag("iframe"); - } - - public static ContainerTag iframe(String text) { - return new ContainerTag("iframe").withText(text); - } - - public static ContainerTag iframe(DomContent... dc) { - return new ContainerTag("iframe").with(dc); - } - - public static ContainerTag iframe(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("iframe"), shortAttr); - } - - public static ContainerTag iframe(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("iframe").withText(text), shortAttr); - } - - public static ContainerTag iframe(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("iframe").with(dc), shortAttr); - } - - public static ContainerTag ins() { - return new ContainerTag("ins"); - } - - public static ContainerTag ins(String text) { - return new ContainerTag("ins").withText(text); - } - - public static ContainerTag ins(DomContent... dc) { - return new ContainerTag("ins").with(dc); - } - - public static ContainerTag ins(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("ins"), shortAttr); - } - - public static ContainerTag ins(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("ins").withText(text), shortAttr); - } - - public static ContainerTag ins(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("ins").with(dc), shortAttr); - } - - public static ContainerTag kbd() { - return new ContainerTag("kbd"); - } - - public static ContainerTag kbd(String text) { - return new ContainerTag("kbd").withText(text); - } - - public static ContainerTag kbd(DomContent... dc) { - return new ContainerTag("kbd").with(dc); - } - - public static ContainerTag kbd(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("kbd"), shortAttr); - } - - public static ContainerTag kbd(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("kbd").withText(text), shortAttr); - } - - public static ContainerTag kbd(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("kbd").with(dc), shortAttr); - } - - public static ContainerTag label() { - return new ContainerTag("label"); - } - - public static ContainerTag label(String text) { - return new ContainerTag("label").withText(text); - } - - public static ContainerTag label(DomContent... dc) { - return new ContainerTag("label").with(dc); - } - - public static ContainerTag label(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("label"), shortAttr); - } - - public static ContainerTag label(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("label").withText(text), shortAttr); - } - - public static ContainerTag label(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("label").with(dc), shortAttr); - } - - public static ContainerTag legend() { - return new ContainerTag("legend"); - } - - public static ContainerTag legend(String text) { - return new ContainerTag("legend").withText(text); - } - - public static ContainerTag legend(DomContent... dc) { - return new ContainerTag("legend").with(dc); - } - - public static ContainerTag legend(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("legend"), shortAttr); - } - - public static ContainerTag legend(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("legend").withText(text), shortAttr); - } - - public static ContainerTag legend(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("legend").with(dc), shortAttr); - } - - public static ContainerTag li() { - return new ContainerTag("li"); - } - - public static ContainerTag li(String text) { - return new ContainerTag("li").withText(text); - } - - public static ContainerTag li(DomContent... dc) { - return new ContainerTag("li").with(dc); - } - - public static ContainerTag li(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("li"), shortAttr); - } - - public static ContainerTag li(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("li").withText(text), shortAttr); - } - - public static ContainerTag li(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("li").with(dc), shortAttr); - } - - public static ContainerTag main() { - return new ContainerTag("main"); - } - - public static ContainerTag main(String text) { - return new ContainerTag("main").withText(text); - } - - public static ContainerTag main(DomContent... dc) { - return new ContainerTag("main").with(dc); - } - - public static ContainerTag main(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("main"), shortAttr); - } - - public static ContainerTag main(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("main").withText(text), shortAttr); - } - - public static ContainerTag main(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("main").with(dc), shortAttr); - } - - public static ContainerTag map() { - return new ContainerTag("map"); - } - - public static ContainerTag map(String text) { - return new ContainerTag("map").withText(text); - } - - public static ContainerTag map(DomContent... dc) { - return new ContainerTag("map").with(dc); - } - - public static ContainerTag map(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("map"), shortAttr); - } - - public static ContainerTag map(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("map").withText(text), shortAttr); - } - - public static ContainerTag map(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("map").with(dc), shortAttr); - } - - public static ContainerTag mark() { - return new ContainerTag("mark"); - } - - public static ContainerTag mark(String text) { - return new ContainerTag("mark").withText(text); - } - - public static ContainerTag mark(DomContent... dc) { - return new ContainerTag("mark").with(dc); - } - - public static ContainerTag mark(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("mark"), shortAttr); - } - - public static ContainerTag mark(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("mark").withText(text), shortAttr); - } - - public static ContainerTag mark(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("mark").with(dc), shortAttr); - } - - public static ContainerTag menu() { - return new ContainerTag("menu"); - } - - public static ContainerTag menu(String text) { - return new ContainerTag("menu").withText(text); - } - - public static ContainerTag menu(DomContent... dc) { - return new ContainerTag("menu").with(dc); - } - - public static ContainerTag menu(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("menu"), shortAttr); - } - - public static ContainerTag menu(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("menu").withText(text), shortAttr); - } - - public static ContainerTag menu(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("menu").with(dc), shortAttr); - } - - public static ContainerTag menuitem() { - return new ContainerTag("menuitem"); - } - - public static ContainerTag menuitem(String text) { - return new ContainerTag("menuitem").withText(text); - } - - public static ContainerTag menuitem(DomContent... dc) { - return new ContainerTag("menuitem").with(dc); - } - - public static ContainerTag menuitem(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("menuitem"), shortAttr); - } - - public static ContainerTag menuitem(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("menuitem").withText(text), shortAttr); - } - - public static ContainerTag menuitem(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("menuitem").with(dc), shortAttr); - } - - public static ContainerTag meter() { - return new ContainerTag("meter"); - } - - public static ContainerTag meter(String text) { - return new ContainerTag("meter").withText(text); - } - - public static ContainerTag meter(DomContent... dc) { - return new ContainerTag("meter").with(dc); - } - - public static ContainerTag meter(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("meter"), shortAttr); - } - - public static ContainerTag meter(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("meter").withText(text), shortAttr); - } - - public static ContainerTag meter(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("meter").with(dc), shortAttr); - } - - public static ContainerTag nav() { - return new ContainerTag("nav"); - } - - public static ContainerTag nav(String text) { - return new ContainerTag("nav").withText(text); - } - - public static ContainerTag nav(DomContent... dc) { - return new ContainerTag("nav").with(dc); - } - - public static ContainerTag nav(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("nav"), shortAttr); - } - - public static ContainerTag nav(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("nav").withText(text), shortAttr); - } - - public static ContainerTag nav(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("nav").with(dc), shortAttr); - } - - public static ContainerTag noscript() { - return new ContainerTag("noscript"); - } - - public static ContainerTag noscript(String text) { - return new ContainerTag("noscript").withText(text); - } - - public static ContainerTag noscript(DomContent... dc) { - return new ContainerTag("noscript").with(dc); - } - - public static ContainerTag noscript(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("noscript"), shortAttr); - } - - public static ContainerTag noscript(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("noscript").withText(text), shortAttr); - } - - public static ContainerTag noscript(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("noscript").with(dc), shortAttr); - } - - public static ContainerTag object() { - return new ContainerTag("object"); - } - - public static ContainerTag object(String text) { - return new ContainerTag("object").withText(text); - } - - public static ContainerTag object(DomContent... dc) { - return new ContainerTag("object").with(dc); - } - - public static ContainerTag object(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("object"), shortAttr); - } - - public static ContainerTag object(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("object").withText(text), shortAttr); - } - - public static ContainerTag object(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("object").with(dc), shortAttr); - } - - public static ContainerTag ol() { - return new ContainerTag("ol"); - } - - public static ContainerTag ol(String text) { - return new ContainerTag("ol").withText(text); - } - - public static ContainerTag ol(DomContent... dc) { - return new ContainerTag("ol").with(dc); - } - - public static ContainerTag ol(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("ol"), shortAttr); - } - - public static ContainerTag ol(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("ol").withText(text), shortAttr); - } - - public static ContainerTag ol(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("ol").with(dc), shortAttr); - } - - public static ContainerTag optgroup() { - return new ContainerTag("optgroup"); - } - - public static ContainerTag optgroup(String text) { - return new ContainerTag("optgroup").withText(text); - } - - public static ContainerTag optgroup(DomContent... dc) { - return new ContainerTag("optgroup").with(dc); - } - - public static ContainerTag optgroup(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("optgroup"), shortAttr); - } - - public static ContainerTag optgroup(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("optgroup").withText(text), shortAttr); - } - - public static ContainerTag optgroup(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("optgroup").with(dc), shortAttr); - } - - public static ContainerTag option() { - return new ContainerTag("option"); - } - - public static ContainerTag option(String text) { - return new ContainerTag("option").withText(text); - } - - public static ContainerTag option(DomContent... dc) { - return new ContainerTag("option").with(dc); - } - - public static ContainerTag option(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("option"), shortAttr); - } - - public static ContainerTag option(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("option").withText(text), shortAttr); - } - - public static ContainerTag option(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("option").with(dc), shortAttr); - } - - public static ContainerTag output() { - return new ContainerTag("output"); - } - - public static ContainerTag output(String text) { - return new ContainerTag("output").withText(text); - } - - public static ContainerTag output(DomContent... dc) { - return new ContainerTag("output").with(dc); - } - - public static ContainerTag output(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("output"), shortAttr); - } - - public static ContainerTag output(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("output").withText(text), shortAttr); - } - - public static ContainerTag output(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("output").with(dc), shortAttr); - } - - public static ContainerTag p() { - return new ContainerTag("p"); - } - - public static ContainerTag p(String text) { - return new ContainerTag("p").withText(text); - } - - public static ContainerTag p(DomContent... dc) { - return new ContainerTag("p").with(dc); - } - - public static ContainerTag p(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("p"), shortAttr); - } - - public static ContainerTag p(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("p").withText(text), shortAttr); - } - - public static ContainerTag p(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("p").with(dc), shortAttr); - } - - public static ContainerTag pre() { - return new ContainerTag("pre"); - } - - public static ContainerTag pre(String text) { - return new ContainerTag("pre").withText(text); - } - - public static ContainerTag pre(DomContent... dc) { - return new ContainerTag("pre").with(dc); - } - - public static ContainerTag pre(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("pre"), shortAttr); - } - - public static ContainerTag pre(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("pre").withText(text), shortAttr); - } - - public static ContainerTag pre(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("pre").with(dc), shortAttr); - } - - public static ContainerTag progress() { - return new ContainerTag("progress"); - } - - public static ContainerTag progress(String text) { - return new ContainerTag("progress").withText(text); - } - - public static ContainerTag progress(DomContent... dc) { - return new ContainerTag("progress").with(dc); - } - - public static ContainerTag progress(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("progress"), shortAttr); - } - - public static ContainerTag progress(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("progress").withText(text), shortAttr); - } - - public static ContainerTag progress(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("progress").with(dc), shortAttr); - } - - public static ContainerTag q() { - return new ContainerTag("q"); - } - - public static ContainerTag q(String text) { - return new ContainerTag("q").withText(text); - } - - public static ContainerTag q(DomContent... dc) { - return new ContainerTag("q").with(dc); - } - - public static ContainerTag q(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("q"), shortAttr); - } - - public static ContainerTag q(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("q").withText(text), shortAttr); - } - - public static ContainerTag q(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("q").with(dc), shortAttr); - } - - public static ContainerTag rp() { - return new ContainerTag("rp"); - } - - public static ContainerTag rp(String text) { - return new ContainerTag("rp").withText(text); - } - - public static ContainerTag rp(DomContent... dc) { - return new ContainerTag("rp").with(dc); - } - - public static ContainerTag rp(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("rp"), shortAttr); - } - - public static ContainerTag rp(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("rp").withText(text), shortAttr); - } - - public static ContainerTag rp(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("rp").with(dc), shortAttr); - } - - public static ContainerTag rt() { - return new ContainerTag("rt"); - } - - public static ContainerTag rt(String text) { - return new ContainerTag("rt").withText(text); - } - - public static ContainerTag rt(DomContent... dc) { - return new ContainerTag("rt").with(dc); - } - - public static ContainerTag rt(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("rt"), shortAttr); - } - - public static ContainerTag rt(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("rt").withText(text), shortAttr); - } - - public static ContainerTag rt(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("rt").with(dc), shortAttr); - } - - public static ContainerTag ruby() { - return new ContainerTag("ruby"); - } - - public static ContainerTag ruby(String text) { - return new ContainerTag("ruby").withText(text); - } - - public static ContainerTag ruby(DomContent... dc) { - return new ContainerTag("ruby").with(dc); - } - - public static ContainerTag ruby(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("ruby"), shortAttr); - } - - public static ContainerTag ruby(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("ruby").withText(text), shortAttr); - } - - public static ContainerTag ruby(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("ruby").with(dc), shortAttr); - } - - public static ContainerTag s() { - return new ContainerTag("s"); - } - - public static ContainerTag s(String text) { - return new ContainerTag("s").withText(text); - } - - public static ContainerTag s(DomContent... dc) { - return new ContainerTag("s").with(dc); - } - - public static ContainerTag s(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("s"), shortAttr); - } - - public static ContainerTag s(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("s").withText(text), shortAttr); - } - - public static ContainerTag s(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("s").with(dc), shortAttr); - } - - public static ContainerTag samp() { - return new ContainerTag("samp"); - } - - public static ContainerTag samp(String text) { - return new ContainerTag("samp").withText(text); - } - - public static ContainerTag samp(DomContent... dc) { - return new ContainerTag("samp").with(dc); - } - - public static ContainerTag samp(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("samp"), shortAttr); - } - - public static ContainerTag samp(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("samp").withText(text), shortAttr); - } - - public static ContainerTag samp(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("samp").with(dc), shortAttr); - } - - public static ContainerTag script() { - return new ContainerTag("script"); - } - - public static ContainerTag script(String text) { - return new ContainerTag("script").withText(text); - } - - public static ContainerTag script(DomContent... dc) { - return new ContainerTag("script").with(dc); - } - - public static ContainerTag script(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("script"), shortAttr); - } - - public static ContainerTag script(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("script").withText(text), shortAttr); - } - - public static ContainerTag script(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("script").with(dc), shortAttr); - } - - public static ContainerTag section() { - return new ContainerTag("section"); - } - - public static ContainerTag section(String text) { - return new ContainerTag("section").withText(text); - } - - public static ContainerTag section(DomContent... dc) { - return new ContainerTag("section").with(dc); - } - - public static ContainerTag section(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("section"), shortAttr); - } - - public static ContainerTag section(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("section").withText(text), shortAttr); - } - - public static ContainerTag section(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("section").with(dc), shortAttr); - } - - public static SelectTag select() { - return new SelectTag(); - } - - public static SelectTag select(String text) { - return (SelectTag)new SelectTag().withText(text); - } - - public static SelectTag select(DomContent... dc) { - return (SelectTag)new SelectTag().with(dc); - } - - public static SelectTag select(Attr.ShortForm shortAttr) { - return (SelectTag)Attr.addTo(new SelectTag(), shortAttr); - } - - public static SelectTag select(Attr.ShortForm shortAttr, String text) { - return (SelectTag)Attr.addTo(new SelectTag().withText(text), shortAttr); - } - - public static SelectTag select(Attr.ShortForm shortAttr, DomContent... dc) { - return (SelectTag)Attr.addTo(new SelectTag().with(dc), shortAttr); - } - - public static ContainerTag small() { - return new ContainerTag("small"); - } - - public static ContainerTag small(String text) { - return new ContainerTag("small").withText(text); - } - - public static ContainerTag small(DomContent... dc) { - return new ContainerTag("small").with(dc); - } - - public static ContainerTag small(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("small"), shortAttr); - } - - public static ContainerTag small(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("small").withText(text), shortAttr); - } - - public static ContainerTag small(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("small").with(dc), shortAttr); - } - - public static ContainerTag span() { - return new ContainerTag("span"); - } - - public static ContainerTag span(String text) { - return new ContainerTag("span").withText(text); - } - - public static ContainerTag span(DomContent... dc) { - return new ContainerTag("span").with(dc); - } - - public static ContainerTag span(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("span"), shortAttr); - } - - public static ContainerTag span(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("span").withText(text), shortAttr); - } - - public static ContainerTag span(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("span").with(dc), shortAttr); - } - - public static ContainerTag strong() { - return new ContainerTag("strong"); - } - - public static ContainerTag strong(String text) { - return new ContainerTag("strong").withText(text); - } - - public static ContainerTag strong(DomContent... dc) { - return new ContainerTag("strong").with(dc); - } - - public static ContainerTag strong(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("strong"), shortAttr); - } - - public static ContainerTag strong(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("strong").withText(text), shortAttr); - } - - public static ContainerTag strong(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("strong").with(dc), shortAttr); - } - - public static ContainerTag style() { - return new ContainerTag("style"); - } - - public static ContainerTag style(String text) { - return new ContainerTag("style").withText(text); - } - - public static ContainerTag style(DomContent... dc) { - return new ContainerTag("style").with(dc); - } - - public static ContainerTag style(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("style"), shortAttr); - } - - public static ContainerTag style(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("style").withText(text), shortAttr); - } - - public static ContainerTag style(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("style").with(dc), shortAttr); - } - - public static ContainerTag sub() { - return new ContainerTag("sub"); - } - - public static ContainerTag sub(String text) { - return new ContainerTag("sub").withText(text); - } - - public static ContainerTag sub(DomContent... dc) { - return new ContainerTag("sub").with(dc); - } - - public static ContainerTag sub(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("sub"), shortAttr); - } - - public static ContainerTag sub(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("sub").withText(text), shortAttr); - } - - public static ContainerTag sub(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("sub").with(dc), shortAttr); - } - - public static ContainerTag summary() { - return new ContainerTag("summary"); - } - - public static ContainerTag summary(String text) { - return new ContainerTag("summary").withText(text); - } - - public static ContainerTag summary(DomContent... dc) { - return new ContainerTag("summary").with(dc); - } - - public static ContainerTag summary(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("summary"), shortAttr); - } - - public static ContainerTag summary(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("summary").withText(text), shortAttr); - } - - public static ContainerTag summary(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("summary").with(dc), shortAttr); - } - - public static ContainerTag sup() { - return new ContainerTag("sup"); - } - - public static ContainerTag sup(String text) { - return new ContainerTag("sup").withText(text); - } - - public static ContainerTag sup(DomContent... dc) { - return new ContainerTag("sup").with(dc); - } - - public static ContainerTag sup(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("sup"), shortAttr); - } - - public static ContainerTag sup(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("sup").withText(text), shortAttr); - } - - public static ContainerTag sup(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("sup").with(dc), shortAttr); - } - - public static ContainerTag table() { - return new ContainerTag("table"); - } - - public static ContainerTag table(String text) { - return new ContainerTag("table").withText(text); - } - - public static ContainerTag table(DomContent... dc) { - return new ContainerTag("table").with(dc); - } - - public static ContainerTag table(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("table"), shortAttr); - } - - public static ContainerTag table(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("table").withText(text), shortAttr); - } - - public static ContainerTag table(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("table").with(dc), shortAttr); - } - - public static ContainerTag tbody() { - return new ContainerTag("tbody"); - } - - public static ContainerTag tbody(String text) { - return new ContainerTag("tbody").withText(text); - } - - public static ContainerTag tbody(DomContent... dc) { - return new ContainerTag("tbody").with(dc); - } - - public static ContainerTag tbody(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("tbody"), shortAttr); - } - - public static ContainerTag tbody(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("tbody").withText(text), shortAttr); - } - - public static ContainerTag tbody(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("tbody").with(dc), shortAttr); - } - - public static ContainerTag td() { - return new ContainerTag("td"); - } - - public static ContainerTag td(String text) { - return new ContainerTag("td").withText(text); - } - - public static ContainerTag td(DomContent... dc) { - return new ContainerTag("td").with(dc); - } - - public static ContainerTag td(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("td"), shortAttr); - } - - public static ContainerTag td(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("td").withText(text), shortAttr); - } - - public static ContainerTag td(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("td").with(dc), shortAttr); - } - - public static TextAreaTag textarea() { - return new TextAreaTag(); - } - - public static TextAreaTag textarea(String text) { - return (TextAreaTag)new TextAreaTag().withText(text); - } - - public static TextAreaTag textarea(DomContent... dc) { - return (TextAreaTag)new TextAreaTag().with(dc); - } - - public static TextAreaTag textarea(Attr.ShortForm shortAttr) { - return (TextAreaTag)Attr.addTo(new TextAreaTag(), shortAttr); - } - - public static TextAreaTag textarea(Attr.ShortForm shortAttr, String text) { - return (TextAreaTag)Attr.addTo(new TextAreaTag().withText(text), shortAttr); - } - - public static TextAreaTag textarea(Attr.ShortForm shortAttr, DomContent... dc) { - return (TextAreaTag)Attr.addTo(new TextAreaTag().with(dc), shortAttr); - } - - public static ContainerTag tfoot() { - return new ContainerTag("tfoot"); - } - - public static ContainerTag tfoot(String text) { - return new ContainerTag("tfoot").withText(text); - } - - public static ContainerTag tfoot(DomContent... dc) { - return new ContainerTag("tfoot").with(dc); - } - - public static ContainerTag tfoot(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("tfoot"), shortAttr); - } - - public static ContainerTag tfoot(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("tfoot").withText(text), shortAttr); - } - - public static ContainerTag tfoot(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("tfoot").with(dc), shortAttr); - } - - public static ContainerTag th() { - return new ContainerTag("th"); - } - - public static ContainerTag th(String text) { - return new ContainerTag("th").withText(text); - } - - public static ContainerTag th(DomContent... dc) { - return new ContainerTag("th").with(dc); - } - - public static ContainerTag th(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("th"), shortAttr); - } - - public static ContainerTag th(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("th").withText(text), shortAttr); - } - - public static ContainerTag th(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("th").with(dc), shortAttr); - } - - public static ContainerTag thead() { - return new ContainerTag("thead"); - } - - public static ContainerTag thead(String text) { - return new ContainerTag("thead").withText(text); - } - - public static ContainerTag thead(DomContent... dc) { - return new ContainerTag("thead").with(dc); - } - - public static ContainerTag thead(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("thead"), shortAttr); - } - - public static ContainerTag thead(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("thead").withText(text), shortAttr); - } - - public static ContainerTag thead(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("thead").with(dc), shortAttr); - } - - public static ContainerTag time() { - return new ContainerTag("time"); - } - - public static ContainerTag time(String text) { - return new ContainerTag("time").withText(text); - } - - public static ContainerTag time(DomContent... dc) { - return new ContainerTag("time").with(dc); - } - - public static ContainerTag time(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("time"), shortAttr); - } - - public static ContainerTag time(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("time").withText(text), shortAttr); - } - - public static ContainerTag time(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("time").with(dc), shortAttr); - } - - public static ContainerTag title() { - return new ContainerTag("title"); - } - - public static ContainerTag title(String text) { - return new ContainerTag("title").withText(text); - } - - public static ContainerTag title(DomContent... dc) { - return new ContainerTag("title").with(dc); - } - - public static ContainerTag title(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("title"), shortAttr); - } - - public static ContainerTag title(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("title").withText(text), shortAttr); - } - - public static ContainerTag title(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("title").with(dc), shortAttr); - } - - public static ContainerTag tr() { - return new ContainerTag("tr"); - } - - public static ContainerTag tr(String text) { - return new ContainerTag("tr").withText(text); - } - - public static ContainerTag tr(DomContent... dc) { - return new ContainerTag("tr").with(dc); - } - - public static ContainerTag tr(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("tr"), shortAttr); - } - - public static ContainerTag tr(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("tr").withText(text), shortAttr); - } - - public static ContainerTag tr(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("tr").with(dc), shortAttr); - } - - public static ContainerTag u() { - return new ContainerTag("u"); - } - - public static ContainerTag u(String text) { - return new ContainerTag("u").withText(text); - } - - public static ContainerTag u(DomContent... dc) { - return new ContainerTag("u").with(dc); - } - - public static ContainerTag u(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("u"), shortAttr); - } - - public static ContainerTag u(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("u").withText(text), shortAttr); - } - - public static ContainerTag u(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("u").with(dc), shortAttr); - } - - public static ContainerTag ul() { - return new ContainerTag("ul"); - } - - public static ContainerTag ul(String text) { - return new ContainerTag("ul").withText(text); - } - - public static ContainerTag ul(DomContent... dc) { - return new ContainerTag("ul").with(dc); - } - - public static ContainerTag ul(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("ul"), shortAttr); - } - - public static ContainerTag ul(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("ul").withText(text), shortAttr); - } - - public static ContainerTag ul(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("ul").with(dc), shortAttr); - } - - public static ContainerTag var() { - return new ContainerTag("var"); - } - - public static ContainerTag var(String text) { - return new ContainerTag("var").withText(text); - } - - public static ContainerTag var(DomContent... dc) { - return new ContainerTag("var").with(dc); - } - - public static ContainerTag var(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("var"), shortAttr); - } - - public static ContainerTag var(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("var").withText(text), shortAttr); - } - public static ContainerTag var(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("var").with(dc), shortAttr); - } - public static ContainerTag video() { - return new ContainerTag("video"); - } - public static ContainerTag video(String text) { - return new ContainerTag("video").withText(text); - } - public static ContainerTag video(DomContent... dc) { - return new ContainerTag("video").with(dc); - } + // EmptyTags, generated in class j2html.tags.generators.TagCreatorCodeGenerator + public static AreaTag area () { return new AreaTag(); } + public static AreaTag area (Attr.ShortForm shortAttr) { return (AreaTag) Attr.addTo( new AreaTag(), shortAttr); } - public static ContainerTag video(Attr.ShortForm shortAttr) { - return Attr.addTo(new ContainerTag("video"), shortAttr); - } + public static BaseTag base () { return new BaseTag(); } + public static BaseTag base (Attr.ShortForm shortAttr) { return (BaseTag) Attr.addTo( new BaseTag(), shortAttr); } - public static ContainerTag video(Attr.ShortForm shortAttr, String text) { - return Attr.addTo(new ContainerTag("video").withText(text), shortAttr); - } + public static BrTag br () { return new BrTag(); } + public static BrTag br (Attr.ShortForm shortAttr) { return (BrTag) Attr.addTo( new BrTag(), shortAttr); } - public static ContainerTag video(Attr.ShortForm shortAttr, DomContent... dc) { - return Attr.addTo(new ContainerTag("video").with(dc), shortAttr); - } + public static ColTag col () { return new ColTag(); } + public static ColTag col (Attr.ShortForm shortAttr) { return (ColTag) Attr.addTo( new ColTag(), shortAttr); } + + public static EmbedTag embed () { return new EmbedTag(); } + public static EmbedTag embed (Attr.ShortForm shortAttr) { return (EmbedTag) Attr.addTo( new EmbedTag(), shortAttr); } + + public static HrTag hr () { return new HrTag(); } + public static HrTag hr (Attr.ShortForm shortAttr) { return (HrTag) Attr.addTo( new HrTag(), shortAttr); } + + public static ImgTag img () { return new ImgTag(); } + public static ImgTag img (Attr.ShortForm shortAttr) { return (ImgTag) Attr.addTo( new ImgTag(), shortAttr); } + + public static InputTag input () { return new InputTag(); } + public static InputTag input (Attr.ShortForm shortAttr) { return (InputTag) Attr.addTo( new InputTag(), shortAttr); } + + public static KeygenTag keygen () { return new KeygenTag(); } + public static KeygenTag keygen (Attr.ShortForm shortAttr) { return (KeygenTag) Attr.addTo( new KeygenTag(), shortAttr); } + + public static LinkTag link () { return new LinkTag(); } + public static LinkTag link (Attr.ShortForm shortAttr) { return (LinkTag) Attr.addTo( new LinkTag(), shortAttr); } + + public static MetaTag meta () { return new MetaTag(); } + public static MetaTag meta (Attr.ShortForm shortAttr) { return (MetaTag) Attr.addTo( new MetaTag(), shortAttr); } + + public static ParamTag param () { return new ParamTag(); } + public static ParamTag param (Attr.ShortForm shortAttr) { return (ParamTag) Attr.addTo( new ParamTag(), shortAttr); } + + public static SourceTag source () { return new SourceTag(); } + public static SourceTag source (Attr.ShortForm shortAttr) { return (SourceTag) Attr.addTo( new SourceTag(), shortAttr); } + + public static TrackTag track () { return new TrackTag(); } + public static TrackTag track (Attr.ShortForm shortAttr) { return (TrackTag) Attr.addTo( new TrackTag(), shortAttr); } + + public static WbrTag wbr () { return new WbrTag(); } + public static WbrTag wbr (Attr.ShortForm shortAttr) { return (WbrTag) Attr.addTo( new WbrTag(), shortAttr); } + + // ContainerTags, generated in class j2html.tags.generators.TagCreatorCodeGenerator + public static ATag a () { return (ATag) new ATag(); } + public static ATag a (String text) { return (ATag) new ATag().withText(text); } + public static ATag a (DomContent... dc) { return (ATag) new ATag().with(dc); } + public static ATag a (Attr.ShortForm shortAttr) { return (ATag) Attr.addTo( new ATag(), shortAttr); } + public static ATag a (Attr.ShortForm shortAttr, String text) { return (ATag) Attr.addTo( new ATag().withText(text), shortAttr); } + public static ATag a (Attr.ShortForm shortAttr, DomContent... dc) { return (ATag) Attr.addTo( new ATag().with(dc), shortAttr); } + + public static AbbrTag abbr () { return (AbbrTag) new AbbrTag(); } + public static AbbrTag abbr (String text) { return (AbbrTag) new AbbrTag().withText(text); } + public static AbbrTag abbr (DomContent... dc) { return (AbbrTag) new AbbrTag().with(dc); } + public static AbbrTag abbr (Attr.ShortForm shortAttr) { return (AbbrTag) Attr.addTo( new AbbrTag(), shortAttr); } + public static AbbrTag abbr (Attr.ShortForm shortAttr, String text) { return (AbbrTag) Attr.addTo( new AbbrTag().withText(text), shortAttr); } + public static AbbrTag abbr (Attr.ShortForm shortAttr, DomContent... dc) { return (AbbrTag) Attr.addTo( new AbbrTag().with(dc), shortAttr); } + + public static AddressTag address () { return (AddressTag) new AddressTag(); } + public static AddressTag address (String text) { return (AddressTag) new AddressTag().withText(text); } + public static AddressTag address (DomContent... dc) { return (AddressTag) new AddressTag().with(dc); } + public static AddressTag address (Attr.ShortForm shortAttr) { return (AddressTag) Attr.addTo( new AddressTag(), shortAttr); } + public static AddressTag address (Attr.ShortForm shortAttr, String text) { return (AddressTag) Attr.addTo( new AddressTag().withText(text), shortAttr); } + public static AddressTag address (Attr.ShortForm shortAttr, DomContent... dc) { return (AddressTag) Attr.addTo( new AddressTag().with(dc), shortAttr); } + + public static ArticleTag article () { return (ArticleTag) new ArticleTag(); } + public static ArticleTag article (String text) { return (ArticleTag) new ArticleTag().withText(text); } + public static ArticleTag article (DomContent... dc) { return (ArticleTag) new ArticleTag().with(dc); } + public static ArticleTag article (Attr.ShortForm shortAttr) { return (ArticleTag) Attr.addTo( new ArticleTag(), shortAttr); } + public static ArticleTag article (Attr.ShortForm shortAttr, String text) { return (ArticleTag) Attr.addTo( new ArticleTag().withText(text), shortAttr); } + public static ArticleTag article (Attr.ShortForm shortAttr, DomContent... dc) { return (ArticleTag) Attr.addTo( new ArticleTag().with(dc), shortAttr); } + + public static AsideTag aside () { return (AsideTag) new AsideTag(); } + public static AsideTag aside (String text) { return (AsideTag) new AsideTag().withText(text); } + public static AsideTag aside (DomContent... dc) { return (AsideTag) new AsideTag().with(dc); } + public static AsideTag aside (Attr.ShortForm shortAttr) { return (AsideTag) Attr.addTo( new AsideTag(), shortAttr); } + public static AsideTag aside (Attr.ShortForm shortAttr, String text) { return (AsideTag) Attr.addTo( new AsideTag().withText(text), shortAttr); } + public static AsideTag aside (Attr.ShortForm shortAttr, DomContent... dc) { return (AsideTag) Attr.addTo( new AsideTag().with(dc), shortAttr); } + + public static AudioTag audio () { return (AudioTag) new AudioTag(); } + public static AudioTag audio (String text) { return (AudioTag) new AudioTag().withText(text); } + public static AudioTag audio (DomContent... dc) { return (AudioTag) new AudioTag().with(dc); } + public static AudioTag audio (Attr.ShortForm shortAttr) { return (AudioTag) Attr.addTo( new AudioTag(), shortAttr); } + public static AudioTag audio (Attr.ShortForm shortAttr, String text) { return (AudioTag) Attr.addTo( new AudioTag().withText(text), shortAttr); } + public static AudioTag audio (Attr.ShortForm shortAttr, DomContent... dc) { return (AudioTag) Attr.addTo( new AudioTag().with(dc), shortAttr); } + + public static BTag b () { return (BTag) new BTag(); } + public static BTag b (String text) { return (BTag) new BTag().withText(text); } + public static BTag b (DomContent... dc) { return (BTag) new BTag().with(dc); } + public static BTag b (Attr.ShortForm shortAttr) { return (BTag) Attr.addTo( new BTag(), shortAttr); } + public static BTag b (Attr.ShortForm shortAttr, String text) { return (BTag) Attr.addTo( new BTag().withText(text), shortAttr); } + public static BTag b (Attr.ShortForm shortAttr, DomContent... dc) { return (BTag) Attr.addTo( new BTag().with(dc), shortAttr); } + + public static BdiTag bdi () { return (BdiTag) new BdiTag(); } + public static BdiTag bdi (String text) { return (BdiTag) new BdiTag().withText(text); } + public static BdiTag bdi (DomContent... dc) { return (BdiTag) new BdiTag().with(dc); } + public static BdiTag bdi (Attr.ShortForm shortAttr) { return (BdiTag) Attr.addTo( new BdiTag(), shortAttr); } + public static BdiTag bdi (Attr.ShortForm shortAttr, String text) { return (BdiTag) Attr.addTo( new BdiTag().withText(text), shortAttr); } + public static BdiTag bdi (Attr.ShortForm shortAttr, DomContent... dc) { return (BdiTag) Attr.addTo( new BdiTag().with(dc), shortAttr); } + + public static BdoTag bdo () { return (BdoTag) new BdoTag(); } + public static BdoTag bdo (String text) { return (BdoTag) new BdoTag().withText(text); } + public static BdoTag bdo (DomContent... dc) { return (BdoTag) new BdoTag().with(dc); } + public static BdoTag bdo (Attr.ShortForm shortAttr) { return (BdoTag) Attr.addTo( new BdoTag(), shortAttr); } + public static BdoTag bdo (Attr.ShortForm shortAttr, String text) { return (BdoTag) Attr.addTo( new BdoTag().withText(text), shortAttr); } + public static BdoTag bdo (Attr.ShortForm shortAttr, DomContent... dc) { return (BdoTag) Attr.addTo( new BdoTag().with(dc), shortAttr); } + + public static BlockquoteTag blockquote () { return (BlockquoteTag) new BlockquoteTag(); } + public static BlockquoteTag blockquote (String text) { return (BlockquoteTag) new BlockquoteTag().withText(text); } + public static BlockquoteTag blockquote (DomContent... dc) { return (BlockquoteTag) new BlockquoteTag().with(dc); } + public static BlockquoteTag blockquote (Attr.ShortForm shortAttr) { return (BlockquoteTag) Attr.addTo( new BlockquoteTag(), shortAttr); } + public static BlockquoteTag blockquote (Attr.ShortForm shortAttr, String text) { return (BlockquoteTag) Attr.addTo( new BlockquoteTag().withText(text), shortAttr); } + public static BlockquoteTag blockquote (Attr.ShortForm shortAttr, DomContent... dc){ return (BlockquoteTag) Attr.addTo( new BlockquoteTag().with(dc), shortAttr); } + + public static ButtonTag button () { return (ButtonTag) new ButtonTag(); } + public static ButtonTag button (String text) { return (ButtonTag) new ButtonTag().withText(text); } + public static ButtonTag button (DomContent... dc) { return (ButtonTag) new ButtonTag().with(dc); } + public static ButtonTag button (Attr.ShortForm shortAttr) { return (ButtonTag) Attr.addTo( new ButtonTag(), shortAttr); } + public static ButtonTag button (Attr.ShortForm shortAttr, String text) { return (ButtonTag) Attr.addTo( new ButtonTag().withText(text), shortAttr); } + public static ButtonTag button (Attr.ShortForm shortAttr, DomContent... dc) { return (ButtonTag) Attr.addTo( new ButtonTag().with(dc), shortAttr); } + + public static CanvasTag canvas () { return (CanvasTag) new CanvasTag(); } + public static CanvasTag canvas (String text) { return (CanvasTag) new CanvasTag().withText(text); } + public static CanvasTag canvas (DomContent... dc) { return (CanvasTag) new CanvasTag().with(dc); } + public static CanvasTag canvas (Attr.ShortForm shortAttr) { return (CanvasTag) Attr.addTo( new CanvasTag(), shortAttr); } + public static CanvasTag canvas (Attr.ShortForm shortAttr, String text) { return (CanvasTag) Attr.addTo( new CanvasTag().withText(text), shortAttr); } + public static CanvasTag canvas (Attr.ShortForm shortAttr, DomContent... dc) { return (CanvasTag) Attr.addTo( new CanvasTag().with(dc), shortAttr); } + + public static CaptionTag caption () { return (CaptionTag) new CaptionTag(); } + public static CaptionTag caption (String text) { return (CaptionTag) new CaptionTag().withText(text); } + public static CaptionTag caption (DomContent... dc) { return (CaptionTag) new CaptionTag().with(dc); } + public static CaptionTag caption (Attr.ShortForm shortAttr) { return (CaptionTag) Attr.addTo( new CaptionTag(), shortAttr); } + public static CaptionTag caption (Attr.ShortForm shortAttr, String text) { return (CaptionTag) Attr.addTo( new CaptionTag().withText(text), shortAttr); } + public static CaptionTag caption (Attr.ShortForm shortAttr, DomContent... dc) { return (CaptionTag) Attr.addTo( new CaptionTag().with(dc), shortAttr); } + + public static CiteTag cite () { return (CiteTag) new CiteTag(); } + public static CiteTag cite (String text) { return (CiteTag) new CiteTag().withText(text); } + public static CiteTag cite (DomContent... dc) { return (CiteTag) new CiteTag().with(dc); } + public static CiteTag cite (Attr.ShortForm shortAttr) { return (CiteTag) Attr.addTo( new CiteTag(), shortAttr); } + public static CiteTag cite (Attr.ShortForm shortAttr, String text) { return (CiteTag) Attr.addTo( new CiteTag().withText(text), shortAttr); } + public static CiteTag cite (Attr.ShortForm shortAttr, DomContent... dc) { return (CiteTag) Attr.addTo( new CiteTag().with(dc), shortAttr); } + + public static CodeTag code () { return (CodeTag) new CodeTag(); } + public static CodeTag code (String text) { return (CodeTag) new CodeTag().withText(text); } + public static CodeTag code (DomContent... dc) { return (CodeTag) new CodeTag().with(dc); } + public static CodeTag code (Attr.ShortForm shortAttr) { return (CodeTag) Attr.addTo( new CodeTag(), shortAttr); } + public static CodeTag code (Attr.ShortForm shortAttr, String text) { return (CodeTag) Attr.addTo( new CodeTag().withText(text), shortAttr); } + public static CodeTag code (Attr.ShortForm shortAttr, DomContent... dc) { return (CodeTag) Attr.addTo( new CodeTag().with(dc), shortAttr); } + + public static ColgroupTag colgroup () { return (ColgroupTag) new ColgroupTag(); } + public static ColgroupTag colgroup (String text) { return (ColgroupTag) new ColgroupTag().withText(text); } + public static ColgroupTag colgroup (DomContent... dc) { return (ColgroupTag) new ColgroupTag().with(dc); } + public static ColgroupTag colgroup (Attr.ShortForm shortAttr) { return (ColgroupTag) Attr.addTo( new ColgroupTag(), shortAttr); } + public static ColgroupTag colgroup (Attr.ShortForm shortAttr, String text) { return (ColgroupTag) Attr.addTo( new ColgroupTag().withText(text), shortAttr); } + public static ColgroupTag colgroup (Attr.ShortForm shortAttr, DomContent... dc) { return (ColgroupTag) Attr.addTo( new ColgroupTag().with(dc), shortAttr); } + + public static DatalistTag datalist () { return (DatalistTag) new DatalistTag(); } + public static DatalistTag datalist (String text) { return (DatalistTag) new DatalistTag().withText(text); } + public static DatalistTag datalist (DomContent... dc) { return (DatalistTag) new DatalistTag().with(dc); } + public static DatalistTag datalist (Attr.ShortForm shortAttr) { return (DatalistTag) Attr.addTo( new DatalistTag(), shortAttr); } + public static DatalistTag datalist (Attr.ShortForm shortAttr, String text) { return (DatalistTag) Attr.addTo( new DatalistTag().withText(text), shortAttr); } + public static DatalistTag datalist (Attr.ShortForm shortAttr, DomContent... dc) { return (DatalistTag) Attr.addTo( new DatalistTag().with(dc), shortAttr); } + + public static DdTag dd () { return (DdTag) new DdTag(); } + public static DdTag dd (String text) { return (DdTag) new DdTag().withText(text); } + public static DdTag dd (DomContent... dc) { return (DdTag) new DdTag().with(dc); } + public static DdTag dd (Attr.ShortForm shortAttr) { return (DdTag) Attr.addTo( new DdTag(), shortAttr); } + public static DdTag dd (Attr.ShortForm shortAttr, String text) { return (DdTag) Attr.addTo( new DdTag().withText(text), shortAttr); } + public static DdTag dd (Attr.ShortForm shortAttr, DomContent... dc) { return (DdTag) Attr.addTo( new DdTag().with(dc), shortAttr); } + + public static DelTag del () { return (DelTag) new DelTag(); } + public static DelTag del (String text) { return (DelTag) new DelTag().withText(text); } + public static DelTag del (DomContent... dc) { return (DelTag) new DelTag().with(dc); } + public static DelTag del (Attr.ShortForm shortAttr) { return (DelTag) Attr.addTo( new DelTag(), shortAttr); } + public static DelTag del (Attr.ShortForm shortAttr, String text) { return (DelTag) Attr.addTo( new DelTag().withText(text), shortAttr); } + public static DelTag del (Attr.ShortForm shortAttr, DomContent... dc) { return (DelTag) Attr.addTo( new DelTag().with(dc), shortAttr); } + + public static DetailsTag details () { return (DetailsTag) new DetailsTag(); } + public static DetailsTag details (String text) { return (DetailsTag) new DetailsTag().withText(text); } + public static DetailsTag details (DomContent... dc) { return (DetailsTag) new DetailsTag().with(dc); } + public static DetailsTag details (Attr.ShortForm shortAttr) { return (DetailsTag) Attr.addTo( new DetailsTag(), shortAttr); } + public static DetailsTag details (Attr.ShortForm shortAttr, String text) { return (DetailsTag) Attr.addTo( new DetailsTag().withText(text), shortAttr); } + public static DetailsTag details (Attr.ShortForm shortAttr, DomContent... dc) { return (DetailsTag) Attr.addTo( new DetailsTag().with(dc), shortAttr); } + + public static DfnTag dfn () { return (DfnTag) new DfnTag(); } + public static DfnTag dfn (String text) { return (DfnTag) new DfnTag().withText(text); } + public static DfnTag dfn (DomContent... dc) { return (DfnTag) new DfnTag().with(dc); } + public static DfnTag dfn (Attr.ShortForm shortAttr) { return (DfnTag) Attr.addTo( new DfnTag(), shortAttr); } + public static DfnTag dfn (Attr.ShortForm shortAttr, String text) { return (DfnTag) Attr.addTo( new DfnTag().withText(text), shortAttr); } + public static DfnTag dfn (Attr.ShortForm shortAttr, DomContent... dc) { return (DfnTag) Attr.addTo( new DfnTag().with(dc), shortAttr); } + + public static DialogTag dialog () { return (DialogTag) new DialogTag(); } + public static DialogTag dialog (String text) { return (DialogTag) new DialogTag().withText(text); } + public static DialogTag dialog (DomContent... dc) { return (DialogTag) new DialogTag().with(dc); } + public static DialogTag dialog (Attr.ShortForm shortAttr) { return (DialogTag) Attr.addTo( new DialogTag(), shortAttr); } + public static DialogTag dialog (Attr.ShortForm shortAttr, String text) { return (DialogTag) Attr.addTo( new DialogTag().withText(text), shortAttr); } + public static DialogTag dialog (Attr.ShortForm shortAttr, DomContent... dc) { return (DialogTag) Attr.addTo( new DialogTag().with(dc), shortAttr); } + + public static DivTag div () { return (DivTag) new DivTag(); } + public static DivTag div (String text) { return (DivTag) new DivTag().withText(text); } + public static DivTag div (DomContent... dc) { return (DivTag) new DivTag().with(dc); } + public static DivTag div (Attr.ShortForm shortAttr) { return (DivTag) Attr.addTo( new DivTag(), shortAttr); } + public static DivTag div (Attr.ShortForm shortAttr, String text) { return (DivTag) Attr.addTo( new DivTag().withText(text), shortAttr); } + public static DivTag div (Attr.ShortForm shortAttr, DomContent... dc) { return (DivTag) Attr.addTo( new DivTag().with(dc), shortAttr); } + + public static DlTag dl () { return (DlTag) new DlTag(); } + public static DlTag dl (String text) { return (DlTag) new DlTag().withText(text); } + public static DlTag dl (DomContent... dc) { return (DlTag) new DlTag().with(dc); } + public static DlTag dl (Attr.ShortForm shortAttr) { return (DlTag) Attr.addTo( new DlTag(), shortAttr); } + public static DlTag dl (Attr.ShortForm shortAttr, String text) { return (DlTag) Attr.addTo( new DlTag().withText(text), shortAttr); } + public static DlTag dl (Attr.ShortForm shortAttr, DomContent... dc) { return (DlTag) Attr.addTo( new DlTag().with(dc), shortAttr); } + + public static DtTag dt () { return (DtTag) new DtTag(); } + public static DtTag dt (String text) { return (DtTag) new DtTag().withText(text); } + public static DtTag dt (DomContent... dc) { return (DtTag) new DtTag().with(dc); } + public static DtTag dt (Attr.ShortForm shortAttr) { return (DtTag) Attr.addTo( new DtTag(), shortAttr); } + public static DtTag dt (Attr.ShortForm shortAttr, String text) { return (DtTag) Attr.addTo( new DtTag().withText(text), shortAttr); } + public static DtTag dt (Attr.ShortForm shortAttr, DomContent... dc) { return (DtTag) Attr.addTo( new DtTag().with(dc), shortAttr); } + + public static EmTag em () { return (EmTag) new EmTag(); } + public static EmTag em (String text) { return (EmTag) new EmTag().withText(text); } + public static EmTag em (DomContent... dc) { return (EmTag) new EmTag().with(dc); } + public static EmTag em (Attr.ShortForm shortAttr) { return (EmTag) Attr.addTo( new EmTag(), shortAttr); } + public static EmTag em (Attr.ShortForm shortAttr, String text) { return (EmTag) Attr.addTo( new EmTag().withText(text), shortAttr); } + public static EmTag em (Attr.ShortForm shortAttr, DomContent... dc) { return (EmTag) Attr.addTo( new EmTag().with(dc), shortAttr); } + + public static FieldsetTag fieldset () { return (FieldsetTag) new FieldsetTag(); } + public static FieldsetTag fieldset (String text) { return (FieldsetTag) new FieldsetTag().withText(text); } + public static FieldsetTag fieldset (DomContent... dc) { return (FieldsetTag) new FieldsetTag().with(dc); } + public static FieldsetTag fieldset (Attr.ShortForm shortAttr) { return (FieldsetTag) Attr.addTo( new FieldsetTag(), shortAttr); } + public static FieldsetTag fieldset (Attr.ShortForm shortAttr, String text) { return (FieldsetTag) Attr.addTo( new FieldsetTag().withText(text), shortAttr); } + public static FieldsetTag fieldset (Attr.ShortForm shortAttr, DomContent... dc) { return (FieldsetTag) Attr.addTo( new FieldsetTag().with(dc), shortAttr); } + + public static FigcaptionTag figcaption () { return (FigcaptionTag) new FigcaptionTag(); } + public static FigcaptionTag figcaption (String text) { return (FigcaptionTag) new FigcaptionTag().withText(text); } + public static FigcaptionTag figcaption (DomContent... dc) { return (FigcaptionTag) new FigcaptionTag().with(dc); } + public static FigcaptionTag figcaption (Attr.ShortForm shortAttr) { return (FigcaptionTag) Attr.addTo( new FigcaptionTag(), shortAttr); } + public static FigcaptionTag figcaption (Attr.ShortForm shortAttr, String text) { return (FigcaptionTag) Attr.addTo( new FigcaptionTag().withText(text), shortAttr); } + public static FigcaptionTag figcaption (Attr.ShortForm shortAttr, DomContent... dc){ return (FigcaptionTag) Attr.addTo( new FigcaptionTag().with(dc), shortAttr); } + + public static FigureTag figure () { return (FigureTag) new FigureTag(); } + public static FigureTag figure (String text) { return (FigureTag) new FigureTag().withText(text); } + public static FigureTag figure (DomContent... dc) { return (FigureTag) new FigureTag().with(dc); } + public static FigureTag figure (Attr.ShortForm shortAttr) { return (FigureTag) Attr.addTo( new FigureTag(), shortAttr); } + public static FigureTag figure (Attr.ShortForm shortAttr, String text) { return (FigureTag) Attr.addTo( new FigureTag().withText(text), shortAttr); } + public static FigureTag figure (Attr.ShortForm shortAttr, DomContent... dc) { return (FigureTag) Attr.addTo( new FigureTag().with(dc), shortAttr); } + + public static FooterTag footer () { return (FooterTag) new FooterTag(); } + public static FooterTag footer (String text) { return (FooterTag) new FooterTag().withText(text); } + public static FooterTag footer (DomContent... dc) { return (FooterTag) new FooterTag().with(dc); } + public static FooterTag footer (Attr.ShortForm shortAttr) { return (FooterTag) Attr.addTo( new FooterTag(), shortAttr); } + public static FooterTag footer (Attr.ShortForm shortAttr, String text) { return (FooterTag) Attr.addTo( new FooterTag().withText(text), shortAttr); } + public static FooterTag footer (Attr.ShortForm shortAttr, DomContent... dc) { return (FooterTag) Attr.addTo( new FooterTag().with(dc), shortAttr); } + + public static FormTag form () { return (FormTag) new FormTag(); } + public static FormTag form (String text) { return (FormTag) new FormTag().withText(text); } + public static FormTag form (DomContent... dc) { return (FormTag) new FormTag().with(dc); } + public static FormTag form (Attr.ShortForm shortAttr) { return (FormTag) Attr.addTo( new FormTag(), shortAttr); } + public static FormTag form (Attr.ShortForm shortAttr, String text) { return (FormTag) Attr.addTo( new FormTag().withText(text), shortAttr); } + public static FormTag form (Attr.ShortForm shortAttr, DomContent... dc) { return (FormTag) Attr.addTo( new FormTag().with(dc), shortAttr); } + + public static H1Tag h1 () { return (H1Tag) new H1Tag(); } + public static H1Tag h1 (String text) { return (H1Tag) new H1Tag().withText(text); } + public static H1Tag h1 (DomContent... dc) { return (H1Tag) new H1Tag().with(dc); } + public static H1Tag h1 (Attr.ShortForm shortAttr) { return (H1Tag) Attr.addTo( new H1Tag(), shortAttr); } + public static H1Tag h1 (Attr.ShortForm shortAttr, String text) { return (H1Tag) Attr.addTo( new H1Tag().withText(text), shortAttr); } + public static H1Tag h1 (Attr.ShortForm shortAttr, DomContent... dc) { return (H1Tag) Attr.addTo( new H1Tag().with(dc), shortAttr); } + + public static H2Tag h2 () { return (H2Tag) new H2Tag(); } + public static H2Tag h2 (String text) { return (H2Tag) new H2Tag().withText(text); } + public static H2Tag h2 (DomContent... dc) { return (H2Tag) new H2Tag().with(dc); } + public static H2Tag h2 (Attr.ShortForm shortAttr) { return (H2Tag) Attr.addTo( new H2Tag(), shortAttr); } + public static H2Tag h2 (Attr.ShortForm shortAttr, String text) { return (H2Tag) Attr.addTo( new H2Tag().withText(text), shortAttr); } + public static H2Tag h2 (Attr.ShortForm shortAttr, DomContent... dc) { return (H2Tag) Attr.addTo( new H2Tag().with(dc), shortAttr); } + + public static H3Tag h3 () { return (H3Tag) new H3Tag(); } + public static H3Tag h3 (String text) { return (H3Tag) new H3Tag().withText(text); } + public static H3Tag h3 (DomContent... dc) { return (H3Tag) new H3Tag().with(dc); } + public static H3Tag h3 (Attr.ShortForm shortAttr) { return (H3Tag) Attr.addTo( new H3Tag(), shortAttr); } + public static H3Tag h3 (Attr.ShortForm shortAttr, String text) { return (H3Tag) Attr.addTo( new H3Tag().withText(text), shortAttr); } + public static H3Tag h3 (Attr.ShortForm shortAttr, DomContent... dc) { return (H3Tag) Attr.addTo( new H3Tag().with(dc), shortAttr); } + + public static H4Tag h4 () { return (H4Tag) new H4Tag(); } + public static H4Tag h4 (String text) { return (H4Tag) new H4Tag().withText(text); } + public static H4Tag h4 (DomContent... dc) { return (H4Tag) new H4Tag().with(dc); } + public static H4Tag h4 (Attr.ShortForm shortAttr) { return (H4Tag) Attr.addTo( new H4Tag(), shortAttr); } + public static H4Tag h4 (Attr.ShortForm shortAttr, String text) { return (H4Tag) Attr.addTo( new H4Tag().withText(text), shortAttr); } + public static H4Tag h4 (Attr.ShortForm shortAttr, DomContent... dc) { return (H4Tag) Attr.addTo( new H4Tag().with(dc), shortAttr); } + + public static H5Tag h5 () { return (H5Tag) new H5Tag(); } + public static H5Tag h5 (String text) { return (H5Tag) new H5Tag().withText(text); } + public static H5Tag h5 (DomContent... dc) { return (H5Tag) new H5Tag().with(dc); } + public static H5Tag h5 (Attr.ShortForm shortAttr) { return (H5Tag) Attr.addTo( new H5Tag(), shortAttr); } + public static H5Tag h5 (Attr.ShortForm shortAttr, String text) { return (H5Tag) Attr.addTo( new H5Tag().withText(text), shortAttr); } + public static H5Tag h5 (Attr.ShortForm shortAttr, DomContent... dc) { return (H5Tag) Attr.addTo( new H5Tag().with(dc), shortAttr); } + + public static H6Tag h6 () { return (H6Tag) new H6Tag(); } + public static H6Tag h6 (String text) { return (H6Tag) new H6Tag().withText(text); } + public static H6Tag h6 (DomContent... dc) { return (H6Tag) new H6Tag().with(dc); } + public static H6Tag h6 (Attr.ShortForm shortAttr) { return (H6Tag) Attr.addTo( new H6Tag(), shortAttr); } + public static H6Tag h6 (Attr.ShortForm shortAttr, String text) { return (H6Tag) Attr.addTo( new H6Tag().withText(text), shortAttr); } + public static H6Tag h6 (Attr.ShortForm shortAttr, DomContent... dc) { return (H6Tag) Attr.addTo( new H6Tag().with(dc), shortAttr); } + + public static HeaderTag header () { return (HeaderTag) new HeaderTag(); } + public static HeaderTag header (String text) { return (HeaderTag) new HeaderTag().withText(text); } + public static HeaderTag header (DomContent... dc) { return (HeaderTag) new HeaderTag().with(dc); } + public static HeaderTag header (Attr.ShortForm shortAttr) { return (HeaderTag) Attr.addTo( new HeaderTag(), shortAttr); } + public static HeaderTag header (Attr.ShortForm shortAttr, String text) { return (HeaderTag) Attr.addTo( new HeaderTag().withText(text), shortAttr); } + public static HeaderTag header (Attr.ShortForm shortAttr, DomContent... dc) { return (HeaderTag) Attr.addTo( new HeaderTag().with(dc), shortAttr); } + + public static ITag i () { return (ITag) new ITag(); } + public static ITag i (String text) { return (ITag) new ITag().withText(text); } + public static ITag i (DomContent... dc) { return (ITag) new ITag().with(dc); } + public static ITag i (Attr.ShortForm shortAttr) { return (ITag) Attr.addTo( new ITag(), shortAttr); } + public static ITag i (Attr.ShortForm shortAttr, String text) { return (ITag) Attr.addTo( new ITag().withText(text), shortAttr); } + public static ITag i (Attr.ShortForm shortAttr, DomContent... dc) { return (ITag) Attr.addTo( new ITag().with(dc), shortAttr); } + + public static IframeTag iframe () { return (IframeTag) new IframeTag(); } + public static IframeTag iframe (String text) { return (IframeTag) new IframeTag().withText(text); } + public static IframeTag iframe (DomContent... dc) { return (IframeTag) new IframeTag().with(dc); } + public static IframeTag iframe (Attr.ShortForm shortAttr) { return (IframeTag) Attr.addTo( new IframeTag(), shortAttr); } + public static IframeTag iframe (Attr.ShortForm shortAttr, String text) { return (IframeTag) Attr.addTo( new IframeTag().withText(text), shortAttr); } + public static IframeTag iframe (Attr.ShortForm shortAttr, DomContent... dc) { return (IframeTag) Attr.addTo( new IframeTag().with(dc), shortAttr); } + + public static InsTag ins () { return (InsTag) new InsTag(); } + public static InsTag ins (String text) { return (InsTag) new InsTag().withText(text); } + public static InsTag ins (DomContent... dc) { return (InsTag) new InsTag().with(dc); } + public static InsTag ins (Attr.ShortForm shortAttr) { return (InsTag) Attr.addTo( new InsTag(), shortAttr); } + public static InsTag ins (Attr.ShortForm shortAttr, String text) { return (InsTag) Attr.addTo( new InsTag().withText(text), shortAttr); } + public static InsTag ins (Attr.ShortForm shortAttr, DomContent... dc) { return (InsTag) Attr.addTo( new InsTag().with(dc), shortAttr); } + + public static KbdTag kbd () { return (KbdTag) new KbdTag(); } + public static KbdTag kbd (String text) { return (KbdTag) new KbdTag().withText(text); } + public static KbdTag kbd (DomContent... dc) { return (KbdTag) new KbdTag().with(dc); } + public static KbdTag kbd (Attr.ShortForm shortAttr) { return (KbdTag) Attr.addTo( new KbdTag(), shortAttr); } + public static KbdTag kbd (Attr.ShortForm shortAttr, String text) { return (KbdTag) Attr.addTo( new KbdTag().withText(text), shortAttr); } + public static KbdTag kbd (Attr.ShortForm shortAttr, DomContent... dc) { return (KbdTag) Attr.addTo( new KbdTag().with(dc), shortAttr); } + + public static LabelTag label () { return (LabelTag) new LabelTag(); } + public static LabelTag label (String text) { return (LabelTag) new LabelTag().withText(text); } + public static LabelTag label (DomContent... dc) { return (LabelTag) new LabelTag().with(dc); } + public static LabelTag label (Attr.ShortForm shortAttr) { return (LabelTag) Attr.addTo( new LabelTag(), shortAttr); } + public static LabelTag label (Attr.ShortForm shortAttr, String text) { return (LabelTag) Attr.addTo( new LabelTag().withText(text), shortAttr); } + public static LabelTag label (Attr.ShortForm shortAttr, DomContent... dc) { return (LabelTag) Attr.addTo( new LabelTag().with(dc), shortAttr); } + + public static LegendTag legend () { return (LegendTag) new LegendTag(); } + public static LegendTag legend (String text) { return (LegendTag) new LegendTag().withText(text); } + public static LegendTag legend (DomContent... dc) { return (LegendTag) new LegendTag().with(dc); } + public static LegendTag legend (Attr.ShortForm shortAttr) { return (LegendTag) Attr.addTo( new LegendTag(), shortAttr); } + public static LegendTag legend (Attr.ShortForm shortAttr, String text) { return (LegendTag) Attr.addTo( new LegendTag().withText(text), shortAttr); } + public static LegendTag legend (Attr.ShortForm shortAttr, DomContent... dc) { return (LegendTag) Attr.addTo( new LegendTag().with(dc), shortAttr); } + + public static LiTag li () { return (LiTag) new LiTag(); } + public static LiTag li (String text) { return (LiTag) new LiTag().withText(text); } + public static LiTag li (DomContent... dc) { return (LiTag) new LiTag().with(dc); } + public static LiTag li (Attr.ShortForm shortAttr) { return (LiTag) Attr.addTo( new LiTag(), shortAttr); } + public static LiTag li (Attr.ShortForm shortAttr, String text) { return (LiTag) Attr.addTo( new LiTag().withText(text), shortAttr); } + public static LiTag li (Attr.ShortForm shortAttr, DomContent... dc) { return (LiTag) Attr.addTo( new LiTag().with(dc), shortAttr); } + + public static MainTag main () { return (MainTag) new MainTag(); } + public static MainTag main (String text) { return (MainTag) new MainTag().withText(text); } + public static MainTag main (DomContent... dc) { return (MainTag) new MainTag().with(dc); } + public static MainTag main (Attr.ShortForm shortAttr) { return (MainTag) Attr.addTo( new MainTag(), shortAttr); } + public static MainTag main (Attr.ShortForm shortAttr, String text) { return (MainTag) Attr.addTo( new MainTag().withText(text), shortAttr); } + public static MainTag main (Attr.ShortForm shortAttr, DomContent... dc) { return (MainTag) Attr.addTo( new MainTag().with(dc), shortAttr); } + + public static MapTag map () { return (MapTag) new MapTag(); } + public static MapTag map (String text) { return (MapTag) new MapTag().withText(text); } + public static MapTag map (DomContent... dc) { return (MapTag) new MapTag().with(dc); } + public static MapTag map (Attr.ShortForm shortAttr) { return (MapTag) Attr.addTo( new MapTag(), shortAttr); } + public static MapTag map (Attr.ShortForm shortAttr, String text) { return (MapTag) Attr.addTo( new MapTag().withText(text), shortAttr); } + public static MapTag map (Attr.ShortForm shortAttr, DomContent... dc) { return (MapTag) Attr.addTo( new MapTag().with(dc), shortAttr); } + + public static MarkTag mark () { return (MarkTag) new MarkTag(); } + public static MarkTag mark (String text) { return (MarkTag) new MarkTag().withText(text); } + public static MarkTag mark (DomContent... dc) { return (MarkTag) new MarkTag().with(dc); } + public static MarkTag mark (Attr.ShortForm shortAttr) { return (MarkTag) Attr.addTo( new MarkTag(), shortAttr); } + public static MarkTag mark (Attr.ShortForm shortAttr, String text) { return (MarkTag) Attr.addTo( new MarkTag().withText(text), shortAttr); } + public static MarkTag mark (Attr.ShortForm shortAttr, DomContent... dc) { return (MarkTag) Attr.addTo( new MarkTag().with(dc), shortAttr); } + + public static MenuTag menu () { return (MenuTag) new MenuTag(); } + public static MenuTag menu (String text) { return (MenuTag) new MenuTag().withText(text); } + public static MenuTag menu (DomContent... dc) { return (MenuTag) new MenuTag().with(dc); } + public static MenuTag menu (Attr.ShortForm shortAttr) { return (MenuTag) Attr.addTo( new MenuTag(), shortAttr); } + public static MenuTag menu (Attr.ShortForm shortAttr, String text) { return (MenuTag) Attr.addTo( new MenuTag().withText(text), shortAttr); } + public static MenuTag menu (Attr.ShortForm shortAttr, DomContent... dc) { return (MenuTag) Attr.addTo( new MenuTag().with(dc), shortAttr); } + + public static MenuitemTag menuitem () { return (MenuitemTag) new MenuitemTag(); } + public static MenuitemTag menuitem (String text) { return (MenuitemTag) new MenuitemTag().withText(text); } + public static MenuitemTag menuitem (DomContent... dc) { return (MenuitemTag) new MenuitemTag().with(dc); } + public static MenuitemTag menuitem (Attr.ShortForm shortAttr) { return (MenuitemTag) Attr.addTo( new MenuitemTag(), shortAttr); } + public static MenuitemTag menuitem (Attr.ShortForm shortAttr, String text) { return (MenuitemTag) Attr.addTo( new MenuitemTag().withText(text), shortAttr); } + public static MenuitemTag menuitem (Attr.ShortForm shortAttr, DomContent... dc) { return (MenuitemTag) Attr.addTo( new MenuitemTag().with(dc), shortAttr); } + + public static MeterTag meter () { return (MeterTag) new MeterTag(); } + public static MeterTag meter (String text) { return (MeterTag) new MeterTag().withText(text); } + public static MeterTag meter (DomContent... dc) { return (MeterTag) new MeterTag().with(dc); } + public static MeterTag meter (Attr.ShortForm shortAttr) { return (MeterTag) Attr.addTo( new MeterTag(), shortAttr); } + public static MeterTag meter (Attr.ShortForm shortAttr, String text) { return (MeterTag) Attr.addTo( new MeterTag().withText(text), shortAttr); } + public static MeterTag meter (Attr.ShortForm shortAttr, DomContent... dc) { return (MeterTag) Attr.addTo( new MeterTag().with(dc), shortAttr); } + + public static NavTag nav () { return (NavTag) new NavTag(); } + public static NavTag nav (String text) { return (NavTag) new NavTag().withText(text); } + public static NavTag nav (DomContent... dc) { return (NavTag) new NavTag().with(dc); } + public static NavTag nav (Attr.ShortForm shortAttr) { return (NavTag) Attr.addTo( new NavTag(), shortAttr); } + public static NavTag nav (Attr.ShortForm shortAttr, String text) { return (NavTag) Attr.addTo( new NavTag().withText(text), shortAttr); } + public static NavTag nav (Attr.ShortForm shortAttr, DomContent... dc) { return (NavTag) Attr.addTo( new NavTag().with(dc), shortAttr); } + + public static NoscriptTag noscript () { return (NoscriptTag) new NoscriptTag(); } + public static NoscriptTag noscript (String text) { return (NoscriptTag) new NoscriptTag().withText(text); } + public static NoscriptTag noscript (DomContent... dc) { return (NoscriptTag) new NoscriptTag().with(dc); } + public static NoscriptTag noscript (Attr.ShortForm shortAttr) { return (NoscriptTag) Attr.addTo( new NoscriptTag(), shortAttr); } + public static NoscriptTag noscript (Attr.ShortForm shortAttr, String text) { return (NoscriptTag) Attr.addTo( new NoscriptTag().withText(text), shortAttr); } + public static NoscriptTag noscript (Attr.ShortForm shortAttr, DomContent... dc) { return (NoscriptTag) Attr.addTo( new NoscriptTag().with(dc), shortAttr); } + + public static ObjectTag object () { return (ObjectTag) new ObjectTag(); } + public static ObjectTag object (String text) { return (ObjectTag) new ObjectTag().withText(text); } + public static ObjectTag object (DomContent... dc) { return (ObjectTag) new ObjectTag().with(dc); } + public static ObjectTag object (Attr.ShortForm shortAttr) { return (ObjectTag) Attr.addTo( new ObjectTag(), shortAttr); } + public static ObjectTag object (Attr.ShortForm shortAttr, String text) { return (ObjectTag) Attr.addTo( new ObjectTag().withText(text), shortAttr); } + public static ObjectTag object (Attr.ShortForm shortAttr, DomContent... dc) { return (ObjectTag) Attr.addTo( new ObjectTag().with(dc), shortAttr); } + + public static OlTag ol () { return (OlTag) new OlTag(); } + public static OlTag ol (String text) { return (OlTag) new OlTag().withText(text); } + public static OlTag ol (DomContent... dc) { return (OlTag) new OlTag().with(dc); } + public static OlTag ol (Attr.ShortForm shortAttr) { return (OlTag) Attr.addTo( new OlTag(), shortAttr); } + public static OlTag ol (Attr.ShortForm shortAttr, String text) { return (OlTag) Attr.addTo( new OlTag().withText(text), shortAttr); } + public static OlTag ol (Attr.ShortForm shortAttr, DomContent... dc) { return (OlTag) Attr.addTo( new OlTag().with(dc), shortAttr); } + + public static OptgroupTag optgroup () { return (OptgroupTag) new OptgroupTag(); } + public static OptgroupTag optgroup (String text) { return (OptgroupTag) new OptgroupTag().withText(text); } + public static OptgroupTag optgroup (DomContent... dc) { return (OptgroupTag) new OptgroupTag().with(dc); } + public static OptgroupTag optgroup (Attr.ShortForm shortAttr) { return (OptgroupTag) Attr.addTo( new OptgroupTag(), shortAttr); } + public static OptgroupTag optgroup (Attr.ShortForm shortAttr, String text) { return (OptgroupTag) Attr.addTo( new OptgroupTag().withText(text), shortAttr); } + public static OptgroupTag optgroup (Attr.ShortForm shortAttr, DomContent... dc) { return (OptgroupTag) Attr.addTo( new OptgroupTag().with(dc), shortAttr); } + + public static OptionTag option () { return (OptionTag) new OptionTag(); } + public static OptionTag option (String text) { return (OptionTag) new OptionTag().withText(text); } + public static OptionTag option (DomContent... dc) { return (OptionTag) new OptionTag().with(dc); } + public static OptionTag option (Attr.ShortForm shortAttr) { return (OptionTag) Attr.addTo( new OptionTag(), shortAttr); } + public static OptionTag option (Attr.ShortForm shortAttr, String text) { return (OptionTag) Attr.addTo( new OptionTag().withText(text), shortAttr); } + public static OptionTag option (Attr.ShortForm shortAttr, DomContent... dc) { return (OptionTag) Attr.addTo( new OptionTag().with(dc), shortAttr); } + + public static OutputTag output () { return (OutputTag) new OutputTag(); } + public static OutputTag output (String text) { return (OutputTag) new OutputTag().withText(text); } + public static OutputTag output (DomContent... dc) { return (OutputTag) new OutputTag().with(dc); } + public static OutputTag output (Attr.ShortForm shortAttr) { return (OutputTag) Attr.addTo( new OutputTag(), shortAttr); } + public static OutputTag output (Attr.ShortForm shortAttr, String text) { return (OutputTag) Attr.addTo( new OutputTag().withText(text), shortAttr); } + public static OutputTag output (Attr.ShortForm shortAttr, DomContent... dc) { return (OutputTag) Attr.addTo( new OutputTag().with(dc), shortAttr); } + + public static PTag p () { return (PTag) new PTag(); } + public static PTag p (String text) { return (PTag) new PTag().withText(text); } + public static PTag p (DomContent... dc) { return (PTag) new PTag().with(dc); } + public static PTag p (Attr.ShortForm shortAttr) { return (PTag) Attr.addTo( new PTag(), shortAttr); } + public static PTag p (Attr.ShortForm shortAttr, String text) { return (PTag) Attr.addTo( new PTag().withText(text), shortAttr); } + public static PTag p (Attr.ShortForm shortAttr, DomContent... dc) { return (PTag) Attr.addTo( new PTag().with(dc), shortAttr); } + + public static PreTag pre () { return (PreTag) new PreTag(); } + public static PreTag pre (String text) { return (PreTag) new PreTag().withText(text); } + public static PreTag pre (DomContent... dc) { return (PreTag) new PreTag().with(dc); } + public static PreTag pre (Attr.ShortForm shortAttr) { return (PreTag) Attr.addTo( new PreTag(), shortAttr); } + public static PreTag pre (Attr.ShortForm shortAttr, String text) { return (PreTag) Attr.addTo( new PreTag().withText(text), shortAttr); } + public static PreTag pre (Attr.ShortForm shortAttr, DomContent... dc) { return (PreTag) Attr.addTo( new PreTag().with(dc), shortAttr); } + + public static ProgressTag progress () { return (ProgressTag) new ProgressTag(); } + public static ProgressTag progress (String text) { return (ProgressTag) new ProgressTag().withText(text); } + public static ProgressTag progress (DomContent... dc) { return (ProgressTag) new ProgressTag().with(dc); } + public static ProgressTag progress (Attr.ShortForm shortAttr) { return (ProgressTag) Attr.addTo( new ProgressTag(), shortAttr); } + public static ProgressTag progress (Attr.ShortForm shortAttr, String text) { return (ProgressTag) Attr.addTo( new ProgressTag().withText(text), shortAttr); } + public static ProgressTag progress (Attr.ShortForm shortAttr, DomContent... dc) { return (ProgressTag) Attr.addTo( new ProgressTag().with(dc), shortAttr); } + + public static QTag q () { return (QTag) new QTag(); } + public static QTag q (String text) { return (QTag) new QTag().withText(text); } + public static QTag q (DomContent... dc) { return (QTag) new QTag().with(dc); } + public static QTag q (Attr.ShortForm shortAttr) { return (QTag) Attr.addTo( new QTag(), shortAttr); } + public static QTag q (Attr.ShortForm shortAttr, String text) { return (QTag) Attr.addTo( new QTag().withText(text), shortAttr); } + public static QTag q (Attr.ShortForm shortAttr, DomContent... dc) { return (QTag) Attr.addTo( new QTag().with(dc), shortAttr); } + + public static RpTag rp () { return (RpTag) new RpTag(); } + public static RpTag rp (String text) { return (RpTag) new RpTag().withText(text); } + public static RpTag rp (DomContent... dc) { return (RpTag) new RpTag().with(dc); } + public static RpTag rp (Attr.ShortForm shortAttr) { return (RpTag) Attr.addTo( new RpTag(), shortAttr); } + public static RpTag rp (Attr.ShortForm shortAttr, String text) { return (RpTag) Attr.addTo( new RpTag().withText(text), shortAttr); } + public static RpTag rp (Attr.ShortForm shortAttr, DomContent... dc) { return (RpTag) Attr.addTo( new RpTag().with(dc), shortAttr); } + + public static RtTag rt () { return (RtTag) new RtTag(); } + public static RtTag rt (String text) { return (RtTag) new RtTag().withText(text); } + public static RtTag rt (DomContent... dc) { return (RtTag) new RtTag().with(dc); } + public static RtTag rt (Attr.ShortForm shortAttr) { return (RtTag) Attr.addTo( new RtTag(), shortAttr); } + public static RtTag rt (Attr.ShortForm shortAttr, String text) { return (RtTag) Attr.addTo( new RtTag().withText(text), shortAttr); } + public static RtTag rt (Attr.ShortForm shortAttr, DomContent... dc) { return (RtTag) Attr.addTo( new RtTag().with(dc), shortAttr); } + + public static RubyTag ruby () { return (RubyTag) new RubyTag(); } + public static RubyTag ruby (String text) { return (RubyTag) new RubyTag().withText(text); } + public static RubyTag ruby (DomContent... dc) { return (RubyTag) new RubyTag().with(dc); } + public static RubyTag ruby (Attr.ShortForm shortAttr) { return (RubyTag) Attr.addTo( new RubyTag(), shortAttr); } + public static RubyTag ruby (Attr.ShortForm shortAttr, String text) { return (RubyTag) Attr.addTo( new RubyTag().withText(text), shortAttr); } + public static RubyTag ruby (Attr.ShortForm shortAttr, DomContent... dc) { return (RubyTag) Attr.addTo( new RubyTag().with(dc), shortAttr); } + + public static STag s () { return (STag) new STag(); } + public static STag s (String text) { return (STag) new STag().withText(text); } + public static STag s (DomContent... dc) { return (STag) new STag().with(dc); } + public static STag s (Attr.ShortForm shortAttr) { return (STag) Attr.addTo( new STag(), shortAttr); } + public static STag s (Attr.ShortForm shortAttr, String text) { return (STag) Attr.addTo( new STag().withText(text), shortAttr); } + public static STag s (Attr.ShortForm shortAttr, DomContent... dc) { return (STag) Attr.addTo( new STag().with(dc), shortAttr); } + + public static SampTag samp () { return (SampTag) new SampTag(); } + public static SampTag samp (String text) { return (SampTag) new SampTag().withText(text); } + public static SampTag samp (DomContent... dc) { return (SampTag) new SampTag().with(dc); } + public static SampTag samp (Attr.ShortForm shortAttr) { return (SampTag) Attr.addTo( new SampTag(), shortAttr); } + public static SampTag samp (Attr.ShortForm shortAttr, String text) { return (SampTag) Attr.addTo( new SampTag().withText(text), shortAttr); } + public static SampTag samp (Attr.ShortForm shortAttr, DomContent... dc) { return (SampTag) Attr.addTo( new SampTag().with(dc), shortAttr); } + + public static ScriptTag script () { return (ScriptTag) new ScriptTag(); } + public static ScriptTag script (String text) { return (ScriptTag) new ScriptTag().withText(text); } + public static ScriptTag script (DomContent... dc) { return (ScriptTag) new ScriptTag().with(dc); } + public static ScriptTag script (Attr.ShortForm shortAttr) { return (ScriptTag) Attr.addTo( new ScriptTag(), shortAttr); } + public static ScriptTag script (Attr.ShortForm shortAttr, String text) { return (ScriptTag) Attr.addTo( new ScriptTag().withText(text), shortAttr); } + public static ScriptTag script (Attr.ShortForm shortAttr, DomContent... dc) { return (ScriptTag) Attr.addTo( new ScriptTag().with(dc), shortAttr); } + + public static SectionTag section () { return (SectionTag) new SectionTag(); } + public static SectionTag section (String text) { return (SectionTag) new SectionTag().withText(text); } + public static SectionTag section (DomContent... dc) { return (SectionTag) new SectionTag().with(dc); } + public static SectionTag section (Attr.ShortForm shortAttr) { return (SectionTag) Attr.addTo( new SectionTag(), shortAttr); } + public static SectionTag section (Attr.ShortForm shortAttr, String text) { return (SectionTag) Attr.addTo( new SectionTag().withText(text), shortAttr); } + public static SectionTag section (Attr.ShortForm shortAttr, DomContent... dc) { return (SectionTag) Attr.addTo( new SectionTag().with(dc), shortAttr); } + + public static SelectTag select () { return (SelectTag) new SelectTag(); } + public static SelectTag select (String text) { return (SelectTag) new SelectTag().withText(text); } + public static SelectTag select (DomContent... dc) { return (SelectTag) new SelectTag().with(dc); } + public static SelectTag select (Attr.ShortForm shortAttr) { return (SelectTag) Attr.addTo( new SelectTag(), shortAttr); } + public static SelectTag select (Attr.ShortForm shortAttr, String text) { return (SelectTag) Attr.addTo( new SelectTag().withText(text), shortAttr); } + public static SelectTag select (Attr.ShortForm shortAttr, DomContent... dc) { return (SelectTag) Attr.addTo( new SelectTag().with(dc), shortAttr); } + + public static SmallTag small () { return (SmallTag) new SmallTag(); } + public static SmallTag small (String text) { return (SmallTag) new SmallTag().withText(text); } + public static SmallTag small (DomContent... dc) { return (SmallTag) new SmallTag().with(dc); } + public static SmallTag small (Attr.ShortForm shortAttr) { return (SmallTag) Attr.addTo( new SmallTag(), shortAttr); } + public static SmallTag small (Attr.ShortForm shortAttr, String text) { return (SmallTag) Attr.addTo( new SmallTag().withText(text), shortAttr); } + public static SmallTag small (Attr.ShortForm shortAttr, DomContent... dc) { return (SmallTag) Attr.addTo( new SmallTag().with(dc), shortAttr); } + + public static SpanTag span () { return (SpanTag) new SpanTag(); } + public static SpanTag span (String text) { return (SpanTag) new SpanTag().withText(text); } + public static SpanTag span (DomContent... dc) { return (SpanTag) new SpanTag().with(dc); } + public static SpanTag span (Attr.ShortForm shortAttr) { return (SpanTag) Attr.addTo( new SpanTag(), shortAttr); } + public static SpanTag span (Attr.ShortForm shortAttr, String text) { return (SpanTag) Attr.addTo( new SpanTag().withText(text), shortAttr); } + public static SpanTag span (Attr.ShortForm shortAttr, DomContent... dc) { return (SpanTag) Attr.addTo( new SpanTag().with(dc), shortAttr); } + + public static StrongTag strong () { return (StrongTag) new StrongTag(); } + public static StrongTag strong (String text) { return (StrongTag) new StrongTag().withText(text); } + public static StrongTag strong (DomContent... dc) { return (StrongTag) new StrongTag().with(dc); } + public static StrongTag strong (Attr.ShortForm shortAttr) { return (StrongTag) Attr.addTo( new StrongTag(), shortAttr); } + public static StrongTag strong (Attr.ShortForm shortAttr, String text) { return (StrongTag) Attr.addTo( new StrongTag().withText(text), shortAttr); } + public static StrongTag strong (Attr.ShortForm shortAttr, DomContent... dc) { return (StrongTag) Attr.addTo( new StrongTag().with(dc), shortAttr); } + + public static StyleTag style () { return (StyleTag) new StyleTag(); } + public static StyleTag style (String text) { return (StyleTag) new StyleTag().withText(text); } + public static StyleTag style (DomContent... dc) { return (StyleTag) new StyleTag().with(dc); } + public static StyleTag style (Attr.ShortForm shortAttr) { return (StyleTag) Attr.addTo( new StyleTag(), shortAttr); } + public static StyleTag style (Attr.ShortForm shortAttr, String text) { return (StyleTag) Attr.addTo( new StyleTag().withText(text), shortAttr); } + public static StyleTag style (Attr.ShortForm shortAttr, DomContent... dc) { return (StyleTag) Attr.addTo( new StyleTag().with(dc), shortAttr); } + + public static SubTag sub () { return (SubTag) new SubTag(); } + public static SubTag sub (String text) { return (SubTag) new SubTag().withText(text); } + public static SubTag sub (DomContent... dc) { return (SubTag) new SubTag().with(dc); } + public static SubTag sub (Attr.ShortForm shortAttr) { return (SubTag) Attr.addTo( new SubTag(), shortAttr); } + public static SubTag sub (Attr.ShortForm shortAttr, String text) { return (SubTag) Attr.addTo( new SubTag().withText(text), shortAttr); } + public static SubTag sub (Attr.ShortForm shortAttr, DomContent... dc) { return (SubTag) Attr.addTo( new SubTag().with(dc), shortAttr); } + + public static SummaryTag summary () { return (SummaryTag) new SummaryTag(); } + public static SummaryTag summary (String text) { return (SummaryTag) new SummaryTag().withText(text); } + public static SummaryTag summary (DomContent... dc) { return (SummaryTag) new SummaryTag().with(dc); } + public static SummaryTag summary (Attr.ShortForm shortAttr) { return (SummaryTag) Attr.addTo( new SummaryTag(), shortAttr); } + public static SummaryTag summary (Attr.ShortForm shortAttr, String text) { return (SummaryTag) Attr.addTo( new SummaryTag().withText(text), shortAttr); } + public static SummaryTag summary (Attr.ShortForm shortAttr, DomContent... dc) { return (SummaryTag) Attr.addTo( new SummaryTag().with(dc), shortAttr); } + + public static SupTag sup () { return (SupTag) new SupTag(); } + public static SupTag sup (String text) { return (SupTag) new SupTag().withText(text); } + public static SupTag sup (DomContent... dc) { return (SupTag) new SupTag().with(dc); } + public static SupTag sup (Attr.ShortForm shortAttr) { return (SupTag) Attr.addTo( new SupTag(), shortAttr); } + public static SupTag sup (Attr.ShortForm shortAttr, String text) { return (SupTag) Attr.addTo( new SupTag().withText(text), shortAttr); } + public static SupTag sup (Attr.ShortForm shortAttr, DomContent... dc) { return (SupTag) Attr.addTo( new SupTag().with(dc), shortAttr); } + + public static TableTag table () { return (TableTag) new TableTag(); } + public static TableTag table (String text) { return (TableTag) new TableTag().withText(text); } + public static TableTag table (DomContent... dc) { return (TableTag) new TableTag().with(dc); } + public static TableTag table (Attr.ShortForm shortAttr) { return (TableTag) Attr.addTo( new TableTag(), shortAttr); } + public static TableTag table (Attr.ShortForm shortAttr, String text) { return (TableTag) Attr.addTo( new TableTag().withText(text), shortAttr); } + public static TableTag table (Attr.ShortForm shortAttr, DomContent... dc) { return (TableTag) Attr.addTo( new TableTag().with(dc), shortAttr); } + + public static TbodyTag tbody () { return (TbodyTag) new TbodyTag(); } + public static TbodyTag tbody (String text) { return (TbodyTag) new TbodyTag().withText(text); } + public static TbodyTag tbody (DomContent... dc) { return (TbodyTag) new TbodyTag().with(dc); } + public static TbodyTag tbody (Attr.ShortForm shortAttr) { return (TbodyTag) Attr.addTo( new TbodyTag(), shortAttr); } + public static TbodyTag tbody (Attr.ShortForm shortAttr, String text) { return (TbodyTag) Attr.addTo( new TbodyTag().withText(text), shortAttr); } + public static TbodyTag tbody (Attr.ShortForm shortAttr, DomContent... dc) { return (TbodyTag) Attr.addTo( new TbodyTag().with(dc), shortAttr); } + + public static TdTag td () { return (TdTag) new TdTag(); } + public static TdTag td (String text) { return (TdTag) new TdTag().withText(text); } + public static TdTag td (DomContent... dc) { return (TdTag) new TdTag().with(dc); } + public static TdTag td (Attr.ShortForm shortAttr) { return (TdTag) Attr.addTo( new TdTag(), shortAttr); } + public static TdTag td (Attr.ShortForm shortAttr, String text) { return (TdTag) Attr.addTo( new TdTag().withText(text), shortAttr); } + public static TdTag td (Attr.ShortForm shortAttr, DomContent... dc) { return (TdTag) Attr.addTo( new TdTag().with(dc), shortAttr); } + + public static TextareaTag textarea () { return (TextareaTag) new TextareaTag(); } + public static TextareaTag textarea (String text) { return (TextareaTag) new TextareaTag().withText(text); } + public static TextareaTag textarea (DomContent... dc) { return (TextareaTag) new TextareaTag().with(dc); } + public static TextareaTag textarea (Attr.ShortForm shortAttr) { return (TextareaTag) Attr.addTo( new TextareaTag(), shortAttr); } + public static TextareaTag textarea (Attr.ShortForm shortAttr, String text) { return (TextareaTag) Attr.addTo( new TextareaTag().withText(text), shortAttr); } + public static TextareaTag textarea (Attr.ShortForm shortAttr, DomContent... dc) { return (TextareaTag) Attr.addTo( new TextareaTag().with(dc), shortAttr); } + + public static TfootTag tfoot () { return (TfootTag) new TfootTag(); } + public static TfootTag tfoot (String text) { return (TfootTag) new TfootTag().withText(text); } + public static TfootTag tfoot (DomContent... dc) { return (TfootTag) new TfootTag().with(dc); } + public static TfootTag tfoot (Attr.ShortForm shortAttr) { return (TfootTag) Attr.addTo( new TfootTag(), shortAttr); } + public static TfootTag tfoot (Attr.ShortForm shortAttr, String text) { return (TfootTag) Attr.addTo( new TfootTag().withText(text), shortAttr); } + public static TfootTag tfoot (Attr.ShortForm shortAttr, DomContent... dc) { return (TfootTag) Attr.addTo( new TfootTag().with(dc), shortAttr); } + + public static ThTag th () { return (ThTag) new ThTag(); } + public static ThTag th (String text) { return (ThTag) new ThTag().withText(text); } + public static ThTag th (DomContent... dc) { return (ThTag) new ThTag().with(dc); } + public static ThTag th (Attr.ShortForm shortAttr) { return (ThTag) Attr.addTo( new ThTag(), shortAttr); } + public static ThTag th (Attr.ShortForm shortAttr, String text) { return (ThTag) Attr.addTo( new ThTag().withText(text), shortAttr); } + public static ThTag th (Attr.ShortForm shortAttr, DomContent... dc) { return (ThTag) Attr.addTo( new ThTag().with(dc), shortAttr); } + + public static TheadTag thead () { return (TheadTag) new TheadTag(); } + public static TheadTag thead (String text) { return (TheadTag) new TheadTag().withText(text); } + public static TheadTag thead (DomContent... dc) { return (TheadTag) new TheadTag().with(dc); } + public static TheadTag thead (Attr.ShortForm shortAttr) { return (TheadTag) Attr.addTo( new TheadTag(), shortAttr); } + public static TheadTag thead (Attr.ShortForm shortAttr, String text) { return (TheadTag) Attr.addTo( new TheadTag().withText(text), shortAttr); } + public static TheadTag thead (Attr.ShortForm shortAttr, DomContent... dc) { return (TheadTag) Attr.addTo( new TheadTag().with(dc), shortAttr); } + + public static TimeTag time () { return (TimeTag) new TimeTag(); } + public static TimeTag time (String text) { return (TimeTag) new TimeTag().withText(text); } + public static TimeTag time (DomContent... dc) { return (TimeTag) new TimeTag().with(dc); } + public static TimeTag time (Attr.ShortForm shortAttr) { return (TimeTag) Attr.addTo( new TimeTag(), shortAttr); } + public static TimeTag time (Attr.ShortForm shortAttr, String text) { return (TimeTag) Attr.addTo( new TimeTag().withText(text), shortAttr); } + public static TimeTag time (Attr.ShortForm shortAttr, DomContent... dc) { return (TimeTag) Attr.addTo( new TimeTag().with(dc), shortAttr); } + + public static TitleTag title () { return (TitleTag) new TitleTag(); } + public static TitleTag title (String text) { return (TitleTag) new TitleTag().withText(text); } + public static TitleTag title (DomContent... dc) { return (TitleTag) new TitleTag().with(dc); } + public static TitleTag title (Attr.ShortForm shortAttr) { return (TitleTag) Attr.addTo( new TitleTag(), shortAttr); } + public static TitleTag title (Attr.ShortForm shortAttr, String text) { return (TitleTag) Attr.addTo( new TitleTag().withText(text), shortAttr); } + public static TitleTag title (Attr.ShortForm shortAttr, DomContent... dc) { return (TitleTag) Attr.addTo( new TitleTag().with(dc), shortAttr); } + + public static TrTag tr () { return (TrTag) new TrTag(); } + public static TrTag tr (String text) { return (TrTag) new TrTag().withText(text); } + public static TrTag tr (DomContent... dc) { return (TrTag) new TrTag().with(dc); } + public static TrTag tr (Attr.ShortForm shortAttr) { return (TrTag) Attr.addTo( new TrTag(), shortAttr); } + public static TrTag tr (Attr.ShortForm shortAttr, String text) { return (TrTag) Attr.addTo( new TrTag().withText(text), shortAttr); } + public static TrTag tr (Attr.ShortForm shortAttr, DomContent... dc) { return (TrTag) Attr.addTo( new TrTag().with(dc), shortAttr); } + + public static UTag u () { return (UTag) new UTag(); } + public static UTag u (String text) { return (UTag) new UTag().withText(text); } + public static UTag u (DomContent... dc) { return (UTag) new UTag().with(dc); } + public static UTag u (Attr.ShortForm shortAttr) { return (UTag) Attr.addTo( new UTag(), shortAttr); } + public static UTag u (Attr.ShortForm shortAttr, String text) { return (UTag) Attr.addTo( new UTag().withText(text), shortAttr); } + public static UTag u (Attr.ShortForm shortAttr, DomContent... dc) { return (UTag) Attr.addTo( new UTag().with(dc), shortAttr); } + + public static UlTag ul () { return (UlTag) new UlTag(); } + public static UlTag ul (String text) { return (UlTag) new UlTag().withText(text); } + public static UlTag ul (DomContent... dc) { return (UlTag) new UlTag().with(dc); } + public static UlTag ul (Attr.ShortForm shortAttr) { return (UlTag) Attr.addTo( new UlTag(), shortAttr); } + public static UlTag ul (Attr.ShortForm shortAttr, String text) { return (UlTag) Attr.addTo( new UlTag().withText(text), shortAttr); } + public static UlTag ul (Attr.ShortForm shortAttr, DomContent... dc) { return (UlTag) Attr.addTo( new UlTag().with(dc), shortAttr); } + + public static VarTag var () { return (VarTag) new VarTag(); } + public static VarTag var (String text) { return (VarTag) new VarTag().withText(text); } + public static VarTag var (DomContent... dc) { return (VarTag) new VarTag().with(dc); } + public static VarTag var (Attr.ShortForm shortAttr) { return (VarTag) Attr.addTo( new VarTag(), shortAttr); } + public static VarTag var (Attr.ShortForm shortAttr, String text) { return (VarTag) Attr.addTo( new VarTag().withText(text), shortAttr); } + public static VarTag var (Attr.ShortForm shortAttr, DomContent... dc) { return (VarTag) Attr.addTo( new VarTag().with(dc), shortAttr); } + + public static VideoTag video () { return (VideoTag) new VideoTag(); } + public static VideoTag video (String text) { return (VideoTag) new VideoTag().withText(text); } + public static VideoTag video (DomContent... dc) { return (VideoTag) new VideoTag().with(dc); } + public static VideoTag video (Attr.ShortForm shortAttr) { return (VideoTag) Attr.addTo( new VideoTag(), shortAttr); } + public static VideoTag video (Attr.ShortForm shortAttr, String text) { return (VideoTag) Attr.addTo( new VideoTag().withText(text), shortAttr); } + public static VideoTag video (Attr.ShortForm shortAttr, DomContent... dc) { return (VideoTag) Attr.addTo( new VideoTag().with(dc), shortAttr); } } diff --git a/src/main/java/j2html/tags/generators/TagCreatorCodeGenerator.java b/src/main/java/j2html/tags/generators/TagCreatorCodeGenerator.java index 51934ab7..d9f814cd 100644 --- a/src/main/java/j2html/tags/generators/TagCreatorCodeGenerator.java +++ b/src/main/java/j2html/tags/generators/TagCreatorCodeGenerator.java @@ -13,7 +13,7 @@ public static void main(String[] args) { final String className = SpecializedTagClassCodeGenerator.classNameFromTag(tag); final String publicstaticTypeMethod = "public static "+className+" "+tag+" "; final String castReturn = " return ("+className+") "; - final String construct = " new "+className+"(\"" + tag + "\")"; + final String construct = " new "+className+"()"; String emptyA1 = publicstaticTypeMethod + "()"; String emptyA2 = "{ return "+construct+"; }"; @@ -32,7 +32,7 @@ public static void main(String[] args) { final String className = SpecializedTagClassCodeGenerator.classNameFromTag(tag); final String publicstaticTypeMethod = "public static "+className+" "+tag+" "; final String castReturn = " return ("+className+") "; - final String construct = " new "+className+"(\"" + tag + "\")"; + final String construct = " new "+className+"()"; String containerA1 = publicstaticTypeMethod+ "()"; String containerA2 = "{ "+castReturn + construct + "; }"; @@ -73,6 +73,7 @@ static List emptyTags() { "embed", "hr", "img", + "input", "keygen", "link", "meta", @@ -85,7 +86,7 @@ static List emptyTags() { static List containerTags() { return Arrays.asList( - // "a" ATag is managed manually + "a", "abbr", "address", "article", @@ -95,7 +96,8 @@ static List containerTags() { "bdi", "bdo", "blockquote", - //"body" BodyTag is managed manually + //"body" BodyTag is managed manually, + "button", "canvas", "caption", "cite", @@ -155,6 +157,7 @@ static List containerTags() { "samp", "script", "section", + "select", "small", "span", "strong", diff --git a/src/main/java/j2html/tags/specialized/ATag.java b/src/main/java/j2html/tags/specialized/ATag.java index f99464d2..329c4d89 100644 --- a/src/main/java/j2html/tags/specialized/ATag.java +++ b/src/main/java/j2html/tags/specialized/ATag.java @@ -1,14 +1,8 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.IDownload; -import j2html.tags.attributes.IType; -public final class ATag extends ContainerTag -implements - IType, - IDownload -{ +public final class ATag extends ContainerTag { public ATag() { super("a"); } diff --git a/src/main/java/j2html/tags/specialized/AreaTag.java b/src/main/java/j2html/tags/specialized/AreaTag.java index 48d0ff7a..dba32544 100644 --- a/src/main/java/j2html/tags/specialized/AreaTag.java +++ b/src/main/java/j2html/tags/specialized/AreaTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.EmptyTag; +import j2html.tags.attributes.*; public final class AreaTag extends EmptyTag { public AreaTag() { diff --git a/src/main/java/j2html/tags/specialized/BaseTag.java b/src/main/java/j2html/tags/specialized/BaseTag.java index 8d54bfd4..5d7184fb 100644 --- a/src/main/java/j2html/tags/specialized/BaseTag.java +++ b/src/main/java/j2html/tags/specialized/BaseTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.EmptyTag; +import j2html.tags.attributes.*; public final class BaseTag extends EmptyTag { public BaseTag() { diff --git a/src/main/java/j2html/tags/specialized/BrTag.java b/src/main/java/j2html/tags/specialized/BrTag.java index ae1fc63e..ba1b2d28 100644 --- a/src/main/java/j2html/tags/specialized/BrTag.java +++ b/src/main/java/j2html/tags/specialized/BrTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.EmptyTag; +import j2html.tags.attributes.*; public final class BrTag extends EmptyTag { public BrTag() { diff --git a/src/main/java/j2html/tags/specialized/ButtonTag.java b/src/main/java/j2html/tags/specialized/ButtonTag.java index 59a678a4..39a646d5 100644 --- a/src/main/java/j2html/tags/specialized/ButtonTag.java +++ b/src/main/java/j2html/tags/specialized/ButtonTag.java @@ -1,16 +1,8 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.IDisabled; -import j2html.tags.attributes.IForm; -import j2html.tags.attributes.IType; -public final class ButtonTag extends ContainerTag -implements - IType, - IDisabled, - IForm -{ +public final class ButtonTag extends ContainerTag { public ButtonTag() { super("button"); } diff --git a/src/main/java/j2html/tags/specialized/ColTag.java b/src/main/java/j2html/tags/specialized/ColTag.java index a4352771..5ae8049b 100644 --- a/src/main/java/j2html/tags/specialized/ColTag.java +++ b/src/main/java/j2html/tags/specialized/ColTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.EmptyTag; +import j2html.tags.attributes.*; public final class ColTag extends EmptyTag { public ColTag() { diff --git a/src/main/java/j2html/tags/specialized/EmbedTag.java b/src/main/java/j2html/tags/specialized/EmbedTag.java index 7c6b913b..8e9bc0d3 100644 --- a/src/main/java/j2html/tags/specialized/EmbedTag.java +++ b/src/main/java/j2html/tags/specialized/EmbedTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.EmptyTag; +import j2html.tags.attributes.*; public final class EmbedTag extends EmptyTag { public EmbedTag() { diff --git a/src/main/java/j2html/tags/specialized/HrTag.java b/src/main/java/j2html/tags/specialized/HrTag.java index 9cff496f..b0283a60 100644 --- a/src/main/java/j2html/tags/specialized/HrTag.java +++ b/src/main/java/j2html/tags/specialized/HrTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.EmptyTag; +import j2html.tags.attributes.*; public final class HrTag extends EmptyTag { public HrTag() { diff --git a/src/main/java/j2html/tags/specialized/ImgTag.java b/src/main/java/j2html/tags/specialized/ImgTag.java index d0170299..1ca1454c 100644 --- a/src/main/java/j2html/tags/specialized/ImgTag.java +++ b/src/main/java/j2html/tags/specialized/ImgTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.EmptyTag; +import j2html.tags.attributes.*; public final class ImgTag extends EmptyTag { public ImgTag() { diff --git a/src/main/java/j2html/tags/specialized/InputTag.java b/src/main/java/j2html/tags/specialized/InputTag.java index a0f94f59..5db1ee2a 100644 --- a/src/main/java/j2html/tags/specialized/InputTag.java +++ b/src/main/java/j2html/tags/specialized/InputTag.java @@ -3,31 +3,8 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class InputTag extends EmptyTag - implements - IAccept, - IForm, - IDisabled, - IFormAction, - IType, - IValue { - - /* - Attributes implemented are those not found in EmptyTag Base Class and present in - https://www.w3schools.com/tags/tag_input.asp - - When using InputTag, the attributes specific to InputTag (present in this class) must be set first, - otherwise the type is watered down to EmptyTag. - */ - +public final class InputTag extends EmptyTag { public InputTag() { super("input"); } - - public InputTag withChecked(boolean checked) { - if (checked) { - attr("checked"); - } - return this; - } } diff --git a/src/main/java/j2html/tags/specialized/KeygenTag.java b/src/main/java/j2html/tags/specialized/KeygenTag.java index 0bbcedcf..06f8c44d 100644 --- a/src/main/java/j2html/tags/specialized/KeygenTag.java +++ b/src/main/java/j2html/tags/specialized/KeygenTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.EmptyTag; +import j2html.tags.attributes.*; public final class KeygenTag extends EmptyTag { public KeygenTag() { diff --git a/src/main/java/j2html/tags/specialized/LinkTag.java b/src/main/java/j2html/tags/specialized/LinkTag.java index 38915d61..895d4be0 100644 --- a/src/main/java/j2html/tags/specialized/LinkTag.java +++ b/src/main/java/j2html/tags/specialized/LinkTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.EmptyTag; +import j2html.tags.attributes.*; public final class LinkTag extends EmptyTag { public LinkTag() { diff --git a/src/main/java/j2html/tags/specialized/MetaTag.java b/src/main/java/j2html/tags/specialized/MetaTag.java index 0ec6c83a..7d84c69d 100644 --- a/src/main/java/j2html/tags/specialized/MetaTag.java +++ b/src/main/java/j2html/tags/specialized/MetaTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.EmptyTag; +import j2html.tags.attributes.*; public final class MetaTag extends EmptyTag { public MetaTag() { diff --git a/src/main/java/j2html/tags/specialized/ParamTag.java b/src/main/java/j2html/tags/specialized/ParamTag.java index 17b6e0d0..187feb7e 100644 --- a/src/main/java/j2html/tags/specialized/ParamTag.java +++ b/src/main/java/j2html/tags/specialized/ParamTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.EmptyTag; +import j2html.tags.attributes.*; public final class ParamTag extends EmptyTag { public ParamTag() { diff --git a/src/main/java/j2html/tags/specialized/SelectTag.java b/src/main/java/j2html/tags/specialized/SelectTag.java index a2ea5a24..c2240ee9 100644 --- a/src/main/java/j2html/tags/specialized/SelectTag.java +++ b/src/main/java/j2html/tags/specialized/SelectTag.java @@ -1,14 +1,8 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.IDisabled; -import j2html.tags.attributes.IType; -public final class SelectTag extends ContainerTag -implements - IDisabled, - IType -{ +public final class SelectTag extends ContainerTag { public SelectTag() { super("select"); } diff --git a/src/main/java/j2html/tags/specialized/SourceTag.java b/src/main/java/j2html/tags/specialized/SourceTag.java index a7d6255d..2fadfabf 100644 --- a/src/main/java/j2html/tags/specialized/SourceTag.java +++ b/src/main/java/j2html/tags/specialized/SourceTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.EmptyTag; +import j2html.tags.attributes.*; public final class SourceTag extends EmptyTag { public SourceTag() { diff --git a/src/main/java/j2html/tags/specialized/TrackTag.java b/src/main/java/j2html/tags/specialized/TrackTag.java index f1eed372..1b21bc99 100644 --- a/src/main/java/j2html/tags/specialized/TrackTag.java +++ b/src/main/java/j2html/tags/specialized/TrackTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.EmptyTag; +import j2html.tags.attributes.*; public final class TrackTag extends EmptyTag { public TrackTag() { diff --git a/src/main/java/j2html/tags/specialized/WbrTag.java b/src/main/java/j2html/tags/specialized/WbrTag.java index a076d01b..601d255e 100644 --- a/src/main/java/j2html/tags/specialized/WbrTag.java +++ b/src/main/java/j2html/tags/specialized/WbrTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.EmptyTag; +import j2html.tags.attributes.*; public final class WbrTag extends EmptyTag { public WbrTag() { diff --git a/src/test/java/j2html/tags/ComplexRenderTest.java b/src/test/java/j2html/tags/ComplexRenderTest.java index 02e196a2..aad24a65 100644 --- a/src/test/java/j2html/tags/ComplexRenderTest.java +++ b/src/test/java/j2html/tags/ComplexRenderTest.java @@ -43,10 +43,10 @@ private String renderTest() { main().with( h2("Test Form"), div().with( - input().withType("email").withName("email").withPlaceholder("Email"), - input().withType("password").withName("password").withPlaceholder("Password") - ).condWith(USER_SHOULD_LOG_IN, button().withType("submit").withText("Login") - ).condWith(USER_SHOULD_SIGN_UP, button().withType("submit").withText("Signup")) + input().attr("type","email").withName("email").withPlaceholder("Email"), + input().attr("type","password").withName("password").withPlaceholder("Password") + ).condWith(USER_SHOULD_LOG_IN, button().attr("type","submit").withText("Login") + ).condWith(USER_SHOULD_SIGN_UP, button().attr("type","submit").withText("Signup")) ), footer().attr(Attr.CLASS, "footer").condAttr(1 == 1, Attr.ID, "id").withText("Test Footer"), script().withSrc("/testScript.js") @@ -73,10 +73,10 @@ private String renderTest2() { main( h2("Test Form"), div( - input().withType("email").withName("email").withPlaceholder("Email"), - input().withType("password").withName("password").withPlaceholder("Password"), - iff(USER_SHOULD_LOG_IN, button().withType("submit").withText("Login")), - iff(USER_SHOULD_SIGN_UP, button().withType("submit").withText("Signup")) + input().attr("type","email").withName("email").withPlaceholder("Email"), + input().attr("type","password").withName("password").withPlaceholder("Password"), + iff(USER_SHOULD_LOG_IN, button().attr("type","submit").withText("Login")), + iff(USER_SHOULD_SIGN_UP, button().attr("type","submit").withText("Signup")) ) ), footer("Test Footer").attr(Attr.CLASS, "footer").condAttr(1 == 1, Attr.ID, "id"), @@ -104,10 +104,10 @@ private String renderTest3() { main( h2("Test Form"), div( - input().withType("email").withName("email").withPlaceholder("Email"), - input().withType("password").withName("password").withPlaceholder("Password"), - iff(USER_SHOULD_LOG_IN, button().withType("submit").withText("Login")), - iff(USER_SHOULD_SIGN_UP, button().withType("submit").withText("Signup")) + input().attr("type","email").withName("email").withPlaceholder("Email"), + input().attr("type","password").withName("password").withPlaceholder("Password"), + iff(USER_SHOULD_LOG_IN, button().attr("type","submit").withText("Login")), + iff(USER_SHOULD_SIGN_UP, button().attr("type","submit").withText("Signup")) ) ), footer("Test Footer").attr(Attr.CLASS, "footer").condAttr(1 == 1, Attr.ID, "id"), diff --git a/src/test/java/j2html/tags/ConvenienceMethodTest.java b/src/test/java/j2html/tags/ConvenienceMethodTest.java index 006f658f..51c8e8b6 100644 --- a/src/test/java/j2html/tags/ConvenienceMethodTest.java +++ b/src/test/java/j2html/tags/ConvenienceMethodTest.java @@ -32,12 +32,12 @@ public void testAllConvenienceMethods() throws Exception { assertThat(input().withPlaceholder("test-placeholder").render(), is("")); assertThat(a().withTarget("_blank").render(), is("")); assertThat(a().withTitle("Title").render(), is("")); - assertThat(input().withType("email").render(), is("")); + assertThat(input().attr("type","email").render(), is("")); assertThat(link().withRel("stylesheet").render(), is("")); assertThat(link().withRole("role").render(), is("")); assertThat(img().withSrc("/img/test.png").render(), is("")); assertThat(input().withStep("0.1").render(), is("")); assertThat(div().withStyle("background:red;").render(), is("
")); - assertThat(input().withValue("test-value").render(), is("")); + assertThat(input().attr("value","test-value").render(), is("")); } } diff --git a/src/test/java/j2html/tags/TagTest.java b/src/test/java/j2html/tags/TagTest.java index ed5dc311..162f9bfa 100644 --- a/src/test/java/j2html/tags/TagTest.java +++ b/src/test/java/j2html/tags/TagTest.java @@ -61,7 +61,7 @@ public void testCloseTag() throws Exception { public void testSelfClosingTags() throws Exception { Config.closeEmptyTags = true; assertThat(img().withSrc("/test.png").render(), is("")); - assertThat(input().withType("text").render(), is("")); + assertThat(input().attr("type","text").render(), is("")); Config.closeEmptyTags = false; } From 4e69cf4d84bda8c1050f9902fa594b021b1e668a Mon Sep 17 00:00:00 2001 From: pointbazaar Date: Sun, 23 Aug 2020 19:29:11 +0200 Subject: [PATCH 06/19] generify EmptyTag and ContainerTag and adjust the code generation accordingly. Now .withClasses(),... and such return the actual precise type of the tag and will be able to be chained with special attributes later on --- src/main/java/j2html/tags/ContainerTag.java | 35 ++++++++++--------- src/main/java/j2html/tags/EmptyTag.java | 3 +- .../SpecializedTagClassCodeGenerator.java | 4 +-- .../java/j2html/tags/specialized/ATag.java | 2 +- .../java/j2html/tags/specialized/AbbrTag.java | 2 +- .../j2html/tags/specialized/AddressTag.java | 2 +- .../java/j2html/tags/specialized/AreaTag.java | 2 +- .../j2html/tags/specialized/ArticleTag.java | 2 +- .../j2html/tags/specialized/AsideTag.java | 2 +- .../j2html/tags/specialized/AudioTag.java | 2 +- .../java/j2html/tags/specialized/BTag.java | 2 +- .../java/j2html/tags/specialized/BaseTag.java | 2 +- .../java/j2html/tags/specialized/BdiTag.java | 2 +- .../java/j2html/tags/specialized/BdoTag.java | 2 +- .../tags/specialized/BlockquoteTag.java | 2 +- .../java/j2html/tags/specialized/BrTag.java | 2 +- .../j2html/tags/specialized/ButtonTag.java | 2 +- .../j2html/tags/specialized/CanvasTag.java | 2 +- .../j2html/tags/specialized/CaptionTag.java | 2 +- .../java/j2html/tags/specialized/CiteTag.java | 2 +- .../java/j2html/tags/specialized/CodeTag.java | 2 +- .../java/j2html/tags/specialized/ColTag.java | 2 +- .../j2html/tags/specialized/ColgroupTag.java | 2 +- .../j2html/tags/specialized/DatalistTag.java | 2 +- .../java/j2html/tags/specialized/DdTag.java | 2 +- .../java/j2html/tags/specialized/DelTag.java | 2 +- .../j2html/tags/specialized/DetailsTag.java | 2 +- .../java/j2html/tags/specialized/DfnTag.java | 2 +- .../j2html/tags/specialized/DialogTag.java | 2 +- .../java/j2html/tags/specialized/DivTag.java | 2 +- .../java/j2html/tags/specialized/DlTag.java | 2 +- .../java/j2html/tags/specialized/DtTag.java | 2 +- .../java/j2html/tags/specialized/EmTag.java | 2 +- .../j2html/tags/specialized/EmbedTag.java | 2 +- .../j2html/tags/specialized/FieldsetTag.java | 2 +- .../tags/specialized/FigcaptionTag.java | 2 +- .../j2html/tags/specialized/FigureTag.java | 2 +- .../j2html/tags/specialized/FooterTag.java | 2 +- .../java/j2html/tags/specialized/FormTag.java | 2 +- .../java/j2html/tags/specialized/H1Tag.java | 2 +- .../java/j2html/tags/specialized/H2Tag.java | 2 +- .../java/j2html/tags/specialized/H3Tag.java | 2 +- .../java/j2html/tags/specialized/H4Tag.java | 2 +- .../java/j2html/tags/specialized/H5Tag.java | 2 +- .../java/j2html/tags/specialized/H6Tag.java | 2 +- .../j2html/tags/specialized/HeaderTag.java | 2 +- .../java/j2html/tags/specialized/HrTag.java | 2 +- .../java/j2html/tags/specialized/ITag.java | 2 +- .../j2html/tags/specialized/IframeTag.java | 2 +- .../java/j2html/tags/specialized/ImgTag.java | 2 +- .../j2html/tags/specialized/InputTag.java | 2 +- .../java/j2html/tags/specialized/InsTag.java | 2 +- .../java/j2html/tags/specialized/KbdTag.java | 2 +- .../j2html/tags/specialized/KeygenTag.java | 2 +- .../j2html/tags/specialized/LabelTag.java | 2 +- .../j2html/tags/specialized/LegendTag.java | 2 +- .../java/j2html/tags/specialized/LiTag.java | 2 +- .../java/j2html/tags/specialized/LinkTag.java | 2 +- .../java/j2html/tags/specialized/MainTag.java | 2 +- .../java/j2html/tags/specialized/MapTag.java | 2 +- .../java/j2html/tags/specialized/MarkTag.java | 2 +- .../java/j2html/tags/specialized/MenuTag.java | 2 +- .../j2html/tags/specialized/MenuitemTag.java | 2 +- .../java/j2html/tags/specialized/MetaTag.java | 2 +- .../j2html/tags/specialized/MeterTag.java | 2 +- .../java/j2html/tags/specialized/NavTag.java | 2 +- .../j2html/tags/specialized/NoscriptTag.java | 2 +- .../j2html/tags/specialized/ObjectTag.java | 2 +- .../java/j2html/tags/specialized/OlTag.java | 2 +- .../j2html/tags/specialized/OptgroupTag.java | 2 +- .../j2html/tags/specialized/OptionTag.java | 2 +- .../j2html/tags/specialized/OutputTag.java | 2 +- .../java/j2html/tags/specialized/PTag.java | 2 +- .../j2html/tags/specialized/ParamTag.java | 2 +- .../java/j2html/tags/specialized/PreTag.java | 2 +- .../j2html/tags/specialized/ProgressTag.java | 2 +- .../java/j2html/tags/specialized/QTag.java | 2 +- .../java/j2html/tags/specialized/RpTag.java | 2 +- .../java/j2html/tags/specialized/RtTag.java | 2 +- .../java/j2html/tags/specialized/RubyTag.java | 2 +- .../java/j2html/tags/specialized/STag.java | 2 +- .../java/j2html/tags/specialized/SampTag.java | 2 +- .../j2html/tags/specialized/ScriptTag.java | 2 +- .../j2html/tags/specialized/SectionTag.java | 2 +- .../j2html/tags/specialized/SelectTag.java | 2 +- .../j2html/tags/specialized/SmallTag.java | 2 +- .../j2html/tags/specialized/SourceTag.java | 2 +- .../java/j2html/tags/specialized/SpanTag.java | 2 +- .../j2html/tags/specialized/StrongTag.java | 2 +- .../j2html/tags/specialized/StyleTag.java | 2 +- .../java/j2html/tags/specialized/SubTag.java | 2 +- .../j2html/tags/specialized/SummaryTag.java | 2 +- .../java/j2html/tags/specialized/SupTag.java | 2 +- .../j2html/tags/specialized/TableTag.java | 2 +- .../j2html/tags/specialized/TbodyTag.java | 2 +- .../java/j2html/tags/specialized/TdTag.java | 2 +- .../j2html/tags/specialized/TextareaTag.java | 2 +- .../j2html/tags/specialized/TfootTag.java | 2 +- .../java/j2html/tags/specialized/ThTag.java | 2 +- .../j2html/tags/specialized/TheadTag.java | 2 +- .../java/j2html/tags/specialized/TimeTag.java | 2 +- .../j2html/tags/specialized/TitleTag.java | 2 +- .../java/j2html/tags/specialized/TrTag.java | 2 +- .../j2html/tags/specialized/TrackTag.java | 2 +- .../java/j2html/tags/specialized/UTag.java | 2 +- .../java/j2html/tags/specialized/UlTag.java | 2 +- .../java/j2html/tags/specialized/VarTag.java | 2 +- .../j2html/tags/specialized/VideoTag.java | 2 +- .../java/j2html/tags/specialized/WbrTag.java | 2 +- src/test/java/j2html/tags/TagTest.java | 12 +++---- 110 files changed, 134 insertions(+), 132 deletions(-) diff --git a/src/main/java/j2html/tags/ContainerTag.java b/src/main/java/j2html/tags/ContainerTag.java index fd8956c8..055cf07d 100644 --- a/src/main/java/j2html/tags/ContainerTag.java +++ b/src/main/java/j2html/tags/ContainerTag.java @@ -6,7 +6,8 @@ import java.util.List; import java.util.stream.Stream; -public class ContainerTag extends Tag { +public class ContainerTag> extends Tag { +//public class ContainerTag extends Tag { private List 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 children) { + public T with(Iterable children) { if (children != null) { for (DomContent child : children) { this.with(child); } } - return this; + return (T)this; } @@ -71,8 +72,8 @@ public ContainerTag with(Iterable children) { * @param children DomContent-objects to be appended if condition met * @return itself for easy chaining */ - public ContainerTag condWith(boolean condition, Iterable children) { - return condition ? this.with(children) : this; + public T condWith(boolean condition, Iterable children) { + return condition ? this.with(children) : (T)this; } @@ -82,11 +83,11 @@ public ContainerTag condWith(boolean condition, Iterable 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 children) { + public T with(Stream children) { children.forEach(this::with); - return this; + return (T)this; } @@ -110,8 +111,8 @@ public ContainerTag with(Stream 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)); } diff --git a/src/main/java/j2html/tags/EmptyTag.java b/src/main/java/j2html/tags/EmptyTag.java index 7dd63f49..88a42e0b 100644 --- a/src/main/java/j2html/tags/EmptyTag.java +++ b/src/main/java/j2html/tags/EmptyTag.java @@ -4,7 +4,8 @@ import j2html.attributes.Attribute; import java.io.IOException; -public class EmptyTag extends Tag { +public class EmptyTag> extends Tag { +//public class EmptyTag extends Tag { public EmptyTag(String tagName) { super(tagName); diff --git a/src/main/java/j2html/tags/generators/SpecializedTagClassCodeGenerator.java b/src/main/java/j2html/tags/generators/SpecializedTagClassCodeGenerator.java index 4179254d..81da16d5 100644 --- a/src/main/java/j2html/tags/generators/SpecializedTagClassCodeGenerator.java +++ b/src/main/java/j2html/tags/generators/SpecializedTagClassCodeGenerator.java @@ -82,7 +82,7 @@ public static void mainInner(final boolean delete) throws IOException { final String classString = getClassTemplate( className, - Optional.of("EmptyTag"), + Optional.of("EmptyTag<"+className+">"), Arrays.asList( "j2html.tags.EmptyTag", "j2html.tags.attributes.*" @@ -111,7 +111,7 @@ public InputTag() { final String classString = getClassTemplate( className, - Optional.of("ContainerTag"), + Optional.of("ContainerTag<"+className+">"), Arrays.asList("j2html.tags.ContainerTag"), tag ); diff --git a/src/main/java/j2html/tags/specialized/ATag.java b/src/main/java/j2html/tags/specialized/ATag.java index 329c4d89..f01ede82 100644 --- a/src/main/java/j2html/tags/specialized/ATag.java +++ b/src/main/java/j2html/tags/specialized/ATag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class ATag extends ContainerTag { +public final class ATag extends ContainerTag { public ATag() { super("a"); } diff --git a/src/main/java/j2html/tags/specialized/AbbrTag.java b/src/main/java/j2html/tags/specialized/AbbrTag.java index b79d3344..218ca301 100644 --- a/src/main/java/j2html/tags/specialized/AbbrTag.java +++ b/src/main/java/j2html/tags/specialized/AbbrTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class AbbrTag extends ContainerTag { +public final class AbbrTag extends ContainerTag { public AbbrTag() { super("abbr"); } diff --git a/src/main/java/j2html/tags/specialized/AddressTag.java b/src/main/java/j2html/tags/specialized/AddressTag.java index da04c9c5..20179d96 100644 --- a/src/main/java/j2html/tags/specialized/AddressTag.java +++ b/src/main/java/j2html/tags/specialized/AddressTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class AddressTag extends ContainerTag { +public final class AddressTag extends ContainerTag { public AddressTag() { super("address"); } diff --git a/src/main/java/j2html/tags/specialized/AreaTag.java b/src/main/java/j2html/tags/specialized/AreaTag.java index dba32544..f6f89739 100644 --- a/src/main/java/j2html/tags/specialized/AreaTag.java +++ b/src/main/java/j2html/tags/specialized/AreaTag.java @@ -3,7 +3,7 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class AreaTag extends EmptyTag { +public final class AreaTag extends EmptyTag { public AreaTag() { super("area"); } diff --git a/src/main/java/j2html/tags/specialized/ArticleTag.java b/src/main/java/j2html/tags/specialized/ArticleTag.java index a53c82fe..b5abf71b 100644 --- a/src/main/java/j2html/tags/specialized/ArticleTag.java +++ b/src/main/java/j2html/tags/specialized/ArticleTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class ArticleTag extends ContainerTag { +public final class ArticleTag extends ContainerTag { public ArticleTag() { super("article"); } diff --git a/src/main/java/j2html/tags/specialized/AsideTag.java b/src/main/java/j2html/tags/specialized/AsideTag.java index 967ebdf3..08326cda 100644 --- a/src/main/java/j2html/tags/specialized/AsideTag.java +++ b/src/main/java/j2html/tags/specialized/AsideTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class AsideTag extends ContainerTag { +public final class AsideTag extends ContainerTag { public AsideTag() { super("aside"); } diff --git a/src/main/java/j2html/tags/specialized/AudioTag.java b/src/main/java/j2html/tags/specialized/AudioTag.java index 380773c9..b4b43820 100644 --- a/src/main/java/j2html/tags/specialized/AudioTag.java +++ b/src/main/java/j2html/tags/specialized/AudioTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class AudioTag extends ContainerTag { +public final class AudioTag extends ContainerTag { public AudioTag() { super("audio"); } diff --git a/src/main/java/j2html/tags/specialized/BTag.java b/src/main/java/j2html/tags/specialized/BTag.java index 11878e0f..3dd3977e 100644 --- a/src/main/java/j2html/tags/specialized/BTag.java +++ b/src/main/java/j2html/tags/specialized/BTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class BTag extends ContainerTag { +public final class BTag extends ContainerTag { public BTag() { super("b"); } diff --git a/src/main/java/j2html/tags/specialized/BaseTag.java b/src/main/java/j2html/tags/specialized/BaseTag.java index 5d7184fb..339fc84d 100644 --- a/src/main/java/j2html/tags/specialized/BaseTag.java +++ b/src/main/java/j2html/tags/specialized/BaseTag.java @@ -3,7 +3,7 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class BaseTag extends EmptyTag { +public final class BaseTag extends EmptyTag { public BaseTag() { super("base"); } diff --git a/src/main/java/j2html/tags/specialized/BdiTag.java b/src/main/java/j2html/tags/specialized/BdiTag.java index 4febece7..cf947e57 100644 --- a/src/main/java/j2html/tags/specialized/BdiTag.java +++ b/src/main/java/j2html/tags/specialized/BdiTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class BdiTag extends ContainerTag { +public final class BdiTag extends ContainerTag { public BdiTag() { super("bdi"); } diff --git a/src/main/java/j2html/tags/specialized/BdoTag.java b/src/main/java/j2html/tags/specialized/BdoTag.java index d1a93c58..e352bea5 100644 --- a/src/main/java/j2html/tags/specialized/BdoTag.java +++ b/src/main/java/j2html/tags/specialized/BdoTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class BdoTag extends ContainerTag { +public final class BdoTag extends ContainerTag { public BdoTag() { super("bdo"); } diff --git a/src/main/java/j2html/tags/specialized/BlockquoteTag.java b/src/main/java/j2html/tags/specialized/BlockquoteTag.java index 90dff4fa..3c242191 100644 --- a/src/main/java/j2html/tags/specialized/BlockquoteTag.java +++ b/src/main/java/j2html/tags/specialized/BlockquoteTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class BlockquoteTag extends ContainerTag { +public final class BlockquoteTag extends ContainerTag { public BlockquoteTag() { super("blockquote"); } diff --git a/src/main/java/j2html/tags/specialized/BrTag.java b/src/main/java/j2html/tags/specialized/BrTag.java index ba1b2d28..04da9b1f 100644 --- a/src/main/java/j2html/tags/specialized/BrTag.java +++ b/src/main/java/j2html/tags/specialized/BrTag.java @@ -3,7 +3,7 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class BrTag extends EmptyTag { +public final class BrTag extends EmptyTag { public BrTag() { super("br"); } diff --git a/src/main/java/j2html/tags/specialized/ButtonTag.java b/src/main/java/j2html/tags/specialized/ButtonTag.java index 39a646d5..5fa24423 100644 --- a/src/main/java/j2html/tags/specialized/ButtonTag.java +++ b/src/main/java/j2html/tags/specialized/ButtonTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class ButtonTag extends ContainerTag { +public final class ButtonTag extends ContainerTag { public ButtonTag() { super("button"); } diff --git a/src/main/java/j2html/tags/specialized/CanvasTag.java b/src/main/java/j2html/tags/specialized/CanvasTag.java index d38f80dc..89e3581d 100644 --- a/src/main/java/j2html/tags/specialized/CanvasTag.java +++ b/src/main/java/j2html/tags/specialized/CanvasTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class CanvasTag extends ContainerTag { +public final class CanvasTag extends ContainerTag { public CanvasTag() { super("canvas"); } diff --git a/src/main/java/j2html/tags/specialized/CaptionTag.java b/src/main/java/j2html/tags/specialized/CaptionTag.java index b2a2bf82..d9acf53d 100644 --- a/src/main/java/j2html/tags/specialized/CaptionTag.java +++ b/src/main/java/j2html/tags/specialized/CaptionTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class CaptionTag extends ContainerTag { +public final class CaptionTag extends ContainerTag { public CaptionTag() { super("caption"); } diff --git a/src/main/java/j2html/tags/specialized/CiteTag.java b/src/main/java/j2html/tags/specialized/CiteTag.java index f6273ed7..ab9a269f 100644 --- a/src/main/java/j2html/tags/specialized/CiteTag.java +++ b/src/main/java/j2html/tags/specialized/CiteTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class CiteTag extends ContainerTag { +public final class CiteTag extends ContainerTag { public CiteTag() { super("cite"); } diff --git a/src/main/java/j2html/tags/specialized/CodeTag.java b/src/main/java/j2html/tags/specialized/CodeTag.java index 2c798635..6c98a555 100644 --- a/src/main/java/j2html/tags/specialized/CodeTag.java +++ b/src/main/java/j2html/tags/specialized/CodeTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class CodeTag extends ContainerTag { +public final class CodeTag extends ContainerTag { public CodeTag() { super("code"); } diff --git a/src/main/java/j2html/tags/specialized/ColTag.java b/src/main/java/j2html/tags/specialized/ColTag.java index 5ae8049b..6c22cecc 100644 --- a/src/main/java/j2html/tags/specialized/ColTag.java +++ b/src/main/java/j2html/tags/specialized/ColTag.java @@ -3,7 +3,7 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class ColTag extends EmptyTag { +public final class ColTag extends EmptyTag { public ColTag() { super("col"); } diff --git a/src/main/java/j2html/tags/specialized/ColgroupTag.java b/src/main/java/j2html/tags/specialized/ColgroupTag.java index 65ee29bf..54e6495a 100644 --- a/src/main/java/j2html/tags/specialized/ColgroupTag.java +++ b/src/main/java/j2html/tags/specialized/ColgroupTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class ColgroupTag extends ContainerTag { +public final class ColgroupTag extends ContainerTag { public ColgroupTag() { super("colgroup"); } diff --git a/src/main/java/j2html/tags/specialized/DatalistTag.java b/src/main/java/j2html/tags/specialized/DatalistTag.java index e422ba5a..c9245e8e 100644 --- a/src/main/java/j2html/tags/specialized/DatalistTag.java +++ b/src/main/java/j2html/tags/specialized/DatalistTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class DatalistTag extends ContainerTag { +public final class DatalistTag extends ContainerTag { public DatalistTag() { super("datalist"); } diff --git a/src/main/java/j2html/tags/specialized/DdTag.java b/src/main/java/j2html/tags/specialized/DdTag.java index d66824a4..9531939c 100644 --- a/src/main/java/j2html/tags/specialized/DdTag.java +++ b/src/main/java/j2html/tags/specialized/DdTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class DdTag extends ContainerTag { +public final class DdTag extends ContainerTag { public DdTag() { super("dd"); } diff --git a/src/main/java/j2html/tags/specialized/DelTag.java b/src/main/java/j2html/tags/specialized/DelTag.java index b7034300..90cc5417 100644 --- a/src/main/java/j2html/tags/specialized/DelTag.java +++ b/src/main/java/j2html/tags/specialized/DelTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class DelTag extends ContainerTag { +public final class DelTag extends ContainerTag { public DelTag() { super("del"); } diff --git a/src/main/java/j2html/tags/specialized/DetailsTag.java b/src/main/java/j2html/tags/specialized/DetailsTag.java index ed2833b9..0eaba90e 100644 --- a/src/main/java/j2html/tags/specialized/DetailsTag.java +++ b/src/main/java/j2html/tags/specialized/DetailsTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class DetailsTag extends ContainerTag { +public final class DetailsTag extends ContainerTag { public DetailsTag() { super("details"); } diff --git a/src/main/java/j2html/tags/specialized/DfnTag.java b/src/main/java/j2html/tags/specialized/DfnTag.java index fbcbb85c..4e890af2 100644 --- a/src/main/java/j2html/tags/specialized/DfnTag.java +++ b/src/main/java/j2html/tags/specialized/DfnTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class DfnTag extends ContainerTag { +public final class DfnTag extends ContainerTag { public DfnTag() { super("dfn"); } diff --git a/src/main/java/j2html/tags/specialized/DialogTag.java b/src/main/java/j2html/tags/specialized/DialogTag.java index eb20f958..b01cfa43 100644 --- a/src/main/java/j2html/tags/specialized/DialogTag.java +++ b/src/main/java/j2html/tags/specialized/DialogTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class DialogTag extends ContainerTag { +public final class DialogTag extends ContainerTag { public DialogTag() { super("dialog"); } diff --git a/src/main/java/j2html/tags/specialized/DivTag.java b/src/main/java/j2html/tags/specialized/DivTag.java index a25c8031..ebcd5034 100644 --- a/src/main/java/j2html/tags/specialized/DivTag.java +++ b/src/main/java/j2html/tags/specialized/DivTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class DivTag extends ContainerTag { +public final class DivTag extends ContainerTag { public DivTag() { super("div"); } diff --git a/src/main/java/j2html/tags/specialized/DlTag.java b/src/main/java/j2html/tags/specialized/DlTag.java index 681c411a..248c41ad 100644 --- a/src/main/java/j2html/tags/specialized/DlTag.java +++ b/src/main/java/j2html/tags/specialized/DlTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class DlTag extends ContainerTag { +public final class DlTag extends ContainerTag { public DlTag() { super("dl"); } diff --git a/src/main/java/j2html/tags/specialized/DtTag.java b/src/main/java/j2html/tags/specialized/DtTag.java index 44231f79..2c962185 100644 --- a/src/main/java/j2html/tags/specialized/DtTag.java +++ b/src/main/java/j2html/tags/specialized/DtTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class DtTag extends ContainerTag { +public final class DtTag extends ContainerTag { public DtTag() { super("dt"); } diff --git a/src/main/java/j2html/tags/specialized/EmTag.java b/src/main/java/j2html/tags/specialized/EmTag.java index 4cc2882b..42000403 100644 --- a/src/main/java/j2html/tags/specialized/EmTag.java +++ b/src/main/java/j2html/tags/specialized/EmTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class EmTag extends ContainerTag { +public final class EmTag extends ContainerTag { public EmTag() { super("em"); } diff --git a/src/main/java/j2html/tags/specialized/EmbedTag.java b/src/main/java/j2html/tags/specialized/EmbedTag.java index 8e9bc0d3..b129fcad 100644 --- a/src/main/java/j2html/tags/specialized/EmbedTag.java +++ b/src/main/java/j2html/tags/specialized/EmbedTag.java @@ -3,7 +3,7 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class EmbedTag extends EmptyTag { +public final class EmbedTag extends EmptyTag { public EmbedTag() { super("embed"); } diff --git a/src/main/java/j2html/tags/specialized/FieldsetTag.java b/src/main/java/j2html/tags/specialized/FieldsetTag.java index 271b1c10..2583547e 100644 --- a/src/main/java/j2html/tags/specialized/FieldsetTag.java +++ b/src/main/java/j2html/tags/specialized/FieldsetTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class FieldsetTag extends ContainerTag { +public final class FieldsetTag extends ContainerTag { public FieldsetTag() { super("fieldset"); } diff --git a/src/main/java/j2html/tags/specialized/FigcaptionTag.java b/src/main/java/j2html/tags/specialized/FigcaptionTag.java index a843277e..9339d440 100644 --- a/src/main/java/j2html/tags/specialized/FigcaptionTag.java +++ b/src/main/java/j2html/tags/specialized/FigcaptionTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class FigcaptionTag extends ContainerTag { +public final class FigcaptionTag extends ContainerTag { public FigcaptionTag() { super("figcaption"); } diff --git a/src/main/java/j2html/tags/specialized/FigureTag.java b/src/main/java/j2html/tags/specialized/FigureTag.java index 1e33e6a8..15ffd4a6 100644 --- a/src/main/java/j2html/tags/specialized/FigureTag.java +++ b/src/main/java/j2html/tags/specialized/FigureTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class FigureTag extends ContainerTag { +public final class FigureTag extends ContainerTag { public FigureTag() { super("figure"); } diff --git a/src/main/java/j2html/tags/specialized/FooterTag.java b/src/main/java/j2html/tags/specialized/FooterTag.java index 14cacb50..b7c15868 100644 --- a/src/main/java/j2html/tags/specialized/FooterTag.java +++ b/src/main/java/j2html/tags/specialized/FooterTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class FooterTag extends ContainerTag { +public final class FooterTag extends ContainerTag { public FooterTag() { super("footer"); } diff --git a/src/main/java/j2html/tags/specialized/FormTag.java b/src/main/java/j2html/tags/specialized/FormTag.java index d46ba0b5..2e4a8ec1 100644 --- a/src/main/java/j2html/tags/specialized/FormTag.java +++ b/src/main/java/j2html/tags/specialized/FormTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class FormTag extends ContainerTag { +public final class FormTag extends ContainerTag { public FormTag() { super("form"); } diff --git a/src/main/java/j2html/tags/specialized/H1Tag.java b/src/main/java/j2html/tags/specialized/H1Tag.java index 012ed5a0..d2ce78f2 100644 --- a/src/main/java/j2html/tags/specialized/H1Tag.java +++ b/src/main/java/j2html/tags/specialized/H1Tag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class H1Tag extends ContainerTag { +public final class H1Tag extends ContainerTag { public H1Tag() { super("h1"); } diff --git a/src/main/java/j2html/tags/specialized/H2Tag.java b/src/main/java/j2html/tags/specialized/H2Tag.java index fd97fc4d..b2967b0f 100644 --- a/src/main/java/j2html/tags/specialized/H2Tag.java +++ b/src/main/java/j2html/tags/specialized/H2Tag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class H2Tag extends ContainerTag { +public final class H2Tag extends ContainerTag { public H2Tag() { super("h2"); } diff --git a/src/main/java/j2html/tags/specialized/H3Tag.java b/src/main/java/j2html/tags/specialized/H3Tag.java index bdf0a3b0..c8cc431a 100644 --- a/src/main/java/j2html/tags/specialized/H3Tag.java +++ b/src/main/java/j2html/tags/specialized/H3Tag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class H3Tag extends ContainerTag { +public final class H3Tag extends ContainerTag { public H3Tag() { super("h3"); } diff --git a/src/main/java/j2html/tags/specialized/H4Tag.java b/src/main/java/j2html/tags/specialized/H4Tag.java index b3354b20..65973e73 100644 --- a/src/main/java/j2html/tags/specialized/H4Tag.java +++ b/src/main/java/j2html/tags/specialized/H4Tag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class H4Tag extends ContainerTag { +public final class H4Tag extends ContainerTag { public H4Tag() { super("h4"); } diff --git a/src/main/java/j2html/tags/specialized/H5Tag.java b/src/main/java/j2html/tags/specialized/H5Tag.java index 7265c292..457aa387 100644 --- a/src/main/java/j2html/tags/specialized/H5Tag.java +++ b/src/main/java/j2html/tags/specialized/H5Tag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class H5Tag extends ContainerTag { +public final class H5Tag extends ContainerTag { public H5Tag() { super("h5"); } diff --git a/src/main/java/j2html/tags/specialized/H6Tag.java b/src/main/java/j2html/tags/specialized/H6Tag.java index 9791865d..b05e3579 100644 --- a/src/main/java/j2html/tags/specialized/H6Tag.java +++ b/src/main/java/j2html/tags/specialized/H6Tag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class H6Tag extends ContainerTag { +public final class H6Tag extends ContainerTag { public H6Tag() { super("h6"); } diff --git a/src/main/java/j2html/tags/specialized/HeaderTag.java b/src/main/java/j2html/tags/specialized/HeaderTag.java index 234d6363..1d9126d4 100644 --- a/src/main/java/j2html/tags/specialized/HeaderTag.java +++ b/src/main/java/j2html/tags/specialized/HeaderTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class HeaderTag extends ContainerTag { +public final class HeaderTag extends ContainerTag { public HeaderTag() { super("header"); } diff --git a/src/main/java/j2html/tags/specialized/HrTag.java b/src/main/java/j2html/tags/specialized/HrTag.java index b0283a60..5e3b3533 100644 --- a/src/main/java/j2html/tags/specialized/HrTag.java +++ b/src/main/java/j2html/tags/specialized/HrTag.java @@ -3,7 +3,7 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class HrTag extends EmptyTag { +public final class HrTag extends EmptyTag { public HrTag() { super("hr"); } diff --git a/src/main/java/j2html/tags/specialized/ITag.java b/src/main/java/j2html/tags/specialized/ITag.java index 227381a1..631ddc52 100644 --- a/src/main/java/j2html/tags/specialized/ITag.java +++ b/src/main/java/j2html/tags/specialized/ITag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class ITag extends ContainerTag { +public final class ITag extends ContainerTag { public ITag() { super("i"); } diff --git a/src/main/java/j2html/tags/specialized/IframeTag.java b/src/main/java/j2html/tags/specialized/IframeTag.java index 502f281c..6ce92236 100644 --- a/src/main/java/j2html/tags/specialized/IframeTag.java +++ b/src/main/java/j2html/tags/specialized/IframeTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class IframeTag extends ContainerTag { +public final class IframeTag extends ContainerTag { public IframeTag() { super("iframe"); } diff --git a/src/main/java/j2html/tags/specialized/ImgTag.java b/src/main/java/j2html/tags/specialized/ImgTag.java index 1ca1454c..443229d7 100644 --- a/src/main/java/j2html/tags/specialized/ImgTag.java +++ b/src/main/java/j2html/tags/specialized/ImgTag.java @@ -3,7 +3,7 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class ImgTag extends EmptyTag { +public final class ImgTag extends EmptyTag { public ImgTag() { super("img"); } diff --git a/src/main/java/j2html/tags/specialized/InputTag.java b/src/main/java/j2html/tags/specialized/InputTag.java index 5db1ee2a..30112fc1 100644 --- a/src/main/java/j2html/tags/specialized/InputTag.java +++ b/src/main/java/j2html/tags/specialized/InputTag.java @@ -3,7 +3,7 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class InputTag extends EmptyTag { +public final class InputTag extends EmptyTag { public InputTag() { super("input"); } diff --git a/src/main/java/j2html/tags/specialized/InsTag.java b/src/main/java/j2html/tags/specialized/InsTag.java index 18d3432c..2ba51af4 100644 --- a/src/main/java/j2html/tags/specialized/InsTag.java +++ b/src/main/java/j2html/tags/specialized/InsTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class InsTag extends ContainerTag { +public final class InsTag extends ContainerTag { public InsTag() { super("ins"); } diff --git a/src/main/java/j2html/tags/specialized/KbdTag.java b/src/main/java/j2html/tags/specialized/KbdTag.java index 9e85ba53..3656c16c 100644 --- a/src/main/java/j2html/tags/specialized/KbdTag.java +++ b/src/main/java/j2html/tags/specialized/KbdTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class KbdTag extends ContainerTag { +public final class KbdTag extends ContainerTag { public KbdTag() { super("kbd"); } diff --git a/src/main/java/j2html/tags/specialized/KeygenTag.java b/src/main/java/j2html/tags/specialized/KeygenTag.java index 06f8c44d..f41ee767 100644 --- a/src/main/java/j2html/tags/specialized/KeygenTag.java +++ b/src/main/java/j2html/tags/specialized/KeygenTag.java @@ -3,7 +3,7 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class KeygenTag extends EmptyTag { +public final class KeygenTag extends EmptyTag { public KeygenTag() { super("keygen"); } diff --git a/src/main/java/j2html/tags/specialized/LabelTag.java b/src/main/java/j2html/tags/specialized/LabelTag.java index c6a8741b..7ac940f7 100644 --- a/src/main/java/j2html/tags/specialized/LabelTag.java +++ b/src/main/java/j2html/tags/specialized/LabelTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class LabelTag extends ContainerTag { +public final class LabelTag extends ContainerTag { public LabelTag() { super("label"); } diff --git a/src/main/java/j2html/tags/specialized/LegendTag.java b/src/main/java/j2html/tags/specialized/LegendTag.java index 6fc9be43..0b634a08 100644 --- a/src/main/java/j2html/tags/specialized/LegendTag.java +++ b/src/main/java/j2html/tags/specialized/LegendTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class LegendTag extends ContainerTag { +public final class LegendTag extends ContainerTag { public LegendTag() { super("legend"); } diff --git a/src/main/java/j2html/tags/specialized/LiTag.java b/src/main/java/j2html/tags/specialized/LiTag.java index 319194d1..ecc3ea70 100644 --- a/src/main/java/j2html/tags/specialized/LiTag.java +++ b/src/main/java/j2html/tags/specialized/LiTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class LiTag extends ContainerTag { +public final class LiTag extends ContainerTag { public LiTag() { super("li"); } diff --git a/src/main/java/j2html/tags/specialized/LinkTag.java b/src/main/java/j2html/tags/specialized/LinkTag.java index 895d4be0..c2c86b53 100644 --- a/src/main/java/j2html/tags/specialized/LinkTag.java +++ b/src/main/java/j2html/tags/specialized/LinkTag.java @@ -3,7 +3,7 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class LinkTag extends EmptyTag { +public final class LinkTag extends EmptyTag { public LinkTag() { super("link"); } diff --git a/src/main/java/j2html/tags/specialized/MainTag.java b/src/main/java/j2html/tags/specialized/MainTag.java index 4439c778..594adf6e 100644 --- a/src/main/java/j2html/tags/specialized/MainTag.java +++ b/src/main/java/j2html/tags/specialized/MainTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class MainTag extends ContainerTag { +public final class MainTag extends ContainerTag { public MainTag() { super("main"); } diff --git a/src/main/java/j2html/tags/specialized/MapTag.java b/src/main/java/j2html/tags/specialized/MapTag.java index c62ee22b..23517e97 100644 --- a/src/main/java/j2html/tags/specialized/MapTag.java +++ b/src/main/java/j2html/tags/specialized/MapTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class MapTag extends ContainerTag { +public final class MapTag extends ContainerTag { public MapTag() { super("map"); } diff --git a/src/main/java/j2html/tags/specialized/MarkTag.java b/src/main/java/j2html/tags/specialized/MarkTag.java index 3983e754..2d437b1a 100644 --- a/src/main/java/j2html/tags/specialized/MarkTag.java +++ b/src/main/java/j2html/tags/specialized/MarkTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class MarkTag extends ContainerTag { +public final class MarkTag extends ContainerTag { public MarkTag() { super("mark"); } diff --git a/src/main/java/j2html/tags/specialized/MenuTag.java b/src/main/java/j2html/tags/specialized/MenuTag.java index 7dbd759c..c730759a 100644 --- a/src/main/java/j2html/tags/specialized/MenuTag.java +++ b/src/main/java/j2html/tags/specialized/MenuTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class MenuTag extends ContainerTag { +public final class MenuTag extends ContainerTag { public MenuTag() { super("menu"); } diff --git a/src/main/java/j2html/tags/specialized/MenuitemTag.java b/src/main/java/j2html/tags/specialized/MenuitemTag.java index 92c2a01f..52942e63 100644 --- a/src/main/java/j2html/tags/specialized/MenuitemTag.java +++ b/src/main/java/j2html/tags/specialized/MenuitemTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class MenuitemTag extends ContainerTag { +public final class MenuitemTag extends ContainerTag { public MenuitemTag() { super("menuitem"); } diff --git a/src/main/java/j2html/tags/specialized/MetaTag.java b/src/main/java/j2html/tags/specialized/MetaTag.java index 7d84c69d..cc70cd32 100644 --- a/src/main/java/j2html/tags/specialized/MetaTag.java +++ b/src/main/java/j2html/tags/specialized/MetaTag.java @@ -3,7 +3,7 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class MetaTag extends EmptyTag { +public final class MetaTag extends EmptyTag { public MetaTag() { super("meta"); } diff --git a/src/main/java/j2html/tags/specialized/MeterTag.java b/src/main/java/j2html/tags/specialized/MeterTag.java index e161e9d7..9c9baf4d 100644 --- a/src/main/java/j2html/tags/specialized/MeterTag.java +++ b/src/main/java/j2html/tags/specialized/MeterTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class MeterTag extends ContainerTag { +public final class MeterTag extends ContainerTag { public MeterTag() { super("meter"); } diff --git a/src/main/java/j2html/tags/specialized/NavTag.java b/src/main/java/j2html/tags/specialized/NavTag.java index 0eac5627..b9290635 100644 --- a/src/main/java/j2html/tags/specialized/NavTag.java +++ b/src/main/java/j2html/tags/specialized/NavTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class NavTag extends ContainerTag { +public final class NavTag extends ContainerTag { public NavTag() { super("nav"); } diff --git a/src/main/java/j2html/tags/specialized/NoscriptTag.java b/src/main/java/j2html/tags/specialized/NoscriptTag.java index 3eb4c702..b111b471 100644 --- a/src/main/java/j2html/tags/specialized/NoscriptTag.java +++ b/src/main/java/j2html/tags/specialized/NoscriptTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class NoscriptTag extends ContainerTag { +public final class NoscriptTag extends ContainerTag { public NoscriptTag() { super("noscript"); } diff --git a/src/main/java/j2html/tags/specialized/ObjectTag.java b/src/main/java/j2html/tags/specialized/ObjectTag.java index 5110394c..54801d7a 100644 --- a/src/main/java/j2html/tags/specialized/ObjectTag.java +++ b/src/main/java/j2html/tags/specialized/ObjectTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class ObjectTag extends ContainerTag { +public final class ObjectTag extends ContainerTag { public ObjectTag() { super("object"); } diff --git a/src/main/java/j2html/tags/specialized/OlTag.java b/src/main/java/j2html/tags/specialized/OlTag.java index 6d5d2a21..85de0152 100644 --- a/src/main/java/j2html/tags/specialized/OlTag.java +++ b/src/main/java/j2html/tags/specialized/OlTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class OlTag extends ContainerTag { +public final class OlTag extends ContainerTag { public OlTag() { super("ol"); } diff --git a/src/main/java/j2html/tags/specialized/OptgroupTag.java b/src/main/java/j2html/tags/specialized/OptgroupTag.java index 1a6cb426..a3ab4ba1 100644 --- a/src/main/java/j2html/tags/specialized/OptgroupTag.java +++ b/src/main/java/j2html/tags/specialized/OptgroupTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class OptgroupTag extends ContainerTag { +public final class OptgroupTag extends ContainerTag { public OptgroupTag() { super("optgroup"); } diff --git a/src/main/java/j2html/tags/specialized/OptionTag.java b/src/main/java/j2html/tags/specialized/OptionTag.java index f52849b1..1269f04e 100644 --- a/src/main/java/j2html/tags/specialized/OptionTag.java +++ b/src/main/java/j2html/tags/specialized/OptionTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class OptionTag extends ContainerTag { +public final class OptionTag extends ContainerTag { public OptionTag() { super("option"); } diff --git a/src/main/java/j2html/tags/specialized/OutputTag.java b/src/main/java/j2html/tags/specialized/OutputTag.java index 0d3eaf99..a5ac8285 100644 --- a/src/main/java/j2html/tags/specialized/OutputTag.java +++ b/src/main/java/j2html/tags/specialized/OutputTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class OutputTag extends ContainerTag { +public final class OutputTag extends ContainerTag { public OutputTag() { super("output"); } diff --git a/src/main/java/j2html/tags/specialized/PTag.java b/src/main/java/j2html/tags/specialized/PTag.java index 86f31058..6e02cd2c 100644 --- a/src/main/java/j2html/tags/specialized/PTag.java +++ b/src/main/java/j2html/tags/specialized/PTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class PTag extends ContainerTag { +public final class PTag extends ContainerTag { public PTag() { super("p"); } diff --git a/src/main/java/j2html/tags/specialized/ParamTag.java b/src/main/java/j2html/tags/specialized/ParamTag.java index 187feb7e..b772bb1c 100644 --- a/src/main/java/j2html/tags/specialized/ParamTag.java +++ b/src/main/java/j2html/tags/specialized/ParamTag.java @@ -3,7 +3,7 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class ParamTag extends EmptyTag { +public final class ParamTag extends EmptyTag { public ParamTag() { super("param"); } diff --git a/src/main/java/j2html/tags/specialized/PreTag.java b/src/main/java/j2html/tags/specialized/PreTag.java index b38dcbe0..4d1c0607 100644 --- a/src/main/java/j2html/tags/specialized/PreTag.java +++ b/src/main/java/j2html/tags/specialized/PreTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class PreTag extends ContainerTag { +public final class PreTag extends ContainerTag { public PreTag() { super("pre"); } diff --git a/src/main/java/j2html/tags/specialized/ProgressTag.java b/src/main/java/j2html/tags/specialized/ProgressTag.java index 159a5b5a..59440972 100644 --- a/src/main/java/j2html/tags/specialized/ProgressTag.java +++ b/src/main/java/j2html/tags/specialized/ProgressTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class ProgressTag extends ContainerTag { +public final class ProgressTag extends ContainerTag { public ProgressTag() { super("progress"); } diff --git a/src/main/java/j2html/tags/specialized/QTag.java b/src/main/java/j2html/tags/specialized/QTag.java index b9a51809..9c1ba9c5 100644 --- a/src/main/java/j2html/tags/specialized/QTag.java +++ b/src/main/java/j2html/tags/specialized/QTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class QTag extends ContainerTag { +public final class QTag extends ContainerTag { public QTag() { super("q"); } diff --git a/src/main/java/j2html/tags/specialized/RpTag.java b/src/main/java/j2html/tags/specialized/RpTag.java index a4a1c7d7..c19ac18b 100644 --- a/src/main/java/j2html/tags/specialized/RpTag.java +++ b/src/main/java/j2html/tags/specialized/RpTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class RpTag extends ContainerTag { +public final class RpTag extends ContainerTag { public RpTag() { super("rp"); } diff --git a/src/main/java/j2html/tags/specialized/RtTag.java b/src/main/java/j2html/tags/specialized/RtTag.java index e4e6625f..016024f7 100644 --- a/src/main/java/j2html/tags/specialized/RtTag.java +++ b/src/main/java/j2html/tags/specialized/RtTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class RtTag extends ContainerTag { +public final class RtTag extends ContainerTag { public RtTag() { super("rt"); } diff --git a/src/main/java/j2html/tags/specialized/RubyTag.java b/src/main/java/j2html/tags/specialized/RubyTag.java index 26f08537..841fa449 100644 --- a/src/main/java/j2html/tags/specialized/RubyTag.java +++ b/src/main/java/j2html/tags/specialized/RubyTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class RubyTag extends ContainerTag { +public final class RubyTag extends ContainerTag { public RubyTag() { super("ruby"); } diff --git a/src/main/java/j2html/tags/specialized/STag.java b/src/main/java/j2html/tags/specialized/STag.java index a7886a8b..c0f1de57 100644 --- a/src/main/java/j2html/tags/specialized/STag.java +++ b/src/main/java/j2html/tags/specialized/STag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class STag extends ContainerTag { +public final class STag extends ContainerTag { public STag() { super("s"); } diff --git a/src/main/java/j2html/tags/specialized/SampTag.java b/src/main/java/j2html/tags/specialized/SampTag.java index a56d7438..8ce6681f 100644 --- a/src/main/java/j2html/tags/specialized/SampTag.java +++ b/src/main/java/j2html/tags/specialized/SampTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class SampTag extends ContainerTag { +public final class SampTag extends ContainerTag { public SampTag() { super("samp"); } diff --git a/src/main/java/j2html/tags/specialized/ScriptTag.java b/src/main/java/j2html/tags/specialized/ScriptTag.java index 5ca20c10..94ba4425 100644 --- a/src/main/java/j2html/tags/specialized/ScriptTag.java +++ b/src/main/java/j2html/tags/specialized/ScriptTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class ScriptTag extends ContainerTag { +public final class ScriptTag extends ContainerTag { public ScriptTag() { super("script"); } diff --git a/src/main/java/j2html/tags/specialized/SectionTag.java b/src/main/java/j2html/tags/specialized/SectionTag.java index 12477f91..0a0d6d6e 100644 --- a/src/main/java/j2html/tags/specialized/SectionTag.java +++ b/src/main/java/j2html/tags/specialized/SectionTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class SectionTag extends ContainerTag { +public final class SectionTag extends ContainerTag { public SectionTag() { super("section"); } diff --git a/src/main/java/j2html/tags/specialized/SelectTag.java b/src/main/java/j2html/tags/specialized/SelectTag.java index c2240ee9..c18a2d84 100644 --- a/src/main/java/j2html/tags/specialized/SelectTag.java +++ b/src/main/java/j2html/tags/specialized/SelectTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class SelectTag extends ContainerTag { +public final class SelectTag extends ContainerTag { public SelectTag() { super("select"); } diff --git a/src/main/java/j2html/tags/specialized/SmallTag.java b/src/main/java/j2html/tags/specialized/SmallTag.java index 17c193b9..07f14e66 100644 --- a/src/main/java/j2html/tags/specialized/SmallTag.java +++ b/src/main/java/j2html/tags/specialized/SmallTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class SmallTag extends ContainerTag { +public final class SmallTag extends ContainerTag { public SmallTag() { super("small"); } diff --git a/src/main/java/j2html/tags/specialized/SourceTag.java b/src/main/java/j2html/tags/specialized/SourceTag.java index 2fadfabf..cc08d9aa 100644 --- a/src/main/java/j2html/tags/specialized/SourceTag.java +++ b/src/main/java/j2html/tags/specialized/SourceTag.java @@ -3,7 +3,7 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class SourceTag extends EmptyTag { +public final class SourceTag extends EmptyTag { public SourceTag() { super("source"); } diff --git a/src/main/java/j2html/tags/specialized/SpanTag.java b/src/main/java/j2html/tags/specialized/SpanTag.java index 57924ae8..404c2c98 100644 --- a/src/main/java/j2html/tags/specialized/SpanTag.java +++ b/src/main/java/j2html/tags/specialized/SpanTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class SpanTag extends ContainerTag { +public final class SpanTag extends ContainerTag { public SpanTag() { super("span"); } diff --git a/src/main/java/j2html/tags/specialized/StrongTag.java b/src/main/java/j2html/tags/specialized/StrongTag.java index f98b0b99..a82c59ad 100644 --- a/src/main/java/j2html/tags/specialized/StrongTag.java +++ b/src/main/java/j2html/tags/specialized/StrongTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class StrongTag extends ContainerTag { +public final class StrongTag extends ContainerTag { public StrongTag() { super("strong"); } diff --git a/src/main/java/j2html/tags/specialized/StyleTag.java b/src/main/java/j2html/tags/specialized/StyleTag.java index 750491af..500e7469 100644 --- a/src/main/java/j2html/tags/specialized/StyleTag.java +++ b/src/main/java/j2html/tags/specialized/StyleTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class StyleTag extends ContainerTag { +public final class StyleTag extends ContainerTag { public StyleTag() { super("style"); } diff --git a/src/main/java/j2html/tags/specialized/SubTag.java b/src/main/java/j2html/tags/specialized/SubTag.java index d37da0df..9895a6dc 100644 --- a/src/main/java/j2html/tags/specialized/SubTag.java +++ b/src/main/java/j2html/tags/specialized/SubTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class SubTag extends ContainerTag { +public final class SubTag extends ContainerTag { public SubTag() { super("sub"); } diff --git a/src/main/java/j2html/tags/specialized/SummaryTag.java b/src/main/java/j2html/tags/specialized/SummaryTag.java index 9fcbe1dc..08bcdf71 100644 --- a/src/main/java/j2html/tags/specialized/SummaryTag.java +++ b/src/main/java/j2html/tags/specialized/SummaryTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class SummaryTag extends ContainerTag { +public final class SummaryTag extends ContainerTag { public SummaryTag() { super("summary"); } diff --git a/src/main/java/j2html/tags/specialized/SupTag.java b/src/main/java/j2html/tags/specialized/SupTag.java index b7465c5c..6d5ae486 100644 --- a/src/main/java/j2html/tags/specialized/SupTag.java +++ b/src/main/java/j2html/tags/specialized/SupTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class SupTag extends ContainerTag { +public final class SupTag extends ContainerTag { public SupTag() { super("sup"); } diff --git a/src/main/java/j2html/tags/specialized/TableTag.java b/src/main/java/j2html/tags/specialized/TableTag.java index e02a00fa..60364037 100644 --- a/src/main/java/j2html/tags/specialized/TableTag.java +++ b/src/main/java/j2html/tags/specialized/TableTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class TableTag extends ContainerTag { +public final class TableTag extends ContainerTag { public TableTag() { super("table"); } diff --git a/src/main/java/j2html/tags/specialized/TbodyTag.java b/src/main/java/j2html/tags/specialized/TbodyTag.java index f4460004..a478a9a9 100644 --- a/src/main/java/j2html/tags/specialized/TbodyTag.java +++ b/src/main/java/j2html/tags/specialized/TbodyTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class TbodyTag extends ContainerTag { +public final class TbodyTag extends ContainerTag { public TbodyTag() { super("tbody"); } diff --git a/src/main/java/j2html/tags/specialized/TdTag.java b/src/main/java/j2html/tags/specialized/TdTag.java index ce59453f..11581581 100644 --- a/src/main/java/j2html/tags/specialized/TdTag.java +++ b/src/main/java/j2html/tags/specialized/TdTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class TdTag extends ContainerTag { +public final class TdTag extends ContainerTag { public TdTag() { super("td"); } diff --git a/src/main/java/j2html/tags/specialized/TextareaTag.java b/src/main/java/j2html/tags/specialized/TextareaTag.java index 60388429..12b3eeb8 100644 --- a/src/main/java/j2html/tags/specialized/TextareaTag.java +++ b/src/main/java/j2html/tags/specialized/TextareaTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class TextareaTag extends ContainerTag { +public final class TextareaTag extends ContainerTag { public TextareaTag() { super("textarea"); } diff --git a/src/main/java/j2html/tags/specialized/TfootTag.java b/src/main/java/j2html/tags/specialized/TfootTag.java index 1131019f..fdea4251 100644 --- a/src/main/java/j2html/tags/specialized/TfootTag.java +++ b/src/main/java/j2html/tags/specialized/TfootTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class TfootTag extends ContainerTag { +public final class TfootTag extends ContainerTag { public TfootTag() { super("tfoot"); } diff --git a/src/main/java/j2html/tags/specialized/ThTag.java b/src/main/java/j2html/tags/specialized/ThTag.java index eebe79fa..c92bba30 100644 --- a/src/main/java/j2html/tags/specialized/ThTag.java +++ b/src/main/java/j2html/tags/specialized/ThTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class ThTag extends ContainerTag { +public final class ThTag extends ContainerTag { public ThTag() { super("th"); } diff --git a/src/main/java/j2html/tags/specialized/TheadTag.java b/src/main/java/j2html/tags/specialized/TheadTag.java index 0ab1e3b0..31108d35 100644 --- a/src/main/java/j2html/tags/specialized/TheadTag.java +++ b/src/main/java/j2html/tags/specialized/TheadTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class TheadTag extends ContainerTag { +public final class TheadTag extends ContainerTag { public TheadTag() { super("thead"); } diff --git a/src/main/java/j2html/tags/specialized/TimeTag.java b/src/main/java/j2html/tags/specialized/TimeTag.java index cf554c2e..ee7cc418 100644 --- a/src/main/java/j2html/tags/specialized/TimeTag.java +++ b/src/main/java/j2html/tags/specialized/TimeTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class TimeTag extends ContainerTag { +public final class TimeTag extends ContainerTag { public TimeTag() { super("time"); } diff --git a/src/main/java/j2html/tags/specialized/TitleTag.java b/src/main/java/j2html/tags/specialized/TitleTag.java index 52cb450e..be8a55b3 100644 --- a/src/main/java/j2html/tags/specialized/TitleTag.java +++ b/src/main/java/j2html/tags/specialized/TitleTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class TitleTag extends ContainerTag { +public final class TitleTag extends ContainerTag { public TitleTag() { super("title"); } diff --git a/src/main/java/j2html/tags/specialized/TrTag.java b/src/main/java/j2html/tags/specialized/TrTag.java index a822b4c2..4b825d32 100644 --- a/src/main/java/j2html/tags/specialized/TrTag.java +++ b/src/main/java/j2html/tags/specialized/TrTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class TrTag extends ContainerTag { +public final class TrTag extends ContainerTag { public TrTag() { super("tr"); } diff --git a/src/main/java/j2html/tags/specialized/TrackTag.java b/src/main/java/j2html/tags/specialized/TrackTag.java index 1b21bc99..10ddc98f 100644 --- a/src/main/java/j2html/tags/specialized/TrackTag.java +++ b/src/main/java/j2html/tags/specialized/TrackTag.java @@ -3,7 +3,7 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class TrackTag extends EmptyTag { +public final class TrackTag extends EmptyTag { public TrackTag() { super("track"); } diff --git a/src/main/java/j2html/tags/specialized/UTag.java b/src/main/java/j2html/tags/specialized/UTag.java index cade9b63..d961314c 100644 --- a/src/main/java/j2html/tags/specialized/UTag.java +++ b/src/main/java/j2html/tags/specialized/UTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class UTag extends ContainerTag { +public final class UTag extends ContainerTag { public UTag() { super("u"); } diff --git a/src/main/java/j2html/tags/specialized/UlTag.java b/src/main/java/j2html/tags/specialized/UlTag.java index f0d6c83e..f56b6414 100644 --- a/src/main/java/j2html/tags/specialized/UlTag.java +++ b/src/main/java/j2html/tags/specialized/UlTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class UlTag extends ContainerTag { +public final class UlTag extends ContainerTag { public UlTag() { super("ul"); } diff --git a/src/main/java/j2html/tags/specialized/VarTag.java b/src/main/java/j2html/tags/specialized/VarTag.java index a6432c5e..19b3fe64 100644 --- a/src/main/java/j2html/tags/specialized/VarTag.java +++ b/src/main/java/j2html/tags/specialized/VarTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class VarTag extends ContainerTag { +public final class VarTag extends ContainerTag { public VarTag() { super("var"); } diff --git a/src/main/java/j2html/tags/specialized/VideoTag.java b/src/main/java/j2html/tags/specialized/VideoTag.java index ba5fbd2c..709f1166 100644 --- a/src/main/java/j2html/tags/specialized/VideoTag.java +++ b/src/main/java/j2html/tags/specialized/VideoTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class VideoTag extends ContainerTag { +public final class VideoTag extends ContainerTag { public VideoTag() { super("video"); } diff --git a/src/main/java/j2html/tags/specialized/WbrTag.java b/src/main/java/j2html/tags/specialized/WbrTag.java index 601d255e..a827e7de 100644 --- a/src/main/java/j2html/tags/specialized/WbrTag.java +++ b/src/main/java/j2html/tags/specialized/WbrTag.java @@ -3,7 +3,7 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class WbrTag extends EmptyTag { +public final class WbrTag extends EmptyTag { public WbrTag() { super("wbr"); } diff --git a/src/test/java/j2html/tags/TagTest.java b/src/test/java/j2html/tags/TagTest.java index 162f9bfa..fc2cd1fd 100644 --- a/src/test/java/j2html/tags/TagTest.java +++ b/src/test/java/j2html/tags/TagTest.java @@ -72,14 +72,14 @@ public void testFormattedTags() throws Exception { // better test in ComplexRend @Test public void testEquals() throws Exception { - Tag tagOne = tag("p").withClass("class").withText("Test"); + Tag tagOne = tag("p").withText("Test").withClass("class"); Tag tagTwo = p("Test").withClass("class"); assertThat(tagOne.equals(tagTwo), is(true)); } @Test public void testAcceptObjectValueAttribute() throws Exception { - ContainerTag complexTestTag = new ContainerTag("input") + Tag complexTestTag = new ContainerTag("input") .attr("attr1", "value1") .attr("attr2", 2) .attr("attr3", null); @@ -96,22 +96,22 @@ public void testWithClasses() throws Exception { @Test public void testEmptyAttribute() throws Exception { - ContainerTag testTagWithAttrValueNull = new ContainerTag("a").attr("attribute", null); + Tag testTagWithAttrValueNull = new ContainerTag("a").attr("attribute", null); assertThat(testTagWithAttrValueNull.render(), is("")); - ContainerTag testTagAttrWithoutAttr = new ContainerTag("a").attr("attribute"); + Tag testTagAttrWithoutAttr = new ContainerTag("a").attr("attribute"); assertThat(testTagAttrWithoutAttr.render(), is("")); } @Test public void testDynamicAttribute() throws Exception { - ContainerTag testTagWithAttrValueNull = new ContainerTag("a").attr(new DynamicHrefAttribute()); + Tag testTagWithAttrValueNull = new ContainerTag("a").attr(new DynamicHrefAttribute()); assertThat(testTagWithAttrValueNull.render(), is("")); } @Test public void testDynamicAttributeReplacement() throws Exception { - ContainerTag testTagWithAttrValueNull = new ContainerTag("a").attr("href", "/link").attr(new DynamicHrefAttribute()); + Tag testTagWithAttrValueNull = new ContainerTag("a").attr("href", "/link").attr(new DynamicHrefAttribute()); assertThat(testTagWithAttrValueNull.render(), is("")); } From eb8af294cc2e5e0f1d7307c2548369ec29ce7eca Mon Sep 17 00:00:00 2001 From: pointbazaar Date: Sun, 23 Aug 2020 21:04:26 +0200 Subject: [PATCH 07/19] insert the information about which attributes are implemented --- .../java/j2html/tags/generators/AttrD.java | 20 ++ .../AttributeInterfaceCodeGenerator.java | 4 +- .../tags/generators/AttributesList.java | 300 ++++++++++-------- .../SpecializedTagClassCodeGenerator.java | 47 ++- .../java/j2html/tags/specialized/ATag.java | 5 +- .../java/j2html/tags/specialized/AreaTag.java | 3 +- .../j2html/tags/specialized/AudioTag.java | 5 +- .../java/j2html/tags/specialized/BaseTag.java | 3 +- .../java/j2html/tags/specialized/BodyTag.java | 2 +- .../j2html/tags/specialized/ButtonTag.java | 5 +- .../j2html/tags/specialized/CanvasTag.java | 5 +- .../java/j2html/tags/specialized/ColTag.java | 3 +- .../j2html/tags/specialized/ColgroupTag.java | 5 +- .../java/j2html/tags/specialized/DelTag.java | 5 +- .../j2html/tags/specialized/DetailsTag.java | 5 +- .../j2html/tags/specialized/EmbedTag.java | 3 +- .../j2html/tags/specialized/FieldsetTag.java | 4 +- .../java/j2html/tags/specialized/FormTag.java | 4 +- .../java/j2html/tags/specialized/HeadTag.java | 2 +- .../j2html/tags/specialized/IframeTag.java | 5 +- .../java/j2html/tags/specialized/ImgTag.java | 3 +- .../j2html/tags/specialized/InputTag.java | 3 +- .../java/j2html/tags/specialized/InsTag.java | 5 +- .../j2html/tags/specialized/LabelTag.java | 5 +- .../java/j2html/tags/specialized/LiTag.java | 5 +- .../java/j2html/tags/specialized/LinkTag.java | 3 +- .../java/j2html/tags/specialized/MapTag.java | 5 +- .../java/j2html/tags/specialized/MenuTag.java | 5 +- .../java/j2html/tags/specialized/MetaTag.java | 3 +- .../j2html/tags/specialized/MeterTag.java | 5 +- .../j2html/tags/specialized/ObjectTag.java | 5 +- .../java/j2html/tags/specialized/OlTag.java | 5 +- .../j2html/tags/specialized/OptgroupTag.java | 5 +- .../j2html/tags/specialized/OptionTag.java | 5 +- .../j2html/tags/specialized/OutputTag.java | 5 +- .../j2html/tags/specialized/ParamTag.java | 3 +- .../j2html/tags/specialized/ProgressTag.java | 5 +- .../java/j2html/tags/specialized/QTag.java | 5 +- .../j2html/tags/specialized/ScriptTag.java | 5 +- .../j2html/tags/specialized/SelectTag.java | 5 +- .../j2html/tags/specialized/SourceTag.java | 3 +- .../j2html/tags/specialized/StyleTag.java | 5 +- .../java/j2html/tags/specialized/TdTag.java | 5 +- .../j2html/tags/specialized/TextareaTag.java | 5 +- .../java/j2html/tags/specialized/ThTag.java | 5 +- .../java/j2html/tags/specialized/TimeTag.java | 5 +- .../j2html/tags/specialized/TrackTag.java | 7 +- .../j2html/tags/specialized/VideoTag.java | 4 +- 48 files changed, 376 insertions(+), 188 deletions(-) create mode 100644 src/main/java/j2html/tags/generators/AttrD.java diff --git a/src/main/java/j2html/tags/generators/AttrD.java b/src/main/java/j2html/tags/generators/AttrD.java new file mode 100644 index 00000000..c63e49a2 --- /dev/null +++ b/src/main/java/j2html/tags/generators/AttrD.java @@ -0,0 +1,20 @@ +package j2html.tags.generators; + +final class AttrD { + //attribute descriptor + + public final String attr; + + //the html tags that this attribute can be used on + public final String[] tags; + + public AttrD(final String attr){ + this.attr = attr; + this.tags = new String[]{}; + } + + public AttrD(final String attr, final String... tags) { + this.attr = attr; + this.tags = tags; + } +} diff --git a/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java b/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java index 91045a26..0c5847b1 100644 --- a/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java +++ b/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java @@ -101,8 +101,8 @@ default T withFormAction(String formAction){ return sb.toString(); } - private static String interfaceNameFromAttribute(String tageNameLowerCase){ - String res = tageNameLowerCase.substring(0,1).toUpperCase()+tageNameLowerCase.substring(1); + public static String interfaceNameFromAttribute(String attribute){ + String res = attribute.substring(0,1).toUpperCase()+attribute.substring(1); return "I" + res; } diff --git a/src/main/java/j2html/tags/generators/AttributesList.java b/src/main/java/j2html/tags/generators/AttributesList.java index a3276260..ab03711d 100644 --- a/src/main/java/j2html/tags/generators/AttributesList.java +++ b/src/main/java/j2html/tags/generators/AttributesList.java @@ -1,159 +1,187 @@ package j2html.tags.generators; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; public final class AttributesList { - static List attributes() { + //https://www.w3schools.com/tags/ref_attributes.asp + + static List getCustomAttributesForHtmlTag(final String tagLowercase){ + + final List attrs = new ArrayList<>(); + for(AttrD attrD : attributesDescriptive()){ + if( + Arrays.asList(attrD.tags).contains(tagLowercase) + ){ + attrs.add(attrD.attr); + } + } + return attrs; + } + + static List attributes(){ + return attributesDescriptive().stream().map(a->a.attr).collect(Collectors.toList()); + } + + static List attributesDescriptive() { return Arrays.asList( - "accept", - //"accept-charset", contains dashes, TODO - "accesskey", - "action", + new AttrD("accept", "input"), + //new AttrD("accept-charset","form"), //contains dashes, TODO + //new AttrD("accesskey"), //global attribute + new AttrD("action", "form"), //"align", not supported in HTML5 - "alt", - "async", - "autocomplete", - "autofocus", - "autoplay", + new AttrD("alt", "area","img","input"), + new AttrD("async","script"), + new AttrD("autocomplete","form","input"), + new AttrD("autofocus","button","input","select","textarea"), + new AttrD("autoplay","audio","video"), //"bgcolor", not supported in HTMTL5 //"border", not supported in HTML5 - "charset", - "checked", - "cite", - //"class" already implemented in Tag.java - "cols", - "colspan", - "content", + new AttrD("charset","meta","script"), + new AttrD("checked","input"), + new AttrD("cite","blockquote","del","ins","q"), + //"class" already implemented in Tag.java // global attribute + new AttrD("cols","textarea"), + new AttrD("colspan","td","th"), + new AttrD("content","meta"), //"contenteditable" global attribute, should be in Tag.java - "controls", - "coords", - "data", - "datetime", - "default", - "defer", - "dir", - "dirname", - //"disabled", manually implemented - //"download" manually implemented - //"draggable" global attribute, should be in Tag.java - "enctype", - "for", - "form", - "formaction", - "headers", - "height", - "hidden", - "high", - "href", - "hreflang", + new AttrD("controls","audio","video"), + new AttrD("coords","area"), + new AttrD("data","object"), + new AttrD("datetime","del","ins","time"), + new AttrD("default","track"), + new AttrD("defer","script"), + //new AttrD("dir"), //global attribute + new AttrD("dirname","input","textarea"), + //new AttrD("disabled","button","fieldset","input","optgroup","option","select","textarea"), manually implemented + //new AttrD("download","a","area") manually implemented + //new AttrD("draggable") global attribute, should be in Tag.java + new AttrD("enctype", "form"), + new AttrD("for","label","output"), + new AttrD("form","button","fieldset","input","label","meter","object","output","select","textarea"), + new AttrD("formaction","button","input"), + new AttrD("headers","td","th"), + new AttrD("height","canvas","embed","iframe","img","input","object","video"), + //new AttrD("hidden"), global attribute + new AttrD("high","meter"), + new AttrD("href","a","area","base","link"), + new AttrD("hreflang","a","area","link"), //"http-equiv", // '-' is problematic in code generation //"id" global attribute, should be in Tag.java - "ismap", - "kind", - "label", + new AttrD("ismap", "img"), + new AttrD("kind","track"), + new AttrD("label","track","option","optgroup"), //"lang" global attribute, should be in Tag.java - "list", - "loop", - "low", - "max", - "maxlength", - "media", - "method", - "min", - "multiple", - "muted", - "name", - "novalidate", - "onabort", - "onafterprint", - "onbeforeprint", - "onbeforeunload", - "onblur", - "oncanplay", - "oncanplaythrough", + new AttrD("list","input"), + new AttrD("loop","audio","video"), + new AttrD("low","meter"), + new AttrD("max","input","meter","progress"), + new AttrD("maxlength","input","textarea"), + new AttrD("media","a","area","link","source","style"), + new AttrD("method","form"), + new AttrD("min","input","meter"), + new AttrD("multiple","input","select"), + new AttrD("muted","video","audio"), + new AttrD("name","button","fieldset","form","iframe","input","map","meta","object","output","param","select","textarea"), + new AttrD("novalidate","form"), + new AttrD("onabort","audio","embed","img","object","video"), + new AttrD("onafterprint","body"), + new AttrD("onbeforeprint","body"), + new AttrD("onbeforeunload","body"), + //new AttrD("onblur"), global attribute + new AttrD("oncanplay", "audio","embed","object","video"), + new AttrD("oncanplaythrough","audio","video"), /* a bunch of event attributes that are on all visible elements (so should be in Tag.java) "onchange", - "" - + "onclick", + "oncontextmenu", + "oncopy", + */ + new AttrD("oncuechange","track"), + /* + "oncut", + ... + "ondrop", */ - "ondurationchange", - "onemptied", - "onended", - "onerror", - //"onfocus" global attribute - "onhashchange", + new AttrD("ondurationchange","audio","video"), + new AttrD("onemptied","audio","video"), + new AttrD("onended","audio","video"), + new AttrD("onerror","audio","body","embed","img","object","script","style","video"), + //new AttrD("onfocus"),// global attribute + new AttrD("onhashchange","body"), // ... a bunch of event attributes visible on all elements - "onload", - "onloadeddata", - "onloadedmetadata", - "onloadstart", + new AttrD("onload","body","iframe","img","input","link","script","style"), + new AttrD("onloadeddata","audio","video"), + new AttrD("onloadedmetadata","audio","video"), + new AttrD("onloadstart", "audio","video"), // ... a bunch of event attributes visible on all elements - "onoffline", - "ononline", - "onpagehide", - "onpageshow", - //"onpaste" global attribute - "onpause", - "onplay", - "onplaying", - "onpopstate", - "onprogress", - "onratechange", - "onreset", - "onresize", - "onscroll", - "onsearch", - "onseeked", - "onseeking", - "onselect", - "onstalled", - "onstorage", - "onsubmit", - "onsuspend", - "ontimeupdate", - "ontoggle", - "onunload", - "onvolumechanged", - "onwaiting", - "onwheel", - "open", - "optimum", - "pattern", - "placeholder", - "poster", - "preload", - "readonly", - "rel", - "required", - "reversed", - "rows", - "rowspan", - "sandbox", - "scope", - "selected", - "shape", - "size", - "sizes", - "span", - "spellcheck", - "src", - "srcdoc", - "srclang", - "srcset", - "start", - "step", - //"style", global attribute - //"tabindex", global attribute - "target", - //"title", global attribute - //"translate" global attribute - "type", - "usemap", - "value", - "width", - "wrap" + new AttrD("onoffline","body"), + new AttrD("ononline","body"), + new AttrD("onpagehide","body"), + new AttrD("onpageshow","body"), + //new AttrD("onpaste"),// global attribute + new AttrD("onpause","audio","video"), + new AttrD("onplay","audio","video"), + new AttrD("onplaying","audio","video"), + new AttrD("onpopstate","body"), + new AttrD("onprogress","audio","video"), + new AttrD("onratechange","audio","video"), + new AttrD("onreset","form"), + new AttrD("onresize","body"), + //new AttrD("onscroll"), //global attribute + new AttrD("onsearch","input"), + new AttrD("onseeked","audio","video"), + new AttrD("onseeking","audio","video"), + //new AttrD("onselect"), //global attribute + new AttrD("onstalled","audio","video"), + new AttrD("onstorage","body"), + new AttrD("onsubmit","form"), + new AttrD("onsuspend","audio","video"), + new AttrD("ontimeupdate","audio","video"), + new AttrD("ontoggle","details"), + new AttrD("onunload","body"), + new AttrD("onvolumechanged","audio","video"), + new AttrD("onwaiting","audio","video"), + //new AttrD("onwheel"), //global attribute + new AttrD("open","details"), + new AttrD("optimum","meter"), + new AttrD("pattern","input"), + new AttrD("placeholder","input","textarea"), + new AttrD("poster","video"), + new AttrD("preload","audio","video"), + new AttrD("readonly","input","textarea"), + new AttrD("rel","a","area","form","link"), + new AttrD("required","input","select","textarea"), + new AttrD("reversed","ol"), + new AttrD("rows","textarea"), + new AttrD("rowspan","td","th"), + new AttrD("sandbox","iframe"), + new AttrD("scope","th"), + new AttrD("selected","option"), + new AttrD("shape","area"), + new AttrD("size","input","select"), + new AttrD("sizes","img","link","source"), + new AttrD("span","col","colgroup"), + //new AttrD("spellcheck"), //global attribute + new AttrD("src","audio","embed","iframe","img","input","script","source","track","video"), + new AttrD("srcdoc","iframe"), + new AttrD("srclang","track"), + new AttrD("srcset","img","source"), + new AttrD("start","ol"), + new AttrD("step","input"), + //new AttrD("style"), //global attribute + //new AttrD("tabindex"), //global attribute + new AttrD("target", "a","area","base","form"), + //new AttrD("title"), //global attribute + //new AttrD("translate"),// global attribute + new AttrD("type","a","button","embed","input","link","menu","object","script","source","style"), + new AttrD("usemap","img","object"), + new AttrD("value","button","input","li","option","meter","progress","param"), + new AttrD("width","canvas","embed","iframe","img","input","object","video"), + new AttrD("wrap","textarea") ); } } diff --git a/src/main/java/j2html/tags/generators/SpecializedTagClassCodeGenerator.java b/src/main/java/j2html/tags/generators/SpecializedTagClassCodeGenerator.java index 81da16d5..30b79a66 100644 --- a/src/main/java/j2html/tags/generators/SpecializedTagClassCodeGenerator.java +++ b/src/main/java/j2html/tags/generators/SpecializedTagClassCodeGenerator.java @@ -1,5 +1,6 @@ package j2html.tags.generators; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -7,6 +8,7 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; +import java.util.stream.Collectors; import static j2html.tags.generators.TagCreatorCodeGenerator.containerTags; import static j2html.tags.generators.TagCreatorCodeGenerator.emptyTags; @@ -38,7 +40,8 @@ private static String getClassTemplate( final String className, final Optional optExtends, final List imports, - final String tag + final String tag, + final List interfaces ){ final StringBuilder sb = new StringBuilder(); @@ -51,13 +54,27 @@ private static String getClassTemplate( } sb.append("\n"); sb.append("public final class ") - .append(className); + .append(className) + .append(" "); if(optExtends.isPresent()) { - sb.append(" extends ").append(optExtends.get()) + sb.append("extends ").append(optExtends.get()) .append(" "); } + //add the 'implements' clause + if(!interfaces.isEmpty()) { + sb.append("\n"); + sb.append("implements "); + + final List genericInterfaceNames + = interfaces.stream().map(iName -> iName+"<"+className+">") + .collect(Collectors.toList()); + sb.append( + String.join(",", genericInterfaceNames) + ); + } + sb.append(" {\n"); //class contents @@ -72,6 +89,14 @@ private static String getClassTemplate( return sb.toString(); } + private static List getInterfaceNamesForTag(final String tagNameLowercase){ + return AttributesList.getCustomAttributesForHtmlTag(tagNameLowercase) + .stream() + .map( + AttributeInterfaceCodeGenerator::interfaceNameFromAttribute + ).collect(Collectors.toList()); + } + public static void mainInner(final boolean delete) throws IOException { System.out.println("// EmptyTags, generated in " + SpecializedTagClassCodeGenerator.class); @@ -79,6 +104,8 @@ public static void mainInner(final boolean delete) throws IOException { final String className = classNameFromTag(tag); final Path path = makePath(tag); + final List interfaceNames = getInterfaceNamesForTag(tag); + final String classString = getClassTemplate( className, @@ -87,7 +114,8 @@ public static void mainInner(final boolean delete) throws IOException { "j2html.tags.EmptyTag", "j2html.tags.attributes.*" ), - tag + tag, + interfaceNames ); /* @@ -108,12 +136,19 @@ public InputTag() { for (final String tag : containerTags()) { final Path path = makePath(tag); final String className = classNameFromTag(tag); + + final List interfaceNames = getInterfaceNamesForTag(tag); + final String classString = getClassTemplate( className, Optional.of("ContainerTag<"+className+">"), - Arrays.asList("j2html.tags.ContainerTag"), - tag + Arrays.asList( + "j2html.tags.ContainerTag", + "j2html.tags.attributes.*" + ), + tag, + interfaceNames ); if(delete){ diff --git a/src/main/java/j2html/tags/specialized/ATag.java b/src/main/java/j2html/tags/specialized/ATag.java index f01ede82..b4b6902e 100644 --- a/src/main/java/j2html/tags/specialized/ATag.java +++ b/src/main/java/j2html/tags/specialized/ATag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class ATag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class ATag extends ContainerTag + implements IHref, IHreflang, IMedia, IRel, ITarget, IType { public ATag() { super("a"); } diff --git a/src/main/java/j2html/tags/specialized/AreaTag.java b/src/main/java/j2html/tags/specialized/AreaTag.java index f6f89739..b3e601a6 100644 --- a/src/main/java/j2html/tags/specialized/AreaTag.java +++ b/src/main/java/j2html/tags/specialized/AreaTag.java @@ -3,7 +3,8 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class AreaTag extends EmptyTag { +public final class AreaTag extends EmptyTag + implements IAlt, ICoords, IHref, IHreflang, IMedia, IRel, IShape, ITarget { public AreaTag() { super("area"); } diff --git a/src/main/java/j2html/tags/specialized/AudioTag.java b/src/main/java/j2html/tags/specialized/AudioTag.java index b4b43820..cc38c630 100644 --- a/src/main/java/j2html/tags/specialized/AudioTag.java +++ b/src/main/java/j2html/tags/specialized/AudioTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class AudioTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class AudioTag extends ContainerTag + implements IAutoplay, IControls, ILoop, IMuted, IOnabort, IOncanplay, IOncanplaythrough, IOndurationchange, IOnemptied, IOnended, IOnerror, IOnloadeddata, IOnloadedmetadata, IOnloadstart, IOnpause, IOnplay, IOnplaying, IOnprogress, IOnratechange, IOnseeked, IOnseeking, IOnstalled, IOnsuspend, IOntimeupdate, IOnvolumechanged, IOnwaiting, IPreload, ISrc { public AudioTag() { super("audio"); } diff --git a/src/main/java/j2html/tags/specialized/BaseTag.java b/src/main/java/j2html/tags/specialized/BaseTag.java index 339fc84d..fa921d55 100644 --- a/src/main/java/j2html/tags/specialized/BaseTag.java +++ b/src/main/java/j2html/tags/specialized/BaseTag.java @@ -3,7 +3,8 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class BaseTag extends EmptyTag { +public final class BaseTag extends EmptyTag + implements IHref, ITarget { public BaseTag() { super("base"); } diff --git a/src/main/java/j2html/tags/specialized/BodyTag.java b/src/main/java/j2html/tags/specialized/BodyTag.java index a021f88b..7fde307a 100644 --- a/src/main/java/j2html/tags/specialized/BodyTag.java +++ b/src/main/java/j2html/tags/specialized/BodyTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class BodyTag extends ContainerTag { +public final class BodyTag extends ContainerTag { public BodyTag() { super("body"); diff --git a/src/main/java/j2html/tags/specialized/ButtonTag.java b/src/main/java/j2html/tags/specialized/ButtonTag.java index 5fa24423..5206de54 100644 --- a/src/main/java/j2html/tags/specialized/ButtonTag.java +++ b/src/main/java/j2html/tags/specialized/ButtonTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class ButtonTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class ButtonTag extends ContainerTag + implements IAutofocus, IForm, IFormaction, IName, IType, IValue { public ButtonTag() { super("button"); } diff --git a/src/main/java/j2html/tags/specialized/CanvasTag.java b/src/main/java/j2html/tags/specialized/CanvasTag.java index 89e3581d..6d5ec000 100644 --- a/src/main/java/j2html/tags/specialized/CanvasTag.java +++ b/src/main/java/j2html/tags/specialized/CanvasTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class CanvasTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class CanvasTag extends ContainerTag + implements IHeight, IWidth { public CanvasTag() { super("canvas"); } diff --git a/src/main/java/j2html/tags/specialized/ColTag.java b/src/main/java/j2html/tags/specialized/ColTag.java index 6c22cecc..5bdd3234 100644 --- a/src/main/java/j2html/tags/specialized/ColTag.java +++ b/src/main/java/j2html/tags/specialized/ColTag.java @@ -3,7 +3,8 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class ColTag extends EmptyTag { +public final class ColTag extends EmptyTag + implements ISpan { public ColTag() { super("col"); } diff --git a/src/main/java/j2html/tags/specialized/ColgroupTag.java b/src/main/java/j2html/tags/specialized/ColgroupTag.java index 54e6495a..65ad55e1 100644 --- a/src/main/java/j2html/tags/specialized/ColgroupTag.java +++ b/src/main/java/j2html/tags/specialized/ColgroupTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class ColgroupTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class ColgroupTag extends ContainerTag + implements ISpan { public ColgroupTag() { super("colgroup"); } diff --git a/src/main/java/j2html/tags/specialized/DelTag.java b/src/main/java/j2html/tags/specialized/DelTag.java index 90cc5417..10f951cf 100644 --- a/src/main/java/j2html/tags/specialized/DelTag.java +++ b/src/main/java/j2html/tags/specialized/DelTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class DelTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class DelTag extends ContainerTag + implements ICite, IDatetime { public DelTag() { super("del"); } diff --git a/src/main/java/j2html/tags/specialized/DetailsTag.java b/src/main/java/j2html/tags/specialized/DetailsTag.java index 0eaba90e..e23464f2 100644 --- a/src/main/java/j2html/tags/specialized/DetailsTag.java +++ b/src/main/java/j2html/tags/specialized/DetailsTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class DetailsTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class DetailsTag extends ContainerTag + implements IOntoggle, IOpen { public DetailsTag() { super("details"); } diff --git a/src/main/java/j2html/tags/specialized/EmbedTag.java b/src/main/java/j2html/tags/specialized/EmbedTag.java index b129fcad..59d8c438 100644 --- a/src/main/java/j2html/tags/specialized/EmbedTag.java +++ b/src/main/java/j2html/tags/specialized/EmbedTag.java @@ -3,7 +3,8 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class EmbedTag extends EmptyTag { +public final class EmbedTag extends EmptyTag + implements IHeight, IOnabort, IOncanplay, IOnerror, ISrc, IType, IWidth { public EmbedTag() { super("embed"); } diff --git a/src/main/java/j2html/tags/specialized/FieldsetTag.java b/src/main/java/j2html/tags/specialized/FieldsetTag.java index 2583547e..63cad232 100644 --- a/src/main/java/j2html/tags/specialized/FieldsetTag.java +++ b/src/main/java/j2html/tags/specialized/FieldsetTag.java @@ -1,8 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; -public final class FieldsetTag extends ContainerTag { +public final class FieldsetTag extends ContainerTag + implements IForm, IName { public FieldsetTag() { super("fieldset"); } diff --git a/src/main/java/j2html/tags/specialized/FormTag.java b/src/main/java/j2html/tags/specialized/FormTag.java index 2e4a8ec1..5e2239b6 100644 --- a/src/main/java/j2html/tags/specialized/FormTag.java +++ b/src/main/java/j2html/tags/specialized/FormTag.java @@ -1,8 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; -public final class FormTag extends ContainerTag { +public final class FormTag extends ContainerTag + implements IAction, IAutocomplete, IEnctype, IMethod, IName, INovalidate, IOnreset, IOnsubmit, IRel, ITarget { public FormTag() { super("form"); } diff --git a/src/main/java/j2html/tags/specialized/HeadTag.java b/src/main/java/j2html/tags/specialized/HeadTag.java index 1d19edc1..c8340a1f 100644 --- a/src/main/java/j2html/tags/specialized/HeadTag.java +++ b/src/main/java/j2html/tags/specialized/HeadTag.java @@ -2,7 +2,7 @@ import j2html.tags.ContainerTag; -public final class HeadTag extends ContainerTag { +public final class HeadTag extends ContainerTag { public HeadTag() { super("head"); diff --git a/src/main/java/j2html/tags/specialized/IframeTag.java b/src/main/java/j2html/tags/specialized/IframeTag.java index 6ce92236..8faca29c 100644 --- a/src/main/java/j2html/tags/specialized/IframeTag.java +++ b/src/main/java/j2html/tags/specialized/IframeTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class IframeTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class IframeTag extends ContainerTag + implements IHeight, IName, IOnload, ISandbox, ISrc, ISrcdoc, IWidth { public IframeTag() { super("iframe"); } diff --git a/src/main/java/j2html/tags/specialized/ImgTag.java b/src/main/java/j2html/tags/specialized/ImgTag.java index 443229d7..680a033b 100644 --- a/src/main/java/j2html/tags/specialized/ImgTag.java +++ b/src/main/java/j2html/tags/specialized/ImgTag.java @@ -3,7 +3,8 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class ImgTag extends EmptyTag { +public final class ImgTag extends EmptyTag + implements IAlt, IHeight, IIsmap, IOnabort, IOnerror, IOnload, ISizes, ISrc, ISrcset, IUsemap, IWidth { public ImgTag() { super("img"); } diff --git a/src/main/java/j2html/tags/specialized/InputTag.java b/src/main/java/j2html/tags/specialized/InputTag.java index 30112fc1..7c19cb4a 100644 --- a/src/main/java/j2html/tags/specialized/InputTag.java +++ b/src/main/java/j2html/tags/specialized/InputTag.java @@ -3,7 +3,8 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class InputTag extends EmptyTag { +public final class InputTag extends EmptyTag + implements IAccept, IAlt, IAutocomplete, IAutofocus, IChecked, IDirname, IForm, IFormaction, IHeight, IList, IMax, IMaxlength, IMin, IMultiple, IName, IOnload, IOnsearch, IPattern, IPlaceholder, IReadonly, IRequired, ISize, ISrc, IStep, IType, IValue, IWidth { public InputTag() { super("input"); } diff --git a/src/main/java/j2html/tags/specialized/InsTag.java b/src/main/java/j2html/tags/specialized/InsTag.java index 2ba51af4..43f2834a 100644 --- a/src/main/java/j2html/tags/specialized/InsTag.java +++ b/src/main/java/j2html/tags/specialized/InsTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class InsTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class InsTag extends ContainerTag + implements ICite, IDatetime { public InsTag() { super("ins"); } diff --git a/src/main/java/j2html/tags/specialized/LabelTag.java b/src/main/java/j2html/tags/specialized/LabelTag.java index 7ac940f7..9f4169d7 100644 --- a/src/main/java/j2html/tags/specialized/LabelTag.java +++ b/src/main/java/j2html/tags/specialized/LabelTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class LabelTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class LabelTag extends ContainerTag + implements IFor, IForm { public LabelTag() { super("label"); } diff --git a/src/main/java/j2html/tags/specialized/LiTag.java b/src/main/java/j2html/tags/specialized/LiTag.java index ecc3ea70..46ab65a4 100644 --- a/src/main/java/j2html/tags/specialized/LiTag.java +++ b/src/main/java/j2html/tags/specialized/LiTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class LiTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class LiTag extends ContainerTag + implements IValue { public LiTag() { super("li"); } diff --git a/src/main/java/j2html/tags/specialized/LinkTag.java b/src/main/java/j2html/tags/specialized/LinkTag.java index c2c86b53..f6c7d6c5 100644 --- a/src/main/java/j2html/tags/specialized/LinkTag.java +++ b/src/main/java/j2html/tags/specialized/LinkTag.java @@ -3,7 +3,8 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class LinkTag extends EmptyTag { +public final class LinkTag extends EmptyTag + implements IHref, IHreflang, IMedia, IOnload, IRel, ISizes, IType { public LinkTag() { super("link"); } diff --git a/src/main/java/j2html/tags/specialized/MapTag.java b/src/main/java/j2html/tags/specialized/MapTag.java index 23517e97..14acf3b8 100644 --- a/src/main/java/j2html/tags/specialized/MapTag.java +++ b/src/main/java/j2html/tags/specialized/MapTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class MapTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class MapTag extends ContainerTag + implements IName { public MapTag() { super("map"); } diff --git a/src/main/java/j2html/tags/specialized/MenuTag.java b/src/main/java/j2html/tags/specialized/MenuTag.java index c730759a..87ea09ce 100644 --- a/src/main/java/j2html/tags/specialized/MenuTag.java +++ b/src/main/java/j2html/tags/specialized/MenuTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class MenuTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class MenuTag extends ContainerTag + implements IType { public MenuTag() { super("menu"); } diff --git a/src/main/java/j2html/tags/specialized/MetaTag.java b/src/main/java/j2html/tags/specialized/MetaTag.java index cc70cd32..5fca82f0 100644 --- a/src/main/java/j2html/tags/specialized/MetaTag.java +++ b/src/main/java/j2html/tags/specialized/MetaTag.java @@ -3,7 +3,8 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class MetaTag extends EmptyTag { +public final class MetaTag extends EmptyTag + implements ICharset, IContent, IName { public MetaTag() { super("meta"); } diff --git a/src/main/java/j2html/tags/specialized/MeterTag.java b/src/main/java/j2html/tags/specialized/MeterTag.java index 9c9baf4d..937c68ab 100644 --- a/src/main/java/j2html/tags/specialized/MeterTag.java +++ b/src/main/java/j2html/tags/specialized/MeterTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class MeterTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class MeterTag extends ContainerTag + implements IForm, IHigh, ILow, IMax, IMin, IOptimum, IValue { public MeterTag() { super("meter"); } diff --git a/src/main/java/j2html/tags/specialized/ObjectTag.java b/src/main/java/j2html/tags/specialized/ObjectTag.java index 54801d7a..69dd7b27 100644 --- a/src/main/java/j2html/tags/specialized/ObjectTag.java +++ b/src/main/java/j2html/tags/specialized/ObjectTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class ObjectTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class ObjectTag extends ContainerTag + implements IData, IForm, IHeight, IName, IOnabort, IOncanplay, IOnerror, IType, IUsemap, IWidth { public ObjectTag() { super("object"); } diff --git a/src/main/java/j2html/tags/specialized/OlTag.java b/src/main/java/j2html/tags/specialized/OlTag.java index 85de0152..0eb8a472 100644 --- a/src/main/java/j2html/tags/specialized/OlTag.java +++ b/src/main/java/j2html/tags/specialized/OlTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class OlTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class OlTag extends ContainerTag + implements IReversed, IStart { public OlTag() { super("ol"); } diff --git a/src/main/java/j2html/tags/specialized/OptgroupTag.java b/src/main/java/j2html/tags/specialized/OptgroupTag.java index a3ab4ba1..3dd2d216 100644 --- a/src/main/java/j2html/tags/specialized/OptgroupTag.java +++ b/src/main/java/j2html/tags/specialized/OptgroupTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class OptgroupTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class OptgroupTag extends ContainerTag + implements ILabel { public OptgroupTag() { super("optgroup"); } diff --git a/src/main/java/j2html/tags/specialized/OptionTag.java b/src/main/java/j2html/tags/specialized/OptionTag.java index 1269f04e..f2230b00 100644 --- a/src/main/java/j2html/tags/specialized/OptionTag.java +++ b/src/main/java/j2html/tags/specialized/OptionTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class OptionTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class OptionTag extends ContainerTag + implements ILabel, ISelected, IValue { public OptionTag() { super("option"); } diff --git a/src/main/java/j2html/tags/specialized/OutputTag.java b/src/main/java/j2html/tags/specialized/OutputTag.java index a5ac8285..9fdc2bcc 100644 --- a/src/main/java/j2html/tags/specialized/OutputTag.java +++ b/src/main/java/j2html/tags/specialized/OutputTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class OutputTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class OutputTag extends ContainerTag + implements IFor, IForm, IName { public OutputTag() { super("output"); } diff --git a/src/main/java/j2html/tags/specialized/ParamTag.java b/src/main/java/j2html/tags/specialized/ParamTag.java index b772bb1c..d8b8ece5 100644 --- a/src/main/java/j2html/tags/specialized/ParamTag.java +++ b/src/main/java/j2html/tags/specialized/ParamTag.java @@ -3,7 +3,8 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class ParamTag extends EmptyTag { +public final class ParamTag extends EmptyTag + implements IName, IValue { public ParamTag() { super("param"); } diff --git a/src/main/java/j2html/tags/specialized/ProgressTag.java b/src/main/java/j2html/tags/specialized/ProgressTag.java index 59440972..8b5b77a1 100644 --- a/src/main/java/j2html/tags/specialized/ProgressTag.java +++ b/src/main/java/j2html/tags/specialized/ProgressTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class ProgressTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class ProgressTag extends ContainerTag + implements IMax, IValue { public ProgressTag() { super("progress"); } diff --git a/src/main/java/j2html/tags/specialized/QTag.java b/src/main/java/j2html/tags/specialized/QTag.java index 9c1ba9c5..7b1ceb3e 100644 --- a/src/main/java/j2html/tags/specialized/QTag.java +++ b/src/main/java/j2html/tags/specialized/QTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class QTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class QTag extends ContainerTag + implements ICite { public QTag() { super("q"); } diff --git a/src/main/java/j2html/tags/specialized/ScriptTag.java b/src/main/java/j2html/tags/specialized/ScriptTag.java index 94ba4425..6fa3c63e 100644 --- a/src/main/java/j2html/tags/specialized/ScriptTag.java +++ b/src/main/java/j2html/tags/specialized/ScriptTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class ScriptTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class ScriptTag extends ContainerTag + implements IAsync, ICharset, IDefer, IOnerror, IOnload, ISrc, IType { public ScriptTag() { super("script"); } diff --git a/src/main/java/j2html/tags/specialized/SelectTag.java b/src/main/java/j2html/tags/specialized/SelectTag.java index c18a2d84..11610658 100644 --- a/src/main/java/j2html/tags/specialized/SelectTag.java +++ b/src/main/java/j2html/tags/specialized/SelectTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class SelectTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class SelectTag extends ContainerTag + implements IAutofocus, IForm, IMultiple, IName, IRequired, ISize { public SelectTag() { super("select"); } diff --git a/src/main/java/j2html/tags/specialized/SourceTag.java b/src/main/java/j2html/tags/specialized/SourceTag.java index cc08d9aa..6727b140 100644 --- a/src/main/java/j2html/tags/specialized/SourceTag.java +++ b/src/main/java/j2html/tags/specialized/SourceTag.java @@ -3,7 +3,8 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class SourceTag extends EmptyTag { +public final class SourceTag extends EmptyTag + implements IMedia, ISizes, ISrc, ISrcset, IType { public SourceTag() { super("source"); } diff --git a/src/main/java/j2html/tags/specialized/StyleTag.java b/src/main/java/j2html/tags/specialized/StyleTag.java index 500e7469..3824cffb 100644 --- a/src/main/java/j2html/tags/specialized/StyleTag.java +++ b/src/main/java/j2html/tags/specialized/StyleTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class StyleTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class StyleTag extends ContainerTag + implements IMedia, IOnerror, IOnload, IType { public StyleTag() { super("style"); } diff --git a/src/main/java/j2html/tags/specialized/TdTag.java b/src/main/java/j2html/tags/specialized/TdTag.java index 11581581..ee0f486f 100644 --- a/src/main/java/j2html/tags/specialized/TdTag.java +++ b/src/main/java/j2html/tags/specialized/TdTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class TdTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class TdTag extends ContainerTag + implements IColspan, IHeaders, IRowspan { public TdTag() { super("td"); } diff --git a/src/main/java/j2html/tags/specialized/TextareaTag.java b/src/main/java/j2html/tags/specialized/TextareaTag.java index 12b3eeb8..c3d6301d 100644 --- a/src/main/java/j2html/tags/specialized/TextareaTag.java +++ b/src/main/java/j2html/tags/specialized/TextareaTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class TextareaTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class TextareaTag extends ContainerTag + implements IAutofocus, ICols, IDirname, IForm, IMaxlength, IName, IPlaceholder, IReadonly, IRequired, IRows, IWrap { public TextareaTag() { super("textarea"); } diff --git a/src/main/java/j2html/tags/specialized/ThTag.java b/src/main/java/j2html/tags/specialized/ThTag.java index c92bba30..7929e93a 100644 --- a/src/main/java/j2html/tags/specialized/ThTag.java +++ b/src/main/java/j2html/tags/specialized/ThTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class ThTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class ThTag extends ContainerTag + implements IColspan, IHeaders, IRowspan, IScope { public ThTag() { super("th"); } diff --git a/src/main/java/j2html/tags/specialized/TimeTag.java b/src/main/java/j2html/tags/specialized/TimeTag.java index ee7cc418..d29cf64e 100644 --- a/src/main/java/j2html/tags/specialized/TimeTag.java +++ b/src/main/java/j2html/tags/specialized/TimeTag.java @@ -2,7 +2,10 @@ import j2html.tags.ContainerTag; -public final class TimeTag extends ContainerTag { +import j2html.tags.attributes.*; + +public final class TimeTag extends ContainerTag + implements IDatetime { public TimeTag() { super("time"); } diff --git a/src/main/java/j2html/tags/specialized/TrackTag.java b/src/main/java/j2html/tags/specialized/TrackTag.java index 10ddc98f..a94f3a17 100644 --- a/src/main/java/j2html/tags/specialized/TrackTag.java +++ b/src/main/java/j2html/tags/specialized/TrackTag.java @@ -3,7 +3,12 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -public final class TrackTag extends EmptyTag { +import j2html.tags.attributes.*; + +import j2html.tags.attributes.*; + +public final class TrackTag extends EmptyTag + implements IDefault, IKind, ILabel, ISrc, ISrclang { public TrackTag() { super("track"); } diff --git a/src/main/java/j2html/tags/specialized/VideoTag.java b/src/main/java/j2html/tags/specialized/VideoTag.java index 709f1166..5085f625 100644 --- a/src/main/java/j2html/tags/specialized/VideoTag.java +++ b/src/main/java/j2html/tags/specialized/VideoTag.java @@ -1,8 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; -public final class VideoTag extends ContainerTag { +public final class VideoTag extends ContainerTag + implements IAutoplay, IControls, IHeight, ILoop, IMuted, IOnabort, IOncanplay, IOncanplaythrough, IOndurationchange, IOnemptied, IOnended, IOnerror, IOnloadeddata, IOnloadedmetadata, IOnloadstart, IOnpause, IOnplay, IOnplaying, IOnprogress, IOnratechange, IOnseeked, IOnseeking, IOnstalled, IOnsuspend, IOntimeupdate, IOnvolumechanged, IOnwaiting, IPoster, IPreload, ISrc, IWidth { public VideoTag() { super("video"); } From dae5661be4dcc61527d3fa12e7d05302a91335b8 Mon Sep 17 00:00:00 2001 From: pointbazaar Date: Sun, 23 Aug 2020 21:07:49 +0200 Subject: [PATCH 08/19] correctly use implement in a generic way for the attribute interfaces --- src/main/java/j2html/tags/specialized/ATag.java | 3 +-- src/main/java/j2html/tags/specialized/AbbrTag.java | 1 + src/main/java/j2html/tags/specialized/AddressTag.java | 1 + src/main/java/j2html/tags/specialized/AreaTag.java | 2 +- src/main/java/j2html/tags/specialized/ArticleTag.java | 1 + src/main/java/j2html/tags/specialized/AsideTag.java | 1 + src/main/java/j2html/tags/specialized/AudioTag.java | 3 +-- src/main/java/j2html/tags/specialized/BTag.java | 1 + src/main/java/j2html/tags/specialized/BaseTag.java | 2 +- src/main/java/j2html/tags/specialized/BdiTag.java | 1 + src/main/java/j2html/tags/specialized/BdoTag.java | 1 + src/main/java/j2html/tags/specialized/BlockquoteTag.java | 4 +++- src/main/java/j2html/tags/specialized/ButtonTag.java | 3 +-- src/main/java/j2html/tags/specialized/CanvasTag.java | 3 +-- src/main/java/j2html/tags/specialized/CaptionTag.java | 1 + src/main/java/j2html/tags/specialized/CiteTag.java | 1 + src/main/java/j2html/tags/specialized/CodeTag.java | 1 + src/main/java/j2html/tags/specialized/ColTag.java | 2 +- src/main/java/j2html/tags/specialized/ColgroupTag.java | 3 +-- src/main/java/j2html/tags/specialized/DatalistTag.java | 1 + src/main/java/j2html/tags/specialized/DdTag.java | 1 + src/main/java/j2html/tags/specialized/DelTag.java | 3 +-- src/main/java/j2html/tags/specialized/DetailsTag.java | 3 +-- src/main/java/j2html/tags/specialized/DfnTag.java | 1 + src/main/java/j2html/tags/specialized/DialogTag.java | 1 + src/main/java/j2html/tags/specialized/DivTag.java | 1 + src/main/java/j2html/tags/specialized/DlTag.java | 1 + src/main/java/j2html/tags/specialized/DtTag.java | 1 + src/main/java/j2html/tags/specialized/EmTag.java | 1 + src/main/java/j2html/tags/specialized/EmbedTag.java | 2 +- src/main/java/j2html/tags/specialized/FieldsetTag.java | 2 +- src/main/java/j2html/tags/specialized/FigcaptionTag.java | 1 + src/main/java/j2html/tags/specialized/FigureTag.java | 1 + src/main/java/j2html/tags/specialized/FooterTag.java | 1 + src/main/java/j2html/tags/specialized/FormTag.java | 2 +- src/main/java/j2html/tags/specialized/H1Tag.java | 1 + src/main/java/j2html/tags/specialized/H2Tag.java | 1 + src/main/java/j2html/tags/specialized/H3Tag.java | 1 + src/main/java/j2html/tags/specialized/H4Tag.java | 1 + src/main/java/j2html/tags/specialized/H5Tag.java | 1 + src/main/java/j2html/tags/specialized/H6Tag.java | 1 + src/main/java/j2html/tags/specialized/HeaderTag.java | 1 + src/main/java/j2html/tags/specialized/ITag.java | 1 + src/main/java/j2html/tags/specialized/IframeTag.java | 3 +-- src/main/java/j2html/tags/specialized/ImgTag.java | 2 +- src/main/java/j2html/tags/specialized/InputTag.java | 2 +- src/main/java/j2html/tags/specialized/InsTag.java | 3 +-- src/main/java/j2html/tags/specialized/KbdTag.java | 1 + src/main/java/j2html/tags/specialized/LabelTag.java | 3 +-- src/main/java/j2html/tags/specialized/LegendTag.java | 1 + src/main/java/j2html/tags/specialized/LiTag.java | 3 +-- src/main/java/j2html/tags/specialized/LinkTag.java | 2 +- src/main/java/j2html/tags/specialized/MainTag.java | 1 + src/main/java/j2html/tags/specialized/MapTag.java | 3 +-- src/main/java/j2html/tags/specialized/MarkTag.java | 1 + src/main/java/j2html/tags/specialized/MenuTag.java | 3 +-- src/main/java/j2html/tags/specialized/MenuitemTag.java | 1 + src/main/java/j2html/tags/specialized/MetaTag.java | 2 +- src/main/java/j2html/tags/specialized/MeterTag.java | 3 +-- src/main/java/j2html/tags/specialized/NavTag.java | 1 + src/main/java/j2html/tags/specialized/NoscriptTag.java | 1 + src/main/java/j2html/tags/specialized/ObjectTag.java | 3 +-- src/main/java/j2html/tags/specialized/OlTag.java | 3 +-- src/main/java/j2html/tags/specialized/OptgroupTag.java | 3 +-- src/main/java/j2html/tags/specialized/OptionTag.java | 3 +-- src/main/java/j2html/tags/specialized/OutputTag.java | 3 +-- src/main/java/j2html/tags/specialized/PTag.java | 1 + src/main/java/j2html/tags/specialized/ParamTag.java | 2 +- src/main/java/j2html/tags/specialized/PreTag.java | 1 + src/main/java/j2html/tags/specialized/ProgressTag.java | 3 +-- src/main/java/j2html/tags/specialized/QTag.java | 3 +-- src/main/java/j2html/tags/specialized/RpTag.java | 1 + src/main/java/j2html/tags/specialized/RtTag.java | 1 + src/main/java/j2html/tags/specialized/RubyTag.java | 1 + src/main/java/j2html/tags/specialized/STag.java | 1 + src/main/java/j2html/tags/specialized/SampTag.java | 1 + src/main/java/j2html/tags/specialized/ScriptTag.java | 3 +-- src/main/java/j2html/tags/specialized/SectionTag.java | 1 + src/main/java/j2html/tags/specialized/SelectTag.java | 3 +-- src/main/java/j2html/tags/specialized/SmallTag.java | 1 + src/main/java/j2html/tags/specialized/SourceTag.java | 2 +- src/main/java/j2html/tags/specialized/SpanTag.java | 1 + src/main/java/j2html/tags/specialized/StrongTag.java | 1 + src/main/java/j2html/tags/specialized/StyleTag.java | 3 +-- src/main/java/j2html/tags/specialized/SubTag.java | 1 + src/main/java/j2html/tags/specialized/SummaryTag.java | 1 + src/main/java/j2html/tags/specialized/SupTag.java | 1 + src/main/java/j2html/tags/specialized/TableTag.java | 1 + src/main/java/j2html/tags/specialized/TbodyTag.java | 1 + src/main/java/j2html/tags/specialized/TdTag.java | 3 +-- src/main/java/j2html/tags/specialized/TextareaTag.java | 3 +-- src/main/java/j2html/tags/specialized/TfootTag.java | 1 + src/main/java/j2html/tags/specialized/ThTag.java | 3 +-- src/main/java/j2html/tags/specialized/TheadTag.java | 1 + src/main/java/j2html/tags/specialized/TimeTag.java | 3 +-- src/main/java/j2html/tags/specialized/TitleTag.java | 1 + src/main/java/j2html/tags/specialized/TrTag.java | 1 + src/main/java/j2html/tags/specialized/TrackTag.java | 6 +----- src/main/java/j2html/tags/specialized/UTag.java | 1 + src/main/java/j2html/tags/specialized/UlTag.java | 1 + src/main/java/j2html/tags/specialized/VarTag.java | 1 + src/main/java/j2html/tags/specialized/VideoTag.java | 2 +- 102 files changed, 104 insertions(+), 75 deletions(-) diff --git a/src/main/java/j2html/tags/specialized/ATag.java b/src/main/java/j2html/tags/specialized/ATag.java index b4b6902e..da3e0482 100644 --- a/src/main/java/j2html/tags/specialized/ATag.java +++ b/src/main/java/j2html/tags/specialized/ATag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class ATag extends ContainerTag - implements IHref, IHreflang, IMedia, IRel, ITarget, IType { + implements IHref, IHreflang, IMedia, IRel, ITarget, IType { public ATag() { super("a"); } diff --git a/src/main/java/j2html/tags/specialized/AbbrTag.java b/src/main/java/j2html/tags/specialized/AbbrTag.java index 218ca301..c108cdad 100644 --- a/src/main/java/j2html/tags/specialized/AbbrTag.java +++ b/src/main/java/j2html/tags/specialized/AbbrTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class AbbrTag extends ContainerTag { public AbbrTag() { diff --git a/src/main/java/j2html/tags/specialized/AddressTag.java b/src/main/java/j2html/tags/specialized/AddressTag.java index 20179d96..fc2ef765 100644 --- a/src/main/java/j2html/tags/specialized/AddressTag.java +++ b/src/main/java/j2html/tags/specialized/AddressTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class AddressTag extends ContainerTag { public AddressTag() { diff --git a/src/main/java/j2html/tags/specialized/AreaTag.java b/src/main/java/j2html/tags/specialized/AreaTag.java index b3e601a6..8e66ff5f 100644 --- a/src/main/java/j2html/tags/specialized/AreaTag.java +++ b/src/main/java/j2html/tags/specialized/AreaTag.java @@ -4,7 +4,7 @@ import j2html.tags.attributes.*; public final class AreaTag extends EmptyTag - implements IAlt, ICoords, IHref, IHreflang, IMedia, IRel, IShape, ITarget { + implements IAlt, ICoords, IHref, IHreflang, IMedia, IRel, IShape, ITarget { public AreaTag() { super("area"); } diff --git a/src/main/java/j2html/tags/specialized/ArticleTag.java b/src/main/java/j2html/tags/specialized/ArticleTag.java index b5abf71b..73f1ff79 100644 --- a/src/main/java/j2html/tags/specialized/ArticleTag.java +++ b/src/main/java/j2html/tags/specialized/ArticleTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class ArticleTag extends ContainerTag { public ArticleTag() { diff --git a/src/main/java/j2html/tags/specialized/AsideTag.java b/src/main/java/j2html/tags/specialized/AsideTag.java index 08326cda..9415c22d 100644 --- a/src/main/java/j2html/tags/specialized/AsideTag.java +++ b/src/main/java/j2html/tags/specialized/AsideTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class AsideTag extends ContainerTag { public AsideTag() { diff --git a/src/main/java/j2html/tags/specialized/AudioTag.java b/src/main/java/j2html/tags/specialized/AudioTag.java index cc38c630..4e35283a 100644 --- a/src/main/java/j2html/tags/specialized/AudioTag.java +++ b/src/main/java/j2html/tags/specialized/AudioTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class AudioTag extends ContainerTag - implements IAutoplay, IControls, ILoop, IMuted, IOnabort, IOncanplay, IOncanplaythrough, IOndurationchange, IOnemptied, IOnended, IOnerror, IOnloadeddata, IOnloadedmetadata, IOnloadstart, IOnpause, IOnplay, IOnplaying, IOnprogress, IOnratechange, IOnseeked, IOnseeking, IOnstalled, IOnsuspend, IOntimeupdate, IOnvolumechanged, IOnwaiting, IPreload, ISrc { + implements IAutoplay, IControls, ILoop, IMuted, IOnabort, IOncanplay, IOncanplaythrough, IOndurationchange, IOnemptied, IOnended, IOnerror, IOnloadeddata, IOnloadedmetadata, IOnloadstart, IOnpause, IOnplay, IOnplaying, IOnprogress, IOnratechange, IOnseeked, IOnseeking, IOnstalled, IOnsuspend, IOntimeupdate, IOnvolumechanged, IOnwaiting, IPreload, ISrc { public AudioTag() { super("audio"); } diff --git a/src/main/java/j2html/tags/specialized/BTag.java b/src/main/java/j2html/tags/specialized/BTag.java index 3dd3977e..c8d3fd7a 100644 --- a/src/main/java/j2html/tags/specialized/BTag.java +++ b/src/main/java/j2html/tags/specialized/BTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class BTag extends ContainerTag { public BTag() { diff --git a/src/main/java/j2html/tags/specialized/BaseTag.java b/src/main/java/j2html/tags/specialized/BaseTag.java index fa921d55..932b7aa3 100644 --- a/src/main/java/j2html/tags/specialized/BaseTag.java +++ b/src/main/java/j2html/tags/specialized/BaseTag.java @@ -4,7 +4,7 @@ import j2html.tags.attributes.*; public final class BaseTag extends EmptyTag - implements IHref, ITarget { + implements IHref, ITarget { public BaseTag() { super("base"); } diff --git a/src/main/java/j2html/tags/specialized/BdiTag.java b/src/main/java/j2html/tags/specialized/BdiTag.java index cf947e57..eb0e0d9f 100644 --- a/src/main/java/j2html/tags/specialized/BdiTag.java +++ b/src/main/java/j2html/tags/specialized/BdiTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class BdiTag extends ContainerTag { public BdiTag() { diff --git a/src/main/java/j2html/tags/specialized/BdoTag.java b/src/main/java/j2html/tags/specialized/BdoTag.java index e352bea5..20334c01 100644 --- a/src/main/java/j2html/tags/specialized/BdoTag.java +++ b/src/main/java/j2html/tags/specialized/BdoTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class BdoTag extends ContainerTag { public BdoTag() { diff --git a/src/main/java/j2html/tags/specialized/BlockquoteTag.java b/src/main/java/j2html/tags/specialized/BlockquoteTag.java index 3c242191..a116b40c 100644 --- a/src/main/java/j2html/tags/specialized/BlockquoteTag.java +++ b/src/main/java/j2html/tags/specialized/BlockquoteTag.java @@ -1,8 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; -public final class BlockquoteTag extends ContainerTag { +public final class BlockquoteTag extends ContainerTag + implements ICite { public BlockquoteTag() { super("blockquote"); } diff --git a/src/main/java/j2html/tags/specialized/ButtonTag.java b/src/main/java/j2html/tags/specialized/ButtonTag.java index 5206de54..686158ab 100644 --- a/src/main/java/j2html/tags/specialized/ButtonTag.java +++ b/src/main/java/j2html/tags/specialized/ButtonTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class ButtonTag extends ContainerTag - implements IAutofocus, IForm, IFormaction, IName, IType, IValue { + implements IAutofocus, IForm, IFormaction, IName, IType, IValue { public ButtonTag() { super("button"); } diff --git a/src/main/java/j2html/tags/specialized/CanvasTag.java b/src/main/java/j2html/tags/specialized/CanvasTag.java index 6d5ec000..b808681b 100644 --- a/src/main/java/j2html/tags/specialized/CanvasTag.java +++ b/src/main/java/j2html/tags/specialized/CanvasTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class CanvasTag extends ContainerTag - implements IHeight, IWidth { + implements IHeight, IWidth { public CanvasTag() { super("canvas"); } diff --git a/src/main/java/j2html/tags/specialized/CaptionTag.java b/src/main/java/j2html/tags/specialized/CaptionTag.java index d9acf53d..ca6f6d8f 100644 --- a/src/main/java/j2html/tags/specialized/CaptionTag.java +++ b/src/main/java/j2html/tags/specialized/CaptionTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class CaptionTag extends ContainerTag { public CaptionTag() { diff --git a/src/main/java/j2html/tags/specialized/CiteTag.java b/src/main/java/j2html/tags/specialized/CiteTag.java index ab9a269f..e0d83644 100644 --- a/src/main/java/j2html/tags/specialized/CiteTag.java +++ b/src/main/java/j2html/tags/specialized/CiteTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class CiteTag extends ContainerTag { public CiteTag() { diff --git a/src/main/java/j2html/tags/specialized/CodeTag.java b/src/main/java/j2html/tags/specialized/CodeTag.java index 6c98a555..2d89930c 100644 --- a/src/main/java/j2html/tags/specialized/CodeTag.java +++ b/src/main/java/j2html/tags/specialized/CodeTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class CodeTag extends ContainerTag { public CodeTag() { diff --git a/src/main/java/j2html/tags/specialized/ColTag.java b/src/main/java/j2html/tags/specialized/ColTag.java index 5bdd3234..6f527b8e 100644 --- a/src/main/java/j2html/tags/specialized/ColTag.java +++ b/src/main/java/j2html/tags/specialized/ColTag.java @@ -4,7 +4,7 @@ import j2html.tags.attributes.*; public final class ColTag extends EmptyTag - implements ISpan { + implements ISpan { public ColTag() { super("col"); } diff --git a/src/main/java/j2html/tags/specialized/ColgroupTag.java b/src/main/java/j2html/tags/specialized/ColgroupTag.java index 65ad55e1..2b5316ff 100644 --- a/src/main/java/j2html/tags/specialized/ColgroupTag.java +++ b/src/main/java/j2html/tags/specialized/ColgroupTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class ColgroupTag extends ContainerTag - implements ISpan { + implements ISpan { public ColgroupTag() { super("colgroup"); } diff --git a/src/main/java/j2html/tags/specialized/DatalistTag.java b/src/main/java/j2html/tags/specialized/DatalistTag.java index c9245e8e..af80212e 100644 --- a/src/main/java/j2html/tags/specialized/DatalistTag.java +++ b/src/main/java/j2html/tags/specialized/DatalistTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class DatalistTag extends ContainerTag { public DatalistTag() { diff --git a/src/main/java/j2html/tags/specialized/DdTag.java b/src/main/java/j2html/tags/specialized/DdTag.java index 9531939c..8b4c72ca 100644 --- a/src/main/java/j2html/tags/specialized/DdTag.java +++ b/src/main/java/j2html/tags/specialized/DdTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class DdTag extends ContainerTag { public DdTag() { diff --git a/src/main/java/j2html/tags/specialized/DelTag.java b/src/main/java/j2html/tags/specialized/DelTag.java index 10f951cf..e1da6514 100644 --- a/src/main/java/j2html/tags/specialized/DelTag.java +++ b/src/main/java/j2html/tags/specialized/DelTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class DelTag extends ContainerTag - implements ICite, IDatetime { + implements ICite, IDatetime { public DelTag() { super("del"); } diff --git a/src/main/java/j2html/tags/specialized/DetailsTag.java b/src/main/java/j2html/tags/specialized/DetailsTag.java index e23464f2..c9ab5dda 100644 --- a/src/main/java/j2html/tags/specialized/DetailsTag.java +++ b/src/main/java/j2html/tags/specialized/DetailsTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class DetailsTag extends ContainerTag - implements IOntoggle, IOpen { + implements IOntoggle, IOpen { public DetailsTag() { super("details"); } diff --git a/src/main/java/j2html/tags/specialized/DfnTag.java b/src/main/java/j2html/tags/specialized/DfnTag.java index 4e890af2..9d3eac53 100644 --- a/src/main/java/j2html/tags/specialized/DfnTag.java +++ b/src/main/java/j2html/tags/specialized/DfnTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class DfnTag extends ContainerTag { public DfnTag() { diff --git a/src/main/java/j2html/tags/specialized/DialogTag.java b/src/main/java/j2html/tags/specialized/DialogTag.java index b01cfa43..63db2f45 100644 --- a/src/main/java/j2html/tags/specialized/DialogTag.java +++ b/src/main/java/j2html/tags/specialized/DialogTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class DialogTag extends ContainerTag { public DialogTag() { diff --git a/src/main/java/j2html/tags/specialized/DivTag.java b/src/main/java/j2html/tags/specialized/DivTag.java index ebcd5034..fc40cf3b 100644 --- a/src/main/java/j2html/tags/specialized/DivTag.java +++ b/src/main/java/j2html/tags/specialized/DivTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class DivTag extends ContainerTag { public DivTag() { diff --git a/src/main/java/j2html/tags/specialized/DlTag.java b/src/main/java/j2html/tags/specialized/DlTag.java index 248c41ad..0a4a4640 100644 --- a/src/main/java/j2html/tags/specialized/DlTag.java +++ b/src/main/java/j2html/tags/specialized/DlTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class DlTag extends ContainerTag { public DlTag() { diff --git a/src/main/java/j2html/tags/specialized/DtTag.java b/src/main/java/j2html/tags/specialized/DtTag.java index 2c962185..09b4a700 100644 --- a/src/main/java/j2html/tags/specialized/DtTag.java +++ b/src/main/java/j2html/tags/specialized/DtTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class DtTag extends ContainerTag { public DtTag() { diff --git a/src/main/java/j2html/tags/specialized/EmTag.java b/src/main/java/j2html/tags/specialized/EmTag.java index 42000403..166cf8cb 100644 --- a/src/main/java/j2html/tags/specialized/EmTag.java +++ b/src/main/java/j2html/tags/specialized/EmTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class EmTag extends ContainerTag { public EmTag() { diff --git a/src/main/java/j2html/tags/specialized/EmbedTag.java b/src/main/java/j2html/tags/specialized/EmbedTag.java index 59d8c438..b9cf9c72 100644 --- a/src/main/java/j2html/tags/specialized/EmbedTag.java +++ b/src/main/java/j2html/tags/specialized/EmbedTag.java @@ -4,7 +4,7 @@ import j2html.tags.attributes.*; public final class EmbedTag extends EmptyTag - implements IHeight, IOnabort, IOncanplay, IOnerror, ISrc, IType, IWidth { + implements IHeight, IOnabort, IOncanplay, IOnerror, ISrc, IType, IWidth { public EmbedTag() { super("embed"); } diff --git a/src/main/java/j2html/tags/specialized/FieldsetTag.java b/src/main/java/j2html/tags/specialized/FieldsetTag.java index 63cad232..606d474f 100644 --- a/src/main/java/j2html/tags/specialized/FieldsetTag.java +++ b/src/main/java/j2html/tags/specialized/FieldsetTag.java @@ -4,7 +4,7 @@ import j2html.tags.attributes.*; public final class FieldsetTag extends ContainerTag - implements IForm, IName { + implements IForm, IName { public FieldsetTag() { super("fieldset"); } diff --git a/src/main/java/j2html/tags/specialized/FigcaptionTag.java b/src/main/java/j2html/tags/specialized/FigcaptionTag.java index 9339d440..c73c3b11 100644 --- a/src/main/java/j2html/tags/specialized/FigcaptionTag.java +++ b/src/main/java/j2html/tags/specialized/FigcaptionTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class FigcaptionTag extends ContainerTag { public FigcaptionTag() { diff --git a/src/main/java/j2html/tags/specialized/FigureTag.java b/src/main/java/j2html/tags/specialized/FigureTag.java index 15ffd4a6..f471765d 100644 --- a/src/main/java/j2html/tags/specialized/FigureTag.java +++ b/src/main/java/j2html/tags/specialized/FigureTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class FigureTag extends ContainerTag { public FigureTag() { diff --git a/src/main/java/j2html/tags/specialized/FooterTag.java b/src/main/java/j2html/tags/specialized/FooterTag.java index b7c15868..b20e396e 100644 --- a/src/main/java/j2html/tags/specialized/FooterTag.java +++ b/src/main/java/j2html/tags/specialized/FooterTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class FooterTag extends ContainerTag { public FooterTag() { diff --git a/src/main/java/j2html/tags/specialized/FormTag.java b/src/main/java/j2html/tags/specialized/FormTag.java index 5e2239b6..0dd431fc 100644 --- a/src/main/java/j2html/tags/specialized/FormTag.java +++ b/src/main/java/j2html/tags/specialized/FormTag.java @@ -4,7 +4,7 @@ import j2html.tags.attributes.*; public final class FormTag extends ContainerTag - implements IAction, IAutocomplete, IEnctype, IMethod, IName, INovalidate, IOnreset, IOnsubmit, IRel, ITarget { + implements IAction, IAutocomplete, IEnctype, IMethod, IName, INovalidate, IOnreset, IOnsubmit, IRel, ITarget { public FormTag() { super("form"); } diff --git a/src/main/java/j2html/tags/specialized/H1Tag.java b/src/main/java/j2html/tags/specialized/H1Tag.java index d2ce78f2..89a27d96 100644 --- a/src/main/java/j2html/tags/specialized/H1Tag.java +++ b/src/main/java/j2html/tags/specialized/H1Tag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class H1Tag extends ContainerTag { public H1Tag() { diff --git a/src/main/java/j2html/tags/specialized/H2Tag.java b/src/main/java/j2html/tags/specialized/H2Tag.java index b2967b0f..11464266 100644 --- a/src/main/java/j2html/tags/specialized/H2Tag.java +++ b/src/main/java/j2html/tags/specialized/H2Tag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class H2Tag extends ContainerTag { public H2Tag() { diff --git a/src/main/java/j2html/tags/specialized/H3Tag.java b/src/main/java/j2html/tags/specialized/H3Tag.java index c8cc431a..b63aa400 100644 --- a/src/main/java/j2html/tags/specialized/H3Tag.java +++ b/src/main/java/j2html/tags/specialized/H3Tag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class H3Tag extends ContainerTag { public H3Tag() { diff --git a/src/main/java/j2html/tags/specialized/H4Tag.java b/src/main/java/j2html/tags/specialized/H4Tag.java index 65973e73..4c7e78be 100644 --- a/src/main/java/j2html/tags/specialized/H4Tag.java +++ b/src/main/java/j2html/tags/specialized/H4Tag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class H4Tag extends ContainerTag { public H4Tag() { diff --git a/src/main/java/j2html/tags/specialized/H5Tag.java b/src/main/java/j2html/tags/specialized/H5Tag.java index 457aa387..344d9811 100644 --- a/src/main/java/j2html/tags/specialized/H5Tag.java +++ b/src/main/java/j2html/tags/specialized/H5Tag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class H5Tag extends ContainerTag { public H5Tag() { diff --git a/src/main/java/j2html/tags/specialized/H6Tag.java b/src/main/java/j2html/tags/specialized/H6Tag.java index b05e3579..eea60051 100644 --- a/src/main/java/j2html/tags/specialized/H6Tag.java +++ b/src/main/java/j2html/tags/specialized/H6Tag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class H6Tag extends ContainerTag { public H6Tag() { diff --git a/src/main/java/j2html/tags/specialized/HeaderTag.java b/src/main/java/j2html/tags/specialized/HeaderTag.java index 1d9126d4..0696e907 100644 --- a/src/main/java/j2html/tags/specialized/HeaderTag.java +++ b/src/main/java/j2html/tags/specialized/HeaderTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class HeaderTag extends ContainerTag { public HeaderTag() { diff --git a/src/main/java/j2html/tags/specialized/ITag.java b/src/main/java/j2html/tags/specialized/ITag.java index 631ddc52..5cbc38b0 100644 --- a/src/main/java/j2html/tags/specialized/ITag.java +++ b/src/main/java/j2html/tags/specialized/ITag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class ITag extends ContainerTag { public ITag() { diff --git a/src/main/java/j2html/tags/specialized/IframeTag.java b/src/main/java/j2html/tags/specialized/IframeTag.java index 8faca29c..ab5b732f 100644 --- a/src/main/java/j2html/tags/specialized/IframeTag.java +++ b/src/main/java/j2html/tags/specialized/IframeTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class IframeTag extends ContainerTag - implements IHeight, IName, IOnload, ISandbox, ISrc, ISrcdoc, IWidth { + implements IHeight, IName, IOnload, ISandbox, ISrc, ISrcdoc, IWidth { public IframeTag() { super("iframe"); } diff --git a/src/main/java/j2html/tags/specialized/ImgTag.java b/src/main/java/j2html/tags/specialized/ImgTag.java index 680a033b..a43c35d4 100644 --- a/src/main/java/j2html/tags/specialized/ImgTag.java +++ b/src/main/java/j2html/tags/specialized/ImgTag.java @@ -4,7 +4,7 @@ import j2html.tags.attributes.*; public final class ImgTag extends EmptyTag - implements IAlt, IHeight, IIsmap, IOnabort, IOnerror, IOnload, ISizes, ISrc, ISrcset, IUsemap, IWidth { + implements IAlt, IHeight, IIsmap, IOnabort, IOnerror, IOnload, ISizes, ISrc, ISrcset, IUsemap, IWidth { public ImgTag() { super("img"); } diff --git a/src/main/java/j2html/tags/specialized/InputTag.java b/src/main/java/j2html/tags/specialized/InputTag.java index 7c19cb4a..e8bd8367 100644 --- a/src/main/java/j2html/tags/specialized/InputTag.java +++ b/src/main/java/j2html/tags/specialized/InputTag.java @@ -4,7 +4,7 @@ import j2html.tags.attributes.*; public final class InputTag extends EmptyTag - implements IAccept, IAlt, IAutocomplete, IAutofocus, IChecked, IDirname, IForm, IFormaction, IHeight, IList, IMax, IMaxlength, IMin, IMultiple, IName, IOnload, IOnsearch, IPattern, IPlaceholder, IReadonly, IRequired, ISize, ISrc, IStep, IType, IValue, IWidth { + implements IAccept, IAlt, IAutocomplete, IAutofocus, IChecked, IDirname, IForm, IFormaction, IHeight, IList, IMax, IMaxlength, IMin, IMultiple, IName, IOnload, IOnsearch, IPattern, IPlaceholder, IReadonly, IRequired, ISize, ISrc, IStep, IType, IValue, IWidth { public InputTag() { super("input"); } diff --git a/src/main/java/j2html/tags/specialized/InsTag.java b/src/main/java/j2html/tags/specialized/InsTag.java index 43f2834a..47d29ad3 100644 --- a/src/main/java/j2html/tags/specialized/InsTag.java +++ b/src/main/java/j2html/tags/specialized/InsTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class InsTag extends ContainerTag - implements ICite, IDatetime { + implements ICite, IDatetime { public InsTag() { super("ins"); } diff --git a/src/main/java/j2html/tags/specialized/KbdTag.java b/src/main/java/j2html/tags/specialized/KbdTag.java index 3656c16c..60f4bcd5 100644 --- a/src/main/java/j2html/tags/specialized/KbdTag.java +++ b/src/main/java/j2html/tags/specialized/KbdTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class KbdTag extends ContainerTag { public KbdTag() { diff --git a/src/main/java/j2html/tags/specialized/LabelTag.java b/src/main/java/j2html/tags/specialized/LabelTag.java index 9f4169d7..e921e9cc 100644 --- a/src/main/java/j2html/tags/specialized/LabelTag.java +++ b/src/main/java/j2html/tags/specialized/LabelTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class LabelTag extends ContainerTag - implements IFor, IForm { + implements IFor, IForm { public LabelTag() { super("label"); } diff --git a/src/main/java/j2html/tags/specialized/LegendTag.java b/src/main/java/j2html/tags/specialized/LegendTag.java index 0b634a08..b8ba1201 100644 --- a/src/main/java/j2html/tags/specialized/LegendTag.java +++ b/src/main/java/j2html/tags/specialized/LegendTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class LegendTag extends ContainerTag { public LegendTag() { diff --git a/src/main/java/j2html/tags/specialized/LiTag.java b/src/main/java/j2html/tags/specialized/LiTag.java index 46ab65a4..e49e41f1 100644 --- a/src/main/java/j2html/tags/specialized/LiTag.java +++ b/src/main/java/j2html/tags/specialized/LiTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class LiTag extends ContainerTag - implements IValue { + implements IValue { public LiTag() { super("li"); } diff --git a/src/main/java/j2html/tags/specialized/LinkTag.java b/src/main/java/j2html/tags/specialized/LinkTag.java index f6c7d6c5..ee7b3b1b 100644 --- a/src/main/java/j2html/tags/specialized/LinkTag.java +++ b/src/main/java/j2html/tags/specialized/LinkTag.java @@ -4,7 +4,7 @@ import j2html.tags.attributes.*; public final class LinkTag extends EmptyTag - implements IHref, IHreflang, IMedia, IOnload, IRel, ISizes, IType { + implements IHref, IHreflang, IMedia, IOnload, IRel, ISizes, IType { public LinkTag() { super("link"); } diff --git a/src/main/java/j2html/tags/specialized/MainTag.java b/src/main/java/j2html/tags/specialized/MainTag.java index 594adf6e..383f0167 100644 --- a/src/main/java/j2html/tags/specialized/MainTag.java +++ b/src/main/java/j2html/tags/specialized/MainTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class MainTag extends ContainerTag { public MainTag() { diff --git a/src/main/java/j2html/tags/specialized/MapTag.java b/src/main/java/j2html/tags/specialized/MapTag.java index 14acf3b8..011cbb46 100644 --- a/src/main/java/j2html/tags/specialized/MapTag.java +++ b/src/main/java/j2html/tags/specialized/MapTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class MapTag extends ContainerTag - implements IName { + implements IName { public MapTag() { super("map"); } diff --git a/src/main/java/j2html/tags/specialized/MarkTag.java b/src/main/java/j2html/tags/specialized/MarkTag.java index 2d437b1a..1cb51e3d 100644 --- a/src/main/java/j2html/tags/specialized/MarkTag.java +++ b/src/main/java/j2html/tags/specialized/MarkTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class MarkTag extends ContainerTag { public MarkTag() { diff --git a/src/main/java/j2html/tags/specialized/MenuTag.java b/src/main/java/j2html/tags/specialized/MenuTag.java index 87ea09ce..f674ba15 100644 --- a/src/main/java/j2html/tags/specialized/MenuTag.java +++ b/src/main/java/j2html/tags/specialized/MenuTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class MenuTag extends ContainerTag - implements IType { + implements IType { public MenuTag() { super("menu"); } diff --git a/src/main/java/j2html/tags/specialized/MenuitemTag.java b/src/main/java/j2html/tags/specialized/MenuitemTag.java index 52942e63..7df60bba 100644 --- a/src/main/java/j2html/tags/specialized/MenuitemTag.java +++ b/src/main/java/j2html/tags/specialized/MenuitemTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class MenuitemTag extends ContainerTag { public MenuitemTag() { diff --git a/src/main/java/j2html/tags/specialized/MetaTag.java b/src/main/java/j2html/tags/specialized/MetaTag.java index 5fca82f0..3f95572f 100644 --- a/src/main/java/j2html/tags/specialized/MetaTag.java +++ b/src/main/java/j2html/tags/specialized/MetaTag.java @@ -4,7 +4,7 @@ import j2html.tags.attributes.*; public final class MetaTag extends EmptyTag - implements ICharset, IContent, IName { + implements ICharset, IContent, IName { public MetaTag() { super("meta"); } diff --git a/src/main/java/j2html/tags/specialized/MeterTag.java b/src/main/java/j2html/tags/specialized/MeterTag.java index 937c68ab..7843860a 100644 --- a/src/main/java/j2html/tags/specialized/MeterTag.java +++ b/src/main/java/j2html/tags/specialized/MeterTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class MeterTag extends ContainerTag - implements IForm, IHigh, ILow, IMax, IMin, IOptimum, IValue { + implements IForm, IHigh, ILow, IMax, IMin, IOptimum, IValue { public MeterTag() { super("meter"); } diff --git a/src/main/java/j2html/tags/specialized/NavTag.java b/src/main/java/j2html/tags/specialized/NavTag.java index b9290635..e62ed68c 100644 --- a/src/main/java/j2html/tags/specialized/NavTag.java +++ b/src/main/java/j2html/tags/specialized/NavTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class NavTag extends ContainerTag { public NavTag() { diff --git a/src/main/java/j2html/tags/specialized/NoscriptTag.java b/src/main/java/j2html/tags/specialized/NoscriptTag.java index b111b471..ea0ef34b 100644 --- a/src/main/java/j2html/tags/specialized/NoscriptTag.java +++ b/src/main/java/j2html/tags/specialized/NoscriptTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class NoscriptTag extends ContainerTag { public NoscriptTag() { diff --git a/src/main/java/j2html/tags/specialized/ObjectTag.java b/src/main/java/j2html/tags/specialized/ObjectTag.java index 69dd7b27..f6adba9b 100644 --- a/src/main/java/j2html/tags/specialized/ObjectTag.java +++ b/src/main/java/j2html/tags/specialized/ObjectTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class ObjectTag extends ContainerTag - implements IData, IForm, IHeight, IName, IOnabort, IOncanplay, IOnerror, IType, IUsemap, IWidth { + implements IData, IForm, IHeight, IName, IOnabort, IOncanplay, IOnerror, IType, IUsemap, IWidth { public ObjectTag() { super("object"); } diff --git a/src/main/java/j2html/tags/specialized/OlTag.java b/src/main/java/j2html/tags/specialized/OlTag.java index 0eb8a472..e209929d 100644 --- a/src/main/java/j2html/tags/specialized/OlTag.java +++ b/src/main/java/j2html/tags/specialized/OlTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class OlTag extends ContainerTag - implements IReversed, IStart { + implements IReversed, IStart { public OlTag() { super("ol"); } diff --git a/src/main/java/j2html/tags/specialized/OptgroupTag.java b/src/main/java/j2html/tags/specialized/OptgroupTag.java index 3dd2d216..eb499669 100644 --- a/src/main/java/j2html/tags/specialized/OptgroupTag.java +++ b/src/main/java/j2html/tags/specialized/OptgroupTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class OptgroupTag extends ContainerTag - implements ILabel { + implements ILabel { public OptgroupTag() { super("optgroup"); } diff --git a/src/main/java/j2html/tags/specialized/OptionTag.java b/src/main/java/j2html/tags/specialized/OptionTag.java index f2230b00..0d345757 100644 --- a/src/main/java/j2html/tags/specialized/OptionTag.java +++ b/src/main/java/j2html/tags/specialized/OptionTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class OptionTag extends ContainerTag - implements ILabel, ISelected, IValue { + implements ILabel, ISelected, IValue { public OptionTag() { super("option"); } diff --git a/src/main/java/j2html/tags/specialized/OutputTag.java b/src/main/java/j2html/tags/specialized/OutputTag.java index 9fdc2bcc..9ee2230c 100644 --- a/src/main/java/j2html/tags/specialized/OutputTag.java +++ b/src/main/java/j2html/tags/specialized/OutputTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class OutputTag extends ContainerTag - implements IFor, IForm, IName { + implements IFor, IForm, IName { public OutputTag() { super("output"); } diff --git a/src/main/java/j2html/tags/specialized/PTag.java b/src/main/java/j2html/tags/specialized/PTag.java index 6e02cd2c..89945abb 100644 --- a/src/main/java/j2html/tags/specialized/PTag.java +++ b/src/main/java/j2html/tags/specialized/PTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class PTag extends ContainerTag { public PTag() { diff --git a/src/main/java/j2html/tags/specialized/ParamTag.java b/src/main/java/j2html/tags/specialized/ParamTag.java index d8b8ece5..630ff8ea 100644 --- a/src/main/java/j2html/tags/specialized/ParamTag.java +++ b/src/main/java/j2html/tags/specialized/ParamTag.java @@ -4,7 +4,7 @@ import j2html.tags.attributes.*; public final class ParamTag extends EmptyTag - implements IName, IValue { + implements IName, IValue { public ParamTag() { super("param"); } diff --git a/src/main/java/j2html/tags/specialized/PreTag.java b/src/main/java/j2html/tags/specialized/PreTag.java index 4d1c0607..6300504d 100644 --- a/src/main/java/j2html/tags/specialized/PreTag.java +++ b/src/main/java/j2html/tags/specialized/PreTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class PreTag extends ContainerTag { public PreTag() { diff --git a/src/main/java/j2html/tags/specialized/ProgressTag.java b/src/main/java/j2html/tags/specialized/ProgressTag.java index 8b5b77a1..61dd0222 100644 --- a/src/main/java/j2html/tags/specialized/ProgressTag.java +++ b/src/main/java/j2html/tags/specialized/ProgressTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class ProgressTag extends ContainerTag - implements IMax, IValue { + implements IMax, IValue { public ProgressTag() { super("progress"); } diff --git a/src/main/java/j2html/tags/specialized/QTag.java b/src/main/java/j2html/tags/specialized/QTag.java index 7b1ceb3e..de96722a 100644 --- a/src/main/java/j2html/tags/specialized/QTag.java +++ b/src/main/java/j2html/tags/specialized/QTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class QTag extends ContainerTag - implements ICite { + implements ICite { public QTag() { super("q"); } diff --git a/src/main/java/j2html/tags/specialized/RpTag.java b/src/main/java/j2html/tags/specialized/RpTag.java index c19ac18b..77eebb4a 100644 --- a/src/main/java/j2html/tags/specialized/RpTag.java +++ b/src/main/java/j2html/tags/specialized/RpTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class RpTag extends ContainerTag { public RpTag() { diff --git a/src/main/java/j2html/tags/specialized/RtTag.java b/src/main/java/j2html/tags/specialized/RtTag.java index 016024f7..3d3f88ec 100644 --- a/src/main/java/j2html/tags/specialized/RtTag.java +++ b/src/main/java/j2html/tags/specialized/RtTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class RtTag extends ContainerTag { public RtTag() { diff --git a/src/main/java/j2html/tags/specialized/RubyTag.java b/src/main/java/j2html/tags/specialized/RubyTag.java index 841fa449..3e840dc7 100644 --- a/src/main/java/j2html/tags/specialized/RubyTag.java +++ b/src/main/java/j2html/tags/specialized/RubyTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class RubyTag extends ContainerTag { public RubyTag() { diff --git a/src/main/java/j2html/tags/specialized/STag.java b/src/main/java/j2html/tags/specialized/STag.java index c0f1de57..5ec9e9f8 100644 --- a/src/main/java/j2html/tags/specialized/STag.java +++ b/src/main/java/j2html/tags/specialized/STag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class STag extends ContainerTag { public STag() { diff --git a/src/main/java/j2html/tags/specialized/SampTag.java b/src/main/java/j2html/tags/specialized/SampTag.java index 8ce6681f..f518bb2b 100644 --- a/src/main/java/j2html/tags/specialized/SampTag.java +++ b/src/main/java/j2html/tags/specialized/SampTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class SampTag extends ContainerTag { public SampTag() { diff --git a/src/main/java/j2html/tags/specialized/ScriptTag.java b/src/main/java/j2html/tags/specialized/ScriptTag.java index 6fa3c63e..47c39778 100644 --- a/src/main/java/j2html/tags/specialized/ScriptTag.java +++ b/src/main/java/j2html/tags/specialized/ScriptTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class ScriptTag extends ContainerTag - implements IAsync, ICharset, IDefer, IOnerror, IOnload, ISrc, IType { + implements IAsync, ICharset, IDefer, IOnerror, IOnload, ISrc, IType { public ScriptTag() { super("script"); } diff --git a/src/main/java/j2html/tags/specialized/SectionTag.java b/src/main/java/j2html/tags/specialized/SectionTag.java index 0a0d6d6e..f56a4ba4 100644 --- a/src/main/java/j2html/tags/specialized/SectionTag.java +++ b/src/main/java/j2html/tags/specialized/SectionTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class SectionTag extends ContainerTag { public SectionTag() { diff --git a/src/main/java/j2html/tags/specialized/SelectTag.java b/src/main/java/j2html/tags/specialized/SelectTag.java index 11610658..914721ea 100644 --- a/src/main/java/j2html/tags/specialized/SelectTag.java +++ b/src/main/java/j2html/tags/specialized/SelectTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class SelectTag extends ContainerTag - implements IAutofocus, IForm, IMultiple, IName, IRequired, ISize { + implements IAutofocus, IForm, IMultiple, IName, IRequired, ISize { public SelectTag() { super("select"); } diff --git a/src/main/java/j2html/tags/specialized/SmallTag.java b/src/main/java/j2html/tags/specialized/SmallTag.java index 07f14e66..5d178067 100644 --- a/src/main/java/j2html/tags/specialized/SmallTag.java +++ b/src/main/java/j2html/tags/specialized/SmallTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class SmallTag extends ContainerTag { public SmallTag() { diff --git a/src/main/java/j2html/tags/specialized/SourceTag.java b/src/main/java/j2html/tags/specialized/SourceTag.java index 6727b140..6707b42c 100644 --- a/src/main/java/j2html/tags/specialized/SourceTag.java +++ b/src/main/java/j2html/tags/specialized/SourceTag.java @@ -4,7 +4,7 @@ import j2html.tags.attributes.*; public final class SourceTag extends EmptyTag - implements IMedia, ISizes, ISrc, ISrcset, IType { + implements IMedia, ISizes, ISrc, ISrcset, IType { public SourceTag() { super("source"); } diff --git a/src/main/java/j2html/tags/specialized/SpanTag.java b/src/main/java/j2html/tags/specialized/SpanTag.java index 404c2c98..59076ffa 100644 --- a/src/main/java/j2html/tags/specialized/SpanTag.java +++ b/src/main/java/j2html/tags/specialized/SpanTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class SpanTag extends ContainerTag { public SpanTag() { diff --git a/src/main/java/j2html/tags/specialized/StrongTag.java b/src/main/java/j2html/tags/specialized/StrongTag.java index a82c59ad..71c311c5 100644 --- a/src/main/java/j2html/tags/specialized/StrongTag.java +++ b/src/main/java/j2html/tags/specialized/StrongTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class StrongTag extends ContainerTag { public StrongTag() { diff --git a/src/main/java/j2html/tags/specialized/StyleTag.java b/src/main/java/j2html/tags/specialized/StyleTag.java index 3824cffb..60737a40 100644 --- a/src/main/java/j2html/tags/specialized/StyleTag.java +++ b/src/main/java/j2html/tags/specialized/StyleTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class StyleTag extends ContainerTag - implements IMedia, IOnerror, IOnload, IType { + implements IMedia, IOnerror, IOnload, IType { public StyleTag() { super("style"); } diff --git a/src/main/java/j2html/tags/specialized/SubTag.java b/src/main/java/j2html/tags/specialized/SubTag.java index 9895a6dc..32f5e41b 100644 --- a/src/main/java/j2html/tags/specialized/SubTag.java +++ b/src/main/java/j2html/tags/specialized/SubTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class SubTag extends ContainerTag { public SubTag() { diff --git a/src/main/java/j2html/tags/specialized/SummaryTag.java b/src/main/java/j2html/tags/specialized/SummaryTag.java index 08bcdf71..bffe9186 100644 --- a/src/main/java/j2html/tags/specialized/SummaryTag.java +++ b/src/main/java/j2html/tags/specialized/SummaryTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class SummaryTag extends ContainerTag { public SummaryTag() { diff --git a/src/main/java/j2html/tags/specialized/SupTag.java b/src/main/java/j2html/tags/specialized/SupTag.java index 6d5ae486..a0cca811 100644 --- a/src/main/java/j2html/tags/specialized/SupTag.java +++ b/src/main/java/j2html/tags/specialized/SupTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class SupTag extends ContainerTag { public SupTag() { diff --git a/src/main/java/j2html/tags/specialized/TableTag.java b/src/main/java/j2html/tags/specialized/TableTag.java index 60364037..1ec556b4 100644 --- a/src/main/java/j2html/tags/specialized/TableTag.java +++ b/src/main/java/j2html/tags/specialized/TableTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class TableTag extends ContainerTag { public TableTag() { diff --git a/src/main/java/j2html/tags/specialized/TbodyTag.java b/src/main/java/j2html/tags/specialized/TbodyTag.java index a478a9a9..bc65ca40 100644 --- a/src/main/java/j2html/tags/specialized/TbodyTag.java +++ b/src/main/java/j2html/tags/specialized/TbodyTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class TbodyTag extends ContainerTag { public TbodyTag() { diff --git a/src/main/java/j2html/tags/specialized/TdTag.java b/src/main/java/j2html/tags/specialized/TdTag.java index ee0f486f..b8a806ce 100644 --- a/src/main/java/j2html/tags/specialized/TdTag.java +++ b/src/main/java/j2html/tags/specialized/TdTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class TdTag extends ContainerTag - implements IColspan, IHeaders, IRowspan { + implements IColspan, IHeaders, IRowspan { public TdTag() { super("td"); } diff --git a/src/main/java/j2html/tags/specialized/TextareaTag.java b/src/main/java/j2html/tags/specialized/TextareaTag.java index c3d6301d..bcae6b2d 100644 --- a/src/main/java/j2html/tags/specialized/TextareaTag.java +++ b/src/main/java/j2html/tags/specialized/TextareaTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class TextareaTag extends ContainerTag - implements IAutofocus, ICols, IDirname, IForm, IMaxlength, IName, IPlaceholder, IReadonly, IRequired, IRows, IWrap { + implements IAutofocus, ICols, IDirname, IForm, IMaxlength, IName, IPlaceholder, IReadonly, IRequired, IRows, IWrap { public TextareaTag() { super("textarea"); } diff --git a/src/main/java/j2html/tags/specialized/TfootTag.java b/src/main/java/j2html/tags/specialized/TfootTag.java index fdea4251..183d6998 100644 --- a/src/main/java/j2html/tags/specialized/TfootTag.java +++ b/src/main/java/j2html/tags/specialized/TfootTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class TfootTag extends ContainerTag { public TfootTag() { diff --git a/src/main/java/j2html/tags/specialized/ThTag.java b/src/main/java/j2html/tags/specialized/ThTag.java index 7929e93a..73ad32a5 100644 --- a/src/main/java/j2html/tags/specialized/ThTag.java +++ b/src/main/java/j2html/tags/specialized/ThTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class ThTag extends ContainerTag - implements IColspan, IHeaders, IRowspan, IScope { + implements IColspan, IHeaders, IRowspan, IScope { public ThTag() { super("th"); } diff --git a/src/main/java/j2html/tags/specialized/TheadTag.java b/src/main/java/j2html/tags/specialized/TheadTag.java index 31108d35..0efc5307 100644 --- a/src/main/java/j2html/tags/specialized/TheadTag.java +++ b/src/main/java/j2html/tags/specialized/TheadTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class TheadTag extends ContainerTag { public TheadTag() { diff --git a/src/main/java/j2html/tags/specialized/TimeTag.java b/src/main/java/j2html/tags/specialized/TimeTag.java index d29cf64e..2dccb1f1 100644 --- a/src/main/java/j2html/tags/specialized/TimeTag.java +++ b/src/main/java/j2html/tags/specialized/TimeTag.java @@ -1,11 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; - import j2html.tags.attributes.*; public final class TimeTag extends ContainerTag - implements IDatetime { + implements IDatetime { public TimeTag() { super("time"); } diff --git a/src/main/java/j2html/tags/specialized/TitleTag.java b/src/main/java/j2html/tags/specialized/TitleTag.java index be8a55b3..34d002d7 100644 --- a/src/main/java/j2html/tags/specialized/TitleTag.java +++ b/src/main/java/j2html/tags/specialized/TitleTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class TitleTag extends ContainerTag { public TitleTag() { diff --git a/src/main/java/j2html/tags/specialized/TrTag.java b/src/main/java/j2html/tags/specialized/TrTag.java index 4b825d32..0279738e 100644 --- a/src/main/java/j2html/tags/specialized/TrTag.java +++ b/src/main/java/j2html/tags/specialized/TrTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class TrTag extends ContainerTag { public TrTag() { diff --git a/src/main/java/j2html/tags/specialized/TrackTag.java b/src/main/java/j2html/tags/specialized/TrackTag.java index a94f3a17..3bc31e2a 100644 --- a/src/main/java/j2html/tags/specialized/TrackTag.java +++ b/src/main/java/j2html/tags/specialized/TrackTag.java @@ -3,12 +3,8 @@ import j2html.tags.EmptyTag; import j2html.tags.attributes.*; -import j2html.tags.attributes.*; - -import j2html.tags.attributes.*; - public final class TrackTag extends EmptyTag - implements IDefault, IKind, ILabel, ISrc, ISrclang { + implements IDefault, IKind, ILabel, IOncuechange, ISrc, ISrclang { public TrackTag() { super("track"); } diff --git a/src/main/java/j2html/tags/specialized/UTag.java b/src/main/java/j2html/tags/specialized/UTag.java index d961314c..62906124 100644 --- a/src/main/java/j2html/tags/specialized/UTag.java +++ b/src/main/java/j2html/tags/specialized/UTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class UTag extends ContainerTag { public UTag() { diff --git a/src/main/java/j2html/tags/specialized/UlTag.java b/src/main/java/j2html/tags/specialized/UlTag.java index f56b6414..0f61ea93 100644 --- a/src/main/java/j2html/tags/specialized/UlTag.java +++ b/src/main/java/j2html/tags/specialized/UlTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class UlTag extends ContainerTag { public UlTag() { diff --git a/src/main/java/j2html/tags/specialized/VarTag.java b/src/main/java/j2html/tags/specialized/VarTag.java index 19b3fe64..d1825ec8 100644 --- a/src/main/java/j2html/tags/specialized/VarTag.java +++ b/src/main/java/j2html/tags/specialized/VarTag.java @@ -1,6 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; +import j2html.tags.attributes.*; public final class VarTag extends ContainerTag { public VarTag() { diff --git a/src/main/java/j2html/tags/specialized/VideoTag.java b/src/main/java/j2html/tags/specialized/VideoTag.java index 5085f625..142197f8 100644 --- a/src/main/java/j2html/tags/specialized/VideoTag.java +++ b/src/main/java/j2html/tags/specialized/VideoTag.java @@ -4,7 +4,7 @@ import j2html.tags.attributes.*; public final class VideoTag extends ContainerTag - implements IAutoplay, IControls, IHeight, ILoop, IMuted, IOnabort, IOncanplay, IOncanplaythrough, IOndurationchange, IOnemptied, IOnended, IOnerror, IOnloadeddata, IOnloadedmetadata, IOnloadstart, IOnpause, IOnplay, IOnplaying, IOnprogress, IOnratechange, IOnseeked, IOnseeking, IOnstalled, IOnsuspend, IOntimeupdate, IOnvolumechanged, IOnwaiting, IPoster, IPreload, ISrc, IWidth { + implements IAutoplay, IControls, IHeight, ILoop, IMuted, IOnabort, IOncanplay, IOncanplaythrough, IOndurationchange, IOnemptied, IOnended, IOnerror, IOnloadeddata, IOnloadedmetadata, IOnloadstart, IOnpause, IOnplay, IOnplaying, IOnprogress, IOnratechange, IOnseeked, IOnseeking, IOnstalled, IOnsuspend, IOntimeupdate, IOnvolumechanged, IOnwaiting, IPoster, IPreload, ISrc, IWidth { public VideoTag() { super("video"); } From d334d4c8ae90ca24dac994f456c1b56c60f40e34 Mon Sep 17 00:00:00 2001 From: pointbazaar Date: Sun, 23 Aug 2020 21:08:39 +0200 Subject: [PATCH 09/19] fix it not building due to one attribute interface --- src/main/java/j2html/tags/specialized/TrackTag.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/j2html/tags/specialized/TrackTag.java b/src/main/java/j2html/tags/specialized/TrackTag.java index 3bc31e2a..99d2fb76 100644 --- a/src/main/java/j2html/tags/specialized/TrackTag.java +++ b/src/main/java/j2html/tags/specialized/TrackTag.java @@ -4,7 +4,7 @@ import j2html.tags.attributes.*; public final class TrackTag extends EmptyTag - implements IDefault, IKind, ILabel, IOncuechange, ISrc, ISrclang { + implements IDefault, IKind, ILabel, ISrc, ISrclang { public TrackTag() { super("track"); } From 2ae1779bf4b93ec2d702feccb7b0660b3b5403b4 Mon Sep 17 00:00:00 2001 From: pointbazaar Date: Sun, 23 Aug 2020 22:34:12 +0200 Subject: [PATCH 10/19] generate the interfaces differently depending on if the attribute has an argument or not. --- .../java/j2html/tags/attributes/IChecked.java | 6 +- .../j2html/tags/attributes/IDisabled.java | 6 +- .../j2html/tags/attributes/IDownload.java | 8 +- .../j2html/tags/attributes/IOncuechange.java | 10 + .../java/j2html/tags/generators/AttrD.java | 8 +- .../AttributeInterfaceCodeGenerator.java | 50 ++-- .../tags/generators/AttributesList.java | 238 +++++++++--------- .../java/j2html/tags/specialized/ATag.java | 2 +- .../java/j2html/tags/specialized/AbbrTag.java | 1 - .../j2html/tags/specialized/AddressTag.java | 1 - .../java/j2html/tags/specialized/AreaTag.java | 2 +- .../j2html/tags/specialized/ArticleTag.java | 1 - .../j2html/tags/specialized/AsideTag.java | 1 - .../java/j2html/tags/specialized/BTag.java | 1 - .../java/j2html/tags/specialized/BaseTag.java | 3 +- .../java/j2html/tags/specialized/BdiTag.java | 1 - .../java/j2html/tags/specialized/BdoTag.java | 1 - .../tags/specialized/BlockquoteTag.java | 2 +- .../java/j2html/tags/specialized/BrTag.java | 1 - .../j2html/tags/specialized/ButtonTag.java | 2 +- .../j2html/tags/specialized/CanvasTag.java | 3 +- .../j2html/tags/specialized/CaptionTag.java | 1 - .../java/j2html/tags/specialized/CiteTag.java | 1 - .../java/j2html/tags/specialized/CodeTag.java | 1 - .../java/j2html/tags/specialized/ColTag.java | 2 +- .../j2html/tags/specialized/ColgroupTag.java | 2 +- .../j2html/tags/specialized/DatalistTag.java | 1 - .../java/j2html/tags/specialized/DdTag.java | 1 - .../java/j2html/tags/specialized/DelTag.java | 3 +- .../j2html/tags/specialized/DetailsTag.java | 3 +- .../java/j2html/tags/specialized/DfnTag.java | 1 - .../j2html/tags/specialized/DialogTag.java | 1 - .../java/j2html/tags/specialized/DivTag.java | 1 - .../java/j2html/tags/specialized/DlTag.java | 1 - .../java/j2html/tags/specialized/DtTag.java | 1 - .../java/j2html/tags/specialized/EmTag.java | 1 - .../j2html/tags/specialized/FieldsetTag.java | 6 +- .../tags/specialized/FigcaptionTag.java | 1 - .../j2html/tags/specialized/FigureTag.java | 1 - .../j2html/tags/specialized/FooterTag.java | 1 - .../java/j2html/tags/specialized/H1Tag.java | 1 - .../java/j2html/tags/specialized/H2Tag.java | 1 - .../java/j2html/tags/specialized/H3Tag.java | 1 - .../java/j2html/tags/specialized/H4Tag.java | 1 - .../java/j2html/tags/specialized/H5Tag.java | 1 - .../java/j2html/tags/specialized/H6Tag.java | 1 - .../j2html/tags/specialized/HeaderTag.java | 1 - .../java/j2html/tags/specialized/HrTag.java | 1 - .../java/j2html/tags/specialized/ITag.java | 1 - .../j2html/tags/specialized/InputTag.java | 2 +- .../java/j2html/tags/specialized/InsTag.java | 3 +- .../java/j2html/tags/specialized/KbdTag.java | 1 - .../j2html/tags/specialized/KeygenTag.java | 1 - .../j2html/tags/specialized/LabelTag.java | 3 +- .../j2html/tags/specialized/LegendTag.java | 1 - .../java/j2html/tags/specialized/LiTag.java | 2 +- .../java/j2html/tags/specialized/MainTag.java | 1 - .../java/j2html/tags/specialized/MapTag.java | 2 +- .../java/j2html/tags/specialized/MarkTag.java | 1 - .../java/j2html/tags/specialized/MenuTag.java | 2 +- .../j2html/tags/specialized/MenuitemTag.java | 1 - .../java/j2html/tags/specialized/MetaTag.java | 4 +- .../java/j2html/tags/specialized/NavTag.java | 1 - .../j2html/tags/specialized/NoscriptTag.java | 1 - .../java/j2html/tags/specialized/OlTag.java | 3 +- .../j2html/tags/specialized/OptgroupTag.java | 5 +- .../j2html/tags/specialized/OptionTag.java | 7 +- .../j2html/tags/specialized/OutputTag.java | 4 +- .../java/j2html/tags/specialized/PTag.java | 1 - .../j2html/tags/specialized/ParamTag.java | 3 +- .../java/j2html/tags/specialized/PreTag.java | 1 - .../j2html/tags/specialized/ProgressTag.java | 3 +- .../java/j2html/tags/specialized/QTag.java | 2 +- .../java/j2html/tags/specialized/RpTag.java | 1 - .../java/j2html/tags/specialized/RtTag.java | 1 - .../java/j2html/tags/specialized/RubyTag.java | 1 - .../java/j2html/tags/specialized/STag.java | 1 - .../java/j2html/tags/specialized/SampTag.java | 1 - .../j2html/tags/specialized/SectionTag.java | 1 - .../j2html/tags/specialized/SelectTag.java | 2 +- .../j2html/tags/specialized/SmallTag.java | 1 - .../java/j2html/tags/specialized/SpanTag.java | 1 - .../j2html/tags/specialized/StrongTag.java | 1 - .../j2html/tags/specialized/StyleTag.java | 5 +- .../java/j2html/tags/specialized/SubTag.java | 1 - .../j2html/tags/specialized/SummaryTag.java | 1 - .../java/j2html/tags/specialized/SupTag.java | 1 - .../j2html/tags/specialized/TableTag.java | 1 - .../j2html/tags/specialized/TbodyTag.java | 1 - .../java/j2html/tags/specialized/TdTag.java | 4 +- .../j2html/tags/specialized/TextareaTag.java | 2 +- .../j2html/tags/specialized/TfootTag.java | 1 - .../java/j2html/tags/specialized/ThTag.java | 5 +- .../j2html/tags/specialized/TheadTag.java | 1 - .../java/j2html/tags/specialized/TimeTag.java | 2 +- .../j2html/tags/specialized/TitleTag.java | 1 - .../java/j2html/tags/specialized/TrTag.java | 1 - .../j2html/tags/specialized/TrackTag.java | 2 +- .../java/j2html/tags/specialized/UTag.java | 1 - .../java/j2html/tags/specialized/UlTag.java | 1 - .../java/j2html/tags/specialized/VarTag.java | 1 - .../java/j2html/tags/specialized/WbrTag.java | 1 - 102 files changed, 241 insertions(+), 245 deletions(-) create mode 100644 src/main/java/j2html/tags/attributes/IOncuechange.java diff --git a/src/main/java/j2html/tags/attributes/IChecked.java b/src/main/java/j2html/tags/attributes/IChecked.java index 7422833d..0c91de97 100644 --- a/src/main/java/j2html/tags/attributes/IChecked.java +++ b/src/main/java/j2html/tags/attributes/IChecked.java @@ -3,8 +3,10 @@ import j2html.tags.Tag; public interface IChecked extends IInstance { - default T withChecked(final String checked_) { - get().attr("checked", checked_); + default T withChecked(final boolean checked_) { + if (checked_) { + get().attr("checked"); + } return get(); } } diff --git a/src/main/java/j2html/tags/attributes/IDisabled.java b/src/main/java/j2html/tags/attributes/IDisabled.java index d6e54f87..507f6b53 100644 --- a/src/main/java/j2html/tags/attributes/IDisabled.java +++ b/src/main/java/j2html/tags/attributes/IDisabled.java @@ -3,12 +3,10 @@ import j2html.tags.Tag; public interface IDisabled extends IInstance { - - default T withDisabled(boolean isDisabled) { - if (isDisabled) { + default T withDisabled(final boolean disabled_) { + if (disabled_) { get().attr("disabled"); } return get(); } - } diff --git a/src/main/java/j2html/tags/attributes/IDownload.java b/src/main/java/j2html/tags/attributes/IDownload.java index b0dabe3d..908773bc 100644 --- a/src/main/java/j2html/tags/attributes/IDownload.java +++ b/src/main/java/j2html/tags/attributes/IDownload.java @@ -2,11 +2,11 @@ import j2html.tags.Tag; - public interface IDownload extends IInstance { - - default T withDownload() { - get().attr("download"); + default T withDownload(final boolean download_) { + if (download_) { + get().attr("download"); + } return get(); } } diff --git a/src/main/java/j2html/tags/attributes/IOncuechange.java b/src/main/java/j2html/tags/attributes/IOncuechange.java new file mode 100644 index 00000000..8167ce65 --- /dev/null +++ b/src/main/java/j2html/tags/attributes/IOncuechange.java @@ -0,0 +1,10 @@ +package j2html.tags.attributes; + +import j2html.tags.Tag; + +public interface IOncuechange extends IInstance { + default T withOncuechange(final String oncuechange_) { + get().attr("oncuechange", oncuechange_); + return get(); + } +} diff --git a/src/main/java/j2html/tags/generators/AttrD.java b/src/main/java/j2html/tags/generators/AttrD.java index c63e49a2..612edf0c 100644 --- a/src/main/java/j2html/tags/generators/AttrD.java +++ b/src/main/java/j2html/tags/generators/AttrD.java @@ -5,16 +5,20 @@ final class AttrD { public final String attr; + public final boolean hasArgument; + //the html tags that this attribute can be used on public final String[] tags; - public AttrD(final String attr){ + public AttrD(final String attr, boolean hasArgument){ this.attr = attr; + this.hasArgument = hasArgument; this.tags = new String[]{}; } - public AttrD(final String attr, final String... tags) { + public AttrD(final String attr, boolean hasArgument, final String... tags) { this.attr = attr; + this.hasArgument = hasArgument; this.tags = tags; } } diff --git a/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java b/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java index 0c5847b1..2b252eed 100644 --- a/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java +++ b/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java @@ -7,17 +7,16 @@ import java.util.List; import java.util.Optional; -import static j2html.tags.generators.AttributesList.attributes; - public final class AttributeInterfaceCodeGenerator { public static void main(String[] args){ try { final boolean delete = false; - for (final String attr : attributes()) { - final Path path = makePath(attr); - final String interfaceName = interfaceNameFromAttribute(attr)+""; + for (final AttrD attr : AttributesList.attributesDescriptive()) { + final Path path = makePath(attr.attr); + final String interfaceName = interfaceNameFromAttribute(attr.attr)+""; + /* IFormAction extends IInstance @@ -32,7 +31,8 @@ default T withFormAction(String formAction){ interfaceName, Optional.of("IInstance"), Arrays.asList("j2html.tags.Tag"), - interfaceNameFromAttribute(attr).substring(1) + interfaceNameFromAttribute(attr.attr).substring(1), + attr ); if (delete) { @@ -52,7 +52,8 @@ private static String getInterfaceTemplate( final String interfaceName, final Optional optExtends, final List imports, - final String interfaceNameSimple + final String interfaceNameSimple, + final AttrD attrD ){ final StringBuilder sb = new StringBuilder(); @@ -87,20 +88,41 @@ default T withFormAction(String formAction){ //where attributes are java keywords. Just to make it consistent and avoid special cases. final String attrName = interfaceNameSimple.toLowerCase(); final String paramName = attrName+"_"; - sb.append("default ") - .append("T ").append("with").append(interfaceNameSimple) - .append("(final String ").append(paramName).append(") {") - - .append("get().attr(\"").append(attrName).append("\", "+paramName+");\n") - .append("return get();\n") - .append("}\n"); + //append the 'with$ATTR' method + writeAttributeMethod(interfaceNameSimple, attrD, sb, attrName, paramName); sb.append("}\n"); return sb.toString(); } + private static void writeAttributeMethod(String interfaceNameSimple, AttrD attrD, StringBuilder sb, String attrName, String paramName) { + sb.append("default ") + .append("T "); + + sb.append("with").append(interfaceNameSimple); + + if(attrD.hasArgument){ + //add a variant where you can specify the argument + + sb.append("(final String ").append(paramName).append(") {") + + .append("get().attr(\"").append(attrName).append("\", "+ paramName +");\n") + .append("return get();\n"); + }else{ + //add a variant where you can toggle the attribute + + sb.append("(final boolean ").append(paramName).append(") {") + + .append("if ("+ paramName +") {\n") + .append("get().attr(\"").append(attrName).append("\");\n") + .append("}\n") + .append("return get();\n"); + } + sb.append("}\n"); + } + public static String interfaceNameFromAttribute(String attribute){ String res = attribute.substring(0,1).toUpperCase()+attribute.substring(1); return "I" + res; diff --git a/src/main/java/j2html/tags/generators/AttributesList.java b/src/main/java/j2html/tags/generators/AttributesList.java index ab03711d..15f0e0f8 100644 --- a/src/main/java/j2html/tags/generators/AttributesList.java +++ b/src/main/java/j2html/tags/generators/AttributesList.java @@ -22,166 +22,162 @@ static List getCustomAttributesForHtmlTag(final String tagLowercase){ return attrs; } - static List attributes(){ - return attributesDescriptive().stream().map(a->a.attr).collect(Collectors.toList()); - } - static List attributesDescriptive() { return Arrays.asList( - new AttrD("accept", "input"), + new AttrD("accept", true, "input"), //new AttrD("accept-charset","form"), //contains dashes, TODO //new AttrD("accesskey"), //global attribute - new AttrD("action", "form"), + new AttrD("action", true, "form"), //"align", not supported in HTML5 - new AttrD("alt", "area","img","input"), - new AttrD("async","script"), - new AttrD("autocomplete","form","input"), - new AttrD("autofocus","button","input","select","textarea"), - new AttrD("autoplay","audio","video"), + new AttrD("alt", true, "area","img","input"), + new AttrD("async", true, "script"), + new AttrD("autocomplete", true, "form","input"), + new AttrD("autofocus", true, "button","input","select","textarea"), + new AttrD("autoplay", true, "audio","video"), //"bgcolor", not supported in HTMTL5 //"border", not supported in HTML5 - new AttrD("charset","meta","script"), - new AttrD("checked","input"), - new AttrD("cite","blockquote","del","ins","q"), + new AttrD("charset", true, "meta","script"), + new AttrD("checked", false, "input"), + new AttrD("cite", true, "blockquote","del","ins","q"), //"class" already implemented in Tag.java // global attribute - new AttrD("cols","textarea"), - new AttrD("colspan","td","th"), - new AttrD("content","meta"), + new AttrD("cols", true, "textarea"), + new AttrD("colspan", true, "td","th"), + new AttrD("content", true, "meta"), //"contenteditable" global attribute, should be in Tag.java - new AttrD("controls","audio","video"), - new AttrD("coords","area"), - new AttrD("data","object"), - new AttrD("datetime","del","ins","time"), - new AttrD("default","track"), - new AttrD("defer","script"), + new AttrD("controls", true, "audio","video"), + new AttrD("coords", true, "area"), + new AttrD("data", true, "object"), + new AttrD("datetime", true, "del","ins","time"), + new AttrD("default", true, "track"), + new AttrD("defer", true, "script"), //new AttrD("dir"), //global attribute - new AttrD("dirname","input","textarea"), - //new AttrD("disabled","button","fieldset","input","optgroup","option","select","textarea"), manually implemented - //new AttrD("download","a","area") manually implemented + new AttrD("dirname", true, "input","textarea"), + new AttrD("disabled",false, "button","fieldset","input","optgroup","option","select","textarea"), + new AttrD("download",false, "a","area"), //new AttrD("draggable") global attribute, should be in Tag.java - new AttrD("enctype", "form"), - new AttrD("for","label","output"), - new AttrD("form","button","fieldset","input","label","meter","object","output","select","textarea"), - new AttrD("formaction","button","input"), - new AttrD("headers","td","th"), - new AttrD("height","canvas","embed","iframe","img","input","object","video"), + new AttrD("enctype", true, "form"), + new AttrD("for", true, "label","output"), + new AttrD("form", true, "button","fieldset","input","label","meter","object","output","select","textarea"), + new AttrD("formaction", true, "button","input"), + new AttrD("headers", true, "td","th"), + new AttrD("height", true, "canvas","embed","iframe","img","input","object","video"), //new AttrD("hidden"), global attribute - new AttrD("high","meter"), - new AttrD("href","a","area","base","link"), - new AttrD("hreflang","a","area","link"), + new AttrD("high", true, "meter"), + new AttrD("href", true, "a","area","base","link"), + new AttrD("hreflang", true, "a","area","link"), //"http-equiv", // '-' is problematic in code generation //"id" global attribute, should be in Tag.java - new AttrD("ismap", "img"), - new AttrD("kind","track"), - new AttrD("label","track","option","optgroup"), + new AttrD("ismap", true, "img"), + new AttrD("kind", true, "track"), + new AttrD("label", true, "track","option","optgroup"), //"lang" global attribute, should be in Tag.java - new AttrD("list","input"), - new AttrD("loop","audio","video"), - new AttrD("low","meter"), - new AttrD("max","input","meter","progress"), - new AttrD("maxlength","input","textarea"), - new AttrD("media","a","area","link","source","style"), - new AttrD("method","form"), - new AttrD("min","input","meter"), - new AttrD("multiple","input","select"), - new AttrD("muted","video","audio"), - new AttrD("name","button","fieldset","form","iframe","input","map","meta","object","output","param","select","textarea"), - new AttrD("novalidate","form"), - new AttrD("onabort","audio","embed","img","object","video"), - new AttrD("onafterprint","body"), - new AttrD("onbeforeprint","body"), - new AttrD("onbeforeunload","body"), + new AttrD("list", true, "input"), + new AttrD("loop", true, "audio","video"), + new AttrD("low", true, "meter"), + new AttrD("max", true, "input","meter","progress"), + new AttrD("maxlength", true, "input","textarea"), + new AttrD("media", true, "a","area","link","source","style"), + new AttrD("method", true, "form"), + new AttrD("min", true, "input","meter"), + new AttrD("multiple", true, "input","select"), + new AttrD("muted", true, "video","audio"), + new AttrD("name", true, "button","fieldset","form","iframe","input","map","meta","object","output","param","select","textarea"), + new AttrD("novalidate", true, "form"), + new AttrD("onabort", true, "audio","embed","img","object","video"), + new AttrD("onafterprint", true, "body"), + new AttrD("onbeforeprint", true, "body"), + new AttrD("onbeforeunload", true, "body"), //new AttrD("onblur"), global attribute - new AttrD("oncanplay", "audio","embed","object","video"), - new AttrD("oncanplaythrough","audio","video"), + new AttrD("oncanplay", true, "audio","embed","object","video"), + new AttrD("oncanplaythrough", true, "audio","video"), /* a bunch of event attributes that are on all visible elements (so should be in Tag.java) "onchange", "onclick", "oncontextmenu", "oncopy", */ - new AttrD("oncuechange","track"), + new AttrD("oncuechange", true, "track"), /* "oncut", ... "ondrop", */ - new AttrD("ondurationchange","audio","video"), - new AttrD("onemptied","audio","video"), - new AttrD("onended","audio","video"), - new AttrD("onerror","audio","body","embed","img","object","script","style","video"), + new AttrD("ondurationchange", true, "audio","video"), + new AttrD("onemptied", true, "audio","video"), + new AttrD("onended", true, "audio","video"), + new AttrD("onerror", true, "audio","body","embed","img","object","script","style","video"), //new AttrD("onfocus"),// global attribute - new AttrD("onhashchange","body"), + new AttrD("onhashchange", true, "body"), // ... a bunch of event attributes visible on all elements - new AttrD("onload","body","iframe","img","input","link","script","style"), - new AttrD("onloadeddata","audio","video"), - new AttrD("onloadedmetadata","audio","video"), - new AttrD("onloadstart", "audio","video"), + new AttrD("onload", true, "body","iframe","img","input","link","script","style"), + new AttrD("onloadeddata", true, "audio","video"), + new AttrD("onloadedmetadata", true, "audio","video"), + new AttrD("onloadstart", true, "audio","video"), // ... a bunch of event attributes visible on all elements - new AttrD("onoffline","body"), - new AttrD("ononline","body"), - new AttrD("onpagehide","body"), - new AttrD("onpageshow","body"), + new AttrD("onoffline", true, "body"), + new AttrD("ononline", true, "body"), + new AttrD("onpagehide", true, "body"), + new AttrD("onpageshow", true, "body"), //new AttrD("onpaste"),// global attribute - new AttrD("onpause","audio","video"), - new AttrD("onplay","audio","video"), - new AttrD("onplaying","audio","video"), - new AttrD("onpopstate","body"), - new AttrD("onprogress","audio","video"), - new AttrD("onratechange","audio","video"), - new AttrD("onreset","form"), - new AttrD("onresize","body"), + new AttrD("onpause", true, "audio","video"), + new AttrD("onplay", true, "audio","video"), + new AttrD("onplaying", true, "audio","video"), + new AttrD("onpopstate", true, "body"), + new AttrD("onprogress", true, "audio","video"), + new AttrD("onratechange", true, "audio","video"), + new AttrD("onreset", true, "form"), + new AttrD("onresize", true, "body"), //new AttrD("onscroll"), //global attribute - new AttrD("onsearch","input"), - new AttrD("onseeked","audio","video"), - new AttrD("onseeking","audio","video"), + new AttrD("onsearch", true, "input"), + new AttrD("onseeked", true, "audio","video"), + new AttrD("onseeking", true, "audio","video"), //new AttrD("onselect"), //global attribute - new AttrD("onstalled","audio","video"), - new AttrD("onstorage","body"), - new AttrD("onsubmit","form"), - new AttrD("onsuspend","audio","video"), - new AttrD("ontimeupdate","audio","video"), - new AttrD("ontoggle","details"), - new AttrD("onunload","body"), - new AttrD("onvolumechanged","audio","video"), - new AttrD("onwaiting","audio","video"), + new AttrD("onstalled", true, "audio","video"), + new AttrD("onstorage", true, "body"), + new AttrD("onsubmit", true, "form"), + new AttrD("onsuspend", true, "audio","video"), + new AttrD("ontimeupdate", true, "audio","video"), + new AttrD("ontoggle", true, "details"), + new AttrD("onunload", true, "body"), + new AttrD("onvolumechanged", true, "audio","video"), + new AttrD("onwaiting", true, "audio","video"), //new AttrD("onwheel"), //global attribute - new AttrD("open","details"), - new AttrD("optimum","meter"), - new AttrD("pattern","input"), - new AttrD("placeholder","input","textarea"), - new AttrD("poster","video"), - new AttrD("preload","audio","video"), - new AttrD("readonly","input","textarea"), - new AttrD("rel","a","area","form","link"), - new AttrD("required","input","select","textarea"), - new AttrD("reversed","ol"), - new AttrD("rows","textarea"), - new AttrD("rowspan","td","th"), - new AttrD("sandbox","iframe"), - new AttrD("scope","th"), - new AttrD("selected","option"), - new AttrD("shape","area"), - new AttrD("size","input","select"), - new AttrD("sizes","img","link","source"), - new AttrD("span","col","colgroup"), + new AttrD("open", true, "details"), + new AttrD("optimum", true, "meter"), + new AttrD("pattern", true, "input"), + new AttrD("placeholder", true, "input","textarea"), + new AttrD("poster", true, "video"), + new AttrD("preload", true, "audio","video"), + new AttrD("readonly", true, "input","textarea"), + new AttrD("rel", true, "a","area","form","link"), + new AttrD("required", true, "input","select","textarea"), + new AttrD("reversed", true, "ol"), + new AttrD("rows", true, "textarea"), + new AttrD("rowspan", true, "td","th"), + new AttrD("sandbox", true, "iframe"), + new AttrD("scope", true, "th"), + new AttrD("selected", true, "option"), + new AttrD("shape", true, "area"), + new AttrD("size", true, "input","select"), + new AttrD("sizes", true, "img","link","source"), + new AttrD("span", true, "col","colgroup"), //new AttrD("spellcheck"), //global attribute - new AttrD("src","audio","embed","iframe","img","input","script","source","track","video"), - new AttrD("srcdoc","iframe"), - new AttrD("srclang","track"), - new AttrD("srcset","img","source"), - new AttrD("start","ol"), - new AttrD("step","input"), + new AttrD("src", true, "audio","embed","iframe","img","input","script","source","track","video"), + new AttrD("srcdoc", true, "iframe"), + new AttrD("srclang", true, "track"), + new AttrD("srcset", true, "img","source"), + new AttrD("start", true, "ol"), + new AttrD("step", true, "input"), //new AttrD("style"), //global attribute //new AttrD("tabindex"), //global attribute - new AttrD("target", "a","area","base","form"), + new AttrD("target", true, "a","area","base","form"), //new AttrD("title"), //global attribute //new AttrD("translate"),// global attribute - new AttrD("type","a","button","embed","input","link","menu","object","script","source","style"), - new AttrD("usemap","img","object"), - new AttrD("value","button","input","li","option","meter","progress","param"), - new AttrD("width","canvas","embed","iframe","img","input","object","video"), - new AttrD("wrap","textarea") + new AttrD("type", true, "a","button","embed","input","link","menu","object","script","source","style"), + new AttrD("usemap", true, "img","object"), + new AttrD("value", true, "button","input","li","option","meter","progress","param"), + new AttrD("width", true, "canvas","embed","iframe","img","input","object","video"), + new AttrD("wrap", true, "textarea") ); } } diff --git a/src/main/java/j2html/tags/specialized/ATag.java b/src/main/java/j2html/tags/specialized/ATag.java index da3e0482..d3d91e5b 100644 --- a/src/main/java/j2html/tags/specialized/ATag.java +++ b/src/main/java/j2html/tags/specialized/ATag.java @@ -4,7 +4,7 @@ import j2html.tags.attributes.*; public final class ATag extends ContainerTag - implements IHref, IHreflang, IMedia, IRel, ITarget, IType { + implements IDownload, IHref, IHreflang, IMedia, IRel, ITarget, IType { public ATag() { super("a"); } diff --git a/src/main/java/j2html/tags/specialized/AbbrTag.java b/src/main/java/j2html/tags/specialized/AbbrTag.java index c108cdad..218ca301 100644 --- a/src/main/java/j2html/tags/specialized/AbbrTag.java +++ b/src/main/java/j2html/tags/specialized/AbbrTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class AbbrTag extends ContainerTag { public AbbrTag() { diff --git a/src/main/java/j2html/tags/specialized/AddressTag.java b/src/main/java/j2html/tags/specialized/AddressTag.java index fc2ef765..20179d96 100644 --- a/src/main/java/j2html/tags/specialized/AddressTag.java +++ b/src/main/java/j2html/tags/specialized/AddressTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class AddressTag extends ContainerTag { public AddressTag() { diff --git a/src/main/java/j2html/tags/specialized/AreaTag.java b/src/main/java/j2html/tags/specialized/AreaTag.java index 8e66ff5f..7e0e166e 100644 --- a/src/main/java/j2html/tags/specialized/AreaTag.java +++ b/src/main/java/j2html/tags/specialized/AreaTag.java @@ -4,7 +4,7 @@ import j2html.tags.attributes.*; public final class AreaTag extends EmptyTag - implements IAlt, ICoords, IHref, IHreflang, IMedia, IRel, IShape, ITarget { + implements IAlt, ICoords, IDownload, IHref, IHreflang, IMedia, IRel, IShape, ITarget { public AreaTag() { super("area"); } diff --git a/src/main/java/j2html/tags/specialized/ArticleTag.java b/src/main/java/j2html/tags/specialized/ArticleTag.java index 73f1ff79..b5abf71b 100644 --- a/src/main/java/j2html/tags/specialized/ArticleTag.java +++ b/src/main/java/j2html/tags/specialized/ArticleTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class ArticleTag extends ContainerTag { public ArticleTag() { diff --git a/src/main/java/j2html/tags/specialized/AsideTag.java b/src/main/java/j2html/tags/specialized/AsideTag.java index 9415c22d..08326cda 100644 --- a/src/main/java/j2html/tags/specialized/AsideTag.java +++ b/src/main/java/j2html/tags/specialized/AsideTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class AsideTag extends ContainerTag { public AsideTag() { diff --git a/src/main/java/j2html/tags/specialized/BTag.java b/src/main/java/j2html/tags/specialized/BTag.java index c8d3fd7a..3dd3977e 100644 --- a/src/main/java/j2html/tags/specialized/BTag.java +++ b/src/main/java/j2html/tags/specialized/BTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class BTag extends ContainerTag { public BTag() { diff --git a/src/main/java/j2html/tags/specialized/BaseTag.java b/src/main/java/j2html/tags/specialized/BaseTag.java index 932b7aa3..c157ae4c 100644 --- a/src/main/java/j2html/tags/specialized/BaseTag.java +++ b/src/main/java/j2html/tags/specialized/BaseTag.java @@ -1,7 +1,8 @@ package j2html.tags.specialized; import j2html.tags.EmptyTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.IHref; +import j2html.tags.attributes.ITarget; public final class BaseTag extends EmptyTag implements IHref, ITarget { diff --git a/src/main/java/j2html/tags/specialized/BdiTag.java b/src/main/java/j2html/tags/specialized/BdiTag.java index eb0e0d9f..cf947e57 100644 --- a/src/main/java/j2html/tags/specialized/BdiTag.java +++ b/src/main/java/j2html/tags/specialized/BdiTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class BdiTag extends ContainerTag { public BdiTag() { diff --git a/src/main/java/j2html/tags/specialized/BdoTag.java b/src/main/java/j2html/tags/specialized/BdoTag.java index 20334c01..e352bea5 100644 --- a/src/main/java/j2html/tags/specialized/BdoTag.java +++ b/src/main/java/j2html/tags/specialized/BdoTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class BdoTag extends ContainerTag { public BdoTag() { diff --git a/src/main/java/j2html/tags/specialized/BlockquoteTag.java b/src/main/java/j2html/tags/specialized/BlockquoteTag.java index a116b40c..d1f0d0f6 100644 --- a/src/main/java/j2html/tags/specialized/BlockquoteTag.java +++ b/src/main/java/j2html/tags/specialized/BlockquoteTag.java @@ -1,7 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.ICite; public final class BlockquoteTag extends ContainerTag implements ICite { diff --git a/src/main/java/j2html/tags/specialized/BrTag.java b/src/main/java/j2html/tags/specialized/BrTag.java index 04da9b1f..257fed2b 100644 --- a/src/main/java/j2html/tags/specialized/BrTag.java +++ b/src/main/java/j2html/tags/specialized/BrTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.EmptyTag; -import j2html.tags.attributes.*; public final class BrTag extends EmptyTag { public BrTag() { diff --git a/src/main/java/j2html/tags/specialized/ButtonTag.java b/src/main/java/j2html/tags/specialized/ButtonTag.java index 686158ab..f235a932 100644 --- a/src/main/java/j2html/tags/specialized/ButtonTag.java +++ b/src/main/java/j2html/tags/specialized/ButtonTag.java @@ -4,7 +4,7 @@ import j2html.tags.attributes.*; public final class ButtonTag extends ContainerTag - implements IAutofocus, IForm, IFormaction, IName, IType, IValue { + implements IAutofocus, IDisabled, IForm, IFormaction, IName, IType, IValue { public ButtonTag() { super("button"); } diff --git a/src/main/java/j2html/tags/specialized/CanvasTag.java b/src/main/java/j2html/tags/specialized/CanvasTag.java index b808681b..7b5971f1 100644 --- a/src/main/java/j2html/tags/specialized/CanvasTag.java +++ b/src/main/java/j2html/tags/specialized/CanvasTag.java @@ -1,7 +1,8 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.IHeight; +import j2html.tags.attributes.IWidth; public final class CanvasTag extends ContainerTag implements IHeight, IWidth { diff --git a/src/main/java/j2html/tags/specialized/CaptionTag.java b/src/main/java/j2html/tags/specialized/CaptionTag.java index ca6f6d8f..d9acf53d 100644 --- a/src/main/java/j2html/tags/specialized/CaptionTag.java +++ b/src/main/java/j2html/tags/specialized/CaptionTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class CaptionTag extends ContainerTag { public CaptionTag() { diff --git a/src/main/java/j2html/tags/specialized/CiteTag.java b/src/main/java/j2html/tags/specialized/CiteTag.java index e0d83644..ab9a269f 100644 --- a/src/main/java/j2html/tags/specialized/CiteTag.java +++ b/src/main/java/j2html/tags/specialized/CiteTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class CiteTag extends ContainerTag { public CiteTag() { diff --git a/src/main/java/j2html/tags/specialized/CodeTag.java b/src/main/java/j2html/tags/specialized/CodeTag.java index 2d89930c..6c98a555 100644 --- a/src/main/java/j2html/tags/specialized/CodeTag.java +++ b/src/main/java/j2html/tags/specialized/CodeTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class CodeTag extends ContainerTag { public CodeTag() { diff --git a/src/main/java/j2html/tags/specialized/ColTag.java b/src/main/java/j2html/tags/specialized/ColTag.java index 6f527b8e..33e6d97b 100644 --- a/src/main/java/j2html/tags/specialized/ColTag.java +++ b/src/main/java/j2html/tags/specialized/ColTag.java @@ -1,7 +1,7 @@ package j2html.tags.specialized; import j2html.tags.EmptyTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.ISpan; public final class ColTag extends EmptyTag implements ISpan { diff --git a/src/main/java/j2html/tags/specialized/ColgroupTag.java b/src/main/java/j2html/tags/specialized/ColgroupTag.java index 2b5316ff..aa71aaaf 100644 --- a/src/main/java/j2html/tags/specialized/ColgroupTag.java +++ b/src/main/java/j2html/tags/specialized/ColgroupTag.java @@ -1,7 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.ISpan; public final class ColgroupTag extends ContainerTag implements ISpan { diff --git a/src/main/java/j2html/tags/specialized/DatalistTag.java b/src/main/java/j2html/tags/specialized/DatalistTag.java index af80212e..c9245e8e 100644 --- a/src/main/java/j2html/tags/specialized/DatalistTag.java +++ b/src/main/java/j2html/tags/specialized/DatalistTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class DatalistTag extends ContainerTag { public DatalistTag() { diff --git a/src/main/java/j2html/tags/specialized/DdTag.java b/src/main/java/j2html/tags/specialized/DdTag.java index 8b4c72ca..9531939c 100644 --- a/src/main/java/j2html/tags/specialized/DdTag.java +++ b/src/main/java/j2html/tags/specialized/DdTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class DdTag extends ContainerTag { public DdTag() { diff --git a/src/main/java/j2html/tags/specialized/DelTag.java b/src/main/java/j2html/tags/specialized/DelTag.java index e1da6514..b29ccafd 100644 --- a/src/main/java/j2html/tags/specialized/DelTag.java +++ b/src/main/java/j2html/tags/specialized/DelTag.java @@ -1,7 +1,8 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.ICite; +import j2html.tags.attributes.IDatetime; public final class DelTag extends ContainerTag implements ICite, IDatetime { diff --git a/src/main/java/j2html/tags/specialized/DetailsTag.java b/src/main/java/j2html/tags/specialized/DetailsTag.java index c9ab5dda..19bb8315 100644 --- a/src/main/java/j2html/tags/specialized/DetailsTag.java +++ b/src/main/java/j2html/tags/specialized/DetailsTag.java @@ -1,7 +1,8 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.IOntoggle; +import j2html.tags.attributes.IOpen; public final class DetailsTag extends ContainerTag implements IOntoggle, IOpen { diff --git a/src/main/java/j2html/tags/specialized/DfnTag.java b/src/main/java/j2html/tags/specialized/DfnTag.java index 9d3eac53..4e890af2 100644 --- a/src/main/java/j2html/tags/specialized/DfnTag.java +++ b/src/main/java/j2html/tags/specialized/DfnTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class DfnTag extends ContainerTag { public DfnTag() { diff --git a/src/main/java/j2html/tags/specialized/DialogTag.java b/src/main/java/j2html/tags/specialized/DialogTag.java index 63db2f45..b01cfa43 100644 --- a/src/main/java/j2html/tags/specialized/DialogTag.java +++ b/src/main/java/j2html/tags/specialized/DialogTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class DialogTag extends ContainerTag { public DialogTag() { diff --git a/src/main/java/j2html/tags/specialized/DivTag.java b/src/main/java/j2html/tags/specialized/DivTag.java index fc40cf3b..ebcd5034 100644 --- a/src/main/java/j2html/tags/specialized/DivTag.java +++ b/src/main/java/j2html/tags/specialized/DivTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class DivTag extends ContainerTag { public DivTag() { diff --git a/src/main/java/j2html/tags/specialized/DlTag.java b/src/main/java/j2html/tags/specialized/DlTag.java index 0a4a4640..248c41ad 100644 --- a/src/main/java/j2html/tags/specialized/DlTag.java +++ b/src/main/java/j2html/tags/specialized/DlTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class DlTag extends ContainerTag { public DlTag() { diff --git a/src/main/java/j2html/tags/specialized/DtTag.java b/src/main/java/j2html/tags/specialized/DtTag.java index 09b4a700..2c962185 100644 --- a/src/main/java/j2html/tags/specialized/DtTag.java +++ b/src/main/java/j2html/tags/specialized/DtTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class DtTag extends ContainerTag { public DtTag() { diff --git a/src/main/java/j2html/tags/specialized/EmTag.java b/src/main/java/j2html/tags/specialized/EmTag.java index 166cf8cb..42000403 100644 --- a/src/main/java/j2html/tags/specialized/EmTag.java +++ b/src/main/java/j2html/tags/specialized/EmTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class EmTag extends ContainerTag { public EmTag() { diff --git a/src/main/java/j2html/tags/specialized/FieldsetTag.java b/src/main/java/j2html/tags/specialized/FieldsetTag.java index 606d474f..9644fbab 100644 --- a/src/main/java/j2html/tags/specialized/FieldsetTag.java +++ b/src/main/java/j2html/tags/specialized/FieldsetTag.java @@ -1,10 +1,12 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.IDisabled; +import j2html.tags.attributes.IForm; +import j2html.tags.attributes.IName; public final class FieldsetTag extends ContainerTag - implements IForm, IName { + implements IDisabled, IForm, IName { public FieldsetTag() { super("fieldset"); } diff --git a/src/main/java/j2html/tags/specialized/FigcaptionTag.java b/src/main/java/j2html/tags/specialized/FigcaptionTag.java index c73c3b11..9339d440 100644 --- a/src/main/java/j2html/tags/specialized/FigcaptionTag.java +++ b/src/main/java/j2html/tags/specialized/FigcaptionTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class FigcaptionTag extends ContainerTag { public FigcaptionTag() { diff --git a/src/main/java/j2html/tags/specialized/FigureTag.java b/src/main/java/j2html/tags/specialized/FigureTag.java index f471765d..15ffd4a6 100644 --- a/src/main/java/j2html/tags/specialized/FigureTag.java +++ b/src/main/java/j2html/tags/specialized/FigureTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class FigureTag extends ContainerTag { public FigureTag() { diff --git a/src/main/java/j2html/tags/specialized/FooterTag.java b/src/main/java/j2html/tags/specialized/FooterTag.java index b20e396e..b7c15868 100644 --- a/src/main/java/j2html/tags/specialized/FooterTag.java +++ b/src/main/java/j2html/tags/specialized/FooterTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class FooterTag extends ContainerTag { public FooterTag() { diff --git a/src/main/java/j2html/tags/specialized/H1Tag.java b/src/main/java/j2html/tags/specialized/H1Tag.java index 89a27d96..d2ce78f2 100644 --- a/src/main/java/j2html/tags/specialized/H1Tag.java +++ b/src/main/java/j2html/tags/specialized/H1Tag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class H1Tag extends ContainerTag { public H1Tag() { diff --git a/src/main/java/j2html/tags/specialized/H2Tag.java b/src/main/java/j2html/tags/specialized/H2Tag.java index 11464266..b2967b0f 100644 --- a/src/main/java/j2html/tags/specialized/H2Tag.java +++ b/src/main/java/j2html/tags/specialized/H2Tag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class H2Tag extends ContainerTag { public H2Tag() { diff --git a/src/main/java/j2html/tags/specialized/H3Tag.java b/src/main/java/j2html/tags/specialized/H3Tag.java index b63aa400..c8cc431a 100644 --- a/src/main/java/j2html/tags/specialized/H3Tag.java +++ b/src/main/java/j2html/tags/specialized/H3Tag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class H3Tag extends ContainerTag { public H3Tag() { diff --git a/src/main/java/j2html/tags/specialized/H4Tag.java b/src/main/java/j2html/tags/specialized/H4Tag.java index 4c7e78be..65973e73 100644 --- a/src/main/java/j2html/tags/specialized/H4Tag.java +++ b/src/main/java/j2html/tags/specialized/H4Tag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class H4Tag extends ContainerTag { public H4Tag() { diff --git a/src/main/java/j2html/tags/specialized/H5Tag.java b/src/main/java/j2html/tags/specialized/H5Tag.java index 344d9811..457aa387 100644 --- a/src/main/java/j2html/tags/specialized/H5Tag.java +++ b/src/main/java/j2html/tags/specialized/H5Tag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class H5Tag extends ContainerTag { public H5Tag() { diff --git a/src/main/java/j2html/tags/specialized/H6Tag.java b/src/main/java/j2html/tags/specialized/H6Tag.java index eea60051..b05e3579 100644 --- a/src/main/java/j2html/tags/specialized/H6Tag.java +++ b/src/main/java/j2html/tags/specialized/H6Tag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class H6Tag extends ContainerTag { public H6Tag() { diff --git a/src/main/java/j2html/tags/specialized/HeaderTag.java b/src/main/java/j2html/tags/specialized/HeaderTag.java index 0696e907..1d9126d4 100644 --- a/src/main/java/j2html/tags/specialized/HeaderTag.java +++ b/src/main/java/j2html/tags/specialized/HeaderTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class HeaderTag extends ContainerTag { public HeaderTag() { diff --git a/src/main/java/j2html/tags/specialized/HrTag.java b/src/main/java/j2html/tags/specialized/HrTag.java index 5e3b3533..82cb0ff7 100644 --- a/src/main/java/j2html/tags/specialized/HrTag.java +++ b/src/main/java/j2html/tags/specialized/HrTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.EmptyTag; -import j2html.tags.attributes.*; public final class HrTag extends EmptyTag { public HrTag() { diff --git a/src/main/java/j2html/tags/specialized/ITag.java b/src/main/java/j2html/tags/specialized/ITag.java index 5cbc38b0..631ddc52 100644 --- a/src/main/java/j2html/tags/specialized/ITag.java +++ b/src/main/java/j2html/tags/specialized/ITag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class ITag extends ContainerTag { public ITag() { diff --git a/src/main/java/j2html/tags/specialized/InputTag.java b/src/main/java/j2html/tags/specialized/InputTag.java index e8bd8367..d210e565 100644 --- a/src/main/java/j2html/tags/specialized/InputTag.java +++ b/src/main/java/j2html/tags/specialized/InputTag.java @@ -4,7 +4,7 @@ import j2html.tags.attributes.*; public final class InputTag extends EmptyTag - implements IAccept, IAlt, IAutocomplete, IAutofocus, IChecked, IDirname, IForm, IFormaction, IHeight, IList, IMax, IMaxlength, IMin, IMultiple, IName, IOnload, IOnsearch, IPattern, IPlaceholder, IReadonly, IRequired, ISize, ISrc, IStep, IType, IValue, IWidth { + implements IAccept, IAlt, IAutocomplete, IAutofocus, IChecked, IDirname, IDisabled, IForm, IFormaction, IHeight, IList, IMax, IMaxlength, IMin, IMultiple, IName, IOnload, IOnsearch, IPattern, IPlaceholder, IReadonly, IRequired, ISize, ISrc, IStep, IType, IValue, IWidth { public InputTag() { super("input"); } diff --git a/src/main/java/j2html/tags/specialized/InsTag.java b/src/main/java/j2html/tags/specialized/InsTag.java index 47d29ad3..4238cfb0 100644 --- a/src/main/java/j2html/tags/specialized/InsTag.java +++ b/src/main/java/j2html/tags/specialized/InsTag.java @@ -1,7 +1,8 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.ICite; +import j2html.tags.attributes.IDatetime; public final class InsTag extends ContainerTag implements ICite, IDatetime { diff --git a/src/main/java/j2html/tags/specialized/KbdTag.java b/src/main/java/j2html/tags/specialized/KbdTag.java index 60f4bcd5..3656c16c 100644 --- a/src/main/java/j2html/tags/specialized/KbdTag.java +++ b/src/main/java/j2html/tags/specialized/KbdTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class KbdTag extends ContainerTag { public KbdTag() { diff --git a/src/main/java/j2html/tags/specialized/KeygenTag.java b/src/main/java/j2html/tags/specialized/KeygenTag.java index f41ee767..a9565619 100644 --- a/src/main/java/j2html/tags/specialized/KeygenTag.java +++ b/src/main/java/j2html/tags/specialized/KeygenTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.EmptyTag; -import j2html.tags.attributes.*; public final class KeygenTag extends EmptyTag { public KeygenTag() { diff --git a/src/main/java/j2html/tags/specialized/LabelTag.java b/src/main/java/j2html/tags/specialized/LabelTag.java index e921e9cc..637b3933 100644 --- a/src/main/java/j2html/tags/specialized/LabelTag.java +++ b/src/main/java/j2html/tags/specialized/LabelTag.java @@ -1,7 +1,8 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.IFor; +import j2html.tags.attributes.IForm; public final class LabelTag extends ContainerTag implements IFor, IForm { diff --git a/src/main/java/j2html/tags/specialized/LegendTag.java b/src/main/java/j2html/tags/specialized/LegendTag.java index b8ba1201..0b634a08 100644 --- a/src/main/java/j2html/tags/specialized/LegendTag.java +++ b/src/main/java/j2html/tags/specialized/LegendTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class LegendTag extends ContainerTag { public LegendTag() { diff --git a/src/main/java/j2html/tags/specialized/LiTag.java b/src/main/java/j2html/tags/specialized/LiTag.java index e49e41f1..e12ed41f 100644 --- a/src/main/java/j2html/tags/specialized/LiTag.java +++ b/src/main/java/j2html/tags/specialized/LiTag.java @@ -1,7 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.IValue; public final class LiTag extends ContainerTag implements IValue { diff --git a/src/main/java/j2html/tags/specialized/MainTag.java b/src/main/java/j2html/tags/specialized/MainTag.java index 383f0167..594adf6e 100644 --- a/src/main/java/j2html/tags/specialized/MainTag.java +++ b/src/main/java/j2html/tags/specialized/MainTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class MainTag extends ContainerTag { public MainTag() { diff --git a/src/main/java/j2html/tags/specialized/MapTag.java b/src/main/java/j2html/tags/specialized/MapTag.java index 011cbb46..c98e0eff 100644 --- a/src/main/java/j2html/tags/specialized/MapTag.java +++ b/src/main/java/j2html/tags/specialized/MapTag.java @@ -1,7 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.IName; public final class MapTag extends ContainerTag implements IName { diff --git a/src/main/java/j2html/tags/specialized/MarkTag.java b/src/main/java/j2html/tags/specialized/MarkTag.java index 1cb51e3d..2d437b1a 100644 --- a/src/main/java/j2html/tags/specialized/MarkTag.java +++ b/src/main/java/j2html/tags/specialized/MarkTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class MarkTag extends ContainerTag { public MarkTag() { diff --git a/src/main/java/j2html/tags/specialized/MenuTag.java b/src/main/java/j2html/tags/specialized/MenuTag.java index f674ba15..9c4863ba 100644 --- a/src/main/java/j2html/tags/specialized/MenuTag.java +++ b/src/main/java/j2html/tags/specialized/MenuTag.java @@ -1,7 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.IType; public final class MenuTag extends ContainerTag implements IType { diff --git a/src/main/java/j2html/tags/specialized/MenuitemTag.java b/src/main/java/j2html/tags/specialized/MenuitemTag.java index 7df60bba..52942e63 100644 --- a/src/main/java/j2html/tags/specialized/MenuitemTag.java +++ b/src/main/java/j2html/tags/specialized/MenuitemTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class MenuitemTag extends ContainerTag { public MenuitemTag() { diff --git a/src/main/java/j2html/tags/specialized/MetaTag.java b/src/main/java/j2html/tags/specialized/MetaTag.java index 3f95572f..8626322a 100644 --- a/src/main/java/j2html/tags/specialized/MetaTag.java +++ b/src/main/java/j2html/tags/specialized/MetaTag.java @@ -1,7 +1,9 @@ package j2html.tags.specialized; import j2html.tags.EmptyTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.ICharset; +import j2html.tags.attributes.IContent; +import j2html.tags.attributes.IName; public final class MetaTag extends EmptyTag implements ICharset, IContent, IName { diff --git a/src/main/java/j2html/tags/specialized/NavTag.java b/src/main/java/j2html/tags/specialized/NavTag.java index e62ed68c..b9290635 100644 --- a/src/main/java/j2html/tags/specialized/NavTag.java +++ b/src/main/java/j2html/tags/specialized/NavTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class NavTag extends ContainerTag { public NavTag() { diff --git a/src/main/java/j2html/tags/specialized/NoscriptTag.java b/src/main/java/j2html/tags/specialized/NoscriptTag.java index ea0ef34b..b111b471 100644 --- a/src/main/java/j2html/tags/specialized/NoscriptTag.java +++ b/src/main/java/j2html/tags/specialized/NoscriptTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class NoscriptTag extends ContainerTag { public NoscriptTag() { diff --git a/src/main/java/j2html/tags/specialized/OlTag.java b/src/main/java/j2html/tags/specialized/OlTag.java index e209929d..3033394a 100644 --- a/src/main/java/j2html/tags/specialized/OlTag.java +++ b/src/main/java/j2html/tags/specialized/OlTag.java @@ -1,7 +1,8 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.IReversed; +import j2html.tags.attributes.IStart; public final class OlTag extends ContainerTag implements IReversed, IStart { diff --git a/src/main/java/j2html/tags/specialized/OptgroupTag.java b/src/main/java/j2html/tags/specialized/OptgroupTag.java index eb499669..df4369b4 100644 --- a/src/main/java/j2html/tags/specialized/OptgroupTag.java +++ b/src/main/java/j2html/tags/specialized/OptgroupTag.java @@ -1,10 +1,11 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.IDisabled; +import j2html.tags.attributes.ILabel; public final class OptgroupTag extends ContainerTag - implements ILabel { + implements IDisabled, ILabel { public OptgroupTag() { super("optgroup"); } diff --git a/src/main/java/j2html/tags/specialized/OptionTag.java b/src/main/java/j2html/tags/specialized/OptionTag.java index 0d345757..48ef6074 100644 --- a/src/main/java/j2html/tags/specialized/OptionTag.java +++ b/src/main/java/j2html/tags/specialized/OptionTag.java @@ -1,10 +1,13 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.IDisabled; +import j2html.tags.attributes.ILabel; +import j2html.tags.attributes.ISelected; +import j2html.tags.attributes.IValue; public final class OptionTag extends ContainerTag - implements ILabel, ISelected, IValue { + implements IDisabled, ILabel, ISelected, IValue { public OptionTag() { super("option"); } diff --git a/src/main/java/j2html/tags/specialized/OutputTag.java b/src/main/java/j2html/tags/specialized/OutputTag.java index 9ee2230c..58689dca 100644 --- a/src/main/java/j2html/tags/specialized/OutputTag.java +++ b/src/main/java/j2html/tags/specialized/OutputTag.java @@ -1,7 +1,9 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.IFor; +import j2html.tags.attributes.IForm; +import j2html.tags.attributes.IName; public final class OutputTag extends ContainerTag implements IFor, IForm, IName { diff --git a/src/main/java/j2html/tags/specialized/PTag.java b/src/main/java/j2html/tags/specialized/PTag.java index 89945abb..6e02cd2c 100644 --- a/src/main/java/j2html/tags/specialized/PTag.java +++ b/src/main/java/j2html/tags/specialized/PTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class PTag extends ContainerTag { public PTag() { diff --git a/src/main/java/j2html/tags/specialized/ParamTag.java b/src/main/java/j2html/tags/specialized/ParamTag.java index 630ff8ea..0f71e265 100644 --- a/src/main/java/j2html/tags/specialized/ParamTag.java +++ b/src/main/java/j2html/tags/specialized/ParamTag.java @@ -1,7 +1,8 @@ package j2html.tags.specialized; import j2html.tags.EmptyTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.IName; +import j2html.tags.attributes.IValue; public final class ParamTag extends EmptyTag implements IName, IValue { diff --git a/src/main/java/j2html/tags/specialized/PreTag.java b/src/main/java/j2html/tags/specialized/PreTag.java index 6300504d..4d1c0607 100644 --- a/src/main/java/j2html/tags/specialized/PreTag.java +++ b/src/main/java/j2html/tags/specialized/PreTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class PreTag extends ContainerTag { public PreTag() { diff --git a/src/main/java/j2html/tags/specialized/ProgressTag.java b/src/main/java/j2html/tags/specialized/ProgressTag.java index 61dd0222..ed5ced1c 100644 --- a/src/main/java/j2html/tags/specialized/ProgressTag.java +++ b/src/main/java/j2html/tags/specialized/ProgressTag.java @@ -1,7 +1,8 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.IMax; +import j2html.tags.attributes.IValue; public final class ProgressTag extends ContainerTag implements IMax, IValue { diff --git a/src/main/java/j2html/tags/specialized/QTag.java b/src/main/java/j2html/tags/specialized/QTag.java index de96722a..14fa8836 100644 --- a/src/main/java/j2html/tags/specialized/QTag.java +++ b/src/main/java/j2html/tags/specialized/QTag.java @@ -1,7 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.ICite; public final class QTag extends ContainerTag implements ICite { diff --git a/src/main/java/j2html/tags/specialized/RpTag.java b/src/main/java/j2html/tags/specialized/RpTag.java index 77eebb4a..c19ac18b 100644 --- a/src/main/java/j2html/tags/specialized/RpTag.java +++ b/src/main/java/j2html/tags/specialized/RpTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class RpTag extends ContainerTag { public RpTag() { diff --git a/src/main/java/j2html/tags/specialized/RtTag.java b/src/main/java/j2html/tags/specialized/RtTag.java index 3d3f88ec..016024f7 100644 --- a/src/main/java/j2html/tags/specialized/RtTag.java +++ b/src/main/java/j2html/tags/specialized/RtTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class RtTag extends ContainerTag { public RtTag() { diff --git a/src/main/java/j2html/tags/specialized/RubyTag.java b/src/main/java/j2html/tags/specialized/RubyTag.java index 3e840dc7..841fa449 100644 --- a/src/main/java/j2html/tags/specialized/RubyTag.java +++ b/src/main/java/j2html/tags/specialized/RubyTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class RubyTag extends ContainerTag { public RubyTag() { diff --git a/src/main/java/j2html/tags/specialized/STag.java b/src/main/java/j2html/tags/specialized/STag.java index 5ec9e9f8..c0f1de57 100644 --- a/src/main/java/j2html/tags/specialized/STag.java +++ b/src/main/java/j2html/tags/specialized/STag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class STag extends ContainerTag { public STag() { diff --git a/src/main/java/j2html/tags/specialized/SampTag.java b/src/main/java/j2html/tags/specialized/SampTag.java index f518bb2b..8ce6681f 100644 --- a/src/main/java/j2html/tags/specialized/SampTag.java +++ b/src/main/java/j2html/tags/specialized/SampTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class SampTag extends ContainerTag { public SampTag() { diff --git a/src/main/java/j2html/tags/specialized/SectionTag.java b/src/main/java/j2html/tags/specialized/SectionTag.java index f56a4ba4..0a0d6d6e 100644 --- a/src/main/java/j2html/tags/specialized/SectionTag.java +++ b/src/main/java/j2html/tags/specialized/SectionTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class SectionTag extends ContainerTag { public SectionTag() { diff --git a/src/main/java/j2html/tags/specialized/SelectTag.java b/src/main/java/j2html/tags/specialized/SelectTag.java index 914721ea..9e3bb990 100644 --- a/src/main/java/j2html/tags/specialized/SelectTag.java +++ b/src/main/java/j2html/tags/specialized/SelectTag.java @@ -4,7 +4,7 @@ import j2html.tags.attributes.*; public final class SelectTag extends ContainerTag - implements IAutofocus, IForm, IMultiple, IName, IRequired, ISize { + implements IAutofocus, IDisabled, IForm, IMultiple, IName, IRequired, ISize { public SelectTag() { super("select"); } diff --git a/src/main/java/j2html/tags/specialized/SmallTag.java b/src/main/java/j2html/tags/specialized/SmallTag.java index 5d178067..07f14e66 100644 --- a/src/main/java/j2html/tags/specialized/SmallTag.java +++ b/src/main/java/j2html/tags/specialized/SmallTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class SmallTag extends ContainerTag { public SmallTag() { diff --git a/src/main/java/j2html/tags/specialized/SpanTag.java b/src/main/java/j2html/tags/specialized/SpanTag.java index 59076ffa..404c2c98 100644 --- a/src/main/java/j2html/tags/specialized/SpanTag.java +++ b/src/main/java/j2html/tags/specialized/SpanTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class SpanTag extends ContainerTag { public SpanTag() { diff --git a/src/main/java/j2html/tags/specialized/StrongTag.java b/src/main/java/j2html/tags/specialized/StrongTag.java index 71c311c5..a82c59ad 100644 --- a/src/main/java/j2html/tags/specialized/StrongTag.java +++ b/src/main/java/j2html/tags/specialized/StrongTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class StrongTag extends ContainerTag { public StrongTag() { diff --git a/src/main/java/j2html/tags/specialized/StyleTag.java b/src/main/java/j2html/tags/specialized/StyleTag.java index 60737a40..47490058 100644 --- a/src/main/java/j2html/tags/specialized/StyleTag.java +++ b/src/main/java/j2html/tags/specialized/StyleTag.java @@ -1,7 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.IMedia; +import j2html.tags.attributes.IOnerror; +import j2html.tags.attributes.IOnload; +import j2html.tags.attributes.IType; public final class StyleTag extends ContainerTag implements IMedia, IOnerror, IOnload, IType { diff --git a/src/main/java/j2html/tags/specialized/SubTag.java b/src/main/java/j2html/tags/specialized/SubTag.java index 32f5e41b..9895a6dc 100644 --- a/src/main/java/j2html/tags/specialized/SubTag.java +++ b/src/main/java/j2html/tags/specialized/SubTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class SubTag extends ContainerTag { public SubTag() { diff --git a/src/main/java/j2html/tags/specialized/SummaryTag.java b/src/main/java/j2html/tags/specialized/SummaryTag.java index bffe9186..08bcdf71 100644 --- a/src/main/java/j2html/tags/specialized/SummaryTag.java +++ b/src/main/java/j2html/tags/specialized/SummaryTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class SummaryTag extends ContainerTag { public SummaryTag() { diff --git a/src/main/java/j2html/tags/specialized/SupTag.java b/src/main/java/j2html/tags/specialized/SupTag.java index a0cca811..6d5ae486 100644 --- a/src/main/java/j2html/tags/specialized/SupTag.java +++ b/src/main/java/j2html/tags/specialized/SupTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class SupTag extends ContainerTag { public SupTag() { diff --git a/src/main/java/j2html/tags/specialized/TableTag.java b/src/main/java/j2html/tags/specialized/TableTag.java index 1ec556b4..60364037 100644 --- a/src/main/java/j2html/tags/specialized/TableTag.java +++ b/src/main/java/j2html/tags/specialized/TableTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class TableTag extends ContainerTag { public TableTag() { diff --git a/src/main/java/j2html/tags/specialized/TbodyTag.java b/src/main/java/j2html/tags/specialized/TbodyTag.java index bc65ca40..a478a9a9 100644 --- a/src/main/java/j2html/tags/specialized/TbodyTag.java +++ b/src/main/java/j2html/tags/specialized/TbodyTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class TbodyTag extends ContainerTag { public TbodyTag() { diff --git a/src/main/java/j2html/tags/specialized/TdTag.java b/src/main/java/j2html/tags/specialized/TdTag.java index b8a806ce..99589c34 100644 --- a/src/main/java/j2html/tags/specialized/TdTag.java +++ b/src/main/java/j2html/tags/specialized/TdTag.java @@ -1,7 +1,9 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.IColspan; +import j2html.tags.attributes.IHeaders; +import j2html.tags.attributes.IRowspan; public final class TdTag extends ContainerTag implements IColspan, IHeaders, IRowspan { diff --git a/src/main/java/j2html/tags/specialized/TextareaTag.java b/src/main/java/j2html/tags/specialized/TextareaTag.java index bcae6b2d..250d3f0a 100644 --- a/src/main/java/j2html/tags/specialized/TextareaTag.java +++ b/src/main/java/j2html/tags/specialized/TextareaTag.java @@ -4,7 +4,7 @@ import j2html.tags.attributes.*; public final class TextareaTag extends ContainerTag - implements IAutofocus, ICols, IDirname, IForm, IMaxlength, IName, IPlaceholder, IReadonly, IRequired, IRows, IWrap { + implements IAutofocus, ICols, IDirname, IDisabled, IForm, IMaxlength, IName, IPlaceholder, IReadonly, IRequired, IRows, IWrap { public TextareaTag() { super("textarea"); } diff --git a/src/main/java/j2html/tags/specialized/TfootTag.java b/src/main/java/j2html/tags/specialized/TfootTag.java index 183d6998..fdea4251 100644 --- a/src/main/java/j2html/tags/specialized/TfootTag.java +++ b/src/main/java/j2html/tags/specialized/TfootTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class TfootTag extends ContainerTag { public TfootTag() { diff --git a/src/main/java/j2html/tags/specialized/ThTag.java b/src/main/java/j2html/tags/specialized/ThTag.java index 73ad32a5..b4004d41 100644 --- a/src/main/java/j2html/tags/specialized/ThTag.java +++ b/src/main/java/j2html/tags/specialized/ThTag.java @@ -1,7 +1,10 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.IColspan; +import j2html.tags.attributes.IHeaders; +import j2html.tags.attributes.IRowspan; +import j2html.tags.attributes.IScope; public final class ThTag extends ContainerTag implements IColspan, IHeaders, IRowspan, IScope { diff --git a/src/main/java/j2html/tags/specialized/TheadTag.java b/src/main/java/j2html/tags/specialized/TheadTag.java index 0efc5307..31108d35 100644 --- a/src/main/java/j2html/tags/specialized/TheadTag.java +++ b/src/main/java/j2html/tags/specialized/TheadTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class TheadTag extends ContainerTag { public TheadTag() { diff --git a/src/main/java/j2html/tags/specialized/TimeTag.java b/src/main/java/j2html/tags/specialized/TimeTag.java index 2dccb1f1..f2da8a8b 100644 --- a/src/main/java/j2html/tags/specialized/TimeTag.java +++ b/src/main/java/j2html/tags/specialized/TimeTag.java @@ -1,7 +1,7 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; +import j2html.tags.attributes.IDatetime; public final class TimeTag extends ContainerTag implements IDatetime { diff --git a/src/main/java/j2html/tags/specialized/TitleTag.java b/src/main/java/j2html/tags/specialized/TitleTag.java index 34d002d7..be8a55b3 100644 --- a/src/main/java/j2html/tags/specialized/TitleTag.java +++ b/src/main/java/j2html/tags/specialized/TitleTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class TitleTag extends ContainerTag { public TitleTag() { diff --git a/src/main/java/j2html/tags/specialized/TrTag.java b/src/main/java/j2html/tags/specialized/TrTag.java index 0279738e..4b825d32 100644 --- a/src/main/java/j2html/tags/specialized/TrTag.java +++ b/src/main/java/j2html/tags/specialized/TrTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class TrTag extends ContainerTag { public TrTag() { diff --git a/src/main/java/j2html/tags/specialized/TrackTag.java b/src/main/java/j2html/tags/specialized/TrackTag.java index 99d2fb76..3bc31e2a 100644 --- a/src/main/java/j2html/tags/specialized/TrackTag.java +++ b/src/main/java/j2html/tags/specialized/TrackTag.java @@ -4,7 +4,7 @@ import j2html.tags.attributes.*; public final class TrackTag extends EmptyTag - implements IDefault, IKind, ILabel, ISrc, ISrclang { + implements IDefault, IKind, ILabel, IOncuechange, ISrc, ISrclang { public TrackTag() { super("track"); } diff --git a/src/main/java/j2html/tags/specialized/UTag.java b/src/main/java/j2html/tags/specialized/UTag.java index 62906124..d961314c 100644 --- a/src/main/java/j2html/tags/specialized/UTag.java +++ b/src/main/java/j2html/tags/specialized/UTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class UTag extends ContainerTag { public UTag() { diff --git a/src/main/java/j2html/tags/specialized/UlTag.java b/src/main/java/j2html/tags/specialized/UlTag.java index 0f61ea93..f56b6414 100644 --- a/src/main/java/j2html/tags/specialized/UlTag.java +++ b/src/main/java/j2html/tags/specialized/UlTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class UlTag extends ContainerTag { public UlTag() { diff --git a/src/main/java/j2html/tags/specialized/VarTag.java b/src/main/java/j2html/tags/specialized/VarTag.java index d1825ec8..19b3fe64 100644 --- a/src/main/java/j2html/tags/specialized/VarTag.java +++ b/src/main/java/j2html/tags/specialized/VarTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.ContainerTag; -import j2html.tags.attributes.*; public final class VarTag extends ContainerTag { public VarTag() { diff --git a/src/main/java/j2html/tags/specialized/WbrTag.java b/src/main/java/j2html/tags/specialized/WbrTag.java index a827e7de..c3842b01 100644 --- a/src/main/java/j2html/tags/specialized/WbrTag.java +++ b/src/main/java/j2html/tags/specialized/WbrTag.java @@ -1,7 +1,6 @@ package j2html.tags.specialized; import j2html.tags.EmptyTag; -import j2html.tags.attributes.*; public final class WbrTag extends EmptyTag { public WbrTag() { From 5444b82909b0ddee85eb8a23d64af12b14a09f5d Mon Sep 17 00:00:00 2001 From: pointbazaar Date: Mon, 24 Aug 2020 20:06:53 +0200 Subject: [PATCH 11/19] adjust Tag.java to contain all the global attributes valid on all html elements as specified by w3schools.com --- src/main/java/j2html/attributes/Attr.java | 1 + src/main/java/j2html/tags/Tag.java | 213 ++++-------------- .../generators/TagCreatorCodeGenerator.java | 1 + 3 files changed, 52 insertions(+), 163 deletions(-) diff --git a/src/main/java/j2html/attributes/Attr.java b/src/main/java/j2html/attributes/Attr.java index 5e5b95b5..c049b2c9 100644 --- a/src/main/java/j2html/attributes/Attr.java +++ b/src/main/java/j2html/attributes/Attr.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(("#"))) { diff --git a/src/main/java/j2html/tags/Tag.java b/src/main/java/j2html/tags/Tag.java index 9b20d360..008eace7 100644 --- a/src/main/java/j2html/tags/Tag.java +++ b/src/main/java/j2html/tags/Tag.java @@ -157,195 +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); - } + /* + 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 withTitle(String title) { - return attr(Attr.TITLE, title); - } + public T withAccesskey(String accesskey){ return attr(Attr.ACCESSKEY, accesskey); } - public T withRel(String rel) { - return attr(Attr.REL, rel); - } + public T withClass(String className) { return attr(Attr.CLASS, className); } - public T withRole(String role) { - return attr(Attr.ROLE, role); - } + public T withContenteditable(){ return attr(Attr.CONTENTEDITABLE, "true"); } - public T withSrc(String src) { - return attr(Attr.SRC, src); - } + public T withData(String dataAttr, String value) { return attr(Attr.DATA + "-" + dataAttr, value); } - public T withStyle(String style) { - return attr(Attr.STYLE, style); - } + public T withDir(String dir) { return attr(Attr.DIR, dir); } - public T withStep(String step) { - return attr(Attr.STEP, step); - } + public T withDraggable(){ return attr(Attr.DRAGGABLE, "true"); } - public T withCondAutoComplete(boolean condition) { - return condAttr(condition, Attr.AUTOCOMPLETE, null); - } + public T isHidden() { return attr(Attr.HIDDEN, null); } - public T withCondAutoFocus(boolean condition) { - return condAttr(condition, Attr.AUTOFOCUS, null); - } - - public T withCondHidden(boolean condition) { - return condAttr(condition, 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 withSpellcheck(){ 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 withTranslate(){ 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"); } } diff --git a/src/main/java/j2html/tags/generators/TagCreatorCodeGenerator.java b/src/main/java/j2html/tags/generators/TagCreatorCodeGenerator.java index d9f814cd..59b6b058 100644 --- a/src/main/java/j2html/tags/generators/TagCreatorCodeGenerator.java +++ b/src/main/java/j2html/tags/generators/TagCreatorCodeGenerator.java @@ -126,6 +126,7 @@ static List containerTags() { "h6", //"head", HeadTag is managed manually "header", + //"html" HtmlTag is managed manually "i", "iframe", "ins", From c038a0e1ffbd9e821a2947106c274abfbd2e8772 Mon Sep 17 00:00:00 2001 From: pointbazaar Date: Mon, 24 Aug 2020 20:55:02 +0200 Subject: [PATCH 12/19] add withCond... and is... because that is the pattern consistent with the rest of the project. These methods should now be generated. --- src/main/java/j2html/tags/Tag.java | 8 +-- .../java/j2html/tags/attributes/IAccept.java | 7 +++ .../j2html/tags/attributes/IAccesskey.java | 10 ---- .../java/j2html/tags/attributes/IAction.java | 7 +++ .../java/j2html/tags/attributes/IAlt.java | 7 +++ .../java/j2html/tags/attributes/IAsync.java | 7 +++ .../j2html/tags/attributes/IAutocomplete.java | 11 ++++- .../j2html/tags/attributes/IAutofocus.java | 11 ++++- .../j2html/tags/attributes/IAutoplay.java | 7 +++ .../java/j2html/tags/attributes/ICharset.java | 7 +++ .../java/j2html/tags/attributes/IChecked.java | 9 +++- .../java/j2html/tags/attributes/ICite.java | 7 +++ .../java/j2html/tags/attributes/ICols.java | 7 +++ .../java/j2html/tags/attributes/IColspan.java | 7 +++ .../java/j2html/tags/attributes/IContent.java | 7 +++ .../j2html/tags/attributes/IControls.java | 7 +++ .../java/j2html/tags/attributes/ICoords.java | 7 +++ .../java/j2html/tags/attributes/IData.java | 7 +++ .../j2html/tags/attributes/IDatetime.java | 7 +++ .../java/j2html/tags/attributes/IDefault.java | 7 +++ .../java/j2html/tags/attributes/IDefer.java | 7 +++ .../java/j2html/tags/attributes/IDir.java | 10 ---- .../java/j2html/tags/attributes/IDirname.java | 7 +++ .../j2html/tags/attributes/IDisabled.java | 9 +++- .../j2html/tags/attributes/IDownload.java | 9 +++- .../java/j2html/tags/attributes/IEnctype.java | 7 +++ .../java/j2html/tags/attributes/IFor.java | 7 +++ .../java/j2html/tags/attributes/IForm.java | 7 +++ .../j2html/tags/attributes/IFormaction.java | 7 +++ .../java/j2html/tags/attributes/IHeaders.java | 7 +++ .../java/j2html/tags/attributes/IHeight.java | 7 +++ .../java/j2html/tags/attributes/IHidden.java | 10 ---- .../java/j2html/tags/attributes/IHigh.java | 7 +++ .../java/j2html/tags/attributes/IHref.java | 7 +++ .../j2html/tags/attributes/IHreflang.java | 7 +++ .../java/j2html/tags/attributes/IIsmap.java | 7 +++ .../java/j2html/tags/attributes/IKind.java | 7 +++ .../java/j2html/tags/attributes/ILabel.java | 7 +++ .../java/j2html/tags/attributes/IList.java | 7 +++ .../java/j2html/tags/attributes/ILoop.java | 7 +++ .../java/j2html/tags/attributes/ILow.java | 7 +++ .../java/j2html/tags/attributes/IMax.java | 7 +++ .../j2html/tags/attributes/IMaxlength.java | 7 +++ .../java/j2html/tags/attributes/IMedia.java | 7 +++ .../java/j2html/tags/attributes/IMethod.java | 7 +++ .../java/j2html/tags/attributes/IMin.java | 7 +++ .../j2html/tags/attributes/IMultiple.java | 7 +++ .../java/j2html/tags/attributes/IMuted.java | 7 +++ .../java/j2html/tags/attributes/IName.java | 7 +++ .../j2html/tags/attributes/INovalidate.java | 7 +++ .../java/j2html/tags/attributes/IOnabort.java | 7 +++ .../j2html/tags/attributes/IOnafterprint.java | 7 +++ .../tags/attributes/IOnbeforeprint.java | 7 +++ .../tags/attributes/IOnbeforeunload.java | 7 +++ .../j2html/tags/attributes/IOncanplay.java | 7 +++ .../tags/attributes/IOncanplaythrough.java | 7 +++ .../j2html/tags/attributes/IOncuechange.java | 7 +++ .../tags/attributes/IOndurationchange.java | 7 +++ .../j2html/tags/attributes/IOnemptied.java | 7 +++ .../java/j2html/tags/attributes/IOnended.java | 7 +++ .../java/j2html/tags/attributes/IOnerror.java | 7 +++ .../j2html/tags/attributes/IOnhashchange.java | 7 +++ .../java/j2html/tags/attributes/IOnload.java | 7 +++ .../j2html/tags/attributes/IOnloadeddata.java | 7 +++ .../tags/attributes/IOnloadedmetadata.java | 7 +++ .../j2html/tags/attributes/IOnloadstart.java | 7 +++ .../j2html/tags/attributes/IOnoffline.java | 7 +++ .../j2html/tags/attributes/IOnonline.java | 7 +++ .../j2html/tags/attributes/IOnpagehide.java | 7 +++ .../j2html/tags/attributes/IOnpageshow.java | 7 +++ .../java/j2html/tags/attributes/IOnpause.java | 7 +++ .../java/j2html/tags/attributes/IOnplay.java | 7 +++ .../j2html/tags/attributes/IOnplaying.java | 7 +++ .../j2html/tags/attributes/IOnpopstate.java | 7 +++ .../j2html/tags/attributes/IOnprogress.java | 7 +++ .../j2html/tags/attributes/IOnratechange.java | 7 +++ .../java/j2html/tags/attributes/IOnreset.java | 7 +++ .../j2html/tags/attributes/IOnresize.java | 7 +++ .../j2html/tags/attributes/IOnsearch.java | 7 +++ .../j2html/tags/attributes/IOnseeked.java | 7 +++ .../j2html/tags/attributes/IOnseeking.java | 7 +++ .../j2html/tags/attributes/IOnstalled.java | 7 +++ .../j2html/tags/attributes/IOnstorage.java | 7 +++ .../j2html/tags/attributes/IOnsubmit.java | 7 +++ .../j2html/tags/attributes/IOnsuspend.java | 7 +++ .../j2html/tags/attributes/IOntimeupdate.java | 7 +++ .../j2html/tags/attributes/IOntoggle.java | 7 +++ .../j2html/tags/attributes/IOnunload.java | 7 +++ .../tags/attributes/IOnvolumechanged.java | 7 +++ .../j2html/tags/attributes/IOnwaiting.java | 7 +++ .../java/j2html/tags/attributes/IOpen.java | 7 +++ .../java/j2html/tags/attributes/IOptimum.java | 7 +++ .../java/j2html/tags/attributes/IPattern.java | 7 +++ .../j2html/tags/attributes/IPlaceholder.java | 7 +++ .../java/j2html/tags/attributes/IPoster.java | 7 +++ .../java/j2html/tags/attributes/IPreload.java | 7 +++ .../j2html/tags/attributes/IReadonly.java | 7 +++ .../java/j2html/tags/attributes/IRel.java | 7 +++ .../j2html/tags/attributes/IRequired.java | 11 ++++- .../j2html/tags/attributes/IReversed.java | 7 +++ .../java/j2html/tags/attributes/IRows.java | 7 +++ .../java/j2html/tags/attributes/IRowspan.java | 7 +++ .../java/j2html/tags/attributes/ISandbox.java | 7 +++ .../java/j2html/tags/attributes/IScope.java | 7 +++ .../j2html/tags/attributes/ISelected.java | 7 +++ .../java/j2html/tags/attributes/IShape.java | 7 +++ .../java/j2html/tags/attributes/ISize.java | 7 +++ .../java/j2html/tags/attributes/ISizes.java | 7 +++ .../java/j2html/tags/attributes/ISpan.java | 7 +++ .../j2html/tags/attributes/ISpellcheck.java | 10 ---- .../java/j2html/tags/attributes/ISrc.java | 7 +++ .../java/j2html/tags/attributes/ISrcdoc.java | 7 +++ .../java/j2html/tags/attributes/ISrclang.java | 7 +++ .../java/j2html/tags/attributes/ISrcset.java | 7 +++ .../java/j2html/tags/attributes/IStart.java | 7 +++ .../java/j2html/tags/attributes/IStep.java | 7 +++ .../java/j2html/tags/attributes/ITarget.java | 7 +++ .../java/j2html/tags/attributes/IType.java | 7 +++ .../java/j2html/tags/attributes/IUsemap.java | 7 +++ .../java/j2html/tags/attributes/IValue.java | 7 +++ .../java/j2html/tags/attributes/IWidth.java | 7 +++ .../java/j2html/tags/attributes/IWrap.java | 7 +++ .../AttributeInterfaceCodeGenerator.java | 49 ++++++++++++++++--- .../tags/generators/AttributesList.java | 6 +-- .../j2html/tags/ConvenienceMethodTest.java | 6 +-- src/test/java/j2html/tags/TagTest.java | 4 +- 126 files changed, 879 insertions(+), 71 deletions(-) delete mode 100644 src/main/java/j2html/tags/attributes/IAccesskey.java delete mode 100644 src/main/java/j2html/tags/attributes/IDir.java delete mode 100644 src/main/java/j2html/tags/attributes/IHidden.java delete mode 100644 src/main/java/j2html/tags/attributes/ISpellcheck.java diff --git a/src/main/java/j2html/tags/Tag.java b/src/main/java/j2html/tags/Tag.java index 008eace7..dce75358 100644 --- a/src/main/java/j2html/tags/Tag.java +++ b/src/main/java/j2html/tags/Tag.java @@ -183,13 +183,13 @@ public T withClasses(String... classes) { public T withClass(String className) { return attr(Attr.CLASS, className); } - public T withContenteditable(){ return attr(Attr.CONTENTEDITABLE, "true"); } + public T isContenteditable(){ return attr(Attr.CONTENTEDITABLE, "true"); } public T withData(String dataAttr, String value) { return attr(Attr.DATA + "-" + dataAttr, value); } public T withDir(String dir) { return attr(Attr.DIR, dir); } - public T withDraggable(){ return attr(Attr.DRAGGABLE, "true"); } + public T isDraggable(){ return attr(Attr.DRAGGABLE, "true"); } public T isHidden() { return attr(Attr.HIDDEN, null); } @@ -197,7 +197,7 @@ public T withClasses(String... classes) { public T withLang(String lang) { return attr(Attr.LANG, lang); } - public T withSpellcheck(){ return attr(Attr.SPELLCHECK, "true"); } + public T isSpellcheck(){ return attr(Attr.SPELLCHECK, "true"); } public T withStyle(String style) { return attr(Attr.STYLE, style); } @@ -205,7 +205,7 @@ public T withClasses(String... classes) { public T withTitle(String title) { return attr(Attr.TITLE, title); } - public T withTranslate(){ return attr(Attr.TRANSLATE, "yes"); } + public T isTranslate(){ return attr(Attr.TRANSLATE, "yes"); } // ----- start of withCond$ATTR variants ----- public T withCondAccessKey(boolean condition, String accesskey){ return condAttr(condition, Attr.ACCESSKEY, accesskey); } diff --git a/src/main/java/j2html/tags/attributes/IAccept.java b/src/main/java/j2html/tags/attributes/IAccept.java index dee0b127..6c8f645e 100644 --- a/src/main/java/j2html/tags/attributes/IAccept.java +++ b/src/main/java/j2html/tags/attributes/IAccept.java @@ -7,4 +7,11 @@ default T withAccept(final String accept_) { get().attr("accept", accept_); return get(); } + + default T withCondAccept(final boolean enable, final String accept_) { + if (enable) { + get().attr("accept", accept_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IAccesskey.java b/src/main/java/j2html/tags/attributes/IAccesskey.java deleted file mode 100644 index 5bd764ab..00000000 --- a/src/main/java/j2html/tags/attributes/IAccesskey.java +++ /dev/null @@ -1,10 +0,0 @@ -package j2html.tags.attributes; - -import j2html.tags.Tag; - -public interface IAccesskey extends IInstance { - default T withAccesskey(final String accesskey_) { - get().attr("accesskey", accesskey_); - return get(); - } -} diff --git a/src/main/java/j2html/tags/attributes/IAction.java b/src/main/java/j2html/tags/attributes/IAction.java index bc2611b4..43c45d2a 100644 --- a/src/main/java/j2html/tags/attributes/IAction.java +++ b/src/main/java/j2html/tags/attributes/IAction.java @@ -7,4 +7,11 @@ default T withAction(final String action_) { get().attr("action", action_); return get(); } + + default T withCondAction(final boolean enable, final String action_) { + if (enable) { + get().attr("action", action_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IAlt.java b/src/main/java/j2html/tags/attributes/IAlt.java index d27967fb..a3ef8c33 100644 --- a/src/main/java/j2html/tags/attributes/IAlt.java +++ b/src/main/java/j2html/tags/attributes/IAlt.java @@ -7,4 +7,11 @@ default T withAlt(final String alt_) { get().attr("alt", alt_); return get(); } + + default T withCondAlt(final boolean enable, final String alt_) { + if (enable) { + get().attr("alt", alt_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IAsync.java b/src/main/java/j2html/tags/attributes/IAsync.java index cd00ae17..edebdba8 100644 --- a/src/main/java/j2html/tags/attributes/IAsync.java +++ b/src/main/java/j2html/tags/attributes/IAsync.java @@ -7,4 +7,11 @@ default T withAsync(final String async_) { get().attr("async", async_); return get(); } + + default T withCondAsync(final boolean enable, final String async_) { + if (enable) { + get().attr("async", async_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IAutocomplete.java b/src/main/java/j2html/tags/attributes/IAutocomplete.java index 407ef04e..c32ec1f4 100644 --- a/src/main/java/j2html/tags/attributes/IAutocomplete.java +++ b/src/main/java/j2html/tags/attributes/IAutocomplete.java @@ -3,8 +3,15 @@ import j2html.tags.Tag; public interface IAutocomplete extends IInstance { - default T withAutocomplete(final String autocomplete_) { - get().attr("autocomplete", autocomplete_); + default T isAutocomplete() { + get().attr("autocomplete"); + return get(); + } + + default T withCondAutocomplete(final boolean enable) { + if (enable) { + get().attr("autocomplete"); + } return get(); } } diff --git a/src/main/java/j2html/tags/attributes/IAutofocus.java b/src/main/java/j2html/tags/attributes/IAutofocus.java index 38cb872d..a0dee978 100644 --- a/src/main/java/j2html/tags/attributes/IAutofocus.java +++ b/src/main/java/j2html/tags/attributes/IAutofocus.java @@ -3,8 +3,15 @@ import j2html.tags.Tag; public interface IAutofocus extends IInstance { - default T withAutofocus(final String autofocus_) { - get().attr("autofocus", autofocus_); + default T isAutofocus() { + get().attr("autofocus"); + return get(); + } + + default T withCondAutofocus(final boolean enable) { + if (enable) { + get().attr("autofocus"); + } return get(); } } diff --git a/src/main/java/j2html/tags/attributes/IAutoplay.java b/src/main/java/j2html/tags/attributes/IAutoplay.java index 313b5a42..eacdef41 100644 --- a/src/main/java/j2html/tags/attributes/IAutoplay.java +++ b/src/main/java/j2html/tags/attributes/IAutoplay.java @@ -7,4 +7,11 @@ default T withAutoplay(final String autoplay_) { get().attr("autoplay", autoplay_); return get(); } + + default T withCondAutoplay(final boolean enable, final String autoplay_) { + if (enable) { + get().attr("autoplay", autoplay_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/ICharset.java b/src/main/java/j2html/tags/attributes/ICharset.java index 4a813024..a7817eca 100644 --- a/src/main/java/j2html/tags/attributes/ICharset.java +++ b/src/main/java/j2html/tags/attributes/ICharset.java @@ -7,4 +7,11 @@ default T withCharset(final String charset_) { get().attr("charset", charset_); return get(); } + + default T withCondCharset(final boolean enable, final String charset_) { + if (enable) { + get().attr("charset", charset_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IChecked.java b/src/main/java/j2html/tags/attributes/IChecked.java index 0c91de97..c2a4d13d 100644 --- a/src/main/java/j2html/tags/attributes/IChecked.java +++ b/src/main/java/j2html/tags/attributes/IChecked.java @@ -3,8 +3,13 @@ import j2html.tags.Tag; public interface IChecked extends IInstance { - default T withChecked(final boolean checked_) { - if (checked_) { + default T isChecked() { + get().attr("checked"); + return get(); + } + + default T withCondChecked(final boolean enable) { + if (enable) { get().attr("checked"); } return get(); diff --git a/src/main/java/j2html/tags/attributes/ICite.java b/src/main/java/j2html/tags/attributes/ICite.java index a12629e9..cba8f8db 100644 --- a/src/main/java/j2html/tags/attributes/ICite.java +++ b/src/main/java/j2html/tags/attributes/ICite.java @@ -7,4 +7,11 @@ default T withCite(final String cite_) { get().attr("cite", cite_); return get(); } + + default T withCondCite(final boolean enable, final String cite_) { + if (enable) { + get().attr("cite", cite_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/ICols.java b/src/main/java/j2html/tags/attributes/ICols.java index 360b4376..da167239 100644 --- a/src/main/java/j2html/tags/attributes/ICols.java +++ b/src/main/java/j2html/tags/attributes/ICols.java @@ -7,4 +7,11 @@ default T withCols(final String cols_) { get().attr("cols", cols_); return get(); } + + default T withCondCols(final boolean enable, final String cols_) { + if (enable) { + get().attr("cols", cols_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IColspan.java b/src/main/java/j2html/tags/attributes/IColspan.java index 0352c2aa..b7411e7d 100644 --- a/src/main/java/j2html/tags/attributes/IColspan.java +++ b/src/main/java/j2html/tags/attributes/IColspan.java @@ -7,4 +7,11 @@ default T withColspan(final String colspan_) { get().attr("colspan", colspan_); return get(); } + + default T withCondColspan(final boolean enable, final String colspan_) { + if (enable) { + get().attr("colspan", colspan_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IContent.java b/src/main/java/j2html/tags/attributes/IContent.java index 8b2488cd..9b1eb945 100644 --- a/src/main/java/j2html/tags/attributes/IContent.java +++ b/src/main/java/j2html/tags/attributes/IContent.java @@ -7,4 +7,11 @@ default T withContent(final String content_) { get().attr("content", content_); return get(); } + + default T withCondContent(final boolean enable, final String content_) { + if (enable) { + get().attr("content", content_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IControls.java b/src/main/java/j2html/tags/attributes/IControls.java index b8d726db..930b2717 100644 --- a/src/main/java/j2html/tags/attributes/IControls.java +++ b/src/main/java/j2html/tags/attributes/IControls.java @@ -7,4 +7,11 @@ default T withControls(final String controls_) { get().attr("controls", controls_); return get(); } + + default T withCondControls(final boolean enable, final String controls_) { + if (enable) { + get().attr("controls", controls_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/ICoords.java b/src/main/java/j2html/tags/attributes/ICoords.java index 4cc331c1..f37ea43a 100644 --- a/src/main/java/j2html/tags/attributes/ICoords.java +++ b/src/main/java/j2html/tags/attributes/ICoords.java @@ -7,4 +7,11 @@ default T withCoords(final String coords_) { get().attr("coords", coords_); return get(); } + + default T withCondCoords(final boolean enable, final String coords_) { + if (enable) { + get().attr("coords", coords_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IData.java b/src/main/java/j2html/tags/attributes/IData.java index be87d711..c01ad755 100644 --- a/src/main/java/j2html/tags/attributes/IData.java +++ b/src/main/java/j2html/tags/attributes/IData.java @@ -7,4 +7,11 @@ default T withData(final String data_) { get().attr("data", data_); return get(); } + + default T withCondData(final boolean enable, final String data_) { + if (enable) { + get().attr("data", data_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IDatetime.java b/src/main/java/j2html/tags/attributes/IDatetime.java index c95e5558..fa4e3e6a 100644 --- a/src/main/java/j2html/tags/attributes/IDatetime.java +++ b/src/main/java/j2html/tags/attributes/IDatetime.java @@ -7,4 +7,11 @@ default T withDatetime(final String datetime_) { get().attr("datetime", datetime_); return get(); } + + default T withCondDatetime(final boolean enable, final String datetime_) { + if (enable) { + get().attr("datetime", datetime_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IDefault.java b/src/main/java/j2html/tags/attributes/IDefault.java index 6677f46d..198521b8 100644 --- a/src/main/java/j2html/tags/attributes/IDefault.java +++ b/src/main/java/j2html/tags/attributes/IDefault.java @@ -7,4 +7,11 @@ default T withDefault(final String default_) { get().attr("default", default_); return get(); } + + default T withCondDefault(final boolean enable, final String default_) { + if (enable) { + get().attr("default", default_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IDefer.java b/src/main/java/j2html/tags/attributes/IDefer.java index 3ffdbdcb..b2f1078e 100644 --- a/src/main/java/j2html/tags/attributes/IDefer.java +++ b/src/main/java/j2html/tags/attributes/IDefer.java @@ -7,4 +7,11 @@ default T withDefer(final String defer_) { get().attr("defer", defer_); return get(); } + + default T withCondDefer(final boolean enable, final String defer_) { + if (enable) { + get().attr("defer", defer_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IDir.java b/src/main/java/j2html/tags/attributes/IDir.java deleted file mode 100644 index 32438877..00000000 --- a/src/main/java/j2html/tags/attributes/IDir.java +++ /dev/null @@ -1,10 +0,0 @@ -package j2html.tags.attributes; - -import j2html.tags.Tag; - -public interface IDir extends IInstance { - default T withDir(final String dir_) { - get().attr("dir", dir_); - return get(); - } -} diff --git a/src/main/java/j2html/tags/attributes/IDirname.java b/src/main/java/j2html/tags/attributes/IDirname.java index 4d870470..b3f8c9f9 100644 --- a/src/main/java/j2html/tags/attributes/IDirname.java +++ b/src/main/java/j2html/tags/attributes/IDirname.java @@ -7,4 +7,11 @@ default T withDirname(final String dirname_) { get().attr("dirname", dirname_); return get(); } + + default T withCondDirname(final boolean enable, final String dirname_) { + if (enable) { + get().attr("dirname", dirname_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IDisabled.java b/src/main/java/j2html/tags/attributes/IDisabled.java index 507f6b53..be278c07 100644 --- a/src/main/java/j2html/tags/attributes/IDisabled.java +++ b/src/main/java/j2html/tags/attributes/IDisabled.java @@ -3,8 +3,13 @@ import j2html.tags.Tag; public interface IDisabled extends IInstance { - default T withDisabled(final boolean disabled_) { - if (disabled_) { + default T isDisabled() { + get().attr("disabled"); + return get(); + } + + default T withCondDisabled(final boolean enable) { + if (enable) { get().attr("disabled"); } return get(); diff --git a/src/main/java/j2html/tags/attributes/IDownload.java b/src/main/java/j2html/tags/attributes/IDownload.java index 908773bc..5dac1ef3 100644 --- a/src/main/java/j2html/tags/attributes/IDownload.java +++ b/src/main/java/j2html/tags/attributes/IDownload.java @@ -3,8 +3,13 @@ import j2html.tags.Tag; public interface IDownload extends IInstance { - default T withDownload(final boolean download_) { - if (download_) { + default T isDownload() { + get().attr("download"); + return get(); + } + + default T withCondDownload(final boolean enable) { + if (enable) { get().attr("download"); } return get(); diff --git a/src/main/java/j2html/tags/attributes/IEnctype.java b/src/main/java/j2html/tags/attributes/IEnctype.java index bf3dcb48..f65b1f33 100644 --- a/src/main/java/j2html/tags/attributes/IEnctype.java +++ b/src/main/java/j2html/tags/attributes/IEnctype.java @@ -7,4 +7,11 @@ default T withEnctype(final String enctype_) { get().attr("enctype", enctype_); return get(); } + + default T withCondEnctype(final boolean enable, final String enctype_) { + if (enable) { + get().attr("enctype", enctype_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IFor.java b/src/main/java/j2html/tags/attributes/IFor.java index a14cc461..a596699a 100644 --- a/src/main/java/j2html/tags/attributes/IFor.java +++ b/src/main/java/j2html/tags/attributes/IFor.java @@ -7,4 +7,11 @@ default T withFor(final String for_) { get().attr("for", for_); return get(); } + + default T withCondFor(final boolean enable, final String for_) { + if (enable) { + get().attr("for", for_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IForm.java b/src/main/java/j2html/tags/attributes/IForm.java index aca53b78..723330de 100644 --- a/src/main/java/j2html/tags/attributes/IForm.java +++ b/src/main/java/j2html/tags/attributes/IForm.java @@ -7,4 +7,11 @@ default T withForm(final String form_) { get().attr("form", form_); return get(); } + + default T withCondForm(final boolean enable, final String form_) { + if (enable) { + get().attr("form", form_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IFormaction.java b/src/main/java/j2html/tags/attributes/IFormaction.java index f306d5b9..2016db2d 100644 --- a/src/main/java/j2html/tags/attributes/IFormaction.java +++ b/src/main/java/j2html/tags/attributes/IFormaction.java @@ -7,4 +7,11 @@ default T withFormaction(final String formaction_) { get().attr("formaction", formaction_); return get(); } + + default T withCondFormaction(final boolean enable, final String formaction_) { + if (enable) { + get().attr("formaction", formaction_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IHeaders.java b/src/main/java/j2html/tags/attributes/IHeaders.java index 8d9cc129..7e4702cc 100644 --- a/src/main/java/j2html/tags/attributes/IHeaders.java +++ b/src/main/java/j2html/tags/attributes/IHeaders.java @@ -7,4 +7,11 @@ default T withHeaders(final String headers_) { get().attr("headers", headers_); return get(); } + + default T withCondHeaders(final boolean enable, final String headers_) { + if (enable) { + get().attr("headers", headers_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IHeight.java b/src/main/java/j2html/tags/attributes/IHeight.java index 3afc8d41..40e90e41 100644 --- a/src/main/java/j2html/tags/attributes/IHeight.java +++ b/src/main/java/j2html/tags/attributes/IHeight.java @@ -7,4 +7,11 @@ default T withHeight(final String height_) { get().attr("height", height_); return get(); } + + default T withCondHeight(final boolean enable, final String height_) { + if (enable) { + get().attr("height", height_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IHidden.java b/src/main/java/j2html/tags/attributes/IHidden.java deleted file mode 100644 index dfe71376..00000000 --- a/src/main/java/j2html/tags/attributes/IHidden.java +++ /dev/null @@ -1,10 +0,0 @@ -package j2html.tags.attributes; - -import j2html.tags.Tag; - -public interface IHidden extends IInstance { - default T withHidden(final String hidden_) { - get().attr("hidden", hidden_); - return get(); - } -} diff --git a/src/main/java/j2html/tags/attributes/IHigh.java b/src/main/java/j2html/tags/attributes/IHigh.java index 7ef98cf6..389da6f3 100644 --- a/src/main/java/j2html/tags/attributes/IHigh.java +++ b/src/main/java/j2html/tags/attributes/IHigh.java @@ -7,4 +7,11 @@ default T withHigh(final String high_) { get().attr("high", high_); return get(); } + + default T withCondHigh(final boolean enable, final String high_) { + if (enable) { + get().attr("high", high_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IHref.java b/src/main/java/j2html/tags/attributes/IHref.java index 2ffc018f..1b1fe8ac 100644 --- a/src/main/java/j2html/tags/attributes/IHref.java +++ b/src/main/java/j2html/tags/attributes/IHref.java @@ -7,4 +7,11 @@ default T withHref(final String href_) { get().attr("href", href_); return get(); } + + default T withCondHref(final boolean enable, final String href_) { + if (enable) { + get().attr("href", href_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IHreflang.java b/src/main/java/j2html/tags/attributes/IHreflang.java index 32e2d82c..509a49fd 100644 --- a/src/main/java/j2html/tags/attributes/IHreflang.java +++ b/src/main/java/j2html/tags/attributes/IHreflang.java @@ -7,4 +7,11 @@ default T withHreflang(final String hreflang_) { get().attr("hreflang", hreflang_); return get(); } + + default T withCondHreflang(final boolean enable, final String hreflang_) { + if (enable) { + get().attr("hreflang", hreflang_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IIsmap.java b/src/main/java/j2html/tags/attributes/IIsmap.java index fdae2e61..3d1381fa 100644 --- a/src/main/java/j2html/tags/attributes/IIsmap.java +++ b/src/main/java/j2html/tags/attributes/IIsmap.java @@ -7,4 +7,11 @@ default T withIsmap(final String ismap_) { get().attr("ismap", ismap_); return get(); } + + default T withCondIsmap(final boolean enable, final String ismap_) { + if (enable) { + get().attr("ismap", ismap_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IKind.java b/src/main/java/j2html/tags/attributes/IKind.java index 9b105ba0..df28a605 100644 --- a/src/main/java/j2html/tags/attributes/IKind.java +++ b/src/main/java/j2html/tags/attributes/IKind.java @@ -7,4 +7,11 @@ default T withKind(final String kind_) { get().attr("kind", kind_); return get(); } + + default T withCondKind(final boolean enable, final String kind_) { + if (enable) { + get().attr("kind", kind_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/ILabel.java b/src/main/java/j2html/tags/attributes/ILabel.java index a2f29828..14747c95 100644 --- a/src/main/java/j2html/tags/attributes/ILabel.java +++ b/src/main/java/j2html/tags/attributes/ILabel.java @@ -7,4 +7,11 @@ default T withLabel(final String label_) { get().attr("label", label_); return get(); } + + default T withCondLabel(final boolean enable, final String label_) { + if (enable) { + get().attr("label", label_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IList.java b/src/main/java/j2html/tags/attributes/IList.java index 29db3712..846ea7b5 100644 --- a/src/main/java/j2html/tags/attributes/IList.java +++ b/src/main/java/j2html/tags/attributes/IList.java @@ -7,4 +7,11 @@ default T withList(final String list_) { get().attr("list", list_); return get(); } + + default T withCondList(final boolean enable, final String list_) { + if (enable) { + get().attr("list", list_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/ILoop.java b/src/main/java/j2html/tags/attributes/ILoop.java index d2d8bc6f..82844a6e 100644 --- a/src/main/java/j2html/tags/attributes/ILoop.java +++ b/src/main/java/j2html/tags/attributes/ILoop.java @@ -7,4 +7,11 @@ default T withLoop(final String loop_) { get().attr("loop", loop_); return get(); } + + default T withCondLoop(final boolean enable, final String loop_) { + if (enable) { + get().attr("loop", loop_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/ILow.java b/src/main/java/j2html/tags/attributes/ILow.java index 47192c26..017372ad 100644 --- a/src/main/java/j2html/tags/attributes/ILow.java +++ b/src/main/java/j2html/tags/attributes/ILow.java @@ -7,4 +7,11 @@ default T withLow(final String low_) { get().attr("low", low_); return get(); } + + default T withCondLow(final boolean enable, final String low_) { + if (enable) { + get().attr("low", low_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IMax.java b/src/main/java/j2html/tags/attributes/IMax.java index 925b15ad..29a030b4 100644 --- a/src/main/java/j2html/tags/attributes/IMax.java +++ b/src/main/java/j2html/tags/attributes/IMax.java @@ -7,4 +7,11 @@ default T withMax(final String max_) { get().attr("max", max_); return get(); } + + default T withCondMax(final boolean enable, final String max_) { + if (enable) { + get().attr("max", max_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IMaxlength.java b/src/main/java/j2html/tags/attributes/IMaxlength.java index c8002685..bc337474 100644 --- a/src/main/java/j2html/tags/attributes/IMaxlength.java +++ b/src/main/java/j2html/tags/attributes/IMaxlength.java @@ -7,4 +7,11 @@ default T withMaxlength(final String maxlength_) { get().attr("maxlength", maxlength_); return get(); } + + default T withCondMaxlength(final boolean enable, final String maxlength_) { + if (enable) { + get().attr("maxlength", maxlength_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IMedia.java b/src/main/java/j2html/tags/attributes/IMedia.java index 5c52ed54..45bdd7a2 100644 --- a/src/main/java/j2html/tags/attributes/IMedia.java +++ b/src/main/java/j2html/tags/attributes/IMedia.java @@ -7,4 +7,11 @@ default T withMedia(final String media_) { get().attr("media", media_); return get(); } + + default T withCondMedia(final boolean enable, final String media_) { + if (enable) { + get().attr("media", media_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IMethod.java b/src/main/java/j2html/tags/attributes/IMethod.java index f599a1bc..823e133b 100644 --- a/src/main/java/j2html/tags/attributes/IMethod.java +++ b/src/main/java/j2html/tags/attributes/IMethod.java @@ -7,4 +7,11 @@ default T withMethod(final String method_) { get().attr("method", method_); return get(); } + + default T withCondMethod(final boolean enable, final String method_) { + if (enable) { + get().attr("method", method_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IMin.java b/src/main/java/j2html/tags/attributes/IMin.java index 6b87d43d..95e826f4 100644 --- a/src/main/java/j2html/tags/attributes/IMin.java +++ b/src/main/java/j2html/tags/attributes/IMin.java @@ -7,4 +7,11 @@ default T withMin(final String min_) { get().attr("min", min_); return get(); } + + default T withCondMin(final boolean enable, final String min_) { + if (enable) { + get().attr("min", min_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IMultiple.java b/src/main/java/j2html/tags/attributes/IMultiple.java index f861bfc1..4b38cfd7 100644 --- a/src/main/java/j2html/tags/attributes/IMultiple.java +++ b/src/main/java/j2html/tags/attributes/IMultiple.java @@ -7,4 +7,11 @@ default T withMultiple(final String multiple_) { get().attr("multiple", multiple_); return get(); } + + default T withCondMultiple(final boolean enable, final String multiple_) { + if (enable) { + get().attr("multiple", multiple_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IMuted.java b/src/main/java/j2html/tags/attributes/IMuted.java index 4b1a72e4..aad5eb89 100644 --- a/src/main/java/j2html/tags/attributes/IMuted.java +++ b/src/main/java/j2html/tags/attributes/IMuted.java @@ -7,4 +7,11 @@ default T withMuted(final String muted_) { get().attr("muted", muted_); return get(); } + + default T withCondMuted(final boolean enable, final String muted_) { + if (enable) { + get().attr("muted", muted_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IName.java b/src/main/java/j2html/tags/attributes/IName.java index 564ec01a..ac615d7a 100644 --- a/src/main/java/j2html/tags/attributes/IName.java +++ b/src/main/java/j2html/tags/attributes/IName.java @@ -7,4 +7,11 @@ default T withName(final String name_) { get().attr("name", name_); return get(); } + + default T withCondName(final boolean enable, final String name_) { + if (enable) { + get().attr("name", name_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/INovalidate.java b/src/main/java/j2html/tags/attributes/INovalidate.java index fefc7174..26f72390 100644 --- a/src/main/java/j2html/tags/attributes/INovalidate.java +++ b/src/main/java/j2html/tags/attributes/INovalidate.java @@ -7,4 +7,11 @@ default T withNovalidate(final String novalidate_) { get().attr("novalidate", novalidate_); return get(); } + + default T withCondNovalidate(final boolean enable, final String novalidate_) { + if (enable) { + get().attr("novalidate", novalidate_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnabort.java b/src/main/java/j2html/tags/attributes/IOnabort.java index 7046c355..be633222 100644 --- a/src/main/java/j2html/tags/attributes/IOnabort.java +++ b/src/main/java/j2html/tags/attributes/IOnabort.java @@ -7,4 +7,11 @@ default T withOnabort(final String onabort_) { get().attr("onabort", onabort_); return get(); } + + default T withCondOnabort(final boolean enable, final String onabort_) { + if (enable) { + get().attr("onabort", onabort_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnafterprint.java b/src/main/java/j2html/tags/attributes/IOnafterprint.java index d4a39d02..6d97565e 100644 --- a/src/main/java/j2html/tags/attributes/IOnafterprint.java +++ b/src/main/java/j2html/tags/attributes/IOnafterprint.java @@ -7,4 +7,11 @@ default T withOnafterprint(final String onafterprint_) { get().attr("onafterprint", onafterprint_); return get(); } + + default T withCondOnafterprint(final boolean enable, final String onafterprint_) { + if (enable) { + get().attr("onafterprint", onafterprint_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnbeforeprint.java b/src/main/java/j2html/tags/attributes/IOnbeforeprint.java index c66490c7..5fd70252 100644 --- a/src/main/java/j2html/tags/attributes/IOnbeforeprint.java +++ b/src/main/java/j2html/tags/attributes/IOnbeforeprint.java @@ -7,4 +7,11 @@ default T withOnbeforeprint(final String onbeforeprint_) { get().attr("onbeforeprint", onbeforeprint_); return get(); } + + default T withCondOnbeforeprint(final boolean enable, final String onbeforeprint_) { + if (enable) { + get().attr("onbeforeprint", onbeforeprint_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnbeforeunload.java b/src/main/java/j2html/tags/attributes/IOnbeforeunload.java index 5d02d863..08d8ec9e 100644 --- a/src/main/java/j2html/tags/attributes/IOnbeforeunload.java +++ b/src/main/java/j2html/tags/attributes/IOnbeforeunload.java @@ -7,4 +7,11 @@ default T withOnbeforeunload(final String onbeforeunload_) { get().attr("onbeforeunload", onbeforeunload_); return get(); } + + default T withCondOnbeforeunload(final boolean enable, final String onbeforeunload_) { + if (enable) { + get().attr("onbeforeunload", onbeforeunload_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOncanplay.java b/src/main/java/j2html/tags/attributes/IOncanplay.java index 80a8eb43..bb05b461 100644 --- a/src/main/java/j2html/tags/attributes/IOncanplay.java +++ b/src/main/java/j2html/tags/attributes/IOncanplay.java @@ -7,4 +7,11 @@ default T withOncanplay(final String oncanplay_) { get().attr("oncanplay", oncanplay_); return get(); } + + default T withCondOncanplay(final boolean enable, final String oncanplay_) { + if (enable) { + get().attr("oncanplay", oncanplay_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOncanplaythrough.java b/src/main/java/j2html/tags/attributes/IOncanplaythrough.java index 57f7ad25..30c905a5 100644 --- a/src/main/java/j2html/tags/attributes/IOncanplaythrough.java +++ b/src/main/java/j2html/tags/attributes/IOncanplaythrough.java @@ -7,4 +7,11 @@ default T withOncanplaythrough(final String oncanplaythrough_) { get().attr("oncanplaythrough", oncanplaythrough_); return get(); } + + default T withCondOncanplaythrough(final boolean enable, final String oncanplaythrough_) { + if (enable) { + get().attr("oncanplaythrough", oncanplaythrough_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOncuechange.java b/src/main/java/j2html/tags/attributes/IOncuechange.java index 8167ce65..5953e88b 100644 --- a/src/main/java/j2html/tags/attributes/IOncuechange.java +++ b/src/main/java/j2html/tags/attributes/IOncuechange.java @@ -7,4 +7,11 @@ default T withOncuechange(final String oncuechange_) { get().attr("oncuechange", oncuechange_); return get(); } + + default T withCondOncuechange(final boolean enable, final String oncuechange_) { + if (enable) { + get().attr("oncuechange", oncuechange_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOndurationchange.java b/src/main/java/j2html/tags/attributes/IOndurationchange.java index 867da2a0..07a79cb6 100644 --- a/src/main/java/j2html/tags/attributes/IOndurationchange.java +++ b/src/main/java/j2html/tags/attributes/IOndurationchange.java @@ -7,4 +7,11 @@ default T withOndurationchange(final String ondurationchange_) { get().attr("ondurationchange", ondurationchange_); return get(); } + + default T withCondOndurationchange(final boolean enable, final String ondurationchange_) { + if (enable) { + get().attr("ondurationchange", ondurationchange_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnemptied.java b/src/main/java/j2html/tags/attributes/IOnemptied.java index 71a904a6..f89ab788 100644 --- a/src/main/java/j2html/tags/attributes/IOnemptied.java +++ b/src/main/java/j2html/tags/attributes/IOnemptied.java @@ -7,4 +7,11 @@ default T withOnemptied(final String onemptied_) { get().attr("onemptied", onemptied_); return get(); } + + default T withCondOnemptied(final boolean enable, final String onemptied_) { + if (enable) { + get().attr("onemptied", onemptied_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnended.java b/src/main/java/j2html/tags/attributes/IOnended.java index 42a6db4b..0e143fc3 100644 --- a/src/main/java/j2html/tags/attributes/IOnended.java +++ b/src/main/java/j2html/tags/attributes/IOnended.java @@ -7,4 +7,11 @@ default T withOnended(final String onended_) { get().attr("onended", onended_); return get(); } + + default T withCondOnended(final boolean enable, final String onended_) { + if (enable) { + get().attr("onended", onended_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnerror.java b/src/main/java/j2html/tags/attributes/IOnerror.java index 029d60b2..737587c1 100644 --- a/src/main/java/j2html/tags/attributes/IOnerror.java +++ b/src/main/java/j2html/tags/attributes/IOnerror.java @@ -7,4 +7,11 @@ default T withOnerror(final String onerror_) { get().attr("onerror", onerror_); return get(); } + + default T withCondOnerror(final boolean enable, final String onerror_) { + if (enable) { + get().attr("onerror", onerror_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnhashchange.java b/src/main/java/j2html/tags/attributes/IOnhashchange.java index 1b6a73b7..23f4e767 100644 --- a/src/main/java/j2html/tags/attributes/IOnhashchange.java +++ b/src/main/java/j2html/tags/attributes/IOnhashchange.java @@ -7,4 +7,11 @@ default T withOnhashchange(final String onhashchange_) { get().attr("onhashchange", onhashchange_); return get(); } + + default T withCondOnhashchange(final boolean enable, final String onhashchange_) { + if (enable) { + get().attr("onhashchange", onhashchange_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnload.java b/src/main/java/j2html/tags/attributes/IOnload.java index 9f98a5df..3d9f18b8 100644 --- a/src/main/java/j2html/tags/attributes/IOnload.java +++ b/src/main/java/j2html/tags/attributes/IOnload.java @@ -7,4 +7,11 @@ default T withOnload(final String onload_) { get().attr("onload", onload_); return get(); } + + default T withCondOnload(final boolean enable, final String onload_) { + if (enable) { + get().attr("onload", onload_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnloadeddata.java b/src/main/java/j2html/tags/attributes/IOnloadeddata.java index c8e72ee2..b50f41fc 100644 --- a/src/main/java/j2html/tags/attributes/IOnloadeddata.java +++ b/src/main/java/j2html/tags/attributes/IOnloadeddata.java @@ -7,4 +7,11 @@ default T withOnloadeddata(final String onloadeddata_) { get().attr("onloadeddata", onloadeddata_); return get(); } + + default T withCondOnloadeddata(final boolean enable, final String onloadeddata_) { + if (enable) { + get().attr("onloadeddata", onloadeddata_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnloadedmetadata.java b/src/main/java/j2html/tags/attributes/IOnloadedmetadata.java index 031050eb..386e1de6 100644 --- a/src/main/java/j2html/tags/attributes/IOnloadedmetadata.java +++ b/src/main/java/j2html/tags/attributes/IOnloadedmetadata.java @@ -7,4 +7,11 @@ default T withOnloadedmetadata(final String onloadedmetadata_) { get().attr("onloadedmetadata", onloadedmetadata_); return get(); } + + default T withCondOnloadedmetadata(final boolean enable, final String onloadedmetadata_) { + if (enable) { + get().attr("onloadedmetadata", onloadedmetadata_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnloadstart.java b/src/main/java/j2html/tags/attributes/IOnloadstart.java index 27f7f41e..1a151398 100644 --- a/src/main/java/j2html/tags/attributes/IOnloadstart.java +++ b/src/main/java/j2html/tags/attributes/IOnloadstart.java @@ -7,4 +7,11 @@ default T withOnloadstart(final String onloadstart_) { get().attr("onloadstart", onloadstart_); return get(); } + + default T withCondOnloadstart(final boolean enable, final String onloadstart_) { + if (enable) { + get().attr("onloadstart", onloadstart_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnoffline.java b/src/main/java/j2html/tags/attributes/IOnoffline.java index b56dbf57..0f0b437d 100644 --- a/src/main/java/j2html/tags/attributes/IOnoffline.java +++ b/src/main/java/j2html/tags/attributes/IOnoffline.java @@ -7,4 +7,11 @@ default T withOnoffline(final String onoffline_) { get().attr("onoffline", onoffline_); return get(); } + + default T withCondOnoffline(final boolean enable, final String onoffline_) { + if (enable) { + get().attr("onoffline", onoffline_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnonline.java b/src/main/java/j2html/tags/attributes/IOnonline.java index 6b3420b0..c634b60a 100644 --- a/src/main/java/j2html/tags/attributes/IOnonline.java +++ b/src/main/java/j2html/tags/attributes/IOnonline.java @@ -7,4 +7,11 @@ default T withOnonline(final String ononline_) { get().attr("ononline", ononline_); return get(); } + + default T withCondOnonline(final boolean enable, final String ononline_) { + if (enable) { + get().attr("ononline", ononline_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnpagehide.java b/src/main/java/j2html/tags/attributes/IOnpagehide.java index 144b2f51..1437875b 100644 --- a/src/main/java/j2html/tags/attributes/IOnpagehide.java +++ b/src/main/java/j2html/tags/attributes/IOnpagehide.java @@ -7,4 +7,11 @@ default T withOnpagehide(final String onpagehide_) { get().attr("onpagehide", onpagehide_); return get(); } + + default T withCondOnpagehide(final boolean enable, final String onpagehide_) { + if (enable) { + get().attr("onpagehide", onpagehide_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnpageshow.java b/src/main/java/j2html/tags/attributes/IOnpageshow.java index 486bc7dc..5e76af20 100644 --- a/src/main/java/j2html/tags/attributes/IOnpageshow.java +++ b/src/main/java/j2html/tags/attributes/IOnpageshow.java @@ -7,4 +7,11 @@ default T withOnpageshow(final String onpageshow_) { get().attr("onpageshow", onpageshow_); return get(); } + + default T withCondOnpageshow(final boolean enable, final String onpageshow_) { + if (enable) { + get().attr("onpageshow", onpageshow_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnpause.java b/src/main/java/j2html/tags/attributes/IOnpause.java index 178ed334..a4edf3a6 100644 --- a/src/main/java/j2html/tags/attributes/IOnpause.java +++ b/src/main/java/j2html/tags/attributes/IOnpause.java @@ -7,4 +7,11 @@ default T withOnpause(final String onpause_) { get().attr("onpause", onpause_); return get(); } + + default T withCondOnpause(final boolean enable, final String onpause_) { + if (enable) { + get().attr("onpause", onpause_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnplay.java b/src/main/java/j2html/tags/attributes/IOnplay.java index 4ab2777e..5a0ba60b 100644 --- a/src/main/java/j2html/tags/attributes/IOnplay.java +++ b/src/main/java/j2html/tags/attributes/IOnplay.java @@ -7,4 +7,11 @@ default T withOnplay(final String onplay_) { get().attr("onplay", onplay_); return get(); } + + default T withCondOnplay(final boolean enable, final String onplay_) { + if (enable) { + get().attr("onplay", onplay_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnplaying.java b/src/main/java/j2html/tags/attributes/IOnplaying.java index d42ffa48..22e4281b 100644 --- a/src/main/java/j2html/tags/attributes/IOnplaying.java +++ b/src/main/java/j2html/tags/attributes/IOnplaying.java @@ -7,4 +7,11 @@ default T withOnplaying(final String onplaying_) { get().attr("onplaying", onplaying_); return get(); } + + default T withCondOnplaying(final boolean enable, final String onplaying_) { + if (enable) { + get().attr("onplaying", onplaying_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnpopstate.java b/src/main/java/j2html/tags/attributes/IOnpopstate.java index 8417921d..73d45e1f 100644 --- a/src/main/java/j2html/tags/attributes/IOnpopstate.java +++ b/src/main/java/j2html/tags/attributes/IOnpopstate.java @@ -7,4 +7,11 @@ default T withOnpopstate(final String onpopstate_) { get().attr("onpopstate", onpopstate_); return get(); } + + default T withCondOnpopstate(final boolean enable, final String onpopstate_) { + if (enable) { + get().attr("onpopstate", onpopstate_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnprogress.java b/src/main/java/j2html/tags/attributes/IOnprogress.java index 96ccec78..5d427fdd 100644 --- a/src/main/java/j2html/tags/attributes/IOnprogress.java +++ b/src/main/java/j2html/tags/attributes/IOnprogress.java @@ -7,4 +7,11 @@ default T withOnprogress(final String onprogress_) { get().attr("onprogress", onprogress_); return get(); } + + default T withCondOnprogress(final boolean enable, final String onprogress_) { + if (enable) { + get().attr("onprogress", onprogress_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnratechange.java b/src/main/java/j2html/tags/attributes/IOnratechange.java index 7a07dc7e..1bc4876e 100644 --- a/src/main/java/j2html/tags/attributes/IOnratechange.java +++ b/src/main/java/j2html/tags/attributes/IOnratechange.java @@ -7,4 +7,11 @@ default T withOnratechange(final String onratechange_) { get().attr("onratechange", onratechange_); return get(); } + + default T withCondOnratechange(final boolean enable, final String onratechange_) { + if (enable) { + get().attr("onratechange", onratechange_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnreset.java b/src/main/java/j2html/tags/attributes/IOnreset.java index 0c6a062d..99508fdf 100644 --- a/src/main/java/j2html/tags/attributes/IOnreset.java +++ b/src/main/java/j2html/tags/attributes/IOnreset.java @@ -7,4 +7,11 @@ default T withOnreset(final String onreset_) { get().attr("onreset", onreset_); return get(); } + + default T withCondOnreset(final boolean enable, final String onreset_) { + if (enable) { + get().attr("onreset", onreset_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnresize.java b/src/main/java/j2html/tags/attributes/IOnresize.java index d900224e..e5e4986b 100644 --- a/src/main/java/j2html/tags/attributes/IOnresize.java +++ b/src/main/java/j2html/tags/attributes/IOnresize.java @@ -7,4 +7,11 @@ default T withOnresize(final String onresize_) { get().attr("onresize", onresize_); return get(); } + + default T withCondOnresize(final boolean enable, final String onresize_) { + if (enable) { + get().attr("onresize", onresize_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnsearch.java b/src/main/java/j2html/tags/attributes/IOnsearch.java index d10de27f..236e9538 100644 --- a/src/main/java/j2html/tags/attributes/IOnsearch.java +++ b/src/main/java/j2html/tags/attributes/IOnsearch.java @@ -7,4 +7,11 @@ default T withOnsearch(final String onsearch_) { get().attr("onsearch", onsearch_); return get(); } + + default T withCondOnsearch(final boolean enable, final String onsearch_) { + if (enable) { + get().attr("onsearch", onsearch_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnseeked.java b/src/main/java/j2html/tags/attributes/IOnseeked.java index 97407dd8..8c06ee3c 100644 --- a/src/main/java/j2html/tags/attributes/IOnseeked.java +++ b/src/main/java/j2html/tags/attributes/IOnseeked.java @@ -7,4 +7,11 @@ default T withOnseeked(final String onseeked_) { get().attr("onseeked", onseeked_); return get(); } + + default T withCondOnseeked(final boolean enable, final String onseeked_) { + if (enable) { + get().attr("onseeked", onseeked_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnseeking.java b/src/main/java/j2html/tags/attributes/IOnseeking.java index a39352c5..80039d3b 100644 --- a/src/main/java/j2html/tags/attributes/IOnseeking.java +++ b/src/main/java/j2html/tags/attributes/IOnseeking.java @@ -7,4 +7,11 @@ default T withOnseeking(final String onseeking_) { get().attr("onseeking", onseeking_); return get(); } + + default T withCondOnseeking(final boolean enable, final String onseeking_) { + if (enable) { + get().attr("onseeking", onseeking_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnstalled.java b/src/main/java/j2html/tags/attributes/IOnstalled.java index aed9e870..53b6124e 100644 --- a/src/main/java/j2html/tags/attributes/IOnstalled.java +++ b/src/main/java/j2html/tags/attributes/IOnstalled.java @@ -7,4 +7,11 @@ default T withOnstalled(final String onstalled_) { get().attr("onstalled", onstalled_); return get(); } + + default T withCondOnstalled(final boolean enable, final String onstalled_) { + if (enable) { + get().attr("onstalled", onstalled_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnstorage.java b/src/main/java/j2html/tags/attributes/IOnstorage.java index de3f1353..70be0a15 100644 --- a/src/main/java/j2html/tags/attributes/IOnstorage.java +++ b/src/main/java/j2html/tags/attributes/IOnstorage.java @@ -7,4 +7,11 @@ default T withOnstorage(final String onstorage_) { get().attr("onstorage", onstorage_); return get(); } + + default T withCondOnstorage(final boolean enable, final String onstorage_) { + if (enable) { + get().attr("onstorage", onstorage_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnsubmit.java b/src/main/java/j2html/tags/attributes/IOnsubmit.java index 4aca1d77..c9cb03be 100644 --- a/src/main/java/j2html/tags/attributes/IOnsubmit.java +++ b/src/main/java/j2html/tags/attributes/IOnsubmit.java @@ -7,4 +7,11 @@ default T withOnsubmit(final String onsubmit_) { get().attr("onsubmit", onsubmit_); return get(); } + + default T withCondOnsubmit(final boolean enable, final String onsubmit_) { + if (enable) { + get().attr("onsubmit", onsubmit_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnsuspend.java b/src/main/java/j2html/tags/attributes/IOnsuspend.java index fc27803b..ba008c03 100644 --- a/src/main/java/j2html/tags/attributes/IOnsuspend.java +++ b/src/main/java/j2html/tags/attributes/IOnsuspend.java @@ -7,4 +7,11 @@ default T withOnsuspend(final String onsuspend_) { get().attr("onsuspend", onsuspend_); return get(); } + + default T withCondOnsuspend(final boolean enable, final String onsuspend_) { + if (enable) { + get().attr("onsuspend", onsuspend_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOntimeupdate.java b/src/main/java/j2html/tags/attributes/IOntimeupdate.java index 10414531..ac5b67ec 100644 --- a/src/main/java/j2html/tags/attributes/IOntimeupdate.java +++ b/src/main/java/j2html/tags/attributes/IOntimeupdate.java @@ -7,4 +7,11 @@ default T withOntimeupdate(final String ontimeupdate_) { get().attr("ontimeupdate", ontimeupdate_); return get(); } + + default T withCondOntimeupdate(final boolean enable, final String ontimeupdate_) { + if (enable) { + get().attr("ontimeupdate", ontimeupdate_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOntoggle.java b/src/main/java/j2html/tags/attributes/IOntoggle.java index 36052c96..91aeea36 100644 --- a/src/main/java/j2html/tags/attributes/IOntoggle.java +++ b/src/main/java/j2html/tags/attributes/IOntoggle.java @@ -7,4 +7,11 @@ default T withOntoggle(final String ontoggle_) { get().attr("ontoggle", ontoggle_); return get(); } + + default T withCondOntoggle(final boolean enable, final String ontoggle_) { + if (enable) { + get().attr("ontoggle", ontoggle_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnunload.java b/src/main/java/j2html/tags/attributes/IOnunload.java index 9c5278e1..1a87fdea 100644 --- a/src/main/java/j2html/tags/attributes/IOnunload.java +++ b/src/main/java/j2html/tags/attributes/IOnunload.java @@ -7,4 +7,11 @@ default T withOnunload(final String onunload_) { get().attr("onunload", onunload_); return get(); } + + default T withCondOnunload(final boolean enable, final String onunload_) { + if (enable) { + get().attr("onunload", onunload_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnvolumechanged.java b/src/main/java/j2html/tags/attributes/IOnvolumechanged.java index 2c130b4c..16115a86 100644 --- a/src/main/java/j2html/tags/attributes/IOnvolumechanged.java +++ b/src/main/java/j2html/tags/attributes/IOnvolumechanged.java @@ -7,4 +7,11 @@ default T withOnvolumechanged(final String onvolumechanged_) { get().attr("onvolumechanged", onvolumechanged_); return get(); } + + default T withCondOnvolumechanged(final boolean enable, final String onvolumechanged_) { + if (enable) { + get().attr("onvolumechanged", onvolumechanged_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOnwaiting.java b/src/main/java/j2html/tags/attributes/IOnwaiting.java index 356695a2..84cf74f8 100644 --- a/src/main/java/j2html/tags/attributes/IOnwaiting.java +++ b/src/main/java/j2html/tags/attributes/IOnwaiting.java @@ -7,4 +7,11 @@ default T withOnwaiting(final String onwaiting_) { get().attr("onwaiting", onwaiting_); return get(); } + + default T withCondOnwaiting(final boolean enable, final String onwaiting_) { + if (enable) { + get().attr("onwaiting", onwaiting_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOpen.java b/src/main/java/j2html/tags/attributes/IOpen.java index 29991c74..edf3ed16 100644 --- a/src/main/java/j2html/tags/attributes/IOpen.java +++ b/src/main/java/j2html/tags/attributes/IOpen.java @@ -7,4 +7,11 @@ default T withOpen(final String open_) { get().attr("open", open_); return get(); } + + default T withCondOpen(final boolean enable, final String open_) { + if (enable) { + get().attr("open", open_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IOptimum.java b/src/main/java/j2html/tags/attributes/IOptimum.java index 334ca3f9..b538fcd4 100644 --- a/src/main/java/j2html/tags/attributes/IOptimum.java +++ b/src/main/java/j2html/tags/attributes/IOptimum.java @@ -7,4 +7,11 @@ default T withOptimum(final String optimum_) { get().attr("optimum", optimum_); return get(); } + + default T withCondOptimum(final boolean enable, final String optimum_) { + if (enable) { + get().attr("optimum", optimum_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IPattern.java b/src/main/java/j2html/tags/attributes/IPattern.java index caaffa68..dbcda5fe 100644 --- a/src/main/java/j2html/tags/attributes/IPattern.java +++ b/src/main/java/j2html/tags/attributes/IPattern.java @@ -7,4 +7,11 @@ default T withPattern(final String pattern_) { get().attr("pattern", pattern_); return get(); } + + default T withCondPattern(final boolean enable, final String pattern_) { + if (enable) { + get().attr("pattern", pattern_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IPlaceholder.java b/src/main/java/j2html/tags/attributes/IPlaceholder.java index 18457506..a6f34ee9 100644 --- a/src/main/java/j2html/tags/attributes/IPlaceholder.java +++ b/src/main/java/j2html/tags/attributes/IPlaceholder.java @@ -7,4 +7,11 @@ default T withPlaceholder(final String placeholder_) { get().attr("placeholder", placeholder_); return get(); } + + default T withCondPlaceholder(final boolean enable, final String placeholder_) { + if (enable) { + get().attr("placeholder", placeholder_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IPoster.java b/src/main/java/j2html/tags/attributes/IPoster.java index 5d775e53..65d8eea0 100644 --- a/src/main/java/j2html/tags/attributes/IPoster.java +++ b/src/main/java/j2html/tags/attributes/IPoster.java @@ -7,4 +7,11 @@ default T withPoster(final String poster_) { get().attr("poster", poster_); return get(); } + + default T withCondPoster(final boolean enable, final String poster_) { + if (enable) { + get().attr("poster", poster_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IPreload.java b/src/main/java/j2html/tags/attributes/IPreload.java index fb4cb226..2545c20f 100644 --- a/src/main/java/j2html/tags/attributes/IPreload.java +++ b/src/main/java/j2html/tags/attributes/IPreload.java @@ -7,4 +7,11 @@ default T withPreload(final String preload_) { get().attr("preload", preload_); return get(); } + + default T withCondPreload(final boolean enable, final String preload_) { + if (enable) { + get().attr("preload", preload_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IReadonly.java b/src/main/java/j2html/tags/attributes/IReadonly.java index 77115ca3..d7c5e7a5 100644 --- a/src/main/java/j2html/tags/attributes/IReadonly.java +++ b/src/main/java/j2html/tags/attributes/IReadonly.java @@ -7,4 +7,11 @@ default T withReadonly(final String readonly_) { get().attr("readonly", readonly_); return get(); } + + default T withCondReadonly(final boolean enable, final String readonly_) { + if (enable) { + get().attr("readonly", readonly_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IRel.java b/src/main/java/j2html/tags/attributes/IRel.java index 6d857a1e..38c0e135 100644 --- a/src/main/java/j2html/tags/attributes/IRel.java +++ b/src/main/java/j2html/tags/attributes/IRel.java @@ -7,4 +7,11 @@ default T withRel(final String rel_) { get().attr("rel", rel_); return get(); } + + default T withCondRel(final boolean enable, final String rel_) { + if (enable) { + get().attr("rel", rel_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IRequired.java b/src/main/java/j2html/tags/attributes/IRequired.java index c065bae5..e78d065d 100644 --- a/src/main/java/j2html/tags/attributes/IRequired.java +++ b/src/main/java/j2html/tags/attributes/IRequired.java @@ -3,8 +3,15 @@ import j2html.tags.Tag; public interface IRequired extends IInstance { - default T withRequired(final String required_) { - get().attr("required", required_); + default T isRequired() { + get().attr("required"); + return get(); + } + + default T withCondRequired(final boolean enable) { + if (enable) { + get().attr("required"); + } return get(); } } diff --git a/src/main/java/j2html/tags/attributes/IReversed.java b/src/main/java/j2html/tags/attributes/IReversed.java index 7adb9ef8..7e352217 100644 --- a/src/main/java/j2html/tags/attributes/IReversed.java +++ b/src/main/java/j2html/tags/attributes/IReversed.java @@ -7,4 +7,11 @@ default T withReversed(final String reversed_) { get().attr("reversed", reversed_); return get(); } + + default T withCondReversed(final boolean enable, final String reversed_) { + if (enable) { + get().attr("reversed", reversed_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IRows.java b/src/main/java/j2html/tags/attributes/IRows.java index c4bf997d..55ae367b 100644 --- a/src/main/java/j2html/tags/attributes/IRows.java +++ b/src/main/java/j2html/tags/attributes/IRows.java @@ -7,4 +7,11 @@ default T withRows(final String rows_) { get().attr("rows", rows_); return get(); } + + default T withCondRows(final boolean enable, final String rows_) { + if (enable) { + get().attr("rows", rows_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IRowspan.java b/src/main/java/j2html/tags/attributes/IRowspan.java index 58c69fd7..2c9829aa 100644 --- a/src/main/java/j2html/tags/attributes/IRowspan.java +++ b/src/main/java/j2html/tags/attributes/IRowspan.java @@ -7,4 +7,11 @@ default T withRowspan(final String rowspan_) { get().attr("rowspan", rowspan_); return get(); } + + default T withCondRowspan(final boolean enable, final String rowspan_) { + if (enable) { + get().attr("rowspan", rowspan_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/ISandbox.java b/src/main/java/j2html/tags/attributes/ISandbox.java index dc266b09..3589438e 100644 --- a/src/main/java/j2html/tags/attributes/ISandbox.java +++ b/src/main/java/j2html/tags/attributes/ISandbox.java @@ -7,4 +7,11 @@ default T withSandbox(final String sandbox_) { get().attr("sandbox", sandbox_); return get(); } + + default T withCondSandbox(final boolean enable, final String sandbox_) { + if (enable) { + get().attr("sandbox", sandbox_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IScope.java b/src/main/java/j2html/tags/attributes/IScope.java index b518e006..a3dc225c 100644 --- a/src/main/java/j2html/tags/attributes/IScope.java +++ b/src/main/java/j2html/tags/attributes/IScope.java @@ -7,4 +7,11 @@ default T withScope(final String scope_) { get().attr("scope", scope_); return get(); } + + default T withCondScope(final boolean enable, final String scope_) { + if (enable) { + get().attr("scope", scope_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/ISelected.java b/src/main/java/j2html/tags/attributes/ISelected.java index 1743741f..63b5d1fc 100644 --- a/src/main/java/j2html/tags/attributes/ISelected.java +++ b/src/main/java/j2html/tags/attributes/ISelected.java @@ -7,4 +7,11 @@ default T withSelected(final String selected_) { get().attr("selected", selected_); return get(); } + + default T withCondSelected(final boolean enable, final String selected_) { + if (enable) { + get().attr("selected", selected_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IShape.java b/src/main/java/j2html/tags/attributes/IShape.java index 2760f215..cbfcc303 100644 --- a/src/main/java/j2html/tags/attributes/IShape.java +++ b/src/main/java/j2html/tags/attributes/IShape.java @@ -7,4 +7,11 @@ default T withShape(final String shape_) { get().attr("shape", shape_); return get(); } + + default T withCondShape(final boolean enable, final String shape_) { + if (enable) { + get().attr("shape", shape_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/ISize.java b/src/main/java/j2html/tags/attributes/ISize.java index 7c2674d5..4798131e 100644 --- a/src/main/java/j2html/tags/attributes/ISize.java +++ b/src/main/java/j2html/tags/attributes/ISize.java @@ -7,4 +7,11 @@ default T withSize(final String size_) { get().attr("size", size_); return get(); } + + default T withCondSize(final boolean enable, final String size_) { + if (enable) { + get().attr("size", size_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/ISizes.java b/src/main/java/j2html/tags/attributes/ISizes.java index 24d0484d..a50070cf 100644 --- a/src/main/java/j2html/tags/attributes/ISizes.java +++ b/src/main/java/j2html/tags/attributes/ISizes.java @@ -7,4 +7,11 @@ default T withSizes(final String sizes_) { get().attr("sizes", sizes_); return get(); } + + default T withCondSizes(final boolean enable, final String sizes_) { + if (enable) { + get().attr("sizes", sizes_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/ISpan.java b/src/main/java/j2html/tags/attributes/ISpan.java index e973144e..a4b715a9 100644 --- a/src/main/java/j2html/tags/attributes/ISpan.java +++ b/src/main/java/j2html/tags/attributes/ISpan.java @@ -7,4 +7,11 @@ default T withSpan(final String span_) { get().attr("span", span_); return get(); } + + default T withCondSpan(final boolean enable, final String span_) { + if (enable) { + get().attr("span", span_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/ISpellcheck.java b/src/main/java/j2html/tags/attributes/ISpellcheck.java deleted file mode 100644 index b4cc28d2..00000000 --- a/src/main/java/j2html/tags/attributes/ISpellcheck.java +++ /dev/null @@ -1,10 +0,0 @@ -package j2html.tags.attributes; - -import j2html.tags.Tag; - -public interface ISpellcheck extends IInstance { - default T withSpellcheck(final String spellcheck_) { - get().attr("spellcheck", spellcheck_); - return get(); - } -} diff --git a/src/main/java/j2html/tags/attributes/ISrc.java b/src/main/java/j2html/tags/attributes/ISrc.java index 4adca54a..f12c30b9 100644 --- a/src/main/java/j2html/tags/attributes/ISrc.java +++ b/src/main/java/j2html/tags/attributes/ISrc.java @@ -7,4 +7,11 @@ default T withSrc(final String src_) { get().attr("src", src_); return get(); } + + default T withCondSrc(final boolean enable, final String src_) { + if (enable) { + get().attr("src", src_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/ISrcdoc.java b/src/main/java/j2html/tags/attributes/ISrcdoc.java index 5dda59c7..9976c77d 100644 --- a/src/main/java/j2html/tags/attributes/ISrcdoc.java +++ b/src/main/java/j2html/tags/attributes/ISrcdoc.java @@ -7,4 +7,11 @@ default T withSrcdoc(final String srcdoc_) { get().attr("srcdoc", srcdoc_); return get(); } + + default T withCondSrcdoc(final boolean enable, final String srcdoc_) { + if (enable) { + get().attr("srcdoc", srcdoc_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/ISrclang.java b/src/main/java/j2html/tags/attributes/ISrclang.java index 20bf6886..0399017d 100644 --- a/src/main/java/j2html/tags/attributes/ISrclang.java +++ b/src/main/java/j2html/tags/attributes/ISrclang.java @@ -7,4 +7,11 @@ default T withSrclang(final String srclang_) { get().attr("srclang", srclang_); return get(); } + + default T withCondSrclang(final boolean enable, final String srclang_) { + if (enable) { + get().attr("srclang", srclang_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/ISrcset.java b/src/main/java/j2html/tags/attributes/ISrcset.java index 30d3b069..b32af208 100644 --- a/src/main/java/j2html/tags/attributes/ISrcset.java +++ b/src/main/java/j2html/tags/attributes/ISrcset.java @@ -7,4 +7,11 @@ default T withSrcset(final String srcset_) { get().attr("srcset", srcset_); return get(); } + + default T withCondSrcset(final boolean enable, final String srcset_) { + if (enable) { + get().attr("srcset", srcset_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IStart.java b/src/main/java/j2html/tags/attributes/IStart.java index 6af66055..d46a1ddd 100644 --- a/src/main/java/j2html/tags/attributes/IStart.java +++ b/src/main/java/j2html/tags/attributes/IStart.java @@ -7,4 +7,11 @@ default T withStart(final String start_) { get().attr("start", start_); return get(); } + + default T withCondStart(final boolean enable, final String start_) { + if (enable) { + get().attr("start", start_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IStep.java b/src/main/java/j2html/tags/attributes/IStep.java index 5ed2d895..5f474d18 100644 --- a/src/main/java/j2html/tags/attributes/IStep.java +++ b/src/main/java/j2html/tags/attributes/IStep.java @@ -7,4 +7,11 @@ default T withStep(final String step_) { get().attr("step", step_); return get(); } + + default T withCondStep(final boolean enable, final String step_) { + if (enable) { + get().attr("step", step_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/ITarget.java b/src/main/java/j2html/tags/attributes/ITarget.java index b8b9e0cb..d5ff1a75 100644 --- a/src/main/java/j2html/tags/attributes/ITarget.java +++ b/src/main/java/j2html/tags/attributes/ITarget.java @@ -7,4 +7,11 @@ default T withTarget(final String target_) { get().attr("target", target_); return get(); } + + default T withCondTarget(final boolean enable, final String target_) { + if (enable) { + get().attr("target", target_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IType.java b/src/main/java/j2html/tags/attributes/IType.java index 3a0c96aa..dd09ec8d 100644 --- a/src/main/java/j2html/tags/attributes/IType.java +++ b/src/main/java/j2html/tags/attributes/IType.java @@ -7,4 +7,11 @@ default T withType(final String type_) { get().attr("type", type_); return get(); } + + default T withCondType(final boolean enable, final String type_) { + if (enable) { + get().attr("type", type_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IUsemap.java b/src/main/java/j2html/tags/attributes/IUsemap.java index 8bbb00c6..038f52b5 100644 --- a/src/main/java/j2html/tags/attributes/IUsemap.java +++ b/src/main/java/j2html/tags/attributes/IUsemap.java @@ -7,4 +7,11 @@ default T withUsemap(final String usemap_) { get().attr("usemap", usemap_); return get(); } + + default T withCondUsemap(final boolean enable, final String usemap_) { + if (enable) { + get().attr("usemap", usemap_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IValue.java b/src/main/java/j2html/tags/attributes/IValue.java index 60af4b60..d66357ca 100644 --- a/src/main/java/j2html/tags/attributes/IValue.java +++ b/src/main/java/j2html/tags/attributes/IValue.java @@ -7,4 +7,11 @@ default T withValue(final String value_) { get().attr("value", value_); return get(); } + + default T withCondValue(final boolean enable, final String value_) { + if (enable) { + get().attr("value", value_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IWidth.java b/src/main/java/j2html/tags/attributes/IWidth.java index 66f4ba83..06a2afb0 100644 --- a/src/main/java/j2html/tags/attributes/IWidth.java +++ b/src/main/java/j2html/tags/attributes/IWidth.java @@ -7,4 +7,11 @@ default T withWidth(final String width_) { get().attr("width", width_); return get(); } + + default T withCondWidth(final boolean enable, final String width_) { + if (enable) { + get().attr("width", width_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/attributes/IWrap.java b/src/main/java/j2html/tags/attributes/IWrap.java index 076b15e7..50b07e5e 100644 --- a/src/main/java/j2html/tags/attributes/IWrap.java +++ b/src/main/java/j2html/tags/attributes/IWrap.java @@ -7,4 +7,11 @@ default T withWrap(final String wrap_) { get().attr("wrap", wrap_); return get(); } + + default T withCondWrap(final boolean enable, final String wrap_) { + if (enable) { + get().attr("wrap", wrap_); + } + return get(); + } } diff --git a/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java b/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java index 2b252eed..ea22f203 100644 --- a/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java +++ b/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java @@ -17,7 +17,6 @@ public static void main(String[] args){ final Path path = makePath(attr.attr); final String interfaceName = interfaceNameFromAttribute(attr.attr)+""; - /* IFormAction extends IInstance @@ -48,6 +47,10 @@ private static String getPackage(){ return "package j2html.tags.attributes;\n"; } + private static String makeReturnTypeAndMethodName(final String name){ + return "default "+ "T "+name; + } + private static String getInterfaceTemplate( final String interfaceName, final Optional optExtends, @@ -89,19 +92,51 @@ default T withFormAction(String formAction){ final String attrName = interfaceNameSimple.toLowerCase(); final String paramName = attrName+"_"; + //depending on if the attribute has an argument or not, + //generate methods according to the convention in Tag.java + // arg -> with$ATTR(arg), withCond$ATTR(condition, arg) + // no arg -> is$ATTR(), withCond$ATTR(condition) + //append the 'with$ATTR' method writeAttributeMethod(interfaceNameSimple, attrD, sb, attrName, paramName); + writeAttributeMethodCond(interfaceNameSimple, attrD, sb, attrName, paramName); sb.append("}\n"); return sb.toString(); } + private static void writeAttributeMethodCond(String interfaceNameSimple, AttrD attrD, StringBuilder sb, String attrName, String paramName) { + + sb.append(makeReturnTypeAndMethodName("withCond"+interfaceNameSimple)); + + if(attrD.hasArgument){ + //add a variant where you can specify the argument + + sb.append("(final boolean enable, final String ").append(paramName).append(") {"); + + sb.append("if (enable){\n"); + sb.append("get().attr(\"").append(attrName).append("\", "+ paramName +");\n"); + sb.append("}\n"); + + sb.append("return get();\n"); + }else{ + //add a variant where you can toggle the attribute + + sb.append("(final boolean enable) {"); + sb.append("if (enable){\n"); + sb.append("get().attr(\"").append(attrName).append("\");\n"); + sb.append("}\n"); + sb.append("return get();\n"); + } + sb.append("}\n"); + } + private static void writeAttributeMethod(String interfaceNameSimple, AttrD attrD, StringBuilder sb, String attrName, String paramName) { - sb.append("default ") - .append("T "); - sb.append("with").append(interfaceNameSimple); + sb.append(makeReturnTypeAndMethodName( + ((attrD.hasArgument)?"with":"is")+interfaceNameSimple) + ); if(attrD.hasArgument){ //add a variant where you can specify the argument @@ -113,11 +148,9 @@ private static void writeAttributeMethod(String interfaceNameSimple, AttrD attrD }else{ //add a variant where you can toggle the attribute - sb.append("(final boolean ").append(paramName).append(") {") + sb.append("() {") - .append("if ("+ paramName +") {\n") - .append("get().attr(\"").append(attrName).append("\");\n") - .append("}\n") + .append("get().attr(\"").append(attrName).append("\");\n") .append("return get();\n"); } sb.append("}\n"); diff --git a/src/main/java/j2html/tags/generators/AttributesList.java b/src/main/java/j2html/tags/generators/AttributesList.java index 15f0e0f8..15f781ae 100644 --- a/src/main/java/j2html/tags/generators/AttributesList.java +++ b/src/main/java/j2html/tags/generators/AttributesList.java @@ -31,8 +31,8 @@ static List attributesDescriptive() { //"align", not supported in HTML5 new AttrD("alt", true, "area","img","input"), new AttrD("async", true, "script"), - new AttrD("autocomplete", true, "form","input"), - new AttrD("autofocus", true, "button","input","select","textarea"), + new AttrD("autocomplete", false, "form","input"), + new AttrD("autofocus", false, "button","input","select","textarea"), new AttrD("autoplay", true, "audio","video"), //"bgcolor", not supported in HTMTL5 //"border", not supported in HTML5 @@ -150,7 +150,7 @@ static List attributesDescriptive() { new AttrD("preload", true, "audio","video"), new AttrD("readonly", true, "input","textarea"), new AttrD("rel", true, "a","area","form","link"), - new AttrD("required", true, "input","select","textarea"), + new AttrD("required", false, "input","select","textarea"), new AttrD("reversed", true, "ol"), new AttrD("rows", true, "textarea"), new AttrD("rowspan", true, "td","th"), diff --git a/src/test/java/j2html/tags/ConvenienceMethodTest.java b/src/test/java/j2html/tags/ConvenienceMethodTest.java index 51c8e8b6..f293c306 100644 --- a/src/test/java/j2html/tags/ConvenienceMethodTest.java +++ b/src/test/java/j2html/tags/ConvenienceMethodTest.java @@ -15,8 +15,8 @@ public class ConvenienceMethodTest { @Test public void testAllConvenienceMethods() throws Exception { - assertThat(input().isAutoComplete().render(), is("")); - assertThat(input().isAutoFocus().render(), is("")); + assertThat(input().isAutocomplete().render(), is("")); + assertThat(input().isAutofocus().render(), is("")); assertThat(input().isHidden().render(), is("")); assertThat(input().isRequired().render(), is("")); assertThat(img().withAlt("An image").render(), is("\"An")); @@ -34,7 +34,7 @@ public void testAllConvenienceMethods() throws Exception { assertThat(a().withTitle("Title").render(), is("")); assertThat(input().attr("type","email").render(), is("")); assertThat(link().withRel("stylesheet").render(), is("")); - assertThat(link().withRole("role").render(), is("")); + assertThat(link().attr("role","role").render(), is("")); assertThat(img().withSrc("/img/test.png").render(), is("")); assertThat(input().withStep("0.1").render(), is("")); assertThat(div().withStyle("background:red;").render(), is("
")); diff --git a/src/test/java/j2html/tags/TagTest.java b/src/test/java/j2html/tags/TagTest.java index fc2cd1fd..d9f8d65e 100644 --- a/src/test/java/j2html/tags/TagTest.java +++ b/src/test/java/j2html/tags/TagTest.java @@ -46,7 +46,9 @@ public void testOpenTag() throws Exception { assertThat(testTag.renderOpenTag(), is("")); ContainerTag complexTestTag = new ContainerTag("input"); - complexTestTag.attr("type","password").withId("password").withName("password").withPlaceholder("Password").isRequired(); + complexTestTag.attr("type","password").withId("password") + .attr("name","password") + .attr("placeholder","Password").attr("required"); String expectedResult = ""; assertThat(complexTestTag.renderOpenTag(), is(expectedResult)); } From 12860b8349b373d4273c8806bf48c25fb22d27c4 Mon Sep 17 00:00:00 2001 From: pointbazaar Date: Mon, 24 Aug 2020 21:52:12 +0200 Subject: [PATCH 13/19] write tests for some custom attributes per tag and also correct some properties of some attributes --- .../java/j2html/tags/attributes/IAsync.java | 8 ++-- .../j2html/tags/attributes/IAutocomplete.java | 4 +- .../j2html/tags/attributes/IAutoplay.java | 8 ++-- .../AttributeInterfaceCodeGenerator.java | 25 ++++++++-- .../tags/generators/AttributesList.java | 4 +- .../j2html/attributes/AttrShortFormTest.java | 5 +- .../java/j2html/attributes/AttributeTest.java | 1 + .../j2html/tags/AttributesPerTagTest.java | 46 +++++++++++++++++++ 8 files changed, 82 insertions(+), 19 deletions(-) create mode 100644 src/test/java/j2html/tags/AttributesPerTagTest.java diff --git a/src/main/java/j2html/tags/attributes/IAsync.java b/src/main/java/j2html/tags/attributes/IAsync.java index edebdba8..f6125267 100644 --- a/src/main/java/j2html/tags/attributes/IAsync.java +++ b/src/main/java/j2html/tags/attributes/IAsync.java @@ -3,14 +3,14 @@ import j2html.tags.Tag; public interface IAsync extends IInstance { - default T withAsync(final String async_) { - get().attr("async", async_); + default T isAsync() { + get().attr("async"); return get(); } - default T withCondAsync(final boolean enable, final String async_) { + default T withCondAsync(final boolean enable) { if (enable) { - get().attr("async", async_); + get().attr("async"); } return get(); } diff --git a/src/main/java/j2html/tags/attributes/IAutocomplete.java b/src/main/java/j2html/tags/attributes/IAutocomplete.java index c32ec1f4..ae3709f2 100644 --- a/src/main/java/j2html/tags/attributes/IAutocomplete.java +++ b/src/main/java/j2html/tags/attributes/IAutocomplete.java @@ -4,13 +4,13 @@ public interface IAutocomplete extends IInstance { default T isAutocomplete() { - get().attr("autocomplete"); + get().attr("autocomplete", "on"); return get(); } default T withCondAutocomplete(final boolean enable) { if (enable) { - get().attr("autocomplete"); + get().attr("autocomplete", "on"); } return get(); } diff --git a/src/main/java/j2html/tags/attributes/IAutoplay.java b/src/main/java/j2html/tags/attributes/IAutoplay.java index eacdef41..f200f047 100644 --- a/src/main/java/j2html/tags/attributes/IAutoplay.java +++ b/src/main/java/j2html/tags/attributes/IAutoplay.java @@ -3,14 +3,14 @@ import j2html.tags.Tag; public interface IAutoplay extends IInstance { - default T withAutoplay(final String autoplay_) { - get().attr("autoplay", autoplay_); + default T isAutoplay() { + get().attr("autoplay"); return get(); } - default T withCondAutoplay(final boolean enable, final String autoplay_) { + default T withCondAutoplay(final boolean enable) { if (enable) { - get().attr("autoplay", autoplay_); + get().attr("autoplay"); } return get(); } diff --git a/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java b/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java index ea22f203..396405fa 100644 --- a/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java +++ b/src/main/java/j2html/tags/generators/AttributeInterfaceCodeGenerator.java @@ -106,6 +106,22 @@ default T withFormAction(String formAction){ return sb.toString(); } + private static void addAttributeNoArg(final StringBuilder sb, final String attrName){ + //generate the code to add an attribute without an argument + + //there are some special attributes + //which do take an argument, but where the argument + //is boolean (meaning on/off, yes/no and the like) + sb.append("get().attr(\""); + if(attrName.equals("autocomplete")){ + sb.append(attrName).append("\",\"on\""); + }else { + + sb.append(attrName).append("\""); + } + sb.append(");\n"); + } + private static void writeAttributeMethodCond(String interfaceNameSimple, AttrD attrD, StringBuilder sb, String attrName, String paramName) { sb.append(makeReturnTypeAndMethodName("withCond"+interfaceNameSimple)); @@ -125,7 +141,7 @@ private static void writeAttributeMethodCond(String interfaceNameSimple, AttrD a sb.append("(final boolean enable) {"); sb.append("if (enable){\n"); - sb.append("get().attr(\"").append(attrName).append("\");\n"); + addAttributeNoArg(sb, attrName); sb.append("}\n"); sb.append("return get();\n"); } @@ -148,10 +164,11 @@ private static void writeAttributeMethod(String interfaceNameSimple, AttrD attrD }else{ //add a variant where you can toggle the attribute - sb.append("() {") + sb.append("() {"); - .append("get().attr(\"").append(attrName).append("\");\n") - .append("return get();\n"); + addAttributeNoArg(sb, attrName); + + sb.append("return get();\n"); } sb.append("}\n"); } diff --git a/src/main/java/j2html/tags/generators/AttributesList.java b/src/main/java/j2html/tags/generators/AttributesList.java index 15f781ae..50f9b099 100644 --- a/src/main/java/j2html/tags/generators/AttributesList.java +++ b/src/main/java/j2html/tags/generators/AttributesList.java @@ -30,10 +30,10 @@ static List attributesDescriptive() { new AttrD("action", true, "form"), //"align", not supported in HTML5 new AttrD("alt", true, "area","img","input"), - new AttrD("async", true, "script"), + new AttrD("async", false, "script"), new AttrD("autocomplete", false, "form","input"), new AttrD("autofocus", false, "button","input","select","textarea"), - new AttrD("autoplay", true, "audio","video"), + new AttrD("autoplay", false, "audio","video"), //"bgcolor", not supported in HTMTL5 //"border", not supported in HTML5 new AttrD("charset", true, "meta","script"), diff --git a/src/test/java/j2html/attributes/AttrShortFormTest.java b/src/test/java/j2html/attributes/AttrShortFormTest.java index c2ba37ae..0b601081 100644 --- a/src/test/java/j2html/attributes/AttrShortFormTest.java +++ b/src/test/java/j2html/attributes/AttrShortFormTest.java @@ -1,9 +1,8 @@ package j2html.attributes; import org.junit.Test; -import static j2html.TagCreator.attrs; -import static j2html.TagCreator.div; -import static j2html.TagCreator.input; + +import static j2html.TagCreator.*; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; diff --git a/src/test/java/j2html/attributes/AttributeTest.java b/src/test/java/j2html/attributes/AttributeTest.java index f98b1551..4d5f9106 100644 --- a/src/test/java/j2html/attributes/AttributeTest.java +++ b/src/test/java/j2html/attributes/AttributeTest.java @@ -2,6 +2,7 @@ import j2html.tags.ContainerTag; import org.junit.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; diff --git a/src/test/java/j2html/tags/AttributesPerTagTest.java b/src/test/java/j2html/tags/AttributesPerTagTest.java new file mode 100644 index 00000000..82a2e834 --- /dev/null +++ b/src/test/java/j2html/tags/AttributesPerTagTest.java @@ -0,0 +1,46 @@ +package j2html.tags; + +import org.junit.Test; + +import static j2html.TagCreator.*; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; + +public final class AttributesPerTagTest { + + //This class should contain Tests that check + //if the generated Interface Methods indeed produce the correct HTML for + //their custom HTML Attributes. + + //TODO: WARNING: only testing .with$ATTR and .is$ATTR Methods, not the 'Cond' Variants + + @Test + public void testAttributesPerTag1(){ + + //TEST: + //accept, action, alt, async, + //autocomplete, autofocus, + //autoplay, charset, checked + assertThat(input().withAccept("image/*").render(), is("")); + + assertThat(form().withAction("/1/2").render(), is("
")); + + assertThat(img().withAlt("horse").render(), is("\"horse\"")); + + assertThat(script().isAsync().render(), is("")); + + assertThat(form().isAutocomplete().render(), is("
")); + + assertThat(input().isAutofocus().render(), is("")); + + assertThat(video().isAutoplay().render(), is("")); + + assertThat(script().withCharset("mycharset").render(), is("")); + + assertThat(input().isChecked().render(), is("")); + } + + //TODO: leaving the rest of the tests for the rest + //of the custom attributes for later, or for other people + //to possibly implement +} From c8a2787573f81d3357a41ab65d7cf8464e8dee0a Mon Sep 17 00:00:00 2001 From: pointbazaar Date: Mon, 24 Aug 2020 21:54:45 +0200 Subject: [PATCH 14/19] adjust a test which was wrong --- src/test/java/j2html/tags/ConvenienceMethodTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/j2html/tags/ConvenienceMethodTest.java b/src/test/java/j2html/tags/ConvenienceMethodTest.java index f293c306..8ac4bb72 100644 --- a/src/test/java/j2html/tags/ConvenienceMethodTest.java +++ b/src/test/java/j2html/tags/ConvenienceMethodTest.java @@ -15,7 +15,7 @@ public class ConvenienceMethodTest { @Test public void testAllConvenienceMethods() throws Exception { - assertThat(input().isAutocomplete().render(), is("")); + assertThat(input().isAutocomplete().render(), is("")); assertThat(input().isAutofocus().render(), is("")); assertThat(input().isHidden().render(), is("")); assertThat(input().isRequired().render(), is("")); From f3eb195d56b2e861346ef1a607733f7cd52efd30 Mon Sep 17 00:00:00 2001 From: pointbazaar Date: Mon, 24 Aug 2020 22:08:48 +0200 Subject: [PATCH 15/19] add tests for attribute specific tags and fix some attribute properties --- .../j2html/tags/attributes/IControls.java | 8 ++++---- .../tags/generators/AttributesList.java | 2 +- .../j2html/tags/AttributesPerTagTest.java | 19 ++++++++++--------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/main/java/j2html/tags/attributes/IControls.java b/src/main/java/j2html/tags/attributes/IControls.java index 930b2717..920a870f 100644 --- a/src/main/java/j2html/tags/attributes/IControls.java +++ b/src/main/java/j2html/tags/attributes/IControls.java @@ -3,14 +3,14 @@ import j2html.tags.Tag; public interface IControls extends IInstance { - default T withControls(final String controls_) { - get().attr("controls", controls_); + default T isControls() { + get().attr("controls"); return get(); } - default T withCondControls(final boolean enable, final String controls_) { + default T withCondControls(final boolean enable) { if (enable) { - get().attr("controls", controls_); + get().attr("controls"); } return get(); } diff --git a/src/main/java/j2html/tags/generators/AttributesList.java b/src/main/java/j2html/tags/generators/AttributesList.java index 50f9b099..d0a4e8a3 100644 --- a/src/main/java/j2html/tags/generators/AttributesList.java +++ b/src/main/java/j2html/tags/generators/AttributesList.java @@ -44,7 +44,7 @@ static List attributesDescriptive() { new AttrD("colspan", true, "td","th"), new AttrD("content", true, "meta"), //"contenteditable" global attribute, should be in Tag.java - new AttrD("controls", true, "audio","video"), + new AttrD("controls", false, "audio","video"), new AttrD("coords", true, "area"), new AttrD("data", true, "object"), new AttrD("datetime", true, "del","ins","time"), diff --git a/src/test/java/j2html/tags/AttributesPerTagTest.java b/src/test/java/j2html/tags/AttributesPerTagTest.java index 82a2e834..153efabd 100644 --- a/src/test/java/j2html/tags/AttributesPerTagTest.java +++ b/src/test/java/j2html/tags/AttributesPerTagTest.java @@ -16,30 +16,31 @@ public final class AttributesPerTagTest { @Test public void testAttributesPerTag1(){ - //TEST: //accept, action, alt, async, //autocomplete, autofocus, //autoplay, charset, checked assertThat(input().withAccept("image/*").render(), is("")); - assertThat(form().withAction("/1/2").render(), is("
")); - assertThat(img().withAlt("horse").render(), is("\"horse\"")); - assertThat(script().isAsync().render(), is("")); - assertThat(form().isAutocomplete().render(), is("
")); - assertThat(input().isAutofocus().render(), is("")); - assertThat(video().isAutoplay().render(), is("")); - assertThat(script().withCharset("mycharset").render(), is("")); - assertThat(input().isChecked().render(), is("")); } + @Test + public void testAttributesPerTag2(){ + //TEST: cite, cols, colspan, content, controls + assertThat(blockquote().withCite("hi").render(), is("
")); + assertThat(textarea().withCols("3").render(), is("")); + assertThat(td().withColspan("4").render(), is("")); + assertThat(meta().withContent("mycontent").render(), is("")); + assertThat(audio().isControls().render(), is("")); + } + //TODO: leaving the rest of the tests for the rest //of the custom attributes for later, or for other people //to possibly implement From 0ec06fac3788917dd5bfabf0ea877901b3cd2d72 Mon Sep 17 00:00:00 2001 From: pointbazaar Date: Mon, 24 Aug 2020 22:38:25 +0200 Subject: [PATCH 16/19] write additional tests for attributes-per-tag and fix some properties of some attributes --- src/main/java/j2html/tags/attributes/IDefault.java | 8 ++++---- src/main/java/j2html/tags/attributes/IDefer.java | 8 ++++---- .../java/j2html/tags/generators/AttributesList.java | 4 ++-- src/test/java/j2html/tags/AttributesPerTagTest.java | 12 ++++++++++++ 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/main/java/j2html/tags/attributes/IDefault.java b/src/main/java/j2html/tags/attributes/IDefault.java index 198521b8..38b3cfb8 100644 --- a/src/main/java/j2html/tags/attributes/IDefault.java +++ b/src/main/java/j2html/tags/attributes/IDefault.java @@ -3,14 +3,14 @@ import j2html.tags.Tag; public interface IDefault extends IInstance { - default T withDefault(final String default_) { - get().attr("default", default_); + default T isDefault() { + get().attr("default"); return get(); } - default T withCondDefault(final boolean enable, final String default_) { + default T withCondDefault(final boolean enable) { if (enable) { - get().attr("default", default_); + get().attr("default"); } return get(); } diff --git a/src/main/java/j2html/tags/attributes/IDefer.java b/src/main/java/j2html/tags/attributes/IDefer.java index b2f1078e..1c015c6a 100644 --- a/src/main/java/j2html/tags/attributes/IDefer.java +++ b/src/main/java/j2html/tags/attributes/IDefer.java @@ -3,14 +3,14 @@ import j2html.tags.Tag; public interface IDefer extends IInstance { - default T withDefer(final String defer_) { - get().attr("defer", defer_); + default T isDefer() { + get().attr("defer"); return get(); } - default T withCondDefer(final boolean enable, final String defer_) { + default T withCondDefer(final boolean enable) { if (enable) { - get().attr("defer", defer_); + get().attr("defer"); } return get(); } diff --git a/src/main/java/j2html/tags/generators/AttributesList.java b/src/main/java/j2html/tags/generators/AttributesList.java index d0a4e8a3..07a93e87 100644 --- a/src/main/java/j2html/tags/generators/AttributesList.java +++ b/src/main/java/j2html/tags/generators/AttributesList.java @@ -48,8 +48,8 @@ static List attributesDescriptive() { new AttrD("coords", true, "area"), new AttrD("data", true, "object"), new AttrD("datetime", true, "del","ins","time"), - new AttrD("default", true, "track"), - new AttrD("defer", true, "script"), + new AttrD("default", false, "track"), + new AttrD("defer", false, "script"), //new AttrD("dir"), //global attribute new AttrD("dirname", true, "input","textarea"), new AttrD("disabled",false, "button","fieldset","input","optgroup","option","select","textarea"), diff --git a/src/test/java/j2html/tags/AttributesPerTagTest.java b/src/test/java/j2html/tags/AttributesPerTagTest.java index 153efabd..c0df78e3 100644 --- a/src/test/java/j2html/tags/AttributesPerTagTest.java +++ b/src/test/java/j2html/tags/AttributesPerTagTest.java @@ -41,6 +41,18 @@ public void testAttributesPerTag2(){ assertThat(audio().isControls().render(), is("")); } + @Test + public void testAttributesPerTag3(){ + //TEST: coords, data, datetime, default, defer, dirname + assertThat(area().withCoords("0,0,82,126").render(), is("")); + assertThat(object().withData("/1/2").render(), is("")); + assertThat(time().withDatetime("2015-11-15T22:55:03Z").render(), is("")); + assertThat(object().withData("/1/2").render(), is("")); + assertThat(track().isDefault().render(), is("")); + assertThat(script().isDefer().render(), is("")); + assertThat(input().withDirname("fname.dir").render(), is("")); + } + //TODO: leaving the rest of the tests for the rest //of the custom attributes for later, or for other people //to possibly implement From b97457ea92b3ba100efb95b646b13357476fc799 Mon Sep 17 00:00:00 2001 From: pointbazaar Date: Mon, 24 Aug 2020 22:46:08 +0200 Subject: [PATCH 17/19] add some tests for attributes-per-tag --- src/test/java/j2html/tags/AttributesPerTagTest.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/test/java/j2html/tags/AttributesPerTagTest.java b/src/test/java/j2html/tags/AttributesPerTagTest.java index c0df78e3..11434368 100644 --- a/src/test/java/j2html/tags/AttributesPerTagTest.java +++ b/src/test/java/j2html/tags/AttributesPerTagTest.java @@ -53,6 +53,17 @@ public void testAttributesPerTag3(){ assertThat(input().withDirname("fname.dir").render(), is("")); } + @Test + public void testAttributesPerTag4(){ + //TEST: disabled, download, enctype, for, form, formaction + assertThat(input().isDisabled().render(), is("")); + assertThat(a().isDownload().render(), is("")); + assertThat(form().withEnctype("enc").render(), is("
")); + assertThat(label().withFor("idk").render(), is("")); + assertThat(button().withForm("myform").render(), is("")); + assertThat(button().withFormaction("/1/2").render(), is("")); + } + //TODO: leaving the rest of the tests for the rest //of the custom attributes for later, or for other people //to possibly implement From 3443f04bd63e338a938d9c13d90f379ec9adc9b9 Mon Sep 17 00:00:00 2001 From: pointbazaar Date: Mon, 24 Aug 2020 23:00:02 +0200 Subject: [PATCH 18/19] work through the list of attributes to determine which has an argument and which does not. --- .../java/j2html/tags/attributes/IIsmap.java | 8 +++---- .../java/j2html/tags/attributes/ILoop.java | 8 +++---- .../j2html/tags/attributes/IMultiple.java | 8 +++---- .../java/j2html/tags/attributes/IMuted.java | 8 +++---- .../j2html/tags/attributes/INovalidate.java | 8 +++---- .../java/j2html/tags/attributes/IOpen.java | 8 +++---- .../j2html/tags/attributes/IReadonly.java | 8 +++---- .../j2html/tags/attributes/IReversed.java | 8 +++---- .../java/j2html/tags/attributes/ISandbox.java | 8 +++---- .../j2html/tags/attributes/ISelected.java | 8 +++---- .../tags/generators/AttributesList.java | 22 +++++++++---------- 11 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/main/java/j2html/tags/attributes/IIsmap.java b/src/main/java/j2html/tags/attributes/IIsmap.java index 3d1381fa..519eca3c 100644 --- a/src/main/java/j2html/tags/attributes/IIsmap.java +++ b/src/main/java/j2html/tags/attributes/IIsmap.java @@ -3,14 +3,14 @@ import j2html.tags.Tag; public interface IIsmap extends IInstance { - default T withIsmap(final String ismap_) { - get().attr("ismap", ismap_); + default T isIsmap() { + get().attr("ismap"); return get(); } - default T withCondIsmap(final boolean enable, final String ismap_) { + default T withCondIsmap(final boolean enable) { if (enable) { - get().attr("ismap", ismap_); + get().attr("ismap"); } return get(); } diff --git a/src/main/java/j2html/tags/attributes/ILoop.java b/src/main/java/j2html/tags/attributes/ILoop.java index 82844a6e..8df11d46 100644 --- a/src/main/java/j2html/tags/attributes/ILoop.java +++ b/src/main/java/j2html/tags/attributes/ILoop.java @@ -3,14 +3,14 @@ import j2html.tags.Tag; public interface ILoop extends IInstance { - default T withLoop(final String loop_) { - get().attr("loop", loop_); + default T isLoop() { + get().attr("loop"); return get(); } - default T withCondLoop(final boolean enable, final String loop_) { + default T withCondLoop(final boolean enable) { if (enable) { - get().attr("loop", loop_); + get().attr("loop"); } return get(); } diff --git a/src/main/java/j2html/tags/attributes/IMultiple.java b/src/main/java/j2html/tags/attributes/IMultiple.java index 4b38cfd7..821e2b90 100644 --- a/src/main/java/j2html/tags/attributes/IMultiple.java +++ b/src/main/java/j2html/tags/attributes/IMultiple.java @@ -3,14 +3,14 @@ import j2html.tags.Tag; public interface IMultiple extends IInstance { - default T withMultiple(final String multiple_) { - get().attr("multiple", multiple_); + default T isMultiple() { + get().attr("multiple"); return get(); } - default T withCondMultiple(final boolean enable, final String multiple_) { + default T withCondMultiple(final boolean enable) { if (enable) { - get().attr("multiple", multiple_); + get().attr("multiple"); } return get(); } diff --git a/src/main/java/j2html/tags/attributes/IMuted.java b/src/main/java/j2html/tags/attributes/IMuted.java index aad5eb89..adeac8c7 100644 --- a/src/main/java/j2html/tags/attributes/IMuted.java +++ b/src/main/java/j2html/tags/attributes/IMuted.java @@ -3,14 +3,14 @@ import j2html.tags.Tag; public interface IMuted extends IInstance { - default T withMuted(final String muted_) { - get().attr("muted", muted_); + default T isMuted() { + get().attr("muted"); return get(); } - default T withCondMuted(final boolean enable, final String muted_) { + default T withCondMuted(final boolean enable) { if (enable) { - get().attr("muted", muted_); + get().attr("muted"); } return get(); } diff --git a/src/main/java/j2html/tags/attributes/INovalidate.java b/src/main/java/j2html/tags/attributes/INovalidate.java index 26f72390..0dd31452 100644 --- a/src/main/java/j2html/tags/attributes/INovalidate.java +++ b/src/main/java/j2html/tags/attributes/INovalidate.java @@ -3,14 +3,14 @@ import j2html.tags.Tag; public interface INovalidate extends IInstance { - default T withNovalidate(final String novalidate_) { - get().attr("novalidate", novalidate_); + default T isNovalidate() { + get().attr("novalidate"); return get(); } - default T withCondNovalidate(final boolean enable, final String novalidate_) { + default T withCondNovalidate(final boolean enable) { if (enable) { - get().attr("novalidate", novalidate_); + get().attr("novalidate"); } return get(); } diff --git a/src/main/java/j2html/tags/attributes/IOpen.java b/src/main/java/j2html/tags/attributes/IOpen.java index edf3ed16..37a2add7 100644 --- a/src/main/java/j2html/tags/attributes/IOpen.java +++ b/src/main/java/j2html/tags/attributes/IOpen.java @@ -3,14 +3,14 @@ import j2html.tags.Tag; public interface IOpen extends IInstance { - default T withOpen(final String open_) { - get().attr("open", open_); + default T isOpen() { + get().attr("open"); return get(); } - default T withCondOpen(final boolean enable, final String open_) { + default T withCondOpen(final boolean enable) { if (enable) { - get().attr("open", open_); + get().attr("open"); } return get(); } diff --git a/src/main/java/j2html/tags/attributes/IReadonly.java b/src/main/java/j2html/tags/attributes/IReadonly.java index d7c5e7a5..80f4bf38 100644 --- a/src/main/java/j2html/tags/attributes/IReadonly.java +++ b/src/main/java/j2html/tags/attributes/IReadonly.java @@ -3,14 +3,14 @@ import j2html.tags.Tag; public interface IReadonly extends IInstance { - default T withReadonly(final String readonly_) { - get().attr("readonly", readonly_); + default T isReadonly() { + get().attr("readonly"); return get(); } - default T withCondReadonly(final boolean enable, final String readonly_) { + default T withCondReadonly(final boolean enable) { if (enable) { - get().attr("readonly", readonly_); + get().attr("readonly"); } return get(); } diff --git a/src/main/java/j2html/tags/attributes/IReversed.java b/src/main/java/j2html/tags/attributes/IReversed.java index 7e352217..cba817dc 100644 --- a/src/main/java/j2html/tags/attributes/IReversed.java +++ b/src/main/java/j2html/tags/attributes/IReversed.java @@ -3,14 +3,14 @@ import j2html.tags.Tag; public interface IReversed extends IInstance { - default T withReversed(final String reversed_) { - get().attr("reversed", reversed_); + default T isReversed() { + get().attr("reversed"); return get(); } - default T withCondReversed(final boolean enable, final String reversed_) { + default T withCondReversed(final boolean enable) { if (enable) { - get().attr("reversed", reversed_); + get().attr("reversed"); } return get(); } diff --git a/src/main/java/j2html/tags/attributes/ISandbox.java b/src/main/java/j2html/tags/attributes/ISandbox.java index 3589438e..eb07bb6d 100644 --- a/src/main/java/j2html/tags/attributes/ISandbox.java +++ b/src/main/java/j2html/tags/attributes/ISandbox.java @@ -3,14 +3,14 @@ import j2html.tags.Tag; public interface ISandbox extends IInstance { - default T withSandbox(final String sandbox_) { - get().attr("sandbox", sandbox_); + default T isSandbox() { + get().attr("sandbox"); return get(); } - default T withCondSandbox(final boolean enable, final String sandbox_) { + default T withCondSandbox(final boolean enable) { if (enable) { - get().attr("sandbox", sandbox_); + get().attr("sandbox"); } return get(); } diff --git a/src/main/java/j2html/tags/attributes/ISelected.java b/src/main/java/j2html/tags/attributes/ISelected.java index 63b5d1fc..6dbf8871 100644 --- a/src/main/java/j2html/tags/attributes/ISelected.java +++ b/src/main/java/j2html/tags/attributes/ISelected.java @@ -3,14 +3,14 @@ import j2html.tags.Tag; public interface ISelected extends IInstance { - default T withSelected(final String selected_) { - get().attr("selected", selected_); + default T isSelected() { + get().attr("selected"); return get(); } - default T withCondSelected(final boolean enable, final String selected_) { + default T withCondSelected(final boolean enable) { if (enable) { - get().attr("selected", selected_); + get().attr("selected"); } return get(); } diff --git a/src/main/java/j2html/tags/generators/AttributesList.java b/src/main/java/j2html/tags/generators/AttributesList.java index 07a93e87..be133ae9 100644 --- a/src/main/java/j2html/tags/generators/AttributesList.java +++ b/src/main/java/j2html/tags/generators/AttributesList.java @@ -65,24 +65,24 @@ static List attributesDescriptive() { new AttrD("high", true, "meter"), new AttrD("href", true, "a","area","base","link"), new AttrD("hreflang", true, "a","area","link"), - //"http-equiv", // '-' is problematic in code generation + //"http-equiv", //TODO: '-' is problematic in code generation //"id" global attribute, should be in Tag.java - new AttrD("ismap", true, "img"), + new AttrD("ismap", false, "img"), new AttrD("kind", true, "track"), new AttrD("label", true, "track","option","optgroup"), //"lang" global attribute, should be in Tag.java new AttrD("list", true, "input"), - new AttrD("loop", true, "audio","video"), + new AttrD("loop", false, "audio","video"), new AttrD("low", true, "meter"), new AttrD("max", true, "input","meter","progress"), new AttrD("maxlength", true, "input","textarea"), new AttrD("media", true, "a","area","link","source","style"), new AttrD("method", true, "form"), new AttrD("min", true, "input","meter"), - new AttrD("multiple", true, "input","select"), - new AttrD("muted", true, "video","audio"), + new AttrD("multiple", false, "input","select"), + new AttrD("muted", false, "video","audio"), new AttrD("name", true, "button","fieldset","form","iframe","input","map","meta","object","output","param","select","textarea"), - new AttrD("novalidate", true, "form"), + new AttrD("novalidate", false, "form"), new AttrD("onabort", true, "audio","embed","img","object","video"), new AttrD("onafterprint", true, "body"), new AttrD("onbeforeprint", true, "body"), @@ -142,21 +142,21 @@ static List attributesDescriptive() { new AttrD("onvolumechanged", true, "audio","video"), new AttrD("onwaiting", true, "audio","video"), //new AttrD("onwheel"), //global attribute - new AttrD("open", true, "details"), + new AttrD("open", false, "details"), new AttrD("optimum", true, "meter"), new AttrD("pattern", true, "input"), new AttrD("placeholder", true, "input","textarea"), new AttrD("poster", true, "video"), new AttrD("preload", true, "audio","video"), - new AttrD("readonly", true, "input","textarea"), + new AttrD("readonly", false, "input","textarea"), new AttrD("rel", true, "a","area","form","link"), new AttrD("required", false, "input","select","textarea"), - new AttrD("reversed", true, "ol"), + new AttrD("reversed", false, "ol"), new AttrD("rows", true, "textarea"), new AttrD("rowspan", true, "td","th"), - new AttrD("sandbox", true, "iframe"), + new AttrD("sandbox", false, "iframe"), new AttrD("scope", true, "th"), - new AttrD("selected", true, "option"), + new AttrD("selected", false, "option"), new AttrD("shape", true, "area"), new AttrD("size", true, "input","select"), new AttrD("sizes", true, "img","link","source"), From 8e10b916c012f0076ed3308bba1b010db38551bd Mon Sep 17 00:00:00 2001 From: pointbazaar Date: Sun, 30 Aug 2020 23:29:46 +0200 Subject: [PATCH 19/19] remove unrelated file from .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 560af530..a5e3074b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ # Created by https://www.gitignore.io -src/main/java/j2html/Experiment.java ### Intellij ### # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm