Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNMTOKENS.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNMTOKENS.java?rev=1881778&r1=1881777&r2=1881778&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNMTOKENS.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNMTOKENS.java Thu Sep 
17 00:04:39 2020
@@ -15,9 +15,6 @@
 
 package org.apache.xmlbeans;
 
-import javax.xml.stream.XMLStreamReader;
-
-
 import java.util.List;
 
 
@@ -27,31 +24,45 @@ import java.util.List;
  * a list type.
  * <p>
  * Convertible to {@link List}.
- */ 
-public interface XmlNMTOKENS extends XmlAnySimpleType
-{
-    /** The constant {@link SchemaType} object representing this schema type. 
*/
-    public static final SchemaType type = 
XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_NMTOKENS");
-    
-    /** Returns the value as a {@link List} of {@link String} values */
+ */
+public interface XmlNMTOKENS extends XmlAnySimpleType {
+    /**
+     * The constant {@link SchemaType} object representing this schema type.
+     */
+    SchemaType type = 
XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_NMTOKENS");
+
+    /**
+     * Returns the value as a {@link List} of {@link String} values
+     */
     List getListValue();
-    /** Returns the value as a {@link List} of {@link XmlNMTOKEN} values */
+
+    /**
+     * Returns the value as a {@link List} of {@link XmlNMTOKEN} values
+     */
     List xgetListValue();
-    /** Sets the value as a {@link List} */
+
+    /**
+     * Sets the value as a {@link List}
+     */
     void setListValue(List l);
 
     /**
      * Returns the value as a {@link List} of {@link String} values
+     *
      * @deprecated replaced by {@link #getListValue}
      **/
     List listValue();
+
     /**
      * Returns the value as a {@link List} of {@link XmlNMTOKEN} values
+     *
      * @deprecated replaced by {@link #getListValue}
      **/
     List xlistValue();
+
     /**
      * Sets the value as a {@link List}
+     *
      * @deprecated replaced by {@link #getListValue}
      **/
     void set(List l);
@@ -61,101 +72,129 @@ public interface XmlNMTOKENS extends Xml
      * A class with methods for creating instances
      * of {@link XmlNMTOKENS}.
      */
-    public static final class Factory
-    {
-        /** Creates an empty instance of {@link XmlNMTOKENS} */
+    final class Factory {
+        /**
+         * Creates an empty instance of {@link XmlNMTOKENS}
+         */
         public static XmlNMTOKENS newInstance() {
-          return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().newInstance( 
type, null ); }
-        
-        /** Creates an empty instance of {@link XmlNMTOKENS} */
+            return (XmlNMTOKENS) 
XmlBeans.getContextTypeLoader().newInstance(type, null);
+        }
+
+        /**
+         * Creates an empty instance of {@link XmlNMTOKENS}
+         */
         public static XmlNMTOKENS newInstance(org.apache.xmlbeans.XmlOptions 
options) {
-          return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().newInstance( 
type, options ); }
-        
-        /** Creates an immutable {@link XmlNMTOKENS} value */
+            return (XmlNMTOKENS) 
XmlBeans.getContextTypeLoader().newInstance(type, options);
+        }
+
+        /**
+         * Creates an immutable {@link XmlNMTOKENS} value
+         */
         public static XmlNMTOKENS newValue(Object obj) {
-          return (XmlNMTOKENS) type.newValue( obj ); }
-        
-        /** Parses a {@link XmlNMTOKENS} fragment from a String. For example: 
"<code>&lt;xml-fragment&gt;sample-1.1 sample-1.2 
sample-1.3&lt;/xml-fragment&gt;</code>". */
+            return (XmlNMTOKENS) type.newValue(obj);
+        }
+
+        /**
+         * Parses a {@link XmlNMTOKENS} fragment from a String. For example: 
"<code>&lt;xml-fragment&gt;sample-1.1 sample-1.2 
sample-1.3&lt;/xml-fragment&gt;</code>".
+         */
         public static XmlNMTOKENS parse(java.lang.String s) throws 
org.apache.xmlbeans.XmlException {
-          return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse( s, type, 
null ); }
-        
-        /** Parses a {@link XmlNMTOKENS} fragment from a String. For example: 
"<code>&lt;xml-fragment&gt;sample-1.1 sample-1.2 
sample-1.3&lt;/xml-fragment&gt;</code>". */
+            return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse(s, 
type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNMTOKENS} fragment from a String. For example: 
"<code>&lt;xml-fragment&gt;sample-1.1 sample-1.2 
sample-1.3&lt;/xml-fragment&gt;</code>".
+         */
         public static XmlNMTOKENS parse(java.lang.String s, 
org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException 
{
-          return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse( s, type, 
options ); }
-        
-        /** Parses a {@link XmlNMTOKENS} fragment from a File. */
+            return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse(s, 
type, options);
+        }
+
+        /**
+         * Parses a {@link XmlNMTOKENS} fragment from a File.
+         */
         public static XmlNMTOKENS parse(java.io.File f) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse( f, type, 
null ); }
-        
-        /** Parses a {@link XmlNMTOKENS} fragment from a File. */
+            return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse(f, 
type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNMTOKENS} fragment from a File.
+         */
         public static XmlNMTOKENS parse(java.io.File f, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse( f, type, 
options ); }
-        
-        /** Parses a {@link XmlNMTOKENS} fragment from a URL. */
+            return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse(f, 
type, options);
+        }
+
+        /**
+         * Parses a {@link XmlNMTOKENS} fragment from a URL.
+         */
         public static XmlNMTOKENS parse(java.net.URL u) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse( u, type, 
null ); }
+            return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse(u, 
type, null);
+        }
 
-        /** Parses a {@link XmlNMTOKENS} fragment from a URL. */
+        /**
+         * Parses a {@link XmlNMTOKENS} fragment from a URL.
+         */
         public static XmlNMTOKENS parse(java.net.URL u, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse( u, type, 
options ); }
+            return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse(u, 
type, options);
+        }
 
-        /** Parses a {@link XmlNMTOKENS} fragment from an InputStream. */
+        /**
+         * Parses a {@link XmlNMTOKENS} fragment from an InputStream.
+         */
         public static XmlNMTOKENS parse(java.io.InputStream is) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse( is, 
type, null ); }
-        
-        /** Parses a {@link XmlNMTOKENS} fragment from an InputStream. */
+            return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse(is, 
type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNMTOKENS} fragment from an InputStream.
+         */
         public static XmlNMTOKENS parse(java.io.InputStream is, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse( is, 
type, options ); }
-        
-        /** Parses a {@link XmlNMTOKENS} fragment from a Reader. */
+            return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse(is, 
type, options);
+        }
+
+        /**
+         * Parses a {@link XmlNMTOKENS} fragment from a Reader.
+         */
         public static XmlNMTOKENS parse(java.io.Reader r) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse( r, type, 
null ); }
-        
-        /** Parses a {@link XmlNMTOKENS} fragment from a Reader. */
+            return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse(r, 
type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNMTOKENS} fragment from a Reader.
+         */
         public static XmlNMTOKENS parse(java.io.Reader r, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse( r, type, 
options ); }
-        
-        /** Parses a {@link XmlNMTOKENS} fragment from a DOM Node. */
+            return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse(r, 
type, options);
+        }
+
+        /**
+         * Parses a {@link XmlNMTOKENS} fragment from a DOM Node.
+         */
         public static XmlNMTOKENS parse(org.w3c.dom.Node node) throws 
