--- old/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAnyElement.java 2015-01-29 16:25:04.825677364 +0300 +++ new/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlAnyElement.java 2015-01-29 16:25:04.757677365 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -50,7 +50,6 @@ * annotation for the other JavaBean properties on the class, is added to this * "catch-all" property. * - *
*
* @XmlAnyElement @@ -61,7 +60,7 @@ * public {@link Object}[] others; * * @XmlAnyElement - * private List<{@link Element}> nodes; + * private List<{@link Element}> nodes; * * @XmlAnyElement * private {@link Element} node; @@ -88,7 +87,7 @@ ** // List of java.lang.String or DOM nodes. * @XmlAnyElement @XmlMixed - * List<Object> others; + * List<Object> others; ** * @@ -96,13 +95,13 @@ * * The following schema would produce the following Java class: *- * <xs:complexType name="foo"> - * <xs:sequence> - * <xs:element name="a" type="xs:int" /> - * <xs:element name="b" type="xs:int" /> - * <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" /> - * </xs:sequence> - * </xs:complexType> + * <xs:complexType name="foo"> + * <xs:sequence> + * <xs:element name="a" type="xs:int" /> + * <xs:element name="b" type="xs:int" /> + * <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" /> + * </xs:sequence> + * </xs:complexType> ** *@@ -110,35 +109,35 @@ * int a; * int b; * @{@link XmlAnyElement} - * List<Element> any; + * List<Element> any; * } ** * It can unmarshal instances like * *- * <foo xmlns:e="extra"> - * <a>1 - * <e:other /> // this will be bound to DOM, because unmarshalling is orderless - * <b>3 - * <e:other /> - * <c>5 // this will be bound to DOM, because the annotation doesn't remember namespaces. - * </foo> + * <foo xmlns:e="extra"> + * <a>1</a> + * <e:other /> // this will be bound to DOM, because unmarshalling is orderless + * <b>3</b> + * <e:other /> + * <c>5</c> // this will be bound to DOM, because the annotation doesn't remember namespaces. + * </foo> ** * * * The following schema would produce the following Java class: *- * <xs:complexType name="bar"> - * <xs:complexContent> - * <xs:extension base="foo"> - * <xs:sequence> - * <xs:element name="c" type="xs:int" /> - * <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" /> - * </xs:sequence> - * </xs:extension> - * </xs:complexType> + * <xs:complexType name="bar"> + * <xs:complexContent> + * <xs:extension base="foo"> + * <xs:sequence> + * <xs:element name="c" type="xs:int" /> + * <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" /> + * </xs:sequence> + * </xs:extension> + * </xs:complexType> ** *@@ -152,14 +151,14 @@ * It can unmarshal instances like * ** then the following document will unmarshal like this: *- * <bar xmlns:e="extra"> - * <a>1 - * <e:other /> // this will be bound to DOM, because unmarshalling is orderless - * <b>3 - * <e:other /> - * <c>5 // this now goes to Bar.c - * <e:other /> // this will go to Foo.any - * </bar> + * <bar xmlns:e="extra"> + * <a>1</a> + * <e:other /> // this will be bound to DOM, because unmarshalling is orderless + * <b>3</b> + * <e:other /> + * <c>5</c> // this now goes to Bar.c + * <e:other /> // this will go to Foo.any + * </bar> ** * @@ -173,13 +172,13 @@ ** The following schema would produce the following Java class: *
- * <xs:complexType name="foo"> - * <xs:choice maxOccurs="unbounded" minOccurs="0"> - * <xs:element name="a" type="xs:int" /> - * <xs:element name="b" type="xs:int" /> - * <xs:any namespace="##other" processContents="lax" /> - * </xs:choice> - * </xs:complexType> + * <xs:complexType name="foo"> + * <xs:choice maxOccurs="unbounded" minOccurs="0"> + * <xs:element name="a" type="xs:int" /> + * <xs:element name="b" type="xs:int" /> + * <xs:any namespace="##other" processContents="lax" /> + * </xs:choice> + * </xs:complexType> ** *@@ -189,27 +188,27 @@ * @{@link XmlElementRef}(name="a", type="JAXBElement.class") * @{@link XmlElementRef}(name="b", type="JAXBElement.class") * }) - * {@link List}<{@link Object}> others; + * {@link List}<{@link Object}> others; * } * * @XmlRegistry * class ObjectFactory { * ... * @XmlElementDecl(name = "a", namespace = "", scope = Foo.class) - * {@link JAXBElement}<Integer> createFooA( Integer i ) { ... } + * {@link JAXBElement}<Integer> createFooA( Integer i ) { ... } * * @XmlElementDecl(name = "b", namespace = "", scope = Foo.class) - * {@link JAXBElement}<Integer> createFooB( Integer i ) { ... } + * {@link JAXBElement}<Integer> createFooB( Integer i ) { ... } ** * It can unmarshal instances like * *- * <foo xmlns:e="extra"> - * <a>1 // this will unmarshal to a {@link JAXBElement} instance whose value is 1. - * <e:other /> // this will unmarshal to a DOM {@link Element}. - * <b>3 // this will unmarshal to a {@link JAXBElement} instance whose value is 1. - * </foo> + * <foo xmlns:e="extra"> + * <a>1</a> // this will unmarshal to a {@link JAXBElement} instance whose value is 1. + * <e:other /> // this will unmarshal to a DOM {@link Element}. + * <b>3</b> // this will unmarshal to a {@link JAXBElement} instance whose value is 1. + * </foo> ** * @@ -227,10 +226,10 @@ *- * <foo> - * <unknown /> - * <foo /> - * </foo> + * <foo> + * <unknown /> + * <foo /> + * </foo> * * Foo foo = unmarshal(); * // 1 for 'unknown', another for 'foo'