diff -r f61a63b7d1e5 -r 5a5710ee05a0 jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Marshaller.java --- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Marshaller.java Wed Jul 05 20:50:41 2017 +0200 +++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/Marshaller.java Thu Sep 24 18:26:42 2015 +0300 @@ -33,7 +33,7 @@ /** *

- * The Marshaller class is responsible for governing the process + * The {@code Marshaller} class is responsible for governing the process * of serializing Java content trees back into XML data. It provides the basic * marshalling methods: * @@ -153,15 +153,15 @@ * Marshalling content tree rooted by a JAXB element
*

* The first parameter of the overloaded - * Marshaller.marshal(java.lang.Object, ...) methods must be a + * {@code Marshaller.marshal(java.lang.Object, ...)} methods must be a * JAXB element as computed by * {@link JAXBIntrospector#isElement(java.lang.Object)}; - * otherwise, a Marshaller.marshal method must throw a + * otherwise, a {@code Marshaller.marshal} method must throw a * {@link MarshalException}. There exist two mechanisms * to enable marshalling an instance that is not a JAXB element. * One method is to wrap the instance as a value of a {@link JAXBElement}, * and pass the wrapper element as the first parameter to - * a Marshaller.marshal method. For java to schema binding, it + * a {@code Marshaller.marshal} method. For java to schema binding, it * is also possible to simply annotate the instance's class with * @{@link XmlRootElement}. *
@@ -170,7 +170,7 @@ * Encoding
*
* By default, the Marshaller will use UTF-8 encoding when generating XML data - * to a java.io.OutputStream, or a java.io.Writer. Use the + * to a {@code java.io.OutputStream}, or a {@code java.io.Writer}. Use the * {@link #setProperty(String,Object) setProperty} API to change the output * encoding used during these marshal operations. Client applications are * expected to supply a valid character encoding name as defined in the @@ -188,7 +188,7 @@ * order to marshal it back into XML data. Different JAXB Providers will * support marshalling invalid Java content trees at varying levels, however * all JAXB Providers must be able to marshal a valid content tree back to - * XML data. A JAXB Provider must throw a MarshalException when it + * XML data. A JAXB Provider must throw a {@code MarshalException} when it * is unable to complete the marshal operation due to invalid content. Some * JAXB Providers will fully allow marshalling invalid content, others will fail * on the first validation error. @@ -213,18 +213,18 @@ * All JAXB Providers are required to support the following set of properties. * Some providers may support additional properties. *
- *
jaxb.encoding - value must be a java.lang.String
+ *
{@code jaxb.encoding} - value must be a java.lang.String
*
The output encoding to use when marshalling the XML data. The * Marshaller will use "UTF-8" by default if this property is not * specified.
- *
jaxb.formatted.output - value must be a java.lang.Boolean
+ *
{@code jaxb.formatted.output} - value must be a java.lang.Boolean
*
This property controls whether or not the Marshaller will format * the resulting XML data with line breaks and indentation. A * true value for this property indicates human readable indented * xml data, while a false value indicates unformatted xml data. * The Marshaller will default to false (unformatted) if this * property is not specified.
- *
jaxb.schemaLocation - value must be a java.lang.String
+ *
{@code jaxb.schemaLocation} - value must be a java.lang.String
*
This property allows the client application to specify an * xsi:schemaLocation attribute in the generated XML data. The format of * the schemaLocation attribute value is discussed in an easy to @@ -233,7 +233,7 @@ * of the W3C XML Schema Part 0: Primer and specified in * * Section 2.6 of the W3C XML Schema Part 1: Structures.
- *
jaxb.noNamespaceSchemaLocation - value must be a java.lang.String
+ *
{@code jaxb.noNamespaceSchemaLocation} - value must be a java.lang.String
*
This property allows the client application to specify an * xsi:noNamespaceSchemaLocation attribute in the generated XML * data. The format of the schemaLocation attribute value is discussed in @@ -242,10 +242,10 @@ * of the W3C XML Schema Part 0: Primer and specified in * * Section 2.6 of the W3C XML Schema Part 1: Structures.
- *
jaxb.fragment - value must be a java.lang.Boolean
+ *
{@code jaxb.fragment} - value must be a java.lang.Boolean
*
This property determines whether or not document level events will be * generated by the Marshaller. If the property is not specified, the - * default is false. This property has different implications depending + * default is {@code false}. This property has different implications depending * on which marshal api you are using - when this property is set to true:
*