Author: fanningpj
Date: Fri Jan 7 12:08:17 2022
New Revision: 1896793
URL: http://svn.apache.org/viewvc?rev=1896793&view=rev
Log:
use more generics internally
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/QNameSetBuilder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaTypeSystem.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/StringEnumAbstractBase.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/StreamInstanceValidator.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/TypeHierarchyPrinter.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xsd2inst/SchemaInstanceGenerator.java
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/QNameSetBuilder.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/QNameSetBuilder.java?rev=1896793&r1=1896792&r2=1896793&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/QNameSetBuilder.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/QNameSetBuilder.java Fri
Jan 7 12:08:17 2022
@@ -152,7 +152,7 @@ public class QNameSetBuilder implements
}
/**
- * Local xml names are hased using "" as the namespace.
+ * Local xml names are created using "" as the namespace.
*/
private static String nsFromName(QName QName)
{
@@ -181,7 +181,7 @@ public class QNameSetBuilder implements
if (s.length() == 0)
return EMPTY_STRINGARRAY;
- List result = new ArrayList();
+ List<String> result = new ArrayList();
int i = 0;
int start = 0;
for (;;)
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaTypeSystem.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaTypeSystem.java?rev=1896793&r1=1896792&r2=1896793&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaTypeSystem.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaTypeSystem.java Fri
Jan 7 12:08:17 2022
@@ -112,13 +112,13 @@ import java.io.File;
* {@link SchemaType} in the SchemaTypeSystem once, including nested
* definitions.
* <pre>{@code
- * List allSeenTypes = new ArrayList();
+ * List<SchemaType> allSeenTypes = new ArrayList();
* allSeenTypes.addAll(Arrays.asList(typeSystem.documentTypes()));
* allSeenTypes.addAll(Arrays.asList(typeSystem.attributeTypes()));
* allSeenTypes.addAll(Arrays.asList(typeSystem.globalTypes()));
* for (int i = 0; i < allSeenTypes.size(); i++)
* {
- * SchemaType sType = (SchemaType)allSeenTypes.get(i);
+ * SchemaType sType = allSeenTypes.get(i);
* System.out.println("Visiting " + sType.toString());
* allSeenTypes.addAll(Arrays.asList(sType.getAnonymousTypes()));
* }
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/StringEnumAbstractBase.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/StringEnumAbstractBase.java?rev=1896793&r1=1896792&r2=1896793&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/StringEnumAbstractBase.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/StringEnumAbstractBase.java
Fri Jan 7 12:08:17 2022
@@ -62,12 +62,13 @@ public class StringEnumAbstractBase impl
*/
public static final class Table
{
- private Map _map;
- private List _list;
+ private Map<String, StringEnumAbstractBase> _map;
+ private List<StringEnumAbstractBase> _list;
+
public Table(StringEnumAbstractBase[] array)
{
- _map = new HashMap(array.length);
- _list = new ArrayList(array.length + 1);
+ _map = new HashMap<>(array.length);
+ _list = new ArrayList<>(array.length + 1);
for (int i = 0; i < array.length; i++)
{
_map.put(array[i].toString(), array[i]);
@@ -81,14 +82,14 @@ public class StringEnumAbstractBase impl
/** Returns the singleton for a {@link String}, or null if none. */
public StringEnumAbstractBase forString(String s)
{
- return (StringEnumAbstractBase)_map.get(s);
+ return _map.get(s);
}
/** Returns the singleton for an int code, or null if none. */
public StringEnumAbstractBase forInt(int i)
{
if (i < 0 || i > _list.size())
return null;
- return (StringEnumAbstractBase)_list.get(i);
+ return _list.get(i);
}
/** Returns the last valid int code (the first is 1; zero is not
used). */
public int lastInt()
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/StreamInstanceValidator.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/StreamInstanceValidator.java?rev=1896793&r1=1896792&r2=1896793&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/StreamInstanceValidator.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/StreamInstanceValidator.java
Fri Jan 7 12:08:17 2022
@@ -98,7 +98,7 @@ public class StreamInstanceValidator
File[] instanceFiles = cl.filesEndingWith(".xml");
File[] jarFiles = cl.filesEndingWith(".jar");
- List sdocs = new ArrayList();
+ List<XmlObject> sdocs = new ArrayList<>();
final XmlOptions options = (new XmlOptions()).setLoadLineNumbers();
for (int i = 0; i < schemaFiles.length; i++) {
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=1896793&r1=1896792&r2=1896793&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 12:08:17 2022
@@ -113,7 +113,7 @@ public class TypeHierarchyPrinter
File[] jarFiles = cl.filesEndingWith(".jar");
// step 1: load all the files
- List sdocs = new ArrayList();
+ List<XmlObject> sdocs = new ArrayList<>();
for (int i = 0; i < schemaFiles.length; i++)
{
try
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xsd2inst/SchemaInstanceGenerator.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xsd2inst/SchemaInstanceGenerator.java?rev=1896793&r1=1896792&r2=1896793&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xsd2inst/SchemaInstanceGenerator.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/xsd2inst/SchemaInstanceGenerator.java
Fri Jan 7 12:08:17 2022
@@ -15,25 +15,22 @@
package org.apache.xmlbeans.impl.xsd2inst;
+import org.apache.xmlbeans.SchemaType;
+import org.apache.xmlbeans.SchemaTypeSystem;
+import org.apache.xmlbeans.XmlBeans;
+import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.XmlOptions;
+import org.apache.xmlbeans.impl.tool.CommandLine;
+import java.io.File;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.util.ArrayList;
-import java.io.File;
import java.util.HashSet;
-import org.apache.xmlbeans.XmlOptions;
-import org.apache.xmlbeans.XmlBeans;
-import org.apache.xmlbeans.SchemaTypeSystem;
-import org.apache.xmlbeans.SchemaType;
-import org.apache.xmlbeans.impl.xsd2inst.SampleXmlUtil;
-import java.util.Set;
-import org.apache.xmlbeans.XmlException;
-import java.util.Iterator;
import java.util.List;
-import java.util.Collection;
-import org.apache.xmlbeans.impl.tool.CommandLine;
+import java.util.Set;
public class SchemaInstanceGenerator
{
@@ -174,7 +171,7 @@ public class SchemaInstanceGenerator
}
// Process Schema files
- List sdocs = new ArrayList();
+ List<XmlObject> sdocs = new ArrayList<>();
for (int i = 0; i < schemaFiles.length; i++)
{
try
@@ -189,7 +186,7 @@ public class SchemaInstanceGenerator
}
}
- XmlObject[] schemas = (XmlObject[]) sdocs.toArray(new
XmlObject[sdocs.size()]);
+ XmlObject[] schemas = sdocs.toArray(new XmlObject[sdocs.size()]);
Xsd2InstOptions options = new Xsd2InstOptions();
options.setNetworkDownloads(dl);
@@ -222,7 +219,7 @@ public class SchemaInstanceGenerator
public static String xsd2inst(Reader[] schemaReaders, String rootName,
Xsd2InstOptions options)
{
// Process Schema files
- List sdocs = new ArrayList();
+ List<XmlObject> sdocs = new ArrayList<>();
for (int i = 0; i < schemaReaders.length; i++)
{
try
@@ -237,7 +234,7 @@ public class SchemaInstanceGenerator
}
}
- XmlObject[] schemas = (XmlObject[]) sdocs.toArray(new
XmlObject[sdocs.size()]);
+ XmlObject[] schemas = sdocs.toArray(new XmlObject[sdocs.size()]);
return xsd2inst(schemas, rootName, options);
}
@@ -248,7 +245,6 @@ public class SchemaInstanceGenerator
SchemaTypeSystem sts = null;
if (schemas.length > 0)
{
- Collection errors = new ArrayList();
XmlOptions compileOptions = new XmlOptions();
if (options.isNetworkDownloads())
compileOptions.setCompileDownloadUrls();
@@ -263,12 +259,7 @@ public class SchemaInstanceGenerator
}
catch (Exception e)
{
- if (errors.isEmpty() || !(e instanceof XmlException))
- e.printStackTrace();
-
- System.out.println("Schema compilation errors: ");
- for (Iterator i = errors.iterator(); i.hasNext(); )
- System.out.println(i.next());
+ e.printStackTrace();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
