Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGMonthDay.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGMonthDay.java?rev=1881778&r1=1881777&r2=1881778&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGMonthDay.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGMonthDay.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 gMonthDay specifies a day of a specific month without specifying the year. *

* Convertible to {@link Calendar} or {@link GDate}. - * + * * @see XmlCalendar * @see GDate - */ -public interface XmlGMonthDay extends XmlAnySimpleType -{ - /** The constant {@link SchemaType} object representing this schema type. */ - public static final SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_gMonthDay"); - - /** Returns this value as a {@link Calendar} */ + */ +public interface XmlGMonthDay extends XmlAnySimpleType { + /** + * The constant {@link SchemaType} object representing this schema type. + */ + SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_gMonthDay"); + + /** + * 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); @@ -70,101 +86,129 @@ public interface XmlGMonthDay extends Xm * A class with methods for creating instances * of {@link XmlGMonthDay}. */ - public static final class Factory - { - /** Creates an empty instance of {@link XmlGMonthDay} */ + final class Factory { + /** + * Creates an empty instance of {@link XmlGMonthDay} + */ public static XmlGMonthDay newInstance() { - return (XmlGMonthDay) XmlBeans.getContextTypeLoader().newInstance( type, null ); } - - /** Creates an empty instance of {@link XmlGMonthDay} */ + return (XmlGMonthDay) XmlBeans.getContextTypeLoader().newInstance(type, null); + } + + /** + * Creates an empty instance of {@link XmlGMonthDay} + */ public static XmlGMonthDay newInstance(org.apache.xmlbeans.XmlOptions options) { - return (XmlGMonthDay) XmlBeans.getContextTypeLoader().newInstance( type, options ); } - - /** Creates an immutable {@link XmlGMonthDay} value */ + return (XmlGMonthDay) XmlBeans.getContextTypeLoader().newInstance(type, options); + } + + /** + * Creates an immutable {@link XmlGMonthDay} value + */ public static XmlGMonthDay newValue(Object obj) { - return (XmlGMonthDay) type.newValue( obj ); } - - /** Parses a {@link XmlGMonthDay} fragment from a String. For example: "<xml-fragment>--06-14</xml-fragment>". */ + return (XmlGMonthDay) type.newValue(obj); + } + + /** + * Parses a {@link XmlGMonthDay} fragment from a String. For example: "<xml-fragment>--06-14</xml-fragment>". + */ public static XmlGMonthDay parse(java.lang.String s) throws org.apache.xmlbeans.XmlException { - return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse( s, type, null ); } - - /** Parses a {@link XmlGMonthDay} fragment from a String. For example: "<xml-fragment>--06-14</xml-fragment>". */ + return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse(s, type, null); + } + + /** + * Parses a {@link XmlGMonthDay} fragment from a String. For example: "<xml-fragment>--06-14</xml-fragment>". + */ public static XmlGMonthDay parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse( s, type, options ); } - - /** Parses a {@link XmlGMonthDay} fragment from a File. */ + return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse(s, type, options); + } + + /** + * Parses a {@link XmlGMonthDay} fragment from a File. + */ public static XmlGMonthDay parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse( f, type, null ); } - - /** Parses a {@link XmlGMonthDay} fragment from a File. */ + return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse(f, type, null); + } + + /** + * Parses a {@link XmlGMonthDay} fragment from a File. + */ public static XmlGMonthDay parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse( f, type, options ); } - - /** Parses a {@link XmlGMonthDay} fragment from a URL. */ + return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse(f, type, options); + } + + /** + * Parses a {@link XmlGMonthDay} fragment from a URL. + */ public static XmlGMonthDay parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse( u, type, null ); } + return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse(u, type, null); + } - /** Parses a {@link XmlGMonthDay} fragment from a URL. */ + /** + * Parses a {@link XmlGMonthDay} fragment from a URL. + */ public static XmlGMonthDay parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse( u, type, options ); } + return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse(u, type, options); + } - /** Parses a {@link XmlGMonthDay} fragment from an InputStream. */ + /** + * Parses a {@link XmlGMonthDay} fragment from an InputStream. + */ public static XmlGMonthDay parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse( is, type, null ); } - - /** Parses a {@link XmlGMonthDay} fragment from an InputStream. */ + return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse(is, type, null); + } + + /** + * Parses a {@link XmlGMonthDay} fragment from an InputStream. + */ public static XmlGMonthDay parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse( is, type, options ); } - - /** Parses a {@link XmlGMonthDay} fragment from a Reader. */ + return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse(is, type, options); + } + + /** + * Parses a {@link XmlGMonthDay} fragment from a Reader. + */ public static XmlGMonthDay parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse( r, type, null ); } - - /** Parses a {@link XmlGMonthDay} fragment from a Reader. */ + return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse(r, type, null); + } + + /** + * Parses a {@link XmlGMonthDay} fragment from a Reader. + */ public static XmlGMonthDay parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse( r, type, options ); } - - /** Parses a {@link XmlGMonthDay} fragment from a DOM Node. */ + return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse(r, type, options); + } + + /** + * Parses a {@link XmlGMonthDay} fragment from a DOM Node. + */ public static XmlGMonthDay parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException { - return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse( node, type, null ); } - - /** Parses a {@link XmlGMonthDay} fragment from a DOM Node. */ + return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse(node, type, null); + } + + /** + * Parses a {@link XmlGMonthDay} fragment from a DOM Node. + */ public static XmlGMonthDay parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse( node, type, options ); } - - /** Parses a {@link XmlGMonthDay} fragment from an XMLInputStream. - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - public static XmlGMonthDay parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException { - return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse( xis, type, null ); } - - /** Parses a {@link XmlGMonthDay} fragment from an XMLInputStream. - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - public static XmlGMonthDay 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 (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse( xis, type, options ); } - - /** Parses a {@link XmlGMonthDay} fragment from an XMLStreamReader. */ + return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse(node, type, options); + } + + /** + * Parses a {@link XmlGMonthDay} fragment from an XMLStreamReader. + */ public static XmlGMonthDay parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException { - return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse( xsr, type, null ); } - - /** Parses a {@link XmlGMonthDay} fragment from an XMLStreamReader. */ - public static XmlGMonthDay parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException{ - return (XmlGMonthDay) 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 (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse(xsr, type, null); + } + + /** + * Parses a {@link XmlGMonthDay} fragment from an XMLStreamReader. + */ + public static XmlGMonthDay parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { + return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse(xsr, type, options); + } + + private Factory() { + // No instance of this class allowed + } } } Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGYear.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGYear.java?rev=1881778&r1=1881777&r2=1881778&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGYear.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGYear.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,55 +24,84 @@ import java.util.Calendar; * A gYear specifies a Gregorian year (AD). *

* Convertible to {@link Calendar}, {@link GDate}, or an int. - * + * * @see XmlCalendar * @see GDate - */ -public interface XmlGYear extends XmlAnySimpleType -{ - /** The constant {@link SchemaType} object representing this schema type. */ - public static final SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_gYear"); - - /** Returns this value as a {@link Calendar} */ + */ +public interface XmlGYear extends XmlAnySimpleType { + /** + * The constant {@link SchemaType} object representing this schema type. + */ + SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_gYear"); + + /** + * 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 an int from 1-31 */ + + /** + * Returns this value as an int from 1-31 + */ int getIntValue(); - /** Sets this value as an int from 1-31 */ + + /** + * Sets this value as an int from 1-31 + */ void setIntValue(int v); /** * 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); + /** * Returns this value as an int from 1-31 + * * @deprecated replaced with {@link #getIntValue} **/ int intValue(); + /** * Sets this value as an int from 1-31 + * * @deprecated replaced with {@link #setIntValue} **/ void set(int v); @@ -84,101 +110,129 @@ public interface XmlGYear extends XmlAny * A class with methods for creating instances * of {@link XmlGYear}. */ - public static final class Factory - { - /** Creates an empty instance of {@link XmlGYear} */ + final class Factory { + /** + * Creates an empty instance of {@link XmlGYear} + */ public static XmlGYear newInstance() { - return (XmlGYear) XmlBeans.getContextTypeLoader().newInstance( type, null ); } - - /** Creates an empty instance of {@link XmlGYear} */ + return (XmlGYear) XmlBeans.getContextTypeLoader().newInstance(type, null); + } + + /** + * Creates an empty instance of {@link XmlGYear} + */ public static XmlGYear newInstance(org.apache.xmlbeans.XmlOptions options) { - return (XmlGYear) XmlBeans.getContextTypeLoader().newInstance( type, options ); } - - /** Creates an immutable {@link XmlGYear} value */ + return (XmlGYear) XmlBeans.getContextTypeLoader().newInstance(type, options); + } + + /** + * Creates an immutable {@link XmlGYear} value + */ public static XmlGYear newValue(Object obj) { - return (XmlGYear) type.newValue( obj ); } - - /** Parses a {@link XmlGYear} fragment from a String. For example: "<xml-fragment>2003</xml-fragment>". */ + return (XmlGYear) type.newValue(obj); + } + + /** + * Parses a {@link XmlGYear} fragment from a String. For example: "<xml-fragment>2003</xml-fragment>". + */ public static XmlGYear parse(java.lang.String s) throws org.apache.xmlbeans.XmlException { - return (XmlGYear) XmlBeans.getContextTypeLoader().parse( s, type, null ); } - - /** Parses a {@link XmlGYear} fragment from a String. For example: "<xml-fragment>2003</xml-fragment>". */ + return (XmlGYear) XmlBeans.getContextTypeLoader().parse(s, type, null); + } + + /** + * Parses a {@link XmlGYear} fragment from a String. For example: "<xml-fragment>2003</xml-fragment>". + */ public static XmlGYear parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlGYear) XmlBeans.getContextTypeLoader().parse( s, type, options ); } - - /** Parses a {@link XmlGYear} fragment from a File. */ + return (XmlGYear) XmlBeans.getContextTypeLoader().parse(s, type, options); + } + + /** + * Parses a {@link XmlGYear} fragment from a File. + */ public static XmlGYear parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGYear) XmlBeans.getContextTypeLoader().parse( f, type, null ); } - - /** Parses a {@link XmlGYear} fragment from a File. */ + return (XmlGYear) XmlBeans.getContextTypeLoader().parse(f, type, null); + } + + /** + * Parses a {@link XmlGYear} fragment from a File. + */ public static XmlGYear parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGYear) XmlBeans.getContextTypeLoader().parse( f, type, options ); } - - /** Parses a {@link XmlGYear} fragment from a URL. */ + return (XmlGYear) XmlBeans.getContextTypeLoader().parse(f, type, options); + } + + /** + * Parses a {@link XmlGYear} fragment from a URL. + */ public static XmlGYear parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGYear) XmlBeans.getContextTypeLoader().parse( u, type, null ); } + return (XmlGYear) XmlBeans.getContextTypeLoader().parse(u, type, null); + } - /** Parses a {@link XmlGYear} fragment from a URL. */ + /** + * Parses a {@link XmlGYear} fragment from a URL. + */ public static XmlGYear parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGYear) XmlBeans.getContextTypeLoader().parse( u, type, options ); } + return (XmlGYear) XmlBeans.getContextTypeLoader().parse(u, type, options); + } - /** Parses a {@link XmlGYear} fragment from an InputStream. */ + /** + * Parses a {@link XmlGYear} fragment from an InputStream. + */ public static XmlGYear parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGYear) XmlBeans.getContextTypeLoader().parse( is, type, null ); } - - /** Parses a {@link XmlGYear} fragment from an InputStream. */ + return (XmlGYear) XmlBeans.getContextTypeLoader().parse(is, type, null); + } + + /** + * Parses a {@link XmlGYear} fragment from an InputStream. + */ public static XmlGYear parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGYear) XmlBeans.getContextTypeLoader().parse( is, type, options ); } - - /** Parses a {@link XmlGYear} fragment from a Reader. */ + return (XmlGYear) XmlBeans.getContextTypeLoader().parse(is, type, options); + } + + /** + * Parses a {@link XmlGYear} fragment from a Reader. + */ public static XmlGYear parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGYear) XmlBeans.getContextTypeLoader().parse( r, type, null ); } - - /** Parses a {@link XmlGYear} fragment from a Reader. */ + return (XmlGYear) XmlBeans.getContextTypeLoader().parse(r, type, null); + } + + /** + * Parses a {@link XmlGYear} fragment from a Reader. + */ public static XmlGYear parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGYear) XmlBeans.getContextTypeLoader().parse( r, type, options ); } - - /** Parses a {@link XmlGYear} fragment from a DOM Node. */ + return (XmlGYear) XmlBeans.getContextTypeLoader().parse(r, type, options); + } + + /** + * Parses a {@link XmlGYear} fragment from a DOM Node. + */ public static XmlGYear parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException { - return (XmlGYear) XmlBeans.getContextTypeLoader().parse( node, type, null ); } - - /** Parses a {@link XmlGYear} fragment from a DOM Node. */ + return (XmlGYear) XmlBeans.getContextTypeLoader().parse(node, type, null); + } + + /** + * Parses a {@link XmlGYear} fragment from a DOM Node. + */ public static XmlGYear parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlGYear) XmlBeans.getContextTypeLoader().parse( node, type, options ); } - - /** Parses a {@link XmlGYear} fragment from an XMLInputStream. - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - public static XmlGYear parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException { - return (XmlGYear) XmlBeans.getContextTypeLoader().parse( xis, type, null ); } - - /** Parses a {@link XmlGYear} fragment from an XMLInputStream. - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - public static XmlGYear 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 (XmlGYear) XmlBeans.getContextTypeLoader().parse( xis, type, options ); } - - /** Parses a {@link XmlGYear} fragment from an XMLStreamReader. */ + return (XmlGYear) XmlBeans.getContextTypeLoader().parse(node, type, options); + } + + /** + * Parses a {@link XmlGYear} fragment from an XMLStreamReader. + */ public static XmlGYear parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException { - return (XmlGYear) XmlBeans.getContextTypeLoader().parse( xsr, type, null ); } - - /** Parses a {@link XmlGYear} fragment from an XMLStreamReader. */ - public static XmlGYear parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException{ - return (XmlGYear) 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 (XmlGYear) XmlBeans.getContextTypeLoader().parse(xsr, type, null); + } + + /** + * Parses a {@link XmlGYear} fragment from an XMLStreamReader. + */ + public static XmlGYear parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { + return (XmlGYear) XmlBeans.getContextTypeLoader().parse(xsr, type, options); + } + + private Factory() { + // No instance of this class allowed + } } } Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGYearMonth.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGYearMonth.java?rev=1881778&r1=1881777&r2=1881778&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGYearMonth.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGYearMonth.java Thu Sep 17 00:04:39 2020 @@ -15,10 +15,6 @@ package org.apache.xmlbeans; -import javax.xml.stream.XMLStreamReader; - - -import java.util.Date; import java.util.Calendar; @@ -28,41 +24,60 @@ import java.util.Calendar; * A gYearMonth specifies a month in a specific year. *

* Convertible to {@link Calendar}, {@link GDate}. - * + * * @see XmlCalendar * @see GDate - */ -public interface XmlGYearMonth extends XmlAnySimpleType -{ - /** The constant {@link SchemaType} object representing this schema type. */ - public static final SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_gYearMonth"); - - /** Returns this value as a {@link Calendar} */ + */ +public interface XmlGYearMonth extends XmlAnySimpleType { + /** + * The constant {@link SchemaType} object representing this schema type. + */ + SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_gYearMonth"); + + /** + * 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 +86,129 @@ public interface XmlGYearMonth extends X * A class with methods for creating instances * of {@link XmlGYearMonth}. */ - public static final class Factory - { - /** Creates an empty instance of {@link XmlGYearMonth} */ + final class Factory { + /** + * Creates an empty instance of {@link XmlGYearMonth} + */ public static XmlGYearMonth newInstance() { - return (XmlGYearMonth) XmlBeans.getContextTypeLoader().newInstance( type, null ); } - - /** Creates an empty instance of {@link XmlGYearMonth} */ + return (XmlGYearMonth) XmlBeans.getContextTypeLoader().newInstance(type, null); + } + + /** + * Creates an empty instance of {@link XmlGYearMonth} + */ public static XmlGYearMonth newInstance(org.apache.xmlbeans.XmlOptions options) { - return (XmlGYearMonth) XmlBeans.getContextTypeLoader().newInstance( type, options ); } - - /** Creates an immutable {@link XmlGYearMonth} value */ + return (XmlGYearMonth) XmlBeans.getContextTypeLoader().newInstance(type, options); + } + + /** + * Creates an immutable {@link XmlGYearMonth} value + */ public static XmlGYearMonth newValue(Object obj) { - return (XmlGYearMonth) type.newValue( obj ); } - - /** Parses a {@link XmlGYearMonth} fragment from a String. For example: "<xml-fragment>2003-06</xml-fragment>". */ + return (XmlGYearMonth) type.newValue(obj); + } + + /** + * Parses a {@link XmlGYearMonth} fragment from a String. For example: "<xml-fragment>2003-06</xml-fragment>". + */ public static XmlGYearMonth parse(java.lang.String s) throws org.apache.xmlbeans.XmlException { - return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse( s, type, null ); } - - /** Parses a {@link XmlGYearMonth} fragment from a String. For example: "<xml-fragment>2003-06</xml-fragment>". */ + return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse(s, type, null); + } + + /** + * Parses a {@link XmlGYearMonth} fragment from a String. For example: "<xml-fragment>2003-06</xml-fragment>". + */ public static XmlGYearMonth parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse( s, type, options ); } - - /** Parses a {@link XmlGYearMonth} fragment from a File. */ + return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse(s, type, options); + } + + /** + * Parses a {@link XmlGYearMonth} fragment from a File. + */ public static XmlGYearMonth parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse( f, type, null ); } - - /** Parses a {@link XmlGYearMonth} fragment from a File. */ + return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse(f, type, null); + } + + /** + * Parses a {@link XmlGYearMonth} fragment from a File. + */ public static XmlGYearMonth parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse( f, type, options ); } - - /** Parses a {@link XmlGYearMonth} fragment from a URL. */ + return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse(f, type, options); + } + + /** + * Parses a {@link XmlGYearMonth} fragment from a URL. + */ public static XmlGYearMonth parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse( u, type, null ); } + return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse(u, type, null); + } - /** Parses a {@link XmlGYearMonth} fragment from a URL. */ + /** + * Parses a {@link XmlGYearMonth} fragment from a URL. + */ public static XmlGYearMonth parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse( u, type, options ); } + return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse(u, type, options); + } - /** Parses a {@link XmlGYearMonth} fragment from an InputStream. */ + /** + * Parses a {@link XmlGYearMonth} fragment from an InputStream. + */ public static XmlGYearMonth parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse( is, type, null ); } - - /** Parses a {@link XmlGYearMonth} fragment from an InputStream. */ + return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse(is, type, null); + } + + /** + * Parses a {@link XmlGYearMonth} fragment from an InputStream. + */ public static XmlGYearMonth parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse( is, type, options ); } - - /** Parses a {@link XmlGYearMonth} fragment from a Reader. */ + return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse(is, type, options); + } + + /** + * Parses a {@link XmlGYearMonth} fragment from a Reader. + */ public static XmlGYearMonth parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse( r, type, null ); } - - /** Parses a {@link XmlGYearMonth} fragment from a Reader. */ + return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse(r, type, null); + } + + /** + * Parses a {@link XmlGYearMonth} fragment from a Reader. + */ public static XmlGYearMonth parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse( r, type, options ); } - - /** Parses a {@link XmlGYearMonth} fragment from a DOM Node. */ + return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse(r, type, options); + } + + /** + * Parses a {@link XmlGYearMonth} fragment from a DOM Node. + */ public static XmlGYearMonth parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException { - return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse( node, type, null ); } - - /** Parses a {@link XmlGYearMonth} fragment from a DOM Node. */ + return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse(node, type, null); + } + + /** + * Parses a {@link XmlGYearMonth} fragment from a DOM Node. + */ public static XmlGYearMonth parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse( node, type, options ); } - - /** Parses a {@link XmlGYearMonth} fragment from an XMLInputStream. - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - public static XmlGYearMonth parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException { - return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse( xis, type, null ); } - - /** Parses a {@link XmlGYearMonth} fragment from an XMLInputStream. - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - public static XmlGYearMonth 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 (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse( xis, type, options ); } - - /** Parses a {@link XmlGYearMonth} fragment from an XMLStreamReader. */ + return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse(node, type, options); + } + + /** + * Parses a {@link XmlGYearMonth} fragment from an XMLStreamReader. + */ public static XmlGYearMonth parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException { - return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse( xsr, type, null ); } - - /** Parses a {@link XmlGYearMonth} fragment from an XMLStreamReader. */ - public static XmlGYearMonth parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException{ - return (XmlGYearMonth) 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 (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse(xsr, type, null); + } + + /** + * Parses a {@link XmlGYearMonth} fragment from an XMLStreamReader. + */ + public static XmlGYearMonth parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { + return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse(xsr, type, options); + } + + private Factory() { + // No instance of this class allowed + } } } Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlHexBinary.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlHexBinary.java?rev=1881778&r1=1881777&r2=1881778&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlHexBinary.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlHexBinary.java Thu Sep 17 00:04:39 2020 @@ -15,138 +15,170 @@ package org.apache.xmlbeans; -import javax.xml.stream.XMLStreamReader; - - /** * Corresponds to the XML Schema * xs:hexBinary type. *

- * Convertible to a byte array. - */ -public interface XmlHexBinary extends XmlAnySimpleType -{ - /** The constant {@link SchemaType} object representing this schema type. */ - public static final SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_hexBinary"); - + * Convertible to a byte array. + */ +public interface XmlHexBinary extends XmlAnySimpleType { + /** + * The constant {@link SchemaType} object representing this schema type. + */ + SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_hexBinary"); + /** * Returns this value as a byte array. + * * @deprecated replaced by {@link #getByteArrayValue} **/ byte[] byteArrayValue(); /** * Sets this value as a byte array. + * * @deprecated replaced by {@link #setByteArrayValue} **/ void set(byte[] ba); - /** Returns this value as a byte array. **/ + /** + * Returns this value as a byte array. + **/ byte[] getByteArrayValue(); - /** Sets this value as a byte array. */ - void setByteArrayValue(byte[] ba); + /** + * Sets this value as a byte array. + */ + void setByteArrayValue(byte[] ba); /** * A class with methods for creating instances * of {@link XmlHexBinary}. */ - public static final class Factory - { - /** Creates an empty instance of {@link XmlHexBinary} */ + final class Factory { + /** + * Creates an empty instance of {@link XmlHexBinary} + */ public static XmlHexBinary newInstance() { - return (XmlHexBinary) XmlBeans.getContextTypeLoader().newInstance( type, null ); } - - /** Creates an empty instance of {@link XmlHexBinary} */ + return (XmlHexBinary) XmlBeans.getContextTypeLoader().newInstance(type, null); + } + + /** + * Creates an empty instance of {@link XmlHexBinary} + */ public static XmlHexBinary newInstance(org.apache.xmlbeans.XmlOptions options) { - return (XmlHexBinary) XmlBeans.getContextTypeLoader().newInstance( type, options ); } - - /** Creates an immutable {@link XmlHexBinary} value */ + return (XmlHexBinary) XmlBeans.getContextTypeLoader().newInstance(type, options); + } + + /** + * Creates an immutable {@link XmlHexBinary} value + */ public static XmlHexBinary newValue(Object obj) { - return (XmlHexBinary) type.newValue( obj ); } - - /** Parses a {@link XmlHexBinary} fragment from a String. For example: "<xml-fragment>68656c6c6f</xml-fragment>". */ + return (XmlHexBinary) type.newValue(obj); + } + + /** + * Parses a {@link XmlHexBinary} fragment from a String. For example: "<xml-fragment>68656c6c6f</xml-fragment>". + */ public static XmlHexBinary parse(java.lang.String s) throws org.apache.xmlbeans.XmlException { - return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse( s, type, null ); } - - /** Parses a {@link XmlHexBinary} fragment from a String. For example: "<xml-fragment>68656c6c6f</xml-fragment>". */ + return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse(s, type, null); + } + + /** + * Parses a {@link XmlHexBinary} fragment from a String. For example: "<xml-fragment>68656c6c6f</xml-fragment>". + */ public static XmlHexBinary parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse( s, type, options ); } - - /** Parses a {@link XmlHexBinary} fragment from a File. */ + return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse(s, type, options); + } + + /** + * Parses a {@link XmlHexBinary} fragment from a File. + */ public static XmlHexBinary parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse( f, type, null ); } - - /** Parses a {@link XmlHexBinary} fragment from a File. */ + return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse(f, type, null); + } + + /** + * Parses a {@link XmlHexBinary} fragment from a File. + */ public static XmlHexBinary parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse( f, type, options ); } - - /** Parses a {@link XmlHexBinary} fragment from a URL. */ + return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse(f, type, options); + } + + /** + * Parses a {@link XmlHexBinary} fragment from a URL. + */ public static XmlHexBinary parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse( u, type, null ); } + return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse(u, type, null); + } - /** Parses a {@link XmlHexBinary} fragment from a URL. */ + /** + * Parses a {@link XmlHexBinary} fragment from a URL. + */ public static XmlHexBinary parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse( u, type, options ); } + return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse(u, type, options); + } - /** Parses a {@link XmlHexBinary} fragment from an InputStream. */ + /** + * Parses a {@link XmlHexBinary} fragment from an InputStream. + */ public static XmlHexBinary parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse( is, type, null ); } - - /** Parses a {@link XmlHexBinary} fragment from an InputStream. */ + return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse(is, type, null); + } + + /** + * Parses a {@link XmlHexBinary} fragment from an InputStream. + */ public static XmlHexBinary parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse( is, type, options ); } - - /** Parses a {@link XmlHexBinary} fragment from a Reader. */ + return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse(is, type, options); + } + + /** + * Parses a {@link XmlHexBinary} fragment from a Reader. + */ public static XmlHexBinary parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse( r, type, null ); } - - /** Parses a {@link XmlHexBinary} fragment from a Reader. */ + return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse(r, type, null); + } + + /** + * Parses a {@link XmlHexBinary} fragment from a Reader. + */ public static XmlHexBinary parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse( r, type, options ); } - - /** Parses a {@link XmlHexBinary} fragment from a DOM Node. */ + return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse(r, type, options); + } + + /** + * Parses a {@link XmlHexBinary} fragment from a DOM Node. + */ public static XmlHexBinary parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException { - return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse( node, type, null ); } - - /** Parses a {@link XmlHexBinary} fragment from a DOM Node. */ + return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse(node, type, null); + } + + /** + * Parses a {@link XmlHexBinary} fragment from a DOM Node. + */ public static XmlHexBinary parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse( node, type, options ); } - - /** Parses a {@link XmlHexBinary} fragment from an XMLInputStream. - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - public static XmlHexBinary parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException { - return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse( xis, type, null ); } - - /** Parses a {@link XmlHexBinary} fragment from an XMLInputStream. - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - public static XmlHexBinary 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 (XmlHexBinary) XmlBeans.getContextTypeLoader().parse( xis, type, options ); } - - /** Parses a {@link XmlHexBinary} fragment from an XMLStreamReader. */ + return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse(node, type, options); + } + + /** + * Parses a {@link XmlHexBinary} fragment from an XMLStreamReader. + */ public static XmlHexBinary parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException { - return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse( xsr, type, null ); } - - /** Parses a {@link XmlHexBinary} fragment from an XMLStreamReader. */ - public static XmlHexBinary parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException{ - return (XmlHexBinary) 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 (XmlHexBinary) XmlBeans.getContextTypeLoader().parse(xsr, type, null); + } + + /** + * Parses a {@link XmlHexBinary} fragment from an XMLStreamReader. + */ + public static XmlHexBinary parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { + return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse(xsr, type, options); + } + + private Factory() { + // No instance of this class allowed + } } } Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlID.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlID.java?rev=1881778&r1=1881777&r2=1881778&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlID.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlID.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 * xs:ID type. @@ -25,112 +22,141 @@ import javax.xml.stream.XMLStreamReader; * When validated, IDs must be unique within a document. An element * may not have more than one attribute whose type is ID. *

- * Convertible to a {@link String}. - */ -public interface XmlID extends XmlNCName -{ - /** The constant {@link SchemaType} object representing this schema type. */ - public static final SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_ID"); - + * Convertible to a {@link String}. + */ +public interface XmlID extends XmlNCName { + /** + * The constant {@link SchemaType} object representing this schema type. + */ + SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_ID"); + /** * A class with methods for creating instances * of {@link XmlID}. */ - public static final class Factory - { - /** Creates an empty instance of {@link XmlID} */ + final class Factory { + /** + * Creates an empty instance of {@link XmlID} + */ public static XmlID newInstance() { - return (XmlID) XmlBeans.getContextTypeLoader().newInstance( type, null ); } - - /** Creates an empty instance of {@link XmlID} */ + return (XmlID) XmlBeans.getContextTypeLoader().newInstance(type, null); + } + + /** + * Creates an empty instance of {@link XmlID} + */ public static XmlID newInstance(org.apache.xmlbeans.XmlOptions options) { - return (XmlID) XmlBeans.getContextTypeLoader().newInstance( type, options ); } - - /** Creates an immutable {@link XmlID} value */ + return (XmlID) XmlBeans.getContextTypeLoader().newInstance(type, options); + } + + /** + * Creates an immutable {@link XmlID} value + */ public static XmlID newValue(Object obj) { - return (XmlID) type.newValue( obj ); } - - /** Parses a {@link XmlID} fragment from a String. For example: "<xml-fragment>n1</xml-fragment>". */ + return (XmlID) type.newValue(obj); + } + + /** + * Parses a {@link XmlID} fragment from a String. For example: "<xml-fragment>n1</xml-fragment>". + */ public static XmlID parse(java.lang.String s) throws org.apache.xmlbeans.XmlException { - return (XmlID) XmlBeans.getContextTypeLoader().parse( s, type, null ); } - - /** Parses a {@link XmlID} fragment from a String. For example: "<xml-fragment>n1</xml-fragment>". */ + return (XmlID) XmlBeans.getContextTypeLoader().parse(s, type, null); + } + + /** + * Parses a {@link XmlID} fragment from a String. For example: "<xml-fragment>n1</xml-fragment>". + */ public static XmlID parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlID) XmlBeans.getContextTypeLoader().parse( s, type, options ); } - - /** Parses a {@link XmlID} fragment from a File. */ + return (XmlID) XmlBeans.getContextTypeLoader().parse(s, type, options); + } + + /** + * Parses a {@link XmlID} fragment from a File. + */ public static XmlID parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlID) XmlBeans.getContextTypeLoader().parse( f, type, null ); } - - /** Parses a {@link XmlID} fragment from a File. */ + return (XmlID) XmlBeans.getContextTypeLoader().parse(f, type, null); + } + + /** + * Parses a {@link XmlID} fragment from a File. + */ public static XmlID parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlID) XmlBeans.getContextTypeLoader().parse( f, type, options ); } - - /** Parses a {@link XmlID} fragment from a URL. */ + return (XmlID) XmlBeans.getContextTypeLoader().parse(f, type, options); + } + + /** + * Parses a {@link XmlID} fragment from a URL. + */ public static XmlID parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlID) XmlBeans.getContextTypeLoader().parse( u, type, null ); } + return (XmlID) XmlBeans.getContextTypeLoader().parse(u, type, null); + } - /** Parses a {@link XmlID} fragment from a URL. */ + /** + * Parses a {@link XmlID} fragment from a URL. + */ public static XmlID parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlID) XmlBeans.getContextTypeLoader().parse( u, type, options ); } + return (XmlID) XmlBeans.getContextTypeLoader().parse(u, type, options); + } - /** Parses a {@link XmlID} fragment from an InputStream. */ + /** + * Parses a {@link XmlID} fragment from an InputStream. + */ public static XmlID parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlID) XmlBeans.getContextTypeLoader().parse( is, type, null ); } - - /** Parses a {@link XmlID} fragment from an InputStream. */ + return (XmlID) XmlBeans.getContextTypeLoader().parse(is, type, null); + } + + /** + * Parses a {@link XmlID} fragment from an InputStream. + */ public static XmlID parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlID) XmlBeans.getContextTypeLoader().parse( is, type, options ); } - - /** Parses a {@link XmlID} fragment from a Reader. */ + return (XmlID) XmlBeans.getContextTypeLoader().parse(is, type, options); + } + + /** + * Parses a {@link XmlID} fragment from a Reader. + */ public static XmlID parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlID) XmlBeans.getContextTypeLoader().parse( r, type, null ); } - - /** Parses a {@link XmlID} fragment from a Reader. */ + return (XmlID) XmlBeans.getContextTypeLoader().parse(r, type, null); + } + + /** + * Parses a {@link XmlID} fragment from a Reader. + */ public static XmlID parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlID) XmlBeans.getContextTypeLoader().parse( r, type, options ); } - - /** Parses a {@link XmlID} fragment from a DOM Node. */ + return (XmlID) XmlBeans.getContextTypeLoader().parse(r, type, options); + } + + /** + * Parses a {@link XmlID} fragment from a DOM Node. + */ public static XmlID parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException { - return (XmlID) XmlBeans.getContextTypeLoader().parse( node, type, null ); } - - /** Parses a {@link XmlID} fragment from a DOM Node. */ + return (XmlID) XmlBeans.getContextTypeLoader().parse(node, type, null); + } + + /** + * Parses a {@link XmlID} fragment from a DOM Node. + */ public static XmlID parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlID) XmlBeans.getContextTypeLoader().parse( node, type, options ); } - - /** Parses a {@link XmlID} fragment from an XMLInputStream. - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - public static XmlID parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException { - return (XmlID) XmlBeans.getContextTypeLoader().parse( xis, type, null ); } - - /** Parses a {@link XmlID} fragment from an XMLInputStream. - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - public static XmlID 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 (XmlID) XmlBeans.getContextTypeLoader().parse( xis, type, options ); } - - /** Parses a {@link XmlID} fragment from an XMLStreamReader. */ + return (XmlID) XmlBeans.getContextTypeLoader().parse(node, type, options); + } + + /** + * Parses a {@link XmlID} fragment from an XMLStreamReader. + */ public static XmlID parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException { - return (XmlID) XmlBeans.getContextTypeLoader().parse( xsr, type, null ); } - - /** Parses a {@link XmlID} fragment from an XMLStreamReader. */ - public static XmlID parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException{ - return (XmlID) 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 (XmlID) XmlBeans.getContextTypeLoader().parse(xsr, type, null); + } + + /** + * Parses a {@link XmlID} fragment from an XMLStreamReader. + */ + public static XmlID parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { + return (XmlID) XmlBeans.getContextTypeLoader().parse(xsr, type, options); + } + + private Factory() { + // No instance of this class allowed + } } } Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlIDREF.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlIDREF.java?rev=1881778&r1=1881777&r2=1881778&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlIDREF.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlIDREF.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 * xs:IDREF type. @@ -26,112 +23,141 @@ import javax.xml.stream.XMLStreamReader; * the document. This rule is only verified when a whole document is validated * at once. *

- * Convertible to a {@link String}. - */ -public interface XmlIDREF extends XmlNCName -{ - /** The constant {@link SchemaType} object representing this schema type. */ - public static final SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_IDREF"); - + * Convertible to a {@link String}. + */ +public interface XmlIDREF extends XmlNCName { + /** + * The constant {@link SchemaType} object representing this schema type. + */ + SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_IDREF"); + /** * A class with methods for creating instances * of {@link XmlIDREF}. */ - public static final class Factory - { - /** Creates an empty instance of {@link XmlIDREF} */ + final class Factory { + /** + * Creates an empty instance of {@link XmlIDREF} + */ public static XmlIDREF newInstance() { - return (XmlIDREF) XmlBeans.getContextTypeLoader().newInstance( type, null ); } - - /** Creates an empty instance of {@link XmlIDREF} */ + return (XmlIDREF) XmlBeans.getContextTypeLoader().newInstance(type, null); + } + + /** + * Creates an empty instance of {@link XmlIDREF} + */ public static XmlIDREF newInstance(org.apache.xmlbeans.XmlOptions options) { - return (XmlIDREF) XmlBeans.getContextTypeLoader().newInstance( type, options ); } - - /** Creates an immutable {@link XmlIDREF} value */ + return (XmlIDREF) XmlBeans.getContextTypeLoader().newInstance(type, options); + } + + /** + * Creates an immutable {@link XmlIDREF} value + */ public static XmlIDREF newValue(Object obj) { - return (XmlIDREF) type.newValue( obj ); } - - /** Parses a {@link XmlIDREF} fragment from a String. */ + return (XmlIDREF) type.newValue(obj); + } + + /** + * Parses a {@link XmlIDREF} fragment from a String. + */ public static XmlIDREF parse(java.lang.String s) throws org.apache.xmlbeans.XmlException { - return (XmlIDREF) XmlBeans.getContextTypeLoader().parse( s, type, null ); } - - /** Parses a {@link XmlIDREF} fragment from a String. */ + return (XmlIDREF) XmlBeans.getContextTypeLoader().parse(s, type, null); + } + + /** + * Parses a {@link XmlIDREF} fragment from a String. + */ public static XmlIDREF parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlIDREF) XmlBeans.getContextTypeLoader().parse( s, type, options ); } - - /** Parses a {@link XmlIDREF} fragment from a File. */ + return (XmlIDREF) XmlBeans.getContextTypeLoader().parse(s, type, options); + } + + /** + * Parses a {@link XmlIDREF} fragment from a File. + */ public static XmlIDREF parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlIDREF) XmlBeans.getContextTypeLoader().parse( f, type, null ); } - - /** Parses a {@link XmlIDREF} fragment from a File. */ + return (XmlIDREF) XmlBeans.getContextTypeLoader().parse(f, type, null); + } + + /** + * Parses a {@link XmlIDREF} fragment from a File. + */ public static XmlIDREF parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlIDREF) XmlBeans.getContextTypeLoader().parse( f, type, options ); } - - /** Parses a {@link XmlIDREF} fragment from a URL. */ + return (XmlIDREF) XmlBeans.getContextTypeLoader().parse(f, type, options); + } + + /** + * Parses a {@link XmlIDREF} fragment from a URL. + */ public static XmlIDREF parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlIDREF) XmlBeans.getContextTypeLoader().parse( u, type, null ); } + return (XmlIDREF) XmlBeans.getContextTypeLoader().parse(u, type, null); + } - /** Parses a {@link XmlIDREF} fragment from a URL. */ + /** + * Parses a {@link XmlIDREF} fragment from a URL. + */ public static XmlIDREF parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlIDREF) XmlBeans.getContextTypeLoader().parse( u, type, options ); } + return (XmlIDREF) XmlBeans.getContextTypeLoader().parse(u, type, options); + } - /** Parses a {@link XmlIDREF} fragment from an InputStream. */ + /** + * Parses a {@link XmlIDREF} fragment from an InputStream. + */ public static XmlIDREF parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlIDREF) XmlBeans.getContextTypeLoader().parse( is, type, null ); } - - /** Parses a {@link XmlIDREF} fragment from an InputStream. */ + return (XmlIDREF) XmlBeans.getContextTypeLoader().parse(is, type, null); + } + + /** + * Parses a {@link XmlIDREF} fragment from an InputStream. + */ public static XmlIDREF parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlIDREF) XmlBeans.getContextTypeLoader().parse( is, type, options ); } - - /** Parses a {@link XmlIDREF} fragment from a Reader. */ + return (XmlIDREF) XmlBeans.getContextTypeLoader().parse(is, type, options); + } + + /** + * Parses a {@link XmlIDREF} fragment from a Reader. + */ public static XmlIDREF parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlIDREF) XmlBeans.getContextTypeLoader().parse( r, type, null ); } - - /** Parses a {@link XmlIDREF} fragment from a Reader. */ + return (XmlIDREF) XmlBeans.getContextTypeLoader().parse(r, type, null); + } + + /** + * Parses a {@link XmlIDREF} fragment from a Reader. + */ public static XmlIDREF parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlIDREF) XmlBeans.getContextTypeLoader().parse( r, type, options ); } - - /** Parses a {@link XmlIDREF} fragment from a DOM Node. */ + return (XmlIDREF) XmlBeans.getContextTypeLoader().parse(r, type, options); + } + + /** + * Parses a {@link XmlIDREF} fragment from a DOM Node. + */ public static XmlIDREF parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException { - return (XmlIDREF) XmlBeans.getContextTypeLoader().parse( node, type, null ); } - - /** Parses a {@link XmlIDREF} fragment from a DOM Node. */ + return (XmlIDREF) XmlBeans.getContextTypeLoader().parse(node, type, null); + } + + /** + * Parses a {@link XmlIDREF} fragment from a DOM Node. + */ public static XmlIDREF parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlIDREF) XmlBeans.getContextTypeLoader().parse( node, type, options ); } - - /** Parses a {@link XmlIDREF} fragment from an XMLInputStream. - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - public static XmlIDREF parse(org.apache.xmlbeans.xml.stream.XMLInputStream xis) throws org.apache.xmlbeans.XmlException, org.apache.xmlbeans.xml.stream.XMLStreamException { - return (XmlIDREF) XmlBeans.getContextTypeLoader().parse( xis, type, null ); } - - /** Parses a {@link XmlIDREF} fragment from an XMLInputStream. - * @deprecated XMLInputStream was deprecated by XMLStreamReader from STaX - jsr173 API. - */ - public static XmlIDREF 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 (XmlIDREF) XmlBeans.getContextTypeLoader().parse( xis, type, options ); } - - /** Parses a {@link XmlIDREF} fragment from an XMLStreamReader. */ + return (XmlIDREF) XmlBeans.getContextTypeLoader().parse(node, type, options); + } + + /** + * Parses a {@link XmlIDREF} fragment from an XMLStreamReader. + */ public static XmlIDREF parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException { - return (XmlIDREF) XmlBeans.getContextTypeLoader().parse( xsr, type, null ); } - - /** Parses a {@link XmlIDREF} fragment from an XMLStreamReader. */ - public static XmlIDREF parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException{ - return (XmlIDREF) 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 (XmlIDREF) XmlBeans.getContextTypeLoader().parse(xsr, type, null); + } + + /** + * Parses a {@link XmlIDREF} fragment from an XMLStreamReader. + */ + public static XmlIDREF parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { + return (XmlIDREF) XmlBeans.getContextTypeLoader().parse(xsr, type, options); + } + + private Factory() { + // No instance of this class allowed + } } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org For additional commands, e-mail: commits-help@poi.apache.org