Cleanup warnings in gnu.xml.transform.* and gnu.xml.util.*.

2016-01-04  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	Cleanup warnings in gnu.xml.transform.* and
	gnu.xml.util.*.
	* gnu/xml/transform/AbstractNumberNode.java:
	(format(String,int[])): Add type parameters to
	lists and remove unnecessary casts.
	* gnu/xml/transform/ApplyTemplatesNode.java:
	Add type parameters to sortKeys and withParams.
	(ApplyTemplatesNode(Expr,QName,List,List,boolean)):
	Add type parameters to arguments.
	(clone(Stylesheet)): Add type parameters to lists
	and remove unnecessary casts.
	(doApply(Stylesheet,QName,Node,int,int,Node,Node)):
	Use a for-each loop rather than an Iterator. Remove
	unnecessary cast.
	(references(QName)): Likewise.
	* gnu/xml/transform/CallTemplateNode.java:
	Add type parameter to withParams.
	(CallTemplateNote(QName,List)): Add type parameters
	to List argument.
	(clone(Stylesheet)): Add type parameters to lists
	and remove unnecessary casts.
	(doApply(Stylesheet,QName,Node,int,int,Node,Node)):
	Use a for-each loop rather than an Iterator. Remove
	unnecessary cast.
	(references(QName)): Likewise.
	* gnu/xml/transform/CopyNode.java:
	(addAttributeSet(Stylesheet,QName,Node,int,int,
	Node,Node,String)): Replace Iterator usage with
	for-each loop.
	* gnu/xml/transform/CopyOfNode.java:
	(doApply(Stylesheet,QName,Node,int,int,Node,Node)):
	Likewise. Add type parameter to ns.
	* gnu/xml/transform/CurrentFunction.java:
	(evaluate(List)): Suppress warnings from method
	prescribed by javax.xml.xpath.XPathFunction.
	(setArguments(List)): Add type parameter to argument.
	* gnu/xml/transform/DocumentFunction.java:
	Add type parameters to args and values.
	(evaluate(List)): Suppress warnings from method
	prescribed by javax.xml.xpath.XPathFunction.
	(setArguments(List)): Add type parameter to argument.
	(evaluate(Node,int,int)): Add type arguments and
	remove unnecessary casts. Use a for-each loop rather
	than an Iterator.
	(document(String,String)): Add type parameters to
	return type and set creation.
	(clone(Object)): Add type parameter and remove
	unnecessary cast.
	(references(QName)): Likewise.
	* gnu/xml/transform/ElementAvailableFunction.java:
	Add type parameter to args, elements and in static
	initializer.
	(evaluate(List)): Suppress warnings from method
	prescribed by javax.xml.xpath.XPathFunction.
	(setArguments(List)): Add type parameter to argument.
	(evaluate(Node,int,int)): Remove unnecessary cast.
	(clone(Object)): Add type parameter and remove
	unnecessary cast.
	(references(QName)): Likewise.
	* gnu/xml/transform/ElementNode.java:
	Add type parameter to elementExcludeResultPrefixes.
	(EleemntNode(TemplateNode,TemplateNode,String,Node)):
	Add type parameters to collection creation.
	(addAttributeSet(Stylesheet,QName,Node,int,int,
	Node,Node,String)): Use a for-each loop rather than
	an Iterator.
	* gnu/xml/transform/FormatNumberFunction.java:
	Add type parameter to args.
	(evaluate(List)): Suppress warnings from method
	prescribed by javax.xml.xpath.XPathFunction.
	(setArguments(List)): Add type parameter to argument.
	(evaluate(Node,int,int)): Add type arguments and
	remove unnecessary casts. Use a for-each loop rather
	than an Iterator.
	(clone(Object)): Add type parameter and remove
	unnecessary cast.
	(references(QName)): Likewise.
	* gnu/xml/transform/FunctionAvailableFunction.java:
	Add type parameters to xsltFunctions, xpathFunctions
	and args and in static initializer.
	(evaluate(Node,int,int)): Remove unnecessary cast.
	(clone(Object)): Add type parameter and remove
	unnecessary cast.
	(references(QName)): Likewise.
	* gnu/xml/transform/GenerateIdFunction.java:
	Add type parameter to args.
	(evaluate(List)): Suppress warnings from method
	prescribed by javax.xml.xpath.XPathFunction.
	(setArguments(List)): Add type parameter to argument.
	(evaluate(Node,int,int)): Add type arguments and
	remove unnecessary casts.
	(clone(Object)): Add type parameter and remove
	unnecessary cast.
	(references(QName)): Likewise.
	* gnu/xml/transform/KeyFunction.java:
	Add type parameter to args.
	(evaluate(List)): Suppress warnings from method
	(setArguments(List)): Add type parameter to argument.
	(matches(Node)): Add type parameter.
	(evaluate(Node,int,int)): Add type arguments and
	remove unnecessary casts.  Use a for-each loop rather
	than an Iterator.
	(addKeyNodes(Node,Collection,String,Collection)):
	Add type parameters.
	(addKeyNodesIfMatch(Node,Collection,String,Collection)):
	Likewise. Use a for-each loop rather than an Iterator.
	(clone(Object)): Add type parameter and remove
	unnecessary cast.
	(references(QName)): Likewise.
	* gnu/xml/transform/LiteralNode.java:
	Add type parameter to elementExcludeResultPrefixes.
	(LiteralNode(Node)): Add type parameters.
	* gnu/xml/transform/NamespaceProxy.java:
	(getPrefixes(String)): Add type parameter.
	* gnu/xml/transform/NodeNumberNode.java:
	(Stylesheet,Node,int,int): Add type parameters.
	Remove redundant casts.
	* gnu/xml/transform/SAXSerializer.java:
	Add type parameters to namespaces.
	(isDefined(String,String)): Add type parameters.
	Use a for-each loop rather than an Iterator.
	(define(String,String)): Likewise. Remove
	redundant cast.
	(undefine(String,String)): Add type parameters.
	Use a for-each loop rather than an Iterator.
	* gnu/xml/transform/StreamSerializer.java:
	Add type parameters to HTML_BOOLEAN_ATTRIBUTES,
	HTML_URIS, namespaces and cdataSectionElements.
	Use type parameter in the static initialiser.
	(StreamSerializer(int,String,String)): Add
	type parameter.
	(setCdataSectionElements(Collection)): Likewise.
	(isDefined(String,String)): Add type parameters.
	Use a for-each loop rather than an Iterator.
	Remove redundant cast.
	(pushNamespaceContext()): Add type parameters.
	(define(String,String)): Likewise. Remove
	redundant cast.
	(isHTMLBoolean(Attr,String)): Likewise.
	* gnu/xml/transform/SystemPropertyFunction.java:
	Add type parameter to args.
	(evaluate(List)): Suppress warnings from method
	prescribed by javax.xml.xpath.XPathFunction.
	(setArguments(List)): Add type parameter to argument.
	(evaluate(Node,int,int)): Add type parameters and
	remove unnecessary casts.
	(clone(Object)): Likewise.
	(references(QName)): Likewise.
	* gnu/xml/transform/Template.java:
	Implement Comparable<Template>.
	(compareTo(Template)): Update type of argument
	from Object to Template, and remove unnecessary
	check/cast.
	* gnu/xml/transform/TransformerFactoryImpl.java:
	(getAssociatedStylesheet(Source,String,String,String)):
	Add type parameters and remove unnecessary cast.
	Use a for-each loop rather than an Iterator.
	(parseParameters(String)): Add type parameters.
	* gnu/xml/transform/TransformerImpl.java:
	(transform(Source,Result)): Add type parameters.
	(writeStreamResult(Node,StreamResult,int,String)): Likewise.
	(reindent(Document,Node,int)): Likewise and remove
	unnecessary casts.
	(convertCdataSectionElements(Document,Node,List)): Likewise.
	* gnu/xml/transform/TransformerOutputProperties.java:
	(TransformerOutputProperties(Stylesheet)): Add type
	parameters and remove redundant casts.
	(apply()): Add type parameter.
	* gnu/xml/transform/UnparsedEntityUriFunction.java:
	(evaluate(List)): Suppress warnings from method
	prescribed by javax.xml.xpath.XPathFunction.
	* gnu/xml/transform/ValueOfNode.java:
	(doApply(Stylesheet,QNae,Node,int,int,Node,Node)):
	Avoid unchecked cast by retrieving objects and
	then casting them to Node after instanceof test.
	* gnu/xml/transform/XSLComparator.java:
	Remove unneeded Iterator import.
	* gnu/xml/util/DomParser.java:
	(callEnd(Node)): Add type parameter.
	* gnu/xml/util/Resolver.java:
	Replace untyped Dictionary with typed Map.
	(addDirectoryMapping(Map,String,File)): Likewise.
	(Resolver(Map)): Likewise.
	(resolveEntity(String,String)): Remove redundant cast.
	* gnu/xml/util/SAXNullTransformerFactory.java:
	Add type parameters to params.
	* gnu/xml/util/XCat.java:
	(normalizePublicId(boolean,String)): Remove unused
	variable token.
	(Catalog): Add type parameters to publicIds,
	publicDelegations, systemIds,
	systemRewrites, systemDelegations, uris,
	uriRewrites, uriDelegations, doctypes and next.
	(Catalog.mapURI(String,Hashtable,Hashtable,Hashtable)):
	Add type parameters and remove redundant casts.
	(Catalog.getExternalSubset(String)): Remove redundant cast.
	(Catalog.checkDelegations(Hashtable,String,String,String)):
	Add type parameters and remove redundant casts.
	(Loader): Add type parameteres to externals & bases.
	(Loader.absolutize(String)): Remove redundant cast.
	(Loader.startDocument()): Add type parameter.
	(Loader.externalEntityDecl(String,String,String)):
	Likewise.
	(Loader.startEntity(String)): Remove redundant cast.
	(Loader.endEntity(String)): Likewise.
	(Loader.startElement(String,String,String,Attributes)):
	Remove redundant casts and add type parameters.
	* gnu/xml/util/XMLWriter.java:
	Add type parameter to space.
	(startElement(String,String,String,Attributes):
	Remove redundant cast.

1 files changed, 30 insertions, 30 deletions

diff --git a/gnu/xml/transform/StreamSerializer.java b/gnu/xml/transform/StreamSerializer.java
index a5705f891..383754a0c 100644
--- a/gnu/xml/transform/StreamSerializer.java
+++ b/gnu/xml/transform/StreamSerializer.java
@@ -1,5 +1,5 @@
 /* StreamSerializer.java --
-   Copyright (C) 2004,2006 Free Software Foundation, Inc.
+   Copyright (C) 2004,2006, 2015 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -50,9 +50,9 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Map;
+import java.util.Set;
 import javax.xml.XMLConstants;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
@@ -79,28 +79,29 @@ public class StreamSerializer
   /**
    * HTML 4.01 boolean attributes
    */
-  static final Map HTML_BOOLEAN_ATTRIBUTES = new HashMap();
+  static final Map<String,Set<String>> HTML_BOOLEAN_ATTRIBUTES =
+    new HashMap<String,Set<String>>();
   static
   {
-    HashSet set;
+    Set<String> set;
 
-    set = new HashSet();
+    set = new HashSet<String>();
     set.add("nohref");
     HTML_BOOLEAN_ATTRIBUTES.put("area", set);
 
-    set = new HashSet();
+    set = new HashSet<String>();
     set.add("ismap");
     HTML_BOOLEAN_ATTRIBUTES.put("img", set);
 
-    set = new HashSet();
+    set = new HashSet<String>();
     set.add("declare");
     HTML_BOOLEAN_ATTRIBUTES.put("object", set);
 
-    set = new HashSet();
+    set = new HashSet<String>();
     set.add("noshade");
     HTML_BOOLEAN_ATTRIBUTES.put("hr", set);
 
-    set = new HashSet();
+    set = new HashSet<String>();
     set.add("compact");
     HTML_BOOLEAN_ATTRIBUTES.put("dl", set);
     HTML_BOOLEAN_ATTRIBUTES.put("ol", set);
@@ -108,52 +109,52 @@ public class StreamSerializer
     HTML_BOOLEAN_ATTRIBUTES.put("dir", set);
     HTML_BOOLEAN_ATTRIBUTES.put("menu", set);
 
-    set = new HashSet();
+    set = new HashSet<String>();
     set.add("checked");
     set.add("disabled");
     set.add("readonly");
     set.add("ismap");
     HTML_BOOLEAN_ATTRIBUTES.put("input", set);
 
-    set = new HashSet();
+    set = new HashSet<String>();
     set.add("multiple");
     set.add("disabled");
     HTML_BOOLEAN_ATTRIBUTES.put("select", set);
 
-    set = new HashSet();
+    set = new HashSet<String>();
     set.add("disabled");
     HTML_BOOLEAN_ATTRIBUTES.put("optgroup", set);
 
-    set = new HashSet();
+    set = new HashSet<String>();
     set.add("selected");
     set.add("disabled");
     HTML_BOOLEAN_ATTRIBUTES.put("option", set);
 
-    set = new HashSet();
+    set = new HashSet<String>();
     set.add("disabled");
     set.add("readonly");
     HTML_BOOLEAN_ATTRIBUTES.put("textarea", set);
 
-    set = new HashSet();
+    set = new HashSet<String>();
     set.add("disabled");
     HTML_BOOLEAN_ATTRIBUTES.put("button", set);
 
-    set = new HashSet();
+    set = new HashSet<String>();
     set.add("nowrap");
     HTML_BOOLEAN_ATTRIBUTES.put("th", set);
     HTML_BOOLEAN_ATTRIBUTES.put("td", set);
 
-    set = new HashSet();
+    set = new HashSet<String>();
     set.add("noresize");
     HTML_BOOLEAN_ATTRIBUTES.put("frame", set);
 
-    set = new HashSet();
+    set = new HashSet<String>();
     set.add("defer");
     HTML_BOOLEAN_ATTRIBUTES.put("script", set);
   }
 
   // HTML namespace URIs
-  static final HashSet HTML_URIS = new HashSet();
+  static final Set<String> HTML_URIS = new HashSet<String>();
   static {
     HTML_URIS.add("http://www.w3.org/1999/xhtml");
   }
@@ -162,9 +163,9 @@ public class StreamSerializer
   final Charset charset;
   final CharsetEncoder encoder;
   final int mode;
-  final LinkedList namespaces;
+  final LinkedList<Map<String,String>> namespaces;
   protected String eol;
-  Collection cdataSectionElements = Collections.EMPTY_SET;
+  Collection<String> cdataSectionElements = Collections.<String>emptySet();
 
   protected boolean discardDefaultContent;
   protected boolean xmlDeclaration = true;
@@ -191,10 +192,10 @@ public class StreamSerializer
     charset = Charset.forName(this.encoding);
     encoder = charset.newEncoder();
     this.eol = (eol != null) ? eol : System.getProperty("line.separator");
-    namespaces = new LinkedList();
+    namespaces = new LinkedList<Map<String,String>>();
   }
 