org.apache.xmlbeans.XmlException {
-          return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse( node, 
type, null ); }
-        
-        /** Parses a {@link XmlNMTOKENS} fragment from a DOM Node. */
+            return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse(node, 
type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNMTOKENS} fragment from a DOM Node.
+         */
         public static XmlNMTOKENS parse(org.w3c.dom.Node node, 
org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException 
{
-          return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse( node, 
type, options ); }
-        
-        /** Parses a {@link XmlNMTOKENS} fragment from an XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from 
STaX - jsr173 API.
-         */
-        public static XmlNMTOKENS 
parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws 
org.apache.xmlbeans.XmlException, 
org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse( xis, 
type, null ); }
-        
-        /** Parses a {@link XmlNMTOKENS} fragment from an XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from 
STaX - jsr173 API.
-         */
-        public static XmlNMTOKENS 
parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, 
org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse( xis, 
type, options ); }
-        
-        /** Parses a {@link XmlNMTOKENS} fragment from an XMLStreamReader. */
+            return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse(node, 
type, options);
+        }
+
+        /**
+         * Parses a {@link XmlNMTOKENS} fragment from an XMLStreamReader.
+         */
         public static XmlNMTOKENS parse(javax.xml.stream.XMLStreamReader xsr) 
throws org.apache.xmlbeans.XmlException {
-          return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse( xsr, 
type, null ); }
-        
-        /** Parses a {@link XmlNMTOKENS} fragment from an XMLStreamReader. */
-        public static XmlNMTOKENS parse(javax.xml.stream.XMLStreamReader xsr, 
org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException{
-          return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse( xsr, 
type, options ); }
-        
-        /** Returns a validating XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from 
STaX - jsr173 API.
-         */
-        public static org.apache.xmlbeans.xml.stream.XMLInputStream 
newValidatingXMLInputStream(org.apache.xmlbeans.xml.stream.XMLInputStream xis) 
throws org.apache.xmlbeans.XmlException, 
org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return XmlBeans.getContextTypeLoader().newValidatingXMLInputStream( 
xis, type, null ); }
-        
-        /** Returns a validating XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from 
STaX - jsr173 API.
-         */
-        public static org.apache.xmlbeans.xml.stream.XMLInputStream 
newValidatingXMLInputStream(org.apache.xmlbeans.xml.stream.XMLInputStream xis, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, 
org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return XmlBeans.getContextTypeLoader().newValidatingXMLInputStream( 
xis, type, options ); }
-        
-        private Factory() { } // No instance of this class allowed
+            return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse(xsr, 
type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNMTOKENS} fragment from an XMLStreamReader.
+         */
+        public static XmlNMTOKENS parse(javax.xml.stream.XMLStreamReader xsr, 
org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException 
{
+            return (XmlNMTOKENS) XmlBeans.getContextTypeLoader().parse(xsr, 
type, options);
+        }
+
+        private Factory() {
+            // No instance of this class allowed
+        }
     }
 }
 

Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNOTATION.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNOTATION.java?rev=1881778&r1=1881777&r2=1881778&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNOTATION.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNOTATION.java Thu Sep 
17 00:04:39 2020
@@ -15,9 +15,6 @@
 
 package org.apache.xmlbeans;
 
-import javax.xml.stream.XMLStreamReader;
-
-
 /**
  * Corresponds to the XML Schema
  * <a target="_blank" 
href="http://www.w3.org/TR/xmlschema-2/#NOTATION";>xs:NOTATION</a> type.
@@ -27,111 +24,140 @@ import javax.xml.stream.XMLStreamReader;
  * users should almost never have any reason to use this data type.
  * <p>
  * Convertible to {@link String}.
- */ 
-public interface XmlNOTATION extends XmlAnySimpleType
-{
-    /** The constant {@link SchemaType} object representing this schema type. 
*/
-    public static final SchemaType type = 
XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_NOTATION");
-    
+ */
+public interface XmlNOTATION extends XmlAnySimpleType {
+    /**
+     * The constant {@link SchemaType} object representing this schema type.
+     */
+    SchemaType type = 
XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_NOTATION");
+
     /**
      * A class with methods for creating instances
      * of {@link XmlNOTATION}.
      */
-    public static final class Factory
-    {
-        /** Creates an empty instance of {@link XmlNOTATION} */
+    final class Factory {
+        /**
+         * Creates an empty instance of {@link XmlNOTATION}
+         */
         public static XmlNOTATION newInstance() {
-          return (XmlNOTATION) XmlBeans.getContextTypeLoader().newInstance( 
type, null ); }
-        
-        /** Creates an empty instance of {@link XmlNOTATION} */
+            return (XmlNOTATION) 
XmlBeans.getContextTypeLoader().newInstance(type, null);
+        }
+
+        /**
+         * Creates an empty instance of {@link XmlNOTATION}
+         */
         public static XmlNOTATION newInstance(org.apache.xmlbeans.XmlOptions 
options) {
-          return (XmlNOTATION) XmlBeans.getContextTypeLoader().newInstance( 
type, options ); }
-        
-        /** Creates an immutable {@link XmlNOTATION} value */
+            return (XmlNOTATION) 
XmlBeans.getContextTypeLoader().newInstance(type, options);
+        }
+
+        /**
+         * Creates an immutable {@link XmlNOTATION} value
+         */
         public static XmlNOTATION newValue(Object obj) {
-          return (XmlNOTATION) type.newValue( obj ); }
-        
-        /** Parses a {@link XmlNOTATION} fragment from a String. */
+            return (XmlNOTATION) type.newValue(obj);
+        }
+
+        /**
+         * Parses a {@link XmlNOTATION} fragment from a String.
+         */
         public static XmlNOTATION parse(java.lang.String s) throws 
org.apache.xmlbeans.XmlException {
-          return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse( s, type, 
null ); }
-        
-        /** Parses a {@link XmlNOTATION} fragment from a String. */
+            return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse(s, 
type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNOTATION} fragment from a String.
+         */
         public static XmlNOTATION parse(java.lang.String s, 
org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException 
{
-          return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse( s, type, 
options ); }
-        
-        /** Parses a {@link XmlNOTATION} fragment from a File. */
+            return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse(s, 
type, options);
+        }
+
+        /**
+         * Parses a {@link XmlNOTATION} fragment from a File.
+         */
         public static XmlNOTATION parse(java.io.File f) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse( f, type, 
null ); }
-        
-        /** Parses a {@link XmlNOTATION} fragment from a File. */
+            return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse(f, 
type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNOTATION} fragment from a File.
+         */
         public static XmlNOTATION parse(java.io.File f, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse( f, type, 
options ); }
-        
-        /** Parses a {@link XmlNOTATION} fragment from a URL. */
+            return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse(f, 
type, options);
+        }
+
+        /**
+         * Parses a {@link XmlNOTATION} fragment from a URL.
+         */
         public static XmlNOTATION parse(java.net.URL u) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse( u, type, 
null ); }
+            return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse(u, 
type, null);
+        }
 
