You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2021/02/21 21:34:01 UTC
svn commit: r1886771 [1/8] - in /xmlbeans/trunk: ./
src/main/java/org/apache/xmlbeans/
src/main/java/org/apache/xmlbeans/impl/schema/
src/main/java/org/apache/xmlbeans/impl/tool/
src/main/java/org/apache/xmlbeans/impl/values/ src/main/multimodule/java9...
Author: kiwiwings
Date: Sun Feb 21 21:34:00 2021
New Revision: 1886771
URL: http://svn.apache.org/viewvc?rev=1886771&view=rev
Log:
XMLBEANS-555 - Partial method support + Refactor Factory inner classes to instance reference in generated beans
Added:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/AbstractDocumentFactory.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/DocumentFactory.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/ElementFactory.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SimpleTypeFactory.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/XmlObjectFactory.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/Parameters.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaListObject.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaListXmlObject.java
xmlbeans/trunk/src/test/resources/xbean/compile/scomp/partials/
xmlbeans/trunk/src/test/resources/xbean/compile/scomp/partials/RootDocument.java
xmlbeans/trunk/src/test/resources/xbean/compile/scomp/partials/impl/
xmlbeans/trunk/src/test/resources/xbean/compile/scomp/partials/impl/RootDocumentImpl.java
xmlbeans/trunk/src/test/resources/xbean/compile/scomp/partials/partialMethods.xsd
- copied, changed from r1886399, xmlbeans/trunk/src/test/resources/xbean/simple/dumb/dumb.xsd
Modified:
xmlbeans/trunk/build.xml
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaCodePrinter.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlAnySimpleType.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlAnyURI.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBeans.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBoolean.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlByte.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlCalendar.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDate.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDateTime.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDecimal.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDouble.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDuration.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlENTITIES.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlENTITY.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlFloat.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGDay.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGMonth.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGMonthDay.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGYear.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGYearMonth.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlHexBinary.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlID.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlIDREF.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlIDREFS.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlInt.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlInteger.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlLanguage.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlLong.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNCName.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNMTOKEN.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNMTOKENS.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNOTATION.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlName.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNegativeInteger.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNonNegativeInteger.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNonPositiveInteger.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNormalizedString.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlObject.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlOptions.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlPositiveInteger.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlQName.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlShort.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlString.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlTime.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlToken.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedByte.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedInt.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedLong.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedShort.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeCodePrinter.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeSystemCompiler.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/SchemaCompiler.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/XMLBean.java
xmlbeans/trunk/src/main/multimodule/java9/module-info.class
xmlbeans/trunk/src/test/java/compile/scomp/checkin/CompilationTests.java
xmlbeans/trunk/src/test/java/compile/scomp/common/CompileTestBase.java
xmlbeans/trunk/src/test/java/compile/scomp/detailed/SchemaCompilerTests.java
xmlbeans/trunk/src/test/java/misc/detailed/JiraRegression151_200Test.java
xmlbeans/trunk/src/test/java/misc/detailed/JiraRegression1_50Test.java
xmlbeans/trunk/src/test/java/misc/detailed/JiraRegression50_100Test.java
xmlbeans/trunk/src/test/java/misc/detailed/JiraRegressionSchemaCompilerTest.java
xmlbeans/trunk/src/test/java/misc/detailed/JiraRegressionTest101_150.java
Modified: xmlbeans/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/build.xml?rev=1886771&r1=1886770&r2=1886771&view=diff
==============================================================================
--- xmlbeans/trunk/build.xml (original)
+++ xmlbeans/trunk/build.xml Sun Feb 21 21:34:00 2021
@@ -332,6 +332,9 @@
<replaceregexp match="^.*@deprecated.*\r?\n.*\r?\n" replace="" flags="gm">
<fileset dir="build/bootstrap/generated-sources" includes="**/*.java"/>
</replaceregexp>
+ <replaceregexp match='^(\s+).*type =[^\n]*\r?\n.*\((.*)\.class[^"]+"([^"]+)"[^"]+("[^"]+").*$' replace="\1org.apache.xmlbeans.impl.schema.XmlObjectFactory<\2> Factory = new org.apache.xmlbeans.impl.schema.XmlObjectFactory<>(\3.TypeSystemHolder.typeSystem, \4); \1org.apache.xmlbeans.SchemaType type = Factory.getType();" flags="gm">
+ <fileset dir="build/bootstrap/generated-sources" includes="**/*.java" excludes="**/impl/xb/*/impl/**"/>
+ </replaceregexp>
<replace dir="build/bootstrap/generated-sources" token=" enumValue()" value=" getEnumValue()" includes="**/*.java"/>
<replace dir="build/bootstrap/generated-sources" token=" set(org.apache.xmlbeans.StringEnumAbstractBase" value=" setEnumValue(org.apache.xmlbeans.StringEnumAbstractBase" includes="**/*.java"/>
<replace dir="build/bootstrap/generated-sources" token="java.util.List list" value="java.util.List<?> list" includes="**/*.java"/>
@@ -382,8 +385,8 @@
<schemaCompProd classpathref="oldschemas" dest="build"/>
- <!-- delete old schema classes -->
- <delete dir="build/classes/org/apache/xmlbeans/impl/xb"/>
+ <!-- delete old schema classes and classes referencing on them -->
+ <delete dir="build/classes/org/apache/xmlbeans" excludes="metadata/**"/>
</target>
<target name="compile" depends="process-resources" description="Compile sources and resources">
@@ -400,6 +403,8 @@
<src refid="sources"/>
<classpath path="${saxon.jar}"/>
<classpath path="${slf4j-api.jar}"/>
+ <classpath path="${javaparser.core.jar}"/>
+ <classpath path="${ant.jar}"/>
</javac>
<javac release="9"
@@ -763,6 +768,7 @@
<exclude name="test/resources/xbean/dom/W3C/level2/core/files/**"/>
<exclude name="test/resources/xbean/xmlobject/soap-envelope.xsd"/>
<exclude name="test/resources/xbean/xmlobject/soap12-encoding.xsd"/>
+ <exclude name="test/resources/xbean/compile/scomp/partials/**"/>
</fileset>
</rat:report>
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaCodePrinter.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaCodePrinter.java?rev=1886771&r1=1886770&r2=1886771&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaCodePrinter.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaCodePrinter.java Sun Feb 21 21:34:00 2021
@@ -24,8 +24,23 @@ import java.io.Writer;
*/
public interface SchemaCodePrinter {
- void printTypeImpl(Writer writer, SchemaType sType) throws IOException;
+ // implement a method of each pair ... otherwise a stackoverflow is inevitable ...
+ @Deprecated
+ default void printTypeImpl(Writer writer, SchemaType sType) throws IOException {
+ printTypeImpl(writer, sType, null);
+ }
- void printType(Writer writer, SchemaType sType) throws IOException;
+ default void printTypeImpl(Writer writer, SchemaType sType, XmlOptions opt) throws IOException {
+ printTypeImpl(writer, sType);
+ }
+
+ @Deprecated
+ default void printType(Writer writer, SchemaType sType) throws IOException {
+ printType(writer, sType, null);
+ }
+
+ default void printType(Writer writer, SchemaType sType, XmlOptions opt) throws IOException {
+ printType(writer, sType);
+ }
}
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlAnySimpleType.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlAnySimpleType.java?rev=1886771&r1=1886770&r2=1886771&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlAnySimpleType.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlAnySimpleType.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-1/#Simple_Type_Definition">xs:anySimpleType</a> type.
@@ -22,10 +24,11 @@ package org.apache.xmlbeans;
* All simple types are convertible to {@link String}.
*/
public interface XmlAnySimpleType extends XmlObject {
+ XmlObjectFactory<XmlAnySimpleType> Factory = new XmlObjectFactory<>("_BI_anySimpleType");
/**
* The constant {@link SchemaType} object representing this schema type.
*/
- SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_anySimpleType");
+ SchemaType type = Factory.getType();
/**
* Returns the value as a {@link String}
@@ -36,134 +39,5 @@ public interface XmlAnySimpleType extend
* Sets the value as a {@link String}
**/
void setStringValue(String s);
-
- /**
- * A class with methods for creating instances
- * of {@link XmlAnySimpleType}.
- */
- final class Factory {
- /**
- * Creates an empty instance of {@link XmlAnySimpleType}
- */
- public static XmlAnySimpleType newInstance() {
- return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().newInstance(type, null);
- }
-
- /**
- * Creates an empty instance of {@link XmlAnySimpleType}
- */
- public static XmlAnySimpleType newInstance(org.apache.xmlbeans.XmlOptions options) {
- return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().newInstance(type, options);
- }
-
- /**
- * Creates an immutable {@link XmlAnySimpleType} value
- */
- public static XmlAnySimpleType newValue(Object obj) {
- return type.newValue(obj);
- }
-
- /**
- * Parses a {@link XmlAnySimpleType} fragment from a String. For example: "<code><xml-fragment>anything</xml-fragment></code>".
- */
- public static XmlAnySimpleType parse(java.lang.String s) throws org.apache.xmlbeans.XmlException {
- return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(s, type, null);
- }
-
- /**
- * Parses a {@link XmlAnySimpleType} fragment from a String. For example: "<code><xml-fragment>anything</xml-fragment></code>".
- */
- public static XmlAnySimpleType parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(s, type, options);
- }
-
- /**
- * Parses a {@link XmlAnySimpleType} fragment from a File.
- */
- public static XmlAnySimpleType parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(f, type, null);
- }
-
- /**
- * Parses a {@link XmlAnySimpleType} fragment from a File.
- */
- public static XmlAnySimpleType parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(f, type, options);
- }
-
- /**
- * Parses a {@link XmlAnySimpleType} fragment from a URL.
- */
- public static XmlAnySimpleType parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(u, type, null);
- }
-
- /**
- * Parses a {@link XmlAnySimpleType} fragment from a URL.
- */
- public static XmlAnySimpleType parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(u, type, options);
- }
-
- /**
- * Parses a {@link XmlAnySimpleType} fragment from an InputStream.
- */
- public static XmlAnySimpleType parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(is, type, null);
- }
-
- /**
- * Parses a {@link XmlAnySimpleType} fragment from an InputStream.
- */
- public static XmlAnySimpleType parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(is, type, options);
- }
-
- /**
- * Parses a {@link XmlAnySimpleType} fragment from a Reader.
- */
- public static XmlAnySimpleType parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(r, type, null);
- }
-
- /**
- * Parses a {@link XmlAnySimpleType} fragment from a Reader.
- */
- public static XmlAnySimpleType parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(r, type, options);
- }
-
- /**
- * Parses a {@link XmlAnySimpleType} fragment from a DOM Node.
- */
- public static XmlAnySimpleType parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException {
- return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(node, type, null);
- }
-
- /**
- * Parses a {@link XmlAnySimpleType} fragment from a DOM Node.
- */
- public static XmlAnySimpleType parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(node, type, options);
- }
-
- /**
- * Parses a {@link XmlAnySimpleType} fragment from an XMLStreamReader.
- */
- public static XmlAnySimpleType parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException {
- return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(xsr, type, null);
- }
-
- /**
- * Parses a {@link XmlAnySimpleType} fragment from an XMLStreamReader.
- */
- public static XmlAnySimpleType parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlAnySimpleType) XmlBeans.getContextTypeLoader().parse(xsr, type, options);
- }
-
- private Factory() {
- // No instance of this class allowed
- }
- }
}
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlAnyURI.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlAnyURI.java?rev=1886771&r1=1886770&r2=1886771&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlAnyURI.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlAnyURI.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/#anyURI">xs:anyURI</a> type.
@@ -22,138 +24,11 @@ package org.apache.xmlbeans;
* Convertible to {@link String}.
*/
public interface XmlAnyURI extends XmlAnySimpleType {
- /**
- * The constant {@link SchemaType} object representing this schema type.
- */
- SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_anyURI");
+ XmlObjectFactory<XmlAnyURI> Factory = new XmlObjectFactory<>("_BI_anyURI");
/**
- * A class with methods for creating instances
- * of {@link XmlAnyURI}.
+ * The constant {@link SchemaType} object representing this schema type.
*/
- final class Factory {
- /**
- * Creates an empty instance of {@link XmlAnyURI}
- */
- public static XmlAnyURI newInstance() {
- return (XmlAnyURI) XmlBeans.getContextTypeLoader().newInstance(type, null);
- }
-
- /**
- * Creates an empty instance of {@link XmlAnyURI}
- */
- public static XmlAnyURI newInstance(org.apache.xmlbeans.XmlOptions options) {
- return (XmlAnyURI) XmlBeans.getContextTypeLoader().newInstance(type, options);
- }
-
- /**
- * Creates an immutable {@link XmlAnyURI} value
- */
- public static XmlAnyURI newValue(Object obj) {
- return (XmlAnyURI) type.newValue(obj);
- }
-
- /**
- * Parses a {@link XmlAnyURI} fragment from a String. For example: "<code><xml-fragment>http://www.w3.org/</xml-fragment></code>".
- */
- public static XmlAnyURI parse(java.lang.String s) throws org.apache.xmlbeans.XmlException {
- return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(s, type, null);
- }
-
- /**
- * Parses a {@link XmlAnyURI} fragment from a String. For example: "<code><xml-fragment>http://www.w3.org/</xml-fragment></code>".
- */
- public static XmlAnyURI parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(s, type, options);
- }
-
- /**
- * Parses a {@link XmlAnyURI} fragment from a File.
- */
- public static XmlAnyURI parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(f, type, null);
- }
-
- /**
- * Parses a {@link XmlAnyURI} fragment from a File.
- */
- public static XmlAnyURI parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(f, type, options);
- }
-
- /**
- * Parses a {@link XmlAnyURI} fragment from a URL.
- */
- public static XmlAnyURI parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(u, type, null);
- }
-
- /**
- * Parses a {@link XmlAnyURI} fragment from a URL.
- */
- public static XmlAnyURI parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(u, type, options);
- }
-
- /**
- * Parses a {@link XmlAnyURI} fragment from an InputStream.
- */
- public static XmlAnyURI parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(is, type, null);
- }
-
- /**
- * Parses a {@link XmlAnyURI} fragment from an InputStream.
- */
- public static XmlAnyURI parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(is, type, options);
- }
-
- /**
- * Parses a {@link XmlAnyURI} fragment from a Reader.
- */
- public static XmlAnyURI parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(r, type, null);
- }
-
- /**
- * Parses a {@link XmlAnyURI} fragment from a Reader.
- */
- public static XmlAnyURI parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(r, type, options);
- }
-
- /**
- * Parses a {@link XmlAnyURI} fragment from a DOM Node.
- */
- public static XmlAnyURI parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException {
- return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(node, type, null);
- }
-
- /**
- * Parses a {@link XmlAnyURI} fragment from a DOM Node.
- */
- public static XmlAnyURI parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(node, type, options);
- }
-
- /**
- * Parses a {@link XmlAnyURI} fragment from an XMLStreamReader.
- */
- public static XmlAnyURI parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException {
- return (XmlAnyURI) XmlBeans.getContextTypeLoader().parse(xsr, type, null);
- }
-
- /**
- * Parses a {@link XmlAnyURI} fragment from an XMLStreamReader.
- */
- public static XmlAnyURI parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlAnyURI) 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/XmlBeans.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBeans.java?rev=1886771&r1=1886770&r2=1886771&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBeans.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBeans.java Sun Feb 21 21:34:00 2021
@@ -232,7 +232,7 @@ public final class XmlBeans {
* linking, and returns a unioned typeloader that is suitable for
* creating instances.
*/
- public static SchemaTypeLoader loadXsd(XmlObject[] schemas) throws XmlException {
+ public static SchemaTypeLoader loadXsd(XmlObject... schemas) throws XmlException {
return loadXsd(schemas, null);
}
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBoolean.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBoolean.java?rev=1886771&r1=1886770&r2=1886771&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBoolean.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBoolean.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/#boolean">xs:boolean</a> type.
@@ -22,6 +24,8 @@ package org.apache.xmlbeans;
* Naturally, convertible to Java boolean.
*/
public interface XmlBoolean extends XmlAnySimpleType {
+ XmlObjectFactory<XmlBoolean> Factory = new XmlObjectFactory<>("_BI_boolean");
+
/**
* The constant {@link SchemaType} object representing this schema type.
*/
@@ -36,134 +40,5 @@ public interface XmlBoolean extends XmlA
* Sets this value as a boolean
*/
void setBooleanValue(boolean v);
-
- /**
- * A class with methods for creating instances
- * of {@link XmlBoolean}.
- */
- final class Factory {
- /**
- * Creates an empty instance of {@link XmlBoolean}
- */
- public static XmlBoolean newInstance() {
- return (XmlBoolean) XmlBeans.getContextTypeLoader().newInstance(type, null);
- }
-
- /**
- * Creates an empty instance of {@link XmlBoolean}
- */
- public static XmlBoolean newInstance(org.apache.xmlbeans.XmlOptions options) {
- return (XmlBoolean) XmlBeans.getContextTypeLoader().newInstance(type, options);
- }
-
- /**
- * Creates an immutable {@link XmlBoolean} value
- */
- public static XmlBoolean newValue(Object obj) {
- return (XmlBoolean) type.newValue(obj);
- }
-
- /**
- * Parses a {@link XmlBoolean} fragment from a String. For example: "<code><xml-fragment>true</xml-fragment></code>".
- */
- public static XmlBoolean parse(java.lang.String s) throws org.apache.xmlbeans.XmlException {
- return (XmlBoolean) XmlBeans.getContextTypeLoader().parse(s, type, null);
- }
-
- /**
- * Parses a {@link XmlBoolean} fragment from a String. For example: "<code><xml-fragment>true</xml-fragment></code>".
- */
- public static XmlBoolean parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlBoolean) XmlBeans.getContextTypeLoader().parse(s, type, options);
- }
-
- /**
- * Parses a {@link XmlBoolean} fragment from a File.
- */
- public static XmlBoolean parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlBoolean) XmlBeans.getContextTypeLoader().parse(f, type, null);
- }
-
- /**
- * Parses a {@link XmlBoolean} fragment from a File.
- */
- public static XmlBoolean parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlBoolean) XmlBeans.getContextTypeLoader().parse(f, type, options);
- }
-
- /**
- * Parses a {@link XmlBoolean} fragment from a URL.
- */
- public static XmlBoolean parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlBoolean) XmlBeans.getContextTypeLoader().parse(u, type, null);
- }
-
- /**
- * Parses a {@link XmlBoolean} fragment from a URL.
- */
- public static XmlBoolean parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlBoolean) XmlBeans.getContextTypeLoader().parse(u, type, options);
- }
-
- /**
- * Parses a {@link XmlBoolean} fragment from an InputStream.
- */
- public static XmlBoolean parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlBoolean) XmlBeans.getContextTypeLoader().parse(is, type, null);
- }
-
- /**
- * Parses a {@link XmlBoolean} fragment from an InputStream.
- */
- public static XmlBoolean parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlBoolean) XmlBeans.getContextTypeLoader().parse(is, type, options);
- }
-
- /**
- * Parses a {@link XmlBoolean} fragment from a Reader.
- */
- public static XmlBoolean parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlBoolean) XmlBeans.getContextTypeLoader().parse(r, type, null);
- }
-
- /**
- * Parses a {@link XmlBoolean} fragment from a Reader.
- */
- public static XmlBoolean parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlBoolean) XmlBeans.getContextTypeLoader().parse(r, type, options);
- }
-
- /**
- * Parses a {@link XmlBoolean} fragment from a DOM Node.
- */
- public static XmlBoolean parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException {
- return (XmlBoolean) XmlBeans.getContextTypeLoader().parse(node, type, null);
- }
-
- /**
- * Parses a {@link XmlBoolean} fragment from a DOM Node.
- */
- public static XmlBoolean parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlBoolean) XmlBeans.getContextTypeLoader().parse(node, type, options);
- }
-
- /**
- * Parses a {@link XmlBoolean} fragment from an XMLStreamReader.
- */
- public static XmlBoolean parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException {
- return (XmlBoolean) XmlBeans.getContextTypeLoader().parse(xsr, type, null);
- }
-
- /**
- * Parses a {@link XmlBoolean} fragment from an XMLStreamReader.
- */
- public static XmlBoolean parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlBoolean) XmlBeans.getContextTypeLoader().parse(xsr, type, options);
- }
-
- private Factory() {
- // No instance of this class allowed
- }
- }
}
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlByte.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlByte.java?rev=1886771&r1=1886770&r2=1886771&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlByte.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlByte.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/#byte">xs:byte</a> type.
@@ -22,10 +24,12 @@ package org.apache.xmlbeans;
* Naturally, convertible to Java byte.
*/
public interface XmlByte extends XmlShort {
+ XmlObjectFactory<XmlByte> Factory = new XmlObjectFactory<>("_BI_byte");
+
/**
* The constant {@link SchemaType} object representing this schema type.
*/
- SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_byte");
+ SchemaType type = Factory.getType();
/**
* Returns this value as a byte
@@ -36,134 +40,5 @@ public interface XmlByte extends XmlShor
* Sets this value as a byte
*/
void setByteValue(byte s);
-
- /**
- * A class with methods for creating instances
- * of {@link XmlByte}.
- */
- final class Factory {
- /**
- * Creates an empty instance of {@link XmlByte}
- */
- static XmlByte newInstance() {
- return (XmlByte) XmlBeans.getContextTypeLoader().newInstance(type, null);
- }
-
- /**
- * Creates an empty instance of {@link XmlByte}
- */
- static XmlByte newInstance(org.apache.xmlbeans.XmlOptions options) {
- return (XmlByte) XmlBeans.getContextTypeLoader().newInstance(type, options);
- }
-
- /**
- * Creates an immutable {@link XmlByte} value
- */
- static XmlByte newValue(Object obj) {
- return (XmlByte) type.newValue(obj);
- }
-
- /**
- * Parses a {@link XmlByte} fragment from a String. For example: "<code><xml-fragment>123</xml-fragment></code>".
- */
- static XmlByte parse(java.lang.String s) throws org.apache.xmlbeans.XmlException {
- return (XmlByte) XmlBeans.getContextTypeLoader().parse(s, type, null);
- }
-
- /**
- * Parses a {@link XmlByte} fragment from a String. For example: "<code><xml-fragment>123</xml-fragment></code>".
- */
- static XmlByte parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlByte) XmlBeans.getContextTypeLoader().parse(s, type, options);
- }
-
- /**
- * Parses a {@link XmlByte} fragment from a File.
- */
- static XmlByte parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlByte) XmlBeans.getContextTypeLoader().parse(f, type, null);
- }
-
- /**
- * Parses a {@link XmlByte} fragment from a File.
- */
- static XmlByte parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlByte) XmlBeans.getContextTypeLoader().parse(f, type, options);
- }
-
- /**
- * Parses a {@link XmlByte} fragment from a URL.
- */
- static XmlByte parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlByte) XmlBeans.getContextTypeLoader().parse(u, type, null);
- }
-
- /**
- * Parses a {@link XmlByte} fragment from a URL.
- */
- static XmlByte parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlByte) XmlBeans.getContextTypeLoader().parse(u, type, options);
- }
-
- /**
- * Parses a {@link XmlByte} fragment from an InputStream.
- */
- static XmlByte parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlByte) XmlBeans.getContextTypeLoader().parse(is, type, null);
- }
-
- /**
- * Parses a {@link XmlByte} fragment from an InputStream.
- */
- static XmlByte parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlByte) XmlBeans.getContextTypeLoader().parse(is, type, options);
- }
-
- /**
- * Parses a {@link XmlByte} fragment from a Reader.
- */
- static XmlByte parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlByte) XmlBeans.getContextTypeLoader().parse(r, type, null);
- }
-
- /**
- * Parses a {@link XmlByte} fragment from a Reader.
- */
- static XmlByte parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlByte) XmlBeans.getContextTypeLoader().parse(r, type, options);
- }
-
- /**
- * Parses a {@link XmlByte} fragment from a DOM Node.
- */
- static XmlByte parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException {
- return (XmlByte) XmlBeans.getContextTypeLoader().parse(node, type, null);
- }
-
- /**
- * Parses a {@link XmlByte} fragment from a DOM Node.
- */
- static XmlByte parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlByte) XmlBeans.getContextTypeLoader().parse(node, type, options);
- }
-
- /**
- * Parses a {@link XmlByte} fragment from an XMLStreamReader.
- */
- static XmlByte parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException {
- return (XmlByte) XmlBeans.getContextTypeLoader().parse(xsr, type, null);
- }
-
- /**
- * Parses a {@link XmlByte} fragment from an XMLStreamReader.
- */
- static XmlByte parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlByte) XmlBeans.getContextTypeLoader().parse(xsr, type, options);
- }
-
- private Factory() {
- // No instance of this class allowed
- }
- }
}
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlCalendar.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlCalendar.java?rev=1886771&r1=1886770&r2=1886771&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlCalendar.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlCalendar.java Sun Feb 21 21:34:00 2021
@@ -15,11 +15,11 @@
package org.apache.xmlbeans;
-import java.util.GregorianCalendar;
+import java.math.BigDecimal;
import java.util.Calendar;
import java.util.Date;
+import java.util.GregorianCalendar;
import java.util.TimeZone;
-import java.math.BigDecimal;
/**
* An XML Schema compatible subclass of {@link java.util.GregorianCalendar GregorianCalendar}.
@@ -56,8 +56,8 @@ import java.math.BigDecimal;
* from {@link GregorianCalendar}, which chooses 1970. The reason 0 is preferable
* is that it is a leap year and so it permits the date --2-29 to be specified
* stably. A different default year can be chosen via the static method
- * {@link #setDefaultYear(int) XmlCalendar.setDefaultYear()}, or by setting the
- * system property "user.defaultyear". If you do change this value, you should
+ * {@link #setDefaultYear(int) XmlCalendar.setDefaultYear()}, or by setting the
+ * system property "user.defaultyear". If you do change this value, you should
* pick another leap year such as 2000 and avoid non-leap years such as 1900.
* </li>
* <li>
@@ -78,32 +78,32 @@ import java.math.BigDecimal;
* of information.
* </li>
* </ol>
- */
+ */
public class XmlCalendar extends GregorianCalendar
{
/**
* Constructs an XmlCalendar for a standard XML
* schema formatted date string.
- *
+ *
* The parser accepts any of the following formats:
- *
+ *
* YYYY-MM-DDThh:mm:ss - dateTime
* YYYY-MM-DD - date
* hh:mm:ss - time
* YYYY - gYear
* --MM - gMonth
* ---DD - gDay
- *
+ *
* The parser actually accepts all 16 combinations of subsets of
* fields (Y, M, D, T) using the same scheme, even for combinations
* that are not defined as types in the schema spec, such as
* year, day, and time:
- *
+ *
* YYYY--DDThh:mm:ss - [everything but month specified]
- *
+ *
* In the string, each field must be padded to its full width, for
* example, January must be --01, not just --1.
- *
+ *
* In particular, a year must be padded to at least four digits, so
* "98" is not a valid year, although "1998" and "0098" are both valid
* years, unambiguously 19 centuries separated from each other. A year
@@ -115,34 +115,34 @@ public class XmlCalendar extends Gregori
* or simple offsets from UTC in the range "-14:00" to "+14:00",
* for example: "14:30:00-05:00" specifies 2:30 PM in the
* afternoon at UTC-05:00, which is the same as EST.
- *
+ *
* If a timezone is not specified, the default TimeZone is used.
- */
+ */
public XmlCalendar(String xmlSchemaDateString)
{
this(new GDate(xmlSchemaDateString)); // use GDate to parse
}
-
+
/**
* Constructs an XmlCalendar from a GDate.
- *
+ *
* If the instance is not completed, you can round-trip to an
* equivalent GDate by writing "new GDate(new XmlCalendar(gdate))".
* However, if you access any of the unset fields of the calendar, all
* the fields will be automatically filled in, so partial dates
* without timezones or other fields will not round-trip after access.
- */
+ */
public XmlCalendar(GDateSpecification date)
{
this(GDate.timeZoneForGDate(date), date);
}
-
+
private XmlCalendar(TimeZone tz, GDateSpecification date)
{
super(tz);
setGregorianChange(_beginningOfTime); // proleptic
clear();
-
+
if (date.hasYear())
{
int y = date.getYear(); // is never 0
@@ -176,10 +176,10 @@ public class XmlCalendar extends Gregori
set(Calendar.DST_OFFSET, 0); // note!! if we don't do this, then GregorianCalendar will pick up DST from the time zone
}
}
-
+
/**
* Constructs an XmlCalendar from a Date.
- *
+ *
* The default TimeZone is used for computing the various fields.
*/
public XmlCalendar(Date date)
@@ -187,7 +187,7 @@ public class XmlCalendar extends Gregori
this(TimeZone.getDefault(), new GDate(date));
complete();
}
-
+
/**
* Constructs an XmlCalendar with the specified year, month, day,
* hours, minutes, seconds, and optional fractional seconds, in
@@ -204,7 +204,7 @@ public class XmlCalendar extends Gregori
{
this(TimeZone.getDefault(), new GDate(year, month, day, hour, minute, second, fraction));
}
-
+
/**
* Constructs an XmlCalendar with the specified year, month, day,
* hours, minutes, seconds, and optional fractional seconds, in
@@ -224,11 +224,11 @@ public class XmlCalendar extends Gregori
{
this(new GDate(year, month, day, hour, minute, second, fraction, tzSign, tzHour, tzMinute));
}
-
+
/**
* Gets the value for a given time field.
- *
+ *
* Unlike the GregorianCalendar implementation, the get() does not
* force a complete of all fields. If you wish to force a completion
* of all the fields, call getTime() first.
@@ -243,19 +243,19 @@ public class XmlCalendar extends Gregori
/**
* Constructs an empty instance with no fields set.
- */
+ */
public XmlCalendar()
{
setGregorianChange(_beginningOfTime); // proleptic
clear();
}
-
+
private static int defaultYear = Integer.MIN_VALUE;
- private static final int DEFAULT_DEFAULT_YEAR = 0;
-
+ private static final int DEFAULT_DEFAULT_YEAR = 0;
+
/**
* Returns the default year that is used when no year is specified.
- */
+ */
public static int getDefaultYear()
{
if (defaultYear == Integer.MIN_VALUE)
@@ -275,19 +275,19 @@ public class XmlCalendar extends Gregori
}
return defaultYear;
}
-
+
/**
* Sets the default year to be used when no year is specified.
- */
+ */
public static void setDefaultYear(int year)
{
defaultYear = year;
}
-
+
/**
* Overrides GregorianCalendar.computeTime to apply a different
* default year. (It must be a leap year.)
- */
+ */
protected void computeTime()
{
boolean unsetYear = !isSet(YEAR);
@@ -303,9 +303,9 @@ public class XmlCalendar extends Gregori
clear(YEAR);
}
}
-
- private static Date _beginningOfTime = new Date(Long.MIN_VALUE);
-
+
+ private static final Date _beginningOfTime = new Date(Long.MIN_VALUE);
+
/**
* Prints the XmlCalendar using a standard XML Schema
* format, as described in XmlCalendar(String s).
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDate.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDate.java?rev=1886771&r1=1886770&r2=1886771&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDate.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDate.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;
import java.util.Date;
@@ -29,10 +31,12 @@ import java.util.Date;
* @see GDate
*/
public interface XmlDate extends XmlAnySimpleType {
+ XmlObjectFactory<XmlDate> Factory = new XmlObjectFactory<>("_BI_date");
+
/**
* The constant {@link SchemaType} object representing this schema type.
*/
- SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_date");
+ SchemaType type = Factory.getType();
/**
* Returns this value as a {@link Calendar}
@@ -63,134 +67,5 @@ public interface XmlDate extends XmlAnyS
* Sets this value as a {@link Date}
*/
void setDateValue(Date d);
-
- /**
- * A class with methods for creating instances
- * of {@link XmlDate}.
- */
- final class Factory {
- /**
- * Creates an empty instance of {@link XmlDate}
- */
- public static XmlDate newInstance() {
- return (XmlDate) XmlBeans.getContextTypeLoader().newInstance(type, null);
- }
-
- /**
- * Creates an empty instance of {@link XmlDate}
- */
- public static XmlDate newInstance(org.apache.xmlbeans.XmlOptions options) {
- return (XmlDate) XmlBeans.getContextTypeLoader().newInstance(type, options);
- }
-
- /**
- * Creates an immutable {@link XmlDate} value
- */
- public static XmlDate newValue(Object obj) {
- return (XmlDate) type.newValue(obj);
- }
-
- /**
- * Parses a {@link XmlDate} fragment from a String. For example: "<code><xml-fragment>2003-06-14</xml-fragment></code>".
- */
- public static XmlDate parse(java.lang.String s) throws org.apache.xmlbeans.XmlException {
- return (XmlDate) XmlBeans.getContextTypeLoader().parse(s, type, null);
- }
-
- /**
- * Parses a {@link XmlDate} fragment from a String. For example: "<code><xml-fragment>2003-06-14</xml-fragment></code>".
- */
- public static XmlDate parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlDate) XmlBeans.getContextTypeLoader().parse(s, type, options);
- }
-
- /**
- * Parses a {@link XmlDate} fragment from a File.
- */
- public static XmlDate parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDate) XmlBeans.getContextTypeLoader().parse(f, type, null);
- }
-
- /**
- * Parses a {@link XmlDate} fragment from a File.
- */
- public static XmlDate parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDate) XmlBeans.getContextTypeLoader().parse(f, type, options);
- }
-
- /**
- * Parses a {@link XmlDate} fragment from a URL.
- */
- public static XmlDate parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDate) XmlBeans.getContextTypeLoader().parse(u, type, null);
- }
-
- /**
- * Parses a {@link XmlDate} fragment from a URL.
- */
- public static XmlDate parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDate) XmlBeans.getContextTypeLoader().parse(u, type, options);
- }
-
- /**
- * Parses a {@link XmlDate} fragment from an InputStream.
- */
- public static XmlDate parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDate) XmlBeans.getContextTypeLoader().parse(is, type, null);
- }
-
- /**
- * Parses a {@link XmlDate} fragment from an InputStream.
- */
- public static XmlDate parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDate) XmlBeans.getContextTypeLoader().parse(is, type, options);
- }
-
- /**
- * Parses a {@link XmlDate} fragment from a Reader.
- */
- public static XmlDate parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDate) XmlBeans.getContextTypeLoader().parse(r, type, null);
- }
-
- /**
- * Parses a {@link XmlDate} fragment from a Reader.
- */
- public static XmlDate parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDate) XmlBeans.getContextTypeLoader().parse(r, type, options);
- }
-
- /**
- * Parses a {@link XmlDate} fragment from a DOM Node.
- */
- public static XmlDate parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException {
- return (XmlDate) XmlBeans.getContextTypeLoader().parse(node, type, null);
- }
-
- /**
- * Parses a {@link XmlDate} fragment from a DOM Node.
- */
- public static XmlDate parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlDate) XmlBeans.getContextTypeLoader().parse(node, type, options);
- }
-
- /**
- * Parses a {@link XmlDate} fragment from an XMLStreamReader.
- */
- public static XmlDate parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException {
- return (XmlDate) XmlBeans.getContextTypeLoader().parse(xsr, type, null);
- }
-
- /**
- * Parses a {@link XmlDate} fragment from an XMLStreamReader.
- */
- public static XmlDate parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlDate) XmlBeans.getContextTypeLoader().parse(xsr, type, options);
- }
-
- private Factory() {
- // No instance of this class allowed
- }
- }
}
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDateTime.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDateTime.java?rev=1886771&r1=1886770&r2=1886771&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDateTime.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDateTime.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;
import java.util.Date;
@@ -34,10 +36,12 @@ import java.util.Date;
* @see GDuration
*/
public interface XmlDateTime extends XmlAnySimpleType {
+ XmlObjectFactory<XmlDateTime> Factory = new XmlObjectFactory<>("_BI_dateTime");
+
/**
* The constant {@link SchemaType} object representing this schema type.
*/
- SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_dateTime");
+ SchemaType type = Factory.getType();
/**
* Returns this value as a {@link Calendar}
@@ -68,134 +72,5 @@ public interface XmlDateTime extends Xml
* Sets this value as a {@link Date}
*/
void setDateValue(Date d);
-
- /**
- * A class with methods for creating instances
- * of {@link XmlDateTime}.
- */
- final class Factory {
- /**
- * Creates an empty instance of {@link XmlDateTime}
- */
- public static XmlDateTime newInstance() {
- return (XmlDateTime) XmlBeans.getContextTypeLoader().newInstance(type, null);
- }
-
- /**
- * Creates an empty instance of {@link XmlDateTime}
- */
- public static XmlDateTime newInstance(org.apache.xmlbeans.XmlOptions options) {
- return (XmlDateTime) XmlBeans.getContextTypeLoader().newInstance(type, options);
- }
-
- /**
- * Creates an immutable {@link XmlDateTime} value
- */
- public static XmlDateTime newValue(Object obj) {
- return (XmlDateTime) type.newValue(obj);
- }
-
- /**
- * Parses a {@link XmlDateTime} fragment from a String. For example: "<code><xml-fragment>2003-06-14T12:00:00</xml-fragment></code>".
- */
- public static XmlDateTime parse(java.lang.String s) throws org.apache.xmlbeans.XmlException {
- return (XmlDateTime) XmlBeans.getContextTypeLoader().parse(s, type, null);
- }
-
- /**
- * Parses a {@link XmlDateTime} fragment from a String. For example: "<code><xml-fragment>2003-06-14T12:00:00</xml-fragment></code>".
- */
- public static XmlDateTime parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlDateTime) XmlBeans.getContextTypeLoader().parse(s, type, options);
- }
-
- /**
- * Parses a {@link XmlDateTime} fragment from a File.
- */
- public static XmlDateTime parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDateTime) XmlBeans.getContextTypeLoader().parse(f, type, null);
- }
-
- /**
- * Parses a {@link XmlDateTime} fragment from a File.
- */
- public static XmlDateTime parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDateTime) XmlBeans.getContextTypeLoader().parse(f, type, options);
- }
-
- /**
- * Parses a {@link XmlDateTime} fragment from a URL.
- */
- public static XmlDateTime parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDateTime) XmlBeans.getContextTypeLoader().parse(u, type, null);
- }
-
- /**
- * Parses a {@link XmlDateTime} fragment from a URL.
- */
- public static XmlDateTime parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDateTime) XmlBeans.getContextTypeLoader().parse(u, type, options);
- }
-
- /**
- * Parses a {@link XmlDateTime} fragment from an InputStream.
- */
- public static XmlDateTime parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDateTime) XmlBeans.getContextTypeLoader().parse(is, type, null);
- }
-
- /**
- * Parses a {@link XmlDateTime} fragment from an InputStream.
- */
- public static XmlDateTime parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDateTime) XmlBeans.getContextTypeLoader().parse(is, type, options);
- }
-
- /**
- * Parses a {@link XmlDateTime} fragment from a Reader.
- */
- public static XmlDateTime parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDateTime) XmlBeans.getContextTypeLoader().parse(r, type, null);
- }
-
- /**
- * Parses a {@link XmlDateTime} fragment from a Reader.
- */
- public static XmlDateTime parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDateTime) XmlBeans.getContextTypeLoader().parse(r, type, options);
- }
-
- /**
- * Parses a {@link XmlDateTime} fragment from a DOM Node.
- */
- public static XmlDateTime parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException {
- return (XmlDateTime) XmlBeans.getContextTypeLoader().parse(node, type, null);
- }
-
- /**
- * Parses a {@link XmlDateTime} fragment from a DOM Node.
- */
- public static XmlDateTime parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlDateTime) XmlBeans.getContextTypeLoader().parse(node, type, options);
- }
-
- /**
- * Parses a {@link XmlDateTime} fragment from an XMLStreamReader.
- */
- public static XmlDateTime parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException {
- return (XmlDateTime) XmlBeans.getContextTypeLoader().parse(xsr, type, null);
- }
-
- /**
- * Parses a {@link XmlDateTime} fragment from an XMLStreamReader.
- */
- public static XmlDateTime parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlDateTime) XmlBeans.getContextTypeLoader().parse(xsr, type, options);
- }
-
- private Factory() {
- // No instance of this class allowed
- }
- }
}
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDecimal.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDecimal.java?rev=1886771&r1=1886770&r2=1886771&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDecimal.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDecimal.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.BigDecimal;
/**
@@ -24,10 +26,12 @@ import java.math.BigDecimal;
* Convertible to {@link BigDecimal}.
*/
public interface XmlDecimal extends XmlAnySimpleType {
+ XmlObjectFactory<XmlDecimal> Factory = new XmlObjectFactory<>("_BI_decimal");
+
/**
* The constant {@link SchemaType} object representing this schema type.
*/
- SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_decimal");
+ SchemaType type = Factory.getType();
/**
* Returns this value as a {@link BigDecimal}
@@ -38,134 +42,5 @@ public interface XmlDecimal extends XmlA
* Sets this value as a {@link BigDecimal}
*/
void setBigDecimalValue(BigDecimal bd);
-
- /**
- * A class with methods for creating instances
- * of {@link XmlDecimal}.
- */
- final class Factory {
- /**
- * Creates an empty instance of {@link XmlDecimal}
- */
- public static XmlDecimal newInstance() {
- return (XmlDecimal) XmlBeans.getContextTypeLoader().newInstance(type, null);
- }
-
- /**
- * Creates an empty instance of {@link XmlDecimal}
- */
- public static XmlDecimal newInstance(org.apache.xmlbeans.XmlOptions options) {
- return (XmlDecimal) XmlBeans.getContextTypeLoader().newInstance(type, options);
- }
-
- /**
- * Creates an immutable {@link XmlDecimal} value
- */
- public static XmlDecimal newValue(Object obj) {
- return (XmlDecimal) type.newValue(obj);
- }
-
- /**
- * Parses a {@link XmlDecimal} fragment from a String. For example: "<code><xml-fragment>1234.56789</xml-fragment></code>".
- */
- public static XmlDecimal parse(java.lang.String s) throws org.apache.xmlbeans.XmlException {
- return (XmlDecimal) XmlBeans.getContextTypeLoader().parse(s, type, null);
- }
-
- /**
- * Parses a {@link XmlDecimal} fragment from a String. For example: "<code><xml-fragment>1234.56789</xml-fragment></code>".
- */
- public static XmlDecimal parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlDecimal) XmlBeans.getContextTypeLoader().parse(s, type, options);
- }
-
- /**
- * Parses a {@link XmlDecimal} fragment from a File.
- */
- public static XmlDecimal parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDecimal) XmlBeans.getContextTypeLoader().parse(f, type, null);
- }
-
- /**
- * Parses a {@link XmlDecimal} fragment from a File.
- */
- public static XmlDecimal parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDecimal) XmlBeans.getContextTypeLoader().parse(f, type, options);
- }
-
- /**
- * Parses a {@link XmlDecimal} fragment from a URL.
- */
- public static XmlDecimal parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDecimal) XmlBeans.getContextTypeLoader().parse(u, type, null);
- }
-
- /**
- * Parses a {@link XmlDecimal} fragment from a URL.
- */
- public static XmlDecimal parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDecimal) XmlBeans.getContextTypeLoader().parse(u, type, options);
- }
-
- /**
- * Parses a {@link XmlDecimal} fragment from an InputStream.
- */
- public static XmlDecimal parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDecimal) XmlBeans.getContextTypeLoader().parse(is, type, null);
- }
-
- /**
- * Parses a {@link XmlDecimal} fragment from an InputStream.
- */
- public static XmlDecimal parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDecimal) XmlBeans.getContextTypeLoader().parse(is, type, options);
- }
-
- /**
- * Parses a {@link XmlDecimal} fragment from a Reader.
- */
- public static XmlDecimal parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDecimal) XmlBeans.getContextTypeLoader().parse(r, type, null);
- }
-
- /**
- * Parses a {@link XmlDecimal} fragment from a Reader.
- */
- public static XmlDecimal parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDecimal) XmlBeans.getContextTypeLoader().parse(r, type, options);
- }
-
- /**
- * Parses a {@link XmlDecimal} fragment from a DOM Node.
- */
- public static XmlDecimal parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException {
- return (XmlDecimal) XmlBeans.getContextTypeLoader().parse(node, type, null);
- }
-
- /**
- * Parses a {@link XmlDecimal} fragment from a DOM Node.
- */
- public static XmlDecimal parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlDecimal) XmlBeans.getContextTypeLoader().parse(node, type, options);
- }
-
- /**
- * Parses a {@link XmlDecimal} fragment from an XMLStreamReader.
- */
- public static XmlDecimal parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException {
- return (XmlDecimal) XmlBeans.getContextTypeLoader().parse(xsr, type, null);
- }
-
- /**
- * Parses a {@link XmlDecimal} fragment from an XMLStreamReader.
- */
- public static XmlDecimal parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlDecimal) XmlBeans.getContextTypeLoader().parse(xsr, type, options);
- }
-
- private Factory() {
- // No instance of this class allowed
- }
- }
}
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDouble.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDouble.java?rev=1886771&r1=1886770&r2=1886771&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDouble.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDouble.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/#double">xs:double</a> type.
@@ -22,10 +24,12 @@ package org.apache.xmlbeans;
* Naturally, convertible to a Java double.
*/
public interface XmlDouble extends XmlAnySimpleType {
+ XmlObjectFactory<XmlDouble> Factory = new XmlObjectFactory<>("_BI_double");
+
/**
* The constant {@link SchemaType} object representing this schema type.
*/
- SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_double");
+ SchemaType type = Factory.getType();
/**
* Returns this value as a double
@@ -36,134 +40,5 @@ public interface XmlDouble extends XmlAn
* Sets this value as a double
*/
void setDoubleValue(double v);
-
- /**
- * A class with methods for creating instances
- * of {@link XmlDouble}.
- */
- final class Factory {
- /**
- * Creates an empty instance of {@link XmlDouble}
- */
- public static XmlDouble newInstance() {
- return (XmlDouble) XmlBeans.getContextTypeLoader().newInstance(type, null);
- }
-
- /**
- * Creates an empty instance of {@link XmlDouble}
- */
- public static XmlDouble newInstance(org.apache.xmlbeans.XmlOptions options) {
- return (XmlDouble) XmlBeans.getContextTypeLoader().newInstance(type, options);
- }
-
- /**
- * Creates an immutable {@link XmlDouble} value
- */
- public static XmlDouble newValue(Object obj) {
- return (XmlDouble) type.newValue(obj);
- }
-
- /**
- * Parses a {@link XmlDouble} fragment from a String. For example: "<code><xml-fragment>123.34e+57</xml-fragment></code>".
- */
- public static XmlDouble parse(java.lang.String s) throws org.apache.xmlbeans.XmlException {
- return (XmlDouble) XmlBeans.getContextTypeLoader().parse(s, type, null);
- }
-
- /**
- * Parses a {@link XmlDouble} fragment from a String. For example: "<code><xml-fragment>123.34e+57</xml-fragment></code>".
- */
- public static XmlDouble parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlDouble) XmlBeans.getContextTypeLoader().parse(s, type, options);
- }
-
- /**
- * Parses a {@link XmlDouble} fragment from a File.
- */
- public static XmlDouble parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDouble) XmlBeans.getContextTypeLoader().parse(f, type, null);
- }
-
- /**
- * Parses a {@link XmlDouble} fragment from a File.
- */
- public static XmlDouble parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDouble) XmlBeans.getContextTypeLoader().parse(f, type, options);
- }
-
- /**
- * Parses a {@link XmlDouble} fragment from a URL.
- */
- public static XmlDouble parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDouble) XmlBeans.getContextTypeLoader().parse(u, type, null);
- }
-
- /**
- * Parses a {@link XmlDouble} fragment from a URL.
- */
- public static XmlDouble parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDouble) XmlBeans.getContextTypeLoader().parse(u, type, options);
- }
-
- /**
- * Parses a {@link XmlDouble} fragment from an InputStream.
- */
- public static XmlDouble parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDouble) XmlBeans.getContextTypeLoader().parse(is, type, null);
- }
-
- /**
- * Parses a {@link XmlDouble} fragment from an InputStream.
- */
- public static XmlDouble parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDouble) XmlBeans.getContextTypeLoader().parse(is, type, options);
- }
-
- /**
- * Parses a {@link XmlDouble} fragment from a Reader.
- */
- public static XmlDouble parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDouble) XmlBeans.getContextTypeLoader().parse(r, type, null);
- }
-
- /**
- * Parses a {@link XmlDouble} fragment from a Reader.
- */
- public static XmlDouble parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDouble) XmlBeans.getContextTypeLoader().parse(r, type, options);
- }
-
- /**
- * Parses a {@link XmlDouble} fragment from a DOM Node.
- */
- public static XmlDouble parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException {
- return (XmlDouble) XmlBeans.getContextTypeLoader().parse(node, type, null);
- }
-
- /**
- * Parses a {@link XmlDouble} fragment from a DOM Node.
- */
- public static XmlDouble parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlDouble) XmlBeans.getContextTypeLoader().parse(node, type, options);
- }
-
- /**
- * Parses a {@link XmlDouble} fragment from an XMLStreamReader.
- */
- public static XmlDouble parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException {
- return (XmlDouble) XmlBeans.getContextTypeLoader().parse(xsr, type, null);
- }
-
- /**
- * Parses a {@link XmlDouble} fragment from an XMLStreamReader.
- */
- public static XmlDouble parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlDouble) XmlBeans.getContextTypeLoader().parse(xsr, type, options);
- }
-
- private Factory() {
- // No instance of this class allowed
- }
- }
}
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDuration.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDuration.java?rev=1886771&r1=1886770&r2=1886771&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDuration.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDuration.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/#duration">xs:duration</a> type.
@@ -24,10 +26,12 @@ package org.apache.xmlbeans;
* @see GDuration
*/
public interface XmlDuration extends XmlAnySimpleType {
+ XmlObjectFactory<XmlDuration> Factory = new XmlObjectFactory<>("_BI_duration");
+
/**
* The constant {@link SchemaType} object representing this schema type.
*/
- SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_duration");
+ SchemaType type = Factory.getType();
/**
* Returns this value as a {@link GDuration}
@@ -38,134 +42,5 @@ public interface XmlDuration extends Xml
* Sets this value as a {@link GDuration}
*/
void setGDurationValue(GDuration gd);
-
- /**
- * A class with methods for creating instances
- * of {@link XmlDuration}.
- */
- final class Factory {
- /**
- * Creates an empty instance of {@link XmlDuration}
- */
- public static XmlDuration newInstance() {
- return (XmlDuration) XmlBeans.getContextTypeLoader().newInstance(type, null);
- }
-
- /**
- * Creates an empty instance of {@link XmlDuration}
- */
- public static XmlDuration newInstance(org.apache.xmlbeans.XmlOptions options) {
- return (XmlDuration) XmlBeans.getContextTypeLoader().newInstance(type, options);
- }
-
- /**
- * Creates an immutable {@link XmlDuration} value
- */
- public static XmlDuration newValue(Object obj) {
- return (XmlDuration) type.newValue(obj);
- }
-
- /**
- * Parses a {@link XmlDuration} fragment from a String. For example: "<code><xml-fragment>P1Y2MT2H</xml-fragment></code>".
- */
- public static XmlDuration parse(java.lang.String s) throws org.apache.xmlbeans.XmlException {
- return (XmlDuration) XmlBeans.getContextTypeLoader().parse(s, type, null);
- }
-
- /**
- * Parses a {@link XmlDuration} fragment from a String. For example: "<code><xml-fragment>P1Y2MT2H</xml-fragment></code>".
- */
- public static XmlDuration parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlDuration) XmlBeans.getContextTypeLoader().parse(s, type, options);
- }
-
- /**
- * Parses a {@link XmlDuration} fragment from a File.
- */
- public static XmlDuration parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDuration) XmlBeans.getContextTypeLoader().parse(f, type, null);
- }
-
- /**
- * Parses a {@link XmlDuration} fragment from a File.
- */
- public static XmlDuration parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDuration) XmlBeans.getContextTypeLoader().parse(f, type, options);
- }
-
- /**
- * Parses a {@link XmlDuration} fragment from a URL.
- */
- public static XmlDuration parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDuration) XmlBeans.getContextTypeLoader().parse(u, type, null);
- }
-
- /**
- * Parses a {@link XmlDuration} fragment from a URL.
- */
- public static XmlDuration parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDuration) XmlBeans.getContextTypeLoader().parse(u, type, options);
- }
-
- /**
- * Parses a {@link XmlDuration} fragment from an InputStream.
- */
- public static XmlDuration parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDuration) XmlBeans.getContextTypeLoader().parse(is, type, null);
- }
-
- /**
- * Parses a {@link XmlDuration} fragment from an InputStream.
- */
- public static XmlDuration parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDuration) XmlBeans.getContextTypeLoader().parse(is, type, options);
- }
-
- /**
- * Parses a {@link XmlDuration} fragment from a Reader.
- */
- public static XmlDuration parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDuration) XmlBeans.getContextTypeLoader().parse(r, type, null);
- }
-
- /**
- * Parses a {@link XmlDuration} fragment from a Reader.
- */
- public static XmlDuration parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlDuration) XmlBeans.getContextTypeLoader().parse(r, type, options);
- }
-
- /**
- * Parses a {@link XmlDuration} fragment from a DOM Node.
- */
- public static XmlDuration parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException {
- return (XmlDuration) XmlBeans.getContextTypeLoader().parse(node, type, null);
- }
-
- /**
- * Parses a {@link XmlDuration} fragment from a DOM Node.
- */
- public static XmlDuration parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlDuration) XmlBeans.getContextTypeLoader().parse(node, type, options);
- }
-
- /**
- * Parses a {@link XmlDuration} fragment from an XMLStreamReader.
- */
- public static XmlDuration parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException {
- return (XmlDuration) XmlBeans.getContextTypeLoader().parse(xsr, type, null);
- }
-
- /**
- * Parses a {@link XmlDuration} fragment from an XMLStreamReader.
- */
- public static XmlDuration parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlDuration) XmlBeans.getContextTypeLoader().parse(xsr, type, options);
- }
-
- private Factory() {
- // No instance of this class allowed
- }
- }
}
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlENTITIES.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlENTITIES.java?rev=1886771&r1=1886770&r2=1886771&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlENTITIES.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlENTITIES.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;
@@ -26,10 +28,12 @@ import java.util.List;
* A list type.
*/
public interface XmlENTITIES extends XmlAnySimpleType {
+ XmlObjectFactory<XmlENTITIES> Factory = new XmlObjectFactory<>("_BI_ENTITIES");
+
/**
* The constant {@link SchemaType} object representing this schema type.
*/
- SchemaType type = XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_ENTITIES");
+ SchemaType type = Factory.getType();
/**
* Returns the value as a {@link List} of {@link String} values
@@ -45,134 +49,5 @@ public interface XmlENTITIES extends Xml
* Sets the value as a {@link List}
*/
void setListValue(List<?> l);
-
- /**
- * A class with methods for creating instances
- * of {@link XmlENTITIES}.
- */
- final class Factory {
- /**
- * Creates an empty instance of {@link XmlENTITIES}
- */
- public static XmlENTITIES newInstance() {
- return (XmlENTITIES) XmlBeans.getContextTypeLoader().newInstance(type, null);
- }
-
- /**
- * Creates an empty instance of {@link XmlENTITIES}
- */
- public static XmlENTITIES newInstance(org.apache.xmlbeans.XmlOptions options) {
- return (XmlENTITIES) XmlBeans.getContextTypeLoader().newInstance(type, options);
- }
-
- /**
- * Creates an immutable {@link XmlENTITIES} value
- */
- public static XmlENTITIES newValue(Object obj) {
- return (XmlENTITIES) type.newValue(obj);
- }
-
- /**
- * Parses a {@link XmlENTITIES} fragment from a String.
- */
- public static XmlENTITIES parse(java.lang.String s) throws org.apache.xmlbeans.XmlException {
- return (XmlENTITIES) XmlBeans.getContextTypeLoader().parse(s, type, null);
- }
-
- /**
- * Parses a {@link XmlENTITIES} fragment from a String.
- */
- public static XmlENTITIES parse(java.lang.String s, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlENTITIES) XmlBeans.getContextTypeLoader().parse(s, type, options);
- }
-
- /**
- * Parses a {@link XmlENTITIES} fragment from a File.
- */
- public static XmlENTITIES parse(java.io.File f) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlENTITIES) XmlBeans.getContextTypeLoader().parse(f, type, null);
- }
-
- /**
- * Parses a {@link XmlENTITIES} fragment from a File.
- */
- public static XmlENTITIES parse(java.io.File f, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlENTITIES) XmlBeans.getContextTypeLoader().parse(f, type, options);
- }
-
- /**
- * Parses a {@link XmlENTITIES} fragment from a URL.
- */
- public static XmlENTITIES parse(java.net.URL u) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlENTITIES) XmlBeans.getContextTypeLoader().parse(u, type, null);
- }
-
- /**
- * Parses a {@link XmlENTITIES} fragment from a URL.
- */
- public static XmlENTITIES parse(java.net.URL u, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlENTITIES) XmlBeans.getContextTypeLoader().parse(u, type, options);
- }
-
- /**
- * Parses a {@link XmlENTITIES} fragment from an InputStream.
- */
- public static XmlENTITIES parse(java.io.InputStream is) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlENTITIES) XmlBeans.getContextTypeLoader().parse(is, type, null);
- }
-
- /**
- * Parses a {@link XmlENTITIES} fragment from an InputStream.
- */
- public static XmlENTITIES parse(java.io.InputStream is, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlENTITIES) XmlBeans.getContextTypeLoader().parse(is, type, options);
- }
-
- /**
- * Parses a {@link XmlENTITIES} fragment from a Reader.
- */
- public static XmlENTITIES parse(java.io.Reader r) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlENTITIES) XmlBeans.getContextTypeLoader().parse(r, type, null);
- }
-
- /**
- * Parses a {@link XmlENTITIES} fragment from a Reader.
- */
- public static XmlENTITIES parse(java.io.Reader r, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException, java.io.IOException {
- return (XmlENTITIES) XmlBeans.getContextTypeLoader().parse(r, type, options);
- }
-
- /**
- * Parses a {@link XmlENTITIES} fragment from a DOM Node.
- */
- public static XmlENTITIES parse(org.w3c.dom.Node node) throws org.apache.xmlbeans.XmlException {
- return (XmlENTITIES) XmlBeans.getContextTypeLoader().parse(node, type, null);
- }
-
- /**
- * Parses a {@link XmlENTITIES} fragment from a DOM Node.
- */
- public static XmlENTITIES parse(org.w3c.dom.Node node, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlENTITIES) XmlBeans.getContextTypeLoader().parse(node, type, options);
- }
-
- /**
- * Parses a {@link XmlENTITIES} fragment from an XMLStreamReader.
- */
- public static XmlENTITIES parse(javax.xml.stream.XMLStreamReader xsr) throws org.apache.xmlbeans.XmlException {
- return (XmlENTITIES) XmlBeans.getContextTypeLoader().parse(xsr, type, null);
- }
-
- /**
- * Parses a {@link XmlENTITIES} fragment from an XMLStreamReader.
- */
- public static XmlENTITIES parse(javax.xml.stream.XMLStreamReader xsr, org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException {
- return (XmlENTITIES) 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