diff options
Diffstat (limited to 'gnu/xml/transform/ElementAvailableFunction.java')
-rw-r--r-- | gnu/xml/transform/ElementAvailableFunction.java | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/gnu/xml/transform/ElementAvailableFunction.java b/gnu/xml/transform/ElementAvailableFunction.java index 6a9d256be..43896c3fc 100644 --- a/gnu/xml/transform/ElementAvailableFunction.java +++ b/gnu/xml/transform/ElementAvailableFunction.java @@ -1,5 +1,5 @@ /* ElementAvailableFunction.java -- - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2015 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -42,6 +42,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.SortedSet; import java.util.TreeSet; import javax.xml.namespace.QName; import javax.xml.namespace.NamespaceContext; @@ -61,10 +62,10 @@ class ElementAvailableFunction implements Function, XPathFunction { - static final Collection elements; + static final Collection<String> elements; static { - TreeSet acc = new TreeSet(); + SortedSet<String> acc = new TreeSet<String>(); acc.add("stylesheet"); acc.add("template"); acc.add("param"); @@ -103,13 +104,14 @@ class ElementAvailableFunction } final NamespaceContext nsctx; - List args; + List<Expr> args; ElementAvailableFunction(NamespaceContext nsctx) { this.nsctx = nsctx; } + @SuppressWarnings("rawtypes") public Object evaluate(List args) throws XPathFunctionException { @@ -117,14 +119,14 @@ class ElementAvailableFunction return Collections.EMPTY_SET; } - public void setArguments(List args) + public void setArguments(List<Expr> args) { this.args = args; } public Object evaluate(Node context, int pos, int len) { - Expr arg = (Expr) args.get(0); + Expr arg = args.get(0); Object val = arg.evaluate(context, pos, len); String name = _string(context, val); String prefix, localName, uri; @@ -156,18 +158,18 @@ class ElementAvailableFunction n = (NamespaceContext) context; ElementAvailableFunction f = new ElementAvailableFunction(n); int len = args.size(); - List args2 = new ArrayList(len); + List<Expr> args2 = new ArrayList<Expr>(len); for (int i = 0; i < len; i++) - args2.add(((Expr) args.get(i)).clone(context)); + args2.add(args.get(i).clone(context)); f.setArguments(args2); return f; } public boolean references(QName var) { - for (Iterator i = args.iterator(); i.hasNext(); ) + for (Iterator<Expr> i = args.iterator(); i.hasNext(); ) { - if (((Expr) i.next()).references(var)) + if (i.next().references(var)) return true; } return false; |