-        /** Parses a {@link XmlNOTATION} fragment from a URL. */
+        /**
+         * Parses a {@link XmlNOTATION} fragment from a URL.
+         */
         public static XmlNOTATION parse(java.net.URL u, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse( u, type, 
options ); }
+            return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse(u, 
type, options);
+        }
 
-        /** Parses a {@link XmlNOTATION} fragment from an InputStream. */
+        /**
+         * Parses a {@link XmlNOTATION} fragment from an InputStream.
+         */
         public static XmlNOTATION parse(java.io.InputStream is) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse( is, 
type, null ); }
-        
-        /** Parses a {@link XmlNOTATION} fragment from an InputStream. */
+            return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse(is, 
type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNOTATION} fragment from an InputStream.
+         */
         public static XmlNOTATION parse(java.io.InputStream is, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse( is, 
type, options ); }
-        
-        /** Parses a {@link XmlNOTATION} fragment from a Reader. */
+            return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse(is, 
type, options);
+        }
+
+        /**
+         * Parses a {@link XmlNOTATION} fragment from a Reader.
+         */
         public static XmlNOTATION parse(java.io.Reader r) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse( r, type, 
null ); }
-        
-        /** Parses a {@link XmlNOTATION} fragment from a Reader. */
+            return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse(r, 
type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNOTATION} fragment from a Reader.
+         */
         public static XmlNOTATION parse(java.io.Reader r, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse( r, type, 
options ); }
-        
-        /** Parses a {@link XmlNOTATION} fragment from a DOM Node. */
+            return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse(r, 
type, options);
+        }
+
+        /**
+         * Parses a {@link XmlNOTATION} fragment from a DOM Node.
+         */
         public static XmlNOTATION parse(org.w3c.dom.Node node) throws 
org.apache.xmlbeans.XmlException {
-          return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse( node, 
type, null ); }
-        
-        /** Parses a {@link XmlNOTATION} fragment from a DOM Node. */
+            return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse(node, 
type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNOTATION} fragment from a DOM Node.
+         */
         public static XmlNOTATION parse(org.w3c.dom.Node node, 
org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException 
{
-          return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse( node, 
type, options ); }
-        
-        /** Parses a {@link XmlNOTATION} fragment from an XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from 
STaX - jsr173 API.
-         */
-        public static XmlNOTATION 
parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws 
org.apache.xmlbeans.XmlException, 
org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse( xis, 
type, null ); }
-        
-        /** Parses a {@link XmlNOTATION} fragment from an XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from 
STaX - jsr173 API.
-         */
-        public static XmlNOTATION 
parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, 
org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse( xis, 
type, options ); }
-        
-        /** Parses a {@link XmlNOTATION} fragment from an XMLStreamReader. */
+            return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse(node, 
type, options);
+        }
+
+        /**
+         * Parses a {@link XmlNOTATION} fragment from an XMLStreamReader.
+         */
         public static XmlNOTATION parse(javax.xml.stream.XMLStreamReader xsr) 
throws org.apache.xmlbeans.XmlException {
-          return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse( xsr, 
type, null ); }
-        
-        /** Parses a {@link XmlNOTATION} fragment from an XMLStreamReader. */
-        public static XmlNOTATION parse(javax.xml.stream.XMLStreamReader xsr, 
org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException{
-          return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse( xsr, 
type, options ); }
-        
-        /** Returns a validating XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from 
STaX - jsr173 API.
-         */
-        public static org.apache.xmlbeans.xml.stream.XMLInputStream 
newValidatingXMLInputStream(org.apache.xmlbeans.xml.stream.XMLInputStream xis) 
throws org.apache.xmlbeans.XmlException, 
org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return XmlBeans.getContextTypeLoader().newValidatingXMLInputStream( 
xis, type, null ); }
-        
-        /** Returns a validating XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from 
STaX - jsr173 API.
-         */
-        public static org.apache.xmlbeans.xml.stream.XMLInputStream 
newValidatingXMLInputStream(org.apache.xmlbeans.xml.stream.XMLInputStream xis, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, 
org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return XmlBeans.getContextTypeLoader().newValidatingXMLInputStream( 
xis, type, options ); }
-        
-        private Factory() { } // No instance of this class allowed
+            return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse(xsr, 
type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNOTATION} fragment from an XMLStreamReader.
+         */
+        public static XmlNOTATION parse(javax.xml.stream.XMLStreamReader xsr, 
org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException 
{
+            return (XmlNOTATION) XmlBeans.getContextTypeLoader().parse(xsr, 
type, options);
+        }
+
+        private Factory() {
+            // No instance of this class allowed
+        }
     }
 }
 

Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlName.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlName.java?rev=1881778&r1=1881777&r2=1881778&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlName.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlName.java Thu Sep 17 
00:04:39 2020
@@ -15,9 +15,6 @@
 
 package org.apache.xmlbeans;
 
-import javax.xml.stream.XMLStreamReader;
-
-
 /**
  * Corresponds to the XML Schema
  * <a target="_blank" 
href="http://www.w3.org/TR/xmlschema-2/#Name";>xs:Name</a> type.
@@ -29,111 +26,140 @@ import javax.xml.stream.XMLStreamReader;
  * which is a logical combination of localname and namespace URI.
  * <p>
  * Convertible to {@link String}.
- */ 
-public interface XmlName extends XmlToken
-{
-    /** The constant {@link SchemaType} object representing this schema type. 
*/
-    public static final SchemaType type = 
XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_Name");
-    
+ */
+public interface XmlName extends XmlToken {
+    /**
+     * The constant {@link SchemaType} object representing this schema type.
+     */
+    SchemaType type = 
XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_Name");
+
     /**
      * A class with methods for creating instances
      * of {@link XmlName}.
      */
-    public static final class Factory
-    {
-        /** Creates an empty instance of {@link XmlName} */
+    final class Factory {
+        /**
+         * Creates an empty instance of {@link XmlName}
+         */
         public static XmlName newInstance() {
-          return (XmlName) XmlBeans.getContextTypeLoader().newInstance( type, 
null ); }
-        
-        /** Creates an empty instance of {@link XmlName} */
+            return (XmlName) XmlBeans.getContextTypeLoader().newInstance(type, 
null);
+        }
+
+        /**
+         * Creates an empty instance of {@link XmlName}
+         */
         public static XmlName newInstance(org.apache.xmlbeans.XmlOptions 
options) {
-          return (XmlName) XmlBeans.getContextTypeLoader().newInstance( type, 
options ); }
-        
-        /** Creates an immutable {@link XmlName} value */
+            return (XmlName) XmlBeans.getContextTypeLoader().newInstance(type, 
options);
+        }
+
+        /**
+         * Creates an immutable {@link XmlName} value
+         */
         public static XmlName newValue(Object obj) {
-          return (XmlName) type.newValue( obj ); }
-        
-        /** Parses a {@link XmlName} fragment from a String. For example: 
"<code>&lt;xml-fragment&gt;My:Name&lt;/xml-fragment&gt;</code>". */
+            return (XmlName) type.newValue(obj);
+        }
+
+        /**
+         * Parses a {@link XmlName} fragment from a String. For example: 
"<code>&lt;xml-fragment&gt;My:Name&lt;/xml-fragment&gt;</code>".
+         */
         public static XmlName parse(java.lang.String s) throws 
org.apache.xmlbeans.XmlException {
-          return (XmlName) XmlBeans.getContextTypeLoader().parse( s, type, 
null ); }
-        
-        /** Parses a {@link XmlName} fragment from a String. For example: 
"<code>&lt;xml-fragment&gt;My:Name&lt;/xml-fragment&gt;</code>". */
+            return (XmlName) XmlBeans.getContextTypeLoader().parse(s, type, 
null);
+        }
+
+        /**
+         * Parses a {@link XmlName} fragment from a String. For example: 
"<code>&lt;xml-fragment&gt;My:Name&lt;/xml-fragment&gt;</code>".
+         */
         public static XmlName parse(java.lang.String s, 
org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException 
{
-          return (XmlName) XmlBeans.getContextTypeLoader().parse( s, type, 
options ); }
-        
-        /** Parses a {@link XmlName} fragment from a File. */
+            return (XmlName) XmlBeans.getContextTypeLoader().parse(s, type, 
options);
+        }
+
+        /**
+         * Parses a {@link XmlName} fragment from a File.
+         */
         public static XmlName parse(java.io.File f) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlName) XmlBeans.getContextTypeLoader().parse( f, type, 
null ); }
-        
-        /** Parses a {@link XmlName} fragment from a File. */
+            return (XmlName) XmlBeans.getContextTypeLoader().parse(f, type, 
null);
+        }
+
+        /**
+         * Parses a {@link XmlName} fragment from a File.
+         */
         public static XmlName parse(java.io.File f, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlName) XmlBeans.getContextTypeLoader().parse( f, type, 
options ); }
-        
-        /** Parses a {@link XmlName} fragment from a URL. */
+            return (XmlName) XmlBeans.getContextTypeLoader().parse(f, type, 
options);
+        }
+
+        /**
+         * Parses a {@link XmlName} fragment from a URL.
+         */
         public static XmlName parse(java.net.URL u) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlName) XmlBeans.getContextTypeLoader().parse( u, type, 
null ); }
+            return (XmlName) XmlBeans.getContextTypeLoader().parse(u, type, 
null);
+        }
 
