diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogFeatures.java b/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogFeatures.java index 01d0b533055..5fca3130cf6 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogFeatures.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogFeatures.java @@ -34,9 +34,9 @@ import jdk.xml.internal.SecuritySupport; * The CatalogFeatures holds a collection of features and properties. *

* - *

Catalog Features

* - * + *
+ * * * * @@ -44,7 +44,7 @@ import jdk.xml.internal.SecuritySupport; * * * - * + * * * * @@ -55,7 +55,7 @@ import jdk.xml.internal.SecuritySupport; * * * - * + * * @@ -71,7 +71,7 @@ import jdk.xml.internal.SecuritySupport; * * * - * + * * * @@ -89,7 +89,7 @@ import jdk.xml.internal.SecuritySupport; * * * - * + * * @@ -107,7 +107,7 @@ import jdk.xml.internal.SecuritySupport; * * * - * + * * * @@ -241,9 +241,10 @@ import jdk.xml.internal.SecuritySupport; * supports a resolver. The following table lists all such processes. * *

- *

Processes with Catalog Support

+ *

Processes with Catalog Support

* - *
Catalog Features
FeatureProperty NameSystem Property [1]jaxp.properties [1]Value [2]Value [2]Action
FILESFILESA semicolon-delimited list of URIs to locate the catalog files. * The URIs must be absolute and have a URL protocol handler for the URI scheme. *
PREFERPREFERIndicates the preference between the public and system * identifiers. The default value is public [3].javax.xml.catalog.prefer
DEFERDEFERIndicates that the alternative catalogs including those * specified in delegate entries or nextCatalog are not read until they are * needed. The default value is true.
RESOLVERESOLVEDetermines the action if there is no matching entry found after * all of the specified catalogs are exhausted. The default is strict.javax.xml.catalog.resolve [4]
+ *
+ * * * * diff --git a/jaxp/src/java.xml/share/classes/javax/xml/catalog/package.html b/jaxp/src/java.xml/share/classes/javax/xml/catalog/package.html index 8e6e42836bf..043cf6f1678 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/catalog/package.html +++ b/jaxp/src/java.xml/share/classes/javax/xml/catalog/package.html @@ -1,8 +1,8 @@ - + - + Provides the classes for implementing @@ -35,7 +35,7 @@ questions.

Unless otherwise noted, passing a null argument to a constructor or method in any class or interface in this package will - cause a NullPointerException to be thrown. + cause a NullPointerException to be thrown.

