Author: fanningpj
Date: Sat Jan 8 10:27:08 2022
New Revision: 1896829
URL: http://svn.apache.org/viewvc?rev=1896829&view=rev
Log:
increase use of generics
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/QNameSetBuilder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlENTITIES.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlIDREFS.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNMTOKENS.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/IdentityConstraint.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/BindingConfigImpl.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/CommandLine.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/ValidatingInfoXMLStreamReader.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=1896829&r1=1896828&r2=1896829&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/QNameSetBuilder.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/QNameSetBuilder.java Sat
Jan 8 10:27:08 2022
@@ -501,7 +501,7 @@ public class QNameSetBuilder implements
private void addAllImpl(Set<String> includedURIs, Set<String>
excludedURIs, Set<QName> includedQNames, Set<QName> excludedQNames)
{
boolean exclude = (excludedURIs != null);
- Set specialURIs = exclude ? excludedURIs : includedURIs;
+ Set<String> specialURIs = exclude ? excludedURIs : includedURIs;
for (Iterator<QName> i = _excludedQNames.iterator(); i.hasNext(); )
{
@@ -552,7 +552,7 @@ public class QNameSetBuilder implements
else
_includedURIs.remove(uri);
}
- Set temp = _excludedQNames;
+ Set<QName> temp = _excludedQNames;
_excludedQNames = _includedQNames;
_includedQNames = temp;
_inverted = !_inverted;
@@ -589,10 +589,10 @@ public class QNameSetBuilder implements
/**
* Implementation of remove(set) that ignores inversion.
*/
- private void removeAllImpl(Set includedURIs, Set excludedURIs, Set
includedQNames, Set excludedQNames)
+ private void removeAllImpl(Set<String> includedURIs, Set<String>
excludedURIs, Set<QName> includedQNames, Set<QName> excludedQNames)
{
boolean exclude = (excludedURIs != null);
- Set specialURIs = exclude ? excludedURIs : includedURIs;
+ Set<String> specialURIs = exclude ? excludedURIs : includedURIs;
for (Iterator<QName> i = _includedQNames.iterator(); i.hasNext(); )
{
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=1896829&r1=1896828&r2=1896829&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlENTITIES.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlENTITIES.java Sat Jan
8 10:27:08 2022
@@ -38,12 +38,12 @@ public interface XmlENTITIES extends Xml
/**
* Returns the value as a {@link List} of {@link String} values
*/
- List getListValue();
+ List<?> getListValue();
/**
* Returns the value as a {@link List} of {@link XmlENTITY} values
**/
- List xgetListValue();
+ List<? extends XmlAnySimpleType> xgetListValue();
/**
* Sets the value as a {@link List}
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=1896829&r1=1896828&r2=1896829&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlIDREFS.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlIDREFS.java Sat Jan 8
10:27:08 2022
@@ -42,12 +42,12 @@ public interface XmlIDREFS extends XmlAn
/**
* Returns the value as a {@link List} of {@link String} values
*/
- List getListValue();
+ List<?> getListValue();
/**
* Returns the value as a {@link List} of {@link XmlIDREF} values
*/
- List xgetListValue();
+ List<? extends XmlAnySimpleType> xgetListValue();
/**
* Sets the value as a {@link List}
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=1896829&r1=1896828&r2=1896829&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNMTOKENS.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlNMTOKENS.java Sat Jan
8 10:27:08 2022
@@ -38,12 +38,12 @@ public interface XmlNMTOKENS extends Xml
/**
* Returns the value as a {@link List} of {@link String} values
*/
- List getListValue();
+ List<?> getListValue();
/**
* Returns the value as a {@link List} of {@link XmlNMTOKEN} values
*/
- List xgetListValue();
+ List<? extends XmlAnySimpleType> xgetListValue();
/**
* Sets the value as a {@link List}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/IdentityConstraint.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/IdentityConstraint.java?rev=1896829&r1=1896828&r2=1896829&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/IdentityConstraint.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/IdentityConstraint.java
Sat Jan 8 10:27:08 2022
@@ -600,13 +600,12 @@ public class IdentityConstraint {
return;
}
- List l = lv.xgetListValue();
+ List<? extends XmlAnySimpleType> l = lv.xgetListValue();
// Add one value for each idref in the list
- for (Object o : l) {
+ for (XmlAnySimpleType o : l) {
XmlObjectList xmlValue = new XmlObjectList(1);
- XmlIDREF idref = (XmlIDREF) o;
- xmlValue.set(idref, 0);
+ xmlValue.set(o, 0);
_values.add(xmlValue);
}
} else if (XmlIDREF.type.isAssignableFrom(st)) {
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/BindingConfigImpl.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/BindingConfigImpl.java?rev=1896829&r1=1896828&r2=1896829&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/BindingConfigImpl.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/BindingConfigImpl.java
Sat Jan 8 10:27:08 2022
@@ -64,7 +64,7 @@ public class BindingConfigImpl extends B
Qnameconfig[] qnc = config.getQnameArray();
for (Qnameconfig qnameconfig : qnc) {
- List applyto = qnameconfig.xgetTarget().xgetListValue();
+ List<? extends XmlAnySimpleType> applyto =
qnameconfig.xgetTarget().xgetListValue();
QName name = qnameconfig.getName();
String javaname = qnameconfig.getJavaname();
for (Object o : applyto) {
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=1896829&r1=1896828&r2=1896829&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
Sat Jan 8 10:27:08 2022
@@ -111,7 +111,7 @@ public class CommandLine
return _options.get(opt);
}
- private static List collectFiles(File[] dirs)
+ private static List<File> collectFiles(File[] dirs)
{
List<File> files = new ArrayList<>();
for (int i = 0; i < dirs.length; i++)
@@ -169,7 +169,7 @@ public class CommandLine
return _files;
}
- private List getUrlList()
+ private List<URL> getUrlList()
{
if (_urls == null)
{
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/ValidatingInfoXMLStreamReader.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/ValidatingInfoXMLStreamReader.java?rev=1896829&r1=1896828&r2=1896829&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/ValidatingInfoXMLStreamReader.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/validator/ValidatingInfoXMLStreamReader.java
Sat Jan 8 10:27:08 2022
@@ -153,12 +153,12 @@ public class ValidatingInfoXMLStreamRead
return _validator==null ? null : _validator.getByteArrayValue();
}
- public List getListValue()
+ public List<?> getListValue()
{
return _validator==null ? null : _validator.getListValue();
}
- public List getListTypes()
+ public List<SchemaType> getListTypes()
{
return _validator==null ? null : _validator.getListTypes();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