-        /** Parses a {@link XmlName} fragment from a URL. */
+        /**
+         * Parses a {@link XmlName} fragment from a URL.
+         */
         public static XmlName parse(java.net.URL u, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlName) XmlBeans.getContextTypeLoader().parse( u, type, 
options ); }
+            return (XmlName) XmlBeans.getContextTypeLoader().parse(u, type, 
options);
+        }
 
-        /** Parses a {@link XmlName} fragment from an InputStream. */
+        /**
+         * Parses a {@link XmlName} fragment from an InputStream.
+         */
         public static XmlName parse(java.io.InputStream is) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlName) XmlBeans.getContextTypeLoader().parse( is, type, 
null ); }
-        
-        /** Parses a {@link XmlName} fragment from an InputStream. */
+            return (XmlName) XmlBeans.getContextTypeLoader().parse(is, type, 
null);
+        }
+
+        /**
+         * Parses a {@link XmlName} fragment from an InputStream.
+         */
         public static XmlName parse(java.io.InputStream is, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlName) XmlBeans.getContextTypeLoader().parse( is, type, 
options ); }
-        
-        /** Parses a {@link XmlName} fragment from a Reader. */
+            return (XmlName) XmlBeans.getContextTypeLoader().parse(is, type, 
options);
+        }
+
+        /**
+         * Parses a {@link XmlName} fragment from a Reader.
+         */
         public static XmlName parse(java.io.Reader r) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlName) XmlBeans.getContextTypeLoader().parse( r, type, 
null ); }
-        
-        /** Parses a {@link XmlName} fragment from a Reader. */
+            return (XmlName) XmlBeans.getContextTypeLoader().parse(r, type, 
null);
+        }
+
+        /**
+         * Parses a {@link XmlName} fragment from a Reader.
+         */
         public static XmlName parse(java.io.Reader r, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlName) XmlBeans.getContextTypeLoader().parse( r, type, 
options ); }
-        
-        /** Parses a {@link XmlName} fragment from a DOM Node. */
+            return (XmlName) XmlBeans.getContextTypeLoader().parse(r, type, 
options);
+        }
+
+        /**
+         * Parses a {@link XmlName} fragment from a DOM Node.
+         */
         public static XmlName parse(org.w3c.dom.Node node) throws 
org.apache.xmlbeans.XmlException {
-          return (XmlName) XmlBeans.getContextTypeLoader().parse( node, type, 
null ); }
-        
-        /** Parses a {@link XmlName} fragment from a DOM Node. */
+            return (XmlName) XmlBeans.getContextTypeLoader().parse(node, type, 
null);
+        }
+
+        /**
+         * Parses a {@link XmlName} fragment from a DOM Node.
+         */
         public static XmlName parse(org.w3c.dom.Node node, 
org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException 
{
-          return (XmlName) XmlBeans.getContextTypeLoader().parse( node, type, 
options ); }
-        
-        /** Parses a {@link XmlName} fragment from an XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from 
STaX - jsr173 API.
-         */
-        public static XmlName 
parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws 
org.apache.xmlbeans.XmlException, 
org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return (XmlName) XmlBeans.getContextTypeLoader().parse( xis, type, 
null ); }
-        
-        /** Parses a {@link XmlName} fragment from an XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from 
STaX - jsr173 API.
-         */
-        public static XmlName 
parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, 
org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return (XmlName) XmlBeans.getContextTypeLoader().parse( xis, type, 
options ); }
-        
-        /** Parses a {@link XmlName} fragment from an XMLStreamReader. */
+            return (XmlName) XmlBeans.getContextTypeLoader().parse(node, type, 
options);
+        }
+
+        /**
+         * Parses a {@link XmlName} fragment from an XMLStreamReader.
+         */
         public static XmlName parse(javax.xml.stream.XMLStreamReader xsr) 
throws org.apache.xmlbeans.XmlException {
-          return (XmlName) XmlBeans.getContextTypeLoader().parse( xsr, type, 
null ); }
-        
-        /** Parses a {@link XmlName} fragment from an XMLStreamReader. */
-        public static XmlName parse(javax.xml.stream.XMLStreamReader xsr, 
org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException{
-          return (XmlName) XmlBeans.getContextTypeLoader().parse( xsr, type, 
options ); }
-        
-        /** Returns a validating XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from 
STaX - jsr173 API.
-         */
-        public static org.apache.xmlbeans.xml.stream.XMLInputStream 
newValidatingXMLInputStream(org.apache.xmlbeans.xml.stream.XMLInputStream xis) 
throws org.apache.xmlbeans.XmlException, 
org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return XmlBeans.getContextTypeLoader().newValidatingXMLInputStream( 
xis, type, null ); }
-        
-        /** Returns a validating XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from 
STaX - jsr173 API.
-         */
-        public static org.apache.xmlbeans.xml.stream.XMLInputStream 
newValidatingXMLInputStream(org.apache.xmlbeans.xml.stream.XMLInputStream xis, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, 
org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return XmlBeans.getContextTypeLoader().newValidatingXMLInputStream( 
xis, type, options ); }
-        
-        private Factory() { } // No instance of this class allowed
+            return (XmlName) XmlBeans.getContextTypeLoader().parse(xsr, type, 
null);
+        }
+
+        /**
+         * Parses a {@link XmlName} fragment from an XMLStreamReader.
+         */
+        public static XmlName parse(javax.xml.stream.XMLStreamReader xsr, 
org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException 
{
+            return (XmlName) XmlBeans.getContextTypeLoader().parse(xsr, type, 
options);
+        }
+
+        private Factory() {
+            // No instance of this class allowed
+        }
     }
 }
 

