Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlString.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlString.java?rev=1881778&r1=1881777&r2=1881778&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlString.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlString.java Thu Sep 17 00:04:39 2020 @@ -15,16 +15,13 @@ 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/#string";>xs:string</a> type. * <p> * A basic string in XML schema is not whitespace normalized. If you * want your string type to be insensitive to variations in runs of - * whitespace, consider using + * whitespace, consider using * <a target="_blank" href="http://www.w3.org/TR/xmlschema-2/#token";>xs:token</a> * (aka {@link XmlToken}) instead. * To forbid whitespace and permit just alphanumeric and other @@ -33,111 +30,140 @@ import javax.xml.stream.XMLStreamReader; * (aka {@link XmlNMTOKEN}) instead. * <p> * Convertible to {@link String}. - */ -public interface XmlString extends XmlAnySimpleType -{ - /** The constant {@link SchemaType} object representing this schema type. */ - public static final SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_string"); - + */ +public interface XmlString extends XmlAnySimpleType { + /** + * The constant {@link SchemaType} object representing this schema type. + */ + SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_string"); + /** * A class with methods for creating instances * of {@link XmlString}. */ - public static final class Factory - { - /** Creates an empty instance of {@link XmlString} */ + final class Factory { + /** + * Creates an empty instance of {@link XmlString} + */ public static XmlString newInstance() { - return (XmlString) XmlBeans.getContextTypeLoader().newInstance( type, null ); } - - /** Creates an empty instance of {@link XmlString} */ + return (XmlString) XmlBeans.getContextTypeLoader().newInstance(type, null); + } + + /** + * Creates an empty instance of {@link XmlString} + */ public static XmlString newInstance(org.apache.xmlbeans.XmlOptions options) { - return (XmlString) XmlBeans.getContextTypeLoader().newInstance( type, options ); } - - /** Creates an immutable {@link XmlString} value */ + return (XmlString) XmlBeans.getContextTypeLoader().newInstance(type, options); + } + + /** + * Creates an immutable {@link XmlString} value + */ public static XmlString newValue(Object obj) { - return (XmlString) type.newValue( obj ); } - - /** Parses a {@link XmlString} fragment from a String. For example: "<code><xml-fragment> arbitrary string </xml-fragment></code>". */ + return (XmlString) type.newValue(obj); + } + + /** + * Parses a {@link XmlString} fragment from a String. For example: "<code><xml-fragment> arbitrary string </xml-fragment></code>". + */ public static XmlString parse(java.lang.String s) throws org.apache.xmlbeans.XmlException { - return (XmlString) XmlBeans.getContextTypeLoader().parse( s, type, null ); } - - /** Parses a {@link XmlString} fragment from a String. For example: "<code><xml-fragment> arbitrary string </xml-fragment></code>". */ + return (XmlString) XmlBeans.getContextTypeLoader().parse(s, type, null); + } + + /** + * Parses a {@link XmlString} fragment from a String. For example: "<code><xml-fragment> arbitrary string </xml-fragment></code>". + */ public static XmlString parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlString) XmlBeans.getContextTypeLoader().parse( s, type, options ); } - - /** Parses a {@link XmlString} fragment from a File. */ + return (XmlString) XmlBeans.getContextTypeLoader().parse(s, type, options); + } + + /** + * Parses a {@link XmlString} fragment from a File. + */ public static XmlString parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlString) XmlBeans.getContextTypeLoader().parse( f, type, null ); } - - /** Parses a {@link XmlString} fragment from a File. */ + return (XmlString) XmlBeans.getContextTypeLoader().parse(f, type, null); + } + + /** + * Parses a {@link XmlString} fragment from a File. + */ public static XmlString parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlString) XmlBeans.getContextTypeLoader().parse( f, type, options ); } - - /** Parses a {@link XmlString} fragment from a URL. */ + return (XmlString) XmlBeans.getContextTypeLoader().parse(f, type, options); + } + + /** + * Parses a {@link XmlString} fragment from a URL. + */ public static XmlString parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlString) XmlBeans.getContextTypeLoader().parse( u, type, null ); } + return (XmlString) XmlBeans.getContextTypeLoader().parse(u, type, null); + } - /** Parses a {@link XmlString} fragment from a URL. */ + /** + * Parses a {@link XmlString} fragment from a URL. + */ public static XmlString parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlString) XmlBeans.getContextTypeLoader().parse( u, type, options ); } + return (XmlString) XmlBeans.getContextTypeLoader().parse(u, type, options); + } - /** Parses a {@link XmlString} fragment from an InputStream. */ + /** + * Parses a {@link XmlString} fragment from an InputStream. + */ public static XmlString parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlString) XmlBeans.getContextTypeLoader().parse( is, type, null ); } - - /** Parses a {@link XmlString} fragment from an InputStream. */ + return (XmlString) XmlBeans.getContextTypeLoader().parse(is, type, null); + } + + /** + * Parses a {@link XmlString} fragment from an InputStream. + */ public static XmlString parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlString) XmlBeans.getContextTypeLoader().parse( is, type, options ); } - - /** Parses a {@link XmlString} fragment from a Reader. */ + return (XmlString) XmlBeans.getContextTypeLoader().parse(is, type, options); + } + + /** + * Parses a {@link XmlString} fragment from a Reader. + */ public static XmlString parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlString) XmlBeans.getContextTypeLoader().parse( r, type, null ); } - - /** Parses a {@link XmlString} fragment from a Reader. */ + return (XmlString) XmlBeans.getContextTypeLoader().parse(r, type, null); + } + + /** + * Parses a {@link XmlString} fragment from a Reader. + */ public static XmlString parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlString) XmlBeans.getContextTypeLoader().parse( r, type, options ); } - - /** Parses a {@link XmlString} fragment from a DOM Node. */ + return (XmlString) XmlBeans.getContextTypeLoader().parse(r, type, options); + } + + /** + * Parses a {@link XmlString} fragment from a DOM Node. + */ public static XmlString parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException { - return (XmlString) XmlBeans.getContextTypeLoader().parse( node, type, null ); } - - /** Parses a {@link XmlString} fragment from a DOM Node. */ + return (XmlString) XmlBeans.getContextTypeLoader().parse(node, type, null); + } + + /** + * Parses a {@link XmlString} fragment from a DOM Node. + */ public static XmlString parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlString) XmlBeans.getContextTypeLoader().parse( node, type, options ); } - - /** Parses a {@link XmlString} fragment from an XMLInputStream. - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - public static XmlString parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException { - return (XmlString) XmlBeans.getContextTypeLoader().parse( xis, type, null ); } - - /** Parses a {@link XmlString} fragment from an XMLInputStream. - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - public static XmlString 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 (XmlString) XmlBeans.getContextTypeLoader().parse( xis, type, options ); } - - /** Parses a {@link XmlString} fragment from an XMLStreamReader. */ + return (XmlString) XmlBeans.getContextTypeLoader().parse(node, type, options); + } + + /** + * Parses a {@link XmlString} fragment from an XMLStreamReader. + */ public static XmlString parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException { - return (XmlString) XmlBeans.getContextTypeLoader().parse( xsr, type, null ); } - - /** Parses a {@link XmlString} fragment from an XMLStreamReader. */ - public static XmlString parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException{ - return (XmlString) 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 (XmlString) XmlBeans.getContextTypeLoader().parse(xsr, type, null); + } + + /** + * Parses a {@link XmlString} fragment from an XMLStreamReader. + */ + public static XmlString parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { + return (XmlString) XmlBeans.getContextTypeLoader().parse(xsr, type, options); + } + + private Factory() { + // No instance of this class allowed + } } }
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlTime.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlTime.java?rev=1881778&r1=1881777&r2=1881778&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlTime.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlTime.java Thu Sep 17 00:04:39 2020 @@ -15,9 +15,6 @@ package org.apache.xmlbeans; -import javax.xml.stream.XMLStreamReader; - - import java.util.Calendar; @@ -27,41 +24,60 @@ import java.util.Calendar; * A gDay specifies only a day-of-month. * <p> * Convertible to {@link Calendar} or {@link GDate}. - * + * * @see XmlCalendar * @see GDate - */ -public interface XmlTime extends XmlAnySimpleType -{ - /** The constant {@link SchemaType} object representing this schema type. */ - public static final SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_time"); - - /** Returns this value as a {@link Calendar} */ + */ +public interface XmlTime extends XmlAnySimpleType { + /** + * The constant {@link SchemaType} object representing this schema type. + */ + SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_time"); + + /** + * Returns this value as a {@link Calendar} + */ Calendar getCalendarValue(); - /** Sets this value as a {@link Calendar} */ + + /** + * Sets this value as a {@link Calendar} + */ void setCalendarValue(Calendar c); - /** Returns this value as a {@link GDate} */ + + /** + * Returns this value as a {@link GDate} + */ GDate getGDateValue(); - /** Sets this value as a {@link GDateSpecification} */ + + /** + * Sets this value as a {@link GDateSpecification} + */ void setGDateValue(GDate gd); /** * Returns this value as a {@link Calendar} + * * @deprecated replaced with {@link #getCalendarValue} **/ Calendar calendarValue(); + /** * Sets this value as a {@link Calendar} + * * @deprecated replaced with {@link #setCalendarValue} **/ void set(Calendar c); + /** * Returns this value as a {@link GDate} + * * @deprecated replaced with {@link #getGDateValue} **/ GDate gDateValue(); + /** * Sets this value as a {@link GDateSpecification} + * * @deprecated replaced with {@link #setGDateValue} **/ void set(GDateSpecification gd); @@ -71,101 +87,129 @@ public interface XmlTime extends XmlAnyS * A class with methods for creating instances * of {@link XmlTime}. */ - public static final class Factory - { - /** Creates an empty instance of {@link XmlTime} */ + final class Factory { + /** + * Creates an empty instance of {@link XmlTime} + */ public static XmlTime newInstance() { - return (XmlTime) XmlBeans.getContextTypeLoader().newInstance( type, null ); } - - /** Creates an empty instance of {@link XmlTime} */ + return (XmlTime) XmlBeans.getContextTypeLoader().newInstance(type, null); + } + + /** + * Creates an empty instance of {@link XmlTime} + */ public static XmlTime newInstance(org.apache.xmlbeans.XmlOptions options) { - return (XmlTime) XmlBeans.getContextTypeLoader().newInstance( type, options ); } - - /** Creates an immutable {@link XmlTime} value */ + return (XmlTime) XmlBeans.getContextTypeLoader().newInstance(type, options); + } + + /** + * Creates an immutable {@link XmlTime} value + */ public static XmlTime newValue(Object obj) { - return (XmlTime) type.newValue( obj ); } - - /** Parses a {@link XmlTime} fragment from a String. For example: "<code><xml-fragment>12:00:00</xml-fragment></code>". */ + return (XmlTime) type.newValue(obj); + } + + /** + * Parses a {@link XmlTime} fragment from a String. For example: "<code><xml-fragment>12:00:00</xml-fragment></code>". + */ public static XmlTime parse(java.lang.String s) throws org.apache.xmlbeans.XmlException { - return (XmlTime) XmlBeans.getContextTypeLoader().parse( s, type, null ); } - - /** Parses a {@link XmlTime} fragment from a String. For example: "<code><xml-fragment>12:00:00</xml-fragment></code>". */ + return (XmlTime) XmlBeans.getContextTypeLoader().parse(s, type, null); + } + + /** + * Parses a {@link XmlTime} fragment from a String. For example: "<code><xml-fragment>12:00:00</xml-fragment></code>". + */ public static XmlTime parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlTime) XmlBeans.getContextTypeLoader().parse( s, type, options ); } - - /** Parses a {@link XmlTime} fragment from a File. */ + return (XmlTime) XmlBeans.getContextTypeLoader().parse(s, type, options); + } + + /** + * Parses a {@link XmlTime} fragment from a File. + */ public static XmlTime parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlTime) XmlBeans.getContextTypeLoader().parse( f, type, null ); } - - /** Parses a {@link XmlTime} fragment from a File. */ + return (XmlTime) XmlBeans.getContextTypeLoader().parse(f, type, null); + } + + /** + * Parses a {@link XmlTime} fragment from a File. + */ public static XmlTime parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlTime) XmlBeans.getContextTypeLoader().parse( f, type, options ); } - - /** Parses a {@link XmlTime} fragment from a URL. */ + return (XmlTime) XmlBeans.getContextTypeLoader().parse(f, type, options); + } + + /** + * Parses a {@link XmlTime} fragment from a URL. + */ public static XmlTime parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlTime) XmlBeans.getContextTypeLoader().parse( u, type, null ); } + return (XmlTime) XmlBeans.getContextTypeLoader().parse(u, type, null); + } - /** Parses a {@link XmlTime} fragment from a URL. */ + /** + * Parses a {@link XmlTime} fragment from a URL. + */ public static XmlTime parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlTime) XmlBeans.getContextTypeLoader().parse( u, type, options ); } + return (XmlTime) XmlBeans.getContextTypeLoader().parse(u, type, options); + } - /** Parses a {@link XmlTime} fragment from an InputStream. */ + /** + * Parses a {@link XmlTime} fragment from an InputStream. + */ public static XmlTime parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlTime) XmlBeans.getContextTypeLoader().parse( is, type, null ); } - - /** Parses a {@link XmlTime} fragment from an InputStream. */ + return (XmlTime) XmlBeans.getContextTypeLoader().parse(is, type, null); + } + + /** + * Parses a {@link XmlTime} fragment from an InputStream. + */ public static XmlTime parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlTime) XmlBeans.getContextTypeLoader().parse( is, type, options ); } - - /** Parses a {@link XmlTime} fragment from a Reader. */ + return (XmlTime) XmlBeans.getContextTypeLoader().parse(is, type, options); + } + + /** + * Parses a {@link XmlTime} fragment from a Reader. + */ public static XmlTime parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlTime) XmlBeans.getContextTypeLoader().parse( r, type, null ); } - - /** Parses a {@link XmlTime} fragment from a Reader. */ + return (XmlTime) XmlBeans.getContextTypeLoader().parse(r, type, null); + } + + /** + * Parses a {@link XmlTime} fragment from a Reader. + */ public static XmlTime parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlTime) XmlBeans.getContextTypeLoader().parse( r, type, options ); } - - /** Parses a {@link XmlTime} fragment from a DOM Node. */ + return (XmlTime) XmlBeans.getContextTypeLoader().parse(r, type, options); + } + + /** + * Parses a {@link XmlTime} fragment from a DOM Node. + */ public static XmlTime parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException { - return (XmlTime) XmlBeans.getContextTypeLoader().parse( node, type, null ); } - - /** Parses a {@link XmlTime} fragment from a DOM Node. */ + return (XmlTime) XmlBeans.getContextTypeLoader().parse(node, type, null); + } + + /** + * Parses a {@link XmlTime} fragment from a DOM Node. + */ public static XmlTime parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlTime) XmlBeans.getContextTypeLoader().parse( node, type, options ); } - - /** Parses a {@link XmlTime} fragment from an XMLInputStream. - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - public static XmlTime parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException { - return (XmlTime) XmlBeans.getContextTypeLoader().parse( xis, type, null ); } - - /** Parses a {@link XmlTime} fragment from an XMLInputStream. - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - public static XmlTime 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 (XmlTime) XmlBeans.getContextTypeLoader().parse( xis, type, options ); } - - /** Parses a {@link XmlTime} fragment from an XMLStreamReader. */ + return (XmlTime) XmlBeans.getContextTypeLoader().parse(node, type, options); + } + + /** + * Parses a {@link XmlTime} fragment from an XMLStreamReader. + */ public static XmlTime parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException { - return (XmlTime) XmlBeans.getContextTypeLoader().parse( xsr, type, null ); } - - /** Parses a {@link XmlTime} fragment from an XMLStreamReader. */ - public static XmlTime parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException{ - return (XmlTime) 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 (XmlTime) XmlBeans.getContextTypeLoader().parse(xsr, type, null); + } + + /** + * Parses a {@link XmlTime} fragment from an XMLStreamReader. + */ + public static XmlTime parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { + return (XmlTime) XmlBeans.getContextTypeLoader().parse(xsr, type, options); + } + + private Factory() { + // No instance of this class allowed + } } } Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlToken.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlToken.java?rev=1881778&r1=1881777&r2=1881778&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlToken.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlToken.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/#token";>xs:token</a> type. @@ -33,115 +30,144 @@ import javax.xml.stream.XMLStreamReader; * to be equivalent to <code>"high priority"</code>, you should consider * using xs:token or a subtype of xs:token. * <p> - * When the {@link #stringValue} is obtained from an XmlToken, the normalized, + * When the {@link #getStringValue()} is obtained from an XmlToken, the normalized, * trimmed, whitespace collapsed value is returned. * <p> * Convertible to {@link String}. - */ -public interface XmlToken extends XmlNormalizedString -{ - /** The constant {@link SchemaType} object representing this schema type. */ - public static final SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_token"); - + */ +public interface XmlToken extends XmlNormalizedString { + /** + * The constant {@link SchemaType} object representing this schema type. + */ + SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_token"); + /** * A class with methods for creating instances * of {@link XmlToken}. */ - public static final class Factory - { - /** Creates an empty instance of {@link XmlToken} */ + final class Factory { + /** + * Creates an empty instance of {@link XmlToken} + */ public static XmlToken newInstance() { - return (XmlToken) XmlBeans.getContextTypeLoader().newInstance( type, null ); } - - /** Creates an empty instance of {@link XmlToken} */ + return (XmlToken) XmlBeans.getContextTypeLoader().newInstance(type, null); + } + + /** + * Creates an empty instance of {@link XmlToken} + */ public static XmlToken newInstance(org.apache.xmlbeans.XmlOptions options) { - return (XmlToken) XmlBeans.getContextTypeLoader().newInstance( type, options ); } - - /** Creates an immutable {@link XmlToken} value */ + return (XmlToken) XmlBeans.getContextTypeLoader().newInstance(type, options); + } + + /** + * Creates an immutable {@link XmlToken} value + */ public static XmlToken newValue(Object obj) { - return (XmlToken) type.newValue( obj ); } - - /** Parses a {@link XmlToken} fragment from a String. For example: "<code><xml-fragment>string to collapse</xml-fragment></code>". */ + return (XmlToken) type.newValue(obj); + } + + /** + * Parses a {@link XmlToken} fragment from a String. For example: "<code><xml-fragment>string to collapse</xml-fragment></code>". + */ public static XmlToken parse(java.lang.String s) throws org.apache.xmlbeans.XmlException { - return (XmlToken) XmlBeans.getContextTypeLoader().parse( s, type, null ); } - - /** Parses a {@link XmlToken} fragment from a String. For example: "<code><xml-fragment>string to collapse</xml-fragment></code>". */ + return (XmlToken) XmlBeans.getContextTypeLoader().parse(s, type, null); + } + + /** + * Parses a {@link XmlToken} fragment from a String. For example: "<code><xml-fragment>string to collapse</xml-fragment></code>". + */ public static XmlToken parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlToken) XmlBeans.getContextTypeLoader().parse( s, type, options ); } - - /** Parses a {@link XmlToken} fragment from a File. */ + return (XmlToken) XmlBeans.getContextTypeLoader().parse(s, type, options); + } + + /** + * Parses a {@link XmlToken} fragment from a File. + */ public static XmlToken parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlToken) XmlBeans.getContextTypeLoader().parse( f, type, null ); } - - /** Parses a {@link XmlToken} fragment from a File. */ + return (XmlToken) XmlBeans.getContextTypeLoader().parse(f, type, null); + } + + /** + * Parses a {@link XmlToken} fragment from a File. + */ public static XmlToken parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlToken) XmlBeans.getContextTypeLoader().parse( f, type, options ); } - - /** Parses a {@link XmlToken} fragment from a URL. */ + return (XmlToken) XmlBeans.getContextTypeLoader().parse(f, type, options); + } + + /** + * Parses a {@link XmlToken} fragment from a URL. + */ public static XmlToken parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlToken) XmlBeans.getContextTypeLoader().parse( u, type, null ); } + return (XmlToken) XmlBeans.getContextTypeLoader().parse(u, type, null); + } - /** Parses a {@link XmlToken} fragment from a URL. */ + /** + * Parses a {@link XmlToken} fragment from a URL. + */ public static XmlToken parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlToken) XmlBeans.getContextTypeLoader().parse( u, type, options ); } + return (XmlToken) XmlBeans.getContextTypeLoader().parse(u, type, options); + } - /** Parses a {@link XmlToken} fragment from an InputStream. */ + /** + * Parses a {@link XmlToken} fragment from an InputStream. + */ public static XmlToken parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlToken) XmlBeans.getContextTypeLoader().parse( is, type, null ); } - - /** Parses a {@link XmlToken} fragment from an InputStream. */ + return (XmlToken) XmlBeans.getContextTypeLoader().parse(is, type, null); + } + + /** + * Parses a {@link XmlToken} fragment from an InputStream. + */ public static XmlToken parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlToken) XmlBeans.getContextTypeLoader().parse( is, type, options ); } - - /** Parses a {@link XmlToken} fragment from a Reader. */ + return (XmlToken) XmlBeans.getContextTypeLoader().parse(is, type, options); + } + + /** + * Parses a {@link XmlToken} fragment from a Reader. + */ public static XmlToken parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlToken) XmlBeans.getContextTypeLoader().parse( r, type, null ); } - - /** Parses a {@link XmlToken} fragment from a Reader. */ + return (XmlToken) XmlBeans.getContextTypeLoader().parse(r, type, null); + } + + /** + * Parses a {@link XmlToken} fragment from a Reader. + */ public static XmlToken parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlToken) XmlBeans.getContextTypeLoader().parse( r, type, options ); } - - /** Parses a {@link XmlToken} fragment from a DOM Node. */ + return (XmlToken) XmlBeans.getContextTypeLoader().parse(r, type, options); + } + + /** + * Parses a {@link XmlToken} fragment from a DOM Node. + */ public static XmlToken parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException { - return (XmlToken) XmlBeans.getContextTypeLoader().parse( node, type, null ); } - - /** Parses a {@link XmlToken} fragment from a DOM Node. */ + return (XmlToken) XmlBeans.getContextTypeLoader().parse(node, type, null); + } + + /** + * Parses a {@link XmlToken} fragment from a DOM Node. + */ public static XmlToken parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlToken) XmlBeans.getContextTypeLoader().parse( node, type, options ); } - - /** Parses a {@link XmlToken} fragment from an XMLInputStream. - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - public static XmlToken parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException { - return (XmlToken) XmlBeans.getContextTypeLoader().parse( xis, type, null ); } - - /** Parses a {@link XmlToken} fragment from an XMLInputStream. - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - public static XmlToken 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 (XmlToken) XmlBeans.getContextTypeLoader().parse( xis, type, options ); } - - /** Parses a {@link XmlToken} fragment from an XMLStreamReader. */ + return (XmlToken) XmlBeans.getContextTypeLoader().parse(node, type, options); + } + + /** + * Parses a {@link XmlToken} fragment from an XMLStreamReader. + */ public static XmlToken parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException { - return (XmlToken) XmlBeans.getContextTypeLoader().parse( xsr, type, null ); } - - /** Parses a {@link XmlToken} fragment from an XMLStreamReader. */ - public static XmlToken parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException{ - return (XmlToken) 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 (XmlToken) XmlBeans.getContextTypeLoader().parse(xsr, type, null); + } + + /** + * Parses a {@link XmlToken} fragment from an XMLStreamReader. + */ + public static XmlToken parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { + return (XmlToken) XmlBeans.getContextTypeLoader().parse(xsr, type, options); + } + + private Factory() { + // No instance of this class allowed + } } } Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlTokenSource.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlTokenSource.java?rev=1881778&r1=1881777&r2=1881778&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlTokenSource.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlTokenSource.java Thu Sep 17 00:04:39 2020 @@ -15,7 +15,6 @@ package org.apache.xmlbeans; -import org.apache.xmlbeans.xml.stream.XMLInputStream; import org.w3c.dom.Node; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; @@ -64,24 +63,6 @@ public interface XmlTokenSource { XmlCursor newCursor(); /** - * Returns a new XmlInputStream. - * <p> - * The stream starts at the current begin-tag or begin-document - * position and ends at the matching end-tag or end-document. - * <p> - * This is a fail-fast stream, so if the underlying data is changed - * while the stream is being read, the stream throws a - * ConcurrentModificationException. - * <p> - * Throws an IllegalStateException if the XmlTokenSource is not - * positioned at begin-tag or begin-document (e.g., if it is at - * an attribute). - * - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - XMLInputStream newXMLInputStream(); - - /** * Returns a new XMLStreamReader. * <p> * The stream starts at the current begin-tag or begin-document @@ -198,8 +179,18 @@ public interface XmlTokenSource { void save(Writer w) throws IOException; /** - * <p>Just like newXMLInputStream() but with any of a number of options. Use the - * <em>options</em> parameter to specify the following:</p> + * Returns a new XMLStreamReader. + * <p> + * The stream starts at the current begin-tag or begin-document + * position and ends at the matching end-tag or end-document. + * <p> + * This is a fail-fast stream, so if the underlying data is changed + * while the stream is being read, the stream throws a + * ConcurrentModificationException. + * <p> + * Throws an IllegalStateException if the XmlTokenSource is not + * positioned at begin-tag or begin-document (e.g., if it is at + * an attribute). * * <table> * <tr><th>To specify this</th><th>Use this method</th></tr> @@ -278,17 +269,8 @@ public interface XmlTokenSource { * </tr> * </table> * - * @param options Any of the described options. - * @return A new validating XMLInputStream. - * @see XmlOptions - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - XMLInputStream newXMLInputStream(XmlOptions options); - - /** - * Just like newXMLInputStream() but with options. - * Options map may be null. - * + * @param options Any of the described options. Options map may be null. + * @return A new validating XMLStreamReader. * @see XmlOptions */ XMLStreamReader newXMLStreamReader(XmlOptions options); Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedByte.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedByte.java?rev=1881778&r1=1881777&r2=1881778&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedByte.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedByte.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/#unsignedByte";>xs:unsignedByte</a> type. @@ -26,24 +23,33 @@ import javax.xml.stream.XMLStreamReader; * Verified to be in the range 0..255 when validating. * <p> * As suggested by JAXB, convertible to Java short. - */ -public interface XmlUnsignedByte extends XmlUnsignedShort -{ - /** The constant {@link SchemaType} object representing this schema type. */ - public static final SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_unsignedByte"); - - /** Returns this value as a short */ + */ +public interface XmlUnsignedByte extends XmlUnsignedShort { + /** + * The constant {@link SchemaType} object representing this schema type. + */ + SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_unsignedByte"); + + /** + * Returns this value as a short + */ public short getShortValue(); - /** Sets this value as a short */ + + /** + * Sets this value as a short + */ public void setShortValue(short s); /** * Returns this value as a short + * * @deprecated replaced with {@link #getShortValue} **/ public short shortValue(); + /** * Sets this value as a short + * * @deprecated replaced with {@link #setShortValue} **/ public void set(short s); @@ -52,101 +58,129 @@ public interface XmlUnsignedByte extends * A class with methods for creating instances * of {@link XmlUnsignedByte}. */ - public static final class Factory - { - /** Creates an empty instance of {@link XmlUnsignedByte} */ + final class Factory { + /** + * Creates an empty instance of {@link XmlUnsignedByte} + */ public static XmlUnsignedByte newInstance() { - return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().newInstance( type, null ); } - - /** Creates an empty instance of {@link XmlUnsignedByte} */ + return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().newInstance(type, null); + } + + /** + * Creates an empty instance of {@link XmlUnsignedByte} + */ public static XmlUnsignedByte newInstance(org.apache.xmlbeans.XmlOptions options) { - return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().newInstance( type, options ); } - - /** Creates an immutable {@link XmlUnsignedByte} value */ + return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().newInstance(type, options); + } + + /** + * Creates an immutable {@link XmlUnsignedByte} value + */ public static XmlUnsignedByte newValue(Object obj) { - return (XmlUnsignedByte) type.newValue( obj ); } - - /** Parses a {@link XmlUnsignedByte} fragment from a String. For example: "<code><xml-fragment>123</xml-fragment></code>". */ + return (XmlUnsignedByte) type.newValue(obj); + } + + /** + * Parses a {@link XmlUnsignedByte} fragment from a String. For example: "<code><xml-fragment>123</xml-fragment></code>". + */ public static XmlUnsignedByte parse(java.lang.String s) throws org.apache.xmlbeans.XmlException { - return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse( s, type, null ); } - - /** Parses a {@link XmlUnsignedByte} fragment from a String. For example: "<code><xml-fragment>123</xml-fragment></code>". */ + return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse(s, type, null); + } + + /** + * Parses a {@link XmlUnsignedByte} fragment from a String. For example: "<code><xml-fragment>123</xml-fragment></code>". + */ public static XmlUnsignedByte parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse( s, type, options ); } - - /** Parses a {@link XmlUnsignedByte} fragment from a File. */ + return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse(s, type, options); + } + + /** + * Parses a {@link XmlUnsignedByte} fragment from a File. + */ public static XmlUnsignedByte parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse( f, type, null ); } - - /** Parses a {@link XmlUnsignedByte} fragment from a File. */ + return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse(f, type, null); + } + + /** + * Parses a {@link XmlUnsignedByte} fragment from a File. + */ public static XmlUnsignedByte parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse( f, type, options ); } - - /** Parses a {@link XmlUnsignedByte} fragment from a URL. */ + return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse(f, type, options); + } + + /** + * Parses a {@link XmlUnsignedByte} fragment from a URL. + */ public static XmlUnsignedByte parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse( u, type, null ); } + return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse(u, type, null); + } - /** Parses a {@link XmlUnsignedByte} fragment from a URL. */ + /** + * Parses a {@link XmlUnsignedByte} fragment from a URL. + */ public static XmlUnsignedByte parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse( u, type, options ); } + return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse(u, type, options); + } - /** Parses a {@link XmlUnsignedByte} fragment from an InputStream. */ + /** + * Parses a {@link XmlUnsignedByte} fragment from an InputStream. + */ public static XmlUnsignedByte parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse( is, type, null ); } - - /** Parses a {@link XmlUnsignedByte} fragment from an InputStream. */ + return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse(is, type, null); + } + + /** + * Parses a {@link XmlUnsignedByte} fragment from an InputStream. + */ public static XmlUnsignedByte parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse( is, type, options ); } - - /** Parses a {@link XmlUnsignedByte} fragment from a Reader. */ + return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse(is, type, options); + } + + /** + * Parses a {@link XmlUnsignedByte} fragment from a Reader. + */ public static XmlUnsignedByte parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse( r, type, null ); } - - /** Parses a {@link XmlUnsignedByte} fragment from a Reader. */ + return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse(r, type, null); + } + + /** + * Parses a {@link XmlUnsignedByte} fragment from a Reader. + */ public static XmlUnsignedByte parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse( r, type, options ); } - - /** Parses a {@link XmlUnsignedByte} fragment from a DOM Node. */ + return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse(r, type, options); + } + + /** + * Parses a {@link XmlUnsignedByte} fragment from a DOM Node. + */ public static XmlUnsignedByte parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException { - return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse( node, type, null ); } - - /** Parses a {@link XmlUnsignedByte} fragment from a DOM Node. */ + return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse(node, type, null); + } + + /** + * Parses a {@link XmlUnsignedByte} fragment from a DOM Node. + */ public static XmlUnsignedByte parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse( node, type, options ); } - - /** Parses a {@link XmlUnsignedByte} fragment from an XMLInputStream. - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - public static XmlUnsignedByte parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException { - return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse( xis, type, null ); } - - /** Parses a {@link XmlUnsignedByte} fragment from an XMLInputStream. - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - public static XmlUnsignedByte 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 (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse( xis, type, options ); } - - /** Parses a {@link XmlUnsignedByte} fragment from an XMLStreamReader. */ + return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse(node, type, options); + } + + /** + * Parses a {@link XmlUnsignedByte} fragment from an XMLStreamReader. + */ public static XmlUnsignedByte parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException { - return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse( xsr, type, null ); } - - /** Parses a {@link XmlUnsignedByte} fragment from an XMLStreamReader. */ - public static XmlUnsignedByte parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException{ - return (XmlUnsignedByte) 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 (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse(xsr, type, null); + } + + /** + * Parses a {@link XmlUnsignedByte} fragment from an XMLStreamReader. + */ + public static XmlUnsignedByte parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { + return (XmlUnsignedByte) XmlBeans.getContextTypeLoader().parse(xsr, type, options); + } + + private Factory() { + // No instance of this class allowed + } } } Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedInt.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedInt.java?rev=1881778&r1=1881777&r2=1881778&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedInt.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedInt.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/#unsignedInt";>xs:unsignedInt</a> type. @@ -26,24 +23,33 @@ import javax.xml.stream.XMLStreamReader; * Verified to be in the range 0..4294967295 when validating. * <p> * Convertible to Java long. - */ -public interface XmlUnsignedInt extends XmlUnsignedLong -{ - /** The constant {@link SchemaType} object representing this schema type. */ - public static final SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_unsignedInt"); - - /** Returns this value as a long */ + */ +public interface XmlUnsignedInt extends XmlUnsignedLong { + /** + * The constant {@link SchemaType} object representing this schema type. + */ + SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_unsignedInt"); + + /** + * Returns this value as a long + */ long getLongValue(); - /** Sets this value as a long */ + + /** + * Sets this value as a long + */ void setLongValue(long v); /** * Returns this value as a long + * * @deprecated replaced with {@link #getLongValue} **/ long longValue(); + /** * Sets this value as a long + * * @deprecated replaced with {@link #setLongValue} **/ void set(long v); @@ -52,101 +58,129 @@ public interface XmlUnsignedInt extends * A class with methods for creating instances * of {@link XmlUnsignedInt}. */ - public static final class Factory - { - /** Creates an empty instance of {@link XmlUnsignedInt} */ + final class Factory { + /** + * Creates an empty instance of {@link XmlUnsignedInt} + */ public static XmlUnsignedInt newInstance() { - return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().newInstance( type, null ); } - - /** Creates an empty instance of {@link XmlUnsignedInt} */ + return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().newInstance(type, null); + } + + /** + * Creates an empty instance of {@link XmlUnsignedInt} + */ public static XmlUnsignedInt newInstance(org.apache.xmlbeans.XmlOptions options) { - return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().newInstance( type, options ); } - - /** Creates an immutable {@link XmlUnsignedInt} value */ + return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().newInstance(type, options); + } + + /** + * Creates an immutable {@link XmlUnsignedInt} value + */ public static XmlUnsignedInt newValue(Object obj) { - return (XmlUnsignedInt) type.newValue( obj ); } - - /** Parses a {@link XmlUnsignedInt} fragment from a String. For example: "<code><xml-fragment>1234567</xml-fragment></code>". */ + return (XmlUnsignedInt) type.newValue(obj); + } + + /** + * Parses a {@link XmlUnsignedInt} fragment from a String. For example: "<code><xml-fragment>1234567</xml-fragment></code>". + */ public static XmlUnsignedInt parse(java.lang.String s) throws org.apache.xmlbeans.XmlException { - return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse( s, type, null ); } - - /** Parses a {@link XmlUnsignedInt} fragment from a String. For example: "<code><xml-fragment>1234567</xml-fragment></code>". */ + return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse(s, type, null); + } + + /** + * Parses a {@link XmlUnsignedInt} fragment from a String. For example: "<code><xml-fragment>1234567</xml-fragment></code>". + */ public static XmlUnsignedInt parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse( s, type, options ); } - - /** Parses a {@link XmlUnsignedInt} fragment from a File. */ + return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse(s, type, options); + } + + /** + * Parses a {@link XmlUnsignedInt} fragment from a File. + */ public static XmlUnsignedInt parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse( f, type, null ); } - - /** Parses a {@link XmlUnsignedInt} fragment from a File. */ + return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse(f, type, null); + } + + /** + * Parses a {@link XmlUnsignedInt} fragment from a File. + */ public static XmlUnsignedInt parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse( f, type, options ); } - - /** Parses a {@link XmlUnsignedInt} fragment from a URL. */ + return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse(f, type, options); + } + + /** + * Parses a {@link XmlUnsignedInt} fragment from a URL. + */ public static XmlUnsignedInt parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse( u, type, null ); } + return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse(u, type, null); + } - /** Parses a {@link XmlUnsignedInt} fragment from a URL. */ + /** + * Parses a {@link XmlUnsignedInt} fragment from a URL. + */ public static XmlUnsignedInt parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse( u, type, options ); } + return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse(u, type, options); + } - /** Parses a {@link XmlUnsignedInt} fragment from an InputStream. */ + /** + * Parses a {@link XmlUnsignedInt} fragment from an InputStream. + */ public static XmlUnsignedInt parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse( is, type, null ); } - - /** Parses a {@link XmlUnsignedInt} fragment from an InputStream. */ + return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse(is, type, null); + } + + /** + * Parses a {@link XmlUnsignedInt} fragment from an InputStream. + */ public static XmlUnsignedInt parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse( is, type, options ); } - - /** Parses a {@link XmlUnsignedInt} fragment from a Reader. */ + return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse(is, type, options); + } + + /** + * Parses a {@link XmlUnsignedInt} fragment from a Reader. + */ public static XmlUnsignedInt parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse( r, type, null ); } - - /** Parses a {@link XmlUnsignedInt} fragment from a Reader. */ + return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse(r, type, null); + } + + /** + * Parses a {@link XmlUnsignedInt} fragment from a Reader. + */ public static XmlUnsignedInt parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse( r, type, options ); } - - /** Parses a {@link XmlUnsignedInt} fragment from a DOM Node. */ + return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse(r, type, options); + } + + /** + * Parses a {@link XmlUnsignedInt} fragment from a DOM Node. + */ public static XmlUnsignedInt parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException { - return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse( node, type, null ); } - - /** Parses a {@link XmlUnsignedInt} fragment from a DOM Node. */ + return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse(node, type, null); + } + + /** + * Parses a {@link XmlUnsignedInt} fragment from a DOM Node. + */ public static XmlUnsignedInt parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse( node, type, options ); } - - /** Parses a {@link XmlUnsignedInt} fragment from an XMLInputStream. - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - public static XmlUnsignedInt parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException { - return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse( xis, type, null ); } - - /** Parses a {@link XmlUnsignedInt} fragment from an XMLInputStream. - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - public static XmlUnsignedInt 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 (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse( xis, type, options ); } - - /** Parses a {@link XmlUnsignedInt} fragment from an XMLStreamReader. */ + return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse(node, type, options); + } + + /** + * Parses a {@link XmlUnsignedInt} fragment from an XMLStreamReader. + */ public static XmlUnsignedInt parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException { - return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse( xsr, type, null ); } - - /** Parses a {@link XmlUnsignedInt} fragment from an XMLStreamReader. */ - public static XmlUnsignedInt parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException{ - return (XmlUnsignedInt) 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 (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse(xsr, type, null); + } + + /** + * Parses a {@link XmlUnsignedInt} fragment from an XMLStreamReader. + */ + public static XmlUnsignedInt parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { + return (XmlUnsignedInt) XmlBeans.getContextTypeLoader().parse(xsr, type, options); + } + + private Factory() { + // No instance of this class allowed + } } } Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedLong.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedLong.java?rev=1881778&r1=1881777&r2=1881778&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedLong.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedLong.java Thu Sep 17 00:04:39 2020 @@ -15,9 +15,6 @@ package org.apache.xmlbeans; -import javax.xml.stream.XMLStreamReader; - - import java.math.BigInteger; @@ -29,111 +26,140 @@ import java.math.BigInteger; * Verified to be in the range 0..2<super>64</super>-1 when validating. * <p> * Convertible to {@link BigInteger}. - */ -public interface XmlUnsignedLong extends XmlNonNegativeInteger -{ - /** The constant {@link SchemaType} object representing this schema type. */ - public static final SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_unsignedLong"); - + */ +public interface XmlUnsignedLong extends XmlNonNegativeInteger { + /** + * The constant {@link SchemaType} object representing this schema type. + */ + SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_unsignedLong"); + /** * A class with methods for creating instances * of {@link XmlUnsignedLong}. */ - public static final class Factory - { - /** Creates an empty instance of {@link XmlUnsignedLong} */ + final class Factory { + /** + * Creates an empty instance of {@link XmlUnsignedLong} + */ public static XmlUnsignedLong newInstance() { - return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().newInstance( type, null ); } - - /** Creates an empty instance of {@link XmlUnsignedLong} */ + return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().newInstance(type, null); + } + + /** + * Creates an empty instance of {@link XmlUnsignedLong} + */ public static XmlUnsignedLong newInstance(org.apache.xmlbeans.XmlOptions options) { - return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().newInstance( type, options ); } - - /** Creates an immutable {@link XmlUnsignedLong} value */ + return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().newInstance(type, options); + } + + /** + * Creates an immutable {@link XmlUnsignedLong} value + */ public static XmlUnsignedLong newValue(Object obj) { - return (XmlUnsignedLong) type.newValue( obj ); } - - /** Parses a {@link XmlUnsignedLong} fragment from a String. For example: "<code><xml-fragment>123456789</xml-fragment></code>". */ + return (XmlUnsignedLong) type.newValue(obj); + } + + /** + * Parses a {@link XmlUnsignedLong} fragment from a String. For example: "<code><xml-fragment>123456789</xml-fragment></code>". + */ public static XmlUnsignedLong parse(java.lang.String s) throws org.apache.xmlbeans.XmlException { - return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse( s, type, null ); } - - /** Parses a {@link XmlUnsignedLong} fragment from a String. For example: "<code><xml-fragment>123456789</xml-fragment></code>". */ + return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse(s, type, null); + } + + /** + * Parses a {@link XmlUnsignedLong} fragment from a String. For example: "<code><xml-fragment>123456789</xml-fragment></code>". + */ public static XmlUnsignedLong parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse( s, type, options ); } - - /** Parses a {@link XmlUnsignedLong} fragment from a File. */ + return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse(s, type, options); + } + + /** + * Parses a {@link XmlUnsignedLong} fragment from a File. + */ public static XmlUnsignedLong parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse( f, type, null ); } - - /** Parses a {@link XmlUnsignedLong} fragment from a File. */ + return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse(f, type, null); + } + + /** + * Parses a {@link XmlUnsignedLong} fragment from a File. + */ public static XmlUnsignedLong parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse( f, type, options ); } - - /** Parses a {@link XmlUnsignedLong} fragment from a URL. */ + return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse(f, type, options); + } + + /** + * Parses a {@link XmlUnsignedLong} fragment from a URL. + */ public static XmlUnsignedLong parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse( u, type, null ); } + return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse(u, type, null); + } - /** Parses a {@link XmlUnsignedLong} fragment from a URL. */ + /** + * Parses a {@link XmlUnsignedLong} fragment from a URL. + */ public static XmlUnsignedLong parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse( u, type, options ); } + return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse(u, type, options); + } - /** Parses a {@link XmlUnsignedLong} fragment from an InputStream. */ + /** + * Parses a {@link XmlUnsignedLong} fragment from an InputStream. + */ public static XmlUnsignedLong parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse( is, type, null ); } - - /** Parses a {@link XmlUnsignedLong} fragment from an InputStream. */ + return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse(is, type, null); + } + + /** + * Parses a {@link XmlUnsignedLong} fragment from an InputStream. + */ public static XmlUnsignedLong parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse( is, type, options ); } - - /** Parses a {@link XmlUnsignedLong} fragment from a Reader. */ + return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse(is, type, options); + } + + /** + * Parses a {@link XmlUnsignedLong} fragment from a Reader. + */ public static XmlUnsignedLong parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse( r, type, null ); } - - /** Parses a {@link XmlUnsignedLong} fragment from a Reader. */ + return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse(r, type, null); + } + + /** + * Parses a {@link XmlUnsignedLong} fragment from a Reader. + */ public static XmlUnsignedLong parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse( r, type, options ); } - - /** Parses a {@link XmlUnsignedLong} fragment from a DOM Node. */ + return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse(r, type, options); + } + + /** + * Parses a {@link XmlUnsignedLong} fragment from a DOM Node. + */ public static XmlUnsignedLong parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException { - return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse( node, type, null ); } - - /** Parses a {@link XmlUnsignedLong} fragment from a DOM Node. */ + return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse(node, type, null); + } + + /** + * Parses a {@link XmlUnsignedLong} fragment from a DOM Node. + */ public static XmlUnsignedLong parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse( node, type, options ); } - - /** Parses a {@link XmlUnsignedLong} fragment from an XMLInputStream. - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - public static XmlUnsignedLong parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException { - return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse( xis, type, null ); } - - /** Parses a {@link XmlUnsignedLong} fragment from an XMLInputStream. - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - public static XmlUnsignedLong 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 (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse( xis, type, options ); } - - /** Parses a {@link XmlUnsignedLong} fragment from an XMLStreamReader. */ + return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse(node, type, options); + } + + /** + * Parses a {@link XmlUnsignedLong} fragment from an XMLStreamReader. + */ public static XmlUnsignedLong parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException { - return (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse( xsr, type, null ); } - - /** Parses a {@link XmlUnsignedLong} fragment from an XMLStreamReader. */ - public static XmlUnsignedLong parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException{ - return (XmlUnsignedLong) 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 (XmlUnsignedLong) XmlBeans.getContextTypeLoader().parse(xsr, type, null); + } + + /** + * Parses a {@link XmlUnsignedLong} fragment from an XMLStreamReader. + */ + public static XmlUnsignedLong parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { + return (XmlUnsignedLong) 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]
