http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Blockquote.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Blockquote.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Blockquote.java index 6f7b554..a2f3f7d 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Blockquote.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Blockquote.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="blockquote") +@Bean(typeName="blockquote") public class Blockquote extends HtmlElement { }
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Body.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Body.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Body.java index f91e742..ccdb69b 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Body.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Body.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="body") +@Bean(typeName="body") public class Body extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Br.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Br.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Br.java index 3104a35..ac3d747 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Br.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Br.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="br") +@Bean(typeName="br") public class Br extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Button.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Button.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Button.java index babcf56..a933b75 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Button.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Button.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="button") +@Bean(typeName="button") public class Button extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Canvas.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Canvas.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Canvas.java index 81e5af8..1adbef2 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Canvas.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Canvas.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="canvas") +@Bean(typeName="canvas") public class Canvas extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Caption.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Caption.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Caption.java index 1c2b149..18118f2 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Caption.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Caption.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="caption") +@Bean(typeName="caption") public class Caption extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Cite.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Cite.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Cite.java index 9bfa180..190b51a 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Cite.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Cite.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="cite") +@Bean(typeName="cite") public class Cite extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Code.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Code.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Code.java index 1383a7a..2870e71 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Code.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Code.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="code") +@Bean(typeName="code") public class Code extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Col.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Col.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Col.java index 80510b2..ef8aeca 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Col.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Col.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="col") +@Bean(typeName="col") public class Col extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Colgroup.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Colgroup.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Colgroup.java index 0fa0ae3..a7f3867 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Colgroup.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Colgroup.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="colgroup") +@Bean(typeName="colgroup") public class Colgroup extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Command.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Command.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Command.java index d880f14..b60654e 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Command.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Command.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="command") +@Bean(typeName="command") public class Command extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Data.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Data.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Data.java index 7e241a9..92f947f 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Data.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Data.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="data") +@Bean(typeName="data") public class Data extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Datalist.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Datalist.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Datalist.java index de6b668..234f0e1 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Datalist.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Datalist.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="datalist") +@Bean(typeName="datalist") public class Datalist extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Dd.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Dd.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dd.java index 74307a7..35cad9f 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Dd.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dd.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="dd") +@Bean(typeName="dd") public class Dd extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Del.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Del.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Del.java index 691b748..ad0ffc1 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Del.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Del.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="del") +@Bean(typeName="del") public class Del extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Details.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Details.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Details.java index e0b7229..6f2f673 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Details.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Details.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="details") +@Bean(typeName="details") public class Details extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Dfn.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Dfn.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dfn.java index 9eb6014..cf90fb6 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Dfn.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dfn.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="dfn") +@Bean(typeName="dfn") public class Dfn extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Div.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Div.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Div.java index cad1884..c16a3f1 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Div.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Div.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="div") +@Bean(typeName="div") public class Div extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Dl.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Dl.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dl.java index f08c916..8f35c5e 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Dl.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dl.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="dl") +@Bean(typeName="dl") public class Dl extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Dt.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Dt.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dt.java index 9832121..4eee40e 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Dt.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Dt.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="dt") +@Bean(typeName="dt") public class Dt extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Em.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Em.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Em.java index 730f265..84ab815 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Em.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Em.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="em") +@Bean(typeName="em") public class Em extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Embed.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Embed.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Embed.java index ca68607..dc053b3 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Embed.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Embed.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="embed") +@Bean(typeName="embed") public class Embed extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Fieldset.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Fieldset.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Fieldset.java index ee1d66e..528b20e 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Fieldset.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Fieldset.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="fieldset") +@Bean(typeName="fieldset") public class Fieldset extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Figcaption.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Figcaption.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Figcaption.java index 6c182f4..ac3634e 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Figcaption.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Figcaption.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="figcaption") +@Bean(typeName="figcaption") public class Figcaption extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Figure.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Figure.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Figure.java index 3258a1b..9775b75 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Figure.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Figure.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="figure") +@Bean(typeName="figure") public class Figure extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Footer.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Footer.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Footer.java index 4df1c37..e91f1c5 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Footer.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Footer.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="footer") +@Bean(typeName="footer") public class Footer extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Form.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Form.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Form.java index 5e45754..213066e 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Form.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Form.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="form") +@Bean(typeName="form") public class Form extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/H1.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/H1.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/H1.java index f6463fc..bb08d2d 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/H1.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/H1.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="h1") +@Bean(typeName="h1") public class H1 extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/H2.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/H2.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/H2.java index a3e6141..a72e2ac 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/H2.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/H2.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="h2") +@Bean(typeName="h2") public class H2 extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/H3.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/H3.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/H3.java index 1e2d078..6b6130f 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/H3.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/H3.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="h3") +@Bean(typeName="h3") public class H3 extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/H4.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/H4.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/H4.java index 8d16df3..3c38bc5 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/H4.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/H4.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="h4") +@Bean(typeName="h4") public class H4 extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/H5.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/H5.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/H5.java index 4f37974..ee66856 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/H5.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/H5.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="h5") +@Bean(typeName="h5") public class H5 extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/H6.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/H6.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/H6.java index 3f8aba4..55f2007 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/H6.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/H6.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="h6") +@Bean(typeName="h6") public class H6 extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Head.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Head.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Head.java index a969d82..181aead 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Head.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Head.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="head") +@Bean(typeName="head") public class Head extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Header.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Header.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Header.java index fa1b29c..3306572 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Header.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Header.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="header") +@Bean(typeName="header") public class Header extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Hgroup.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Hgroup.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Hgroup.java index 64a90f7..cacd598 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Hgroup.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Hgroup.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="hgroup") +@Bean(typeName="hgroup") public class Hgroup extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Hr.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Hr.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Hr.java index b0b7bf0..fbc1832 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Hr.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Hr.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="hr") +@Bean(typeName="hr") public class Hr extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Html.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Html.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Html.java index 91d7f8c..77ce8eb 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Html.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Html.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="html") +@Bean(typeName="html") public class Html extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/I.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/I.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/I.java index ad4f319..4b2ea8a 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/I.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/I.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="i") +@Bean(typeName="i") public class I extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/IFrame.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/IFrame.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/IFrame.java index a9f16bc..5dfc9cf 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/IFrame.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/IFrame.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="iframe") +@Bean(typeName="iframe") public class IFrame extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Img.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Img.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Img.java index 46d9c12..0e37a3a 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Img.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Img.java @@ -22,7 +22,7 @@ import org.apache.juneau.xml.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="img") +@Bean(typeName="img") public class Img extends HtmlElement { /** <code>src</code> attribute */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Input.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Input.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Input.java index e80a905..f3a46a6 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Input.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Input.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="input") +@Bean(typeName="input") public class Input extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Ins.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Ins.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Ins.java index 5a197ff..7506cd4 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Ins.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Ins.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="ins") +@Bean(typeName="ins") public class Ins extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Kbd.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Kbd.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Kbd.java index acacf64..d635b42 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Kbd.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Kbd.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="kbd") +@Bean(typeName="kbd") public class Kbd extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Keygen.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Keygen.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Keygen.java index ca2b7e3..34e2bc6 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Keygen.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Keygen.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="keygen") +@Bean(typeName="keygen") public class Keygen extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Label.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Label.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Label.java index 12a97ae..23d51d0 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Label.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Label.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="label") +@Bean(typeName="label") public class Label extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Legend.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Legend.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Legend.java index 396aa9c..191b911 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Legend.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Legend.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="legend") +@Bean(typeName="legend") public class Legend extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Li.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Li.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Li.java index b813adc..6aeedbe 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Li.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Li.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="li") +@Bean(typeName="li") public class Li extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Link.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Link.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Link.java index 022d4fd..132c38f 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Link.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Link.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="link") +@Bean(typeName="link") public class Link extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Main.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Main.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Main.java index 65758dd..9078860 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Main.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Main.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="main") +@Bean(typeName="main") public class Main extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Map.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Map.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Map.java index 94d7960..8405696 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Map.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Map.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="map") +@Bean(typeName="map") public class Map extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Mark.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Mark.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Mark.java index d3b243f..ea2c420 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Mark.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Mark.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="mark") +@Bean(typeName="mark") public class Mark extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Menu.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Menu.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Menu.java index 3c9e090..735e18d 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Menu.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Menu.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="menu") +@Bean(typeName="menu") public class Menu extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Meta.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Meta.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Meta.java index 9d42870..b1b95c2 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Meta.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Meta.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="meta") +@Bean(typeName="meta") public class Meta extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Meter.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Meter.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Meter.java index 1f7e4f8..9ce1258 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Meter.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Meter.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="meter") +@Bean(typeName="meter") public class Meter extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Nav.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Nav.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Nav.java index 2117b5f..948d09f 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Nav.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Nav.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="nav") +@Bean(typeName="nav") public class Nav extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Noscript.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Noscript.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Noscript.java index 76bc6a0..e8d1e12 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Noscript.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Noscript.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="noscript") +@Bean(typeName="noscript") public class Noscript extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Object.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Object.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Object.java index 2f484fd..ace54a9 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Object.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Object.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="object") +@Bean(typeName="object") public class Object extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Ol.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Ol.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Ol.java index f286ca2..43d0df2 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Ol.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Ol.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="ol") +@Bean(typeName="ol") public class Ol extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Optgroup.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Optgroup.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Optgroup.java index de257a5..8d20ec4 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Optgroup.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Optgroup.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="optgroup") +@Bean(typeName="optgroup") public class Optgroup extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Option.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Option.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Option.java index e9d5df5..88994e4 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Option.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Option.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="option") +@Bean(typeName="option") public class Option extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Output.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Output.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Output.java index 7108913..7ef70c8 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Output.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Output.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="output") +@Bean(typeName="output") public class Output extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/P.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/P.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/P.java index 9e1ab2f..3906842 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/P.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/P.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="p") +@Bean(typeName="p") public class P extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Param.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Param.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Param.java index 266a635..f97da92 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Param.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Param.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="param") +@Bean(typeName="param") public class Param extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Pre.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Pre.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Pre.java index 8e7cfc8..a314039 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Pre.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Pre.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="pre") +@Bean(typeName="pre") public class Pre extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Progress.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Progress.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Progress.java index 7183771..4ad51e9 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Progress.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Progress.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="progress") +@Bean(typeName="progress") public class Progress extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Q.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Q.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Q.java index 2f30efb..f479df2 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Q.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Q.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="q") +@Bean(typeName="q") public class Q extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Rb.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Rb.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Rb.java index aafd654..218ca68 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Rb.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Rb.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="rb") +@Bean(typeName="rb") public class Rb extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Rp.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Rp.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Rp.java index 067d9ba..7312d46 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Rp.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Rp.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="rp") +@Bean(typeName="rp") public class Rp extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Rt.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Rt.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Rt.java index e7271f5..88ab877 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Rt.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Rt.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="rt") +@Bean(typeName="rt") public class Rt extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Rtc.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Rtc.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Rtc.java index 71a658a..0e96b6a 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Rtc.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Rtc.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="rtc") +@Bean(typeName="rtc") public class Rtc extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Ruby.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Ruby.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Ruby.java index e8d5b17..c7d6bbe 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Ruby.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Ruby.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="ruby") +@Bean(typeName="ruby") public class Ruby extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/S.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/S.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/S.java index 7afea70..79c7959 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/S.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/S.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="s") +@Bean(typeName="s") public class S extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Samp.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Samp.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Samp.java index dcf15bd..2b0c231 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Samp.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Samp.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="samp") +@Bean(typeName="samp") public class Samp extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Script.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Script.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Script.java index 340e18c..6cc2b0a 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Script.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Script.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="script") +@Bean(typeName="script") public class Script extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Section.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Section.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Section.java index 166e36c..e7111eb 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Section.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Section.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="section") +@Bean(typeName="section") public class Section extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Select.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Select.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Select.java index 6985792..1c35ebe 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Select.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Select.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="select") +@Bean(typeName="select") public class Select extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Small.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Small.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Small.java index cbabb7f..e83f163 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Small.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Small.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="small") +@Bean(typeName="small") public class Small extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Source.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Source.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Source.java index a3cb8ba..b86c60c 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Source.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Source.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="source") +@Bean(typeName="source") public class Source extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Span.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Span.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Span.java index 226c275..c8e0ce6 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Span.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Span.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="span") +@Bean(typeName="span") public class Span extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Strong.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Strong.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Strong.java index c64a1fb..bd79b18 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Strong.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Strong.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="strong") +@Bean(typeName="strong") public class Strong extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Style.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Style.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Style.java index 8ecc1c9..bb5708b 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Style.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Style.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="style") +@Bean(typeName="style") public class Style extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Sub.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Sub.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Sub.java index 8023478..a929de7 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Sub.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Sub.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="sub") +@Bean(typeName="sub") public class Sub extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Summary.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Summary.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Summary.java index a44d9e3..f11b57a 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Summary.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Summary.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="summary") +@Bean(typeName="summary") public class Summary extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Sup.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Sup.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Sup.java index ce7c58b..dac094b 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Sup.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Sup.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="sup") +@Bean(typeName="sup") public class Sup extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Table.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Table.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Table.java index 601584c..9dd21b7 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Table.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Table.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="table") +@Bean(typeName="table") public class Table extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Tbody.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Tbody.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Tbody.java index a70f0a4..5977095 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Tbody.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Tbody.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="tbody") +@Bean(typeName="tbody") public class Tbody extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Td.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Td.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Td.java index b0e075e..721fed1 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Td.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Td.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="td") +@Bean(typeName="td") public class Td extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Template.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Template.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Template.java index 45be851..1be6831 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Template.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Template.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="template") +@Bean(typeName="template") public class Template extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Textarea.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Textarea.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Textarea.java index 72822fe..6a1629d 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Textarea.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Textarea.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="textarea") +@Bean(typeName="textarea") public class Textarea extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Tfoot.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Tfoot.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Tfoot.java index d634089..f0918db 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Tfoot.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Tfoot.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="tfoot") +@Bean(typeName="tfoot") public class Tfoot extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Th.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Th.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Th.java index 6645d2a..3f72d36 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Th.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Th.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="th") +@Bean(typeName="th") public class Th extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Thead.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Thead.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Thead.java index 0351fd8..94351f9 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Thead.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Thead.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="thead") +@Bean(typeName="thead") public class Thead extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Time.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Time.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Time.java index 47ee4a4..dd292ff 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Time.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Time.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="time") +@Bean(typeName="time") public class Time extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Title.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Title.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Title.java index 31192ae..48a0b88 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Title.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Title.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="title") +@Bean(typeName="title") public class Title extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Tr.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Tr.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Tr.java index f0a0e3f..238816b 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Tr.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Tr.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="tr") +@Bean(typeName="tr") public class Tr extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Track.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Track.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Track.java index f56563f..00c851e 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Track.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Track.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="track") +@Bean(typeName="track") public class Track extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/U.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/U.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/U.java index 3614bce..fa5f36e 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/U.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/U.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="u") +@Bean(typeName="u") public class U extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Ul.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Ul.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Ul.java index 499f8ed..9e7cc83 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Ul.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Ul.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="ul") +@Bean(typeName="ul") public class Ul extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Var.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Var.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Var.java index 98fb564..b1a72a3 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Var.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Var.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="var") +@Bean(typeName="var") public class Var extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Video.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Video.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Video.java index 1923097..7c88b33 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Video.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Video.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="video") +@Bean(typeName="video") public class Video extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/html/dto/Wbr.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/html/dto/Wbr.java b/juneau-core/src/main/java/org/apache/juneau/html/dto/Wbr.java index 1b2df11..96f6ca3 100644 --- a/juneau-core/src/main/java/org/apache/juneau/html/dto/Wbr.java +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Wbr.java @@ -20,6 +20,6 @@ import org.apache.juneau.annotation.*; * * @author James Bognar ([email protected]) */ -@Bean(name="wbr") +@Bean(typeName="wbr") public class Wbr extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/jena/RdfParser.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/jena/RdfParser.java b/juneau-core/src/main/java/org/apache/juneau/jena/RdfParser.java index 2171862..ef482e6 100644 --- a/juneau-core/src/main/java/org/apache/juneau/jena/RdfParser.java +++ b/juneau-core/src/main/java/org/apache/juneau/jena/RdfParser.java @@ -238,22 +238,22 @@ public class RdfParser extends ReaderParser { } @SuppressWarnings({ "unchecked", "rawtypes" }) - private <T> T parseAnything(RdfParserSession session, ClassMeta<T> nt, RDFNode n, Object outer) throws Exception { + private <T> T parseAnything(RdfParserSession session, ClassMeta<T> eType, RDFNode n, Object outer) throws Exception { BeanContext bc = session.getBeanContext(); - if (nt == null) - nt = (ClassMeta<T>)object(); - PojoSwap<T,Object> transform = (PojoSwap<T,Object>)nt.getPojoSwap(); - ClassMeta<?> ft = nt.getSerializedClassMeta(); - session.setCurrentClass(ft); + if (eType == null) + eType = (ClassMeta<T>)object(); + PojoSwap<T,Object> transform = (PojoSwap<T,Object>)eType.getPojoSwap(); + ClassMeta<?> sType = eType.getSerializedClassMeta(); + session.setCurrentClass(sType); - if (! ft.canCreateNewInstance(outer)) { + if (! sType.canCreateNewInstance(outer)) { if (n.isResource()) { Statement st = n.asResource().getProperty(session.getClassProperty()); if (st != null) { String c = st.getLiteral().getString(); - ft = nt = (ClassMeta<T>)bc.getClassMetaFromString(c); + sType = eType = (ClassMeta<T>)bc.getClassMetaFromString(c); } } } @@ -261,7 +261,7 @@ public class RdfParser extends ReaderParser { Object o = null; if (n.isResource() && n.asResource().getURI() != null && n.asResource().getURI().equals(RDF_NIL)) { // Do nothing. Leave o == null. - } else if (ft.isObject()) { + } else if (sType.isObject()) { if (n.isLiteral()) { o = n.asLiteral().getValue(); if (o instanceof String) { @@ -276,13 +276,13 @@ public class RdfParser extends ReaderParser { o = parseAnything(session, object(), n.asResource().getProperty(session.getValueProperty()).getObject(), outer); } else if (isSeq(session, r)) { o = new ObjectList(bc); - parseIntoCollection(session, r.as(Seq.class), (Collection)o, ft.getElementType()); + parseIntoCollection(session, r.as(Seq.class), (Collection)o, sType.getElementType()); } else if (isBag(session, r)) { o = new ObjectList(bc); - parseIntoCollection(session, r.as(Bag.class), (Collection)o, ft.getElementType()); + parseIntoCollection(session, r.as(Bag.class), (Collection)o, sType.getElementType()); } else if (r.canAs(RDFList.class)) { o = new ObjectList(bc); - parseIntoCollection(session, r.as(RDFList.class), (Collection)o, ft.getElementType()); + parseIntoCollection(session, r.as(RDFList.class), (Collection)o, sType.getElementType()); } else { // If it has a URI and no child properties, we interpret this as an // external resource, and convert it to just a URL. @@ -297,67 +297,67 @@ public class RdfParser extends ReaderParser { } else { throw new ParseException(session, "Unrecognized node type ''{0}'' for object", n); } - } else if (ft.isBoolean()) { + } else if (sType.isBoolean()) { o = bc.convertToType(getValue(session, n, outer), boolean.class); - } else if (ft.isCharSequence()) { + } else if (sType.isCharSequence()) { o = session.decodeString(getValue(session, n, outer)); - } else if (ft.isChar()) { + } else if (sType.isChar()) { o = session.decodeString(getValue(session, n, outer)).charAt(0); - } else if (ft.isNumber()) { - o = parseNumber(getValue(session, n, outer).toString(), (Class<? extends Number>)ft.getInnerClass()); - } else if (ft.isMap()) { + } else if (sType.isNumber()) { + o = parseNumber(getValue(session, n, outer).toString(), (Class<? extends Number>)sType.getInnerClass()); + } else if (sType.isMap()) { Resource r = n.asResource(); if (session.wasAlreadyProcessed(r)) return null; - Map m = (ft.canCreateNewInstance(outer) ? (Map)ft.newInstance(outer) : new ObjectMap(bc)); - o = parseIntoMap(session, r, m, nt.getKeyType(), nt.getValueType()); - } else if (ft.isCollection() || ft.isArray()) { - if (ft.isArray()) + Map m = (sType.canCreateNewInstance(outer) ? (Map)sType.newInstance(outer) : new ObjectMap(bc)); + o = parseIntoMap(session, r, m, eType.getKeyType(), eType.getValueType()); + } else if (sType.isCollection() || sType.isArray()) { + if (sType.isArray()) o = new ArrayList(); else - o = (ft.canCreateNewInstance(outer) ? (Collection<?>)ft.newInstance(outer) : new ObjectList(bc)); + o = (sType.canCreateNewInstance(outer) ? (Collection<?>)sType.newInstance(outer) : new ObjectList(bc)); Resource r = n.asResource(); if (session.wasAlreadyProcessed(r)) return null; if (isSeq(session, r)) { - parseIntoCollection(session, r.as(Seq.class), (Collection)o, ft.getElementType()); + parseIntoCollection(session, r.as(Seq.class), (Collection)o, sType.getElementType()); } else if (isBag(session, r)) { - parseIntoCollection(session, r.as(Bag.class), (Collection)o, ft.getElementType()); + parseIntoCollection(session, r.as(Bag.class), (Collection)o, sType.getElementType()); } else if (r.canAs(RDFList.class)) { - parseIntoCollection(session, r.as(RDFList.class), (Collection)o, ft.getElementType()); + parseIntoCollection(session, r.as(RDFList.class), (Collection)o, sType.getElementType()); } else { throw new ParseException("Unrecognized node type ''{0}'' for collection", n); } - if (ft.isArray()) - o = bc.toArray(ft, (Collection)o); - } else if (ft.canCreateNewInstanceFromObjectMap(outer)) { + if (sType.isArray()) + o = bc.toArray(sType, (Collection)o); + } else if (sType.canCreateNewInstanceFromObjectMap(outer)) { Resource r = n.asResource(); if (session.wasAlreadyProcessed(r)) return null; Map m = new ObjectMap(bc); - parseIntoMap(session, r, m, nt.getKeyType(), nt.getValueType()); - o = ft.newInstanceFromObjectMap(outer, (ObjectMap)m); - } else if (ft.canCreateNewBean(outer)) { + parseIntoMap(session, r, m, eType.getKeyType(), eType.getValueType()); + o = sType.newInstanceFromObjectMap(outer, (ObjectMap)m); + } else if (sType.canCreateNewBean(outer)) { Resource r = n.asResource(); if (session.wasAlreadyProcessed(r)) return null; - BeanMap<?> bm = bc.newBeanMap(outer, ft.getInnerClass()); + BeanMap<?> bm = bc.newBeanMap(outer, sType.getInnerClass()); o = parseIntoBeanMap(session, r, bm).getBean(); - } else if (ft.isUri() && n.isResource()) { - o = ft.newInstanceFromString(outer, session.decodeString(n.asResource().getURI())); - } else if (ft.canCreateNewInstanceFromString(outer)) { - o = ft.newInstanceFromString(outer, session.decodeString(getValue(session, n, outer))); - } else if (ft.canCreateNewInstanceFromNumber(outer)) { - o = ft.newInstanceFromNumber(outer, parseNumber(getValue(session, n, outer).toString(), ft.getNewInstanceFromNumberClass())); + } else if (sType.isUri() && n.isResource()) { + o = sType.newInstanceFromString(outer, session.decodeString(n.asResource().getURI())); + } else if (sType.canCreateNewInstanceFromString(outer)) { + o = sType.newInstanceFromString(outer, session.decodeString(getValue(session, n, outer))); + } else if (sType.canCreateNewInstanceFromNumber(outer)) { + o = sType.newInstanceFromNumber(outer, parseNumber(getValue(session, n, outer).toString(), sType.getNewInstanceFromNumberClass())); } else { - throw new ParseException("Class ''{0}'' could not be instantiated. Reason: ''{1}''", ft.getInnerClass().getName(), ft.getNotABeanReason()); + throw new ParseException("Class ''{0}'' could not be instantiated. Reason: ''{1}''", sType.getInnerClass().getName(), sType.getNotABeanReason()); } if (transform != null && o != null) - o = transform.unswap(o, nt, bc); + o = transform.unswap(o, eType, bc); if (outer != null) - setParent(nt, o, outer); + setParent(eType, o, outer); return (T)o; } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e1c60b10/juneau-core/src/main/java/org/apache/juneau/jena/RdfSerializer.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/jena/RdfSerializer.java b/juneau-core/src/main/java/org/apache/juneau/jena/RdfSerializer.java index f9d147e..492c2ed 100644 --- a/juneau-core/src/main/java/org/apache/juneau/jena/RdfSerializer.java +++ b/juneau-core/src/main/java/org/apache/juneau/jena/RdfSerializer.java @@ -2,7 +2,7 @@ // * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file * // * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file * // * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance * -// * with the License. You may obtain a copy of the License at * +// * with the License. You may obtain a copy of the License at * // * * // * http://www.apache.org/licenses/LICENSE-2.0 * // * * @@ -157,7 +157,7 @@ public class RdfSerializer extends WriterSerializer { ClassMeta<?> aType = null; // The actual type ClassMeta<?> wType = null; // The wrapped type - ClassMeta<?> gType = object(); // The generic type + ClassMeta<?> sType = object(); // The serialized type aType = session.push(attrName, o, eType); @@ -177,7 +177,7 @@ public class RdfSerializer extends WriterSerializer { aType = ((Delegate)o).getClassMeta(); } - gType = aType.getSerializedClassMeta(); + sType = aType.getSerializedClassMeta(); // Swap if necessary PojoSwap swap = aType.getPojoSwap(); @@ -186,16 +186,16 @@ public class RdfSerializer extends WriterSerializer { // If the getSwapClass() method returns Object, we need to figure out // the actual type now. - if (gType.isObject()) - gType = bc.getClassMetaForObject(o); + if (sType.isObject()) + sType = bc.getClassMetaForObject(o); } } else { - gType = eType.getSerializedClassMeta(); + sType = eType.getSerializedClassMeta(); } RDFNode n = null; - if (o == null || gType.isChar() && ((Character)o).charValue() == 0) { + if (o == null || sType.isChar() && ((Character)o).charValue() == 0) { if (bpm != null) { if (! session.isTrimNulls()) { n = m.createResource(RDF_NIL); @@ -204,19 +204,19 @@ public class RdfSerializer extends WriterSerializer { n = m.createResource(RDF_NIL); } - } else if (gType.isUri() || isURI) { + } else if (sType.isUri() || isURI) { n = m.createResource(getUri(session, o, null)); - } else if (gType.isCharSequence() || gType.isChar()) { + } else if (sType.isCharSequence() || sType.isChar()) { n = m.createLiteral(session.encodeTextInvalidChars(o)); - } else if (gType.isNumber() || gType.isBoolean()) { + } else if (sType.isNumber() || sType.isBoolean()) { if (! session.isAddLiteralTypes()) n = m.createLiteral(o.toString()); else n = m.createTypedLiteral(o); - } else if (gType.isMap() || (wType != null && wType.isMap())) { + } else if (sType.isMap() || (wType != null && wType.isMap())) { if (o instanceof BeanMap) { BeanMap bm = (BeanMap)o; Object uri = null; @@ -229,15 +229,15 @@ public class RdfSerializer extends WriterSerializer { } else { Map m2 = (Map)o; n = m.createResource(); - serializeMap(session, m2, (Resource)n, gType); + serializeMap(session, m2, (Resource)n, sType); } - } else if (gType.hasToObjectMapMethod()) { - Map m2 = gType.toObjectMap(o); + } else if (sType.hasToObjectMapMethod()) { + Map m2 = sType.toObjectMap(o); n = m.createResource(); - serializeMap(session, m2, (Resource)n, gType); + serializeMap(session, m2, (Resource)n, sType); - } else if (gType.isBean()) { + } else if (sType.isBean()) { BeanMap bm = bc.forBean(o); Object uri = null; RdfBeanMeta rbm = (RdfBeanMeta)bm.getMeta().getExtendedMeta(RdfBeanMeta.class); @@ -247,19 +247,19 @@ public class RdfSerializer extends WriterSerializer { n = m.createResource(uri2); serializeBeanMap(session, bm, (Resource)n); - } else if (gType.isCollection() || gType.isArray() || (wType != null && wType.isCollection())) { - Collection c = session.sort(gType.isCollection() ? (Collection)o : toList(gType.getInnerClass(), o)); + } else if (sType.isCollection() || sType.isArray() || (wType != null && wType.isCollection())) { + Collection c = session.sort(sType.isCollection() ? (Collection)o : toList(sType.getInnerClass(), o)); RdfCollectionFormat f = session.getCollectionFormat(); - RdfClassMeta rcm = gType.getExtendedMeta(RdfClassMeta.class); + RdfClassMeta rcm = sType.getExtendedMeta(RdfClassMeta.class); if (rcm.getCollectionFormat() != RdfCollectionFormat.DEFAULT) f = rcm.getCollectionFormat(); if (bpm != null && bpm.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() != RdfCollectionFormat.DEFAULT) f = bpm.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat(); switch (f) { - case BAG: n = serializeToContainer(session, c, gType, m.createBag()); break; - case LIST: n = serializeToList(session, c, gType); break; - case MULTI_VALUED: serializeToMultiProperties(session, c, gType, bpm, attrName, parentResource); break; - default: n = serializeToContainer(session, c, gType, m.createSeq()); + case BAG: n = serializeToContainer(session, c, sType, m.createBag()); break; + case LIST: n = serializeToList(session, c, sType); break; + case MULTI_VALUED: serializeToMultiProperties(session, c, sType, bpm, attrName, parentResource); break; + default: n = serializeToContainer(session, c, sType, m.createSeq()); } } else { n = m.createLiteral(session.encodeTextInvalidChars(session.toString(o))); @@ -379,8 +379,8 @@ public class RdfSerializer extends WriterSerializer { return session.getModel().createList(l.iterator()); } - private void serializeToMultiProperties(RdfSerializerSession session, Collection c, ClassMeta<?> gType, BeanPropertyMeta bpm, String attrName, Resource parentResource) throws SerializeException { - ClassMeta<?> elementType = gType.getElementType(); + private void serializeToMultiProperties(RdfSerializerSession session, Collection c, ClassMeta<?> sType, BeanPropertyMeta bpm, String attrName, Resource parentResource) throws SerializeException { + ClassMeta<?> elementType = sType.getElementType(); for (Object e : c) { Namespace ns = null; if (bpm != null) {