Modified: 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNegativeInteger.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNegativeInteger.java?rev=1881778&r1=1881777&r2=1881778&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNegativeInteger.java 
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNegativeInteger.java 
Thu Sep 17 00:04:39 2020
@@ -15,9 +15,6 @@
 
 package org.apache.xmlbeans;
 
-import javax.xml.stream.XMLStreamReader;
-
-
 /**
  * Corresponds to the XML Schema
  * <a target="_blank" 
href="http://www.w3.org/TR/xmlschema-2/#negativeInteger";>xs:negativeInteger</a> 
type.
@@ -26,111 +23,140 @@ import javax.xml.stream.XMLStreamReader;
  * Verified to be negative when validating.
  * <p>
  * Convertible to {@link java.math.BigInteger}.
- */ 
-public interface XmlNegativeInteger extends XmlNonPositiveInteger
-{
-    /** The constant {@link SchemaType} object representing this schema type. 
*/
-    public static final SchemaType type = 
XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_negativeInteger");
-    
+ */
+public interface XmlNegativeInteger extends XmlNonPositiveInteger {
+    /**
+     * The constant {@link SchemaType} object representing this schema type.
+     */
+    SchemaType type = 
XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_negativeInteger");
+
     /**
      * A class with methods for creating instances
      * of {@link XmlNegativeInteger}.
      */
-    public static final class Factory
-    {
-        /** Creates an empty instance of {@link XmlNegativeInteger} */
+    final class Factory {
+        /**
+         * Creates an empty instance of {@link XmlNegativeInteger}
+         */
         public static XmlNegativeInteger newInstance() {
-          return (XmlNegativeInteger) 
XmlBeans.getContextTypeLoader().newInstance( type, null ); }
-        
-        /** Creates an empty instance of {@link XmlNegativeInteger} */
+            return (XmlNegativeInteger) 
XmlBeans.getContextTypeLoader().newInstance(type, null);
+        }
+
+        /**
+         * Creates an empty instance of {@link XmlNegativeInteger}
+         */
         public static XmlNegativeInteger 
newInstance(org.apache.xmlbeans.XmlOptions options) {
-          return (XmlNegativeInteger) 
XmlBeans.getContextTypeLoader().newInstance( type, options ); }
-        
-        /** Creates an immutable {@link XmlNegativeInteger} value */
+            return (XmlNegativeInteger) 
XmlBeans.getContextTypeLoader().newInstance(type, options);
+        }
+
+        /**
+         * Creates an immutable {@link XmlNegativeInteger} value
+         */
         public static XmlNegativeInteger newValue(Object obj) {
-          return (XmlNegativeInteger) type.newValue( obj ); }
-        
-        /** Parses a {@link XmlNegativeInteger} fragment from a String. For 
example: "<code>&lt;xml-fragment&gt;-1234567890&lt;/xml-fragment&gt;</code>". */
+            return (XmlNegativeInteger) type.newValue(obj);
+        }
+
+        /**
+         * Parses a {@link XmlNegativeInteger} fragment from a String. For 
example: "<code>&lt;xml-fragment&gt;-1234567890&lt;/xml-fragment&gt;</code>".
+         */
         public static XmlNegativeInteger parse(java.lang.String s) throws 
org.apache.xmlbeans.XmlException {
-          return (XmlNegativeInteger) XmlBeans.getContextTypeLoader().parse( 
s, type, null ); }
-        
-        /** Parses a {@link XmlNegativeInteger} fragment from a String. For 
example: "<code>&lt;xml-fragment&gt;-1234567890&lt;/xml-fragment&gt;</code>". */
+            return (XmlNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(s, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNegativeInteger} fragment from a String. For 
example: "<code>&lt;xml-fragment&gt;-1234567890&lt;/xml-fragment&gt;</code>".
+         */
         public static XmlNegativeInteger parse(java.lang.String s, 
org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException 
{
-          return (XmlNegativeInteger) XmlBeans.getContextTypeLoader().parse( 
s, type, options ); }
-        
-        /** Parses a {@link XmlNegativeInteger} fragment from a File. */
+            return (XmlNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(s, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlNegativeInteger} fragment from a File.
+         */
         public static XmlNegativeInteger parse(java.io.File f) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNegativeInteger) XmlBeans.getContextTypeLoader().parse( 
f, type, null ); }
-        
-        /** Parses a {@link XmlNegativeInteger} fragment from a File. */
+            return (XmlNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(f, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNegativeInteger} fragment from a File.
+         */
         public static XmlNegativeInteger parse(java.io.File f, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNegativeInteger) XmlBeans.getContextTypeLoader().parse( 
f, type, options ); }
-        
-        /** Parses a {@link XmlNegativeInteger} fragment from a URL. */
+            return (XmlNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(f, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlNegativeInteger} fragment from a URL.
+         */
         public static XmlNegativeInteger parse(java.net.URL u) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNegativeInteger) XmlBeans.getContextTypeLoader().parse( 
u, type, null ); }
+            return (XmlNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(u, type, null);
+        }
 
-        /** Parses a {@link XmlNegativeInteger} fragment from a URL. */
+        /**
+         * Parses a {@link XmlNegativeInteger} fragment from a URL.
+         */
         public static XmlNegativeInteger parse(java.net.URL u, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNegativeInteger) XmlBeans.getContextTypeLoader().parse( 
u, type, options ); }
+            return (XmlNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(u, type, options);
+        }
 
