More generification fixes.

2008-06-22  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* gnu/xml/xpath/Expr.java,
	* gnu/xml/xpath/FloorFunction.java,
	* gnu/xml/xpath/Function.java,
	* gnu/xml/xpath/FunctionCall.java,
	* gnu/xml/xpath/NamespaceUriFunction.java,
	* gnu/xml/xpath/ParenthesizedExpr.java,
	* gnu/xml/xpath/Root.java,
	* gnu/xml/xpath/Selector.java,
	* gnu/xml/xpath/Steps.java:
	Genericised.

10 files changed, 52 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index e38e6e76a..88e448409 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2008-06-22  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
+	* gnu/xml/xpath/Expr.java,
+	* gnu/xml/xpath/FloorFunction.java,
+	* gnu/xml/xpath/Function.java,
+	* gnu/xml/xpath/FunctionCall.java,
+	* gnu/xml/xpath/NamespaceUriFunction.java,
+	* gnu/xml/xpath/ParenthesizedExpr.java,
+	* gnu/xml/xpath/Root.java,
+	* gnu/xml/xpath/Selector.java,
+	* gnu/xml/xpath/Steps.java:
+	Genericised.
+
+2008-06-22  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
 	* gnu/xml/xpath/BooleanFunction.java,
 	* gnu/xml/xpath/CeilingFunction.java,
 	* gnu/xml/xpath/ConcatFunction.java,
diff --git a/gnu/xml/xpath/Expr.java b/gnu/xml/xpath/Expr.java
index f471cbd11..1b44c7540 100644
--- a/gnu/xml/xpath/Expr.java
+++ b/gnu/xml/xpath/Expr.java
@@ -285,7 +285,7 @@ public abstract class Expr
    * empty string is returned. If the argument is omitted, it defaults to a
    * node-set with the context node as its only member.
    */
-  public static String _namespace_uri(Node context, Collection nodeSet)
+  public static String _namespace_uri(Node context, Collection<Node> nodeSet)
   {
     if (nodeSet == null || nodeSet.isEmpty())
       return "";
@@ -329,11 +329,11 @@ public abstract class Expr
   /**
    * Returns the first node in the set in document order.
    */
-  static Node firstNode(Collection nodeSet)
+  static Node firstNode(Collection<Node> nodeSet)
   {
-    List list = new ArrayList(nodeSet);
+    List<Node> list = new ArrayList<Node>(nodeSet);
     Collections.sort(list, documentOrderComparator);
-    return (Node) list.get(0);
+    return list.get(0);
   }
 
   /* -- 4.2 String Functions -- */
diff --git a/gnu/xml/xpath/FloorFunction.java b/gnu/xml/xpath/FloorFunction.java
index c03c0e7ed..bbf56c911 100644
--- a/gnu/xml/xpath/FloorFunction.java
+++ b/gnu/xml/xpath/FloorFunction.java
@@ -54,9 +54,9 @@ final class FloorFunction
 
   final Expr arg;
 
-  FloorFunction(List args)
+  FloorFunction(List<Expr> args)
   {
-    this((Expr) args.get(0));
+    this(args.get(0));
   }
 
   FloorFunction(Expr arg)
@@ -64,6 +64,7 @@ final class FloorFunction
     this.arg = arg;
   }
 
+  @Override
   public Object evaluate(Node context, int pos, int len)
   {
     Object val = arg.evaluate(context, pos, len);
diff --git a/gnu/xml/xpath/Function.java b/gnu/xml/xpath/Function.java
index aecd49d9c..12e2e1141 100644
--- a/gnu/xml/xpath/Function.java
+++ b/gnu/xml/xpath/Function.java
@@ -51,7 +51,7 @@ public interface Function
   /**
    * Sets the list of expressions to evaluate as parameter values.
    */
-  void setArguments(List args);
+  void setArguments(List<Expr> args);
 
 }
 
diff --git a/gnu/xml/xpath/FunctionCall.java b/gnu/xml/xpath/FunctionCall.java
index 70a436f6c..e811f53a2 100644
--- a/gnu/xml/xpath/FunctionCall.java
+++ b/gnu/xml/xpath/FunctionCall.java
@@ -60,20 +60,24 @@ public final class FunctionCall
 
   final XPathFunctionResolver resolver;
   final String name;
-  final List args;
+  final List<Expr> args;
 
   public FunctionCall(XPathFunctionResolver resolver, String name)
   {
-    this(resolver, name, Collections.EMPTY_LIST);
+    this(resolver, name, null);
   }
 
-  public FunctionCall(XPathFunctionResolver resolver, String name, List args)
+  public FunctionCall(XPathFunctionResolver resolver, String name, List<Expr> args)
   {
     this.resolver = resolver;
     this.name = name;
-    this.args = args;
+    if (args == null)
+      this.args = Collections.emptyList();
+    else
+      this.args = args;
   }
 
+  @Override
   public Object evaluate(Node context, int pos, int len)
   {
     if (resolver != null)
@@ -94,7 +98,7 @@ public final class FunctionCall
               }
             else
               {
-                List values = new ArrayList(arity);
+                List<Object> values = new ArrayList<Object>(arity);
                 for (int i = 0; i < arity; i++)
                   {
                     Expr arg = (Expr) args.get(i);
@@ -119,10 +123,10 @@ public final class FunctionCall
   public Expr clone(Object context)
   {
     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));
       }
     XPathFunctionResolver r = resolver;
     if (context instanceof XPathFunctionResolver)
