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/08 10:12:51 UTC
svn commit: r1896828 - in /xmlbeans/trunk/src/main/java/org/apache/xmlbeans: ./ impl/inst2xsd/ impl/soap/ impl/tool/ impl/xsd2inst/
Author: fanningpj
Date: Sat Jan 8 10:12:51 2022
New Revision: 1896828
URL: http://svn.apache.org/viewvc?rev=1896828&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/impl/inst2xsd/Inst2Xsd.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/AttachmentPart.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/Detail.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPMessage.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPPart.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/InstanceValidator.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/PrettyPrinter.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/SchemaCodeGenerator.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/SchemaImportResolver.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=1896828&r1=1896827&r2=1896828&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:12:51 2022
@@ -75,21 +75,21 @@ public class QNameSetBuilder implements
* @param excludedQNamesInIncludedURIs the finite set of exceptional QNames to exclude from the included namespaces
* @param includedQNamesInExcludedURIs the finite set of exceptional QNames to include that are in the excluded namespaces
*/
- public QNameSetBuilder(Set<String> excludedURIs, Set<String> includedURIs, Set excludedQNamesInIncludedURIs, Set includedQNamesInExcludedURIs)
+ public QNameSetBuilder(Set<String> excludedURIs, Set<String> includedURIs, Set<QName> excludedQNamesInIncludedURIs, Set<QName> includedQNamesInExcludedURIs)
{
if (includedURIs != null && excludedURIs == null)
{
_inverted = false;
- _includedURIs = new HashSet(includedURIs);
- _excludedQNames = new HashSet(excludedQNamesInIncludedURIs);
- _includedQNames = new HashSet(includedQNamesInExcludedURIs);
+ _includedURIs = new HashSet<>(includedURIs);
+ _excludedQNames = new HashSet<>(excludedQNamesInIncludedURIs);
+ _includedQNames = new HashSet<>(includedQNamesInExcludedURIs);
}
else if (excludedURIs != null && includedURIs == null)
{
_inverted = true;
- _includedURIs = new HashSet(excludedURIs);
- _excludedQNames = new HashSet(includedQNamesInExcludedURIs);
- _includedQNames = new HashSet(excludedQNamesInIncludedURIs);
+ _includedURIs = new HashSet<>(excludedURIs);
+ _excludedQNames = new HashSet<>(includedQNamesInExcludedURIs);
+ _includedQNames = new HashSet<>(excludedQNamesInIncludedURIs);
}
else
throw new IllegalArgumentException("Exactly one of excludedURIs and includedURIs must be null");
@@ -333,8 +333,8 @@ public class QNameSetBuilder implements
private boolean isDisjointImpl(QNameSetSpecification set1, QNameSetSpecification set2)
{
- Set includeURIs = set1.includedURIs();
- Set otherIncludeURIs = set2.includedURIs();
+ Set<String> includeURIs = set1.includedURIs();
+ Set<String> otherIncludeURIs = set2.includedURIs();
if (otherIncludeURIs != null)
{
for (Iterator<String> i = includeURIs.iterator(); i.hasNext(); )
@@ -345,7 +345,7 @@ public class QNameSetBuilder implements
}
else
{
- Set otherExcludeURIs = set2.excludedURIs();
+ Set<String> otherExcludeURIs = set2.excludedURIs();
for (Iterator<String> i = includeURIs.iterator(); i.hasNext(); )
{
if (!otherExcludeURIs.contains(i.next()))
@@ -402,7 +402,7 @@ public class QNameSetBuilder implements
/**
* Adds an entire namespace URI of QNames to this QNameSetBuilder.
- * The empty string is used to signifiy the (local) no-namespace.
+ * The empty string is used to signify the (local) no-namespace.
*/
public void addNamespace(String uri)
{
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=1896828&r1=1896827&r2=1896828&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 Sat Jan 8 10:12:51 2022
@@ -42,7 +42,7 @@ public class Inst2Xsd
return;
}
- Set flags = new HashSet();
+ Set<String> flags = new HashSet<>();
flags.add("h");
flags.add("help");
flags.add("usage");
@@ -51,7 +51,7 @@ public class Inst2Xsd
flags.add("verbose");
flags.add("validate");
- Set opts = new HashSet();
+ Set<String> opts = new HashSet<>();
opts.add("design");
opts.add("simple-content-types");
opts.add("enumerations");
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/AttachmentPart.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/AttachmentPart.java?rev=1896828&r1=1896827&r2=1896828&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/AttachmentPart.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/AttachmentPart.java Sat Jan 8 10:12:51 2022
@@ -351,7 +351,7 @@ public abstract class AttachmentPart {
* @return an {@code Iterator} object with all of the Mime
* headers for this {@code AttachmentPart} object
*/
- public abstract Iterator getAllMimeHeaders();
+ public abstract Iterator<MimeHeader> getAllMimeHeaders();
/**
* Retrieves all {@code MimeHeader} objects that match
@@ -362,7 +362,7 @@ public abstract class AttachmentPart {
* in the given array as an {@code Iterator}
* object
*/
- public abstract Iterator getMatchingMimeHeaders(String[] names);
+ public abstract Iterator<MimeHeader> getMatchingMimeHeaders(String[] names);
/**
* Retrieves all {@code MimeHeader} objects whose name
@@ -375,5 +375,5 @@ public abstract class AttachmentPart {
* headers are returned as an {@code Iterator}
* object.
*/
- public abstract Iterator getNonMatchingMimeHeaders(String[] names);
+ public abstract Iterator<MimeHeader> getNonMatchingMimeHeaders(String[] names);
}
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/Detail.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/Detail.java?rev=1896828&r1=1896827&r2=1896828&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/Detail.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/Detail.java Sat Jan 8 10:12:51 2022
@@ -61,5 +61,5 @@ public interface Detail extends SOAPFaul
* @return an {@code Iterator} object over the {@code DetailEntry}
* objects in this {@code Detail} object
*/
- public abstract Iterator getDetailEntries();
+ public abstract Iterator<DetailEntry> getDetailEntries();
}
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPMessage.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPMessage.java?rev=1896828&r1=1896827&r2=1896828&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPMessage.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPMessage.java Sat Jan 8 10:12:51 2022
@@ -143,7 +143,7 @@ public abstract class SOAPMessage {
* @return an iterator over all the attachments in this
* message
*/
- public abstract Iterator getAttachments();
+ public abstract Iterator<AttachmentPart> getAttachments();
/**
* Retrieves all the {@code AttachmentPart} objects
@@ -156,7 +156,7 @@ public abstract class SOAPMessage {
* @return an iterator over all attachments that have a header
* that matches one of the given headers
*/
- public abstract Iterator getAttachments(MimeHeaders headers);
+ public abstract Iterator<AttachmentPart> getAttachments(MimeHeaders headers);
/**
* Adds the given {@code AttachmentPart} object to this
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPPart.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPPart.java?rev=1896828&r1=1896827&r2=1896828&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPPart.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/soap/SOAPPart.java Sat Jan 8 10:12:51 2022
@@ -212,7 +212,7 @@ public abstract class SOAPPart implement
* @return an {@code Iterator} object with all of the Mime
* headers for this {@code SOAPPart} object
*/
- public abstract Iterator getAllMimeHeaders();
+ public abstract Iterator<MimeHeader> getAllMimeHeaders();
/**
* Retrieves all {@code MimeHeader} objects that match
@@ -223,7 +223,7 @@ public abstract class SOAPPart implement
* in the given array, returned as an {@code Iterator}
* object
*/
- public abstract Iterator getMatchingMimeHeaders(String[] names);
+ public abstract Iterator<MimeHeader> getMatchingMimeHeaders(String[] names);
/**
* Retrieves all {@code MimeHeader} objects whose name
@@ -235,7 +235,7 @@ public abstract class SOAPPart implement
* given array. The nonmatching MIME headers are returned as
* an {@code Iterator} object.
*/
- public abstract Iterator getNonMatchingMimeHeaders(String[] names);
+ public abstract Iterator<MimeHeader> getNonMatchingMimeHeaders(String[] names);
/**
* Sets the content of the {@code SOAPEnvelope} object
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/InstanceValidator.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/InstanceValidator.java?rev=1896828&r1=1896827&r2=1896828&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/InstanceValidator.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/InstanceValidator.java Sat Jan 8 10:12:51 2022
@@ -45,7 +45,7 @@ public class InstanceValidator {
* @return exitCode
*/
public static int extraMain(String[] args) {
- Set flags = new HashSet();
+ Set<String> flags = new HashSet<>();
flags.add("h");
flags.add("help");
flags.add("usage");
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/PrettyPrinter.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/PrettyPrinter.java?rev=1896828&r1=1896827&r2=1896828&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/PrettyPrinter.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/PrettyPrinter.java Sat Jan 8 10:12:51 2022
@@ -41,7 +41,7 @@ public class PrettyPrinter
public static void main(String[] args)
{
- Set flags = new HashSet();
+ Set<String> flags = new HashSet<>();
flags.add("h");
flags.add("help");
flags.add("usage");
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/SchemaCodeGenerator.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/SchemaCodeGenerator.java?rev=1896828&r1=1896827&r2=1896828&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/SchemaCodeGenerator.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/SchemaCodeGenerator.java Sat Jan 8 10:12:51 2022
@@ -150,7 +150,7 @@ public class SchemaCodeGenerator {
}
}
- private static Set deleteFileQueue = new HashSet();
+ private static Set<File> deleteFileQueue = new HashSet<>();
private static int triesRemaining = 0;
private static boolean tryNowThatItsLater() {
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/SchemaImportResolver.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/SchemaImportResolver.java?rev=1896828&r1=1896827&r2=1896828&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/SchemaImportResolver.java (original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/SchemaImportResolver.java Sat Jan 8 10:12:51 2022
@@ -66,9 +66,9 @@ public abstract class SchemaImportResolv
protected final void resolveImports(SchemaResource[] resources)
{
- LinkedList queueOfResources = new LinkedList(Arrays.asList(resources));
- LinkedList queueOfLocators = new LinkedList();
- Set seenResources = new HashSet();
+ LinkedList<SchemaResource> queueOfResources = new LinkedList<>(Arrays.asList(resources));
+ LinkedList<SchemaLocator> queueOfLocators = new LinkedList<>();
+ Set<SchemaResource> seenResources = new HashSet<>();
for (;;)
{
@@ -78,12 +78,12 @@ public abstract class SchemaImportResolv
if (!queueOfResources.isEmpty())
{
// either off the initial queue
- nextResource = (SchemaResource)queueOfResources.removeFirst();
+ nextResource = queueOfResources.removeFirst();
}
else if (!queueOfLocators.isEmpty())
{
// or off the list of locators
- SchemaLocator locator = (SchemaLocator)queueOfLocators.removeFirst();
+ SchemaLocator locator = queueOfLocators.removeFirst();
nextResource = lookupResource(locator.namespace, locator.schemaLocation);
if (nextResource == null)
continue;
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=1896828&r1=1896827&r2=1896828&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 Sat Jan 8 10:12:51 2022
@@ -44,7 +44,7 @@ public class StreamInstanceValidator
public static void main(String[] args)
{
- Set flags = new HashSet();
+ Set<String> flags = new HashSet<>();
flags.add("h");
flags.add("help");
flags.add("usage");
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=1896828&r1=1896827&r2=1896828&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 Sat Jan 8 10:12:51 2022
@@ -56,7 +56,7 @@ public class TypeHierarchyPrinter
public static void main(String[] args) throws Exception
{
- Set flags = new HashSet();
+ Set<String> flags = new HashSet<>();
flags.add("h");
flags.add("help");
flags.add("usage");
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=1896828&r1=1896827&r2=1896828&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 Sat Jan 8 10:12:51 2022
@@ -115,8 +115,8 @@ public class SchemaInstanceGenerator
public static void main(String[] args)
{
- Set flags = new HashSet();
- Set opts = new HashSet();
+ Set<String> flags = new HashSet<>();
+ Set<String> opts = new HashSet<>();
flags.add("h");
flags.add("help");
flags.add("usage");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org