-        /** Parses a {@link XmlNegativeInteger} fragment from an InputStream. 
*/
+        /**
+         * Parses a {@link XmlNegativeInteger} fragment from an InputStream.
+         */
         public static XmlNegativeInteger parse(java.io.InputStream is) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNegativeInteger) XmlBeans.getContextTypeLoader().parse( 
is, type, null ); }
-        
-        /** Parses a {@link XmlNegativeInteger} fragment from an InputStream. 
*/
+            return (XmlNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(is, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNegativeInteger} fragment from an InputStream.
+         */
         public static XmlNegativeInteger parse(java.io.InputStream is, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNegativeInteger) XmlBeans.getContextTypeLoader().parse( 
is, type, options ); }
-        
-        /** Parses a {@link XmlNegativeInteger} fragment from a Reader. */
+            return (XmlNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(is, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlNegativeInteger} fragment from a Reader.
+         */
         public static XmlNegativeInteger parse(java.io.Reader r) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNegativeInteger) XmlBeans.getContextTypeLoader().parse( 
r, type, null ); }
-        
-        /** Parses a {@link XmlNegativeInteger} fragment from a Reader. */
+            return (XmlNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(r, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNegativeInteger} fragment from a Reader.
+         */
         public static XmlNegativeInteger parse(java.io.Reader r, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNegativeInteger) XmlBeans.getContextTypeLoader().parse( 
r, type, options ); }
-        
-        /** Parses a {@link XmlNegativeInteger} fragment from a DOM Node. */
+            return (XmlNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(r, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlNegativeInteger} fragment from a DOM Node.
+         */
         public static XmlNegativeInteger parse(org.w3c.dom.Node node) throws 
org.apache.xmlbeans.XmlException {
-          return (XmlNegativeInteger) XmlBeans.getContextTypeLoader().parse( 
node, type, null ); }
-        
-        /** Parses a {@link XmlNegativeInteger} fragment from a DOM Node. */
+            return (XmlNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(node, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNegativeInteger} fragment from a DOM Node.
+         */
         public static XmlNegativeInteger parse(org.w3c.dom.Node node, 
org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException 
{
-          return (XmlNegativeInteger) XmlBeans.getContextTypeLoader().parse( 
node, type, options ); }
-        
-        /** Parses a {@link XmlNegativeInteger} fragment from an 
XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from 
STaX - jsr173 API.
-         */
-        public static XmlNegativeInteger 
parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws 
org.apache.xmlbeans.XmlException, 
org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return (XmlNegativeInteger) XmlBeans.getContextTypeLoader().parse( 
xis, type, null ); }
-        
-        /** Parses a {@link XmlNegativeInteger} fragment from an 
XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from 
STaX - jsr173 API.
-         */
-        public static XmlNegativeInteger 
parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, 
org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return (XmlNegativeInteger) XmlBeans.getContextTypeLoader().parse( 
xis, type, options ); }
-        
-        /** Parses a {@link XmlNegativeInteger} fragment from an 
XMLStreamReader. */
+            return (XmlNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(node, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlNegativeInteger} fragment from an 
XMLStreamReader.
+         */
         public static XmlNegativeInteger 
parse(javax.xml.stream.XMLStreamReader xsr) throws 
org.apache.xmlbeans.XmlException {
-          return (XmlNegativeInteger) XmlBeans.getContextTypeLoader().parse( 
xsr, type, null ); }
-        
-        /** Parses a {@link XmlNegativeInteger} fragment from an 
XMLStreamReader. */
-        public static XmlNegativeInteger 
parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions 
options) throws org.apache.xmlbeans.XmlException{
-          return (XmlNegativeInteger) XmlBeans.getContextTypeLoader().parse( 
xsr, type, options ); }
-        
-        /** Returns a validating XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from 
STaX - jsr173 API.
-         */
-        public static org.apache.xmlbeans.xml.stream.XMLInputStream 
newValidatingXMLInputStream(org.apache.xmlbeans.xml.stream.XMLInputStream xis) 
throws org.apache.xmlbeans.XmlException, 
org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return XmlBeans.getContextTypeLoader().newValidatingXMLInputStream( 
xis, type, null ); }
-        
-        /** Returns a validating XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from 
STaX - jsr173 API.
-         */
-        public static org.apache.xmlbeans.xml.stream.XMLInputStream 
newValidatingXMLInputStream(org.apache.xmlbeans.xml.stream.XMLInputStream xis, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, 
org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return XmlBeans.getContextTypeLoader().newValidatingXMLInputStream( 
xis, type, options ); }
-        
-        private Factory() { } // No instance of this class allowed
+            return (XmlNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(xsr, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNegativeInteger} fragment from an 
XMLStreamReader.
+         */
+        public static XmlNegativeInteger 
parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions 
options) throws org.apache.xmlbeans.XmlException {
+            return (XmlNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(xsr, type, options);
+        }
+
+        private Factory() {
+            // No instance of this class allowed
+        }
     }
 }
 

Modified: 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNonNegativeInteger.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNonNegativeInteger.java?rev=1881778&r1=1881777&r2=1881778&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNonNegativeInteger.java 
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNonNegativeInteger.java 
Thu Sep 17 00:04:39 2020
@@ -15,9 +15,6 @@
 
 package org.apache.xmlbeans;
 
-import javax.xml.stream.XMLStreamReader;
-
-
 /**
  * Corresponds to the XML Schema
  * <a target="_blank" 
href="http://www.w3.org/TR/xmlschema-2/#nonNegativeInteger";>xs:nonNegativeInteger</a>
 type.
@@ -26,111 +23,140 @@ import javax.xml.stream.XMLStreamReader;
  * Verified to be zero or positive when validating.
  * <p>
  * Convertible to {@link java.math.BigInteger}.
- */ 
-public interface XmlNonNegativeInteger extends XmlInteger
-{
-    /** The constant {@link SchemaType} object representing this schema type. 
*/
-    public static final SchemaType type = 
XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_nonNegativeInteger");
-    
+ */
+public interface XmlNonNegativeInteger extends XmlInteger {
+    /**
+     * The constant {@link SchemaType} object representing this schema type.
+     */
+    SchemaType type = 
XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_nonNegativeInteger");
+
     /**
      * A class with methods for creating instances
      * of {@link XmlNonNegativeInteger}.
      */
-    public static final class Factory
-    {
-        /** Creates an empty instance of {@link XmlNonNegativeInteger} */
+    final class Factory {
+        /**
+         * Creates an empty instance of {@link XmlNonNegativeInteger}
+         */
         public static XmlNonNegativeInteger newInstance() {
-          return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().newInstance( type, null ); }
-        
-        /** Creates an empty instance of {@link XmlNonNegativeInteger} */
+            return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().newInstance(type, null);
+        }
+
+        /**
+         * Creates an empty instance of {@link XmlNonNegativeInteger}
+         */
         public static XmlNonNegativeInteger 
newInstance(org.apache.xmlbeans.XmlOptions options) {
-          return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().newInstance( type, options ); }
-        
-        /** Creates an immutable {@link XmlNonNegativeInteger} value */
+            return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().newInstance(type, options);
+        }
+
+        /**
+         * Creates an immutable {@link XmlNonNegativeInteger} value
+         */
         public static XmlNonNegativeInteger newValue(Object obj) {
-          return (XmlNonNegativeInteger) type.newValue( obj ); }
-        
-        /** Parses a {@link XmlNonNegativeInteger} fragment from a String. For 
example: "<code>&lt;xml-fragment&gt;1234567890&lt;/xml-fragment&gt;</code>". */
+            return (XmlNonNegativeInteger) type.newValue(obj);
+        }
+
+        /**
+         * Parses a {@link XmlNonNegativeInteger} fragment from a String. For 
example: "<code>&lt;xml-fragment&gt;1234567890&lt;/xml-fragment&gt;</code>".
+         */
         public static XmlNonNegativeInteger parse(java.lang.String s) throws 
org.apache.xmlbeans.XmlException {
-          return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse( s, type, null ); }
-        
-        /** Parses a {@link XmlNonNegativeInteger} fragment from a String. For 
example: "<code>&lt;xml-fragment&gt;1234567890&lt;/xml-fragment&gt;</code>". */
+            return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(s, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNonNegativeInteger} fragment from a String. For 
example: "<code>&lt;xml-fragment&gt;1234567890&lt;/xml-fragment&gt;</code>".
+         */
         public static XmlNonNegativeInteger parse(java.lang.String s, 
org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException 
{
-          return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse( s, type, options ); }
-        
-        /** Parses a {@link XmlNonNegativeInteger} fragment from a File. */
+            return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(s, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlNonNegativeInteger} fragment from a File.
+         */
         public static XmlNonNegativeInteger parse(java.io.File f) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse( f, type, null ); }
-        
-        /** Parses a {@link XmlNonNegativeInteger} fragment from a File. */
+            return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(f, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNonNegativeInteger} fragment from a File.
+         */
         public static XmlNonNegativeInteger parse(java.io.File f, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse( f, type, options ); }
-        
-        /** Parses a {@link XmlNonNegativeInteger} fragment from a URL. */
+            return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(f, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlNonNegativeInteger} fragment from a URL.
+         */
         public static XmlNonNegativeInteger parse(java.net.URL u) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse( u, type, null ); }
