You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2022/01/07 13:36:48 UTC
svn commit: r1896801 - in /xmlbeans/trunk/src/main/java/org/apache/xmlbeans: ./ impl/schema/ impl/store/ impl/tool/ impl/util/ impl/validator/
Author: fanningpj
Date: Fri Jan 7 13:36:47 2022
New Revision: 1896801
URL: http://svn.apache.org/viewvc?rev=1896801&view=rev
Log:
use more generics internally
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlCursor.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlObject.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/BuiltinSchemaTypeSystem.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Cursor.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/CommandLine.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/TypeHierarchyPrinter.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/XsTypeConverter.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/ValidatorUtil.java
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlCursor.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlCursor.java?rev=1896801&r1=1896800&r2=1896801&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlCursor.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlCursor.java Fri Jan 7 13:36:47 2022
@@ -1553,7 +1553,7 @@ public interface XmlCursor extends XmlTo
* returned by this method.
*/
- void getAllBookmarkRefs(Collection listToFill);
+ void getAllBookmarkRefs(Collection<Object> listToFill);
/**
* Removes the XML that is immediately after this cursor.
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlObject.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlObject.java?rev=1896801&r1=1896800&r2=1896801&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlObject.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlObject.java Fri Jan 7 13:36:47 2022
@@ -158,7 +158,7 @@ public interface XmlObject extends XmlTo
* <pre>
* // Create an XmlOptions instance and set the error listener.
* XmlOptions validateOptions = new XmlOptions();
- * ArrayList<XmlError> errorList = new ArrayList<>();
+ * ArrayList<XmlError> errorList = new ArrayList<>();
* validateOptions.setErrorListener(errorList);
*
* // Validate the XML.
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/BuiltinSchemaTypeSystem.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/BuiltinSchemaTypeSystem.java?rev=1896801&r1=1896800&r2=1896801&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/BuiltinSchemaTypeSystem.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/BuiltinSchemaTypeSystem.java Fri Jan 7 13:36:47 2022
@@ -209,11 +209,11 @@ public class BuiltinSchemaTypeSystem ext
}
}
- private Map _typeMap = new HashMap();
+ private Map<QName, SchemaType> _typeMap = new HashMap<>();
private SchemaTypeImpl[] _typeArray = new SchemaTypeImpl[SchemaType.BTC_LAST_BUILTIN + 1];
- private Map _handlesToObjects = new HashMap();
- private Map _objectsToHandles = new HashMap();
- private Map _typesByClassname = new HashMap();
+ private Map<String, SchemaType> _handlesToObjects = new HashMap<>();
+ private Map<SchemaType, String> _objectsToHandles = new HashMap<>();
+ private Map<String, SchemaType> _typesByClassname = new HashMap<>();
private SchemaContainer _container = new SchemaContainer("http://www.w3.org/2001/XMLSchema");
private SchemaTypeImpl getBuiltinType(int btc)
@@ -300,7 +300,7 @@ public class BuiltinSchemaTypeSystem ext
public SchemaType findType(QName name)
{
- return (SchemaType)_typeMap.get(name);
+ return _typeMap.get(name);
}
@@ -367,7 +367,7 @@ public class BuiltinSchemaTypeSystem ext
public SchemaType typeForClassname(String classname)
{
- return (SchemaType)_typesByClassname.get(classname);
+ return _typesByClassname.get(classname);
}
public InputStream getSourceAsStream(String sourceName)
@@ -446,7 +446,7 @@ public class BuiltinSchemaTypeSystem ext
*/
public String handleForType(SchemaType type)
{
- return (String)_objectsToHandles.get(type);
+ return _objectsToHandles.get(type);
}
/**
@@ -567,13 +567,10 @@ public class BuiltinSchemaTypeSystem ext
public SchemaType typeForHandle(String handle)
{
- return (SchemaType)_handlesToObjects.get(handle);
+ return _handlesToObjects.get(handle);
}
- public SchemaComponent resolveHandle(String handle)
- {
- return (SchemaComponent)_handlesToObjects.get(handle);
- }
+ public SchemaComponent resolveHandle(String handle) { return _handlesToObjects.get(handle); }
/**
* Links a type.
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Cursor.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Cursor.java?rev=1896801&r1=1896800&r2=1896801&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Cursor.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Cursor.java Fri Jan 7 13:36:47 2022
@@ -1305,7 +1305,7 @@ public final class Cursor implements Xml
}
}
- public void _getAllBookmarkRefs(Collection listToFill) {
+ public void _getAllBookmarkRefs(Collection<Object> listToFill) {
if (listToFill != null) {
for (Bookmark b = _cur._xobj._bookmarks; b != null; b = b._next) {
if (b._value instanceof XmlBookmark) {
@@ -2330,7 +2330,8 @@ public final class Cursor implements Xml
syncWrap(() -> _clearBookmark(key));
}
- public void getAllBookmarkRefs(Collection listToFill) {
+ @Override
+ public void getAllBookmarkRefs(Collection<Object> listToFill) {
syncWrap(() -> _getAllBookmarkRefs(listToFill));
}
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/CommandLine.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/CommandLine.java?rev=1896801&r1=1896800&r2=1896801&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/CommandLine.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/CommandLine.java Fri Jan 7 13:36:47 2022
@@ -33,7 +33,7 @@ import java.util.Map;
public class CommandLine
{
- public CommandLine(String[] args, Collection flags, Collection scheme)
+ public CommandLine(String[] args, Collection<String> flags, Collection<String> scheme)
{
if (flags == null || scheme == null)
throw new IllegalArgumentException("collection required (use Collections.EMPTY_SET if no options)");
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/TypeHierarchyPrinter.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/TypeHierarchyPrinter.java?rev=1896801&r1=1896800&r2=1896801&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/TypeHierarchyPrinter.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/TypeHierarchyPrinter.java Fri Jan 7 13:36:47 2022
@@ -202,7 +202,7 @@ public class TypeHierarchyPrinter
noteNamespace(prefixes, sType);
// enter this type in the list of children of its base type
- Collection children = childTypes.get(sType.getBaseType());
+ Collection<SchemaType> children = childTypes.get(sType.getBaseType());
if (children == null)
{
children = new ArrayList<>();
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/XsTypeConverter.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/XsTypeConverter.java?rev=1896801&r1=1896800&r2=1896801&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/XsTypeConverter.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/util/XsTypeConverter.java Fri Jan 7 13:36:47 2022
@@ -72,7 +72,7 @@ public final class XsTypeConverter {
}
}
- public static float lexFloat(CharSequence cs, Collection errors) {
+ public static float lexFloat(CharSequence cs, Collection<XmlError> errors) {
try {
return lexFloat(cs);
} catch (NumberFormatException e) {
@@ -127,7 +127,7 @@ public final class XsTypeConverter {
}
}
- public static double lexDouble(CharSequence cs, Collection errors) {
+ public static double lexDouble(CharSequence cs, Collection<XmlError> errors) {
try {
return lexDouble(cs);
} catch (NumberFormatException e) {
@@ -229,7 +229,7 @@ public final class XsTypeConverter {
return new BigInteger(trimInitialPlus(v));
}
- public static BigInteger lexInteger(CharSequence cs, Collection errors) {
+ public static BigInteger lexInteger(CharSequence cs, Collection<XmlError> errors) {
try {
return lexInteger(cs);
} catch (NumberFormatException e) {
@@ -250,7 +250,7 @@ public final class XsTypeConverter {
return Long.parseLong(trimInitialPlus(v));
}
- public static long lexLong(CharSequence cs, Collection errors) {
+ public static long lexLong(CharSequence cs, Collection<XmlError> errors) {
try {
return lexLong(cs);
} catch (NumberFormatException e) {
@@ -271,7 +271,7 @@ public final class XsTypeConverter {
return parseShort(cs);
}
- public static short lexShort(CharSequence cs, Collection errors) {
+ public static short lexShort(CharSequence cs, Collection<XmlError> errors) {
try {
return lexShort(cs);
} catch (NumberFormatException e) {
@@ -292,7 +292,7 @@ public final class XsTypeConverter {
return parseInt(cs);
}
- public static int lexInt(CharSequence cs, Collection errors) {
+ public static int lexInt(CharSequence cs, Collection<XmlError> errors) {
try {
return lexInt(cs);
} catch (NumberFormatException e) {
@@ -313,7 +313,7 @@ public final class XsTypeConverter {
return parseByte(cs);
}
- public static byte lexByte(CharSequence cs, Collection errors) {
+ public static byte lexByte(CharSequence cs, Collection<XmlError> errors) {
try {
return lexByte(cs);
} catch (NumberFormatException e) {
@@ -421,7 +421,7 @@ public final class XsTypeConverter {
return new QName(uri, localname);
}
- public static QName lexQName(String xsd_qname, Collection errors,
+ public static QName lexQName(String xsd_qname, Collection<XmlError> errors,
NamespaceContext nscontext) {
try {
return lexQName(xsd_qname, nscontext);
@@ -433,7 +433,7 @@ public final class XsTypeConverter {
}
public static String printQName(QName qname, NamespaceContext nsContext,
- Collection errors) {
+ Collection<XmlError> errors) {
final String uri = qname.getNamespaceURI();
assert uri != null; //qname is not allowed to have null uri values
final String prefix;
@@ -469,7 +469,7 @@ public final class XsTypeConverter {
return new GDate(charSeq);
}
- public static GDate lexGDate(String xsd_gdate, Collection errors) {
+ public static GDate lexGDate(String xsd_gdate, Collection<XmlError> errors) {
try {
return lexGDate(xsd_gdate);
} catch (IllegalArgumentException e) {
@@ -478,7 +478,7 @@ public final class XsTypeConverter {
}
}
- public static String printGDate(GDate gdate, Collection errors) {
+ public static String printGDate(GDate gdate, Collection<XmlError> errors) {
return gdate.toString();
}
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/ValidatorUtil.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/ValidatorUtil.java?rev=1896801&r1=1896800&r2=1896801&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/ValidatorUtil.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/ValidatorUtil.java Fri Jan 7 13:36:47 2022
@@ -17,6 +17,7 @@ package org.apache.xmlbeans.impl.validat
import org.apache.xmlbeans.SchemaType;
import org.apache.xmlbeans.XmlCursor;
+import org.apache.xmlbeans.XmlError;
import org.apache.xmlbeans.impl.common.PrefixResolver;
import org.apache.xmlbeans.impl.common.ValidatorListener;
import org.apache.xmlbeans.impl.common.XmlWhitespace;
@@ -103,7 +104,7 @@ public class ValidatorUtil
}
public static boolean validateSimpleType (
- SchemaType type, String value, Collection errors, PrefixResolver prefixResolver )
+ SchemaType type, String value, Collection<XmlError> errors, PrefixResolver prefixResolver )
{
if (!type.isSimpleType() && type.getContentType() != SchemaType.SIMPLE_CONTENT)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org