Author: kiwiwings
Date: Sat Sep 19 02:33:16 2020
New Revision: 1881834
URL: http://svn.apache.org/viewvc?rev=1881834&view=rev
Log:
remove deprecated methods
Removed:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XMLStreamValidationException.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/xml/stream/XMLStreamException.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/xml/stream/utils/NestedThrowable.java
Modified:
xmlbeans/trunk/build.xml
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/FilterXmlObject.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SimpleValue.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlAnySimpleType.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBase64Binary.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/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/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/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/XmlLong.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNMTOKENS.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/XmlSimpleList.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlTime.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/XmlUnsignedShort.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/BindingConfigImpl.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/BuiltinSchemaTypeSystem.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeCodePrinter.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeImpl.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/SchemaCodeGenerator.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaBase64HolderEx.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaBooleanHolderEx.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaDecimalHolder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaDecimalHolderEx.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaDoubleHolder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaDoubleHolderEx.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaFloatHolder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaFloatHolderEx.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaGDateHolderEx.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaGDurationHolderEx.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaHexBinaryHolderEx.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaIntHolder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaIntHolderEx.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaIntegerHolder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaIntegerHolderEx.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaLongHolder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaQNameHolder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaStringHolder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaStringHolderEx.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/JavaUriHolderEx.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/XmlAnySimpleTypeImpl.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/XmlComplexContentImpl.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/XmlListImpl.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/XmlObjectBase.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/values/XmlUnionImpl.java
xmlbeans/trunk/src/main/multimodule/java9/module-info.class
xmlbeans/trunk/src/main/multimodule/java9/module-info.java
xmlbeans/trunk/src/test/java/xmlobject/schematypes/checkin/EnumTests.java
Modified: xmlbeans/trunk/build.xml
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/build.xml?rev=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/build.xml (original)
+++ xmlbeans/trunk/build.xml Sat Sep 19 02:33:16 2020
@@ -66,10 +66,20 @@
<loadresource property="versionDir">
<string>@{artifact}</string>
<filterchain>
- <replaceregex pattern="[^:]+:[^:]+:(.*)" replace="\1"/>
+ <replaceregex pattern="[^:]+:[^:]+:([^:]+).*"
replace="\1"/>
</filterchain>
</loadresource>
+ <local name="classifier"/>
+ <loadresource property="classifier">
+ <string>@{artifact}</string>
+ <filterchain>
+ <replaceregex pattern="[^:]+:[^:]+:[^:]+:?([^:]*)"
replace="\1"/>
+ <replaceregex pattern="(.+)" replace="-\1"/>
+ </filterchain>
+ </loadresource>
+ <property name="classifier" value=""/>
+
<local name="version"/>
<property name="version" value="${versionDir}"
if:blank="@{snapshot}"/>
<property name="version" value="@{snapshot}"/>
@@ -83,13 +93,23 @@
</filterchain>
</loadresource>
+ <local name="jarName"/>
+ <property name="jarName"
value="${artifactId}-${version}${classifier}.@{packaging}"/>
+
+ <!-- delete old versions -->
+ <delete failonerror="false">
+ <fileset dir="${usageDir}" excludes="${jarName}">
+ <filename
regex="^${artifactId}-[0-9].*${classifier}\.@{packaging}"/>
+ </fileset>
+ </delete>
+
<local name="jarLoc"/>
<property name="jarLoc" value="${usageDir}/@{target}"
unless:blank="@{target}"/>
- <property name="jarLoc"
value="${usageDir}/${artifactId}-${version}.@{packaging}"/>
+ <property name="jarLoc" value="${usageDir}/${jarName}"/>
<local name="urlLoc"/>
<property name="urlLoc" value="@{url}" unless:blank="@{url}"/>
- <property name="urlLoc"
value="@{repo}/${groupDir}/${artifactId}/${versionDir}/${artifactId}-${version}.@{packaging}@{query}"/>
+ <property name="urlLoc"
value="@{repo}/${groupDir}/${artifactId}/${versionDir}/${jarName}@{query}"/>
<property name="@{prefix}.@{packaging}" value="${jarLoc}"/>
<property name="@{prefix}.url" value="${urlLoc}"/>
@@ -296,9 +316,18 @@
<replace dir="build/bootstrap/generated-sources"
token="schemaorg_apache_xmlbeans" value="org.apache.xmlbeans.metadata"
includes="**/*.java"/>
<!-- remove deprecated and not supported XMLInputStream API -->
- <replaceregexp
match="^.*@deprecated.*XMLInputStream.*\r?\n.*\r?\n.*\r?\n.*\r?\n" replace=""
flags="gm">
+ <replaceregexp match="^.*@deprecated.*(XMLInputStream|No
need).*\r?\n.*\r?\n.*\r?\n.*\r?\n" replace="" flags="gm">
+ <fileset dir="build/bootstrap/generated-sources"
includes="**/*.java"/>
+ </replaceregexp>
+ <replaceregexp match="^.*@deprecated.*\r?\n.*\r?\n" replace=""
flags="gm">
<fileset dir="build/bootstrap/generated-sources"
includes="**/*.java"/>
</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"/>
+
+
+
<mkdir dir="build/classes"/>
<mkdir dir="build/generated-sources"/>
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/FilterXmlObject.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/FilterXmlObject.java?rev=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/FilterXmlObject.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/FilterXmlObject.java Sat
Sep 19 02:33:16 2020
@@ -207,272 +207,6 @@ public abstract class FilterXmlObject im
return ((SimpleValue) underlyingXmlObject()).instanceType();
}
- /**
- * @deprecated replaced with {@link #getStringValue}
- */
- public String stringValue() {
- return ((SimpleValue) underlyingXmlObject()).stringValue();
- }
-
- /**
- * @deprecated replaced with {@link #getBooleanValue}
- */
- public boolean booleanValue() {
- return ((SimpleValue) underlyingXmlObject()).booleanValue();
- }
-
- /**
- * @deprecated replaced with {@link #getByteValue}
- */
- public byte byteValue() {
- return ((SimpleValue) underlyingXmlObject()).byteValue();
- }
-
- /**
- * @deprecated replaced with {@link #getShortValue}
- */
- public short shortValue() {
- return ((SimpleValue) underlyingXmlObject()).shortValue();
- }
-
- /**
- * @deprecated replaced with {@link #getIntValue}
- */
- public int intValue() {
- return ((SimpleValue) underlyingXmlObject()).intValue();
- }
-
- /**
- * @deprecated replaced with {@link #getLongValue}
- */
- public long longValue() {
- return ((SimpleValue) underlyingXmlObject()).longValue();
- }
-
- /**
- * @deprecated replaced with {@link #getBigIntegerValue}
- */
- public BigInteger bigIntegerValue() {
- return ((SimpleValue) underlyingXmlObject()).bigIntegerValue();
- }
-
- /**
- * @deprecated replaced with {@link #getBigDecimalValue}
- */
- public BigDecimal bigDecimalValue() {
- return ((SimpleValue) underlyingXmlObject()).bigDecimalValue();
- }
-
- /**
- * @deprecated replaced with {@link #getFloatValue}
- */
- public float floatValue() {
- return ((SimpleValue) underlyingXmlObject()).floatValue();
- }
-
- /**
- * @deprecated replaced with {@link #getDoubleValue}
- */
- public double doubleValue() {
- return ((SimpleValue) underlyingXmlObject()).doubleValue();
- }
-
- /**
- * @deprecated replaced with {@link #getByteArrayValue}
- */
- public byte[] byteArrayValue() {
- return ((SimpleValue) underlyingXmlObject()).byteArrayValue();
- }
-
- /**
- * @deprecated replaced with {@link #getEnumValue}
- */
- public StringEnumAbstractBase enumValue() {
- return ((SimpleValue) underlyingXmlObject()).enumValue();
- }
-
- /**
- * @deprecated replaced with {@link #getCalendarValue}
- */
- public Calendar calendarValue() {
- return ((SimpleValue) underlyingXmlObject()).calendarValue();
- }
-
- /**
- * @deprecated replaced with {@link #getDateValue}
- */
- public Date dateValue() {
- return ((SimpleValue) underlyingXmlObject()).dateValue();
- }
-
- /**
- * @deprecated replaced with {@link #getGDateValue}
- */
- public GDate gDateValue() {
- return ((SimpleValue) underlyingXmlObject()).gDateValue();
- }
-
- /**
- * @deprecated replaced with {@link #getGDurationValue}
- */
- public GDuration gDurationValue() {
- return ((SimpleValue) underlyingXmlObject()).gDurationValue();
- }
-
- /**
- * @deprecated replaced with {@link #getQNameValue}
- */
- public QName qNameValue() {
- return ((SimpleValue) underlyingXmlObject()).qNameValue();
- }
-
- /**
- * @deprecated replaced with {@link #getListValue}
- */
- public List listValue() {
- return ((SimpleValue) underlyingXmlObject()).listValue();
- }
-
- /**
- * @deprecated replaced with {@link #getListValue}
- */
- public List xlistValue() {
- return ((SimpleValue) underlyingXmlObject()).xlistValue();
- }
-
- /**
- * @deprecated replaced with {@link #getObjectValue}
- */
- public Object objectValue() {
- return ((SimpleValue) underlyingXmlObject()).objectValue();
- }
-
- /**
- * @deprecated replaced with {@link #setStringValue}
- */
- public void set(String obj) {
- ((SimpleValue) underlyingXmlObject()).set(obj);
- }
-
- /**
- * @deprecated replaced with {@link #setBooleanValue}
- */
- public void set(boolean v) {
- ((SimpleValue) underlyingXmlObject()).set(v);
- }
-
- /**
- * @deprecated replaced with {@link #setByteValue}
- */
- public void set(byte v) {
- ((SimpleValue) underlyingXmlObject()).set(v);
- }
-
- /**
- * @deprecated replaced with {@link #setShortValue}
- */
- public void set(short v) {
- ((SimpleValue) underlyingXmlObject()).set(v);
- }
-
- /**
- * @deprecated replaced with {@link #setIntValue}
- */
- public void set(int v) {
- ((SimpleValue) underlyingXmlObject()).set(v);
- }
-
- /**
- * @deprecated replaced with {@link #setLongValue}
- */
- public void set(long v) {
- ((SimpleValue) underlyingXmlObject()).set(v);
- }
-
- /**
- * @deprecated replaced with {@link #setBigIntegerValue}
- */
- public void set(BigInteger obj) {
- ((SimpleValue) underlyingXmlObject()).set(obj);
- }
-
- /**
- * @deprecated replaced with {@link #setBigDecimalValue}
- */
- public void set(BigDecimal obj) {
- ((SimpleValue) underlyingXmlObject()).set(obj);
- }
-
- /**
- * @deprecated replaced with {@link #setFloatValue}
- */
- public void set(float v) {
- ((SimpleValue) underlyingXmlObject()).set(v);
- }
-
- /**
- * @deprecated replaced with {@link #setDoubleValue}
- */
- public void set(double v) {
- ((SimpleValue) underlyingXmlObject()).set(v);
- }
-
- /**
- * @deprecated replaced with {@link #setByteArrayValue}
- */
- public void set(byte[] obj) {
- ((SimpleValue) underlyingXmlObject()).set(obj);
- }
-
- /**
- * @deprecated replaced with {@link #setEnumValue}
- */
- public void set(StringEnumAbstractBase obj) {
- ((SimpleValue) underlyingXmlObject()).set(obj);
- }
-
- /**
- * @deprecated replaced with {@link #setCalendarValue}
- */
- public void set(Calendar obj) {
- ((SimpleValue) underlyingXmlObject()).set(obj);
- }
-
- /**
- * @deprecated replaced with {@link #setDateValue}
- */
- public void set(Date obj) {
- ((SimpleValue) underlyingXmlObject()).set(obj);
- }
-
- /**
- * @deprecated replaced with {@link #setGDateValue}
- */
- public void set(GDateSpecification obj) {
- ((SimpleValue) underlyingXmlObject()).set(obj);
- }
-
- /**
- * @deprecated replaced with {@link #setGDurationValue}
- */
- public void set(GDurationSpecification obj) {
- ((SimpleValue) underlyingXmlObject()).set(obj);
- }
-
- /**
- * @deprecated replaced with {@link #setQNameValue}
- */
- public void set(QName obj) {
- ((SimpleValue) underlyingXmlObject()).set(obj);
- }
-
- /**
- * @deprecated replaced with {@link #setListValue}
- */
- public void set(List obj) {
- ((SimpleValue) underlyingXmlObject()).set(obj);
- }
-
public String getStringValue() {
return ((SimpleValue) underlyingXmlObject()).getStringValue();
}
@@ -621,7 +355,7 @@ public abstract class FilterXmlObject im
((SimpleValue) underlyingXmlObject()).setQNameValue(obj);
}
- public void setListValue(List obj) {
+ public void setListValue(List<?> obj) {
((SimpleValue) underlyingXmlObject()).setListValue(obj);
}
@@ -629,13 +363,6 @@ public abstract class FilterXmlObject im
((SimpleValue) underlyingXmlObject()).setObjectValue(obj);
}
- /**
- * @deprecated replaced with {@link #setObjectValue}
- **/
- public void objectSet(Object obj) {
- ((SimpleValue) underlyingXmlObject()).objectSet(obj);
- }
-
public XmlObject[] selectChildren(QName elementName) {
return underlyingXmlObject().selectChildren(elementName);
}
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SimpleValue.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SimpleValue.java?rev=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SimpleValue.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SimpleValue.java Sat Sep
19 02:33:16 2020
@@ -16,11 +16,11 @@
package org.apache.xmlbeans;
import javax.xml.namespace.QName;
-import java.util.List;
-import java.util.Date;
-import java.util.Calendar;
-import java.math.BigInteger;
import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
/**
* All XmlObject implementations can be coerced to SimpleValue.
@@ -33,8 +33,7 @@ import java.math.BigDecimal;
* or two unrelated integer restrictions that happen to fit
* into an int.
*/
-public interface SimpleValue extends XmlObject
-{
+public interface SimpleValue extends XmlObject {
/**
* The same as getSchemaType unless this is a union instance
* or nil value.
@@ -48,286 +47,200 @@ public interface SimpleValue extends Xml
*/
SchemaType instanceType();
- /** Returns the value as a {@link String}. */
- String getStringValue();
- /** Returns the value as a boolean. */
- boolean getBooleanValue();
- /** Returns the value as a byte. */
- public byte getByteValue();
- /** Returns the value as a short. */
- public short getShortValue();
- /** Returns the value as an int. */
- public int getIntValue();
- /** Returns the value as a long. */
- public long getLongValue();
- /** Returns the value as a {@link BigInteger}. */
- public BigInteger getBigIntegerValue();
- /** Returns the value as a {@link BigDecimal}. */
- public BigDecimal getBigDecimalValue();
- /** Returns the value as a float. */
- public float getFloatValue();
- /** Returns the value as a double. */
- public double getDoubleValue();
- /** Returns the value as a byte array. */
- byte[] getByteArrayValue();
- /** Returns the value as a {@link StringEnumAbstractBase}. */
- StringEnumAbstractBase getEnumValue();
- /** Returns the value as a {@link Calendar}. */
- Calendar getCalendarValue();
- /** Returns the value as a {@link Date}. */
- Date getDateValue();
- /** Returns the value as a {@link GDate}. */
- GDate getGDateValue();
- /** Returns the value as a {@link GDuration}. */
- GDuration getGDurationValue();
- /** Returns the value as a {@link QName}. */
- QName getQNameValue();
- /** Returns the value as a {@link List} of friendly Java objects (String,
Integer, Byte, Short, Long, BigInteger, Decimal, Float, Double, byte[],
Calendar, GDuration). */
- List getListValue();
- /** Returns the value as a {@link List} of XmlAnySimpleType objects. */
- List xgetListValue();
-
- /** Returns a union value as a its natural friendly Java object (String,
Integer, Byte, Short, Long, BigInteger, Decimal, Float, Double, byte[],
Calendar, GDuration). */
- Object getObjectValue();
-
- // following are simple type value setters
-
- /** Sets the value as a {@link String}. */
- void setStringValue(String obj);
- /** Sets the value as a boolean. */
- void setBooleanValue(boolean v);
- /** Sets the value as a byte. */
- void setByteValue(byte v);
- /** Sets the value as a short. */
- void setShortValue(short v);
- /** Sets the value as an int. */
- void setIntValue(int v);
- /** Sets the value as a long. */
- void setLongValue(long v);
- /** Sets the value as a {@link BigInteger}. */
- void setBigIntegerValue(BigInteger obj);
- /** Sets the value as a {@link BigDecimal}. */
- void setBigDecimalValue(BigDecimal obj);
- /** Sets the value as a float. */
- void setFloatValue(float v);
- /** Sets the value as a double. */
- void setDoubleValue(double v);
- /** Sets the value as a byte array. */
- void setByteArrayValue(byte[] obj);
- /** Sets the value as a {@link StringEnumAbstractBase}. */
- void setEnumValue(StringEnumAbstractBase obj);
- /** Sets the value as a {@link Calendar}. */
- void setCalendarValue(Calendar obj);
- /** Sets the value as a {@link Date}. */
- void setDateValue(Date obj);
- /** Sets the value as a {@link GDate}. */
- void setGDateValue(GDate obj);
- /** Sets the value as a {@link GDuration}. */
- void setGDurationValue(GDuration obj);
- /** Sets the value as a {@link QName}. */
- void setQNameValue(QName obj);
- /** Sets the value as a {@link List}. */
- void setListValue(List obj);
- /** Sets the value as an arbitrary {@link Object}. */
- void setObjectValue(Object obj);
-
/**
- * Returns the value as a {@link String}. *
- * @deprecated replaced with {@link #getStringValue}
+ * Returns the value as a {@link String}.
*/
- String stringValue();
+ String getStringValue();
+
/**
- * Returns the value as a boolean. *
- * @deprecated replaced with {@link #getBooleanValue}
+ * Returns the value as a boolean.
*/
- boolean booleanValue();
+ boolean getBooleanValue();
+
/**
- * Returns the value as a byte. *
- * @deprecated replaced with {@link #getByteValue}
+ * Returns the value as a byte.
*/
- public byte byteValue();
+ byte getByteValue();
+
/**
- * Returns the value as a short. *
- * @deprecated replaced with {@link #getShortValue}
+ * Returns the value as a short.
*/
- public short shortValue();
+ short getShortValue();
+
/**
- * Returns the value as an int. *
- * @deprecated replaced with {@link #getIntValue}
+ * Returns the value as an int.
*/
- public int intValue();
+ int getIntValue();
+
/**
- * Returns the value as a long. *
- * @deprecated replaced with {@link #getLongValue}
+ * Returns the value as a long.
*/
- public long longValue();
+ long getLongValue();
+
/**
- * Returns the value as a {@link BigInteger}. *
- * @deprecated replaced with {@link #getBigIntegerValue}
+ * Returns the value as a {@link BigInteger}.
*/
- public BigInteger bigIntegerValue();
+ BigInteger getBigIntegerValue();
+
/**
- * Returns the value as a {@link BigDecimal}. *
- * @deprecated replaced with {@link #getBigDecimalValue}
+ * Returns the value as a {@link BigDecimal}.
*/
- public BigDecimal bigDecimalValue();
+ BigDecimal getBigDecimalValue();
+
/**
- * Returns the value as a float. *
- * @deprecated replaced with {@link #getFloatValue}
+ * Returns the value as a float.
*/
- public float floatValue();
+ float getFloatValue();
+
/**
- * Returns the value as a double. *
- * @deprecated replaced with {@link #getDoubleValue}
+ * Returns the value as a double.
*/
- public double doubleValue();
+ double getDoubleValue();
+
/**
- * Returns the value as a byte array. *
- * @deprecated replaced with {@link #getByteArrayValue}
+ * Returns the value as a byte array.
*/
- byte[] byteArrayValue();
+ byte[] getByteArrayValue();
+
/**
- * Returns the value as a {@link StringEnumAbstractBase}. *
- * @deprecated replaced with {@link #getEnumValue}
+ * Returns the value as a {@link StringEnumAbstractBase}.
*/
- StringEnumAbstractBase enumValue();
+ StringEnumAbstractBase getEnumValue();
+
/**
- * Returns the value as a {@link Calendar}. *
- * @deprecated replaced with {@link #getCalendarValue}
+ * Returns the value as a {@link Calendar}.
*/
- Calendar calendarValue();
+ Calendar getCalendarValue();
+
/**
- * Returns the value as a {@link Date}. *
- * @deprecated replaced with {@link #getDateValue}
+ * Returns the value as a {@link Date}.
*/
- Date dateValue();
+ Date getDateValue();
+
/**
- * Returns the value as a {@link GDate}. *
- * @deprecated replaced with {@link #getGDateValue}
+ * Returns the value as a {@link GDate}.
*/
- GDate gDateValue();
+ GDate getGDateValue();
+
/**
- * Returns the value as a {@link GDuration}. *
- * @deprecated replaced with {@link #getGDurationValue}
+ * Returns the value as a {@link GDuration}.
*/
- GDuration gDurationValue();
+ GDuration getGDurationValue();
+
/**
- * Returns the value as a {@link QName}. *
- * @deprecated replaced with {@link #getQNameValue}
+ * Returns the value as a {@link QName}.
*/
- QName qNameValue();
+ QName getQNameValue();
+
/**
- * Returns the value as a {@link List} of friendly Java objects (String,
Integer, Byte, Short, Long, BigInteger, Decimal, Float, Double, byte[],
Calendar, GDuration). *
- * @deprecated replaced with {@link #getListValue}
+ * Returns the value as a {@link List} of friendly Java objects (String,
Integer, Byte, Short, Long, BigInteger, Decimal, Float, Double, byte[],
Calendar, GDuration).
*/
- List listValue();
+ List getListValue();
+
/**
- * Returns the value as a {@link List} of XmlAnySimpleType objects. *
- * @deprecated replaced with {@link #xgetListValue}
+ * Returns the value as a {@link List} of XmlAnySimpleType objects.
*/
- List xlistValue();
-
+ List xgetListValue();
+
/**
- * Returns a union value as a its natural friendly Java object (String,
Integer, Byte, Short, Long, BigInteger, Decimal, Float, Double, byte[],
Calendar, GDuration). *
- * @deprecated replaced with {@link #getObjectValue}
+ * Returns a union value as a its natural friendly Java object (String,
Integer, Byte, Short, Long, BigInteger, Decimal, Float, Double, byte[],
Calendar, GDuration).
*/
- Object objectValue();
+ Object getObjectValue();
// following are simple type value setters
/**
- * Sets the value as a {@link String}. *
- * @deprecated replaced with {@link #setStringValue}
+ * Sets the value as a {@link String}.
*/
- void set(String obj);
+ void setStringValue(String obj);
+
/**
- * Sets the value as a boolean. *
- * @deprecated replaced with {@link #setBooleanValue}
+ * Sets the value as a boolean.
*/
- void set(boolean v);
+ void setBooleanValue(boolean v);
+
/**
* Sets the value as a byte.
- * @deprecated replaced with {@link #setByteValue}
- **/
- void set(byte v);
+ */
+ void setByteValue(byte v);
+
/**
* Sets the value as a short.
- * @deprecated replaced with {@link #setShortValue}
- **/
- void set(short v);
+ */
+ void setShortValue(short v);
+
/**
* Sets the value as an int.
- * @deprecated replaced with {@link #setIntValue}
- **/
- void set(int v);
+ */
+ void setIntValue(int v);
+
/**
* Sets the value as a long.
- * @deprecated replaced with {@link #setLongValue}
- **/
- void set(long v);
+ */
+ void setLongValue(long v);
+
/**
* Sets the value as a {@link BigInteger}.
- * @deprecated replaced with {@link #setBigIntegerValue}
- **/
- void set(BigInteger obj);
- /**
- * Sets the value as a {@link BigDecimal}
- * @deprecated replaced with {@link #setBigDecimalValue}
- **/
- void set(BigDecimal obj);
+ */
+ void setBigIntegerValue(BigInteger obj);
+
+ /**
+ * Sets the value as a {@link BigDecimal}.
+ */
+ void setBigDecimalValue(BigDecimal obj);
+
/**
* Sets the value as a float.
- * @deprecated replaced with {@link #setFloatValue}
- **/
- void set(float v);
+ */
+ void setFloatValue(float v);
+
/**
* Sets the value as a double.
- * @deprecated replaced with {@link #setDoubleValue}
- **/
- void set(double v);
+ */
+ void setDoubleValue(double v);
+
/**
* Sets the value as a byte array.
- * @deprecated replaced with {@link #setByteArrayValue}
- **/
- void set(byte[] obj);
+ */
+ void setByteArrayValue(byte[] obj);
+
/**
* Sets the value as a {@link StringEnumAbstractBase}.
- * @deprecated replaced with {@link #setEnumValue}
- **/
- void set(StringEnumAbstractBase obj);
+ */
+ void setEnumValue(StringEnumAbstractBase obj);
+
/**
* Sets the value as a {@link Calendar}.
- * @deprecated replaced with {@link #setCalendarValue}
- **/
- void set(Calendar obj);
+ */
+ void setCalendarValue(Calendar obj);
+
/**
* Sets the value as a {@link Date}.
- * @deprecated replaced with {@link #setDateValue}
- **/
- void set(Date obj);
+ */
+ void setDateValue(Date obj);
+
/**
* Sets the value as a {@link GDate}.
- * @deprecated replaced with {@link #setGDateValue}
- **/
- void set(GDateSpecification obj);
+ */
+ void setGDateValue(GDate obj);
+
/**
* Sets the value as a {@link GDuration}.
- * @deprecated replaced with {@link #setGDurationValue}
- **/
- void set(GDurationSpecification obj);
+ */
+ void setGDurationValue(GDuration obj);
+
/**
* Sets the value as a {@link QName}.
- * @deprecated replaced with {@link #setQNameValue}
- **/
- void set(QName obj);
+ */
+ void setQNameValue(QName obj);
+
/**
* Sets the value as a {@link List}.
- * @deprecated replaced with {@link #setListValue}
- **/
- void set(List obj);
+ */
+ void setListValue(List<?> obj);
+
/**
* Sets the value as an arbitrary {@link Object}.
- * @deprecated replaced with {@link #setObjectValue}
- **/
- void objectSet(Object obj);
+ */
+ void setObjectValue(Object obj);
}
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=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlAnySimpleType.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlAnySimpleType.java Sat
Sep 19 02:33:16 2020
@@ -29,20 +29,6 @@ public interface XmlAnySimpleType extend
/**
* Returns the value as a {@link String}
- *
- * @deprecated replaced by {@link #getStringValue}
- **/
- String stringValue();
-
- /**
- * Sets the value as a {@link String}
- *
- * @deprecated replaced by {@link #setStringValue}
- **/
- void set(String s);
-
- /**
- * Returns the value as a {@link String}
**/
String getStringValue();
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBase64Binary.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBase64Binary.java?rev=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBase64Binary.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBase64Binary.java Sat
Sep 19 02:33:16 2020
@@ -29,20 +29,6 @@ public interface XmlBase64Binary extends
/**
* Returns this value as a byte array.
- *
- * @deprecated replaced by {@link #getByteArrayValue}
- **/
- byte[] byteArrayValue();
-
- /**
- * Sets this value as a byte array.
- *
- * @deprecated replaced by {@link #setByteArrayValue}
- **/
- void set(byte[] ba);
-
- /**
- * Returns this value as a byte array.
**/
byte[] getByteArrayValue();
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=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBoolean.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBoolean.java Sat Sep 19
02:33:16 2020
@@ -29,20 +29,6 @@ public interface XmlBoolean extends XmlA
/**
* Returns this value as a boolean
- *
- * @deprecated replaced by {@link #getBooleanValue}
- **/
- boolean booleanValue();
-
- /**
- * Sets this value as a boolean
- *
- * @deprecated replaced by {@link #setBooleanValue}
- **/
- void set(boolean v);
-
- /**
- * Returns this value as a boolean
*/
boolean getBooleanValue();
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=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlByte.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlByte.java Sat Sep 19
02:33:16 2020
@@ -29,27 +29,13 @@ public interface XmlByte extends XmlShor
/**
* Returns this value as a byte
- *
- * @deprecated replaced by {@link #getByteValue}
- **/
- public byte byteValue();
-
- /**
- * Sets this value as a byte
- *
- * @deprecated replaced by {@link #setByteValue}
- **/
- public void set(byte s);
-
- /**
- * Returns this value as a byte
*/
- public byte getByteValue();
+ byte getByteValue();
/**
* Sets this value as a byte
*/
- public void setByteValue(byte s);
+ void setByteValue(byte s);
/**
* A class with methods for creating instances
@@ -59,119 +45,119 @@ public interface XmlByte extends XmlShor
/**
* Creates an empty instance of {@link XmlByte}
*/
- public static XmlByte newInstance() {
+ static XmlByte newInstance() {
return (XmlByte) XmlBeans.getContextTypeLoader().newInstance(type,
null);
}
/**
* Creates an empty instance of {@link XmlByte}
*/
- public static XmlByte newInstance(org.apache.xmlbeans.XmlOptions
options) {
+ static XmlByte newInstance(org.apache.xmlbeans.XmlOptions options) {
return (XmlByte) XmlBeans.getContextTypeLoader().newInstance(type,
options);
}
/**
* Creates an immutable {@link XmlByte} value
*/
- public static XmlByte newValue(Object obj) {
+ 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>".
*/
- public static XmlByte parse(java.lang.String s) throws
org.apache.xmlbeans.XmlException {
+ 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>".
*/
- public static XmlByte parse(java.lang.String s,
org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException
{
+ 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.
*/
- public static XmlByte parse(java.io.File f) throws
org.apache.xmlbeans.XmlException, java.io.IOException {
+ 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.
*/
- public static XmlByte parse(java.io.File f,
org.apache.xmlbeans.XmlOptions options) throws
org.apache.xmlbeans.XmlException, java.io.IOException {
+ 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.
*/
- public static XmlByte parse(java.net.URL u) throws
org.apache.xmlbeans.XmlException, java.io.IOException {
+ 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.
*/
- public static XmlByte parse(java.net.URL u,
org.apache.xmlbeans.XmlOptions options) throws
org.apache.xmlbeans.XmlException, java.io.IOException {
+ 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.
*/
- public static XmlByte parse(java.io.InputStream is) throws
org.apache.xmlbeans.XmlException, java.io.IOException {
+ 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.
*/
- public static XmlByte parse(java.io.InputStream is,
org.apache.xmlbeans.XmlOptions options) throws
org.apache.xmlbeans.XmlException, java.io.IOException {
+ 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.
*/
- public static XmlByte parse(java.io.Reader r) throws
org.apache.xmlbeans.XmlException, java.io.IOException {
+ 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.
*/
- public static XmlByte parse(java.io.Reader r,
org.apache.xmlbeans.XmlOptions options) throws
org.apache.xmlbeans.XmlException, java.io.IOException {
+ 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.
*/
- public static XmlByte parse(org.w3c.dom.Node node) throws
org.apache.xmlbeans.XmlException {
+ 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.
*/
- public static XmlByte parse(org.w3c.dom.Node node,
org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException
{
+ 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.
*/
- public static XmlByte parse(javax.xml.stream.XMLStreamReader xsr)
throws org.apache.xmlbeans.XmlException {
+ 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.
*/
- public static XmlByte parse(javax.xml.stream.XMLStreamReader xsr,
org.apache.xmlbeans.XmlOptions options) throws org.apache.xmlbeans.XmlException
{
+ 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);
}
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=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDate.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDate.java Sat Sep 19
02:33:16 2020
@@ -34,49 +34,6 @@ public interface XmlDate extends XmlAnyS
*/
SchemaType type =
XmlBeans.getBuiltinTypeSystem().typeForHandle("_BI_date");
-
- /**
- * Returns this value as a {@link Calendar}
- *
- * @deprecated replaced with {@link #getCalendarValue}
- **/
- Calendar calendarValue();
-
- /**
- * Sets this value as a {@link Calendar}
- *
- * @deprecated replaced with {@link #setCalendarValue}
- **/
- void set(Calendar c);
-
- /**
- * Returns this value as a {@link GDate}
- *
- * @deprecated replaced with {@link #getGDateValue}
- **/
- GDate gDateValue();
-
- /**
- * Sets this value as a {@link GDateSpecification}
- *
- * @deprecated replaced with {@link #setGDateValue}
- **/
- void set(GDateSpecification gd);
-
- /**
- * Returns this value as a {@link Date}
- *
- * @deprecated replaced with {@link #getDateValue}
- **/
- Date dateValue();
-
- /**
- * Sets this value as a {@link Date}
- *
- * @deprecated replaced with {@link #setDateValue}
- **/
- void set(Date d);
-
/**
* Returns this value as a {@link Calendar}
*/
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=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDateTime.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDateTime.java Sat Sep
19 02:33:16 2020
@@ -41,48 +41,6 @@ public interface XmlDateTime extends Xml
/**
* Returns this value as a {@link Calendar}
- *
- * @deprecated replaced with {@link #getCalendarValue}
- **/
- Calendar calendarValue();
-
- /**
- * Sets this value as a {@link Calendar}
- *
- * @deprecated replaced with {@link #setCalendarValue}
- **/
- void set(Calendar c);
-
- /**
- * Returns this value as a {@link GDate}
- *
- * @deprecated replaced with {@link #getGDateValue}
- **/
- GDate gDateValue();
-
- /**
- * Sets this value as a {@link GDateSpecification}
- *
- * @deprecated replaced with {@link #setGDateValue}
- **/
- void set(GDateSpecification gd);
-
- /**
- * Returns this value as a {@link Date}
- *
- * @deprecated replaced with {@link #getDateValue}
- **/
- Date dateValue();
-
- /**
- * Sets this value as a {@link Date}
- *
- * @deprecated replaced with {@link #setDateValue}
- **/
- void set(Date d);
-
- /**
- * Returns this value as a {@link Calendar}
*/
Calendar getCalendarValue();
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=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDecimal.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDecimal.java Sat Sep 19
02:33:16 2020
@@ -40,20 +40,6 @@ public interface XmlDecimal extends XmlA
void setBigDecimalValue(BigDecimal bd);
/**
- * Returns this value as a {@link BigDecimal}
- *
- * @deprecated replaced with {@link #getBigDecimalValue}
- **/
- BigDecimal bigDecimalValue();
-
- /**
- * Sets this value as a {@link BigDecimal}
- *
- * @deprecated replaced with {@link #setBigDecimalValue}
- **/
- void set(BigDecimal bd);
-
- /**
* A class with methods for creating instances
* of {@link XmlDecimal}.
*/
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=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDouble.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDouble.java Sat Sep 19
02:33:16 2020
@@ -38,20 +38,6 @@ public interface XmlDouble extends XmlAn
void setDoubleValue(double v);
/**
- * Returns this value as a double
- *
- * @deprecated replaced with {@link #getDoubleValue}
- **/
- double doubleValue();
-
- /**
- * Sets this value as a double
- *
- * @deprecated replaced with {@link #setDoubleValue}
- **/
- void set(double v);
-
- /**
* A class with methods for creating instances
* of {@link XmlDouble}.
*/
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=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDuration.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlDuration.java Sat Sep
19 02:33:16 2020
@@ -40,20 +40,6 @@ public interface XmlDuration extends Xml
void setGDurationValue(GDuration gd);
/**
- * Returns this value as a {@link GDuration}
- *
- * @deprecated replaced with {@link #getGDurationValue}
- **/
- GDuration gDurationValue();
-
- /**
- * Sets this value as a {@link GDuration}
- *
- * @deprecated replaced with {@link #setGDurationValue}
- **/
- void set(GDurationSpecification gd);
-
- /**
* A class with methods for creating instances
* of {@link XmlDuration}.
*/
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=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlENTITIES.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlENTITIES.java Sat Sep
19 02:33:16 2020
@@ -44,28 +44,7 @@ public interface XmlENTITIES extends Xml
/**
* Sets the value as a {@link List}
*/
- void setListValue(List l);
-
- /**
- * Returns the value as a {@link List} of {@link String} values
- *
- * @deprecated replaced by {@link #getListValue}
- **/
- List listValue();
-
- /**
- * Returns the value as a {@link List} of {@link XmlENTITY} values
- *
- * @deprecated replaced by {@link #getListValue}
- **/
- List xlistValue();
-
- /**
- * Sets the value as a {@link List}
- *
- * @deprecated replaced by {@link #getListValue}
- **/
- void set(List l);
+ void setListValue(List<?> l);
/**
* A class with methods for creating instances
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=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlFloat.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlFloat.java Sat Sep 19
02:33:16 2020
@@ -38,20 +38,6 @@ public interface XmlFloat extends XmlAny
void setFloatValue(float v);
/**
- * Returns this value as a float
- *
- * @deprecated replaced by {@link #getFloatValue}
- **/
- float floatValue();
-
- /**
- * Sets this value as a float
- *
- * @deprecated replaced by {@link #setFloatValue}
- **/
- void set(float v);
-
- /**
* A class with methods for creating instances
* of {@link XmlFloat}.
*/
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=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGDay.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGDay.java Sat Sep 19
02:33:16 2020
@@ -65,48 +65,6 @@ public interface XmlGDay extends XmlAnyS
void setIntValue(int v);
/**
- * Returns this value as a {@link Calendar}
- *
- * @deprecated replaced with {@link #getCalendarValue}
- **/
- Calendar calendarValue();
-
- /**
- * Sets this value as a {@link Calendar}
- *
- * @deprecated replaced with {@link #setCalendarValue}
- **/
- void set(Calendar c);
-
- /**
- * Returns this value as a {@link GDate}
- *
- * @deprecated replaced with {@link #getGDateValue}
- **/
- GDate gDateValue();
-
- /**
- * Sets this value as a {@link GDateSpecification}
- *
- * @deprecated replaced with {@link #setGDateValue}
- **/
- void set(GDateSpecification gd);
-
- /**
- * Returns this value as an int from 1-31
- *
- * @deprecated replaced with {@link #getIntValue}
- **/
- int intValue();
-
- /**
- * Sets this value as an int from 1-31
- *
- * @deprecated replaced with {@link #setIntValue}
- **/
- void set(int v);
-
- /**
* A class with methods for creating instances
* of {@link XmlGDay}.
*/
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=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGMonth.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGMonth.java Sat Sep 19
02:33:16 2020
@@ -65,48 +65,6 @@ public interface XmlGMonth extends XmlAn
void setIntValue(int v);
/**
- * Returns this value as a {@link Calendar}
- *
- * @deprecated replaced with {@link #getCalendarValue}
- **/
- Calendar calendarValue();
-
- /**
- * Sets this value as a {@link Calendar}
- *
- * @deprecated replaced with {@link #setCalendarValue}
- **/
- void set(Calendar c);
-
- /**
- * Returns this value as a {@link GDate}
- *
- * @deprecated replaced with {@link #getGDateValue}
- **/
- GDate gDateValue();
-
- /**
- * Sets this value as a {@link GDateSpecification}
- *
- * @deprecated replaced with {@link #setGDateValue}
- **/
- void set(GDateSpecification gd);
-
- /**
- * Returns this value as an int from 1-12
- *
- * @deprecated replaced with {@link #getIntValue}
- **/
- int intValue();
-
- /**
- * Sets this value as an int from 1-12
- *
- * @deprecated replaced with {@link #setIntValue}
- **/
- void set(int v);
-
- /**
* A class with methods for creating instances
* of {@link XmlGMonth}.
*/
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=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGMonthDay.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGMonthDay.java Sat Sep
19 02:33:16 2020
@@ -55,34 +55,6 @@ public interface XmlGMonthDay extends Xm
void setGDateValue(GDate gd);
/**
- * Returns this value as a {@link Calendar}
- *
- * @deprecated replaced with {@link #getCalendarValue}
- **/
- Calendar calendarValue();
-
- /**
- * Sets this value as a {@link Calendar}
- *
- * @deprecated replaced with {@link #setCalendarValue}
- **/
- void set(Calendar c);
-
- /**
- * Returns this value as a {@link GDate}
- *
- * @deprecated replaced with {@link #getGDateValue}
- **/
- GDate gDateValue();
-
- /**
- * Sets this value as a {@link GDateSpecification}
- *
- * @deprecated replaced with {@link #setGDateValue}
- **/
- void set(GDateSpecification gd);
-
- /**
* A class with methods for creating instances
* of {@link XmlGMonthDay}.
*/
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=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGYear.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGYear.java Sat Sep 19
02:33:16 2020
@@ -65,48 +65,6 @@ public interface XmlGYear extends XmlAny
void setIntValue(int v);
/**
- * Returns this value as a {@link Calendar}
- *
- * @deprecated replaced with {@link #getCalendarValue}
- **/
- Calendar calendarValue();
-
- /**
- * Sets this value as a {@link Calendar}
- *
- * @deprecated replaced with {@link #setCalendarValue}
- **/
- void set(Calendar c);
-
- /**
- * Returns this value as a {@link GDate}
- *
- * @deprecated replaced with {@link #getGDateValue}
- **/
- GDate gDateValue();
-
- /**
- * Sets this value as a {@link GDateSpecification}
- *
- * @deprecated replaced with {@link #setGDateValue}
- **/
- void set(GDateSpecification gd);
-
- /**
- * Returns this value as an int from 1-31
- *
- * @deprecated replaced with {@link #getIntValue}
- **/
- int intValue();
-
- /**
- * Sets this value as an int from 1-31
- *
- * @deprecated replaced with {@link #setIntValue}
- **/
- void set(int v);
-
- /**
* A class with methods for creating instances
* of {@link XmlGYear}.
*/
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=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGYearMonth.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlGYearMonth.java Sat Sep
19 02:33:16 2020
@@ -55,34 +55,6 @@ public interface XmlGYearMonth extends X
void setGDateValue(GDate gd);
/**
- * Returns this value as a {@link Calendar}
- *
- * @deprecated replaced with {@link #getCalendarValue}
- **/
- Calendar calendarValue();
-
- /**
- * Sets this value as a {@link Calendar}
- *
- * @deprecated replaced with {@link #setCalendarValue}
- **/
- void set(Calendar c);
-
- /**
- * Returns this value as a {@link GDate}
- *
- * @deprecated replaced with {@link #getGDateValue}
- **/
- GDate gDateValue();
-
- /**
- * Sets this value as a {@link GDateSpecification}
- *
- * @deprecated replaced with {@link #setGDateValue}
- **/
- void set(GDateSpecification gd);
-
- /**
* A class with methods for creating instances
* of {@link XmlGYearMonth}.
*/
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=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlHexBinary.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlHexBinary.java Sat Sep
19 02:33:16 2020
@@ -29,20 +29,6 @@ public interface XmlHexBinary extends Xm
/**
* Returns this value as a byte array.
- *
- * @deprecated replaced by {@link #getByteArrayValue}
- **/
- byte[] byteArrayValue();
-
- /**
- * Sets this value as a byte array.
- *
- * @deprecated replaced by {@link #setByteArrayValue}
- **/
- void set(byte[] ba);
-
- /**
- * Returns this value as a byte array.
**/
byte[] getByteArrayValue();
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=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlIDREFS.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlIDREFS.java Sat Sep 19
02:33:16 2020
@@ -48,28 +48,7 @@ public interface XmlIDREFS extends XmlAn
/**
* Sets the value as a {@link List}
*/
- void setListValue(List l);
-
- /**
- * Returns the value as a {@link List} of {@link String} values
- *
- * @deprecated replaced by {@link #getListValue}
- **/
- List listValue();
-
- /**
- * Returns the value as a {@link List} of {@link XmlIDREF} values
- *
- * @deprecated replaced by {@link #getListValue}
- **/
- List xlistValue();
-
- /**
- * Sets the value as a {@link List}
- *
- * @deprecated replaced by {@link #getListValue}
- **/
- void set(List l);
+ void setListValue(List<?> l);
/**
* A class with methods for creating instances
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=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlInt.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlInt.java Sat Sep 19
02:33:16 2020
@@ -39,20 +39,6 @@ public interface XmlInt extends XmlLong
void setIntValue(int v);
/**
- * Returns this value as an int
- *
- * @deprecated replaced with {@link #getIntValue}
- **/
- int intValue();
-
- /**
- * Sets this value as an int
- *
- * @deprecated replaced with {@link #setIntValue}
- **/
- void set(int v);
-
- /**
* A class with methods for creating instances
* of {@link XmlInt}.
*/
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=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlInteger.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlInteger.java Sat Sep 19
02:33:16 2020
@@ -45,20 +45,6 @@ public interface XmlInteger extends XmlD
void setBigIntegerValue(BigInteger bi);
/**
- * Returns this value as a {@link BigInteger}
- *
- * @deprecated replaced with {@link #getBigIntegerValue}
- **/
- BigInteger bigIntegerValue();
-
- /**
- * Sets this value as a {@link BigInteger}
- *
- * @deprecated replaced with {@link #setBigIntegerValue}
- **/
- void set(BigInteger bi);
-
- /**
* A class with methods for creating instances
* of {@link XmlInteger}.
*/
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlLong.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlLong.java?rev=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlLong.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlLong.java Sat Sep 19
02:33:16 2020
@@ -39,20 +39,6 @@ public interface XmlLong extends XmlInte
void setLongValue(long v);
/**
- * Returns this value as a long
- *
- * @deprecated replaced with {@link #getLongValue}
- **/
- long longValue();
-
- /**
- * Sets this value as a long
- *
- * @deprecated replaced with {@link #setLongValue}
- **/
- void set(long v);
-
- /**
* A class with methods for creating instances
* of {@link XmlLong}.
*/
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNMTOKENS.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNMTOKENS.java?rev=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNMTOKENS.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNMTOKENS.java Sat Sep
19 02:33:16 2020
@@ -44,29 +44,7 @@ public interface XmlNMTOKENS extends Xml
/**
* Sets the value as a {@link List}
*/
- void setListValue(List l);
-
- /**
- * Returns the value as a {@link List} of {@link String} values
- *
- * @deprecated replaced by {@link #getListValue}
- **/
- List listValue();
-
- /**
- * Returns the value as a {@link List} of {@link XmlNMTOKEN} values
- *
- * @deprecated replaced by {@link #getListValue}
- **/
- List xlistValue();
-
- /**
- * Sets the value as a {@link List}
- *
- * @deprecated replaced by {@link #getListValue}
- **/
- void set(List l);
-
+ void setListValue(List<?> l);
/**
* A class with methods for creating instances
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlQName.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlQName.java?rev=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlQName.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlQName.java Sat Sep 19
02:33:16 2020
@@ -48,20 +48,6 @@ public interface XmlQName extends XmlAny
void setQNameValue(QName name);
/**
- * Returns this value as a {@link QName}
- *
- * @deprecated replaced with {@link #getQNameValue}
- **/
- QName qNameValue();
-
- /**
- * Sets this value as a {@link QName}
- *
- * @deprecated replaced with {@link #setQNameValue}
- **/
- void set(QName name);
-
- /**
* A class with methods for creating instances
* of {@link XmlQName}.
*/
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlShort.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlShort.java?rev=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlShort.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlShort.java Sat Sep 19
02:33:16 2020
@@ -31,26 +31,12 @@ public interface XmlShort extends XmlInt
/**
* Returns this value as a short
*/
- public short getShortValue();
+ short getShortValue();
/**
* Sets this value as a short
*/
- public void setShortValue(short s);
-
- /**
- * Returns this value as a short
- *
- * @deprecated replaced with {@link #getShortValue}
- **/
- public short shortValue();
-
- /**
- * Sets this value as a short
- *
- * @deprecated replaced with {@link #setShortValue}
- **/
- public void set(short s);
+ void setShortValue(short s);
/**
* A class with methods for creating instances
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlSimpleList.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlSimpleList.java?rev=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlSimpleList.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlSimpleList.java Sat Sep
19 02:33:16 2020
@@ -15,174 +15,313 @@
package org.apache.xmlbeans;
-import java.util.Iterator;
import java.util.Collection;
+import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
/**
* The immutable {@link List} returned for XML simple list values.
- *
+ * <p>
* XmlSimpleList implements an equals() and hashCode() that compare list
* contents, so two XmlSimpleLists are the same if they have the same
* values in the same order.
- */
-public class XmlSimpleList implements List, java.io.Serializable
-{
+ */
+public class XmlSimpleList implements List, java.io.Serializable {
private static final long serialVersionUID = 1L;
-
- private List underlying;
-
+
+ private List underlying;
+
/**
* Constructs an immutable XmlSimpleList that wraps (does not copy)
* the given {@link List}. All non-mutating methods delegate to
* the underlying List instance.
- */
- public XmlSimpleList(List list) { this.underlying = list; }
-
- /** Returns the number of elements in this list. */
- public int size() { return underlying.size(); }
- /** True if the list is empty. */
- public boolean isEmpty() { return underlying.isEmpty(); }
- /** True if the list is contains an object equal to o. */
- public boolean contains(Object o) { return underlying.contains(o); }
- /** True if the list is contains all the objects in the given collection.
*/
- public boolean containsAll(Collection coll) { return
underlying.containsAll(coll); }
- /** Copies the collection to an array. */
- public Object[] toArray() { return underlying.toArray(); }
- /** Copies the collection to an array of a specified type. */
- public Object[] toArray(Object[] a) { return underlying.toArray(a); }
-
- /** Unsupported because this list is immutable. */
- public boolean add(Object o) { throw new
UnsupportedOperationException(); }
- /** Unsupported because this list is immutable. */
- public boolean addAll(Collection coll) { throw new
UnsupportedOperationException(); }
- /** Unsupported because this list is immutable. */
- public boolean remove(Object o) { throw new
UnsupportedOperationException(); }
- /** Unsupported because this list is immutable. */
- public boolean removeAll(Collection coll) { throw new
UnsupportedOperationException(); }
- /** Unsupported because this list is immutable. */
- public boolean retainAll(Collection coll) { throw new
UnsupportedOperationException(); }
- /** Unsupported because this list is immutable. */
- public void clear() { throw new
UnsupportedOperationException(); }
-
- /** Returns the object at the specified position in this list. */
- public Object get(int index) { return underlying.get(index); }
- /** Unsupported because this list is immutable. */
- public Object set(int index, Object element) { throw new
UnsupportedOperationException(); }
- /** Unsupported because this list is immutable. */
- public void add(int index, Object element) { throw new
UnsupportedOperationException(); }
- /** Unsupported because this list is immutable. */
- public Object remove(int index) { throw new
UnsupportedOperationException(); }
- /** Returns index of the first occurance of an object equal to o. */
- public int indexOf(Object o) { return underlying.indexOf(o); }
- /** Returns index of the last occurance of an object equal to o. */
- public int lastIndexOf(Object o) { return underlying.lastIndexOf(o); }
- /** Unsupported because this list is immutable. */
- public boolean addAll(int index, Collection c) { throw new
UnsupportedOperationException(); }
- /** Returns a view of the portion of this list between the specified
fromIndex, inclusive, and toIndex, exclusive. */
- public List subList(int from, int to) { return new
XmlSimpleList(underlying.subList(from, to)); }
-
- /** Returns an iterator over the elements in this list in proper sequence.
*/
- public Iterator iterator()
- {
- return new Iterator()
- {
+ */
+ public XmlSimpleList(List list) {
+ this.underlying = list;
+ }
+
+ /**
+ * Returns the number of elements in this list.
+ */
+ public int size() {
+ return underlying.size();
+ }
+
+ /**
+ * True if the list is empty.
+ */
+ public boolean isEmpty() {
+ return underlying.isEmpty();
+ }
+
+ /**
+ * True if the list is contains an object equal to o.
+ */
+ public boolean contains(Object o) {
+ return underlying.contains(o);
+ }
+
+ /**
+ * True if the list is contains all the objects in the given collection.
+ */
+ public boolean containsAll(Collection coll) {
+ return underlying.containsAll(coll);
+ }
+
+ /**
+ * Copies the collection to an array.
+ */
+ public Object[] toArray() {
+ return underlying.toArray();
+ }
+
+ /**
+ * Copies the collection to an array of a specified type.
+ */
+ public Object[] toArray(Object[] a) {
+ return underlying.toArray(a);
+ }
+
+ /**
+ * Unsupported because this list is immutable.
+ */
+ public boolean add(Object o) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Unsupported because this list is immutable.
+ */
+ public boolean addAll(Collection coll) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Unsupported because this list is immutable.
+ */
+ public boolean remove(Object o) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Unsupported because this list is immutable.
+ */
+ public boolean removeAll(Collection coll) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Unsupported because this list is immutable.
+ */
+ public boolean retainAll(Collection coll) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Unsupported because this list is immutable.
+ */
+ public void clear() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Returns the object at the specified position in this list.
+ */
+ public Object get(int index) {
+ return underlying.get(index);
+ }
+
+ /**
+ * Unsupported because this list is immutable.
+ */
+ public Object set(int index, Object element) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Unsupported because this list is immutable.
+ */
+ public void add(int index, Object element) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Unsupported because this list is immutable.
+ */
+ public Object remove(int index) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Returns index of the first occurance of an object equal to o.
+ */
+ public int indexOf(Object o) {
+ return underlying.indexOf(o);
+ }
+
+ /**
+ * Returns index of the last occurance of an object equal to o.
+ */
+ public int lastIndexOf(Object o) {
+ return underlying.lastIndexOf(o);
+ }
+
+ /**
+ * Unsupported because this list is immutable.
+ */
+ public boolean addAll(int index, Collection c) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Returns a view of the portion of this list between the specified
fromIndex, inclusive, and toIndex, exclusive.
+ */
+ public List subList(int from, int to) {
+ return new XmlSimpleList(underlying.subList(from, to));
+ }
+
+ /**
+ * Returns an iterator over the elements in this list in proper sequence.
+ */
+ public Iterator iterator() {
+ return new Iterator() {
Iterator i = underlying.iterator();
- public boolean hasNext() { return i.hasNext(); }
- public Object next() { return i.next(); }
- public void remove() { throw new
UnsupportedOperationException(); }
+
+ public boolean hasNext() {
+ return i.hasNext();
+ }
+
+ public Object next() {
+ return i.next();
+ }
+
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
};
}
- /** Returns a list iterator of the elements in this list in proper
sequence. */
- public ListIterator listIterator() { return listIterator(0); }
- /** Returns a list iterator of the elements in this list in proper
sequence, starting at the specified position in this list. */
- public ListIterator listIterator(final int index)
- {
- return new ListIterator()
- {
+ /**
+ * Returns a list iterator of the elements in this list in proper sequence.
+ */
+ public ListIterator listIterator() {
+ return listIterator(0);
+ }
+
+ /**
+ * Returns a list iterator of the elements in this list in proper
sequence, starting at the specified position in this list.
+ */
+ public ListIterator listIterator(final int index) {
+ return new ListIterator() {
ListIterator i = underlying.listIterator(index);
-
- public boolean hasNext() { return i.hasNext(); }
- public Object next() { return i.next(); }
- public boolean hasPrevious(){ return i.hasPrevious(); }
- public Object previous() { return i.previous(); }
- public int nextIndex() { return i.nextIndex(); }
- public int previousIndex() { return i.previousIndex(); }
-
- public void remove() { throw new
UnsupportedOperationException(); }
- public void set(Object o) { throw new
UnsupportedOperationException(); }
- public void add(Object o) { throw new
UnsupportedOperationException(); }
+
+ public boolean hasNext() {
+ return i.hasNext();
+ }
+
+ public Object next() {
+ return i.next();
+ }
+
+ public boolean hasPrevious() {
+ return i.hasPrevious();
+ }
+
+ public Object previous() {
+ return i.previous();
+ }
+
+ public int nextIndex() {
+ return i.nextIndex();
+ }
+
+ public int previousIndex() {
+ return i.previousIndex();
+ }
+
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+
+ public void set(Object o) {
+ throw new UnsupportedOperationException();
+ }
+
+ public void add(Object o) {
+ throw new UnsupportedOperationException();
+ }
};
}
-
- private String stringValue(Object o)
- {
- if (o instanceof SimpleValue)
- return ((SimpleValue)o).stringValue();
+
+ private String stringValue(Object o) {
+ if (o instanceof SimpleValue) {
+ return ((SimpleValue) o).getStringValue();
+ }
return o.toString();
}
-
+
/**
* Returns a space-separated list of the string representations of all
* the items in the list. For most lists, this is a valid xml lexical
* value for the list. (The notable exception is a list of QNames.)
- */
- public String toString()
- {
+ */
+ public String toString() {
int size = underlying.size();
- if (size == 0)
+ if (size == 0) {
return "";
+ }
String first = stringValue(underlying.get(0));
- if (size == 1)
+ if (size == 1) {
return first;
+ }
StringBuilder result = new StringBuilder(first);
- for (int i = 1; i < size; i++)
- {
+ for (int i = 1; i < size; i++) {
result.append(' ');
result.append(stringValue(underlying.get(i)));
}
return result.toString();
}
-
+
/**
* Two XmlSimpleLists are equal if all their items are equal.
* (They must have the same number of items, and the items must be in
* the same order.)
- */
- public boolean equals(Object o)
- {
- if (this == o) return true;
- if (!(o instanceof XmlSimpleList)) return false;
- final XmlSimpleList xmlSimpleList = (XmlSimpleList)o;
+ */
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof XmlSimpleList)) {
+ return false;
+ }
+ final XmlSimpleList xmlSimpleList = (XmlSimpleList) o;
List underlying2 = xmlSimpleList.underlying;
int size = underlying.size();
- if (size != underlying2.size())
+ if (size != underlying2.size()) {
return false;
- for (int i = 0; i < size; i++)
- {
+ }
+ for (int i = 0; i < size; i++) {
Object item = underlying.get(i);
Object item2 = underlying2.get(i);
- if (item == null ? item2 != null : !item.equals(item2))
+ if (item == null ? item2 != null : !item.equals(item2)) {
return false;
+ }
}
return true;
}
-
+
/**
* Combines the hash codes of all the list items.
- */
- public int hashCode()
- {
+ */
+ public int hashCode() {
int size = underlying.size();
int hash = 0;
- for (int i = 0; i < size; i++)
- {
+ for (int i = 0; i < size; i++) {
Object item = underlying.get(i);
hash *= 19;
hash += item.hashCode();
}
return hash;
- }
+ }
}
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlTime.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlTime.java?rev=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlTime.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlTime.java Sat Sep 19
02:33:16 2020
@@ -55,35 +55,6 @@ public interface XmlTime extends XmlAnyS
void setGDateValue(GDate gd);
/**
- * Returns this value as a {@link Calendar}
- *
- * @deprecated replaced with {@link #getCalendarValue}
- **/
- Calendar calendarValue();
-
- /**
- * Sets this value as a {@link Calendar}
- *
- * @deprecated replaced with {@link #setCalendarValue}
- **/
- void set(Calendar c);
-
- /**
- * Returns this value as a {@link GDate}
- *
- * @deprecated replaced with {@link #getGDateValue}
- **/
- GDate gDateValue();
-
- /**
- * Sets this value as a {@link GDateSpecification}
- *
- * @deprecated replaced with {@link #setGDateValue}
- **/
- void set(GDateSpecification gd);
-
-
- /**
* A class with methods for creating instances
* of {@link XmlTime}.
*/
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedByte.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedByte.java?rev=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedByte.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedByte.java Sat
Sep 19 02:33:16 2020
@@ -33,26 +33,13 @@ public interface XmlUnsignedByte extends
/**
* Returns this value as a short
*/
- public short getShortValue();
+ short getShortValue();
/**
* Sets this value as a short
*/
- public void setShortValue(short s);
+ void setShortValue(short s);
- /**
- * Returns this value as a short
- *
- * @deprecated replaced with {@link #getShortValue}
- **/
- public short shortValue();
-
- /**
- * Sets this value as a short
- *
- * @deprecated replaced with {@link #setShortValue}
- **/
- public void set(short s);
/**
* A class with methods for creating instances
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedInt.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedInt.java?rev=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedInt.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedInt.java Sat
Sep 19 02:33:16 2020
@@ -41,20 +41,6 @@ public interface XmlUnsignedInt extends
void setLongValue(long v);
/**
- * Returns this value as a long
- *
- * @deprecated replaced with {@link #getLongValue}
- **/
- long longValue();
-
- /**
- * Sets this value as a long
- *
- * @deprecated replaced with {@link #setLongValue}
- **/
- void set(long v);
-
- /**
* A class with methods for creating instances
* of {@link XmlUnsignedInt}.
*/
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedShort.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedShort.java?rev=1881834&r1=1881833&r2=1881834&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedShort.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlUnsignedShort.java Sat
Sep 19 02:33:16 2020
@@ -41,20 +41,6 @@ public interface XmlUnsignedShort extend
void setIntValue(int v);
/**
- * Returns this value as an int
- *
- * @deprecated replaced with {@link #getIntValue}
- **/
- int intValue();
-
- /**
- * Sets this value as an int
- *
- * @deprecated replaced with {@link #setIntValue}
- **/
- void set(int v);
-
- /**
* A class with methods for creating instances
* of {@link XmlUnsignedShort}.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
