--- old/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlMixed.java 2015-01-29 16:25:08.369677294 +0300 +++ new/src/java.xml.bind/share/classes/javax/xml/bind/annotation/XmlMixed.java 2015-01-29 16:25:08.305677295 +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 @@ -57,16 +57,16 @@ * * Below is an example of binding and creation of mixed content. *
- * <!-- schema fragment having mixed content --> - * <xs:complexType name="letterBody" mixed="true"> - * <xs:sequence> - * <xs:element name="name" type="xs:string"/> - * <xs:element name="quantity" type="xs:positiveInteger"/> - * <xs:element name="productName" type="xs:string"/> - * <!-- etc. --> - * </xs:sequence> - * </xs:complexType> - * <xs:element name="letterBody" type="letterBody"/> + * <!-- schema fragment having mixed content --> + * <xs:complexType name="letterBody" mixed="true"> + * <xs:sequence> + * <xs:element name="name" type="xs:string"/> + * <xs:element name="quantity" type="xs:positiveInteger"/> + * <xs:element name="productName" type="xs:string"/> + * <!-- etc. --> + * </xs:sequence> + * </xs:complexType> + * <xs:element name="letterBody" type="letterBody"/> * * // Schema-derived Java code: * // (Only annotations relevant to mixed content are shown below, @@ -74,12 +74,12 @@ * import java.math.BigInteger; * public class ObjectFactory { * // element instance factories - * JAXBElement<LetterBody> createLetterBody(LetterBody value); - * JAXBElement<String> createLetterBodyName(String value); - * JAXBElement<BigInteger> createLetterBodyQuantity(BigInteger value); - * JAXBElement<String> createLetterBodyProductName(String value); + * JAXBElement<LetterBody> createLetterBody(LetterBody value); + * JAXBElement<String> createLetterBodyName(String value); + * JAXBElement<BigInteger> createLetterBodyQuantity(BigInteger value); + * JAXBElement<String> createLetterBodyProductName(String value); * // type instance factory - * LetterBody> createLetterBody(); + * LetterBody createLetterBody(); * } **
@@ -97,16 +97,16 @@ ** The following is an XML instance document with mixed content *
- * <letterBody> - * Dear Mr.<name>Robert Smith</name> - * Your order of <quantity>1</quantity> <productName>Baby - * Monitor</productName> shipped from our warehouse. .... - * </letterBody> + * <letterBody> + * Dear Mr.<name>Robert Smith</name> + * Your order of <quantity>1</quantity> <productName>Baby + * Monitor</productName> shipped from our warehouse. .... + * </letterBody> ** that can be constructed using following JAXB API calls. *
* LetterBody lb = ObjectFactory.createLetterBody(); - * JAXBElement<LetterBody> lbe = ObjectFactory.createLetterBody(lb); + * JAXBElement<LetterBody> lbe = ObjectFactory.createLetterBody(lb); * List gcl = lb.getContent(); //add mixed content to general content property. * gcl.add("Dear Mr."); // add text information item as a String. *