@@ -134,9 +138,9 @@ public final class FunctionCall
 
   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;
           }
diff --git a/gnu/xml/xpath/NamespaceUriFunction.java b/gnu/xml/xpath/NamespaceUriFunction.java
index 3ae46f7ee..c988e2aaa 100644
--- a/gnu/xml/xpath/NamespaceUriFunction.java
+++ b/gnu/xml/xpath/NamespaceUriFunction.java
@@ -59,9 +59,9 @@ final class NamespaceUriFunction
 
   final Expr arg;
 
-  NamespaceUriFunction(List args)
+  NamespaceUriFunction(List<Expr> args)
   {
-    this(args.size() > 0 ? (Expr) args.get(0) : null);
+    this(args.size() > 0 ? args.get(0) : null);
   }
   
   NamespaceUriFunction(Expr arg)
@@ -69,11 +69,12 @@ final class NamespaceUriFunction
     this.arg = arg;
   }
 
+  @Override @SuppressWarnings("unchecked")
   public Object evaluate(Node context, int pos, int len)
   {
     Object val = (arg == null) ? Collections.singleton(context) :
         arg.evaluate(context, pos, len);
-    return _namespace_uri(context, (Collection) val);
+    return _namespace_uri(context, (Collection<Node>) val);
   }
 
   public Expr clone(Object context)
diff --git a/gnu/xml/xpath/ParenthesizedExpr.java b/gnu/xml/xpath/ParenthesizedExpr.java
index f343857c3..ac69b4235 100644
--- a/gnu/xml/xpath/ParenthesizedExpr.java
+++ b/gnu/xml/xpath/ParenthesizedExpr.java
@@ -60,12 +60,13 @@ final class ParenthesizedExpr
     this.expr = expr;
   }
 
+  @Override
   public Object evaluate(Node context, int pos, int len)
   {
     Object ret = expr.evaluate(context, pos, len);
     if (ret instanceof Collection)
       {
-        List list = new ArrayList((Collection) ret);
+        List<Node> list = new ArrayList<Node>((Collection<Node>) ret);
         Collections.sort(list, documentOrderComparator);
         ret = list;
       }
diff --git a/gnu/xml/xpath/Root.java b/gnu/xml/xpath/Root.java
index 1f79b3958..cbcb24999 100644
--- a/gnu/xml/xpath/Root.java
+++ b/gnu/xml/xpath/Root.java
@@ -39,6 +39,8 @@ package gnu.xml.xpath;
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Set;
+
 import javax.xml.namespace.QName;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -59,12 +61,14 @@ public final class Root
 
   public Object evaluate(Node context, int pos, int len)
   {
-    return evaluate(context, Collections.EMPTY_SET);
+    Set<Node> emptySet = Collections.emptySet();
+    return evaluate(context, emptySet);
   }
 
-  Collection evaluate(Node context, Collection ns)
+  @Override
+  Collection<Node> evaluate(Node context, Collection<Node> ns)
   {
-    Document doc = (context instanceof Document) ? (Document) context :
+    Node doc = (context instanceof Document) ? context :
       context.getOwnerDocument();
     return Collections.singleton(doc);
   }
diff --git a/gnu/xml/xpath/Selector.java b/gnu/xml/xpath/Selector.java
index 1222b301f..429b3f7e2 100644
--- a/gnu/xml/xpath/Selector.java
+++ b/gnu/xml/xpath/Selector.java
@@ -190,7 +190,7 @@ public final class Selector
     return ret;
   }
 
-  Collection evaluate(Node context, Collection<Node> ns)
+  Collection<Node> evaluate(Node context, Collection<Node> ns)
   {
     Set<Node> acc = new LinkedHashSet<Node>();
     for (Iterator<Node> i = ns.iterator(); i.hasNext(); )
@@ -417,7 +417,7 @@ public final class Selector
   public Expr clone(Object context)
   {
     int len = tests.length;
-    List tests2 = new ArrayList(len);
+    List<Test> tests2 = new ArrayList<Test>(len);
     for (int i = 0; i < len; i++)
       tests2.add(tests[i].clone(context));
     return new Selector(axis, tests2);
diff --git a/gnu/xml/xpath/Steps.java b/gnu/xml/xpath/Steps.java
index 8936f18f4..de22432c4 100644
--- a/gnu/xml/xpath/Steps.java
+++ b/gnu/xml/xpath/Steps.java
@@ -160,7 +160,7 @@ public final class Steps
     return Collections.emptySet();
   }
 
-  @Override
+  @Override @SuppressWarnings("unchecked")
   public Object evaluate(Node context, int pos, int len)
   {
     //System.err.println(toString()+" evaluate");
@@ -172,13 +172,13 @@ public final class Steps
     while (val instanceof Collection && i.hasNext())
       {
         Path rhs = (Path) i.next();
-        val = rhs.evaluate(context, (Collection) val);
+        val = rhs.evaluate(context, (Collection<Node>) val);
         //System.err.println("\tevaluate "+rhs+" = "+val);
       }
     return val;
   }
 
-  @Override
+  @Override @SuppressWarnings("unchecked")
   Collection<Node> evaluate(Node context, Collection<Node> ns)
   {
     // Left to right