diff --git a/code_gen/src/main/java/j2html_codegen/generators/AttributeInterfaceCodeGenerator.java b/code_gen/src/main/java/j2html_codegen/generators/AttributeInterfaceCodeGenerator.java index eed4482..c2f8585 100644 --- a/code_gen/src/main/java/j2html_codegen/generators/AttributeInterfaceCodeGenerator.java +++ b/code_gen/src/main/java/j2html_codegen/generators/AttributeInterfaceCodeGenerator.java @@ -3,8 +3,6 @@ package j2html_codegen.generators; import j2html_codegen.GeneratorUtil; import j2html_codegen.model.AttrD; import j2html_codegen.model.AttributesList; - -import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -25,13 +23,12 @@ public final class AttributeInterfaceCodeGenerator { for (final AttrD attr : AttributesList.attributesDescriptive()) { final Path path = makePath(attr.attr, absPath); - final String interfaceName = interfaceNameFromAttribute(attr.attr)+""; + final String interfaceName = interfaceNameFromAttribute(attr.attr)+">"; /* - IFormAction extends IInstance + IFormAction> extends IInstance default T withFormAction(String formAction){ - get().attr("formaction", formAction); - return get(); + return self().attr("formaction", formAction); } */ final String interfaceStr = getInterfaceTemplate( @@ -78,10 +75,7 @@ public final class AttributeInterfaceCodeGenerator { sb.append("public interface ") .append(interfaceName); - if(optExtends.isPresent()) { - sb.append(" extends ").append(optExtends.get()) - .append(" "); - } + optExtends.ifPresent(ext -> sb.append(" extends ").append(ext).append(" ")); sb.append(" {\n"); @@ -90,8 +84,7 @@ public final class AttributeInterfaceCodeGenerator { IFormAction extends IInstance default T withFormAction(String formAction){ - get().attr("formaction", formAction); - return get(); + return self().attr("formaction", formAction); } */ //IMPORTANT: '_' added as suffix to mitigate problems @@ -119,11 +112,10 @@ public final class AttributeInterfaceCodeGenerator { //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("self().attr(\""); + if (attrName.equals("autocomplete")){ sb.append(attrName).append("\",\"on\""); - }else { - + } else { sb.append(attrName).append("\""); } sb.append(");\n"); @@ -139,10 +131,10 @@ public final class AttributeInterfaceCodeGenerator { 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("self().attr(\"").append(attrName).append("\", ").append(paramName).append(");\n"); sb.append("}\n"); - sb.append("return get();\n"); + sb.append("return self();\n"); }else{ //add a variant where you can toggle the attribute @@ -150,7 +142,7 @@ public final class AttributeInterfaceCodeGenerator { sb.append("if (enable){\n"); addAttributeNoArg(sb, attrName); sb.append("}\n"); - sb.append("return get();\n"); + sb.append("return self();\n"); } sb.append("}\n"); } @@ -166,8 +158,7 @@ public final class AttributeInterfaceCodeGenerator { sb.append("(final String ").append(paramName).append(") {") - .append("get().attr(\"").append(attrName).append("\", "+ paramName +");\n") - .append("return get();\n"); + .append("return self().attr(\"").append(attrName).append("\", ").append(paramName).append(");\n"); }else{ //add a variant where you can toggle the attribute @@ -175,7 +166,7 @@ public final class AttributeInterfaceCodeGenerator { addAttributeNoArg(sb, attrName); - sb.append("return get();\n"); + sb.append("return self();\n"); } sb.append("}\n"); } diff --git a/code_gen/src/main/java/j2html_codegen/generators/SpecializedTagClassCodeGenerator.java b/code_gen/src/main/java/j2html_codegen/generators/SpecializedTagClassCodeGenerator.java index 4d2711d..abea613 100644 --- a/code_gen/src/main/java/j2html_codegen/generators/SpecializedTagClassCodeGenerator.java +++ b/code_gen/src/main/java/j2html_codegen/generators/SpecializedTagClassCodeGenerator.java @@ -126,10 +126,7 @@ public final class SpecializedTagClassCodeGenerator { .append(className) .append(" "); - if(optExtends.isPresent()) { - sb.append("extends ").append(optExtends.get()) - .append(" "); - } + optExtends.ifPresent(ext -> sb.append("extends ").append(ext).append(" ")); //add the 'implements' clause if(!interfaces.isEmpty()) { diff --git a/code_gen/src/main/java/j2html_codegen/generators/TagCreatorCodeGenerator.java b/code_gen/src/main/java/j2html_codegen/generators/TagCreatorCodeGenerator.java index 896facd..960e902 100644 --- a/code_gen/src/main/java/j2html_codegen/generators/TagCreatorCodeGenerator.java +++ b/code_gen/src/main/java/j2html_codegen/generators/TagCreatorCodeGenerator.java @@ -23,7 +23,7 @@ public final class TagCreatorCodeGenerator { // 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(); } System.out.println("// ContainerTags, generated in " + TagCreatorCodeGenerator.class); @@ -58,7 +58,7 @@ public final class TagCreatorCodeGenerator { System.out.println(String.format("%-80s%1s", containerD1, containerD2)); System.out.println(String.format("%-80s%1s", containerE1, containerE2)); System.out.println(String.format("%-80s%1s", containerF1, containerF2)); - System.out.println(""); + System.out.println(); } } @@ -135,6 +135,7 @@ public final class TagCreatorCodeGenerator { "legend", "li", "generate", + "main", "map", "mark", "menu", diff --git a/library/pom.xml b/library/pom.xml index d009bdd..96f2354 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -87,6 +87,9 @@ 1.8 1.8 true + + -Xlint:all + diff --git a/library/src/main/java/j2html/TagCreator.java b/library/src/main/java/j2html/TagCreator.java index 2b20fc7..5856ccd 100644 --- a/library/src/main/java/j2html/TagCreator.java +++ b/library/src/main/java/j2html/TagCreator.java @@ -6,6 +6,7 @@ import j2html.tags.DomContent; import j2html.tags.DomContentJoiner; import j2html.tags.EmptyTag; import j2html.tags.InlineStaticResource; +import j2html.tags.Tag; import j2html.tags.Text; import j2html.tags.UnescapedText; import j2html.tags.specialized.manual.*; @@ -95,7 +96,7 @@ public class TagCreator { * @return DomContent containing elements from the stream */ public static DomContent each(Stream stream) { - return new ContainerTag(null).with(stream); + return new ContainerTag<>(null).with(stream); } /** @@ -173,12 +174,12 @@ public class TagCreator { } //Special tags - public static ContainerTag tag(String tagName) { - return new ContainerTag(tagName); + public static ContainerTag> tag(String tagName) { + return new ContainerTag<>(tagName); } - public static EmptyTag emptyTag(String tagName) { - return new EmptyTag(tagName); + public static EmptyTag> emptyTag(String tagName) { + return new EmptyTag<>(tagName); } public static Text fileAsEscapedString(String path) { @@ -189,20 +190,20 @@ public class TagCreator { return rawHtml(InlineStaticResource.getFileAsString(path)); } - public static ContainerTag styleWithInlineFile(String path) { - return InlineStaticResource.get(path, InlineStaticResource.TargetFormat.CSS); + public static StyleTag styleWithInlineFile(String path) { + return (StyleTag) InlineStaticResource.get(path, InlineStaticResource.TargetFormat.CSS); } - public static ContainerTag scriptWithInlineFile(String path) { - return InlineStaticResource.get(path, InlineStaticResource.TargetFormat.JS); + public static ScriptTag scriptWithInlineFile(String path) { + return (ScriptTag) InlineStaticResource.get(path, InlineStaticResource.TargetFormat.JS); } - public static ContainerTag styleWithInlineFile_min(String path) { - return InlineStaticResource.get(path, InlineStaticResource.TargetFormat.CSS_MIN); + public static StyleTag styleWithInlineFile_min(String path) { + return (StyleTag) InlineStaticResource.get(path, InlineStaticResource.TargetFormat.CSS_MIN); } - public static ContainerTag scriptWithInlineFile_min(String path) { - return InlineStaticResource.get(path, InlineStaticResource.TargetFormat.JS_MIN); + public static ScriptTag scriptWithInlineFile_min(String path) { + return (ScriptTag) InlineStaticResource.get(path, InlineStaticResource.TargetFormat.JS_MIN); } public static DomContent document() { @@ -251,23 +252,23 @@ public class TagCreator { } public static BodyTag body(String text) { - return (BodyTag)new BodyTag().withText(text); + return new BodyTag().withText(text); } public static BodyTag body(DomContent... dc) { - return (BodyTag)new BodyTag().with(dc); + return new BodyTag().with(dc); } public static BodyTag body(Attr.ShortForm shortAttr) { - return (BodyTag)Attr.addTo(new BodyTag(), shortAttr); + return Attr.addTo(new BodyTag(), shortAttr); } public static BodyTag body(Attr.ShortForm shortAttr, String text) { - return (BodyTag)Attr.addTo(new BodyTag().withText(text), shortAttr); + return 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); + return Attr.addTo(new BodyTag().with(dc), shortAttr); } public static HeadTag head() { @@ -275,23 +276,23 @@ public class TagCreator { } public static HeadTag head(String text) { - return (HeadTag)new HeadTag().withText(text); + return new HeadTag().withText(text); } public static HeadTag head(DomContent... dc) { - return (HeadTag)new HeadTag().with(dc); + return new HeadTag().with(dc); } public static HeadTag head(Attr.ShortForm shortAttr) { - return (HeadTag)Attr.addTo(new HeadTag(), shortAttr); + return Attr.addTo(new HeadTag(), shortAttr); } public static HeadTag head(Attr.ShortForm shortAttr, String text) { - return (HeadTag)Attr.addTo(new HeadTag().withText(text), shortAttr); + return 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); + return Attr.addTo(new HeadTag().with(dc), shortAttr); } // -- end of manually managed tags -- @@ -304,686 +305,686 @@ public class TagCreator { // 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 AreaTag area (Attr.ShortForm shortAttr) { return Attr.addTo( new AreaTag(), shortAttr); } public static BaseTag base () { return new BaseTag(); } - public static BaseTag base (Attr.ShortForm shortAttr) { return (BaseTag) Attr.addTo( new BaseTag(), shortAttr); } + public static BaseTag base (Attr.ShortForm shortAttr) { return Attr.addTo( new BaseTag(), shortAttr); } public static BrTag br () { return new BrTag(); } - public static BrTag br (Attr.ShortForm shortAttr) { return (BrTag) Attr.addTo( new BrTag(), shortAttr); } + public static BrTag br (Attr.ShortForm shortAttr) { return Attr.addTo( new BrTag(), shortAttr); } public static ColTag col () { return new ColTag(); } - public static ColTag col (Attr.ShortForm shortAttr) { return (ColTag) Attr.addTo( new ColTag(), shortAttr); } + public static ColTag col (Attr.ShortForm shortAttr) { return 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 EmbedTag embed (Attr.ShortForm shortAttr) { return 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 HrTag hr (Attr.ShortForm shortAttr) { return 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 ImgTag img (Attr.ShortForm shortAttr) { return 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 InputTag input (Attr.ShortForm shortAttr) { return 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 KeygenTag keygen (Attr.ShortForm shortAttr) { return 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 LinkTag link (Attr.ShortForm shortAttr) { return 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 MetaTag meta (Attr.ShortForm shortAttr) { return 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 ParamTag param (Attr.ShortForm shortAttr) { return 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 SourceTag source (Attr.ShortForm shortAttr) { return 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 TrackTag track (Attr.ShortForm shortAttr) { return 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); } + public static WbrTag wbr (Attr.ShortForm shortAttr) { return 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); } + public static ATag a () { return new ATag(); } + public static ATag a (String text) { return new ATag().withText(text); } + public static ATag a (DomContent... dc) { return new ATag().with(dc); } + public static ATag a (Attr.ShortForm shortAttr) { return Attr.addTo( new ATag(), shortAttr); } + public static ATag a (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new ATag().withText(text), shortAttr); } + public static ATag a (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new ATag().with(dc), shortAttr); } + + public static AbbrTag abbr () { return new AbbrTag(); } + public static AbbrTag abbr (String text) { return new AbbrTag().withText(text); } + public static AbbrTag abbr (DomContent... dc) { return new AbbrTag().with(dc); } + public static AbbrTag abbr (Attr.ShortForm shortAttr) { return Attr.addTo( new AbbrTag(), shortAttr); } + public static AbbrTag abbr (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new AbbrTag().withText(text), shortAttr); } + public static AbbrTag abbr (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new AbbrTag().with(dc), shortAttr); } + + public static AddressTag address () { return new AddressTag(); } + public static AddressTag address (String text) { return new AddressTag().withText(text); } + public static AddressTag address (DomContent... dc) { return new AddressTag().with(dc); } + public static AddressTag address (Attr.ShortForm shortAttr) { return Attr.addTo( new AddressTag(), shortAttr); } + public static AddressTag address (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new AddressTag().withText(text), shortAttr); } + public static AddressTag address (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new AddressTag().with(dc), shortAttr); } + + public static ArticleTag article () { return new ArticleTag(); } + public static ArticleTag article (String text) { return new ArticleTag().withText(text); } + public static ArticleTag article (DomContent... dc) { return new ArticleTag().with(dc); } + public static ArticleTag article (Attr.ShortForm shortAttr) { return Attr.addTo( new ArticleTag(), shortAttr); } + public static ArticleTag article (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new ArticleTag().withText(text), shortAttr); } + public static ArticleTag article (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new ArticleTag().with(dc), shortAttr); } + + public static AsideTag aside () { return new AsideTag(); } + public static AsideTag aside (String text) { return new AsideTag().withText(text); } + public static AsideTag aside (DomContent... dc) { return new AsideTag().with(dc); } + public static AsideTag aside (Attr.ShortForm shortAttr) { return Attr.addTo( new AsideTag(), shortAttr); } + public static AsideTag aside (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new AsideTag().withText(text), shortAttr); } + public static AsideTag aside (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new AsideTag().with(dc), shortAttr); } + + public static AudioTag audio () { return new AudioTag(); } + public static AudioTag audio (String text) { return new AudioTag().withText(text); } + public static AudioTag audio (DomContent... dc) { return new AudioTag().with(dc); } + public static AudioTag audio (Attr.ShortForm shortAttr) { return Attr.addTo( new AudioTag(), shortAttr); } + public static AudioTag audio (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new AudioTag().withText(text), shortAttr); } + public static AudioTag audio (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new AudioTag().with(dc), shortAttr); } + + public static BTag b () { return new BTag(); } + public static BTag b (String text) { return new BTag().withText(text); } + public static BTag b (DomContent... dc) { return new BTag().with(dc); } + public static BTag b (Attr.ShortForm shortAttr) { return Attr.addTo( new BTag(), shortAttr); } + public static BTag b (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new BTag().withText(text), shortAttr); } + public static BTag b (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new BTag().with(dc), shortAttr); } + + public static BdiTag bdi () { return new BdiTag(); } + public static BdiTag bdi (String text) { return new BdiTag().withText(text); } + public static BdiTag bdi (DomContent... dc) { return new BdiTag().with(dc); } + public static BdiTag bdi (Attr.ShortForm shortAttr) { return Attr.addTo( new BdiTag(), shortAttr); } + public static BdiTag bdi (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new BdiTag().withText(text), shortAttr); } + public static BdiTag bdi (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new BdiTag().with(dc), shortAttr); } + + public static BdoTag bdo () { return new BdoTag(); } + public static BdoTag bdo (String text) { return new BdoTag().withText(text); } + public static BdoTag bdo (DomContent... dc) { return new BdoTag().with(dc); } + public static BdoTag bdo (Attr.ShortForm shortAttr) { return Attr.addTo( new BdoTag(), shortAttr); } + public static BdoTag bdo (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new BdoTag().withText(text), shortAttr); } + public static BdoTag bdo (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new BdoTag().with(dc), shortAttr); } + + public static BlockquoteTag blockquote () { return new BlockquoteTag(); } + public static BlockquoteTag blockquote (String text) { return new BlockquoteTag().withText(text); } + public static BlockquoteTag blockquote (DomContent... dc) { return new BlockquoteTag().with(dc); } + public static BlockquoteTag blockquote (Attr.ShortForm shortAttr) { return Attr.addTo( new BlockquoteTag(), shortAttr); } + public static BlockquoteTag blockquote (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new BlockquoteTag().withText(text), shortAttr); } + public static BlockquoteTag blockquote (Attr.ShortForm shortAttr, DomContent... dc){ return Attr.addTo( new BlockquoteTag().with(dc), shortAttr); } + + public static ButtonTag button () { return new ButtonTag(); } + public static ButtonTag button (String text) { return new ButtonTag().withText(text); } + public static ButtonTag button (DomContent... dc) { return new ButtonTag().with(dc); } + public static ButtonTag button (Attr.ShortForm shortAttr) { return Attr.addTo( new ButtonTag(), shortAttr); } + public static ButtonTag button (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new ButtonTag().withText(text), shortAttr); } + public static ButtonTag button (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new ButtonTag().with(dc), shortAttr); } + + public static CanvasTag canvas () { return new CanvasTag(); } + public static CanvasTag canvas (String text) { return new CanvasTag().withText(text); } + public static CanvasTag canvas (DomContent... dc) { return new CanvasTag().with(dc); } + public static CanvasTag canvas (Attr.ShortForm shortAttr) { return Attr.addTo( new CanvasTag(), shortAttr); } + public static CanvasTag canvas (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new CanvasTag().withText(text), shortAttr); } + public static CanvasTag canvas (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new CanvasTag().with(dc), shortAttr); } + + public static CaptionTag caption () { return new CaptionTag(); } + public static CaptionTag caption (String text) { return new CaptionTag().withText(text); } + public static CaptionTag caption (DomContent... dc) { return new CaptionTag().with(dc); } + public static CaptionTag caption (Attr.ShortForm shortAttr) { return Attr.addTo( new CaptionTag(), shortAttr); } + public static CaptionTag caption (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new CaptionTag().withText(text), shortAttr); } + public static CaptionTag caption (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new CaptionTag().with(dc), shortAttr); } + + public static CiteTag cite () { return new CiteTag(); } + public static CiteTag cite (String text) { return new CiteTag().withText(text); } + public static CiteTag cite (DomContent... dc) { return new CiteTag().with(dc); } + public static CiteTag cite (Attr.ShortForm shortAttr) { return Attr.addTo( new CiteTag(), shortAttr); } + public static CiteTag cite (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new CiteTag().withText(text), shortAttr); } + public static CiteTag cite (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new CiteTag().with(dc), shortAttr); } + + public static CodeTag code () { return new CodeTag(); } + public static CodeTag code (String text) { return new CodeTag().withText(text); } + public static CodeTag code (DomContent... dc) { return new CodeTag().with(dc); } + public static CodeTag code (Attr.ShortForm shortAttr) { return Attr.addTo( new CodeTag(), shortAttr); } + public static CodeTag code (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new CodeTag().withText(text), shortAttr); } + public static CodeTag code (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new CodeTag().with(dc), shortAttr); } + + public static ColgroupTag colgroup () { return new ColgroupTag(); } + public static ColgroupTag colgroup (String text) { return new ColgroupTag().withText(text); } + public static ColgroupTag colgroup (DomContent... dc) { return new ColgroupTag().with(dc); } + public static ColgroupTag colgroup (Attr.ShortForm shortAttr) { return Attr.addTo( new ColgroupTag(), shortAttr); } + public static ColgroupTag colgroup (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new ColgroupTag().withText(text), shortAttr); } + public static ColgroupTag colgroup (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new ColgroupTag().with(dc), shortAttr); } + + public static DatalistTag datalist () { return new DatalistTag(); } + public static DatalistTag datalist (String text) { return new DatalistTag().withText(text); } + public static DatalistTag datalist (DomContent... dc) { return new DatalistTag().with(dc); } + public static DatalistTag datalist (Attr.ShortForm shortAttr) { return Attr.addTo( new DatalistTag(), shortAttr); } + public static DatalistTag datalist (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new DatalistTag().withText(text), shortAttr); } + public static DatalistTag datalist (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new DatalistTag().with(dc), shortAttr); } + + public static DdTag dd () { return new DdTag(); } + public static DdTag dd (String text) { return new DdTag().withText(text); } + public static DdTag dd (DomContent... dc) { return new DdTag().with(dc); } + public static DdTag dd (Attr.ShortForm shortAttr) { return Attr.addTo( new DdTag(), shortAttr); } + public static DdTag dd (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new DdTag().withText(text), shortAttr); } + public static DdTag dd (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new DdTag().with(dc), shortAttr); } + + public static DelTag del () { return new DelTag(); } + public static DelTag del (String text) { return new DelTag().withText(text); } + public static DelTag del (DomContent... dc) { return new DelTag().with(dc); } + public static DelTag del (Attr.ShortForm shortAttr) { return Attr.addTo( new DelTag(), shortAttr); } + public static DelTag del (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new DelTag().withText(text), shortAttr); } + public static DelTag del (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new DelTag().with(dc), shortAttr); } + + public static DetailsTag details () { return new DetailsTag(); } + public static DetailsTag details (String text) { return new DetailsTag().withText(text); } + public static DetailsTag details (DomContent... dc) { return new DetailsTag().with(dc); } + public static DetailsTag details (Attr.ShortForm shortAttr) { return Attr.addTo( new DetailsTag(), shortAttr); } + public static DetailsTag details (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new DetailsTag().withText(text), shortAttr); } + public static DetailsTag details (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new DetailsTag().with(dc), shortAttr); } + + public static DfnTag dfn () { return new DfnTag(); } + public static DfnTag dfn (String text) { return new DfnTag().withText(text); } + public static DfnTag dfn (DomContent... dc) { return new DfnTag().with(dc); } + public static DfnTag dfn (Attr.ShortForm shortAttr) { return Attr.addTo( new DfnTag(), shortAttr); } + public static DfnTag dfn (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new DfnTag().withText(text), shortAttr); } + public static DfnTag dfn (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new DfnTag().with(dc), shortAttr); } + + public static DialogTag dialog () { return new DialogTag(); } + public static DialogTag dialog (String text) { return new DialogTag().withText(text); } + public static DialogTag dialog (DomContent... dc) { return new DialogTag().with(dc); } + public static DialogTag dialog (Attr.ShortForm shortAttr) { return Attr.addTo( new DialogTag(), shortAttr); } + public static DialogTag dialog (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new DialogTag().withText(text), shortAttr); } + public static DialogTag dialog (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new DialogTag().with(dc), shortAttr); } + + public static DivTag div () { return new DivTag(); } + public static DivTag div (String text) { return new DivTag().withText(text); } + public static DivTag div (DomContent... dc) { return new DivTag().with(dc); } + public static DivTag div (Attr.ShortForm shortAttr) { return Attr.addTo( new DivTag(), shortAttr); } + public static DivTag div (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new DivTag().withText(text), shortAttr); } + public static DivTag div (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new DivTag().with(dc), shortAttr); } + + public static DlTag dl () { return new DlTag(); } + public static DlTag dl (String text) { return new DlTag().withText(text); } + public static DlTag dl (DomContent... dc) { return new DlTag().with(dc); } + public static DlTag dl (Attr.ShortForm shortAttr) { return Attr.addTo( new DlTag(), shortAttr); } + public static DlTag dl (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new DlTag().withText(text), shortAttr); } + public static DlTag dl (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new DlTag().with(dc), shortAttr); } + + public static DtTag dt () { return new DtTag(); } + public static DtTag dt (String text) { return new DtTag().withText(text); } + public static DtTag dt (DomContent... dc) { return new DtTag().with(dc); } + public static DtTag dt (Attr.ShortForm shortAttr) { return Attr.addTo( new DtTag(), shortAttr); } + public static DtTag dt (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new DtTag().withText(text), shortAttr); } + public static DtTag dt (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new DtTag().with(dc), shortAttr); } + + public static EmTag em () { return new EmTag(); } + public static EmTag em (String text) { return new EmTag().withText(text); } + public static EmTag em (DomContent... dc) { return new EmTag().with(dc); } + public static EmTag em (Attr.ShortForm shortAttr) { return Attr.addTo( new EmTag(), shortAttr); } + public static EmTag em (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new EmTag().withText(text), shortAttr); } + public static EmTag em (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new EmTag().with(dc), shortAttr); } + + public static FieldsetTag fieldset () { return new FieldsetTag(); } + public static FieldsetTag fieldset (String text) { return new FieldsetTag().withText(text); } + public static FieldsetTag fieldset (DomContent... dc) { return new FieldsetTag().with(dc); } + public static FieldsetTag fieldset (Attr.ShortForm shortAttr) { return Attr.addTo( new FieldsetTag(), shortAttr); } + public static FieldsetTag fieldset (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new FieldsetTag().withText(text), shortAttr); } + public static FieldsetTag fieldset (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new FieldsetTag().with(dc), shortAttr); } + + public static FigcaptionTag figcaption () { return new FigcaptionTag(); } + public static FigcaptionTag figcaption (String text) { return new FigcaptionTag().withText(text); } + public static FigcaptionTag figcaption (DomContent... dc) { return new FigcaptionTag().with(dc); } + public static FigcaptionTag figcaption (Attr.ShortForm shortAttr) { return Attr.addTo( new FigcaptionTag(), shortAttr); } + public static FigcaptionTag figcaption (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new FigcaptionTag().withText(text), shortAttr); } + public static FigcaptionTag figcaption (Attr.ShortForm shortAttr, DomContent... dc){ return Attr.addTo( new FigcaptionTag().with(dc), shortAttr); } + + public static FigureTag figure () { return new FigureTag(); } + public static FigureTag figure (String text) { return new FigureTag().withText(text); } + public static FigureTag figure (DomContent... dc) { return new FigureTag().with(dc); } + public static FigureTag figure (Attr.ShortForm shortAttr) { return Attr.addTo( new FigureTag(), shortAttr); } + public static FigureTag figure (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new FigureTag().withText(text), shortAttr); } + public static FigureTag figure (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new FigureTag().with(dc), shortAttr); } + + public static FooterTag footer () { return new FooterTag(); } + public static FooterTag footer (String text) { return new FooterTag().withText(text); } + public static FooterTag footer (DomContent... dc) { return new FooterTag().with(dc); } + public static FooterTag footer (Attr.ShortForm shortAttr) { return Attr.addTo( new FooterTag(), shortAttr); } + public static FooterTag footer (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new FooterTag().withText(text), shortAttr); } + public static FooterTag footer (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new FooterTag().with(dc), shortAttr); } + + public static FormTag form () { return new FormTag(); } + public static FormTag form (String text) { return new FormTag().withText(text); } + public static FormTag form (DomContent... dc) { return new FormTag().with(dc); } + public static FormTag form (Attr.ShortForm shortAttr) { return Attr.addTo( new FormTag(), shortAttr); } + public static FormTag form (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new FormTag().withText(text), shortAttr); } + public static FormTag form (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new FormTag().with(dc), shortAttr); } + + public static H1Tag h1 () { return new H1Tag(); } + public static H1Tag h1 (String text) { return new H1Tag().withText(text); } + public static H1Tag h1 (DomContent... dc) { return new H1Tag().with(dc); } + public static H1Tag h1 (Attr.ShortForm shortAttr) { return Attr.addTo( new H1Tag(), shortAttr); } + public static H1Tag h1 (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new H1Tag().withText(text), shortAttr); } + public static H1Tag h1 (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new H1Tag().with(dc), shortAttr); } + + public static H2Tag h2 () { return new H2Tag(); } + public static H2Tag h2 (String text) { return new H2Tag().withText(text); } + public static H2Tag h2 (DomContent... dc) { return new H2Tag().with(dc); } + public static H2Tag h2 (Attr.ShortForm shortAttr) { return Attr.addTo( new H2Tag(), shortAttr); } + public static H2Tag h2 (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new H2Tag().withText(text), shortAttr); } + public static H2Tag h2 (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new H2Tag().with(dc), shortAttr); } + + public static H3Tag h3 () { return new H3Tag(); } + public static H3Tag h3 (String text) { return new H3Tag().withText(text); } + public static H3Tag h3 (DomContent... dc) { return new H3Tag().with(dc); } + public static H3Tag h3 (Attr.ShortForm shortAttr) { return Attr.addTo( new H3Tag(), shortAttr); } + public static H3Tag h3 (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new H3Tag().withText(text), shortAttr); } + public static H3Tag h3 (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new H3Tag().with(dc), shortAttr); } + + public static H4Tag h4 () { return new H4Tag(); } + public static H4Tag h4 (String text) { return new H4Tag().withText(text); } + public static H4Tag h4 (DomContent... dc) { return new H4Tag().with(dc); } + public static H4Tag h4 (Attr.ShortForm shortAttr) { return Attr.addTo( new H4Tag(), shortAttr); } + public static H4Tag h4 (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new H4Tag().withText(text), shortAttr); } + public static H4Tag h4 (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new H4Tag().with(dc), shortAttr); } + + public static H5Tag h5 () { return new H5Tag(); } + public static H5Tag h5 (String text) { return new H5Tag().withText(text); } + public static H5Tag h5 (DomContent... dc) { return new H5Tag().with(dc); } + public static H5Tag h5 (Attr.ShortForm shortAttr) { return Attr.addTo( new H5Tag(), shortAttr); } + public static H5Tag h5 (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new H5Tag().withText(text), shortAttr); } + public static H5Tag h5 (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new H5Tag().with(dc), shortAttr); } + + public static H6Tag h6 () { return new H6Tag(); } + public static H6Tag h6 (String text) { return new H6Tag().withText(text); } + public static H6Tag h6 (DomContent... dc) { return new H6Tag().with(dc); } + public static H6Tag h6 (Attr.ShortForm shortAttr) { return Attr.addTo( new H6Tag(), shortAttr); } + public static H6Tag h6 (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new H6Tag().withText(text), shortAttr); } + public static H6Tag h6 (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new H6Tag().with(dc), shortAttr); } + + public static HeaderTag header () { return new HeaderTag(); } + public static HeaderTag header (String text) { return new HeaderTag().withText(text); } + public static HeaderTag header (DomContent... dc) { return new HeaderTag().with(dc); } + public static HeaderTag header (Attr.ShortForm shortAttr) { return Attr.addTo( new HeaderTag(), shortAttr); } + public static HeaderTag header (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new HeaderTag().withText(text), shortAttr); } + public static HeaderTag header (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new HeaderTag().with(dc), shortAttr); } + + public static ITag i () { return new ITag(); } + public static ITag i (String text) { return new ITag().withText(text); } + public static ITag i (DomContent... dc) { return new ITag().with(dc); } + public static ITag i (Attr.ShortForm shortAttr) { return Attr.addTo( new ITag(), shortAttr); } + public static ITag i (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new ITag().withText(text), shortAttr); } + public static ITag i (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new ITag().with(dc), shortAttr); } + + public static IframeTag iframe () { return new IframeTag(); } + public static IframeTag iframe (String text) { return new IframeTag().withText(text); } + public static IframeTag iframe (DomContent... dc) { return new IframeTag().with(dc); } + public static IframeTag iframe (Attr.ShortForm shortAttr) { return Attr.addTo( new IframeTag(), shortAttr); } + public static IframeTag iframe (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new IframeTag().withText(text), shortAttr); } + public static IframeTag iframe (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new IframeTag().with(dc), shortAttr); } + + public static InsTag ins () { return new InsTag(); } + public static InsTag ins (String text) { return new InsTag().withText(text); } + public static InsTag ins (DomContent... dc) { return new InsTag().with(dc); } + public static InsTag ins (Attr.ShortForm shortAttr) { return Attr.addTo( new InsTag(), shortAttr); } + public static InsTag ins (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new InsTag().withText(text), shortAttr); } + public static InsTag ins (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new InsTag().with(dc), shortAttr); } + + public static KbdTag kbd () { return new KbdTag(); } + public static KbdTag kbd (String text) { return new KbdTag().withText(text); } + public static KbdTag kbd (DomContent... dc) { return new KbdTag().with(dc); } + public static KbdTag kbd (Attr.ShortForm shortAttr) { return Attr.addTo( new KbdTag(), shortAttr); } + public static KbdTag kbd (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new KbdTag().withText(text), shortAttr); } + public static KbdTag kbd (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new KbdTag().with(dc), shortAttr); } + + public static LabelTag label () { return new LabelTag(); } + public static LabelTag label (String text) { return new LabelTag().withText(text); } + public static LabelTag label (DomContent... dc) { return new LabelTag().with(dc); } + public static LabelTag label (Attr.ShortForm shortAttr) { return Attr.addTo( new LabelTag(), shortAttr); } + public static LabelTag label (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new LabelTag().withText(text), shortAttr); } + public static LabelTag label (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new LabelTag().with(dc), shortAttr); } + + public static LegendTag legend () { return new LegendTag(); } + public static LegendTag legend (String text) { return new LegendTag().withText(text); } + public static LegendTag legend (DomContent... dc) { return new LegendTag().with(dc); } + public static LegendTag legend (Attr.ShortForm shortAttr) { return Attr.addTo( new LegendTag(), shortAttr); } + public static LegendTag legend (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new LegendTag().withText(text), shortAttr); } + public static LegendTag legend (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new LegendTag().with(dc), shortAttr); } + + public static LiTag li () { return new LiTag(); } + public static LiTag li (String text) { return new LiTag().withText(text); } + public static LiTag li (DomContent... dc) { return new LiTag().with(dc); } + public static LiTag li (Attr.ShortForm shortAttr) { return Attr.addTo( new LiTag(), shortAttr); } + public static LiTag li (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new LiTag().withText(text), shortAttr); } + public static LiTag li (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new LiTag().with(dc), shortAttr); } + + public static MainTag main () { return new MainTag(); } + public static MainTag main (String text) { return new MainTag().withText(text); } + public static MainTag main (DomContent... dc) { return new MainTag().with(dc); } + public static MainTag main (Attr.ShortForm shortAttr) { return Attr.addTo( new MainTag(), shortAttr); } + public static MainTag main (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new MainTag().withText(text), shortAttr); } + public static MainTag main (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new MainTag().with(dc), shortAttr); } + + public static MapTag map () { return new MapTag(); } + public static MapTag map (String text) { return new MapTag().withText(text); } + public static MapTag map (DomContent... dc) { return new MapTag().with(dc); } + public static MapTag map (Attr.ShortForm shortAttr) { return Attr.addTo( new MapTag(), shortAttr); } + public static MapTag map (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new MapTag().withText(text), shortAttr); } + public static MapTag map (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new MapTag().with(dc), shortAttr); } + + public static MarkTag mark () { return new MarkTag(); } + public static MarkTag mark (String text) { return new MarkTag().withText(text); } + public static MarkTag mark (DomContent... dc) { return new MarkTag().with(dc); } + public static MarkTag mark (Attr.ShortForm shortAttr) { return Attr.addTo( new MarkTag(), shortAttr); } + public static MarkTag mark (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new MarkTag().withText(text), shortAttr); } + public static MarkTag mark (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new MarkTag().with(dc), shortAttr); } + + public static MenuTag menu () { return new MenuTag(); } + public static MenuTag menu (String text) { return new MenuTag().withText(text); } + public static MenuTag menu (DomContent... dc) { return new MenuTag().with(dc); } + public static MenuTag menu (Attr.ShortForm shortAttr) { return Attr.addTo( new MenuTag(), shortAttr); } + public static MenuTag menu (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new MenuTag().withText(text), shortAttr); } + public static MenuTag menu (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new MenuTag().with(dc), shortAttr); } + + public static MenuitemTag menuitem () { return new MenuitemTag(); } + public static MenuitemTag menuitem (String text) { return new MenuitemTag().withText(text); } + public static MenuitemTag menuitem (DomContent... dc) { return new MenuitemTag().with(dc); } + public static MenuitemTag menuitem (Attr.ShortForm shortAttr) { return Attr.addTo( new MenuitemTag(), shortAttr); } + public static MenuitemTag menuitem (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new MenuitemTag().withText(text), shortAttr); } + public static MenuitemTag menuitem (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new MenuitemTag().with(dc), shortAttr); } + + public static MeterTag meter () { return new MeterTag(); } + public static MeterTag meter (String text) { return new MeterTag().withText(text); } + public static MeterTag meter (DomContent... dc) { return new MeterTag().with(dc); } + public static MeterTag meter (Attr.ShortForm shortAttr) { return Attr.addTo( new MeterTag(), shortAttr); } + public static MeterTag meter (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new MeterTag().withText(text), shortAttr); } + public static MeterTag meter (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new MeterTag().with(dc), shortAttr); } + + public static NavTag nav () { return new NavTag(); } + public static NavTag nav (String text) { return new NavTag().withText(text); } + public static NavTag nav (DomContent... dc) { return new NavTag().with(dc); } + public static NavTag nav (Attr.ShortForm shortAttr) { return Attr.addTo( new NavTag(), shortAttr); } + public static NavTag nav (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new NavTag().withText(text), shortAttr); } + public static NavTag nav (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new NavTag().with(dc), shortAttr); } + + public static NoscriptTag noscript () { return new NoscriptTag(); } + public static NoscriptTag noscript (String text) { return new NoscriptTag().withText(text); } + public static NoscriptTag noscript (DomContent... dc) { return new NoscriptTag().with(dc); } + public static NoscriptTag noscript (Attr.ShortForm shortAttr) { return Attr.addTo( new NoscriptTag(), shortAttr); } + public static NoscriptTag noscript (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new NoscriptTag().withText(text), shortAttr); } + public static NoscriptTag noscript (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new NoscriptTag().with(dc), shortAttr); } + + public static ObjectTag object () { return new ObjectTag(); } + public static ObjectTag object (String text) { return new ObjectTag().withText(text); } + public static ObjectTag object (DomContent... dc) { return new ObjectTag().with(dc); } + public static ObjectTag object (Attr.ShortForm shortAttr) { return Attr.addTo( new ObjectTag(), shortAttr); } + public static ObjectTag object (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new ObjectTag().withText(text), shortAttr); } + public static ObjectTag object (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new ObjectTag().with(dc), shortAttr); } + + public static OlTag ol () { return new OlTag(); } + public static OlTag ol (String text) { return new OlTag().withText(text); } + public static OlTag ol (DomContent... dc) { return new OlTag().with(dc); } + public static OlTag ol (Attr.ShortForm shortAttr) { return Attr.addTo( new OlTag(), shortAttr); } + public static OlTag ol (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new OlTag().withText(text), shortAttr); } + public static OlTag ol (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new OlTag().with(dc), shortAttr); } + + public static OptgroupTag optgroup () { return new OptgroupTag(); } + public static OptgroupTag optgroup (String text) { return new OptgroupTag().withText(text); } + public static OptgroupTag optgroup (DomContent... dc) { return new OptgroupTag().with(dc); } + public static OptgroupTag optgroup (Attr.ShortForm shortAttr) { return Attr.addTo( new OptgroupTag(), shortAttr); } + public static OptgroupTag optgroup (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new OptgroupTag().withText(text), shortAttr); } + public static OptgroupTag optgroup (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new OptgroupTag().with(dc), shortAttr); } + + public static OptionTag option () { return new OptionTag(); } + public static OptionTag option (String text) { return new OptionTag().withText(text); } + public static OptionTag option (DomContent... dc) { return new OptionTag().with(dc); } + public static OptionTag option (Attr.ShortForm shortAttr) { return Attr.addTo( new OptionTag(), shortAttr); } + public static OptionTag option (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new OptionTag().withText(text), shortAttr); } + public static OptionTag option (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new OptionTag().with(dc), shortAttr); } + + public static OutputTag output () { return new OutputTag(); } + public static OutputTag output (String text) { return new OutputTag().withText(text); } + public static OutputTag output (DomContent... dc) { return new OutputTag().with(dc); } + public static OutputTag output (Attr.ShortForm shortAttr) { return Attr.addTo( new OutputTag(), shortAttr); } + public static OutputTag output (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new OutputTag().withText(text), shortAttr); } + public static OutputTag output (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new OutputTag().with(dc), shortAttr); } + + public static PTag p () { return new PTag(); } + public static PTag p (String text) { return new PTag().withText(text); } + public static PTag p (DomContent... dc) { return new PTag().with(dc); } + public static PTag p (Attr.ShortForm shortAttr) { return Attr.addTo( new PTag(), shortAttr); } + public static PTag p (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new PTag().withText(text), shortAttr); } + public static PTag p (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new PTag().with(dc), shortAttr); } + + public static PreTag pre () { return new PreTag(); } + public static PreTag pre (String text) { return new PreTag().withText(text); } + public static PreTag pre (DomContent... dc) { return new PreTag().with(dc); } + public static PreTag pre (Attr.ShortForm shortAttr) { return Attr.addTo( new PreTag(), shortAttr); } + public static PreTag pre (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new PreTag().withText(text), shortAttr); } + public static PreTag pre (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new PreTag().with(dc), shortAttr); } + + public static ProgressTag progress () { return new ProgressTag(); } + public static ProgressTag progress (String text) { return new ProgressTag().withText(text); } + public static ProgressTag progress (DomContent... dc) { return new ProgressTag().with(dc); } + public static ProgressTag progress (Attr.ShortForm shortAttr) { return Attr.addTo( new ProgressTag(), shortAttr); } + public static ProgressTag progress (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new ProgressTag().withText(text), shortAttr); } + public static ProgressTag progress (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new ProgressTag().with(dc), shortAttr); } + + public static QTag q () { return new QTag(); } + public static QTag q (String text) { return new QTag().withText(text); } + public static QTag q (DomContent... dc) { return new QTag().with(dc); } + public static QTag q (Attr.ShortForm shortAttr) { return Attr.addTo( new QTag(), shortAttr); } + public static QTag q (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new QTag().withText(text), shortAttr); } + public static QTag q (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new QTag().with(dc), shortAttr); } + + public static RpTag rp () { return new RpTag(); } + public static RpTag rp (String text) { return new RpTag().withText(text); } + public static RpTag rp (DomContent... dc) { return new RpTag().with(dc); } + public static RpTag rp (Attr.ShortForm shortAttr) { return Attr.addTo( new RpTag(), shortAttr); } + public static RpTag rp (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new RpTag().withText(text), shortAttr); } + public static RpTag rp (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new RpTag().with(dc), shortAttr); } + + public static RtTag rt () { return new RtTag(); } + public static RtTag rt (String text) { return new RtTag().withText(text); } + public static RtTag rt (DomContent... dc) { return new RtTag().with(dc); } + public static RtTag rt (Attr.ShortForm shortAttr) { return Attr.addTo( new RtTag(), shortAttr); } + public static RtTag rt (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new RtTag().withText(text), shortAttr); } + public static RtTag rt (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new RtTag().with(dc), shortAttr); } + + public static RubyTag ruby () { return new RubyTag(); } + public static RubyTag ruby (String text) { return new RubyTag().withText(text); } + public static RubyTag ruby (DomContent... dc) { return new RubyTag().with(dc); } + public static RubyTag ruby (Attr.ShortForm shortAttr) { return Attr.addTo( new RubyTag(), shortAttr); } + public static RubyTag ruby (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new RubyTag().withText(text), shortAttr); } + public static RubyTag ruby (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new RubyTag().with(dc), shortAttr); } + + public static STag s () { return new STag(); } + public static STag s (String text) { return new STag().withText(text); } + public static STag s (DomContent... dc) { return new STag().with(dc); } + public static STag s (Attr.ShortForm shortAttr) { return Attr.addTo( new STag(), shortAttr); } + public static STag s (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new STag().withText(text), shortAttr); } + public static STag s (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new STag().with(dc), shortAttr); } + + public static SampTag samp () { return new SampTag(); } + public static SampTag samp (String text) { return new SampTag().withText(text); } + public static SampTag samp (DomContent... dc) { return new SampTag().with(dc); } + public static SampTag samp (Attr.ShortForm shortAttr) { return Attr.addTo( new SampTag(), shortAttr); } + public static SampTag samp (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new SampTag().withText(text), shortAttr); } + public static SampTag samp (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new SampTag().with(dc), shortAttr); } + + public static ScriptTag script () { return new ScriptTag(); } + public static ScriptTag script (String text) { return new ScriptTag().withText(text); } + public static ScriptTag script (DomContent... dc) { return new ScriptTag().with(dc); } + public static ScriptTag script (Attr.ShortForm shortAttr) { return Attr.addTo( new ScriptTag(), shortAttr); } + public static ScriptTag script (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new ScriptTag().withText(text), shortAttr); } + public static ScriptTag script (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new ScriptTag().with(dc), shortAttr); } + + public static SectionTag section () { return new SectionTag(); } + public static SectionTag section (String text) { return new SectionTag().withText(text); } + public static SectionTag section (DomContent... dc) { return new SectionTag().with(dc); } + public static SectionTag section (Attr.ShortForm shortAttr) { return Attr.addTo( new SectionTag(), shortAttr); } + public static SectionTag section (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new SectionTag().withText(text), shortAttr); } + public static SectionTag section (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new SectionTag().with(dc), shortAttr); } + + public static SelectTag select () { return new SelectTag(); } + public static SelectTag select (String text) { return new SelectTag().withText(text); } + public static SelectTag select (DomContent... dc) { return new SelectTag().with(dc); } + public static SelectTag select (Attr.ShortForm shortAttr) { return Attr.addTo( new SelectTag(), shortAttr); } + public static SelectTag select (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new SelectTag().withText(text), shortAttr); } + public static SelectTag select (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new SelectTag().with(dc), shortAttr); } + + public static SmallTag small () { return new SmallTag(); } + public static SmallTag small (String text) { return new SmallTag().withText(text); } + public static SmallTag small (DomContent... dc) { return new SmallTag().with(dc); } + public static SmallTag small (Attr.ShortForm shortAttr) { return Attr.addTo( new SmallTag(), shortAttr); } + public static SmallTag small (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new SmallTag().withText(text), shortAttr); } + public static SmallTag small (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new SmallTag().with(dc), shortAttr); } + + public static SpanTag span () { return new SpanTag(); } + public static SpanTag span (String text) { return new SpanTag().withText(text); } + public static SpanTag span (DomContent... dc) { return new SpanTag().with(dc); } + public static SpanTag span (Attr.ShortForm shortAttr) { return Attr.addTo( new SpanTag(), shortAttr); } + public static SpanTag span (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new SpanTag().withText(text), shortAttr); } + public static SpanTag span (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new SpanTag().with(dc), shortAttr); } + + public static StrongTag strong () { return new StrongTag(); } + public static StrongTag strong (String text) { return new StrongTag().withText(text); } + public static StrongTag strong (DomContent... dc) { return new StrongTag().with(dc); } + public static StrongTag strong (Attr.ShortForm shortAttr) { return Attr.addTo( new StrongTag(), shortAttr); } + public static StrongTag strong (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new StrongTag().withText(text), shortAttr); } + public static StrongTag strong (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new StrongTag().with(dc), shortAttr); } + + public static StyleTag style () { return new StyleTag(); } + public static StyleTag style (String text) { return new StyleTag().withText(text); } + public static StyleTag style (DomContent... dc) { return new StyleTag().with(dc); } + public static StyleTag style (Attr.ShortForm shortAttr) { return Attr.addTo( new StyleTag(), shortAttr); } + public static StyleTag style (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new StyleTag().withText(text), shortAttr); } + public static StyleTag style (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new StyleTag().with(dc), shortAttr); } + + public static SubTag sub () { return new SubTag(); } + public static SubTag sub (String text) { return new SubTag().withText(text); } + public static SubTag sub (DomContent... dc) { return new SubTag().with(dc); } + public static SubTag sub (Attr.ShortForm shortAttr) { return Attr.addTo( new SubTag(), shortAttr); } + public static SubTag sub (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new SubTag().withText(text), shortAttr); } + public static SubTag sub (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new SubTag().with(dc), shortAttr); } + + public static SummaryTag summary () { return new SummaryTag(); } + public static SummaryTag summary (String text) { return new SummaryTag().withText(text); } + public static SummaryTag summary (DomContent... dc) { return new SummaryTag().with(dc); } + public static SummaryTag summary (Attr.ShortForm shortAttr) { return Attr.addTo( new SummaryTag(), shortAttr); } + public static SummaryTag summary (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new SummaryTag().withText(text), shortAttr); } + public static SummaryTag summary (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new SummaryTag().with(dc), shortAttr); } + + public static SupTag sup () { return new SupTag(); } + public static SupTag sup (String text) { return new SupTag().withText(text); } + public static SupTag sup (DomContent... dc) { return new SupTag().with(dc); } + public static SupTag sup (Attr.ShortForm shortAttr) { return Attr.addTo( new SupTag(), shortAttr); } + public static SupTag sup (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new SupTag().withText(text), shortAttr); } + public static SupTag sup (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new SupTag().with(dc), shortAttr); } + + public static TableTag table () { return new TableTag(); } + public static TableTag table (String text) { return new TableTag().withText(text); } + public static TableTag table (DomContent... dc) { return new TableTag().with(dc); } + public static TableTag table (Attr.ShortForm shortAttr) { return Attr.addTo( new TableTag(), shortAttr); } + public static TableTag table (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new TableTag().withText(text), shortAttr); } + public static TableTag table (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new TableTag().with(dc), shortAttr); } + + public static TbodyTag tbody () { return new TbodyTag(); } + public static TbodyTag tbody (String text) { return new TbodyTag().withText(text); } + public static TbodyTag tbody (DomContent... dc) { return new TbodyTag().with(dc); } + public static TbodyTag tbody (Attr.ShortForm shortAttr) { return Attr.addTo( new TbodyTag(), shortAttr); } + public static TbodyTag tbody (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new TbodyTag().withText(text), shortAttr); } + public static TbodyTag tbody (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new TbodyTag().with(dc), shortAttr); } + + public static TdTag td () { return new TdTag(); } + public static TdTag td (String text) { return new TdTag().withText(text); } + public static TdTag td (DomContent... dc) { return new TdTag().with(dc); } + public static TdTag td (Attr.ShortForm shortAttr) { return Attr.addTo( new TdTag(), shortAttr); } + public static TdTag td (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new TdTag().withText(text), shortAttr); } + public static TdTag td (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new TdTag().with(dc), shortAttr); } + + public static TextareaTag textarea () { return new TextareaTag(); } + public static TextareaTag textarea (String text) { return new TextareaTag().withText(text); } + public static TextareaTag textarea (DomContent... dc) { return new TextareaTag().with(dc); } + public static TextareaTag textarea (Attr.ShortForm shortAttr) { return Attr.addTo( new TextareaTag(), shortAttr); } + public static TextareaTag textarea (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new TextareaTag().withText(text), shortAttr); } + public static TextareaTag textarea (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new TextareaTag().with(dc), shortAttr); } + + public static TfootTag tfoot () { return new TfootTag(); } + public static TfootTag tfoot (String text) { return new TfootTag().withText(text); } + public static TfootTag tfoot (DomContent... dc) { return new TfootTag().with(dc); } + public static TfootTag tfoot (Attr.ShortForm shortAttr) { return Attr.addTo( new TfootTag(), shortAttr); } + public static TfootTag tfoot (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new TfootTag().withText(text), shortAttr); } + public static TfootTag tfoot (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new TfootTag().with(dc), shortAttr); } + + public static ThTag th () { return new ThTag(); } + public static ThTag th (String text) { return new ThTag().withText(text); } + public static ThTag th (DomContent... dc) { return new ThTag().with(dc); } + public static ThTag th (Attr.ShortForm shortAttr) { return Attr.addTo( new ThTag(), shortAttr); } + public static ThTag th (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new ThTag().withText(text), shortAttr); } + public static ThTag th (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new ThTag().with(dc), shortAttr); } + + public static TheadTag thead () { return new TheadTag(); } + public static TheadTag thead (String text) { return new TheadTag().withText(text); } + public static TheadTag thead (DomContent... dc) { return new TheadTag().with(dc); } + public static TheadTag thead (Attr.ShortForm shortAttr) { return Attr.addTo( new TheadTag(), shortAttr); } + public static TheadTag thead (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new TheadTag().withText(text), shortAttr); } + public static TheadTag thead (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new TheadTag().with(dc), shortAttr); } + + public static TimeTag time () { return new TimeTag(); } + public static TimeTag time (String text) { return new TimeTag().withText(text); } + public static TimeTag time (DomContent... dc) { return new TimeTag().with(dc); } + public static TimeTag time (Attr.ShortForm shortAttr) { return Attr.addTo( new TimeTag(), shortAttr); } + public static TimeTag time (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new TimeTag().withText(text), shortAttr); } + public static TimeTag time (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new TimeTag().with(dc), shortAttr); } + + public static TitleTag title () { return new TitleTag(); } + public static TitleTag title (String text) { return new TitleTag().withText(text); } + public static TitleTag title (DomContent... dc) { return new TitleTag().with(dc); } + public static TitleTag title (Attr.ShortForm shortAttr) { return Attr.addTo( new TitleTag(), shortAttr); } + public static TitleTag title (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new TitleTag().withText(text), shortAttr); } + public static TitleTag title (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new TitleTag().with(dc), shortAttr); } + + public static TrTag tr () { return new TrTag(); } + public static TrTag tr (String text) { return new TrTag().withText(text); } + public static TrTag tr (DomContent... dc) { return new TrTag().with(dc); } + public static TrTag tr (Attr.ShortForm shortAttr) { return Attr.addTo( new TrTag(), shortAttr); } + public static TrTag tr (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new TrTag().withText(text), shortAttr); } + public static TrTag tr (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new TrTag().with(dc), shortAttr); } + + public static UTag u () { return new UTag(); } + public static UTag u (String text) { return new UTag().withText(text); } + public static UTag u (DomContent... dc) { return new UTag().with(dc); } + public static UTag u (Attr.ShortForm shortAttr) { return Attr.addTo( new UTag(), shortAttr); } + public static UTag u (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new UTag().withText(text), shortAttr); } + public static UTag u (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new UTag().with(dc), shortAttr); } + + public static UlTag ul () { return new UlTag(); } + public static UlTag ul (String text) { return new UlTag().withText(text); } + public static UlTag ul (DomContent... dc) { return new UlTag().with(dc); } + public static UlTag ul (Attr.ShortForm shortAttr) { return Attr.addTo( new UlTag(), shortAttr); } + public static UlTag ul (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new UlTag().withText(text), shortAttr); } + public static UlTag ul (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new UlTag().with(dc), shortAttr); } + + public static VarTag var () { return new VarTag(); } + public static VarTag var (String text) { return new VarTag().withText(text); } + public static VarTag var (DomContent... dc) { return new VarTag().with(dc); } + public static VarTag var (Attr.ShortForm shortAttr) { return Attr.addTo( new VarTag(), shortAttr); } + public static VarTag var (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new VarTag().withText(text), shortAttr); } + public static VarTag var (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new VarTag().with(dc), shortAttr); } + + public static VideoTag video () { return new VideoTag(); } + public static VideoTag video (String text) { return new VideoTag().withText(text); } + public static VideoTag video (DomContent... dc) { return new VideoTag().with(dc); } + public static VideoTag video (Attr.ShortForm shortAttr) { return Attr.addTo( new VideoTag(), shortAttr); } + public static VideoTag video (Attr.ShortForm shortAttr, String text) { return Attr.addTo( new VideoTag().withText(text), shortAttr); } + public static VideoTag video (Attr.ShortForm shortAttr, DomContent... dc) { return Attr.addTo( new VideoTag().with(dc), shortAttr); } } diff --git a/library/src/main/java/j2html/tags/ContainerTag.java b/library/src/main/java/j2html/tags/ContainerTag.java index cad2231..5fc688b 100644 --- a/library/src/main/java/j2html/tags/ContainerTag.java +++ b/library/src/main/java/j2html/tags/ContainerTag.java @@ -32,11 +32,11 @@ public class ContainerTag> extends Tag { if (this == child) { throw new RuntimeException("Cannot append a tag to itself."); } - if (child == null) { - return (T)this; // in some cases, like when using iff(), we ignore null children + if (child != null) { + // in some cases, like when using iff(), we ignore null children + children.add(child); } - children.add(child); - return (T)this; + return self(); } @@ -49,7 +49,7 @@ public class ContainerTag> extends Tag { * @return itself for easy chaining */ public T condWith(boolean condition, DomContent child) { - return condition ? this.with(child) : (T)this; + return condition ? this.with(child) : self(); } @@ -65,7 +65,7 @@ public class ContainerTag> extends Tag { this.with(child); } } - return (T)this; + return self(); } @@ -78,7 +78,7 @@ public class ContainerTag> extends Tag { * @return itself for easy chaining */ public T condWith(boolean condition, Iterable children) { - return condition ? this.with(children) : (T)this; + return condition ? this.with(children) : self(); } @@ -92,7 +92,7 @@ public class ContainerTag> extends Tag { for (DomContent child : children) { with(child); } - return (T)this; + return self(); } @@ -104,7 +104,7 @@ public class ContainerTag> extends Tag { */ public T with(Stream children) { children.forEach(this::with); - return (T)this; + return self(); } @@ -117,7 +117,7 @@ public class ContainerTag> extends Tag { * @return itself for easy chaining */ public T condWith(boolean condition, DomContent... children) { - return condition ? this.with(children) : (T)this; + return condition ? this.with(children) : self(); } diff --git a/library/src/main/java/j2html/tags/IInstance.java b/library/src/main/java/j2html/tags/IInstance.java index 5f331a9..42cb9fd 100644 --- a/library/src/main/java/j2html/tags/IInstance.java +++ b/library/src/main/java/j2html/tags/IInstance.java @@ -4,11 +4,12 @@ public interface IInstance { //to get the actual instance // (every implementing class would have to implement: { return this; } - // public T get(); + // public T self(); // this method shows up in autocomplete. // this is really undesireable as it does not do anything. - default T get() { + @SuppressWarnings("unchecked") + default T self() { //we know that the implementing class will supply //its own type as the type argument. //therefore every instance of IInstance can assume it diff --git a/library/src/main/java/j2html/tags/InlineStaticResource.java b/library/src/main/java/j2html/tags/InlineStaticResource.java index 9554f8f..7fb38f1 100644 --- a/library/src/main/java/j2html/tags/InlineStaticResource.java +++ b/library/src/main/java/j2html/tags/InlineStaticResource.java @@ -4,13 +4,14 @@ import j2html.Config; import java.io.FileInputStream; import java.io.InputStream; import java.util.Scanner; + import static j2html.TagCreator.rawHtml; import static j2html.TagCreator.script; import static j2html.TagCreator.style; public class InlineStaticResource { - public static ContainerTag get(String path, TargetFormat format) { + public static ContainerTag> get(String path, TargetFormat format) { String fileString = getFileAsString(path); switch (format) { case CSS_MIN: diff --git a/library/src/main/java/j2html/tags/Tag.java b/library/src/main/java/j2html/tags/Tag.java index ed274ec..480b980 100644 --- a/library/src/main/java/j2html/tags/Tag.java +++ b/library/src/main/java/j2html/tags/Tag.java @@ -5,9 +5,9 @@ import j2html.attributes.Attribute; import java.util.ArrayList; import java.util.Iterator; -public abstract class Tag> extends DomContent { - protected String tagName; - private ArrayList attributes; +public abstract class Tag> extends DomContent implements IInstance { + private final String tagName; + private final ArrayList attributes; protected Tag(String tagName) { this.tagName = tagName; @@ -54,7 +54,7 @@ public abstract class Tag> extends DomContent { */ public T attr(String attribute, Object value) { setAttribute(attribute, value == null ? null : String.valueOf(value)); - return (T) this; + return self(); } /** @@ -76,7 +76,7 @@ public abstract class Tag> extends DomContent { } } attributes.add(attribute); - return (T) this; + return self(); } /** @@ -100,15 +100,15 @@ public abstract class Tag> extends DomContent { * @return itself for easy chaining */ public T condAttr(boolean condition, String attribute, String value) { - return (condition ? attr(attribute, value) : (T) this); + return (condition ? attr(attribute, value) : self()); } @Override public boolean equals(Object obj) { - if (obj == null || !(obj instanceof Tag)) { + if (!(obj instanceof Tag)) { return false; } - return ((Tag) obj).render().equals(this.render()); + return ((Tag) obj).render().equals(this.render()); } /** diff --git a/library/src/main/java/j2html/tags/Text.java b/library/src/main/java/j2html/tags/Text.java index f31293a..8a512ec 100644 --- a/library/src/main/java/j2html/tags/Text.java +++ b/library/src/main/java/j2html/tags/Text.java @@ -8,7 +8,7 @@ import java.io.IOException; public class Text extends DomContent { - private String text; + private final String text; public Text(String text) { this.text = text; diff --git a/library/src/main/java/j2html/tags/UnescapedText.java b/library/src/main/java/j2html/tags/UnescapedText.java index 24a152f..03fb362 100644 --- a/library/src/main/java/j2html/tags/UnescapedText.java +++ b/library/src/main/java/j2html/tags/UnescapedText.java @@ -8,7 +8,7 @@ import java.io.IOException; public class UnescapedText extends DomContent { - private String text; + private final String text; public UnescapedText(String text) { this.text = text; diff --git a/library/src/main/java/j2html/tags/attributes/IAccept.java b/library/src/main/java/j2html/tags/attributes/IAccept.java index 30a9377..ceb625f 100644 --- a/library/src/main/java/j2html/tags/attributes/IAccept.java +++ b/library/src/main/java/j2html/tags/attributes/IAccept.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IAccept extends IInstance { +public interface IAccept> extends IInstance { default T withAccept(final String accept_) { - get().attr("accept", accept_); - return get(); + return self().attr("accept", accept_); } default T withCondAccept(final boolean enable, final String accept_) { if (enable) { - get().attr("accept", accept_); + self().attr("accept", accept_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IAction.java b/library/src/main/java/j2html/tags/attributes/IAction.java index 2384521..e8c7a42 100644 --- a/library/src/main/java/j2html/tags/attributes/IAction.java +++ b/library/src/main/java/j2html/tags/attributes/IAction.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IAction extends IInstance { +public interface IAction> extends IInstance { default T withAction(final String action_) { - get().attr("action", action_); - return get(); + return self().attr("action", action_); } default T withCondAction(final boolean enable, final String action_) { if (enable) { - get().attr("action", action_); + self().attr("action", action_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IAlt.java b/library/src/main/java/j2html/tags/attributes/IAlt.java index 54e549e..3ae6826 100644 --- a/library/src/main/java/j2html/tags/attributes/IAlt.java +++ b/library/src/main/java/j2html/tags/attributes/IAlt.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IAlt extends IInstance { +public interface IAlt> extends IInstance { default T withAlt(final String alt_) { - get().attr("alt", alt_); - return get(); + return self().attr("alt", alt_); } default T withCondAlt(final boolean enable, final String alt_) { if (enable) { - get().attr("alt", alt_); + self().attr("alt", alt_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IAsync.java b/library/src/main/java/j2html/tags/attributes/IAsync.java index fb94d86..e8ddbee 100644 --- a/library/src/main/java/j2html/tags/attributes/IAsync.java +++ b/library/src/main/java/j2html/tags/attributes/IAsync.java @@ -3,16 +3,16 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IAsync extends IInstance { +public interface IAsync> extends IInstance { default T isAsync() { - get().attr("async"); - return get(); + self().attr("async"); + return self(); } default T withCondAsync(final boolean enable) { if (enable) { - get().attr("async"); + self().attr("async"); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IAutocomplete.java b/library/src/main/java/j2html/tags/attributes/IAutocomplete.java index b15646b..f06b6b4 100644 --- a/library/src/main/java/j2html/tags/attributes/IAutocomplete.java +++ b/library/src/main/java/j2html/tags/attributes/IAutocomplete.java @@ -3,16 +3,16 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IAutocomplete extends IInstance { +public interface IAutocomplete> extends IInstance { default T isAutocomplete() { - get().attr("autocomplete", "on"); - return get(); + self().attr("autocomplete", "on"); + return self(); } default T withCondAutocomplete(final boolean enable) { if (enable) { - get().attr("autocomplete", "on"); + self().attr("autocomplete", "on"); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IAutofocus.java b/library/src/main/java/j2html/tags/attributes/IAutofocus.java index 04dae2c..7ca8dc4 100644 --- a/library/src/main/java/j2html/tags/attributes/IAutofocus.java +++ b/library/src/main/java/j2html/tags/attributes/IAutofocus.java @@ -3,16 +3,16 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IAutofocus extends IInstance { +public interface IAutofocus> extends IInstance { default T isAutofocus() { - get().attr("autofocus"); - return get(); + self().attr("autofocus"); + return self(); } default T withCondAutofocus(final boolean enable) { if (enable) { - get().attr("autofocus"); + self().attr("autofocus"); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IAutoplay.java b/library/src/main/java/j2html/tags/attributes/IAutoplay.java index d127e50..6f68991 100644 --- a/library/src/main/java/j2html/tags/attributes/IAutoplay.java +++ b/library/src/main/java/j2html/tags/attributes/IAutoplay.java @@ -3,16 +3,16 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IAutoplay extends IInstance { +public interface IAutoplay> extends IInstance { default T isAutoplay() { - get().attr("autoplay"); - return get(); + self().attr("autoplay"); + return self(); } default T withCondAutoplay(final boolean enable) { if (enable) { - get().attr("autoplay"); + self().attr("autoplay"); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/ICharset.java b/library/src/main/java/j2html/tags/attributes/ICharset.java index dc30d81..b2ebcc9 100644 --- a/library/src/main/java/j2html/tags/attributes/ICharset.java +++ b/library/src/main/java/j2html/tags/attributes/ICharset.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface ICharset extends IInstance { +public interface ICharset> extends IInstance { default T withCharset(final String charset_) { - get().attr("charset", charset_); - return get(); + return self().attr("charset", charset_); } default T withCondCharset(final boolean enable, final String charset_) { if (enable) { - get().attr("charset", charset_); + self().attr("charset", charset_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IChecked.java b/library/src/main/java/j2html/tags/attributes/IChecked.java index ed5979a..44a2f11 100644 --- a/library/src/main/java/j2html/tags/attributes/IChecked.java +++ b/library/src/main/java/j2html/tags/attributes/IChecked.java @@ -3,16 +3,16 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IChecked extends IInstance { +public interface IChecked> extends IInstance { default T isChecked() { - get().attr("checked"); - return get(); + self().attr("checked"); + return self(); } default T withCondChecked(final boolean enable) { if (enable) { - get().attr("checked"); + self().attr("checked"); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/ICite.java b/library/src/main/java/j2html/tags/attributes/ICite.java index 7a5f0df..c237ab6 100644 --- a/library/src/main/java/j2html/tags/attributes/ICite.java +++ b/library/src/main/java/j2html/tags/attributes/ICite.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface ICite extends IInstance { +public interface ICite> extends IInstance { default T withCite(final String cite_) { - get().attr("cite", cite_); - return get(); + return self().attr("cite", cite_); } default T withCondCite(final boolean enable, final String cite_) { if (enable) { - get().attr("cite", cite_); + self().attr("cite", cite_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/ICols.java b/library/src/main/java/j2html/tags/attributes/ICols.java index ef554d5..4110014 100644 --- a/library/src/main/java/j2html/tags/attributes/ICols.java +++ b/library/src/main/java/j2html/tags/attributes/ICols.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface ICols extends IInstance { +public interface ICols> extends IInstance { default T withCols(final String cols_) { - get().attr("cols", cols_); - return get(); + return self().attr("cols", cols_); } default T withCondCols(final boolean enable, final String cols_) { if (enable) { - get().attr("cols", cols_); + self().attr("cols", cols_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IColspan.java b/library/src/main/java/j2html/tags/attributes/IColspan.java index 3be0bf5..bbec244 100644 --- a/library/src/main/java/j2html/tags/attributes/IColspan.java +++ b/library/src/main/java/j2html/tags/attributes/IColspan.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IColspan extends IInstance { +public interface IColspan> extends IInstance { default T withColspan(final String colspan_) { - get().attr("colspan", colspan_); - return get(); + return self().attr("colspan", colspan_); } default T withCondColspan(final boolean enable, final String colspan_) { if (enable) { - get().attr("colspan", colspan_); + self().attr("colspan", colspan_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IContent.java b/library/src/main/java/j2html/tags/attributes/IContent.java index 777f912..24a465e 100644 --- a/library/src/main/java/j2html/tags/attributes/IContent.java +++ b/library/src/main/java/j2html/tags/attributes/IContent.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IContent extends IInstance { +public interface IContent> extends IInstance { default T withContent(final String content_) { - get().attr("content", content_); - return get(); + return self().attr("content", content_); } default T withCondContent(final boolean enable, final String content_) { if (enable) { - get().attr("content", content_); + self().attr("content", content_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IControls.java b/library/src/main/java/j2html/tags/attributes/IControls.java index d1561d0..d2cca01 100644 --- a/library/src/main/java/j2html/tags/attributes/IControls.java +++ b/library/src/main/java/j2html/tags/attributes/IControls.java @@ -3,16 +3,16 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IControls extends IInstance { +public interface IControls> extends IInstance { default T isControls() { - get().attr("controls"); - return get(); + self().attr("controls"); + return self(); } default T withCondControls(final boolean enable) { if (enable) { - get().attr("controls"); + self().attr("controls"); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/ICoords.java b/library/src/main/java/j2html/tags/attributes/ICoords.java index 70db5ec..c341932 100644 --- a/library/src/main/java/j2html/tags/attributes/ICoords.java +++ b/library/src/main/java/j2html/tags/attributes/ICoords.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface ICoords extends IInstance { +public interface ICoords> extends IInstance { default T withCoords(final String coords_) { - get().attr("coords", coords_); - return get(); + return self().attr("coords", coords_); } default T withCondCoords(final boolean enable, final String coords_) { if (enable) { - get().attr("coords", coords_); + self().attr("coords", coords_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IData.java b/library/src/main/java/j2html/tags/attributes/IData.java index 3f54ae9..205a283 100644 --- a/library/src/main/java/j2html/tags/attributes/IData.java +++ b/library/src/main/java/j2html/tags/attributes/IData.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IData extends IInstance { +public interface IData> extends IInstance { default T withData(final String data_) { - get().attr("data", data_); - return get(); + return self().attr("data", data_); } default T withCondData(final boolean enable, final String data_) { if (enable) { - get().attr("data", data_); + self().attr("data", data_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IDatetime.java b/library/src/main/java/j2html/tags/attributes/IDatetime.java index 4ee7bd3..0824c9f 100644 --- a/library/src/main/java/j2html/tags/attributes/IDatetime.java +++ b/library/src/main/java/j2html/tags/attributes/IDatetime.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IDatetime extends IInstance { +public interface IDatetime> extends IInstance { default T withDatetime(final String datetime_) { - get().attr("datetime", datetime_); - return get(); + return self().attr("datetime", datetime_); } default T withCondDatetime(final boolean enable, final String datetime_) { if (enable) { - get().attr("datetime", datetime_); + self().attr("datetime", datetime_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IDefault.java b/library/src/main/java/j2html/tags/attributes/IDefault.java index baffa38..248b02c 100644 --- a/library/src/main/java/j2html/tags/attributes/IDefault.java +++ b/library/src/main/java/j2html/tags/attributes/IDefault.java @@ -3,16 +3,16 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IDefault extends IInstance { +public interface IDefault> extends IInstance { default T isDefault() { - get().attr("default"); - return get(); + self().attr("default"); + return self(); } default T withCondDefault(final boolean enable) { if (enable) { - get().attr("default"); + self().attr("default"); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IDefer.java b/library/src/main/java/j2html/tags/attributes/IDefer.java index 9a6060b..57533f6 100644 --- a/library/src/main/java/j2html/tags/attributes/IDefer.java +++ b/library/src/main/java/j2html/tags/attributes/IDefer.java @@ -3,16 +3,16 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IDefer extends IInstance { +public interface IDefer> extends IInstance { default T isDefer() { - get().attr("defer"); - return get(); + self().attr("defer"); + return self(); } default T withCondDefer(final boolean enable) { if (enable) { - get().attr("defer"); + self().attr("defer"); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IDirname.java b/library/src/main/java/j2html/tags/attributes/IDirname.java index b273cae..4cfb5e6 100644 --- a/library/src/main/java/j2html/tags/attributes/IDirname.java +++ b/library/src/main/java/j2html/tags/attributes/IDirname.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IDirname extends IInstance { +public interface IDirname> extends IInstance { default T withDirname(final String dirname_) { - get().attr("dirname", dirname_); - return get(); + return self().attr("dirname", dirname_); } default T withCondDirname(final boolean enable, final String dirname_) { if (enable) { - get().attr("dirname", dirname_); + self().attr("dirname", dirname_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IDisabled.java b/library/src/main/java/j2html/tags/attributes/IDisabled.java index e55c49e..23ae30c 100644 --- a/library/src/main/java/j2html/tags/attributes/IDisabled.java +++ b/library/src/main/java/j2html/tags/attributes/IDisabled.java @@ -3,16 +3,16 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IDisabled extends IInstance { +public interface IDisabled> extends IInstance { default T isDisabled() { - get().attr("disabled"); - return get(); + self().attr("disabled"); + return self(); } default T withCondDisabled(final boolean enable) { if (enable) { - get().attr("disabled"); + self().attr("disabled"); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IDownload.java b/library/src/main/java/j2html/tags/attributes/IDownload.java index 25fec97..f1f8d29 100644 --- a/library/src/main/java/j2html/tags/attributes/IDownload.java +++ b/library/src/main/java/j2html/tags/attributes/IDownload.java @@ -3,16 +3,16 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IDownload extends IInstance { +public interface IDownload> extends IInstance { default T isDownload() { - get().attr("download"); - return get(); + self().attr("download"); + return self(); } default T withCondDownload(final boolean enable) { if (enable) { - get().attr("download"); + self().attr("download"); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IEnctype.java b/library/src/main/java/j2html/tags/attributes/IEnctype.java index 7cbc9f3..fc901ef 100644 --- a/library/src/main/java/j2html/tags/attributes/IEnctype.java +++ b/library/src/main/java/j2html/tags/attributes/IEnctype.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IEnctype extends IInstance { +public interface IEnctype> extends IInstance { default T withEnctype(final String enctype_) { - get().attr("enctype", enctype_); - return get(); + return self().attr("enctype", enctype_); } default T withCondEnctype(final boolean enable, final String enctype_) { if (enable) { - get().attr("enctype", enctype_); + self().attr("enctype", enctype_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IFor.java b/library/src/main/java/j2html/tags/attributes/IFor.java index 2ab8778..6cd529e 100644 --- a/library/src/main/java/j2html/tags/attributes/IFor.java +++ b/library/src/main/java/j2html/tags/attributes/IFor.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IFor extends IInstance { +public interface IFor> extends IInstance { default T withFor(final String for_) { - get().attr("for", for_); - return get(); + return self().attr("for", for_); } default T withCondFor(final boolean enable, final String for_) { if (enable) { - get().attr("for", for_); + self().attr("for", for_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IForm.java b/library/src/main/java/j2html/tags/attributes/IForm.java index 44c1f08..f139f42 100644 --- a/library/src/main/java/j2html/tags/attributes/IForm.java +++ b/library/src/main/java/j2html/tags/attributes/IForm.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IForm extends IInstance { +public interface IForm> extends IInstance { default T withForm(final String form_) { - get().attr("form", form_); - return get(); + return self().attr("form", form_); } default T withCondForm(final boolean enable, final String form_) { if (enable) { - get().attr("form", form_); + self().attr("form", form_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IFormaction.java b/library/src/main/java/j2html/tags/attributes/IFormaction.java index 285efaf..ebba206 100644 --- a/library/src/main/java/j2html/tags/attributes/IFormaction.java +++ b/library/src/main/java/j2html/tags/attributes/IFormaction.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IFormaction extends IInstance { +public interface IFormaction> extends IInstance { default T withFormaction(final String formaction_) { - get().attr("formaction", formaction_); - return get(); + return self().attr("formaction", formaction_); } default T withCondFormaction(final boolean enable, final String formaction_) { if (enable) { - get().attr("formaction", formaction_); + self().attr("formaction", formaction_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IHeaders.java b/library/src/main/java/j2html/tags/attributes/IHeaders.java index 0fae661..0cfa3bc 100644 --- a/library/src/main/java/j2html/tags/attributes/IHeaders.java +++ b/library/src/main/java/j2html/tags/attributes/IHeaders.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IHeaders extends IInstance { +public interface IHeaders> extends IInstance { default T withHeaders(final String headers_) { - get().attr("headers", headers_); - return get(); + return self().attr("headers", headers_); } default T withCondHeaders(final boolean enable, final String headers_) { if (enable) { - get().attr("headers", headers_); + self().attr("headers", headers_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IHeight.java b/library/src/main/java/j2html/tags/attributes/IHeight.java index bd3bde7..73db1d4 100644 --- a/library/src/main/java/j2html/tags/attributes/IHeight.java +++ b/library/src/main/java/j2html/tags/attributes/IHeight.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IHeight extends IInstance { +public interface IHeight> extends IInstance { default T withHeight(final String height_) { - get().attr("height", height_); - return get(); + return self().attr("height", height_); } default T withCondHeight(final boolean enable, final String height_) { if (enable) { - get().attr("height", height_); + self().attr("height", height_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IHigh.java b/library/src/main/java/j2html/tags/attributes/IHigh.java index b422dc7..377e48b 100644 --- a/library/src/main/java/j2html/tags/attributes/IHigh.java +++ b/library/src/main/java/j2html/tags/attributes/IHigh.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IHigh extends IInstance { +public interface IHigh> extends IInstance { default T withHigh(final String high_) { - get().attr("high", high_); - return get(); + return self().attr("high", high_); } default T withCondHigh(final boolean enable, final String high_) { if (enable) { - get().attr("high", high_); + self().attr("high", high_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IHref.java b/library/src/main/java/j2html/tags/attributes/IHref.java index 9864cb3..b854e8b 100644 --- a/library/src/main/java/j2html/tags/attributes/IHref.java +++ b/library/src/main/java/j2html/tags/attributes/IHref.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IHref extends IInstance { +public interface IHref> extends IInstance { default T withHref(final String href_) { - get().attr("href", href_); - return get(); + return self().attr("href", href_); } default T withCondHref(final boolean enable, final String href_) { if (enable) { - get().attr("href", href_); + self().attr("href", href_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IHreflang.java b/library/src/main/java/j2html/tags/attributes/IHreflang.java index 4d7165e..9efb25d 100644 --- a/library/src/main/java/j2html/tags/attributes/IHreflang.java +++ b/library/src/main/java/j2html/tags/attributes/IHreflang.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IHreflang extends IInstance { +public interface IHreflang> extends IInstance { default T withHreflang(final String hreflang_) { - get().attr("hreflang", hreflang_); - return get(); + return self().attr("hreflang", hreflang_); } default T withCondHreflang(final boolean enable, final String hreflang_) { if (enable) { - get().attr("hreflang", hreflang_); + self().attr("hreflang", hreflang_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IIsmap.java b/library/src/main/java/j2html/tags/attributes/IIsmap.java index a080e50..93fb982 100644 --- a/library/src/main/java/j2html/tags/attributes/IIsmap.java +++ b/library/src/main/java/j2html/tags/attributes/IIsmap.java @@ -3,16 +3,16 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IIsmap extends IInstance { +public interface IIsmap> extends IInstance { default T isIsmap() { - get().attr("ismap"); - return get(); + self().attr("ismap"); + return self(); } default T withCondIsmap(final boolean enable) { if (enable) { - get().attr("ismap"); + self().attr("ismap"); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IKind.java b/library/src/main/java/j2html/tags/attributes/IKind.java index 6d7e665..5c11d5c 100644 --- a/library/src/main/java/j2html/tags/attributes/IKind.java +++ b/library/src/main/java/j2html/tags/attributes/IKind.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IKind extends IInstance { +public interface IKind> extends IInstance { default T withKind(final String kind_) { - get().attr("kind", kind_); - return get(); + return self().attr("kind", kind_); } default T withCondKind(final boolean enable, final String kind_) { if (enable) { - get().attr("kind", kind_); + self().attr("kind", kind_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/ILabel.java b/library/src/main/java/j2html/tags/attributes/ILabel.java index 8186ed8..846fac4 100644 --- a/library/src/main/java/j2html/tags/attributes/ILabel.java +++ b/library/src/main/java/j2html/tags/attributes/ILabel.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface ILabel extends IInstance { +public interface ILabel> extends IInstance { default T withLabel(final String label_) { - get().attr("label", label_); - return get(); + return self().attr("label", label_); } default T withCondLabel(final boolean enable, final String label_) { if (enable) { - get().attr("label", label_); + self().attr("label", label_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IList.java b/library/src/main/java/j2html/tags/attributes/IList.java index 9eb3534..8351373 100644 --- a/library/src/main/java/j2html/tags/attributes/IList.java +++ b/library/src/main/java/j2html/tags/attributes/IList.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IList extends IInstance { +public interface IList> extends IInstance { default T withList(final String list_) { - get().attr("list", list_); - return get(); + return self().attr("list", list_); } default T withCondList(final boolean enable, final String list_) { if (enable) { - get().attr("list", list_); + self().attr("list", list_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/ILoop.java b/library/src/main/java/j2html/tags/attributes/ILoop.java index d57266a..ea566ce 100644 --- a/library/src/main/java/j2html/tags/attributes/ILoop.java +++ b/library/src/main/java/j2html/tags/attributes/ILoop.java @@ -3,16 +3,16 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface ILoop extends IInstance { +public interface ILoop> extends IInstance { default T isLoop() { - get().attr("loop"); - return get(); + self().attr("loop"); + return self(); } default T withCondLoop(final boolean enable) { if (enable) { - get().attr("loop"); + self().attr("loop"); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/ILow.java b/library/src/main/java/j2html/tags/attributes/ILow.java index 1a15f92..0f06d2f 100644 --- a/library/src/main/java/j2html/tags/attributes/ILow.java +++ b/library/src/main/java/j2html/tags/attributes/ILow.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface ILow extends IInstance { +public interface ILow> extends IInstance { default T withLow(final String low_) { - get().attr("low", low_); - return get(); + return self().attr("low", low_); } default T withCondLow(final boolean enable, final String low_) { if (enable) { - get().attr("low", low_); + self().attr("low", low_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IMax.java b/library/src/main/java/j2html/tags/attributes/IMax.java index 56c080b..f2f8a66 100644 --- a/library/src/main/java/j2html/tags/attributes/IMax.java +++ b/library/src/main/java/j2html/tags/attributes/IMax.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IMax extends IInstance { +public interface IMax> extends IInstance { default T withMax(final String max_) { - get().attr("max", max_); - return get(); + return self().attr("max", max_); } default T withCondMax(final boolean enable, final String max_) { if (enable) { - get().attr("max", max_); + self().attr("max", max_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IMaxlength.java b/library/src/main/java/j2html/tags/attributes/IMaxlength.java index 492a4ed..431640f 100644 --- a/library/src/main/java/j2html/tags/attributes/IMaxlength.java +++ b/library/src/main/java/j2html/tags/attributes/IMaxlength.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IMaxlength extends IInstance { +public interface IMaxlength> extends IInstance { default T withMaxlength(final String maxlength_) { - get().attr("maxlength", maxlength_); - return get(); + return self().attr("maxlength", maxlength_); } default T withCondMaxlength(final boolean enable, final String maxlength_) { if (enable) { - get().attr("maxlength", maxlength_); + self().attr("maxlength", maxlength_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IMedia.java b/library/src/main/java/j2html/tags/attributes/IMedia.java index cc96ae8..bdcf662 100644 --- a/library/src/main/java/j2html/tags/attributes/IMedia.java +++ b/library/src/main/java/j2html/tags/attributes/IMedia.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IMedia extends IInstance { +public interface IMedia> extends IInstance { default T withMedia(final String media_) { - get().attr("media", media_); - return get(); + return self().attr("media", media_); } default T withCondMedia(final boolean enable, final String media_) { if (enable) { - get().attr("media", media_); + self().attr("media", media_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IMethod.java b/library/src/main/java/j2html/tags/attributes/IMethod.java index 656cfea..505241b 100644 --- a/library/src/main/java/j2html/tags/attributes/IMethod.java +++ b/library/src/main/java/j2html/tags/attributes/IMethod.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IMethod extends IInstance { +public interface IMethod> extends IInstance { default T withMethod(final String method_) { - get().attr("method", method_); - return get(); + return self().attr("method", method_); } default T withCondMethod(final boolean enable, final String method_) { if (enable) { - get().attr("method", method_); + self().attr("method", method_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IMin.java b/library/src/main/java/j2html/tags/attributes/IMin.java index cc0a87a..e6dbe17 100644 --- a/library/src/main/java/j2html/tags/attributes/IMin.java +++ b/library/src/main/java/j2html/tags/attributes/IMin.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IMin extends IInstance { +public interface IMin> extends IInstance { default T withMin(final String min_) { - get().attr("min", min_); - return get(); + return self().attr("min", min_); } default T withCondMin(final boolean enable, final String min_) { if (enable) { - get().attr("min", min_); + self().attr("min", min_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IMultiple.java b/library/src/main/java/j2html/tags/attributes/IMultiple.java index c3f76cf..4f8d3e9 100644 --- a/library/src/main/java/j2html/tags/attributes/IMultiple.java +++ b/library/src/main/java/j2html/tags/attributes/IMultiple.java @@ -3,16 +3,16 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IMultiple extends IInstance { +public interface IMultiple> extends IInstance { default T isMultiple() { - get().attr("multiple"); - return get(); + self().attr("multiple"); + return self(); } default T withCondMultiple(final boolean enable) { if (enable) { - get().attr("multiple"); + self().attr("multiple"); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IMuted.java b/library/src/main/java/j2html/tags/attributes/IMuted.java index cbf85a3..8ae4bb7 100644 --- a/library/src/main/java/j2html/tags/attributes/IMuted.java +++ b/library/src/main/java/j2html/tags/attributes/IMuted.java @@ -3,16 +3,16 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IMuted extends IInstance { +public interface IMuted> extends IInstance { default T isMuted() { - get().attr("muted"); - return get(); + self().attr("muted"); + return self(); } default T withCondMuted(final boolean enable) { if (enable) { - get().attr("muted"); + self().attr("muted"); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IName.java b/library/src/main/java/j2html/tags/attributes/IName.java index 9e0200c..e6216bd 100644 --- a/library/src/main/java/j2html/tags/attributes/IName.java +++ b/library/src/main/java/j2html/tags/attributes/IName.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IName extends IInstance { +public interface IName> extends IInstance { default T withName(final String name_) { - get().attr("name", name_); - return get(); + return self().attr("name", name_); } default T withCondName(final boolean enable, final String name_) { if (enable) { - get().attr("name", name_); + self().attr("name", name_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/INovalidate.java b/library/src/main/java/j2html/tags/attributes/INovalidate.java index c7eb14f..50948bc 100644 --- a/library/src/main/java/j2html/tags/attributes/INovalidate.java +++ b/library/src/main/java/j2html/tags/attributes/INovalidate.java @@ -3,16 +3,16 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface INovalidate extends IInstance { +public interface INovalidate> extends IInstance { default T isNovalidate() { - get().attr("novalidate"); - return get(); + self().attr("novalidate"); + return self(); } default T withCondNovalidate(final boolean enable) { if (enable) { - get().attr("novalidate"); + self().attr("novalidate"); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnabort.java b/library/src/main/java/j2html/tags/attributes/IOnabort.java index 930c02b..f08de84 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnabort.java +++ b/library/src/main/java/j2html/tags/attributes/IOnabort.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnabort extends IInstance { +public interface IOnabort> extends IInstance { default T withOnabort(final String onabort_) { - get().attr("onabort", onabort_); - return get(); + return self().attr("onabort", onabort_); } default T withCondOnabort(final boolean enable, final String onabort_) { if (enable) { - get().attr("onabort", onabort_); + self().attr("onabort", onabort_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnafterprint.java b/library/src/main/java/j2html/tags/attributes/IOnafterprint.java index a787a2e..0b09aa0 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnafterprint.java +++ b/library/src/main/java/j2html/tags/attributes/IOnafterprint.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnafterprint extends IInstance { +public interface IOnafterprint> extends IInstance { default T withOnafterprint(final String onafterprint_) { - get().attr("onafterprint", onafterprint_); - return get(); + return self().attr("onafterprint", onafterprint_); } default T withCondOnafterprint(final boolean enable, final String onafterprint_) { if (enable) { - get().attr("onafterprint", onafterprint_); + self().attr("onafterprint", onafterprint_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnbeforeprint.java b/library/src/main/java/j2html/tags/attributes/IOnbeforeprint.java index 9f061a1..7290a87 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnbeforeprint.java +++ b/library/src/main/java/j2html/tags/attributes/IOnbeforeprint.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnbeforeprint extends IInstance { +public interface IOnbeforeprint> extends IInstance { default T withOnbeforeprint(final String onbeforeprint_) { - get().attr("onbeforeprint", onbeforeprint_); - return get(); + return self().attr("onbeforeprint", onbeforeprint_); } default T withCondOnbeforeprint(final boolean enable, final String onbeforeprint_) { if (enable) { - get().attr("onbeforeprint", onbeforeprint_); + self().attr("onbeforeprint", onbeforeprint_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnbeforeunload.java b/library/src/main/java/j2html/tags/attributes/IOnbeforeunload.java index cb53ffb..1663ed7 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnbeforeunload.java +++ b/library/src/main/java/j2html/tags/attributes/IOnbeforeunload.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnbeforeunload extends IInstance { +public interface IOnbeforeunload> extends IInstance { default T withOnbeforeunload(final String onbeforeunload_) { - get().attr("onbeforeunload", onbeforeunload_); - return get(); + return self().attr("onbeforeunload", onbeforeunload_); } default T withCondOnbeforeunload(final boolean enable, final String onbeforeunload_) { if (enable) { - get().attr("onbeforeunload", onbeforeunload_); + self().attr("onbeforeunload", onbeforeunload_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOncanplay.java b/library/src/main/java/j2html/tags/attributes/IOncanplay.java index 92d595f..df1eec8 100644 --- a/library/src/main/java/j2html/tags/attributes/IOncanplay.java +++ b/library/src/main/java/j2html/tags/attributes/IOncanplay.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOncanplay extends IInstance { +public interface IOncanplay> extends IInstance { default T withOncanplay(final String oncanplay_) { - get().attr("oncanplay", oncanplay_); - return get(); + return self().attr("oncanplay", oncanplay_); } default T withCondOncanplay(final boolean enable, final String oncanplay_) { if (enable) { - get().attr("oncanplay", oncanplay_); + self().attr("oncanplay", oncanplay_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOncanplaythrough.java b/library/src/main/java/j2html/tags/attributes/IOncanplaythrough.java index c8ab0c6..80d3b1e 100644 --- a/library/src/main/java/j2html/tags/attributes/IOncanplaythrough.java +++ b/library/src/main/java/j2html/tags/attributes/IOncanplaythrough.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOncanplaythrough extends IInstance { +public interface IOncanplaythrough> extends IInstance { default T withOncanplaythrough(final String oncanplaythrough_) { - get().attr("oncanplaythrough", oncanplaythrough_); - return get(); + return self().attr("oncanplaythrough", oncanplaythrough_); } default T withCondOncanplaythrough(final boolean enable, final String oncanplaythrough_) { if (enable) { - get().attr("oncanplaythrough", oncanplaythrough_); + self().attr("oncanplaythrough", oncanplaythrough_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOncuechange.java b/library/src/main/java/j2html/tags/attributes/IOncuechange.java index 1ca0d76..78130a1 100644 --- a/library/src/main/java/j2html/tags/attributes/IOncuechange.java +++ b/library/src/main/java/j2html/tags/attributes/IOncuechange.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOncuechange extends IInstance { +public interface IOncuechange> extends IInstance { default T withOncuechange(final String oncuechange_) { - get().attr("oncuechange", oncuechange_); - return get(); + return self().attr("oncuechange", oncuechange_); } default T withCondOncuechange(final boolean enable, final String oncuechange_) { if (enable) { - get().attr("oncuechange", oncuechange_); + self().attr("oncuechange", oncuechange_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOndurationchange.java b/library/src/main/java/j2html/tags/attributes/IOndurationchange.java index 54d231c..27de602 100644 --- a/library/src/main/java/j2html/tags/attributes/IOndurationchange.java +++ b/library/src/main/java/j2html/tags/attributes/IOndurationchange.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOndurationchange extends IInstance { +public interface IOndurationchange> extends IInstance { default T withOndurationchange(final String ondurationchange_) { - get().attr("ondurationchange", ondurationchange_); - return get(); + return self().attr("ondurationchange", ondurationchange_); } default T withCondOndurationchange(final boolean enable, final String ondurationchange_) { if (enable) { - get().attr("ondurationchange", ondurationchange_); + self().attr("ondurationchange", ondurationchange_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnemptied.java b/library/src/main/java/j2html/tags/attributes/IOnemptied.java index 0334366..fb35eb1 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnemptied.java +++ b/library/src/main/java/j2html/tags/attributes/IOnemptied.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnemptied extends IInstance { +public interface IOnemptied> extends IInstance { default T withOnemptied(final String onemptied_) { - get().attr("onemptied", onemptied_); - return get(); + return self().attr("onemptied", onemptied_); } default T withCondOnemptied(final boolean enable, final String onemptied_) { if (enable) { - get().attr("onemptied", onemptied_); + self().attr("onemptied", onemptied_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnended.java b/library/src/main/java/j2html/tags/attributes/IOnended.java index 0d1d440..96e9f0c 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnended.java +++ b/library/src/main/java/j2html/tags/attributes/IOnended.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnended extends IInstance { +public interface IOnended> extends IInstance { default T withOnended(final String onended_) { - get().attr("onended", onended_); - return get(); + return self().attr("onended", onended_); } default T withCondOnended(final boolean enable, final String onended_) { if (enable) { - get().attr("onended", onended_); + self().attr("onended", onended_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnerror.java b/library/src/main/java/j2html/tags/attributes/IOnerror.java index 53fe511..da4d1b7 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnerror.java +++ b/library/src/main/java/j2html/tags/attributes/IOnerror.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnerror extends IInstance { +public interface IOnerror> extends IInstance { default T withOnerror(final String onerror_) { - get().attr("onerror", onerror_); - return get(); + return self().attr("onerror", onerror_); } default T withCondOnerror(final boolean enable, final String onerror_) { if (enable) { - get().attr("onerror", onerror_); + self().attr("onerror", onerror_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnhashchange.java b/library/src/main/java/j2html/tags/attributes/IOnhashchange.java index 2096e80..6052ae2 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnhashchange.java +++ b/library/src/main/java/j2html/tags/attributes/IOnhashchange.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnhashchange extends IInstance { +public interface IOnhashchange> extends IInstance { default T withOnhashchange(final String onhashchange_) { - get().attr("onhashchange", onhashchange_); - return get(); + return self().attr("onhashchange", onhashchange_); } default T withCondOnhashchange(final boolean enable, final String onhashchange_) { if (enable) { - get().attr("onhashchange", onhashchange_); + self().attr("onhashchange", onhashchange_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnload.java b/library/src/main/java/j2html/tags/attributes/IOnload.java index e34eb08..cff8079 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnload.java +++ b/library/src/main/java/j2html/tags/attributes/IOnload.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnload extends IInstance { +public interface IOnload> extends IInstance { default T withOnload(final String onload_) { - get().attr("onload", onload_); - return get(); + return self().attr("onload", onload_); } default T withCondOnload(final boolean enable, final String onload_) { if (enable) { - get().attr("onload", onload_); + self().attr("onload", onload_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnloadeddata.java b/library/src/main/java/j2html/tags/attributes/IOnloadeddata.java index c063950..7047505 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnloadeddata.java +++ b/library/src/main/java/j2html/tags/attributes/IOnloadeddata.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnloadeddata extends IInstance { +public interface IOnloadeddata> extends IInstance { default T withOnloadeddata(final String onloadeddata_) { - get().attr("onloadeddata", onloadeddata_); - return get(); + return self().attr("onloadeddata", onloadeddata_); } default T withCondOnloadeddata(final boolean enable, final String onloadeddata_) { if (enable) { - get().attr("onloadeddata", onloadeddata_); + self().attr("onloadeddata", onloadeddata_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnloadedmetadata.java b/library/src/main/java/j2html/tags/attributes/IOnloadedmetadata.java index 947bf80..4d160b4 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnloadedmetadata.java +++ b/library/src/main/java/j2html/tags/attributes/IOnloadedmetadata.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnloadedmetadata extends IInstance { +public interface IOnloadedmetadata> extends IInstance { default T withOnloadedmetadata(final String onloadedmetadata_) { - get().attr("onloadedmetadata", onloadedmetadata_); - return get(); + return self().attr("onloadedmetadata", onloadedmetadata_); } default T withCondOnloadedmetadata(final boolean enable, final String onloadedmetadata_) { if (enable) { - get().attr("onloadedmetadata", onloadedmetadata_); + self().attr("onloadedmetadata", onloadedmetadata_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnloadstart.java b/library/src/main/java/j2html/tags/attributes/IOnloadstart.java index 8aa4bc2..2622650 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnloadstart.java +++ b/library/src/main/java/j2html/tags/attributes/IOnloadstart.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnloadstart extends IInstance { +public interface IOnloadstart> extends IInstance { default T withOnloadstart(final String onloadstart_) { - get().attr("onloadstart", onloadstart_); - return get(); + return self().attr("onloadstart", onloadstart_); } default T withCondOnloadstart(final boolean enable, final String onloadstart_) { if (enable) { - get().attr("onloadstart", onloadstart_); + self().attr("onloadstart", onloadstart_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnoffline.java b/library/src/main/java/j2html/tags/attributes/IOnoffline.java index 16a7b4e..6dc613a 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnoffline.java +++ b/library/src/main/java/j2html/tags/attributes/IOnoffline.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnoffline extends IInstance { +public interface IOnoffline> extends IInstance { default T withOnoffline(final String onoffline_) { - get().attr("onoffline", onoffline_); - return get(); + return self().attr("onoffline", onoffline_); } default T withCondOnoffline(final boolean enable, final String onoffline_) { if (enable) { - get().attr("onoffline", onoffline_); + self().attr("onoffline", onoffline_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnonline.java b/library/src/main/java/j2html/tags/attributes/IOnonline.java index 509ef59..9fe0dd1 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnonline.java +++ b/library/src/main/java/j2html/tags/attributes/IOnonline.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnonline extends IInstance { +public interface IOnonline> extends IInstance { default T withOnonline(final String ononline_) { - get().attr("ononline", ononline_); - return get(); + return self().attr("ononline", ononline_); } default T withCondOnonline(final boolean enable, final String ononline_) { if (enable) { - get().attr("ononline", ononline_); + self().attr("ononline", ononline_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnpagehide.java b/library/src/main/java/j2html/tags/attributes/IOnpagehide.java index 51e2392..b87d90d 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnpagehide.java +++ b/library/src/main/java/j2html/tags/attributes/IOnpagehide.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnpagehide extends IInstance { +public interface IOnpagehide> extends IInstance { default T withOnpagehide(final String onpagehide_) { - get().attr("onpagehide", onpagehide_); - return get(); + return self().attr("onpagehide", onpagehide_); } default T withCondOnpagehide(final boolean enable, final String onpagehide_) { if (enable) { - get().attr("onpagehide", onpagehide_); + self().attr("onpagehide", onpagehide_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnpageshow.java b/library/src/main/java/j2html/tags/attributes/IOnpageshow.java index e2faaae..e712e15 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnpageshow.java +++ b/library/src/main/java/j2html/tags/attributes/IOnpageshow.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnpageshow extends IInstance { +public interface IOnpageshow> extends IInstance { default T withOnpageshow(final String onpageshow_) { - get().attr("onpageshow", onpageshow_); - return get(); + return self().attr("onpageshow", onpageshow_); } default T withCondOnpageshow(final boolean enable, final String onpageshow_) { if (enable) { - get().attr("onpageshow", onpageshow_); + self().attr("onpageshow", onpageshow_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnpause.java b/library/src/main/java/j2html/tags/attributes/IOnpause.java index 7394446..37560fa 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnpause.java +++ b/library/src/main/java/j2html/tags/attributes/IOnpause.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnpause extends IInstance { +public interface IOnpause> extends IInstance { default T withOnpause(final String onpause_) { - get().attr("onpause", onpause_); - return get(); + return self().attr("onpause", onpause_); } default T withCondOnpause(final boolean enable, final String onpause_) { if (enable) { - get().attr("onpause", onpause_); + self().attr("onpause", onpause_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnplay.java b/library/src/main/java/j2html/tags/attributes/IOnplay.java index 181e655..c08774b 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnplay.java +++ b/library/src/main/java/j2html/tags/attributes/IOnplay.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnplay extends IInstance { +public interface IOnplay> extends IInstance { default T withOnplay(final String onplay_) { - get().attr("onplay", onplay_); - return get(); + return self().attr("onplay", onplay_); } default T withCondOnplay(final boolean enable, final String onplay_) { if (enable) { - get().attr("onplay", onplay_); + self().attr("onplay", onplay_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnplaying.java b/library/src/main/java/j2html/tags/attributes/IOnplaying.java index afcd9b8..801f602 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnplaying.java +++ b/library/src/main/java/j2html/tags/attributes/IOnplaying.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnplaying extends IInstance { +public interface IOnplaying> extends IInstance { default T withOnplaying(final String onplaying_) { - get().attr("onplaying", onplaying_); - return get(); + return self().attr("onplaying", onplaying_); } default T withCondOnplaying(final boolean enable, final String onplaying_) { if (enable) { - get().attr("onplaying", onplaying_); + self().attr("onplaying", onplaying_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnpopstate.java b/library/src/main/java/j2html/tags/attributes/IOnpopstate.java index 6e357c2..2e07610 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnpopstate.java +++ b/library/src/main/java/j2html/tags/attributes/IOnpopstate.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnpopstate extends IInstance { +public interface IOnpopstate> extends IInstance { default T withOnpopstate(final String onpopstate_) { - get().attr("onpopstate", onpopstate_); - return get(); + return self().attr("onpopstate", onpopstate_); } default T withCondOnpopstate(final boolean enable, final String onpopstate_) { if (enable) { - get().attr("onpopstate", onpopstate_); + self().attr("onpopstate", onpopstate_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnprogress.java b/library/src/main/java/j2html/tags/attributes/IOnprogress.java index 4cd08d5..127d73a 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnprogress.java +++ b/library/src/main/java/j2html/tags/attributes/IOnprogress.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnprogress extends IInstance { +public interface IOnprogress> extends IInstance { default T withOnprogress(final String onprogress_) { - get().attr("onprogress", onprogress_); - return get(); + return self().attr("onprogress", onprogress_); } default T withCondOnprogress(final boolean enable, final String onprogress_) { if (enable) { - get().attr("onprogress", onprogress_); + self().attr("onprogress", onprogress_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnratechange.java b/library/src/main/java/j2html/tags/attributes/IOnratechange.java index 2138196..2952506 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnratechange.java +++ b/library/src/main/java/j2html/tags/attributes/IOnratechange.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnratechange extends IInstance { +public interface IOnratechange> extends IInstance { default T withOnratechange(final String onratechange_) { - get().attr("onratechange", onratechange_); - return get(); + return self().attr("onratechange", onratechange_); } default T withCondOnratechange(final boolean enable, final String onratechange_) { if (enable) { - get().attr("onratechange", onratechange_); + self().attr("onratechange", onratechange_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnreset.java b/library/src/main/java/j2html/tags/attributes/IOnreset.java index 7db7644..cae79b6 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnreset.java +++ b/library/src/main/java/j2html/tags/attributes/IOnreset.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnreset extends IInstance { +public interface IOnreset> extends IInstance { default T withOnreset(final String onreset_) { - get().attr("onreset", onreset_); - return get(); + return self().attr("onreset", onreset_); } default T withCondOnreset(final boolean enable, final String onreset_) { if (enable) { - get().attr("onreset", onreset_); + self().attr("onreset", onreset_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnresize.java b/library/src/main/java/j2html/tags/attributes/IOnresize.java index 70c4231..4f4aa13 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnresize.java +++ b/library/src/main/java/j2html/tags/attributes/IOnresize.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnresize extends IInstance { +public interface IOnresize> extends IInstance { default T withOnresize(final String onresize_) { - get().attr("onresize", onresize_); - return get(); + return self().attr("onresize", onresize_); } default T withCondOnresize(final boolean enable, final String onresize_) { if (enable) { - get().attr("onresize", onresize_); + self().attr("onresize", onresize_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnsearch.java b/library/src/main/java/j2html/tags/attributes/IOnsearch.java index c83fc42..3200b45 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnsearch.java +++ b/library/src/main/java/j2html/tags/attributes/IOnsearch.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnsearch extends IInstance { +public interface IOnsearch> extends IInstance { default T withOnsearch(final String onsearch_) { - get().attr("onsearch", onsearch_); - return get(); + return self().attr("onsearch", onsearch_); } default T withCondOnsearch(final boolean enable, final String onsearch_) { if (enable) { - get().attr("onsearch", onsearch_); + self().attr("onsearch", onsearch_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnseeked.java b/library/src/main/java/j2html/tags/attributes/IOnseeked.java index c2c513c..2acb538 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnseeked.java +++ b/library/src/main/java/j2html/tags/attributes/IOnseeked.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnseeked extends IInstance { +public interface IOnseeked> extends IInstance { default T withOnseeked(final String onseeked_) { - get().attr("onseeked", onseeked_); - return get(); + return self().attr("onseeked", onseeked_); } default T withCondOnseeked(final boolean enable, final String onseeked_) { if (enable) { - get().attr("onseeked", onseeked_); + self().attr("onseeked", onseeked_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnseeking.java b/library/src/main/java/j2html/tags/attributes/IOnseeking.java index 3ebb5dc..de2b487 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnseeking.java +++ b/library/src/main/java/j2html/tags/attributes/IOnseeking.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnseeking extends IInstance { +public interface IOnseeking> extends IInstance { default T withOnseeking(final String onseeking_) { - get().attr("onseeking", onseeking_); - return get(); + return self().attr("onseeking", onseeking_); } default T withCondOnseeking(final boolean enable, final String onseeking_) { if (enable) { - get().attr("onseeking", onseeking_); + self().attr("onseeking", onseeking_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnstalled.java b/library/src/main/java/j2html/tags/attributes/IOnstalled.java index 81b3e13..cca8582 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnstalled.java +++ b/library/src/main/java/j2html/tags/attributes/IOnstalled.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnstalled extends IInstance { +public interface IOnstalled> extends IInstance { default T withOnstalled(final String onstalled_) { - get().attr("onstalled", onstalled_); - return get(); + return self().attr("onstalled", onstalled_); } default T withCondOnstalled(final boolean enable, final String onstalled_) { if (enable) { - get().attr("onstalled", onstalled_); + self().attr("onstalled", onstalled_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnstorage.java b/library/src/main/java/j2html/tags/attributes/IOnstorage.java index 04f21fc..b6848b2 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnstorage.java +++ b/library/src/main/java/j2html/tags/attributes/IOnstorage.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnstorage extends IInstance { +public interface IOnstorage> extends IInstance { default T withOnstorage(final String onstorage_) { - get().attr("onstorage", onstorage_); - return get(); + return self().attr("onstorage", onstorage_); } default T withCondOnstorage(final boolean enable, final String onstorage_) { if (enable) { - get().attr("onstorage", onstorage_); + self().attr("onstorage", onstorage_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnsubmit.java b/library/src/main/java/j2html/tags/attributes/IOnsubmit.java index 0a09190..8c5ba9c 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnsubmit.java +++ b/library/src/main/java/j2html/tags/attributes/IOnsubmit.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnsubmit extends IInstance { +public interface IOnsubmit> extends IInstance { default T withOnsubmit(final String onsubmit_) { - get().attr("onsubmit", onsubmit_); - return get(); + return self().attr("onsubmit", onsubmit_); } default T withCondOnsubmit(final boolean enable, final String onsubmit_) { if (enable) { - get().attr("onsubmit", onsubmit_); + self().attr("onsubmit", onsubmit_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnsuspend.java b/library/src/main/java/j2html/tags/attributes/IOnsuspend.java index 56bc79a..e7f3d31 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnsuspend.java +++ b/library/src/main/java/j2html/tags/attributes/IOnsuspend.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnsuspend extends IInstance { +public interface IOnsuspend> extends IInstance { default T withOnsuspend(final String onsuspend_) { - get().attr("onsuspend", onsuspend_); - return get(); + return self().attr("onsuspend", onsuspend_); } default T withCondOnsuspend(final boolean enable, final String onsuspend_) { if (enable) { - get().attr("onsuspend", onsuspend_); + self().attr("onsuspend", onsuspend_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOntimeupdate.java b/library/src/main/java/j2html/tags/attributes/IOntimeupdate.java index 6191215..d651506 100644 --- a/library/src/main/java/j2html/tags/attributes/IOntimeupdate.java +++ b/library/src/main/java/j2html/tags/attributes/IOntimeupdate.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOntimeupdate extends IInstance { +public interface IOntimeupdate> extends IInstance { default T withOntimeupdate(final String ontimeupdate_) { - get().attr("ontimeupdate", ontimeupdate_); - return get(); + return self().attr("ontimeupdate", ontimeupdate_); } default T withCondOntimeupdate(final boolean enable, final String ontimeupdate_) { if (enable) { - get().attr("ontimeupdate", ontimeupdate_); + self().attr("ontimeupdate", ontimeupdate_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOntoggle.java b/library/src/main/java/j2html/tags/attributes/IOntoggle.java index 9597334..7a654f0 100644 --- a/library/src/main/java/j2html/tags/attributes/IOntoggle.java +++ b/library/src/main/java/j2html/tags/attributes/IOntoggle.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOntoggle extends IInstance { +public interface IOntoggle> extends IInstance { default T withOntoggle(final String ontoggle_) { - get().attr("ontoggle", ontoggle_); - return get(); + return self().attr("ontoggle", ontoggle_); } default T withCondOntoggle(final boolean enable, final String ontoggle_) { if (enable) { - get().attr("ontoggle", ontoggle_); + self().attr("ontoggle", ontoggle_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnunload.java b/library/src/main/java/j2html/tags/attributes/IOnunload.java index 4a8c1e4..85443e7 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnunload.java +++ b/library/src/main/java/j2html/tags/attributes/IOnunload.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnunload extends IInstance { +public interface IOnunload> extends IInstance { default T withOnunload(final String onunload_) { - get().attr("onunload", onunload_); - return get(); + return self().attr("onunload", onunload_); } default T withCondOnunload(final boolean enable, final String onunload_) { if (enable) { - get().attr("onunload", onunload_); + self().attr("onunload", onunload_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnvolumechanged.java b/library/src/main/java/j2html/tags/attributes/IOnvolumechanged.java index ad29ca1..5b4ccd7 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnvolumechanged.java +++ b/library/src/main/java/j2html/tags/attributes/IOnvolumechanged.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnvolumechanged extends IInstance { +public interface IOnvolumechanged> extends IInstance { default T withOnvolumechanged(final String onvolumechanged_) { - get().attr("onvolumechanged", onvolumechanged_); - return get(); + return self().attr("onvolumechanged", onvolumechanged_); } default T withCondOnvolumechanged(final boolean enable, final String onvolumechanged_) { if (enable) { - get().attr("onvolumechanged", onvolumechanged_); + self().attr("onvolumechanged", onvolumechanged_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOnwaiting.java b/library/src/main/java/j2html/tags/attributes/IOnwaiting.java index 6c0b7b9..8088cfd 100644 --- a/library/src/main/java/j2html/tags/attributes/IOnwaiting.java +++ b/library/src/main/java/j2html/tags/attributes/IOnwaiting.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOnwaiting extends IInstance { +public interface IOnwaiting> extends IInstance { default T withOnwaiting(final String onwaiting_) { - get().attr("onwaiting", onwaiting_); - return get(); + return self().attr("onwaiting", onwaiting_); } default T withCondOnwaiting(final boolean enable, final String onwaiting_) { if (enable) { - get().attr("onwaiting", onwaiting_); + self().attr("onwaiting", onwaiting_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOpen.java b/library/src/main/java/j2html/tags/attributes/IOpen.java index 98b584b..60c8cb1 100644 --- a/library/src/main/java/j2html/tags/attributes/IOpen.java +++ b/library/src/main/java/j2html/tags/attributes/IOpen.java @@ -3,16 +3,16 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOpen extends IInstance { +public interface IOpen> extends IInstance { default T isOpen() { - get().attr("open"); - return get(); + self().attr("open"); + return self(); } default T withCondOpen(final boolean enable) { if (enable) { - get().attr("open"); + self().attr("open"); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IOptimum.java b/library/src/main/java/j2html/tags/attributes/IOptimum.java index 699c6f6..92f30e4 100644 --- a/library/src/main/java/j2html/tags/attributes/IOptimum.java +++ b/library/src/main/java/j2html/tags/attributes/IOptimum.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IOptimum extends IInstance { +public interface IOptimum> extends IInstance { default T withOptimum(final String optimum_) { - get().attr("optimum", optimum_); - return get(); + return self().attr("optimum", optimum_); } default T withCondOptimum(final boolean enable, final String optimum_) { if (enable) { - get().attr("optimum", optimum_); + self().attr("optimum", optimum_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IPattern.java b/library/src/main/java/j2html/tags/attributes/IPattern.java index 9bedfa1..a47c102 100644 --- a/library/src/main/java/j2html/tags/attributes/IPattern.java +++ b/library/src/main/java/j2html/tags/attributes/IPattern.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IPattern extends IInstance { +public interface IPattern> extends IInstance { default T withPattern(final String pattern_) { - get().attr("pattern", pattern_); - return get(); + return self().attr("pattern", pattern_); } default T withCondPattern(final boolean enable, final String pattern_) { if (enable) { - get().attr("pattern", pattern_); + self().attr("pattern", pattern_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IPlaceholder.java b/library/src/main/java/j2html/tags/attributes/IPlaceholder.java index ad5eb56..b78f10e 100644 --- a/library/src/main/java/j2html/tags/attributes/IPlaceholder.java +++ b/library/src/main/java/j2html/tags/attributes/IPlaceholder.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IPlaceholder extends IInstance { +public interface IPlaceholder> extends IInstance { default T withPlaceholder(final String placeholder_) { - get().attr("placeholder", placeholder_); - return get(); + return self().attr("placeholder", placeholder_); } default T withCondPlaceholder(final boolean enable, final String placeholder_) { if (enable) { - get().attr("placeholder", placeholder_); + self().attr("placeholder", placeholder_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IPoster.java b/library/src/main/java/j2html/tags/attributes/IPoster.java index 3e9e719..c80f8f2 100644 --- a/library/src/main/java/j2html/tags/attributes/IPoster.java +++ b/library/src/main/java/j2html/tags/attributes/IPoster.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IPoster extends IInstance { +public interface IPoster> extends IInstance { default T withPoster(final String poster_) { - get().attr("poster", poster_); - return get(); + return self().attr("poster", poster_); } default T withCondPoster(final boolean enable, final String poster_) { if (enable) { - get().attr("poster", poster_); + self().attr("poster", poster_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IPreload.java b/library/src/main/java/j2html/tags/attributes/IPreload.java index f985d2a..73c5564 100644 --- a/library/src/main/java/j2html/tags/attributes/IPreload.java +++ b/library/src/main/java/j2html/tags/attributes/IPreload.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IPreload extends IInstance { +public interface IPreload> extends IInstance { default T withPreload(final String preload_) { - get().attr("preload", preload_); - return get(); + return self().attr("preload", preload_); } default T withCondPreload(final boolean enable, final String preload_) { if (enable) { - get().attr("preload", preload_); + self().attr("preload", preload_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IReadonly.java b/library/src/main/java/j2html/tags/attributes/IReadonly.java index 6c3a5b7..15e22d7 100644 --- a/library/src/main/java/j2html/tags/attributes/IReadonly.java +++ b/library/src/main/java/j2html/tags/attributes/IReadonly.java @@ -3,16 +3,16 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IReadonly extends IInstance { +public interface IReadonly> extends IInstance { default T isReadonly() { - get().attr("readonly"); - return get(); + self().attr("readonly"); + return self(); } default T withCondReadonly(final boolean enable) { if (enable) { - get().attr("readonly"); + self().attr("readonly"); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IRel.java b/library/src/main/java/j2html/tags/attributes/IRel.java index b26d94b..1af14bf 100644 --- a/library/src/main/java/j2html/tags/attributes/IRel.java +++ b/library/src/main/java/j2html/tags/attributes/IRel.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IRel extends IInstance { +public interface IRel> extends IInstance { default T withRel(final String rel_) { - get().attr("rel", rel_); - return get(); + return self().attr("rel", rel_); } default T withCondRel(final boolean enable, final String rel_) { if (enable) { - get().attr("rel", rel_); + self().attr("rel", rel_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IRequired.java b/library/src/main/java/j2html/tags/attributes/IRequired.java index 5c22528..c963f6c 100644 --- a/library/src/main/java/j2html/tags/attributes/IRequired.java +++ b/library/src/main/java/j2html/tags/attributes/IRequired.java @@ -3,16 +3,16 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IRequired extends IInstance { +public interface IRequired> extends IInstance { default T isRequired() { - get().attr("required"); - return get(); + self().attr("required"); + return self(); } default T withCondRequired(final boolean enable) { if (enable) { - get().attr("required"); + self().attr("required"); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IReversed.java b/library/src/main/java/j2html/tags/attributes/IReversed.java index 66f3e50..e1d30b2 100644 --- a/library/src/main/java/j2html/tags/attributes/IReversed.java +++ b/library/src/main/java/j2html/tags/attributes/IReversed.java @@ -3,16 +3,16 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IReversed extends IInstance { +public interface IReversed> extends IInstance { default T isReversed() { - get().attr("reversed"); - return get(); + self().attr("reversed"); + return self(); } default T withCondReversed(final boolean enable) { if (enable) { - get().attr("reversed"); + self().attr("reversed"); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IRows.java b/library/src/main/java/j2html/tags/attributes/IRows.java index 123da9b..32834bb 100644 --- a/library/src/main/java/j2html/tags/attributes/IRows.java +++ b/library/src/main/java/j2html/tags/attributes/IRows.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IRows extends IInstance { +public interface IRows> extends IInstance { default T withRows(final String rows_) { - get().attr("rows", rows_); - return get(); + return self().attr("rows", rows_); } default T withCondRows(final boolean enable, final String rows_) { if (enable) { - get().attr("rows", rows_); + self().attr("rows", rows_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IRowspan.java b/library/src/main/java/j2html/tags/attributes/IRowspan.java index dd72574..98b1d14 100644 --- a/library/src/main/java/j2html/tags/attributes/IRowspan.java +++ b/library/src/main/java/j2html/tags/attributes/IRowspan.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IRowspan extends IInstance { +public interface IRowspan> extends IInstance { default T withRowspan(final String rowspan_) { - get().attr("rowspan", rowspan_); - return get(); + return self().attr("rowspan", rowspan_); } default T withCondRowspan(final boolean enable, final String rowspan_) { if (enable) { - get().attr("rowspan", rowspan_); + self().attr("rowspan", rowspan_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/ISandbox.java b/library/src/main/java/j2html/tags/attributes/ISandbox.java index 7d45733..cf77345 100644 --- a/library/src/main/java/j2html/tags/attributes/ISandbox.java +++ b/library/src/main/java/j2html/tags/attributes/ISandbox.java @@ -3,16 +3,16 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface ISandbox extends IInstance { +public interface ISandbox> extends IInstance { default T isSandbox() { - get().attr("sandbox"); - return get(); + self().attr("sandbox"); + return self(); } default T withCondSandbox(final boolean enable) { if (enable) { - get().attr("sandbox"); + self().attr("sandbox"); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IScope.java b/library/src/main/java/j2html/tags/attributes/IScope.java index 1d9a28c..bdefe20 100644 --- a/library/src/main/java/j2html/tags/attributes/IScope.java +++ b/library/src/main/java/j2html/tags/attributes/IScope.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IScope extends IInstance { +public interface IScope> extends IInstance { default T withScope(final String scope_) { - get().attr("scope", scope_); - return get(); + return self().attr("scope", scope_); } default T withCondScope(final boolean enable, final String scope_) { if (enable) { - get().attr("scope", scope_); + self().attr("scope", scope_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/ISelected.java b/library/src/main/java/j2html/tags/attributes/ISelected.java index 0f01961..2411df9 100644 --- a/library/src/main/java/j2html/tags/attributes/ISelected.java +++ b/library/src/main/java/j2html/tags/attributes/ISelected.java @@ -3,16 +3,16 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface ISelected extends IInstance { +public interface ISelected> extends IInstance { default T isSelected() { - get().attr("selected"); - return get(); + self().attr("selected"); + return self(); } default T withCondSelected(final boolean enable) { if (enable) { - get().attr("selected"); + self().attr("selected"); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IShape.java b/library/src/main/java/j2html/tags/attributes/IShape.java index 1b042d2..f5e193e 100644 --- a/library/src/main/java/j2html/tags/attributes/IShape.java +++ b/library/src/main/java/j2html/tags/attributes/IShape.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IShape extends IInstance { +public interface IShape> extends IInstance { default T withShape(final String shape_) { - get().attr("shape", shape_); - return get(); + return self().attr("shape", shape_); } default T withCondShape(final boolean enable, final String shape_) { if (enable) { - get().attr("shape", shape_); + self().attr("shape", shape_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/ISize.java b/library/src/main/java/j2html/tags/attributes/ISize.java index f0fbd3c..0292060 100644 --- a/library/src/main/java/j2html/tags/attributes/ISize.java +++ b/library/src/main/java/j2html/tags/attributes/ISize.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface ISize extends IInstance { +public interface ISize> extends IInstance { default T withSize(final String size_) { - get().attr("size", size_); - return get(); + return self().attr("size", size_); } default T withCondSize(final boolean enable, final String size_) { if (enable) { - get().attr("size", size_); + self().attr("size", size_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/ISizes.java b/library/src/main/java/j2html/tags/attributes/ISizes.java index 396dedf..d505768 100644 --- a/library/src/main/java/j2html/tags/attributes/ISizes.java +++ b/library/src/main/java/j2html/tags/attributes/ISizes.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface ISizes extends IInstance { +public interface ISizes> extends IInstance { default T withSizes(final String sizes_) { - get().attr("sizes", sizes_); - return get(); + return self().attr("sizes", sizes_); } default T withCondSizes(final boolean enable, final String sizes_) { if (enable) { - get().attr("sizes", sizes_); + self().attr("sizes", sizes_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/ISpan.java b/library/src/main/java/j2html/tags/attributes/ISpan.java index 5e3f4d1..e69a0cb 100644 --- a/library/src/main/java/j2html/tags/attributes/ISpan.java +++ b/library/src/main/java/j2html/tags/attributes/ISpan.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface ISpan extends IInstance { +public interface ISpan> extends IInstance { default T withSpan(final String span_) { - get().attr("span", span_); - return get(); + return self().attr("span", span_); } default T withCondSpan(final boolean enable, final String span_) { if (enable) { - get().attr("span", span_); + self().attr("span", span_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/ISrc.java b/library/src/main/java/j2html/tags/attributes/ISrc.java index 620de96..2811f31 100644 --- a/library/src/main/java/j2html/tags/attributes/ISrc.java +++ b/library/src/main/java/j2html/tags/attributes/ISrc.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface ISrc extends IInstance { +public interface ISrc> extends IInstance { default T withSrc(final String src_) { - get().attr("src", src_); - return get(); + return self().attr("src", src_); } default T withCondSrc(final boolean enable, final String src_) { if (enable) { - get().attr("src", src_); + self().attr("src", src_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/ISrcdoc.java b/library/src/main/java/j2html/tags/attributes/ISrcdoc.java index 480b658..605aabf 100644 --- a/library/src/main/java/j2html/tags/attributes/ISrcdoc.java +++ b/library/src/main/java/j2html/tags/attributes/ISrcdoc.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface ISrcdoc extends IInstance { +public interface ISrcdoc> extends IInstance { default T withSrcdoc(final String srcdoc_) { - get().attr("srcdoc", srcdoc_); - return get(); + return self().attr("srcdoc", srcdoc_); } default T withCondSrcdoc(final boolean enable, final String srcdoc_) { if (enable) { - get().attr("srcdoc", srcdoc_); + self().attr("srcdoc", srcdoc_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/ISrclang.java b/library/src/main/java/j2html/tags/attributes/ISrclang.java index 8335312..47c1c54 100644 --- a/library/src/main/java/j2html/tags/attributes/ISrclang.java +++ b/library/src/main/java/j2html/tags/attributes/ISrclang.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface ISrclang extends IInstance { +public interface ISrclang> extends IInstance { default T withSrclang(final String srclang_) { - get().attr("srclang", srclang_); - return get(); + return self().attr("srclang", srclang_); } default T withCondSrclang(final boolean enable, final String srclang_) { if (enable) { - get().attr("srclang", srclang_); + self().attr("srclang", srclang_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/ISrcset.java b/library/src/main/java/j2html/tags/attributes/ISrcset.java index e1a1623..c00ee5f 100644 --- a/library/src/main/java/j2html/tags/attributes/ISrcset.java +++ b/library/src/main/java/j2html/tags/attributes/ISrcset.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface ISrcset extends IInstance { +public interface ISrcset> extends IInstance { default T withSrcset(final String srcset_) { - get().attr("srcset", srcset_); - return get(); + return self().attr("srcset", srcset_); } default T withCondSrcset(final boolean enable, final String srcset_) { if (enable) { - get().attr("srcset", srcset_); + self().attr("srcset", srcset_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IStart.java b/library/src/main/java/j2html/tags/attributes/IStart.java index 685b605..ccc5473 100644 --- a/library/src/main/java/j2html/tags/attributes/IStart.java +++ b/library/src/main/java/j2html/tags/attributes/IStart.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IStart extends IInstance { +public interface IStart> extends IInstance { default T withStart(final String start_) { - get().attr("start", start_); - return get(); + return self().attr("start", start_); } default T withCondStart(final boolean enable, final String start_) { if (enable) { - get().attr("start", start_); + self().attr("start", start_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IStep.java b/library/src/main/java/j2html/tags/attributes/IStep.java index 76fa407..7f2ad98 100644 --- a/library/src/main/java/j2html/tags/attributes/IStep.java +++ b/library/src/main/java/j2html/tags/attributes/IStep.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IStep extends IInstance { +public interface IStep> extends IInstance { default T withStep(final String step_) { - get().attr("step", step_); - return get(); + return self().attr("step", step_); } default T withCondStep(final boolean enable, final String step_) { if (enable) { - get().attr("step", step_); + self().attr("step", step_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/ITarget.java b/library/src/main/java/j2html/tags/attributes/ITarget.java index 5f653bc..32602fa 100644 --- a/library/src/main/java/j2html/tags/attributes/ITarget.java +++ b/library/src/main/java/j2html/tags/attributes/ITarget.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface ITarget extends IInstance { +public interface ITarget> extends IInstance { default T withTarget(final String target_) { - get().attr("target", target_); - return get(); + return self().attr("target", target_); } default T withCondTarget(final boolean enable, final String target_) { if (enable) { - get().attr("target", target_); + self().attr("target", target_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IType.java b/library/src/main/java/j2html/tags/attributes/IType.java index 16200b4..5e41dee 100644 --- a/library/src/main/java/j2html/tags/attributes/IType.java +++ b/library/src/main/java/j2html/tags/attributes/IType.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IType extends IInstance { +public interface IType> extends IInstance { default T withType(final String type_) { - get().attr("type", type_); - return get(); + return self().attr("type", type_); } default T withCondType(final boolean enable, final String type_) { if (enable) { - get().attr("type", type_); + self().attr("type", type_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IUsemap.java b/library/src/main/java/j2html/tags/attributes/IUsemap.java index de6303a..b453b5b 100644 --- a/library/src/main/java/j2html/tags/attributes/IUsemap.java +++ b/library/src/main/java/j2html/tags/attributes/IUsemap.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IUsemap extends IInstance { +public interface IUsemap> extends IInstance { default T withUsemap(final String usemap_) { - get().attr("usemap", usemap_); - return get(); + return self().attr("usemap", usemap_); } default T withCondUsemap(final boolean enable, final String usemap_) { if (enable) { - get().attr("usemap", usemap_); + self().attr("usemap", usemap_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IValue.java b/library/src/main/java/j2html/tags/attributes/IValue.java index 74c92f6..b7dd631 100644 --- a/library/src/main/java/j2html/tags/attributes/IValue.java +++ b/library/src/main/java/j2html/tags/attributes/IValue.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IValue extends IInstance { +public interface IValue> extends IInstance { default T withValue(final String value_) { - get().attr("value", value_); - return get(); + return self().attr("value", value_); } default T withCondValue(final boolean enable, final String value_) { if (enable) { - get().attr("value", value_); + self().attr("value", value_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IWidth.java b/library/src/main/java/j2html/tags/attributes/IWidth.java index 0cc047e..b521916 100644 --- a/library/src/main/java/j2html/tags/attributes/IWidth.java +++ b/library/src/main/java/j2html/tags/attributes/IWidth.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IWidth extends IInstance { +public interface IWidth> extends IInstance { default T withWidth(final String width_) { - get().attr("width", width_); - return get(); + return self().attr("width", width_); } default T withCondWidth(final boolean enable, final String width_) { if (enable) { - get().attr("width", width_); + self().attr("width", width_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/attributes/IWrap.java b/library/src/main/java/j2html/tags/attributes/IWrap.java index d8dc1ce..4cf8faf 100644 --- a/library/src/main/java/j2html/tags/attributes/IWrap.java +++ b/library/src/main/java/j2html/tags/attributes/IWrap.java @@ -3,16 +3,15 @@ package j2html.tags.attributes; import j2html.tags.IInstance; import j2html.tags.Tag; -public interface IWrap extends IInstance { +public interface IWrap> extends IInstance { default T withWrap(final String wrap_) { - get().attr("wrap", wrap_); - return get(); + return self().attr("wrap", wrap_); } default T withCondWrap(final boolean enable, final String wrap_) { if (enable) { - get().attr("wrap", wrap_); + self().attr("wrap", wrap_); } - return get(); + return self(); } } diff --git a/library/src/main/java/j2html/tags/specialized/manual/MainTag.java b/library/src/main/java/j2html/tags/specialized/generated/MainTag.java similarity index 77% rename from library/src/main/java/j2html/tags/specialized/manual/MainTag.java rename to library/src/main/java/j2html/tags/specialized/generated/MainTag.java index 8423f73..44d0d5a 100644 --- a/library/src/main/java/j2html/tags/specialized/manual/MainTag.java +++ b/library/src/main/java/j2html/tags/specialized/generated/MainTag.java @@ -1,4 +1,4 @@ -package j2html.tags.specialized.manual; +package j2html.tags.specialized.generated; import j2html.tags.ContainerTag; diff --git a/library/src/main/java/j2html/tags/specialized/manual/HtmlTag.java b/library/src/main/java/j2html/tags/specialized/manual/HtmlTag.java index b1b903e..88d25c6 100644 --- a/library/src/main/java/j2html/tags/specialized/manual/HtmlTag.java +++ b/library/src/main/java/j2html/tags/specialized/manual/HtmlTag.java @@ -74,8 +74,8 @@ public final class HtmlTag extends Tag { @Override @Deprecated public void renderModel(Appendable writer, Object model) throws IOException { - HtmlBuilder builder = (writer instanceof HtmlBuilder) - ? (HtmlBuilder) writer + HtmlBuilder builder = (writer instanceof HtmlBuilder) + ? (HtmlBuilder) writer : FlatHtml.into(writer, Config.global()); render(builder, model); diff --git a/library/src/test/java/j2html/comparison/j2html/FiveHundredEmployees.java b/library/src/test/java/j2html/comparison/j2html/FiveHundredEmployees.java index f40b7a2..32c27e8 100644 --- a/library/src/test/java/j2html/comparison/j2html/FiveHundredEmployees.java +++ b/library/src/test/java/j2html/comparison/j2html/FiveHundredEmployees.java @@ -1,7 +1,8 @@ package j2html.comparison.j2html; import j2html.comparison.ComparisonData; -import j2html.tags.ContainerTag; +import j2html.tags.specialized.generated.UlTag; + import static j2html.TagCreator.each; import static j2html.TagCreator.li; import static j2html.TagCreator.ul; @@ -9,7 +10,7 @@ import static org.apache.commons.lang3.StringUtils.join; public class FiveHundredEmployees { - public static ContainerTag tag = ul( + public static UlTag tag = ul( each(ComparisonData.fiveHundredEmployees(), employee -> li(join(employee.getId(), employee.getName(), employee.getTitle())) )