--- old/src/java.xml/share/classes/javax/xml/XMLConstants.java 2015-04-21 18:33:54.360094845 +0400 +++ new/src/java.xml/share/classes/javax/xml/XMLConstants.java 2015-04-21 18:33:54.268094846 +0400 @@ -26,7 +26,7 @@ package javax.xml; /** - *

Utility class to contain basic XML values as constants.

+ *

Utility class to contain basic XML values as constants. * * @author Jeff Suttor * @see Extensible Markup Language (XML) 1.1 @@ -42,15 +42,15 @@ public final class XMLConstants { /** - *

Private constructor to prevent instantiation.

+ * Private constructor to prevent instantiation. */ - private XMLConstants() { - } + private XMLConstants() { + } /** - *

Namespace URI to use to represent that there is no Namespace.

+ * Namespace URI to use to represent that there is no Namespace. * - *

Defined by the Namespace specification to be "".

+ *

Defined by the Namespace specification to be "". * * @see * Namespaces in XML, 5.2 Namespace Defaulting @@ -58,9 +58,9 @@ public static final String NULL_NS_URI = ""; /** - *

Prefix to use to represent the default XML Namespace.

+ * Prefix to use to represent the default XML Namespace. * - *

Defined by the XML specification to be "".

+ *

Defined by the XML specification to be "". * * @see @@ -69,10 +69,10 @@ public static final String DEFAULT_NS_PREFIX = ""; /** - *

The official XML Namespace name URI.

+ * The official XML Namespace name URI. * *

Defined by the XML specification to be - * "{@code http://www.w3.org/XML/1998/namespace}".

+ * "{@code http://www.w3.org/XML/1998/namespace}". * * @see @@ -82,23 +82,23 @@ "http://www.w3.org/XML/1998/namespace"; /** - *

The official XML Namespace prefix.

+ * The official XML Namespace prefix. * - *

Defined by the XML specification to be "{@code xml}".

+ *

Defined by the XML specification to be "{@code xml}". * * @see - * Namespaces in XML, 3. Qualified Names< + * Namespaces in XML, 3. Qualified Names */ public static final String XML_NS_PREFIX = "xml"; /** - *

The official XML attribute used for specifying XML Namespace + * The official XML attribute used for specifying XML Namespace * declarations, {@link #XMLNS_ATTRIBUTE - * XMLConstants.XMLNS_ATTRIBUTE}, Namespace name URI.

+ * XMLConstants.XMLNS_ATTRIBUTE}, Namespace name URI. * *

Defined by the XML specification to be - * "{@code http://www.w3.org/2000/xmlns/}".

+ * "{@code http://www.w3.org/2000/xmlns/}". * * @see @@ -111,12 +111,12 @@ "http://www.w3.org/2000/xmlns/"; /** - *

The official XML attribute used for specifying XML Namespace - * declarations.

+ * The official XML attribute used for specifying XML Namespace + * declarations. * *

It is NOT valid to use as a * prefix. Defined by the XML specification to be - * "{@code xmlns}".

+ * "{@code xmlns}". * * @see @@ -125,7 +125,7 @@ public static final String XMLNS_ATTRIBUTE = "xmlns"; /** - *

W3C XML Schema Namespace URI.

+ * W3C XML Schema Namespace URI. * *

Defined to be "{@code http://www.w3.org/2001/XMLSchema}". * @@ -138,9 +138,9 @@ "http://www.w3.org/2001/XMLSchema"; /** - *

W3C XML Schema Instance Namespace URI.

+ * W3C XML Schema Instance Namespace URI. * - *

Defined to be "{@code http://www.w3.org/2001/XMLSchema-instance}".

+ *

Defined to be "{@code http://www.w3.org/2001/XMLSchema-instance}". * * @see @@ -150,33 +150,33 @@ public static final String W3C_XML_SCHEMA_INSTANCE_NS_URI = "http://www.w3.org/2001/XMLSchema-instance"; - /** - *

W3C XPath Datatype Namespace URI.

- * - *

Defined to be "{@code http://www.w3.org/2003/11/xpath-datatypes}".

- * - * @see XQuery 1.0 and XPath 2.0 Data Model - */ - public static final String W3C_XPATH_DATATYPE_NS_URI = "http://www.w3.org/2003/11/xpath-datatypes"; + /** + * W3C XPath Datatype Namespace URI. + * + *

Defined to be "{@code http://www.w3.org/2003/11/xpath-datatypes}". + * + * @see XQuery 1.0 and XPath 2.0 Data Model + */ + public static final String W3C_XPATH_DATATYPE_NS_URI = "http://www.w3.org/2003/11/xpath-datatypes"; /** - *

XML Document Type Declaration Namespace URI as an arbitrary value.

+ * XML Document Type Declaration Namespace URI as an arbitrary value. * *

Since not formally defined by any existing standard, arbitrarily define to be "{@code http://www.w3.org/TR/REC-xml}". */ public static final String XML_DTD_NS_URI = "http://www.w3.org/TR/REC-xml"; /** - *

RELAX NG Namespace URI.

+ * RELAX NG Namespace URI. * - *

Defined to be "{@code http://relaxng.org/ns/structure/1.0}".

+ *

Defined to be "{@code http://relaxng.org/ns/structure/1.0}". * * @see RELAX NG Specification */ public static final String RELAXNG_NS_URI = "http://relaxng.org/ns/structure/1.0"; /** - *

Feature for secure processing.

+ * Feature for secure processing. * *
+ *
* When FEATURE_SECURE_PROCESSING is enabled, it is recommended that implementations * restrict external connections by default, though this may cause problems for applications * that process XML/XSD/XSL with external references. * - *

* *

* Granting all access: the keyword "all" grants permission to all protocols. - *

+ * *

* System Property: The value of this property can be set or overridden by * system property {@code javax.xml.accessExternalDTD}. - *

+ * * *

* jaxp.properties: This configuration file is in standard @@ -252,11 +249,8 @@ * directory of the Java installation. If the file exists and the system * property is specified, its value will be used to override the default * of the property. - *

* - *

* - *

* @since 1.7 */ public static final String ACCESS_EXTERNAL_DTD = "http://javax.xml.XMLConstants/property/accessExternalDTD"; @@ -270,7 +264,7 @@ * due to the restriction of this property, a runtime exception that is specific * to the context is thrown. In the case of {@link javax.xml.validation.SchemaFactory} * for example, org.xml.sax.SAXException is thrown. - *

