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:04:14 UTC
svn commit: r1896799 - in /xmlbeans/trunk/src/main/java/org/apache/xmlbeans: ./ impl/common/ impl/inst2xsd/ impl/tool/ impl/validator/
Author: fanningpj
Date: Fri Jan 7 13:04:14 2022
New Revision: 1896799
URL: http://svn.apache.org/viewvc?rev=1896799&view=rev
Log:
use more generics internally
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SchemaTypeSystem.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SystemProperties.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlObject.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/Sax2Dom.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/CommandLine.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/ValidatingXMLStreamReader.java
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=1896799&r1=1896798&r2=1896799&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 13:04:14 2022
@@ -112,7 +112,7 @@ import java.io.File;
* {@link SchemaType} in the SchemaTypeSystem once, including nested
* definitions.
* <pre>{@code
- * List<SchemaType> 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()));
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SystemProperties.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SystemProperties.java?rev=1896799&r1=1896798&r2=1896799&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SystemProperties.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/SystemProperties.java Fri Jan 7 13:04:14 2022
@@ -32,7 +32,8 @@ public class SystemProperties {
return null;
}
}
- return (String) propertyH.get(key);
+ Object ret = propertyH.get(key);
+ return ret == null ? null : ret.toString();
}
public static String getProperty(String key, String defaultValue) {
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=1896799&r1=1896798&r2=1896799&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:04:14 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 errorList = new ArrayList();
+ * ArrayList<XmlError> errorList = new ArrayList<>();
* validateOptions.setErrorListener(errorList);
*
* // Validate the XML.
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java?rev=1896799&r1=1896798&r2=1896799&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java Fri Jan 7 13:04:14 2022
@@ -30,7 +30,7 @@ import java.util.Map;
public class QNameHelper
{
- private static final Map WELL_KNOWN_PREFIXES = buildWKP();
+ private static final Map<String, String> WELL_KNOWN_PREFIXES = buildWKP();
public static XMLName getXMLName(QName qname)
{
@@ -178,9 +178,9 @@ public class QNameHelper
return hexsafe(name.getNamespaceURI()) + "/" + hexsafe(name.getLocalPart());
}
- private static Map buildWKP()
+ private static Map<String, String> buildWKP()
{
- Map result = new HashMap();
+ Map<String, String> result = new HashMap<>();
result.put("http://www.w3.org/XML/1998/namespace", "xml");
result.put("http://www.w3.org/2001/XMLSchema", "xs");
result.put("http://www.w3.org/2001/XMLSchema-instance", "xsi");
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/Sax2Dom.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/Sax2Dom.java?rev=1896799&r1=1896798&r2=1896799&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/Sax2Dom.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/Sax2Dom.java Fri Jan 7 13:04:14 2022
@@ -43,8 +43,8 @@ public class Sax2Dom
private Node _root = null;
private Document _document = null;
- private Stack _nodeStk = new Stack();
- private Vector _namespaceDecls = null;
+ private Stack<Node> _nodeStk = new Stack<>();
+ private Vector<String> _namespaceDecls = null;
public Sax2Dom() throws ParserConfigurationException
{
@@ -77,7 +77,7 @@ public class Sax2Dom
public void characters(char[] ch, int start, int length)
{
- final Node last = (Node) _nodeStk.peek();
+ final Node last = _nodeStk.peek();
// No text nodes can be children of root (DOM006 exception)
if (last != _document)
@@ -108,17 +108,16 @@ public class Sax2Dom
final int nDecls = _namespaceDecls.size();
for (int i = 0; i < nDecls; i++)
{
- final String prefix = (String) _namespaceDecls.elementAt(i++);
+ final String prefix = _namespaceDecls.elementAt(i++);
if (prefix == null || prefix.equals(EMPTYSTRING))
{
- tmp.setAttributeNS(XMLNS_URI, XMLNS_PREFIX,
- (String) _namespaceDecls.elementAt(i));
+ tmp.setAttributeNS(XMLNS_URI, XMLNS_PREFIX, _namespaceDecls.elementAt(i));
}
else
{
tmp.setAttributeNS(XMLNS_URI, XMLNS_STRING + prefix,
- (String) _namespaceDecls.elementAt(i));
+ _namespaceDecls.elementAt(i));
}
}
_namespaceDecls.clear();
@@ -140,7 +139,7 @@ public class Sax2Dom
}
// Append this new node onto current stack node
- Node last = (Node) _nodeStk.peek();
+ Node last = _nodeStk.peek();
last.appendChild(tmp);
// Push this node onto stack
@@ -180,7 +179,7 @@ public class Sax2Dom
*/
public void processingInstruction(String target, String data)
{
- final Node last = (Node) _nodeStk.peek();
+ final Node last = _nodeStk.peek();
ProcessingInstruction pi = _document.createProcessingInstruction(
target, data);
if (pi != null) last.appendChild(pi);
@@ -208,7 +207,7 @@ public class Sax2Dom
*/
public void comment(char[] ch, int start, int length)
{
- final Node last = (Node) _nodeStk.peek();
+ final Node last = _nodeStk.peek();
Comment comment = _document.createComment(new String(ch, start, length));
if (comment != null) last.appendChild(comment);
}
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java?rev=1896799&r1=1896798&r2=1896799&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java Fri Jan 7 13:04:14 2022
@@ -298,7 +298,7 @@ public class Inst2Xsd
private static boolean validateInstances(SchemaDocument[] sDocs, XmlObject[] instances)
{
SchemaTypeLoader sLoader;
- Collection<XmlError> compErrors = new ArrayList();
+ Collection<XmlError> compErrors = new ArrayList<>();
XmlOptions schemaOptions = new XmlOptions();
schemaOptions.setErrorListener(compErrors);
try
@@ -339,7 +339,7 @@ public class Inst2Xsd
continue;
}
- Collection<XmlError> errors = new ArrayList();
+ Collection<XmlError> errors = new ArrayList<>();
if (xobj.schemaType() == XmlObject.type)
{
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=1896799&r1=1896798&r2=1896799&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:04:14 2022
@@ -108,7 +108,7 @@ public class CommandLine
public String getOpt(String opt)
{
- return (String)_options.get(opt);
+ return _options.get(opt);
}
private static List collectFiles(File[] dirs)
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/ValidatingXMLStreamReader.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/ValidatingXMLStreamReader.java?rev=1896799&r1=1896798&r2=1896799&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/ValidatingXMLStreamReader.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/ValidatingXMLStreamReader.java Fri Jan 7 13:04:14 2022
@@ -54,7 +54,7 @@ public class ValidatingXMLStreamReader
private SchemaType _contentType;
private SchemaTypeLoader _stl;
private XmlOptions _options;
- private Collection _errorListener;
+ private Collection<XmlError> _errorListener;
protected Validator _validator;
private final ElementEventImpl _elemEvent;
private final AttributeEventImpl _attEvent;
@@ -67,8 +67,8 @@ public class ValidatingXMLStreamReader
private final int STATE_ATTBUFFERING = 2;
private final int STATE_ERROR = 3;
- private List _attNamesList;
- private List _attValuesList;
+ private List<QName> _attNamesList;
+ private List<String> _attValuesList;
private SchemaType _xsiType;
private int _depth;
@@ -96,7 +96,7 @@ public class ValidatingXMLStreamReader
* @param errorListener Errors and warnings listener
*/
public void init(XMLStreamReader xsr, boolean startWithCurrentEvent, SchemaType contentType,
- SchemaTypeLoader stl, XmlOptions options, Collection errorListener)
+ SchemaTypeLoader stl, XmlOptions options, Collection<XmlError> errorListener)
{
_packTextXmlStreamReader.init(xsr);
@@ -598,8 +598,8 @@ public class ValidatingXMLStreamReader
if (_attNamesList==null)
{
- _attNamesList = new ArrayList();
- _attValuesList = new ArrayList();
+ _attNamesList = new ArrayList<>();
+ _attValuesList = new ArrayList<>();
}
// skip xsi:type xsi:nil xsi:schemaLocation xsi:noNamespaceSchemaLocation
if (isSpecialAttribute(qname))
@@ -813,8 +813,8 @@ public class ValidatingXMLStreamReader
}
else
{
- _simpleEvent._qname = (QName)_attNamesList.get(attIndex);
- _simpleEvent._text = (String)_attValuesList.get(attIndex);
+ _simpleEvent._qname = _attNamesList.get(attIndex);
+ _simpleEvent._text = _attValuesList.get(attIndex);
event = _simpleEvent;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org