-  void setCdataSectionElements(Collection c)
+  void setCdataSectionElements(Collection<String> c)
   {
     cdataSectionElements = c;
   }
@@ -554,10 +555,9 @@ public class StreamSerializer
       return "xmlns".equals(prefix);
     if (prefix == null)
       prefix = "";
-    for (Iterator i = namespaces.iterator(); i.hasNext(); )
+    for (Map<String,String> ctx : namespaces)
       {
-        Map ctx = (Map) i.next();
-        String val = (String) ctx.get(uri);
+        String val = ctx.get(uri);
         if (val != null && val.equals(prefix))
           return true;
       }
@@ -566,14 +566,14 @@ public class StreamSerializer
 
   void pushNamespaceContext()
   {
-    namespaces.addFirst(new HashMap());
+    namespaces.addFirst(new HashMap<String,String>());
   }
 
   String define(String uri, String prefix)
   {
     if (namespaces.isEmpty())
       return prefix;
-    HashMap ctx = (HashMap) namespaces.getFirst();
+    Map<String,String> ctx = namespaces.getFirst();
     while (ctx.containsValue(prefix))
       {
         // Fabricate new prefix
@@ -741,8 +741,8 @@ public class StreamSerializer
         elementName = element.getNodeName();
       }
     elementName = elementName.toLowerCase();
-    Collection attributes =
-      (Collection) HTML_BOOLEAN_ATTRIBUTES.get(elementName);
+    Collection<String> attributes =
+      HTML_BOOLEAN_ATTRIBUTES.get(elementName);
     return (attributes != null && attributes.contains(attrName));
   }