diff options
author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2016-02-16 01:45:04 +0000 |
---|---|---|
committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2016-02-16 01:48:09 +0000 |
commit | 5f98982eadb3c595d86d4af2825902a3ccf8f581 (patch) | |
tree | 79c8665526e7d23832db4a3f393edd03301acf88 /gnu/xml/transform/CallTemplateNode.java | |
parent | 11d1d8efc1b17eb87b4cd6aa5ae82f67cb862e96 (diff) | |
download | classpath-5f98982eadb3c595d86d4af2825902a3ccf8f581.tar.gz |
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.
Diffstat (limited to 'gnu/xml/transform/CallTemplateNode.java')
-rw-r--r-- | gnu/xml/transform/CallTemplateNode.java | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/gnu/xml/transform/CallTemplateNode.java b/gnu/xml/transform/CallTemplateNode.java index cc08d93e3..3e2efde1a 100644 --- a/gnu/xml/transform/CallTemplateNode.java +++ b/gnu/xml/transform/CallTemplateNode.java @@ -1,5 +1,5 @@ /* CallTemplateNode.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. @@ -58,9 +58,9 @@ final class CallTemplateNode { final QName name; - final List withParams; + final List<WithParam> withParams; - CallTemplateNode(QName name, List withParams) + CallTemplateNode(QName name, List<WithParam> withParams) { this.name = name; this.withParams = withParams; @@ -69,9 +69,9 @@ final class CallTemplateNode TemplateNode clone(Stylesheet stylesheet) { int len = withParams.size(); - List withParams2 = new ArrayList(len); + List<WithParam> withParams2 = new ArrayList<WithParam>(len); for (int i = 0; i < len; i++) - withParams2.add(((WithParam) withParams.get(i)).clone(stylesheet)); + withParams2.add(withParams.get(i).clone(stylesheet)); TemplateNode ret = new CallTemplateNode(name, withParams2); if (children != null) ret.children = children.clone(stylesheet); @@ -91,10 +91,9 @@ final class CallTemplateNode if (!withParams.isEmpty()) { // compute the parameter values - LinkedList values = new LinkedList(); - for (Iterator i = withParams.iterator(); i.hasNext(); ) + LinkedList<Object[]> values = new LinkedList<Object[]>(); + for (WithParam p : withParams) { - WithParam p = (WithParam) i.next(); if (t.hasParam(p.name)) // ignore parameters not specified { Object value = p.getValue(stylesheet, mode, context, @@ -108,9 +107,8 @@ final class CallTemplateNode // push the parameter context stylesheet.bindings.push(Bindings.WITH_PARAM); // set the parameters - for (Iterator i = values.iterator(); i.hasNext(); ) + for (Object[] pair : values) { - Object[] pair = (Object[]) i.next(); QName name = (QName) pair[0]; Object value = pair[1]; stylesheet.bindings.set(name, value, Bindings.WITH_PARAM); @@ -135,9 +133,9 @@ final class CallTemplateNode public boolean references(QName var) { - for (Iterator i = withParams.iterator(); i.hasNext(); ) + for (Iterator<WithParam> i = withParams.iterator(); i.hasNext(); ) { - if (((WithParam) i.next()).references(var)) + if (i.next().references(var)) return true; } return super.references(var); |