http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 c3c3dc2..f6463fc 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/sections.html#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements'><h1></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="h1") public class H1 extends HtmlElement { }
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 f1b080d..a3e6141 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/sections.html#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements'><h2></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="h2") public class H2 extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 446dc85..1e2d078 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/sections.html#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements'><h3></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="h3") public class H3 extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 9729b17..8d16df3 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/sections.html#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements'><h4></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="h4") public class H4 extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 7f16bb3..4f37974 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/sections.html#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements'><h5></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="h5") public class H5 extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 4e5cd79..3f8aba4 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/sections.html#the-h1,-h2,-h3,-h4,-h5,-and-h6-elements'><h6></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="h6") public class H6 extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 0899311..a969d82 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/document-metadata.html#the-head-element'><head></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="head") public class Head extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 379fd31..fa1b29c 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/sections.html#the-header-element'><header></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="header") public class Header extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 0e5c666..64a90f7 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href=''><hgroup></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="hgroup") public class Hgroup extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 83f2880..b0b7bf0 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/grouping-content.html#the-hr-element'><hr></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="hr") public class Hr extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 8ad3cbb..91d7f8c 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/semantics.html#the-html-element'><html></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="html") public class Html extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 968327e..ad4f319 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/text-level-semantics.html#the-i-element'><i></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="i") public class I extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 7191e1c..a9f16bc 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/embedded-content-0.html#the-iframe-element'><iframe></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="iframe") public class IFrame extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 c042e1d..46d9c12 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 @@ -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 * // * * @@ -14,14 +14,15 @@ package org.apache.juneau.html.dto; import static org.apache.juneau.xml.annotation.XmlFormat.*; +import org.apache.juneau.annotation.*; import org.apache.juneau.xml.annotation.*; /** - * Represents an HTML IMG element. + * DTO for an HTML <a href='https://www.w3.org/TR/html5/embedded-content-0.html#the-img-element'><img></a> element. * * @author James Bognar ([email protected]) */ -@Xml(name="img") +@Bean(name="img") public class Img extends HtmlElement { /** <code>src</code> attribute */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 0257ffa..e80a905 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/forms.html#the-input-element'><input></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="input") public class Input extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 4034ac7..5a197ff 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/edits.html#the-ins-element'><ins></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="ins") public class Ins extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 94656eb..acacf64 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/text-level-semantics.html#the-kbd-element'><kbd></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="kbd") public class Kbd extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 9a38052..ca2b7e3 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/forms.html#the-keygen-element'><keygen></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="keygen") public class Keygen extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 1801eb7..12a97ae 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/forms.html#the-label-element'><label></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="label") public class Label extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 e427e48..396aa9c 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/forms.html#the-legend-element'><legend></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="legend") public class Legend extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 655139c..b813adc 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/grouping-content.html#the-li-element'><li></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="li") public class Li extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 495ba5c..022d4fd 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/document-metadata.html#the-link-element'><link></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="link") public class Link extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 new file mode 100644 index 0000000..65758dd --- /dev/null +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Main.java @@ -0,0 +1,25 @@ +// *************************************************************************************************************************** +// * 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 * +// * * +// * http://www.apache.org/licenses/LICENSE-2.0 * +// * * +// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an * +// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * +// * specific language governing permissions and limitations under the License. * +// *************************************************************************************************************************** +package org.apache.juneau.html.dto; + +import org.apache.juneau.annotation.*; + +/** + * DTO for an HTML <a href='https://www.w3.org/TR/html5/grouping-content.html#the-main-element'><main></a> element. + * <p> + * + * @author James Bognar ([email protected]) + */ +@Bean(name="main") +public class Main extends HtmlElement { +} http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 d80aaf7..94d7960 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/embedded-content-0.html#the-map-element'><map></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="map") public class Map extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 9d93ef1..d3b243f 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/text-level-semantics.html#the-mark-element'><mark></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="mark") public class Mark extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 039d197..3c9e090 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href=''><menu></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="menu") public class Menu extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 d839ff6..9d42870 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/document-metadata.html#the-meta-element'><meta></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="meta") public class Meta extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 02316e6..1f7e4f8 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/forms.html#the-meter-element'><meter></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="meter") public class Meter extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 77079bf..2117b5f 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/sections.html#the-nav-element'><nav></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="nav") public class Nav extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 357fdbe..76bc6a0 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/scripting-1.html#the-noscript-element'><noscript></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="noscript") public class Noscript extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 e9b2489..2f484fd 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/embedded-content-0.html#the-object-element'><object></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="object") public class Object extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 f5b0b39..f286ca2 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/grouping-content.html#the-ol-element'><ol></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="ol") public class Ol extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 75af8eb..de257a5 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/forms.html#the-optgroup-element'><optgroup></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="optgroup") public class Optgroup extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 3ebf00a..e9d5df5 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/forms.html#the-option-element'><option></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="option") public class Option extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 7509537..7108913 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/forms.html#the-output-element'><output></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="output") public class Output extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 5c5ecdf..9e1ab2f 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/grouping-content.html#the-p-element'><p></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="p") public class P extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 b7e014d..266a635 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/embedded-content-0.html#the-param-element'><param></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="param") public class Param extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 1eaa3c2..8e7cfc8 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/grouping-content.html#the-pre-element'><pre></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="pre") public class Pre extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 1d957e6..7183771 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/forms.html#the-progress-element'><progress></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="progress") public class Progress extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 640dbd7..2f30efb 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/text-level-semantics.html#the-q-element'><q></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="q") public class Q extends HtmlElement { } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 new file mode 100644 index 0000000..aafd654 --- /dev/null +++ b/juneau-core/src/main/java/org/apache/juneau/html/dto/Rb.java @@ -0,0 +1,25 @@ +// *************************************************************************************************************************** +// * 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 * +// * * +// * http://www.apache.org/licenses/LICENSE-2.0 * +// * * +// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an * +// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * +// * specific language governing permissions and limitations under the License. * +// *************************************************************************************************************************** +package org.apache.juneau.html.dto; + +import org.apache.juneau.annotation.*; + +/** + * DTO for an HTML <a href='https://www.w3.org/TR/html5/text-level-semantics.html#the-rb-element'><rb></a> element. + * <p> + * + * @author James Bognar ([email protected]) + */ +@Bean(name="rb") +public class Rb extends HtmlElement { +} http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d408947b/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 2a1fe26..067d9ba 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 @@ -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 * // * * @@ -12,14 +12,14 @@ // *************************************************************************************************************************** package org.apache.juneau.html.dto; -import org.apache.juneau.xml.annotation.*; +import org.apache.juneau.annotation.*; /** - * TODO + * DTO for an HTML <a href='https://www.w3.org/TR/html5/text-level-semantics.html#the-rp-element'><rp></a> element. * <p> * * @author James Bognar ([email protected]) */ -@Xml(name="x") +@Bean(name="rp") public class Rp extends HtmlElement { }