+            return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(u, type, null);
+        }
 
-        /** Parses a {@link XmlNonNegativeInteger} fragment from a URL. */
+        /**
+         * Parses a {@link XmlNonNegativeInteger} fragment from a URL.
+         */
         public static XmlNonNegativeInteger parse(java.net.URL u, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse( u, type, options ); }
+            return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(u, type, options);
+        }
 
-        /** Parses a {@link XmlNonNegativeInteger} fragment from an 
InputStream. */
+        /**
+         * Parses a {@link XmlNonNegativeInteger} fragment from an InputStream.
+         */
         public static XmlNonNegativeInteger parse(java.io.InputStream is) 
throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse( is, type, null ); }
-        
-        /** Parses a {@link XmlNonNegativeInteger} fragment from an 
InputStream. */
+            return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(is, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNonNegativeInteger} fragment from an InputStream.
+         */
         public static XmlNonNegativeInteger parse(java.io.InputStream is, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse( is, type, options ); }
-        
-        /** Parses a {@link XmlNonNegativeInteger} fragment from a Reader. */
+            return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(is, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlNonNegativeInteger} fragment from a Reader.
+         */
         public static XmlNonNegativeInteger parse(java.io.Reader r) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse( r, type, null ); }
-        
-        /** Parses a {@link XmlNonNegativeInteger} fragment from a Reader. */
+            return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(r, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNonNegativeInteger} fragment from a Reader.
+         */
         public static XmlNonNegativeInteger parse(java.io.Reader r, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse( r, type, options ); }
-        
-        /** Parses a {@link XmlNonNegativeInteger} fragment from a DOM Node. */
+            return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(r, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlNonNegativeInteger} fragment from a DOM Node.
+         */
         public static XmlNonNegativeInteger parse(org.w3c.dom.Node node) 
throws org.apache.xmlbeans.XmlException {
-          return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse( node, type, null ); }
-        
-        /** Parses a {@link XmlNonNegativeInteger} fragment from a DOM Node. */
+            return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(node, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNonNegativeInteger} fragment from a DOM Node.
+         */
         public static XmlNonNegativeInteger parse(org.w3c.dom.Node node, 
org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException 
{
-          return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse( node, type, options ); }
-        
-        /** Parses a {@link XmlNonNegativeInteger} fragment from an 
XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from 
STaX - jsr173 API.
-         */
-        public static XmlNonNegativeInteger 
parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws 
org.apache.xmlbeans.XmlException, 
org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse( xis, type, null ); }
-        
-        /** Parses a {@link XmlNonNegativeInteger} fragment from an 
XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from 
STaX - jsr173 API.
-         */
-        public static XmlNonNegativeInteger 
parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, 
org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse( xis, type, options ); }
-        
-        /** Parses a {@link XmlNonNegativeInteger} fragment from an 
XMLStreamReader. */
+            return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(node, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlNonNegativeInteger} fragment from an 
XMLStreamReader.
+         */
         public static XmlNonNegativeInteger 
parse(javax.xml.stream.XMLStreamReader xsr) throws 
org.apache.xmlbeans.XmlException {
-          return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse( xsr, type, null ); }
-        
-        /** Parses a {@link XmlNonNegativeInteger} fragment from an 
XMLStreamReader. */
+            return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(xsr, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNonNegativeInteger} fragment from an 
XMLStreamReader.
+         */
         public static XmlNonNegativeInteger 
parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions 
options) throws org.apache.xmlbeans.XmlException {
-          return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse( xsr, type, options ); }
-        
-        /** Returns a validating XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from 
STaX - jsr173 API.
-         */
-        public static org.apache.xmlbeans.xml.stream.XMLInputStream 
newValidatingXMLInputStream(org.apache.xmlbeans.xml.stream.XMLInputStream xis) 
throws org.apache.xmlbeans.XmlException, 
org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return XmlBeans.getContextTypeLoader().newValidatingXMLInputStream( 
xis, type, null ); }
-        
-        /** Returns a validating XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from 
STaX - jsr173 API.
-         */
-        public static org.apache.xmlbeans.xml.stream.XMLInputStream 
newValidatingXMLInputStream(org.apache.xmlbeans.xml.stream.XMLInputStream xis, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, 
org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return XmlBeans.getContextTypeLoader().newValidatingXMLInputStream( 
xis, type, options ); }
-        
-        private Factory() { } // No instance of this class allowed
+            return (XmlNonNegativeInteger) 
XmlBeans.getContextTypeLoader().parse(xsr, type, options);
+        }
+
+        private Factory() {
+            // No instance of this class allowed
+        }
     }
 }
 

Modified: 
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNonPositiveInteger.java
URL: 
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNonPositiveInteger.java?rev=1881778&r1=1881777&r2=1881778&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNonPositiveInteger.java 
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNonPositiveInteger.java 
Thu Sep 17 00:04:39 2020
@@ -15,9 +15,6 @@
 
 package org.apache.xmlbeans;
 