@since 9 diff --git a/jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java index a53f93df2ee..ebd600eb196 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2017, 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 @@ -774,15 +774,11 @@ public abstract class DatatypeFactory { /** * Create an {@code XMLGregorianCalendar} from a {@link GregorianCalendar}. * - *
Processes with Catalog Support
Process
+ *
+ * * * - * - * - * * * * diff --git a/jaxp/src/java.xml/share/classes/javax/xml/datatype/Duration.java b/jaxp/src/java.xml/share/classes/javax/xml/datatype/Duration.java index 90f016edfed..1caf4508a48 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/datatype/Duration.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/datatype/Duration.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2017, 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 @@ -120,26 +120,22 @@ public abstract class Duration { * maps to. Type is computed based on fields that are set, * i.e. {@link #isSet(DatatypeConstants.Field field)} == {@code true}. * - *
Field by Field Conversion from + * {@link GregorianCalendar} to an {@link XMLGregorianCalendar}
- * Field by Field Conversion from - * {@link GregorianCalendar} to an {@link XMLGregorianCalendar} - *
{@code java.util.GregorianCalendar} field{@code javax.xml.datatype.XMLGregorianCalendar} field
+ *
+ * * * - * + * + * + * + * + * + * + * * * * * - * - * - * - * - * - * - * - * - * * * * diff --git a/jaxp/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java b/jaxp/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java index 82ea2e17329..cc25c17a3e4 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2017, 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 @@ -53,25 +53,21 @@ import java.util.GregorianCalendar; * W3C XML Schema 1.0 Part 2, Appendix D, * ISO 8601 Date and Time Formats. * - * - *
Required fields for XML Schema 1.0 Date/Time Datatypes.
+ * (timezone is optional for all date/time datatypes)
- * Required fields for XML Schema 1.0 Date/Time Datatypes.
- * (timezone is optional for all date/time datatypes) - * 		Datatypeyearmonthdayhourminutesecond
Datatypeyearmonthdayhourminutesecond
{@link DatatypeConstants#DURATION}XX
+ * + *
+ * * * - * - * - * - * - * * * * * + * + * * - * + * * @@ -89,12 +85,12 @@ import java.util.GregorianCalendar; * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * * - * + * * * * - * + * * *
Date/Time Datatype Field Mapping Between XML Schema 1.0 and Java Representation
- * Date/Time Datatype Field Mapping Between XML Schema 1.0 and Java Representation - *
XML Schema 1.0
* datatype
* field		Related
XMLGregorianCalendar
Accessor(s)		Value Range
yearyear {@link #getYear()} + {@link #getEon()} or
* {@link #getEonAndYear} *
monthmonth {@link #getMonth()} 1 to 12 or {@link DatatypeConstants#FIELD_UNDEFINED}
dayday {@link #getDay()} Independent of month, max range is 1 to 31 or {@link DatatypeConstants#FIELD_UNDEFINED}.
* The normative value constraint stated relative to month @@ -102,7 +98,7 @@ import java.util.GregorianCalendar; *
hourhour{@link #getHour()} * 0 to 23 or {@link DatatypeConstants#FIELD_UNDEFINED}. @@ -114,12 +110,12 @@ import java.util.GregorianCalendar; *
minuteminute {@link #getMinute()} 0 to 59 or {@link DatatypeConstants#FIELD_UNDEFINED}
secondsecond * {@link #getSecond()} + {@link #getMillisecond()}/1000 or
* {@link #getSecond()} + {@link #getFractionalSecond()} @@ -135,7 +131,7 @@ import java.util.GregorianCalendar; *
timezonetimezone {@link #getTimezone()} Number of minutes or {@link DatatypeConstants#FIELD_UNDEFINED}. * Value range from -14 hours (-14 * 60 minutes) to 14 hours (14 * 60 minutes). @@ -748,26 +744,22 @@ public abstract class XMLGregorianCalendar * Return the name of the XML Schema date/time type that this instance * maps to. Type is computed based on fields that are set. * - * + *
+ * * * - * + * + * + * + * + * + * + * * * * * - * - * - * - * - * - * - * - * - * * * * @@ -911,21 +903,17 @@ public abstract class XMLGregorianCalendar * instance, see * {@link #toGregorianCalendar(TimeZone, Locale, XMLGregorianCalendar)}. * - *
Required fields for XML Schema 1.0 Date/Time Datatypes.
+ * (timezone is optional for all date/time datatypes)
- * Required fields for XML Schema 1.0 Date/Time Datatypes.
- * (timezone is optional for all date/time datatypes) - * 		Datatypeyearmonthdayhourminutesecond
Datatypeyearmonthdayhourminutesecond
{@link DatatypeConstants#DATETIME}XX
+ *
+ * * * - * + * + * * * * * - * - * - * - * * * * diff --git a/jaxp/src/java.xml/share/classes/javax/xml/datatype/package.html b/jaxp/src/java.xml/share/classes/javax/xml/datatype/package.html index de065acc664..d564f6af5c0 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/datatype/package.html +++ b/jaxp/src/java.xml/share/classes/javax/xml/datatype/package.html @@ -1,6 +1,6 @@ - + - - +javax.xml.xpath @@ -50,9 +49,10 @@ questions.
  • XQuery 1.0 and XPath 2.0 Data Model, xdt:yearMonthDuration
    • -
    +
    -
    Field by Field Conversion from this class to + * {@code java.util.GregorianCalendar}
    - * Field by Field Conversion from this class to - * {@code java.util.GregorianCalendar} - * {@code java.util.GregorianCalendar} field{@code javax.xml.datatype.XMLGregorianCalendar} field
    {@code java.util.GregorianCalendar} field{@code javax.xml.datatype.XMLGregorianCalendar} field
    {@code ERA}{@link #getEonAndYear()}{@code .signum() < 0 ? GregorianCalendar.BC : GregorianCalendar.AD}
    +
    + @@ -101,10 +101,11 @@ questions.
    W3C XML Schema/Java Type Mappings
    W3C XML Schema Data Type
    -
    +
    - +
    + @@ -124,7 +125,7 @@ questions.
    XQuery and XPath/Java Type Mappings
    XQuery 1.0 and XPath 2.0 Data Model
    -
    +

    W3C XML Schema data types that have a "natural" mapping to Java types are defined by @@ -151,7 +152,7 @@ questions.

  • xs:unsignedShort
    • -
    +
      @@ -162,7 +163,7 @@ questions.
    • Since 1.5
    -
    +
    diff --git a/jaxp/src/java.xml/share/classes/javax/xml/namespace/NamespaceContext.java b/jaxp/src/java.xml/share/classes/javax/xml/namespace/NamespaceContext.java index 09e46e7dfbf..1ad999acb14 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/namespace/NamespaceContext.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/namespace/NamespaceContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2017, 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 @@ -88,17 +88,12 @@ public interface NamespaceContext { * table describes the returned Namespace URI value for all * possible prefix values: * - * + *
    + * * * - * - * - * - * - * + * + * * * * @@ -158,15 +153,10 @@ public interface NamespaceContext { * table describes the returned prefix value for all Namespace URI * values: * - *
    Return value for specified prefixes
    - * {@code getNamespaceURI(prefix)} - * return value for specified prefixes - *
    prefix parameterNamespace URI return valueprefix parameterNamespace URI return value
    + *
    + * * * - * - * - * * * * @@ -230,14 +220,10 @@ public interface NamespaceContext { * table describes the returned prefixes value for all Namespace * URI values: * - *
    Return value for specified Namespace URIs
    - * {@code getPrefix(namespaceURI)} return value for - * specified Namespace URIs - *
    Namespace URI parameterprefix value returned
    + *
    + * * * - * - * - * * * * diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventWriter.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventWriter.java index e94feaec309..0df399bb5d0 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventWriter.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLEventWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2017, 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 @@ -64,21 +64,17 @@ public interface XMLEventWriter extends XMLEventConsumer { * Add an event to the output stream * Adding a START_ELEMENT will open a new namespace scope that * will be closed when the corresponding END_ELEMENT is written. - *
    Return value for specified Namespace URIs
    {@code - * getPrefixes(namespaceURI)} return value for - * specified Namespace URIs
    Namespace URI parameterprefixes value returned
    + *
    + * * * - * - * - * - * - * * * * * * + * + * * * * diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLInputFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLInputFactory.java index ce03fc9bdc1..4a25f8fc33e 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLInputFactory.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLInputFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2017, 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 @@ -36,22 +36,18 @@ import javax.xml.transform.Source; * Each property varies in the level of support required by each implementation. * The level of support required is described in the 'Required' column. * - *
    Required and optional fields for events added to the writer
    - * Required and optional fields for events added to the writer - *
    Event TypeRequired FieldsOptional FieldsRequired Behavior
    START_ELEMENT QName name
    + *
    + * * * - * - * - * - * - * * * * * * * + * + * * * * diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLOutputFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLOutputFactory.java index 17d1945de3e..0203273256c 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLOutputFactory.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLOutputFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2017, 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 @@ -36,22 +36,18 @@ import javax.xml.transform.Result; * Each property varies in the level of support required by each implementation. * The level of support required is described in the 'Required' column. * - *
    Configuration Parameters
    - * Configuration parameters - *
    Property NameBehaviorReturn typeDefault ValueRequired
    javax.xml.stream.isValidatingTurns on/off implementation specific DTD validationBooleanFalseNo
    javax.xml.stream.isNamespaceAwareTurns on/off namespace processing for XML 1.0 supportBooleanTrueTrue (required) / False (optional)
    javax.xml.stream.isCoalescingRequires the processor to coalesce adjacent character dataBooleanFalseYes
    + *
    + * * * - * - * - * - * - * * * * * * * + * + * * * diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamReader.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamReader.java index 23322b995db..06c44f9b532 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamReader.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamReader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2017, 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 @@ -71,19 +71,15 @@ import javax.xml.namespace.QName; * If a method is called in an invalid state the method will throw a * java.lang.IllegalStateException. * - *
    Configuration Parameters
    - * Configuration parameters - *
    Property NameBehaviorReturn typeDefault ValueRequired
    javax.xml.stream.isRepairingNamespacesdefaults prefixes * on the output sideBooleanFalseYes
    + *
    + * * * - * - * - * - * - * * * * + * + * * * *
    Valid methods for each state
    - * Valid methods for each state - *
    Event TypeValid Methods
    All States getProperty(), hasNext(), require(), close(), diff --git a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamWriter.java b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamWriter.java index 6fc1722c9a0..1f0a3c34577 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamWriter.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/stream/XMLStreamWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2017, 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 @@ -38,12 +38,10 @@ import javax.xml.namespace.NamespaceContext; * Each NAMESPACE * and ATTRIBUTE must be individually written. * - * + *
    + * * - * - * - * - * + * * * * diff --git a/jaxp/src/java.xml/share/classes/javax/xml/transform/package.html b/jaxp/src/java.xml/share/classes/javax/xml/transform/package.html index 45c2d78faf4..2355a5ad1d8 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/transform/package.html +++ b/jaxp/src/java.xml/share/classes/javax/xml/transform/package.html @@ -1,6 +1,6 @@ - + - - - +javax.xml.transform @@ -97,7 +93,7 @@ if (tfactory.getFeature(DOMSource.FEATURE) && tfactory.getFeature(Stream

    -Qualified Name Representation +Qualified Name Representation

    Namespaces diff --git a/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java index 2bcc73e1be1..aafa5cd844b 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2017, 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 @@ -58,7 +58,7 @@ import org.xml.sax.SAXParseException; * may not attempt to recursively invoke the {@code newSchema} method, * even from the same thread. * - *

    Schema Language

    + *

    Schema Language

    *

    * This spec uses a namespace URI to designate a schema language. * The following table shows the values defined by this specification. @@ -84,7 +84,8 @@ import org.xml.sax.SAXParseException; * validation implemented on this interface necessarily deviate from * the XML DTD semantics as defined in the XML 1.0. * - *

    XML Namespaces, {@code javax.xml.stream.isRepairingNamespaces} and write method behaviour
    XML Namespaces, {@code javax.xml.stream.isRepairingNamespaces} and write method behaviour
    Method {@code isRepairingNamespaces} == true{@code isRepairingNamespaces} == false
    + *
    + * * * * diff --git a/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryLoader.java b/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryLoader.java index f617d99ae51..051d496415b 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryLoader.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2017, 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 @@ -60,7 +60,7 @@ public abstract class SchemaFactoryLoader { * the list of available schema languages. * * @throws NullPointerException - * If the schemaLanguage parameter is null. + * If the schemaLanguage parameter is null. * * @return null if the callee fails to create one. */ diff --git a/jaxp/src/java.xml/share/classes/javax/xml/validation/Validator.java b/jaxp/src/java.xml/share/classes/javax/xml/validation/Validator.java index bd746b40e84..b71319c8023 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/validation/Validator.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/validation/Validator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2017, 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 @@ -131,12 +131,10 @@ public abstract class Validator { *

    This method places the following restrictions on the types of * the {@link Source}/{@link Result} accepted. * - *

    URIs for Supported Schema languages
    value
    + *
    + * * * - * - * - * * * * @@ -144,7 +142,7 @@ public abstract class Validator { * * * - * + * * * * diff --git a/jaxp/src/java.xml/share/classes/javax/xml/validation/package.html b/jaxp/src/java.xml/share/classes/javax/xml/validation/package.html index 2dd06b3175e..e50c8334559 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/validation/package.html +++ b/jaxp/src/java.xml/share/classes/javax/xml/validation/package.html @@ -1,6 +1,6 @@ - + - - - +javax.xml.validation @@ -86,7 +82,7 @@ questions. process simple (see example below).

    - Usage example. The following example demonstrates validating + Usage example. The following example demonstrates validating an XML document with the Validation API (for readability, some exception handling is not shown): 

    diff --git a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPath.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPath.java
index d7c0a44bf95..8270231254c 100644
--- a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPath.java
+++ b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, 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
@@ -31,14 +31,18 @@ import org.xml.sax.InputSource;
 
 /**
  * {@code XPath} provides access to the XPath evaluation environment and expressions.
+ * The XPath evaluation is affected by the factors described in the following table.
  *
- * 
- *
    {@code Source} / {@code Result} Accepted
    {@code Source} / {@code Result} Accepted
    {@link javax.xml.transform.stream.StreamSource}{@link javax.xml.transform.sax.SAXSource}{@link javax.xml.transform.stax.StAXSource}
    {@code null}OK
    + * + *
    + * * * - * + * + * * * + * * * * * + * *
    Evaluation of XPath Expressions
    Evaluation of XPath Expressions.FactorBehavior
    context @@ -84,6 +88,7 @@ import org.xml.sax.InputSource; * Conversion to the return type follows XPath conversion rules. *
    * *

    An XPath object is not thread-safe and not reentrant. diff --git a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathExpression.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathExpression.java index 697745e92d5..b6616685231 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathExpression.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathExpression.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2017, 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 @@ -30,14 +30,18 @@ import org.xml.sax.InputSource; /** * {@code XPathExpression} provides access to compiled XPath expressions. + * The XPath evaluation is affected by the factors described in the following table. * - * - * + * + *
    + * * * - * + * + * * * + * * * *
    Evaluation of XPath Expressions
    Evaluation of XPath Expressions.FactorBehavior
    context diff --git a/jaxp/src/java.xml/share/classes/javax/xml/xpath/package.html b/jaxp/src/java.xml/share/classes/javax/xml/xpath/package.html index 585160a726e..839557fde12 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/xpath/package.html +++ b/jaxp/src/java.xml/share/classes/javax/xml/xpath/package.html @@ -1,8 +1,8 @@ - + - + This package provides an object-model neutral API for the evaluation of XPath expressions and access to the evaluation @@ -36,7 +36,7 @@ environment. The XPath API supports XML Path Language (XPath) Version 1.0 -
    +

    - +

    1. XPath Overview

    The XPath language provides a simple, concise syntax for selecting @@ -69,7 +69,7 @@ stand-alone language, as a single XPath expression can be used to replace many lines of DOM API code.

    - +

    2. XPath Expressions

    An XPath expression is composed of a location @@ -139,11 +139,15 @@ attribute nodes, text nodes, comment nodes, and processing instruction nodes. The following table gives examples of location paths for each of these node types:

    - +
    + + - - + + + + +
    Examples of Location Path
    Location PathDescriptionLocation PathDescription
    /foo/bar/@id @@ -171,6 +175,7 @@ distinction is made between escaped and non-escaped character data. <bar> element.

    Predicates allow for refining the nodes selected by an XPath @@ -194,7 +199,7 @@ expression, such as:

    - +

    3. XPath Data Types

    While XPath expressions select nodes in the XML document, the XPath @@ -207,7 +212,7 @@ following data types:

  • String
    • - +

    3.1 QName types

    The XPath API defines the following {@link javax.xml.namespace.QName} types to represent return types of an XPath evaluation: @@ -236,7 +241,7 @@ of the child text nodes is returned.

    The Number return type attempts to coalesce the text of a node to a double data type. - +

    3.2 Class types

    In addition to the QName types, the XPath API supports the use of Class types through the XPathExpression.evaluteExpression(...) or @@ -254,14 +259,14 @@ The XPath data types are mapped to Class types as follows:

    Of the subtypes of Number, only Double, Integer and Long are supported. - +

    3.3 Enum types

    Enum types are defined in {@link javax.xml.xpath.XPathEvaluationResult.XPathResultType} that provide mappings between the QName and Class types above. The result of evaluating an expression using the XPathExpression.evaluteExpression(...) or XPath.evaluateExpression(...) methods will be of one of these types. - +

    4. XPath Context

    XPath location paths may be relative to a particular node in the @@ -278,7 +283,7 @@ document, known as the context. A context consists of: It is an XML document tree represented as a hierarchy of nodes, a {@link org.w3c.dom.Node} for example, in the JDK implementation. - +

    5. Using the XPath API

    Consider the following XML document: diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/Attr.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/Attr.java index 8db99e9a6a1..7b125dedb8e 100644 --- a/jaxp/src/java.xml/share/classes/org/w3c/dom/Attr.java +++ b/jaxp/src/java.xml/share/classes/org/w3c/dom/Attr.java @@ -111,7 +111,9 @@ package org.w3c.dom; *

    The following table gives some examples of the relations between the * attribute value in the original document (parsed attribute), the value as * exposed in the DOM, and the serialization of the value: - * + *
    + * + * * * * * * + * + * * * @@ -126,7 +130,7 @@ package org.w3c.dom; * 
    "x&#178;=5"
    * * * * * + * *
    Examples of the Original, Normalized and Serialized Values
    ExamplesParsed @@ -119,6 +121,8 @@ package org.w3c.dom; * Initial Attr.valueSerialized attribute value
    * Character reference - * 
    "x\u00b2=5"
    + * 
    "x²=5"
    *     		* 
    "x&#178;=5"
    @@ -180,6 +184,7 @@ package org.w3c.dom; *     		Dependent on Implementation and Load OptionsDependent on Implementation and Load/Save Options
    *

    See also the Document Object Model (DOM) Level 3 Core Specification. */ diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/Document.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/Document.java index ab2d6e4f17e..c489fade718 100644 --- a/jaxp/src/java.xml/share/classes/org/w3c/dom/Document.java +++ b/jaxp/src/java.xml/share/classes/org/w3c/dom/Document.java @@ -353,37 +353,42 @@ public interface Document extends Node { * instantiate. * @return A new Element object with the following * attributes: - * + *
    + * + * * * * * + * + * * - * - * + * * * - * - * + * * * - * - * + * * * - * - * + * * * - * - * + * * + * *
    Attributes of the {@code Element} object
    AttributeValue
    Node.nodeName + * Node.nodeName * qualifiedName
    Node.namespaceURI + * Node.namespaceURI * namespaceURI
    Node.prefixprefix, extracted + * Node.prefixprefix, extracted * from qualifiedName, or null if there is * no prefix
    Node.localNamelocal name, extracted from + * Node.localNamelocal name, extracted from * qualifiedName
    Element.tagName + * Element.tagName * qualifiedName
    * @exception DOMException * INVALID_CHARACTER_ERR: Raised if the specified @@ -417,43 +422,48 @@ public interface Document extends Node { * @param qualifiedName The qualified name of the attribute to * instantiate. * @return A new Attr object with the following attributes: - * + *
    + * + * * * * * + * + * * - * - * + * + * * * - * - * + * * * - * - * * * - * - * + * * * - * - * + * * * - * - * + * * + * *
    Attributes of the {@code Attr} object
    * AttributeValue
    Node.nodeNamequalifiedNameNode.nodeNamequalifiedName
    + * * Node.namespaceURInamespaceURInamespaceURI
    + * * Node.prefixprefix, extracted from + * prefix, extracted from * qualifiedName, or null if there is no * prefix
    Node.localNamelocal name, extracted from + * Node.localNamelocal name, extracted from * qualifiedName
    Attr.name + * Attr.name * qualifiedName
    Node.nodeValuethe empty + * Node.nodeValuethe empty * string
    * @exception DOMException * INVALID_CHARACTER_ERR: Raised if the specified diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/Node.java b/jaxp/src/java.xml/share/classes/org/w3c/dom/Node.java index a62ad94d91e..79cbada7935 100644 --- a/jaxp/src/java.xml/share/classes/org/w3c/dom/Node.java +++ b/jaxp/src/java.xml/share/classes/org/w3c/dom/Node.java @@ -61,104 +61,109 @@ package org.w3c.dom; *

    The values of nodeName, * nodeValue, and attributes vary according to the * node type as follows: - * + *
    + * + * * * * * * * + * + * * - * - * - * + * - * + * * * - * - * + * - * - * + * * * - * - * + * - * - * + * * * - * - * + * - * - * + * + * * * - * - * - * + * - * + * * * - * - * + * - * - * + * + * * * - * - * - * - * + * + * * * - * - * - * - * + * + * + * * * - * - * - * + * + * - * + * * * - * - * - * + * + * - * + * * * - * - * + * - * - * + * * * - * - * + * - * - * + * * + * *
    Interface table
    InterfacenodeNamenodeValueattributes
    + * * Attrsame as Attr.namesame as + * same as Attr.namesame as * Attr.valuenullnull
    CDATASection + * CDATASection * "#cdata-section"same as CharacterData.data, the + * same as CharacterData.data, the * content of the CDATA Sectionnullnull
    Comment + * Comment * "#comment"same as CharacterData.data, the + * same as CharacterData.data, the * content of the commentnullnull
    Document + * Document * "#document"nullnullnullnull
    + * * DocumentFragment"#document-fragment" + * "#document-fragment" * nullnullnull
    DocumentTypesame as + * DocumentTypesame as * DocumentType.namenullnullnullnull
    + * * Elementsame as Element.tagNamenull + * same as Element.tagNamenull * NamedNodeMap
    Entityentity namenull + * Entityentity namenull * null
    EntityReferencename of entity referenced + * EntityReferencename of entity referenced * nullnullnull
    Notationnotation name + * Notationnotation name * nullnullnull
    ProcessingInstructionsame + * ProcessingInstructionsame * as ProcessingInstruction.targetsame as + * same as * ProcessingInstruction.datanullnull
    Text + * Text * "#text"same as CharacterData.data, the content + * same as CharacterData.data, the content * of the text nodenullnull
    *

    See also the Document Object Model (DOM) Level 3 Core Specification. */ @@ -687,30 +692,35 @@ public interface Node { * textual content. *
    The string returned is made of the text content of this node * depending on its type, as defined below: - * + *
    + * + * * * * * + * + * * - * - * * * - * - * + * * * - * - * + * * + * *
    Node/Content table
    Node typeContent
    + * * ELEMENT_NODE, ATTRIBUTE_NODE, ENTITY_NODE, ENTITY_REFERENCE_NODE, * DOCUMENT_FRAGMENT_NODEconcatenation of the textContent + * concatenation of the textContent * attribute value of every child node, excluding COMMENT_NODE and * PROCESSING_INSTRUCTION_NODE nodes. This is the empty string if the * node has no children.
    TEXT_NODE, CDATA_SECTION_NODE, COMMENT_NODE, + * TEXT_NODE, CDATA_SECTION_NODE, COMMENT_NODE, * PROCESSING_INSTRUCTION_NODEnodeValuenodeValue
    DOCUMENT_NODE, + * DOCUMENT_NODE, * DOCUMENT_TYPE_NODE, NOTATION_NODEnullnull
    * @exception DOMException * DOMSTRING_SIZE_ERR: Raised when it would return more characters than @@ -737,30 +747,35 @@ public interface Node { * textual content. *
    The string returned is made of the text content of this node * depending on its type, as defined below: - * + *
    + * + * * * * * + * + * * - * - * * * - * - * + * * * - * - * + * * + * *
    Node/Content table
    Node typeContent
    + * * ELEMENT_NODE, ATTRIBUTE_NODE, ENTITY_NODE, ENTITY_REFERENCE_NODE, * DOCUMENT_FRAGMENT_NODEconcatenation of the textContent + * concatenation of the textContent * attribute value of every child node, excluding COMMENT_NODE and * PROCESSING_INSTRUCTION_NODE nodes. This is the empty string if the * node has no children.
    TEXT_NODE, CDATA_SECTION_NODE, COMMENT_NODE, + * TEXT_NODE, CDATA_SECTION_NODE, COMMENT_NODE, * PROCESSING_INSTRUCTION_NODEnodeValuenodeValue
    DOCUMENT_NODE, + * DOCUMENT_NODE, * DOCUMENT_TYPE_NODE, NOTATION_NODEnullnull
    * @exception DOMException * NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly. diff --git a/jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/package.html b/jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/package.html index 83a1a986ae5..c2a59387ee8 100644 --- a/jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/package.html +++ b/jaxp/src/java.xml/share/classes/org/w3c/dom/ranges/package.html @@ -2,7 +2,7 @@ W3C IPR SOFTWARE NOTICE - +

    Document Object Model Level 2 Traversal and Range is a platform and language-neutral interfaces that allow programs @@ -20,14 +20,14 @@

    W3C IPR SOFTWARE NOTICE

    -

    +

    Copyright © 2000 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. -

    +

    The DOM bindings are published under the W3C Software Copyright Notice and License. The software license requires "Notice of any changes or @@ -42,14 +42,14 @@ and License could be found at http://www.w3.org/Consortium/Legal/copyright-software-19980720

    -

    +

    Copyright © 1994-2000 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/ -

    +

    This W3C work (including software, documents, or other related items) is being provided by the copyright holders under the following license. By diff --git a/jaxp/src/java.xml/share/classes/org/xml/sax/package.html b/jaxp/src/java.xml/share/classes/org/xml/sax/package.html index 2af5e4cd47d..2c16b87f34c 100644 --- a/jaxp/src/java.xml/share/classes/org/xml/sax/package.html +++ b/jaxp/src/java.xml/share/classes/org/xml/sax/package.html @@ -24,14 +24,18 @@ Currently defined standard feature URIs have the prefix setFeature. Those standard identifiers are:

    - - +
    + + + - + + + @@ -208,7 +212,7 @@ Currently defined standard feature URIs have the prefix Returns "false" if the parser supports only XML 1.0. - +
    SAX2 Standard Features
    Feature ID Access Default Description
    external-general-entities read/write

    Support for the default values of the @@ -236,11 +240,15 @@ the standard property URIs have the prefix dom-node. Manage those properties using setProperty(). Those identifiers are:

    - - +
    + + + + + @@ -287,7 +295,7 @@ the standard property URIs have the prefix - +
    SAX2 Standard Properties
    Property ID Description
    declaration-handler Readable only during a parser callback, this exposes a TBS chunk of characters responsible for the current event.

    All of these standard properties are optional;