+ * *

* Value: a list of protocols separated by comma. A protocol is the scheme portion of a * {@link java.net.URI}, or in the case of the JAR protocol, "jar" plus the scheme portion @@ -290,9 +284,8 @@ * Examples of protocols are file, http, jar:file. * * - *

* - *

+ *

* Default value: The default value is implementation specific and therefore not specified. * The following options are provided for consideration: *

@@ -300,20 +293,18 @@ *
  • an empty string to deny all access to external references;
    • *
  • a specific protocol, such as file, to give permission to only the protocol;
    • *
  • the keyword "all" to grant permission to all protocols.
    • - *
    + *
    * When FEATURE_SECURE_PROCESSING is enabled, it is recommended that implementations * restrict external connections by default, though this may cause problems for applications * that process XML/XSD/XSL with external references. *
    - *

    + * *

    * Granting all access: the keyword "all" grants permission to all protocols. - *

    * *

    * System Property: The value of this property can be set or overridden by * system property {@code javax.xml.accessExternalSchema} - *

    * *

    * jaxp.properties: This configuration file is in standard @@ -323,12 +314,11 @@ * of the property. * * @since 1.7 - *

    */ public static final String ACCESS_EXTERNAL_SCHEMA = "http://javax.xml.XMLConstants/property/accessExternalSchema"; /** - *

    Property: accessExternalStylesheet

    + * Property: accessExternalStylesheet * *

    * Restrict access to the protocols specified for external references set by the @@ -338,7 +328,7 @@ * {@link javax.xml.transform.Transformer} for example, * {@link javax.xml.transform.TransformerConfigurationException} * will be thrown by the {@link javax.xml.transform.TransformerFactory}. - *

    + * *

    * Value: a list of protocols separated by comma. A protocol is the scheme portion of a * {@link java.net.URI}, or in the case of the JAR protocol, "jar" plus the scheme portion @@ -358,9 +348,8 @@ * Examples of protocols are file, http, jar:file. * * - *

    * - *

    + *

    * Default value: The default value is implementation specific and therefore not specified. * The following options are provided for consideration: *

    @@ -368,20 +357,18 @@ *
  • an empty string to deny all access to external references;
    • *
  • a specific protocol, such as file, to give permission to only the protocol;
    • *
  • the keyword "all" to grant permission to all protocols.
    • - *
    + *
    * When FEATURE_SECURE_PROCESSING is enabled, it is recommended that implementations * restrict external connections by default, though this may cause problems for applications * that process XML/XSD/XSL with external references. *
    - *

    + * *

    * Granting all access: the keyword "all" grants permission to all protocols. - *

    * *

    * System Property: The value of this property can be set or overridden by * system property {@code javax.xml.accessExternalStylesheet} - *

    * *

    * jaxp.properties: This configuration file is in standard --- old/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java 2015-04-21 18:33:54.720094845 +0400 +++ new/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java 2015-04-21 18:33:54.632094845 +0400 @@ -32,11 +32,10 @@ import java.util.regex.Pattern; /** - * Factory that creates new javax.xml.datatype Objects that map XML to/from Java Objects. + * Factory that creates new {@code javax.xml.datatype} {@code Object}s that map XML to/from Java {@code Object}s. *

    * A new instance of the {@code DatatypeFactory} is created through the {@link #newInstance()} method * that uses the following implementation resolution mechanisms to determine an implementation: - *

    *

      *
    1. * If the system property specified by {@link #DATATYPEFACTORY_PROPERTY}, "{@code javax.xml.datatype.DatatypeFactory}", @@ -89,9 +88,9 @@ public abstract class DatatypeFactory { /** - *

      Default property name as defined in JSR 206: Java(TM) API for XML Processing (JAXP) 1.3.

      + * Default property name as defined in JSR 206: Java(TM) API for XML Processing (JAXP) 1.3. * - *

      Default value is {@code javax.xml.datatype.DatatypeFactory}.

      + *

      Default value is {@code javax.xml.datatype.DatatypeFactory}. */ public static final String DATATYPEFACTORY_PROPERTY = // We use a String constant here, rather than calling @@ -100,16 +99,15 @@ "javax.xml.datatype.DatatypeFactory"; /** - *

      Default implementation class name as defined in - * JSR 206: Java(TM) API for XML Processing (JAXP) 1.3.

      + * Default implementation class name as defined in + * JSR 206: Java(TM) API for XML Processing (JAXP) 1.3. * *

      Implementers should specify the name of an appropriate class * to be instantiated if no other implementation resolution mechanism - * succeeds.

      + * succeeds. * *

      Users should not refer to this field; it is intended only to * document a factory implementation detail. - *

      */ public static final String DATATYPEFACTORY_IMPLEMENTATION_CLASS = // We use new String() here to prevent javadoc from generating @@ -130,18 +128,18 @@ Pattern.compile("[^YM]*[DT].*"); /** - *

      Protected constructor to prevent instantiation outside of package.

      + * Protected constructor to prevent instantiation outside of package. * - *

      Use {@link #newInstance()} to create a {@code DatatypeFactory}.

      + *

      Use {@link #newInstance()} to create a {@code DatatypeFactory}. */ protected DatatypeFactory() { } /** - *

      Obtain a new instance of a {@code DatatypeFactory}.

      + * Obtain a new instance of a {@code DatatypeFactory}. * *

      The implementation resolution mechanisms are defined in this - * Class's documentation.

      + * {@code Class}'s documentation. * * @return New instance of a {@code DatatypeFactory} * @@ -161,33 +159,33 @@ } /** - *

      Obtain a new instance of a {@code DatatypeFactory} from class name. + * Obtain a new instance of a {@code DatatypeFactory} from class name. * This function is useful when there are multiple providers in the classpath. * It gives more control to the application as it can specify which provider - * should be loaded.

      + * should be loaded. * *

      Once an application has obtained a reference to a {@code DatatypeFactory} - * it can use the factory to configure and obtain datatype instances.

      + * it can use the factory to configure and obtain datatype instances. * * *

      Tip for Trouble-shooting

      - *

      Setting the jaxp.debug system property will cause + *

      Setting the {@code jaxp.debug} system property will cause * this method to print a lot of debug messages - * to System.err about what it is doing and where it is looking at.

      + * to {@code System.err} about what it is doing and where it is looking at. * - *

      If you have problems try:

      + *

      If you have problems try: * 

            * java -Djaxp.debug=1 YourProgram ....
      *
      * * @param factoryClassName fully qualified factory class name that provides implementation of {@code javax.xml.datatype.DatatypeFactory}. * - * @param classLoader ClassLoader used to load the factory class. If null - * current Thread's context classLoader is used to load the factory class. + * @param classLoader {@code ClassLoader} used to load the factory class. If {@code null} + * current {@code Thread}'s context classLoader is used to load the factory class. * * @return New instance of a {@code DatatypeFactory} * - * @throws DatatypeConfigurationException if factoryClassName is null, or + * @throws DatatypeConfigurationException if {@code factoryClassName} is {@code null}, or * the factory class cannot be loaded, instantiated. * * @see #newInstance() @@ -201,11 +199,11 @@ } /** - *

      Obtain a new instance of a Duration - * specifying the Duration as its string representation, "PnYnMnDTnHnMnS", - * as defined in XML Schema 1.0 section 3.2.6.1.

      + * Obtain a new instance of a {@code Duration} + * specifying the {@code Duration} as its string representation, "PnYnMnDTnHnMnS", + * as defined in XML Schema 1.0 section 3.2.6.1. * - *

      XML Schema Part 2: Datatypes, 3.2.6 duration, defines duration as:

      + *

      XML Schema Part 2: Datatypes, 3.2.6 duration, defines {@code duration} as: *

      * duration represents a duration of time. * The value space of duration is a six-dimensional space where the coordinates designate the @@ -213,28 +211,28 @@ * These components are ordered in their significance by their order of appearance i.e. as * year, month, day, hour, minute, and second. *
      - *

      All six values are set and available from the created {@link Duration}

      + *

      All six values are set and available from the created {@link Duration} * *

      The XML Schema specification states that values can be of an arbitrary size. * Implementations may chose not to or be incapable of supporting arbitrarily large and/or small values. * An {@link UnsupportedOperationException} will be thrown with a message indicating implementation limits - * if implementation capacities are exceeded.

      + * if implementation capacities are exceeded. * - * @param lexicalRepresentation String representation of a Duration. + * @param lexicalRepresentation {@code String} representation of a {@code Duration}. * - * @return New Duration created from parsing the lexicalRepresentation. + * @return New {@code Duration} created from parsing the {@code lexicalRepresentation}. * - * @throws IllegalArgumentException If lexicalRepresentation is not a valid representation of a Duration. + * @throws IllegalArgumentException If {@code lexicalRepresentation} is not a valid representation of a {@code Duration}. * @throws UnsupportedOperationException If implementation cannot support requested values. - * @throws NullPointerException if lexicalRepresentation is null. + * @throws NullPointerException if {@code lexicalRepresentation} is {@code null}. */ public abstract Duration newDuration(final String lexicalRepresentation); /** - *

      Obtain a new instance of a Duration - * specifying the Duration as milliseconds.

      + * Obtain a new instance of a {@code Duration} + * specifying the {@code Duration} as milliseconds. * - *

      XML Schema Part 2: Datatypes, 3.2.6 duration, defines duration as:

      + *

      XML Schema Part 2: Datatypes, 3.2.6 duration, defines {@code duration} as: *

      * duration represents a duration of time. * The value space of duration is a six-dimensional space where the coordinates designate the @@ -243,8 +241,8 @@ * year, month, day, hour, minute, and second. *
      *

      All six values are set by computing their values from the specified milliseconds - * and are available using the get methods of the created {@link Duration}. - * The values conform to and are defined by:

      + * and are available using the {@code get} methods of the created {@link Duration}. + * The values conform to and are defined by: *