Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlENTITY.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlENTITY.java?rev=1886771&r1=1886770&r2=1886771&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlENTITY.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlENTITY.java Sun Feb 21 21:34:00 2021 @@ -15,6 +15,8 @@ package org.apache.xmlbeans; +import org.apache.xmlbeans.impl.schema.XmlObjectFactory; + /** * Corresponds to the XML Schema * <a target="_blank" href="http://www.w3.org/TR/xmlschema-2/#ENTITY";>xs:ENTITY</a> type. @@ -22,138 +24,11 @@ package org.apache.xmlbeans; * Convertible to {@link String}. */ public interface XmlENTITY extends XmlNCName { - /** - * The constant {@link SchemaType} object representing this schema type. - */ - SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_ENTITY"); + XmlObjectFactory<XmlENTITY> Factory = new XmlObjectFactory<>("_BI_ENTITY"); /** - * A class with methods for creating instances - * of {@link XmlENTITY}. + * The constant {@link SchemaType} object representing this schema type. */ - final class Factory { - /** - * Creates an empty instance of {@link XmlENTITY} - */ - public static XmlENTITY newInstance() { - return (XmlENTITY) XmlBeans.getContextTypeLoader().newInstance(type, null); - } - - /** - * Creates an empty instance of {@link XmlENTITY} - */ - public static XmlENTITY newInstance(org.apache.xmlbeans.XmlOptions options) { - return (XmlENTITY) XmlBeans.getContextTypeLoader().newInstance(type, options); - } - - /** - * Creates an immutable {@link XmlENTITY} value - */ - public static XmlENTITY newValue(Object obj) { - return (XmlENTITY) type.newValue(obj); - } - - /** - * Parses a {@link XmlENTITY} fragment from a String. - */ - public static XmlENTITY parse(java.lang.String s) throws org.apache.xmlbeans.XmlException { - return (XmlENTITY) XmlBeans.getContextTypeLoader().parse(s, type, null); - } - - /** - * Parses a {@link XmlENTITY} fragment from a String. - */ - public static XmlENTITY parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlENTITY) XmlBeans.getContextTypeLoader().parse(s, type, options); - } - - /** - * Parses a {@link XmlENTITY} fragment from a File. - */ - public static XmlENTITY parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlENTITY) XmlBeans.getContextTypeLoader().parse(f, type, null); - } - - /** - * Parses a {@link XmlENTITY} fragment from a File. - */ - public static XmlENTITY parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlENTITY) XmlBeans.getContextTypeLoader().parse(f, type, options); - } - - /** - * Parses a {@link XmlENTITY} fragment from a URL. - */ - public static XmlENTITY parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlENTITY) XmlBeans.getContextTypeLoader().parse(u, type, null); - } - - /** - * Parses a {@link XmlENTITY} fragment from a URL. - */ - public static XmlENTITY parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlENTITY) XmlBeans.getContextTypeLoader().parse(u, type, options); - } - - /** - * Parses a {@link XmlENTITY} fragment from an InputStream. - */ - public static XmlENTITY parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlENTITY) XmlBeans.getContextTypeLoader().parse(is, type, null); - } - - /** - * Parses a {@link XmlENTITY} fragment from an InputStream. - */ - public static XmlENTITY parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlENTITY) XmlBeans.getContextTypeLoader().parse(is, type, options); - } - - /** - * Parses a {@link XmlENTITY} fragment from a Reader. - */ - public static XmlENTITY parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlENTITY) XmlBeans.getContextTypeLoader().parse(r, type, null); - } - - /** - * Parses a {@link XmlENTITY} fragment from a Reader. - */ - public static XmlENTITY parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlENTITY) XmlBeans.getContextTypeLoader().parse(r, type, options); - } - - /** - * Parses a {@link XmlENTITY} fragment from a DOM Node. - */ - public static XmlENTITY parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException { - return (XmlENTITY) XmlBeans.getContextTypeLoader().parse(node, type, null); - } - - /** - * Parses a {@link XmlENTITY} fragment from a DOM Node. - */ - public static XmlENTITY parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlENTITY) XmlBeans.getContextTypeLoader().parse(node, type, options); - } - - /** - * Parses a {@link XmlENTITY} fragment from an XMLStreamReader. - */ - public static XmlENTITY parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException { - return (XmlENTITY) XmlBeans.getContextTypeLoader().parse(xsr, type, null); - } - - /** - * Parses a {@link XmlENTITY} fragment from an XMLStreamReader. - */ - public static XmlENTITY parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlENTITY) XmlBeans.getContextTypeLoader().parse(xsr, type, options); - } - - private Factory() { - // No instance of this class allowed - } - } + SchemaType type = Factory.getType(); }
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlFloat.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlFloat.java?rev=1886771&r1=1886770&r2=1886771&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlFloat.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlFloat.java Sun Feb 21 21:34:00 2021 @@ -15,6 +15,8 @@ package org.apache.xmlbeans; +import org.apache.xmlbeans.impl.schema.XmlObjectFactory; + /** * Corresponds to the XML Schema * <a target="_blank" href="http://www.w3.org/TR/xmlschema-2/#float";>xs:float</a> type. @@ -22,10 +24,12 @@ package org.apache.xmlbeans; * Naturally, convertible to a Java float. */ public interface XmlFloat extends XmlAnySimpleType { + XmlObjectFactory<XmlFloat> Factory = new XmlObjectFactory<>("_BI_float"); + /** * The constant {@link SchemaType} object representing this schema type. */ - SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_float"); + SchemaType type = Factory.getType(); /** * Returns this value as a float @@ -36,134 +40,5 @@ public interface XmlFloat extends XmlAny * Sets this value as a float */ void setFloatValue(float v); - - /** - * A class with methods for creating instances - * of {@link XmlFloat}. - */ - final class Factory { - /** - * Creates an empty instance of {@link XmlFloat} - */ - public static XmlFloat newInstance() { - return (XmlFloat) XmlBeans.getContextTypeLoader().newInstance(type, null); - } - - /** - * Creates an empty instance of {@link XmlFloat} - */ - public static XmlFloat newInstance(org.apache.xmlbeans.XmlOptions options) { - return (XmlFloat) XmlBeans.getContextTypeLoader().newInstance(type, options); - } - - /** - * Creates an immutable {@link XmlFloat} value - */ - public static XmlFloat newValue(Object obj) { - return (XmlFloat) type.newValue(obj); - } - - /** - * Parses a {@link XmlFloat} fragment from a String. For example: "<code><xml-fragment>12.34e+5</xml-fragment></code>". - */ - public static XmlFloat parse(java.lang.String s) throws org.apache.xmlbeans.XmlException { - return (XmlFloat) XmlBeans.getContextTypeLoader().parse(s, type, null); - } - - /** - * Parses a {@link XmlFloat} fragment from a String. For example: "<code><xml-fragment>12.34e+5</xml-fragment></code>". - */ - public static XmlFloat parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlFloat) XmlBeans.getContextTypeLoader().parse(s, type, options); - } - - /** - * Parses a {@link XmlFloat} fragment from a File. - */ - public static XmlFloat parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlFloat) XmlBeans.getContextTypeLoader().parse(f, type, null); - } - - /** - * Parses a {@link XmlFloat} fragment from a File. - */ - public static XmlFloat parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlFloat) XmlBeans.getContextTypeLoader().parse(f, type, options); - } - - /** - * Parses a {@link XmlFloat} fragment from a URL. - */ - public static XmlFloat parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlFloat) XmlBeans.getContextTypeLoader().parse(u, type, null); - } - - /** - * Parses a {@link XmlFloat} fragment from a URL. - */ - public static XmlFloat parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlFloat) XmlBeans.getContextTypeLoader().parse(u, type, options); - } - - /** - * Parses a {@link XmlFloat} fragment from an InputStream. - */ - public static XmlFloat parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlFloat) XmlBeans.getContextTypeLoader().parse(is, type, null); - } - - /** - * Parses a {@link XmlFloat} fragment from an InputStream. - */ - public static XmlFloat parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlFloat) XmlBeans.getContextTypeLoader().parse(is, type, options); - } - - /** - * Parses a {@link XmlFloat} fragment from a Reader. - */ - public static XmlFloat parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlFloat) XmlBeans.getContextTypeLoader().parse(r, type, null); - } - - /** - * Parses a {@link XmlFloat} fragment from a Reader. - */ - public static XmlFloat parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlFloat) XmlBeans.getContextTypeLoader().parse(r, type, options); - } - - /** - * Parses a {@link XmlFloat} fragment from a DOM Node. - */ - public static XmlFloat parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException { - return (XmlFloat) XmlBeans.getContextTypeLoader().parse(node, type, null); - } - - /** - * Parses a {@link XmlFloat} fragment from a DOM Node. - */ - public static XmlFloat parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlFloat) XmlBeans.getContextTypeLoader().parse(node, type, options); - } - - /** - * Parses a {@link XmlFloat} fragment from an XMLStreamReader. - */ - public static XmlFloat parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException { - return (XmlFloat) XmlBeans.getContextTypeLoader().parse(xsr, type, null); - } - - /** - * Parses a {@link XmlFloat} fragment from an XMLStreamReader. - */ - public static XmlFloat parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlFloat) XmlBeans.getContextTypeLoader().parse(xsr, type, options); - } - - private Factory() { - // No instance of this class allowed - } - } } Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGDay.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGDay.java?rev=1886771&r1=1886770&r2=1886771&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGDay.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGDay.java Sun Feb 21 21:34:00 2021 @@ -15,6 +15,8 @@ package org.apache.xmlbeans; +import org.apache.xmlbeans.impl.schema.XmlObjectFactory; + import java.util.Calendar; @@ -29,10 +31,12 @@ import java.util.Calendar; * @see GDate */ public interface XmlGDay extends XmlAnySimpleType { + XmlObjectFactory<XmlGDay> Factory = new XmlObjectFactory<>("_BI_gDay"); + /** * The constant {@link SchemaType} object representing this schema type. */ - SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_gDay"); + SchemaType type = Factory.getType(); /** * Returns this value as a {@link Calendar} @@ -63,134 +67,5 @@ public interface XmlGDay extends XmlAnyS * Sets this value as an int from 1-31 */ void setIntValue(int v); - - /** - * A class with methods for creating instances - * of {@link XmlGDay}. - */ - final class Factory { - /** - * Creates an empty instance of {@link XmlGDay} - */ - public static XmlGDay newInstance() { - return (XmlGDay) XmlBeans.getContextTypeLoader().newInstance(type, null); - } - - /** - * Creates an empty instance of {@link XmlGDay} - */ - public static XmlGDay newInstance(org.apache.xmlbeans.XmlOptions options) { - return (XmlGDay) XmlBeans.getContextTypeLoader().newInstance(type, options); - } - - /** - * Creates an immutable {@link XmlGDay} value - */ - public static XmlGDay newValue(Object obj) { - return (XmlGDay) type.newValue(obj); - } - - /** - * Parses a {@link XmlGDay} fragment from a String. For example: "<code><xml-fragment>---14</xml-fragment></code>". - */ - public static XmlGDay parse(java.lang.String s) throws org.apache.xmlbeans.XmlException { - return (XmlGDay) XmlBeans.getContextTypeLoader().parse(s, type, null); - } - - /** - * Parses a {@link XmlGDay} fragment from a String. For example: "<code><xml-fragment>---14</xml-fragment></code>". - */ - public static XmlGDay parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlGDay) XmlBeans.getContextTypeLoader().parse(s, type, options); - } - - /** - * Parses a {@link XmlGDay} fragment from a File. - */ - public static XmlGDay parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGDay) XmlBeans.getContextTypeLoader().parse(f, type, null); - } - - /** - * Parses a {@link XmlGDay} fragment from a File. - */ - public static XmlGDay parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGDay) XmlBeans.getContextTypeLoader().parse(f, type, options); - } - - /** - * Parses a {@link XmlGDay} fragment from a URL. - */ - public static XmlGDay parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGDay) XmlBeans.getContextTypeLoader().parse(u, type, null); - } - - /** - * Parses a {@link XmlGDay} fragment from a URL. - */ - public static XmlGDay parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGDay) XmlBeans.getContextTypeLoader().parse(u, type, options); - } - - /** - * Parses a {@link XmlGDay} fragment from an InputStream. - */ - public static XmlGDay parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGDay) XmlBeans.getContextTypeLoader().parse(is, type, null); - } - - /** - * Parses a {@link XmlGDay} fragment from an InputStream. - */ - public static XmlGDay parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGDay) XmlBeans.getContextTypeLoader().parse(is, type, options); - } - - /** - * Parses a {@link XmlGDay} fragment from a Reader. - */ - public static XmlGDay parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGDay) XmlBeans.getContextTypeLoader().parse(r, type, null); - } - - /** - * Parses a {@link XmlGDay} fragment from a Reader. - */ - public static XmlGDay parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGDay) XmlBeans.getContextTypeLoader().parse(r, type, options); - } - - /** - * Parses a {@link XmlGDay} fragment from a DOM Node. - */ - public static XmlGDay parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException { - return (XmlGDay) XmlBeans.getContextTypeLoader().parse(node, type, null); - } - - /** - * Parses a {@link XmlGDay} fragment from a DOM Node. - */ - public static XmlGDay parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlGDay) XmlBeans.getContextTypeLoader().parse(node, type, options); - } - - /** - * Parses a {@link XmlGDay} fragment from an XMLStreamReader. - */ - public static XmlGDay parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException { - return (XmlGDay) XmlBeans.getContextTypeLoader().parse(xsr, type, null); - } - - /** - * Parses a {@link XmlGDay} fragment from an XMLStreamReader. - */ - public static XmlGDay parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlGDay) XmlBeans.getContextTypeLoader().parse(xsr, type, options); - } - - private Factory() { - // No instance of this class allowed - } - } } Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGMonth.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGMonth.java?rev=1886771&r1=1886770&r2=1886771&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGMonth.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGMonth.java Sun Feb 21 21:34:00 2021 @@ -15,6 +15,8 @@ package org.apache.xmlbeans; +import org.apache.xmlbeans.impl.schema.XmlObjectFactory; + import java.util.Calendar; @@ -29,10 +31,12 @@ import java.util.Calendar; * @see GDate */ public interface XmlGMonth extends XmlAnySimpleType { + XmlObjectFactory<XmlGMonth> Factory = new XmlObjectFactory<>("_BI_gMonth"); + /** * The constant {@link SchemaType} object representing this schema type. */ - SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_gMonth"); + SchemaType type = Factory.getType(); /** * Returns this value as a {@link Calendar} @@ -63,134 +67,5 @@ public interface XmlGMonth extends XmlAn * Sets this value as an int from 1-12 */ void setIntValue(int v); - - /** - * A class with methods for creating instances - * of {@link XmlGMonth}. - */ - final class Factory { - /** - * Creates an empty instance of {@link XmlGMonth} - */ - public static XmlGMonth newInstance() { - return (XmlGMonth) XmlBeans.getContextTypeLoader().newInstance(type, null); - } - - /** - * Creates an empty instance of {@link XmlGMonth} - */ - public static XmlGMonth newInstance(org.apache.xmlbeans.XmlOptions options) { - return (XmlGMonth) XmlBeans.getContextTypeLoader().newInstance(type, options); - } - - /** - * Creates an immutable {@link XmlGMonth} value - */ - public static XmlGMonth newValue(Object obj) { - return (XmlGMonth) type.newValue(obj); - } - - /** - * Parses a {@link XmlGMonth} fragment from a String. For example: "<code><xml-fragment>--06</xml-fragment></code>". - */ - public static XmlGMonth parse(java.lang.String s) throws org.apache.xmlbeans.XmlException { - return (XmlGMonth) XmlBeans.getContextTypeLoader().parse(s, type, null); - } - - /** - * Parses a {@link XmlGMonth} fragment from a String. For example: "<code><xml-fragment>--06</xml-fragment></code>". - */ - public static XmlGMonth parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlGMonth) XmlBeans.getContextTypeLoader().parse(s, type, options); - } - - /** - * Parses a {@link XmlGMonth} fragment from a File. - */ - public static XmlGMonth parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGMonth) XmlBeans.getContextTypeLoader().parse(f, type, null); - } - - /** - * Parses a {@link XmlGMonth} fragment from a File. - */ - public static XmlGMonth parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGMonth) XmlBeans.getContextTypeLoader().parse(f, type, options); - } - - /** - * Parses a {@link XmlGMonth} fragment from a URL. - */ - public static XmlGMonth parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGMonth) XmlBeans.getContextTypeLoader().parse(u, type, null); - } - - /** - * Parses a {@link XmlGMonth} fragment from a URL. - */ - public static XmlGMonth parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGMonth) XmlBeans.getContextTypeLoader().parse(u, type, options); - } - - /** - * Parses a {@link XmlGMonth} fragment from an InputStream. - */ - public static XmlGMonth parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGMonth) XmlBeans.getContextTypeLoader().parse(is, type, null); - } - - /** - * Parses a {@link XmlGMonth} fragment from an InputStream. - */ - public static XmlGMonth parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGMonth) XmlBeans.getContextTypeLoader().parse(is, type, options); - } - - /** - * Parses a {@link XmlGMonth} fragment from a Reader. - */ - public static XmlGMonth parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGMonth) XmlBeans.getContextTypeLoader().parse(r, type, null); - } - - /** - * Parses a {@link XmlGMonth} fragment from a Reader. - */ - public static XmlGMonth parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGMonth) XmlBeans.getContextTypeLoader().parse(r, type, options); - } - - /** - * Parses a {@link XmlGMonth} fragment from a DOM Node. - */ - public static XmlGMonth parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException { - return (XmlGMonth) XmlBeans.getContextTypeLoader().parse(node, type, null); - } - - /** - * Parses a {@link XmlGMonth} fragment from a DOM Node. - */ - public static XmlGMonth parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlGMonth) XmlBeans.getContextTypeLoader().parse(node, type, options); - } - - /** - * Parses a {@link XmlGMonth} fragment from an XMLStreamReader. - */ - public static XmlGMonth parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException { - return (XmlGMonth) XmlBeans.getContextTypeLoader().parse(xsr, type, null); - } - - /** - * Parses a {@link XmlGMonth} fragment from an XMLStreamReader. - */ - public static XmlGMonth parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlGMonth) XmlBeans.getContextTypeLoader().parse(xsr, type, options); - } - - private Factory() { - // No instance of this class allowed - } - } } 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=1886771&r1=1886770&r2=1886771&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGMonthDay.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGMonthDay.java Sun Feb 21 21:34:00 2021 @@ -15,6 +15,8 @@ package org.apache.xmlbeans; +import org.apache.xmlbeans.impl.schema.XmlObjectFactory; + import java.util.Calendar; @@ -29,10 +31,12 @@ import java.util.Calendar; * @see GDate */ public interface XmlGMonthDay extends XmlAnySimpleType { + XmlObjectFactory<XmlGMonthDay> Factory = new XmlObjectFactory<>("_BI_gMonthDay"); + /** * The constant {@link SchemaType} object representing this schema type. */ - SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_gMonthDay"); + SchemaType type = Factory.getType(); /** * Returns this value as a {@link Calendar} @@ -53,134 +57,5 @@ public interface XmlGMonthDay extends Xm * Sets this value as a {@link GDateSpecification} */ void setGDateValue(GDate gd); - - /** - * A class with methods for creating instances - * 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} - */ - public static XmlGMonthDay newInstance(org.apache.xmlbeans.XmlOptions options) { - 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: "<code><xml-fragment>--06-14</xml-fragment></code>". - */ - 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: "<code><xml-fragment>--06-14</xml-fragment></code>". - */ - 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. - */ - 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. - */ - 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. - */ - public static XmlGMonthDay parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGMonthDay) XmlBeans.getContextTypeLoader().parse(u, type, null); - } - - /** - * 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); - } - - /** - * 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. - */ - 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. - */ - 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. - */ - 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. - */ - 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. - */ - 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 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); - } - - 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=1886771&r1=1886770&r2=1886771&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGYear.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGYear.java Sun Feb 21 21:34:00 2021 @@ -15,6 +15,8 @@ package org.apache.xmlbeans; +import org.apache.xmlbeans.impl.schema.XmlObjectFactory; + import java.util.Calendar; @@ -29,10 +31,12 @@ import java.util.Calendar; * @see GDate */ public interface XmlGYear extends XmlAnySimpleType { + XmlObjectFactory<XmlGYear> Factory = new XmlObjectFactory<>("_BI_gYear"); + /** * The constant {@link SchemaType} object representing this schema type. */ - SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_gYear"); + SchemaType type = Factory.getType(); /** * Returns this value as a {@link Calendar} @@ -63,134 +67,5 @@ public interface XmlGYear extends XmlAny * Sets this value as an int from 1-31 */ void setIntValue(int v); - - /** - * A class with methods for creating instances - * 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} - */ - public static XmlGYear newInstance(org.apache.xmlbeans.XmlOptions options) { - 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: "<code><xml-fragment>2003</xml-fragment></code>". - */ - 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: "<code><xml-fragment>2003</xml-fragment></code>". - */ - 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. - */ - 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. - */ - 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. - */ - public static XmlGYear parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGYear) XmlBeans.getContextTypeLoader().parse(u, type, null); - } - - /** - * 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); - } - - /** - * 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. - */ - 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. - */ - 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. - */ - 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. - */ - 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. - */ - 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 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); - } - - 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=1886771&r1=1886770&r2=1886771&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGYearMonth.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGYearMonth.java Sun Feb 21 21:34:00 2021 @@ -15,6 +15,8 @@ package org.apache.xmlbeans; +import org.apache.xmlbeans.impl.schema.XmlObjectFactory; + import java.util.Calendar; @@ -29,10 +31,12 @@ import java.util.Calendar; * @see GDate */ public interface XmlGYearMonth extends XmlAnySimpleType { + XmlObjectFactory<XmlGYearMonth> Factory = new XmlObjectFactory<>("_BI_gYearMonth"); + /** * The constant {@link SchemaType} object representing this schema type. */ - SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_gYearMonth"); + SchemaType type = Factory.getType(); /** * Returns this value as a {@link Calendar} @@ -53,134 +57,5 @@ public interface XmlGYearMonth extends X * Sets this value as a {@link GDateSpecification} */ void setGDateValue(GDate gd); - - /** - * A class with methods for creating instances - * 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} - */ - public static XmlGYearMonth newInstance(org.apache.xmlbeans.XmlOptions options) { - 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: "<code><xml-fragment>2003-06</xml-fragment></code>". - */ - 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: "<code><xml-fragment>2003-06</xml-fragment></code>". - */ - 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. - */ - 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. - */ - 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. - */ - public static XmlGYearMonth parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlGYearMonth) XmlBeans.getContextTypeLoader().parse(u, type, null); - } - - /** - * 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); - } - - /** - * 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. - */ - 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. - */ - 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. - */ - 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. - */ - 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. - */ - 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 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); - } - - 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=1886771&r1=1886770&r2=1886771&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlHexBinary.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlHexBinary.java Sun Feb 21 21:34:00 2021 @@ -15,6 +15,8 @@ package org.apache.xmlbeans; +import org.apache.xmlbeans.impl.schema.XmlObjectFactory; + /** * Corresponds to the XML Schema * <a target="_blank" href="http://www.w3.org/TR/xmlschema-2/#hexBinary";>xs:hexBinary</a> type. @@ -22,10 +24,12 @@ package org.apache.xmlbeans; * Convertible to a byte array. */ public interface XmlHexBinary extends XmlAnySimpleType { + XmlObjectFactory<XmlHexBinary> Factory = new XmlObjectFactory<>("_BI_hexBinary"); + /** * The constant {@link SchemaType} object representing this schema type. */ - SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_hexBinary"); + SchemaType type = Factory.getType(); /** * Returns this value as a byte array. @@ -36,135 +40,5 @@ public interface XmlHexBinary extends Xm * Sets this value as a byte array. */ void setByteArrayValue(byte[] ba); - - - /** - * A class with methods for creating instances - * 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} - */ - public static XmlHexBinary newInstance(org.apache.xmlbeans.XmlOptions options) { - 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: "<code><xml-fragment>68656c6c6f</xml-fragment></code>". - */ - 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: "<code><xml-fragment>68656c6c6f</xml-fragment></code>". - */ - 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. - */ - 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. - */ - 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. - */ - public static XmlHexBinary parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlHexBinary) XmlBeans.getContextTypeLoader().parse(u, type, null); - } - - /** - * 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); - } - - /** - * 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. - */ - 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. - */ - 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. - */ - 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. - */ - 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. - */ - 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 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); - } - - 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=1886771&r1=1886770&r2=1886771&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlID.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlID.java Sun Feb 21 21:34:00 2021 @@ -15,6 +15,8 @@ package org.apache.xmlbeans; +import org.apache.xmlbeans.impl.schema.XmlObjectFactory; + /** * Corresponds to the XML Schema * <a target="_blank" href="http://www.w3.org/TR/xmlschema-2/#ID";>xs:ID</a> type. @@ -25,138 +27,11 @@ package org.apache.xmlbeans; * 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"); + XmlObjectFactory<XmlID> Factory = new XmlObjectFactory<>("_BI_ID"); /** - * A class with methods for creating instances - * of {@link XmlID}. + * The constant {@link SchemaType} object representing this schema type. */ - 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} - */ - public static XmlID newInstance(org.apache.xmlbeans.XmlOptions options) { - 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: "<code><xml-fragment>n1</xml-fragment></code>". - */ - 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: "<code><xml-fragment>n1</xml-fragment></code>". - */ - 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. - */ - 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. - */ - 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. - */ - public static XmlID parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlID) XmlBeans.getContextTypeLoader().parse(u, type, null); - } - - /** - * 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); - } - - /** - * 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. - */ - 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. - */ - 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. - */ - 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. - */ - 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. - */ - 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 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); - } - - private Factory() { - // No instance of this class allowed - } - } + SchemaType type = Factory.getType(); } 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=1886771&r1=1886770&r2=1886771&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlIDREF.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlIDREF.java Sun Feb 21 21:34:00 2021 @@ -15,6 +15,8 @@ package org.apache.xmlbeans; +import org.apache.xmlbeans.impl.schema.XmlObjectFactory; + /** * Corresponds to the XML Schema * <a target="_blank" href="http://www.w3.org/TR/xmlschema-2/#IDREF";>xs:IDREF</a> type. @@ -26,138 +28,11 @@ package org.apache.xmlbeans; * 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"); + XmlObjectFactory<XmlIDREF> Factory = new XmlObjectFactory<>("_BI_IDREF"); /** - * A class with methods for creating instances - * of {@link XmlIDREF}. + * The constant {@link SchemaType} object representing this schema type. */ - 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} - */ - public static XmlIDREF newInstance(org.apache.xmlbeans.XmlOptions options) { - 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. - */ - 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. - */ - 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. - */ - 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. - */ - 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. - */ - public static XmlIDREF parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlIDREF) XmlBeans.getContextTypeLoader().parse(u, type, null); - } - - /** - * 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); - } - - /** - * 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. - */ - 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. - */ - 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. - */ - 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. - */ - 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. - */ - 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 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); - } - - private Factory() { - // No instance of this class allowed - } - } + SchemaType type = Factory.getType(); } Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlIDREFS.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlIDREFS.java?rev=1886771&r1=1886770&r2=1886771&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlIDREFS.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlIDREFS.java Sun Feb 21 21:34:00 2021 @@ -15,6 +15,8 @@ package org.apache.xmlbeans; +import org.apache.xmlbeans.impl.schema.XmlObjectFactory; + import java.util.List; @@ -30,10 +32,12 @@ import java.util.List; * Convertible to a {@link List}. */ public interface XmlIDREFS extends XmlAnySimpleType { + XmlObjectFactory<XmlIDREFS> Factory = new XmlObjectFactory<>("_BI_IDREFS"); + /** * The constant {@link SchemaType} object representing this schema type. */ - SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_IDREFS"); + SchemaType type = Factory.getType(); /** * Returns the value as a {@link List} of {@link String} values @@ -49,134 +53,5 @@ public interface XmlIDREFS extends XmlAn * Sets the value as a {@link List} */ void setListValue(List<?> l); - - /** - * A class with methods for creating instances - * of {@link XmlIDREFS}. - */ - final class Factory { - /** - * Creates an empty instance of {@link XmlIDREFS} - */ - public static XmlIDREFS newInstance() { - return (XmlIDREFS) XmlBeans.getContextTypeLoader().newInstance(type, null); - } - - /** - * Creates an empty instance of {@link XmlIDREFS} - */ - public static XmlIDREFS newInstance(org.apache.xmlbeans.XmlOptions options) { - return (XmlIDREFS) XmlBeans.getContextTypeLoader().newInstance(type, options); - } - - /** - * Creates an immutable {@link XmlIDREFS} value - */ - public static XmlIDREFS newValue(Object obj) { - return (XmlIDREFS) type.newValue(obj); - } - - /** - * Parses a {@link XmlIDREFS} fragment from a String. - */ - public static XmlIDREFS parse(java.lang.String s) throws org.apache.xmlbeans.XmlException { - return (XmlIDREFS) XmlBeans.getContextTypeLoader().parse(s, type, null); - } - - /** - * Parses a {@link XmlIDREFS} fragment from a String. - */ - public static XmlIDREFS parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlIDREFS) XmlBeans.getContextTypeLoader().parse(s, type, options); - } - - /** - * Parses a {@link XmlIDREFS} fragment from a File. - */ - public static XmlIDREFS parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlIDREFS) XmlBeans.getContextTypeLoader().parse(f, type, null); - } - - /** - * Parses a {@link XmlIDREFS} fragment from a File. - */ - public static XmlIDREFS parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlIDREFS) XmlBeans.getContextTypeLoader().parse(f, type, options); - } - - /** - * Parses a {@link XmlIDREFS} fragment from a URL. - */ - public static XmlIDREFS parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlIDREFS) XmlBeans.getContextTypeLoader().parse(u, type, null); - } - - /** - * Parses a {@link XmlIDREFS} fragment from a URL. - */ - public static XmlIDREFS parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlIDREFS) XmlBeans.getContextTypeLoader().parse(u, type, options); - } - - /** - * Parses a {@link XmlIDREFS} fragment from an InputStream. - */ - public static XmlIDREFS parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlIDREFS) XmlBeans.getContextTypeLoader().parse(is, type, null); - } - - /** - * Parses a {@link XmlIDREFS} fragment from an InputStream. - */ - public static XmlIDREFS parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlIDREFS) XmlBeans.getContextTypeLoader().parse(is, type, options); - } - - /** - * Parses a {@link XmlIDREFS} fragment from a Reader. - */ - public static XmlIDREFS parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlIDREFS) XmlBeans.getContextTypeLoader().parse(r, type, null); - } - - /** - * Parses a {@link XmlIDREFS} fragment from a Reader. - */ - public static XmlIDREFS parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlIDREFS) XmlBeans.getContextTypeLoader().parse(r, type, options); - } - - /** - * Parses a {@link XmlIDREFS} fragment from a DOM Node. - */ - public static XmlIDREFS parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException { - return (XmlIDREFS) XmlBeans.getContextTypeLoader().parse(node, type, null); - } - - /** - * Parses a {@link XmlIDREFS} fragment from a DOM Node. - */ - public static XmlIDREFS parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlIDREFS) XmlBeans.getContextTypeLoader().parse(node, type, options); - } - - /** - * Parses a {@link XmlIDREFS} fragment from an XMLStreamReader. - */ - public static XmlIDREFS parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException { - return (XmlIDREFS) XmlBeans.getContextTypeLoader().parse(xsr, type, null); - } - - /** - * Parses a {@link XmlIDREFS} fragment from an XMLStreamReader. - */ - public static XmlIDREFS parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlIDREFS) XmlBeans.getContextTypeLoader().parse(xsr, type, options); - } - - private Factory() { - // No instance of this class allowed - } - } } Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlInt.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlInt.java?rev=1886771&r1=1886770&r2=1886771&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlInt.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlInt.java Sun Feb 21 21:34:00 2021 @@ -15,6 +15,8 @@ package org.apache.xmlbeans; +import org.apache.xmlbeans.impl.schema.XmlObjectFactory; + /** * Corresponds to the XML Schema * <a target="_blank" href="http://www.w3.org/TR/xmlschema-2/#int";>xs:int</a> type. @@ -23,10 +25,12 @@ package org.apache.xmlbeans; * Naturally, convertible to a Java int. */ public interface XmlInt extends XmlLong { + XmlObjectFactory<XmlInt> Factory = new XmlObjectFactory<>("_BI_int"); + /** * The constant {@link SchemaType} object representing this schema type. */ - SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_int"); + SchemaType type = Factory.getType(); /** * Returns this value as an int @@ -37,134 +41,5 @@ public interface XmlInt extends XmlLong * Sets this value as an int */ void setIntValue(int v); - - /** - * A class with methods for creating instances - * of {@link XmlInt}. - */ - final class Factory { - /** - * Creates an empty instance of {@link XmlInt} - */ - public static XmlInt newInstance() { - return (XmlInt) XmlBeans.getContextTypeLoader().newInstance(type, null); - } - - /** - * Creates an empty instance of {@link XmlInt} - */ - public static XmlInt newInstance(org.apache.xmlbeans.XmlOptions options) { - return (XmlInt) XmlBeans.getContextTypeLoader().newInstance(type, options); - } - - /** - * Creates an immutable {@link XmlInt} value - */ - public static XmlInt newValue(Object obj) { - return (XmlInt) type.newValue(obj); - } - - /** - * Parses a {@link XmlInt} fragment from a String. For example: "<code><xml-fragment>1234567</xml-fragment></code>". - */ - public static XmlInt parse(java.lang.String s) throws org.apache.xmlbeans.XmlException { - return (XmlInt) XmlBeans.getContextTypeLoader().parse(s, type, null); - } - - /** - * Parses a {@link XmlInt} fragment from a String. For example: "<code><xml-fragment>1234567</xml-fragment></code>". - */ - public static XmlInt parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlInt) XmlBeans.getContextTypeLoader().parse(s, type, options); - } - - /** - * Parses a {@link XmlInt} fragment from a File. - */ - public static XmlInt parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlInt) XmlBeans.getContextTypeLoader().parse(f, type, null); - } - - /** - * Parses a {@link XmlInt} fragment from a File. - */ - public static XmlInt parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlInt) XmlBeans.getContextTypeLoader().parse(f, type, options); - } - - /** - * Parses a {@link XmlInt} fragment from a URL. - */ - public static XmlInt parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlInt) XmlBeans.getContextTypeLoader().parse(u, type, null); - } - - /** - * Parses a {@link XmlInt} fragment from a URL. - */ - public static XmlInt parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlInt) XmlBeans.getContextTypeLoader().parse(u, type, options); - } - - /** - * Parses a {@link XmlInt} fragment from an InputStream. - */ - public static XmlInt parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlInt) XmlBeans.getContextTypeLoader().parse(is, type, null); - } - - /** - * Parses a {@link XmlInt} fragment from an InputStream. - */ - public static XmlInt parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlInt) XmlBeans.getContextTypeLoader().parse(is, type, options); - } - - /** - * Parses a {@link XmlInt} fragment from a Reader. - */ - public static XmlInt parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlInt) XmlBeans.getContextTypeLoader().parse(r, type, null); - } - - /** - * Parses a {@link XmlInt} fragment from a Reader. - */ - public static XmlInt parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlInt) XmlBeans.getContextTypeLoader().parse(r, type, options); - } - - /** - * Parses a {@link XmlInt} fragment from a DOM Node. - */ - public static XmlInt parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException { - return (XmlInt) XmlBeans.getContextTypeLoader().parse(node, type, null); - } - - /** - * Parses a {@link XmlInt} fragment from a DOM Node. - */ - public static XmlInt parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlInt) XmlBeans.getContextTypeLoader().parse(node, type, options); - } - - /** - * Parses a {@link XmlInt} fragment from an XMLStreamReader. - */ - public static XmlInt parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException { - return (XmlInt) XmlBeans.getContextTypeLoader().parse(xsr, type, null); - } - - /** - * Parses a {@link XmlInt} fragment from an XMLStreamReader. - */ - public static XmlInt parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlInt) XmlBeans.getContextTypeLoader().parse(xsr, type, options); - } - - private Factory() { - // No instance of this class allowed - } - } } Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlInteger.java URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlInteger.java?rev=1886771&r1=1886770&r2=1886771&view=diff ============================================================================== --- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlInteger.java (original) +++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlInteger.java Sun Feb 21 21:34:00 2021 @@ -15,6 +15,8 @@ package org.apache.xmlbeans; +import org.apache.xmlbeans.impl.schema.XmlObjectFactory; + import java.math.BigInteger; /** @@ -29,10 +31,12 @@ import java.math.BigInteger; * Convertible to a Java {@link BigInteger}. */ public interface XmlInteger extends XmlDecimal { + XmlObjectFactory<XmlInteger> Factory = new XmlObjectFactory<>("_BI_integer"); + /** * The constant {@link SchemaType} object representing this schema type. */ - SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_integer"); + SchemaType type = Factory.getType(); /** * Returns this value as a {@link BigInteger} @@ -43,134 +47,5 @@ public interface XmlInteger extends XmlD * Sets this value as a {@link BigInteger} */ void setBigIntegerValue(BigInteger bi); - - /** - * A class with methods for creating instances - * of {@link XmlInteger}. - */ - final class Factory { - /** - * Creates an empty instance of {@link XmlInteger} - */ - public static XmlInteger newInstance() { - return (XmlInteger) XmlBeans.getContextTypeLoader().newInstance(type, null); - } - - /** - * Creates an empty instance of {@link XmlInteger} - */ - public static XmlInteger newInstance(org.apache.xmlbeans.XmlOptions options) { - return (XmlInteger) XmlBeans.getContextTypeLoader().newInstance(type, options); - } - - /** - * Creates an immutable {@link XmlInteger} value - */ - public static XmlInteger newValue(Object obj) { - return (XmlInteger) type.newValue(obj); - } - - /** - * Parses a {@link XmlInteger} fragment from a String. For example: "<code><xml-fragment>1234567890</xml-fragment></code>". - */ - public static XmlInteger parse(java.lang.String s) throws org.apache.xmlbeans.XmlException { - return (XmlInteger) XmlBeans.getContextTypeLoader().parse(s, type, null); - } - - /** - * Parses a {@link XmlInteger} fragment from a String. For example: "<code><xml-fragment>1234567890</xml-fragment></code>". - */ - public static XmlInteger parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlInteger) XmlBeans.getContextTypeLoader().parse(s, type, options); - } - - /** - * Parses a {@link XmlInteger} fragment from a File. - */ - public static XmlInteger parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlInteger) XmlBeans.getContextTypeLoader().parse(f, type, null); - } - - /** - * Parses a {@link XmlInteger} fragment from a File. - */ - public static XmlInteger parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlInteger) XmlBeans.getContextTypeLoader().parse(f, type, options); - } - - /** - * Parses a {@link XmlInteger} fragment from a URL. - */ - public static XmlInteger parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlInteger) XmlBeans.getContextTypeLoader().parse(u, type, null); - } - - /** - * Parses a {@link XmlInteger} fragment from a URL. - */ - public static XmlInteger parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlInteger) XmlBeans.getContextTypeLoader().parse(u, type, options); - } - - /** - * Parses a {@link XmlInteger} fragment from an InputStream. - */ - public static XmlInteger parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlInteger) XmlBeans.getContextTypeLoader().parse(is, type, null); - } - - /** - * Parses a {@link XmlInteger} fragment from an InputStream. - */ - public static XmlInteger parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlInteger) XmlBeans.getContextTypeLoader().parse(is, type, options); - } - - /** - * Parses a {@link XmlInteger} fragment from a Reader. - */ - public static XmlInteger parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlInteger) XmlBeans.getContextTypeLoader().parse(r, type, null); - } - - /** - * Parses a {@link XmlInteger} fragment from a Reader. - */ - public static XmlInteger parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException { - return (XmlInteger) XmlBeans.getContextTypeLoader().parse(r, type, options); - } - - /** - * Parses a {@link XmlInteger} fragment from a DOM Node. - */ - public static XmlInteger parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException { - return (XmlInteger) XmlBeans.getContextTypeLoader().parse(node, type, null); - } - - /** - * Parses a {@link XmlInteger} fragment from a DOM Node. - */ - public static XmlInteger parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlInteger) XmlBeans.getContextTypeLoader().parse(node, type, options); - } - - /** - * Parses a {@link XmlInteger} fragment from an XMLStreamReader. - */ - public static XmlInteger parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException { - return (XmlInteger) XmlBeans.getContextTypeLoader().parse(xsr, type, null); - } - - /** - * Parses a {@link XmlInteger} fragment from an XMLStreamReader. - */ - public static XmlInteger parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException { - return (XmlInteger) XmlBeans.getContextTypeLoader().parse(xsr, type, options); - } - - private Factory() { - // No instance of this class allowed - } - } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org For additional commands, e-mail: commits-h...@poi.apache.org