-import javax.xml.stream.XMLStreamReader;
-
-
 /**
  * Corresponds to the XML Schema
  * <a target="_blank" 
href="http://www.w3.org/TR/xmlschema-2/#nonPositiveInteger";>xs:nonPositiveInteger</a>
 type.
@@ -26,111 +23,140 @@ import javax.xml.stream.XMLStreamReader;
  * Verified to be zero or negative when validating.
  * <p>
  * Convertible to {@link java.math.BigInteger}.
- */ 
-public interface XmlNonPositiveInteger extends XmlInteger
-{
-    /** The constant {@link SchemaType} object representing this schema type. 
*/
-    public static final SchemaType type = 
XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_nonPositiveInteger");
-    
+ */
+public interface XmlNonPositiveInteger extends XmlInteger {
+    /**
+     * The constant {@link SchemaType} object representing this schema type.
+     */
+    SchemaType type = 
XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_nonPositiveInteger");
+
     /**
      * A class with methods for creating instances
      * of {@link XmlNonPositiveInteger}.
      */
-    public static final class Factory
-    {
-        /** Creates an empty instance of {@link XmlNonPositiveInteger} */
+    final class Factory {
+        /**
+         * Creates an empty instance of {@link XmlNonPositiveInteger}
+         */
         public static XmlNonPositiveInteger newInstance() {
-          return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().newInstance( type, null ); }
-        
-        /** Creates an empty instance of {@link XmlNonPositiveInteger} */
+            return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().newInstance(type, null);
+        }
+
+        /**
+         * Creates an empty instance of {@link XmlNonPositiveInteger}
+         */
         public static XmlNonPositiveInteger 
newInstance(org.apache.xmlbeans.XmlOptions options) {
-          return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().newInstance( type, options ); }
-        
-        /** Creates an immutable {@link XmlNonPositiveInteger} value */
+            return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().newInstance(type, options);
+        }
+
+        /**
+         * Creates an immutable {@link XmlNonPositiveInteger} value
+         */
         public static XmlNonPositiveInteger newValue(Object obj) {
-          return (XmlNonPositiveInteger) type.newValue( obj ); }
-        
-        /** Parses a {@link XmlNonPositiveInteger} fragment from a String. For 
example: "<code>&lt;xml-fragment&gt;-1234567890&lt;/xml-fragment&gt;</code>". */
+            return (XmlNonPositiveInteger) type.newValue(obj);
+        }
+
+        /**
+         * Parses a {@link XmlNonPositiveInteger} fragment from a String. For 
example: "<code>&lt;xml-fragment&gt;-1234567890&lt;/xml-fragment&gt;</code>".
+         */
         public static XmlNonPositiveInteger parse(java.lang.String s) throws 
org.apache.xmlbeans.XmlException {
-          return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse( s, type, null ); }
-        
-        /** Parses a {@link XmlNonPositiveInteger} fragment from a String. For 
example: "<code>&lt;xml-fragment&gt;-1234567890&lt;/xml-fragment&gt;</code>". */
+            return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse(s, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNonPositiveInteger} fragment from a String. For 
example: "<code>&lt;xml-fragment&gt;-1234567890&lt;/xml-fragment&gt;</code>".
+         */
         public static XmlNonPositiveInteger parse(java.lang.String s, 
org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException 
{
-          return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse( s, type, options ); }
-        
-        /** Parses a {@link XmlNonPositiveInteger} fragment from a File. */
+            return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse(s, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlNonPositiveInteger} fragment from a File.
+         */
         public static XmlNonPositiveInteger parse(java.io.File f) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse( f, type, null ); }
-        
-        /** Parses a {@link XmlNonPositiveInteger} fragment from a File. */
+            return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse(f, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNonPositiveInteger} fragment from a File.
+         */
         public static XmlNonPositiveInteger parse(java.io.File f, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse( f, type, options ); }
-        
-        /** Parses a {@link XmlNonPositiveInteger} fragment from a URL. */
+            return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse(f, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlNonPositiveInteger} fragment from a URL.
+         */
         public static XmlNonPositiveInteger parse(java.net.URL u) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse( u, type, null ); }
+            return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse(u, type, null);
+        }
 
-        /** Parses a {@link XmlNonPositiveInteger} fragment from a URL. */
+        /**
+         * Parses a {@link XmlNonPositiveInteger} fragment from a URL.
+         */
         public static XmlNonPositiveInteger parse(java.net.URL u, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse( u, type, options ); }
+            return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse(u, type, options);
+        }
 
-        /** Parses a {@link XmlNonPositiveInteger} fragment from an 
InputStream. */
+        /**
+         * Parses a {@link XmlNonPositiveInteger} fragment from an InputStream.
+         */
         public static XmlNonPositiveInteger parse(java.io.InputStream is) 
throws org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse( is, type, null ); }
-        
-        /** Parses a {@link XmlNonPositiveInteger} fragment from an 
InputStream. */
+            return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse(is, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNonPositiveInteger} fragment from an InputStream.
+         */
         public static XmlNonPositiveInteger parse(java.io.InputStream is, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse( is, type, options ); }
-        
-        /** Parses a {@link XmlNonPositiveInteger} fragment from a Reader. */
+            return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse(is, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlNonPositiveInteger} fragment from a Reader.
+         */
         public static XmlNonPositiveInteger parse(java.io.Reader r) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse( r, type, null ); }
-        
-        /** Parses a {@link XmlNonPositiveInteger} fragment from a Reader. */
+            return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse(r, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNonPositiveInteger} fragment from a Reader.
+         */
         public static XmlNonPositiveInteger parse(java.io.Reader r, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, java.io.IOException {
-          return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse( r, type, options ); }
-        
-        /** Parses a {@link XmlNonPositiveInteger} fragment from a DOM Node. */
+            return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse(r, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlNonPositiveInteger} fragment from a DOM Node.
+         */
         public static XmlNonPositiveInteger parse(org.w3c.dom.Node node) 
throws org.apache.xmlbeans.XmlException {
-          return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse( node, type, null ); }
-        
-        /** Parses a {@link XmlNonPositiveInteger} fragment from a DOM Node. */
+            return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse(node, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNonPositiveInteger} fragment from a DOM Node.
+         */
         public static XmlNonPositiveInteger parse(org.w3c.dom.Node node, 
org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException 
{
-          return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse( node, type, options ); }
-        
-        /** Parses a {@link XmlNonPositiveInteger} fragment from an 
XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from 
STaX - jsr173 API.
-         */
-        public static XmlNonPositiveInteger 
parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws 
org.apache.xmlbeans.XmlException, 
org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse( xis, type, null ); }
-        
-        /** Parses a {@link XmlNonPositiveInteger} fragment from an 
XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from 
STaX - jsr173 API.
-         */
-        public static XmlNonPositiveInteger 
parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, 
org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse( xis, type, options ); }
-        
-        /** Parses a {@link XmlNonPositiveInteger} fragment from an 
XMLStreamReader. */
+            return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse(node, type, options);
+        }
+
+        /**
+         * Parses a {@link XmlNonPositiveInteger} fragment from an 
XMLStreamReader.
+         */
         public static XmlNonPositiveInteger 
parse(javax.xml.stream.XMLStreamReader xsr) throws 
org.apache.xmlbeans.XmlException {
-          return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse( xsr, type, null ); }
-        
-        /** Parses a {@link XmlNonPositiveInteger} fragment from an  
XMLStreamReader. */
+            return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse(xsr, type, null);
+        }
+
+        /**
+         * Parses a {@link XmlNonPositiveInteger} fragment from an  
XMLStreamReader.
+         */
         public static XmlNonPositiveInteger 
parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions 
options) throws org.apache.xmlbeans.XmlException {
-          return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse( xsr, type, options ); }
-        
-        /** Returns a validating XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from 
STaX - jsr173 API.
-         */
-        public static org.apache.xmlbeans.xml.stream.XMLInputStream 
newValidatingXMLInputStream(org.apache.xmlbeans.xml.stream.XMLInputStream xis) 
throws org.apache.xmlbeans.XmlException, 
org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return XmlBeans.getContextTypeLoader().newValidatingXMLInputStream( 
xis, type, null ); }
-        
-        /** Returns a validating XMLInputStream.
-         * @deprecated XMLInputStream was deprecated by XMLStreamReader from 
STaX - jsr173 API.
-         */
-        public static org.apache.xmlbeans.xml.stream.XMLInputStream 
newValidatingXMLInputStream(org.apache.xmlbeans.xml.stream.XMLInputStream xis, 
org.apache.xmlbeans.XmlOptions options) throws 
org.apache.xmlbeans.XmlException, 
org.apache.xmlbeans.xml.stream.XMLStreamException {
-          return XmlBeans.getContextTypeLoader().newValidatingXMLInputStream( 
xis, type, options ); }
-        
-        private Factory() { } // No instance of this class allowed
+            return (XmlNonPositiveInteger) 
XmlBeans.getContextTypeLoader().parse(xsr, type, options);
+        }
+
+        private Factory() {
+            // No instance of this class allowed
+        }
     }
 }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to