Genericised javax.xml.* and gnu.xml.xpath.*.

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,
	* gnu/xml/xpath/DocumentOrderComparator.java,
	* gnu/xml/xpath/Expr.java,
	* gnu/xml/xpath/IdFunction.java,
	* gnu/xml/xpath/LangFunction.java,
	* gnu/xml/xpath/LocalNameFunction.java,
	* gnu/xml/xpath/NameFunction.java,
	* gnu/xml/xpath/NormalizeSpaceFunction.java,
	* gnu/xml/xpath/NotFunction.java,
	* gnu/xml/xpath/NumberFunction.java,
	* gnu/xml/xpath/Path.java,
	* gnu/xml/xpath/RoundFunction.java,
	* gnu/xml/xpath/Selector.java,
	* gnu/xml/xpath/StartsWithFunction.java,
	* gnu/xml/xpath/Steps.java,
	* gnu/xml/xpath/StringFunction.java,
	* gnu/xml/xpath/StringLengthFunction.java,
	* gnu/xml/xpath/SubstringAfterFunction.java,
	* gnu/xml/xpath/SubstringBeforeFunction.java,
	* gnu/xml/xpath/SubstringFunction.java,
	* gnu/xml/xpath/SumFunction.java,
	* gnu/xml/xpath/TranslateFunction.java,
	* gnu/xml/xpath/UnionExpr.java,
	* gnu/xml/xpath/XPathParser.java,
	* gnu/xml/xpath/XPathParser.y,
	* gnu/xml/xpath/XPathTokenizer.java:
	Genericised.
	* javax/xml/datatype/DatatypeFactory.java:
	Use new java.util.ServiceLoader framework.
	* javax/xml/namespace/NamespaceContext.java,
	* javax/xml/parsers/DocumentBuilderFactory.java,
	* javax/xml/parsers/SAXParserFactory.java,
	* javax/xml/stream/XMLEventFactory.java,
	* javax/xml/stream/XMLEventReader.java,
	* javax/xml/stream/XMLInputFactory.java,
	* javax/xml/stream/XMLOutputFactory.java:
	Genericised.
	* javax/xml/stream/events/DTD.java,
	* javax/xml/stream/events/EndElement.java,
	* javax/xml/stream/events/StartElement.java:
	Ignore unchecked errors due to API not using generics.
	* javax/xml/transform/TransformerFactory.java,
	* javax/xml/validation/SchemaFactory.java,
	* javax/xml/xpath/XPathFactory.java:
	Genericised.
	* javax/xml/xpath/XPathFunction.java:
	Ignore unchecked errors due to API not using generics.

44 files changed, 249 insertions, 172 deletions

diff --git a/ChangeLog b/ChangeLog
index 0a525a2ff..e38e6e76a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,57 @@
 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,
+	* gnu/xml/xpath/DocumentOrderComparator.java,
+	* gnu/xml/xpath/Expr.java,
+	* gnu/xml/xpath/IdFunction.java,
+	* gnu/xml/xpath/LangFunction.java,
+	* gnu/xml/xpath/LocalNameFunction.java,
+	* gnu/xml/xpath/NameFunction.java,
+	* gnu/xml/xpath/NormalizeSpaceFunction.java,
+	* gnu/xml/xpath/NotFunction.java,
+	* gnu/xml/xpath/NumberFunction.java,
+	* gnu/xml/xpath/Path.java,
+	* gnu/xml/xpath/RoundFunction.java,
+	* gnu/xml/xpath/Selector.java,
+	* gnu/xml/xpath/StartsWithFunction.java,
+	* gnu/xml/xpath/Steps.java,
+	* gnu/xml/xpath/StringFunction.java,
+	* gnu/xml/xpath/StringLengthFunction.java,
+	* gnu/xml/xpath/SubstringAfterFunction.java,
+	* gnu/xml/xpath/SubstringBeforeFunction.java,
+	* gnu/xml/xpath/SubstringFunction.java,
+	* gnu/xml/xpath/SumFunction.java,
+	* gnu/xml/xpath/TranslateFunction.java,
+	* gnu/xml/xpath/UnionExpr.java,
+	* gnu/xml/xpath/XPathParser.java,
+	* gnu/xml/xpath/XPathParser.y,
+	* gnu/xml/xpath/XPathTokenizer.java:
+	Genericised.
+	* javax/xml/datatype/DatatypeFactory.java:
+	Use new java.util.ServiceLoader framework.
+	* javax/xml/namespace/NamespaceContext.java,
+	* javax/xml/parsers/DocumentBuilderFactory.java,
+	* javax/xml/parsers/SAXParserFactory.java,
+	* javax/xml/stream/XMLEventFactory.java,
+	* javax/xml/stream/XMLEventReader.java,
+	* javax/xml/stream/XMLInputFactory.java,
+	* javax/xml/stream/XMLOutputFactory.java:
+	Genericised.
+	* javax/xml/stream/events/DTD.java,
+	* javax/xml/stream/events/EndElement.java,
+	* javax/xml/stream/events/StartElement.java:
+	Ignore unchecked errors due to API not using generics.
+	* javax/xml/transform/TransformerFactory.java,
+	* javax/xml/validation/SchemaFactory.java,
+	* javax/xml/xpath/XPathFactory.java:
+	Genericised.
+	* javax/xml/xpath/XPathFunction.java:
+	Ignore unchecked errors due to API not using generics.
+
+2008-06-22  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
 	PR classpath/36220:
 	* gnu/xml/transform/ParameterNode.java:
 	(clone()): Only clone select if not null.
diff --git a/gnu/xml/xpath/BooleanFunction.java b/gnu/xml/xpath/BooleanFunction.java
index 256de0382..f661b2ac2 100644
--- a/gnu/xml/xpath/BooleanFunction.java
+++ b/gnu/xml/xpath/BooleanFunction.java
@@ -61,9 +61,9 @@ final class BooleanFunction
 
   final Expr arg;
   
-  BooleanFunction(List args)
+  BooleanFunction(List<Expr> args)
   {
-    this((Expr) args.get(0));
+    this(args.get(0));
   }
 
   BooleanFunction(Expr arg)
diff --git a/gnu/xml/xpath/CeilingFunction.java b/gnu/xml/xpath/CeilingFunction.java
index 7db08fc5d..153988422 100644
--- a/gnu/xml/xpath/CeilingFunction.java
+++ b/gnu/xml/xpath/CeilingFunction.java
@@ -54,9 +54,9 @@ final class CeilingFunction
 
   final Expr arg;
   
-  CeilingFunction(List args)
+  CeilingFunction(List<Expr> args)
   {
-    this((Expr) args.get(0));
+    this(args.get(0));
   }
   
   CeilingFunction(Expr arg)
diff --git a/gnu/xml/xpath/ConcatFunction.java b/gnu/xml/xpath/ConcatFunction.java
index 12a5cfcc6..a61a45477 100644
--- a/gnu/xml/xpath/ConcatFunction.java
+++ b/gnu/xml/xpath/ConcatFunction.java
@@ -54,19 +54,19 @@ final class ConcatFunction
   extends Expr
 {
 
-  final List args;
+  final List<Expr> args;
 
-  ConcatFunction(List args)
+  ConcatFunction(List<Expr> args)
   {
     this.args = args;
   }
 
+  @Override
   public Object evaluate(Node context, int pos, int len)
   {
     CPStringBuilder buf = new CPStringBuilder();
-    for (Iterator i = args.iterator(); i.hasNext(); )
+    for (Expr arg : args)
       {
-        Expr arg = (Expr) i.next();
         Object val = arg.evaluate(context, pos, len);
         buf.append(_string(context, val));
       }
@@ -76,19 +76,19 @@ final class ConcatFunction
   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));
       }
     return new ConcatFunction(args2);
   }
 
   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/DocumentOrderComparator.java b/gnu/xml/xpath/DocumentOrderComparator.java
index c7d7de9f7..605749d09 100644
--- a/gnu/xml/xpath/DocumentOrderComparator.java
+++ b/gnu/xml/xpath/DocumentOrderComparator.java
@@ -46,18 +46,12 @@ import org.w3c.dom.Node;
  * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
  */
 public class DocumentOrderComparator
-  implements Comparator
+  implements Comparator<Node>
 {
   
-  public int compare(Object o1, Object o2)
+  public int compare(Node n1, Node n2)
   {
-    if (o1 instanceof Node && o2 instanceof Node)
-      {
-        Node n1 = (Node)o1;
-        Node n2 = (Node)o2;
-        return (int) n1.compareDocumentPosition(n2);
-      }
-    return 0;
+    return (int) n1.compareDocumentPosition(n2);
   }
 
 }
diff --git a/gnu/xml/xpath/Expr.java b/gnu/xml/xpath/Expr.java
index 95fb5ccba..f471cbd11 100644
--- a/gnu/xml/xpath/Expr.java
+++ b/gnu/xml/xpath/Expr.java
@@ -75,7 +75,7 @@ public abstract class Expr
   implements XPathExpression
 {
 
-  protected static final Comparator documentOrderComparator =
+  protected static final Comparator<Node> documentOrderComparator =
     new DocumentOrderComparator();
 
   protected static final DecimalFormat decimalFormat =
diff --git a/gnu/xml/xpath/IdFunction.java b/gnu/xml/xpath/IdFunction.java
index 749795419..98019ced7 100644
--- a/gnu/xml/xpath/IdFunction.java
+++ b/gnu/xml/xpath/IdFunction.java
@@ -62,9 +62,9 @@ public final class IdFunction
 
   final Expr arg;
 
-  IdFunction(List args)
+  IdFunction(List<Expr> args)
   {
-    this((Expr) args.get(0));
+    this(args.get(0));
   }
 
   public IdFunction(Expr arg)
@@ -78,6 +78,7 @@ public final class IdFunction
     return !((Collection) ret).isEmpty();
   }
 
+  @Override
   public Object evaluate(Node context, int pos, int len)
   {
     Object val = arg.evaluate(context, pos, len);
diff --git a/gnu/xml/xpath/LangFunction.java b/gnu/xml/xpath/LangFunction.java
index 584787efb..33cf8b0a2 100644
--- a/gnu/xml/xpath/LangFunction.java
+++ b/gnu/xml/xpath/LangFunction.java
@@ -64,9 +64,9 @@ final class LangFunction
 
   final Expr arg;
 
-  LangFunction(List args)
+  LangFunction(List<Expr> args)
   {
-    this((Expr) args.get(0));
+    this(args.get(0));
   }
 
   LangFunction(Expr arg)
@@ -74,6 +74,7 @@ final class LangFunction
     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/LocalNameFunction.java b/gnu/xml/xpath/LocalNameFunction.java
index 84fb6d482..a7071fc2c 100644
--- a/gnu/xml/xpath/LocalNameFunction.java
+++ b/gnu/xml/xpath/LocalNameFunction.java
@@ -59,9 +59,9 @@ final class LocalNameFunction
 
   final Expr arg;
 
-  LocalNameFunction(List args)
+  LocalNameFunction(List<Expr> args)
   {
-    this(args.size() > 0 ? (Expr) args.get(0) : null);
+    this(args.size() > 0 ? args.get(0) : null);
   }
 
   LocalNameFunction(Expr arg)
@@ -69,6 +69,7 @@ final class LocalNameFunction
     this.arg = arg;
   }
 
+  @Override
   public Object evaluate(Node context, int pos, int len)
   {
     Object val = (arg == null) ? Collections.singleton(context) :
diff --git a/gnu/xml/xpath/NameFunction.java b/gnu/xml/xpath/NameFunction.java
index ea49741fa..2a089ef95 100644
--- a/gnu/xml/xpath/NameFunction.java
+++ b/gnu/xml/xpath/NameFunction.java
@@ -67,9 +67,9 @@ final class NameFunction
 
   final Expr arg;
 
-  NameFunction(List args)
+  NameFunction(List<Expr> args)
   {
-    this(args.size() > 0 ? (Expr) args.get(0) : null);
+    this(args.size() > 0 ? args.get(0) : null);
   }
 
   NameFunction(Expr arg)
@@ -77,6 +77,7 @@ final class NameFunction
     this.arg = arg;
   }
 
+  @Override
   public Object evaluate(Node context, int pos, int len)
   {
     Object val = (arg == null) ? Collections.singleton(context) :
diff --git a/gnu/xml/xpath/NormalizeSpaceFunction.java b/gnu/xml/xpath/NormalizeSpaceFunction.java
index 9e2eb337e..30069acdc 100644
--- a/gnu/xml/xpath/NormalizeSpaceFunction.java
+++ b/gnu/xml/xpath/NormalizeSpaceFunction.java
@@ -61,9 +61,9 @@ final class NormalizeSpaceFunction
 
   final Expr arg;
 
-  NormalizeSpaceFunction(List args)
+  NormalizeSpaceFunction(List<Expr> args)
   {
-    this((Expr) args.get(0));
+    this(args.get(0));
   }
   
   NormalizeSpaceFunction(Expr arg)
@@ -71,6 +71,7 @@ final class NormalizeSpaceFunction
     this.arg = arg;
   }
 
+  @Override
   public Object evaluate(Node context, int pos, int len)
   {
     Object val = (arg == null) ? null : arg.evaluate(context, pos, len);
diff --git a/gnu/xml/xpath/NotFunction.java b/gnu/xml/xpath/NotFunction.java
index bbed66a73..188b3dbc4 100644
--- a/gnu/xml/xpath/NotFunction.java
+++ b/gnu/xml/xpath/NotFunction.java
@@ -53,9 +53,9 @@ final class NotFunction
 
   final Expr arg;
 
-  NotFunction(List args)
+  NotFunction(List<Expr> args)
   {
-    this((Expr) args.get(0));
+    this(args.get(0));
   }
 
   NotFunction(Expr arg)
@@ -63,6 +63,7 @@ final class NotFunction
     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/NumberFunction.java b/gnu/xml/xpath/NumberFunction.java
index 79553ce81..8804a7886 100644
--- a/gnu/xml/xpath/NumberFunction.java
+++ b/gnu/xml/xpath/NumberFunction.java
@@ -68,9 +68,9 @@ final class NumberFunction
 
   final Expr arg;
 
-  NumberFunction(List args)
+  NumberFunction(List<Expr> args)
   {
-    this(args.size() > 0 ? (Expr) args.get(0) : null);
+    this(args.size() > 0 ? args.get(0) : null);
   }
 
   NumberFunction(Expr arg)
@@ -78,6 +78,7 @@ final class NumberFunction
     this.arg = arg;
   }
 
+  @Override
   public Object evaluate(Node context, int pos, int len)
   {
     Object val = (arg == null) ? null : arg.evaluate(context, pos, len);
diff --git a/gnu/xml/xpath/Path.java b/gnu/xml/xpath/Path.java
index 4b01f0918..809f965cc 100644
--- a/gnu/xml/xpath/Path.java
+++ b/gnu/xml/xpath/Path.java
@@ -49,6 +49,6 @@ abstract class Path
   extends Pattern
 {
 
-  abstract Collection evaluate(Node context, Collection nodeSet);
+  abstract Collection<Node> evaluate(Node context, Collection<Node> nodeSet);
   
 }
diff --git a/gnu/xml/xpath/RoundFunction.java b/gnu/xml/xpath/RoundFunction.java
index bfbfd357d..2d1bd5447 100644
--- a/gnu/xml/xpath/RoundFunction.java
+++ b/gnu/xml/xpath/RoundFunction.java
@@ -60,9 +60,9 @@ final class RoundFunction
 
   final Expr arg;
 
-  RoundFunction(List args)
+  RoundFunction(List<Expr> args)
   {
-    this((Expr) args.get(0));
+    this(args.get(0));
   }
 
   RoundFunction(Expr arg)
@@ -70,6 +70,7 @@ final class RoundFunction
     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/Selector.java b/gnu/xml/xpath/Selector.java
index 23c1bcf35..1222b301f 100644
--- a/gnu/xml/xpath/Selector.java
+++ b/gnu/xml/xpath/Selector.java
@@ -84,7 +84,7 @@ public final class Selector
    */
   final Test[] tests;
 
-  public Selector(int axis, List tests)
+  public Selector(int axis, List<? extends Test> tests)
   {
     this.axis = axis;
     int len = tests.size();
@@ -179,29 +179,31 @@ public final class Selector
     return count;
   }
 
+
+  @Override
   public Object evaluate(Node context, int pos, int len)
   {
-    Set acc = new LinkedHashSet();
+    Set<Node> acc = new LinkedHashSet<Node>();
     addCandidates(context, acc);
-    List candidates = new ArrayList(acc);
-    List ret = filterCandidates(candidates, false);
+    List<Node> candidates = new ArrayList<Node>(acc);
+    List<Node> ret = filterCandidates(candidates, false);
     return ret;
   }
 
-  Collection evaluate(Node context, Collection ns)
+  Collection evaluate(Node context, Collection<Node> ns)
   {
-    Set acc = new LinkedHashSet();
-    for (Iterator i = ns.iterator(); i.hasNext(); )
-      addCandidates((Node) i.next(), acc);
-    List candidates = new ArrayList(acc);
-    List ret = filterCandidates(candidates, true);
+    Set<Node> acc = new LinkedHashSet<Node>();
+    for (Iterator<Node> i = ns.iterator(); i.hasNext(); )
+      addCandidates(i.next(), acc);
+    List<Node> candidates = new ArrayList<Node>(acc);
+    List<Node> ret = filterCandidates(candidates, true);
     return ret;
   }
 
   /**
    * Filter the given list of candidates according to the node tests.
    */
-  List filterCandidates(List candidates, boolean cascade)
+  List<Node> filterCandidates(List<Node> candidates, boolean cascade)
   {
     int len = candidates.size();
     int tlen = tests.length;
@@ -211,10 +213,10 @@ public final class Selector
         for (int j = 0; j < tlen && len > 0; j++)
           {
             Test test = tests[j];
-            List successful = new ArrayList(len);
+            List<Node> successful = new ArrayList<Node>(len);
             for (int i = 0; i < len; i++)
               {
-                Node node = (Node) candidates.get(i);
+                Node node = candidates.get(i);
                 if (cascade)
                   {
                     // Documents and DocumentFragments should be considered
@@ -244,7 +246,7 @@ public final class Selector
     return candidates;
   }
 
-  void addCandidates(Node context, Collection candidates)
+  void addCandidates(Node context, Collection<Node> candidates)
   {
     // Build list of candidates
     switch (axis)
@@ -293,7 +295,7 @@ public final class Selector
       }
   }
 
-  void addChildNodes(Node context, Collection acc, boolean recurse)
+  void addChildNodes(Node context, Collection<Node> acc, boolean recurse)
   {
     Node child = context.getFirstChild();
     while (child != null)
@@ -305,7 +307,7 @@ public final class Selector
       }
   }
 
-  void addParentNode(Node context, Collection acc, boolean recurse)
+  void addParentNode(Node context, Collection<Node> acc, boolean recurse)
   {
     Node parent = (context.getNodeType() == Node.ATTRIBUTE_NODE) ?
       ((Attr) context).getOwnerElement() : context.getParentNode();
@@ -317,7 +319,7 @@ public final class Selector
       }
   }
 
-  void addFollowingNodes(Node context, Collection acc, boolean recurse)
+  void addFollowingNodes(Node context, Collection<Node> acc, boolean recurse)
   {
     if (context != null && recurse)
       addChildNodes(context, acc, true);
@@ -351,7 +353,7 @@ public final class Selector
       }
   }
 
-  void addPrecedingNodes(Node context, Collection acc, boolean recurse)
+  void addPrecedingNodes(Node context, Collection<Node> acc, boolean recurse)
   {
     Node cur = (context.getNodeType() == Node.ATTRIBUTE_NODE) ? null :
       context.getPreviousSibling();
@@ -372,7 +374,7 @@ public final class Selector
       }
   }
 
-  void addAttributes(Node context, Collection acc)
+  void addAttributes(Node context, Collection<Node> acc)
   {
     NamedNodeMap attrs = context.getAttributes();
     if (attrs != null)
@@ -389,7 +391,7 @@ public final class Selector
       }
   }
 
-  void addNamespaceAttributes(Node context, Collection acc)
+  void addNamespaceAttributes(Node context, Collection<Node> acc)
   {
     NamedNodeMap attrs = context.getAttributes();
     if (attrs != null)
diff --git a/gnu/xml/xpath/StartsWithFunction.java b/gnu/xml/xpath/StartsWithFunction.java
index ec021551e..2dc2c409d 100644
--- a/gnu/xml/xpath/StartsWithFunction.java
+++ b/gnu/xml/xpath/StartsWithFunction.java
@@ -54,9 +54,9 @@ final class StartsWithFunction
   final Expr arg1;
   final Expr arg2;
 
-  StartsWithFunction(List args)
+  StartsWithFunction(List<Expr> args)
   {
-    this((Expr) args.get(0), (Expr) args.get(1));
+    this(args.get(0), args.get(1));
   }
 
   StartsWithFunction(Expr arg1, Expr arg2)
diff --git a/gnu/xml/xpath/Steps.java b/gnu/xml/xpath/Steps.java
index a1208938b..8936f18f4 100644
--- a/gnu/xml/xpath/Steps.java
+++ b/gnu/xml/xpath/Steps.java
@@ -58,14 +58,14 @@ public final class Steps
   extends Path
 {
 
-  final LinkedList path;
+  final LinkedList<Expr> path;
 
   public Steps()
   {
-    this(new LinkedList());
+    this(new LinkedList<Expr>());
   }
 
-  Steps(LinkedList path)
+  Steps(LinkedList<Expr> path)
   {
     this.path = path;
   }
@@ -86,10 +86,8 @@ public final class Steps
     if (pos > 0)
       {
         Pattern left = (Pattern) path.get(pos - 1);
-        Iterator j = possibleContexts(right, context).iterator();
-        while (j.hasNext())
+	for (Node candidate : possibleContexts(right, context))
           {
-            Node candidate = (Node) j.next();
             if (left.matches(candidate) &&
                 matches(candidate, pos - 1))
               {
@@ -106,12 +104,12 @@ public final class Steps
    * Essentially the reverse of Selector.addCandidates.
    * The idea is to determine possible context nodes for a match.
    */
-  Collection possibleContexts(Pattern pattern, Node context)
+  Collection<Node> possibleContexts(Pattern pattern, Node context)
   {
     if (pattern instanceof Selector)
       {
         Selector s = (Selector) pattern;
-        Collection candidates = new LinkedHashSet();
+        Collection<Node> candidates = new LinkedHashSet<Node>();
         switch (s.axis)
           {
           case Selector.PARENT:
@@ -159,15 +157,16 @@ public final class Steps
           }
         return candidates;
       }
-    return Collections.EMPTY_SET;
+    return Collections.emptySet();
   }
 
+  @Override
   public Object evaluate(Node context, int pos, int len)
   {
     //System.err.println(toString()+" evaluate");
     // Left to right
-    Iterator i = path.iterator();
-    Expr lhs = (Expr) i.next();
+    Iterator<Expr> i = path.iterator();
+    Expr lhs = i.next();
     Object val = lhs.evaluate(context, pos, len);
     //System.err.println("\tevaluate "+lhs+" = "+val);
     while (val instanceof Collection && i.hasNext())
@@ -179,26 +178,26 @@ public final class Steps
     return val;
   }
 
-  Collection evaluate(Node context, Collection ns)
+  @Override
+  Collection<Node> evaluate(Node context, Collection<Node> ns)
   {
     // Left to right
-    Iterator i = path.iterator();
-    Expr lhs = (Expr) i.next();
+    Iterator<Expr> i = path.iterator();
+    Expr lhs = i.next();
     if (lhs instanceof Path)
       {
         ns = ((Path) lhs).evaluate(context, ns);
       }
     else
       {
-        Set acc = new LinkedHashSet();
+        Set<Node> acc = new LinkedHashSet<Node>();
         int pos = 1, len = ns.size();
-        for (Iterator j = ns.iterator(); j.hasNext(); )
+	for (Node node : ns)
           {
-            Node node = (Node) j.next();
             Object ret = lhs.evaluate(node, pos++, len);
             if (ret instanceof Collection)
               {
-                acc.addAll((Collection) ret);
+                acc.addAll((Collection<Node>) ret);
               }
           }
         ns = acc;
@@ -214,19 +213,19 @@ public final class Steps
   public Expr clone(Object context)
   {
     int len = path.size();
-    LinkedList path2 = new LinkedList();
+    LinkedList<Expr> path2 = new LinkedList<Expr>();
     for (int i = 0; i < len; i++)
       {
-        path2.add(((Expr) path.get(i)).clone(context));
+        path2.add(path.get(i).clone(context));
       }
     return new Steps(path2);
   }
 
   public boolean references(QName var)
   {
-    for (Iterator i = path.iterator(); i.hasNext(); )
+    for (Iterator<Expr> i = path.iterator(); i.hasNext(); )
       {
-        if (((Expr) i.next()).references(var))
+        if (i.next().references(var))
           {
             return true;
           }
@@ -237,15 +236,15 @@ public final class Steps
   public String toString()
   {
     CPStringBuilder buf = new CPStringBuilder();
-    Iterator i = path.iterator();
-    Expr expr = (Expr) i.next();
+    Iterator<Expr> i = path.iterator();
+    Expr expr = i.next();
     if (!(expr instanceof Root))
       {
         buf.append(expr);
       }
     while (i.hasNext())
       {
-        expr = (Expr) i.next();
+        expr = i.next();
         buf.append('/');
         buf.append(expr);
       }
diff --git a/gnu/xml/xpath/StringFunction.java b/gnu/xml/xpath/StringFunction.java
index 0a4c681d1..b8cba3798 100644
--- a/gnu/xml/xpath/StringFunction.java
+++ b/gnu/xml/xpath/StringFunction.java
@@ -84,9 +84,9 @@ final class StringFunction
 
   final Expr arg;
 
-  StringFunction(List args)
+  StringFunction(List<Expr> args)
   {
-    this(args.size() > 0 ? (Expr) args.get(0) : null);
+    this(args.size() > 0 ? args.get(0) : null);
   }
   
   StringFunction(Expr arg)
diff --git a/gnu/xml/xpath/StringLengthFunction.java b/gnu/xml/xpath/StringLengthFunction.java
index 7f5ceafee..561537e99 100644
--- a/gnu/xml/xpath/StringLengthFunction.java
+++ b/gnu/xml/xpath/StringLengthFunction.java
@@ -55,7 +55,7 @@ final class StringLengthFunction
 
   final Expr arg;
 
-  StringLengthFunction(List args)
+  StringLengthFunction(List<Expr> args)
   {
     this(args.isEmpty() ? null : (Expr) args.get(0));
   }
@@ -65,6 +65,7 @@ final class StringLengthFunction
     this.arg = arg;
   }
 
+  @Override
   public Object evaluate(Node context, int pos, int len)
   {
     Object val = (arg == null) ? null : arg.evaluate(context, pos, len);
diff --git a/gnu/xml/xpath/SubstringAfterFunction.java b/gnu/xml/xpath/SubstringAfterFunction.java
index 8144cf844..ad75f2e3c 100644
--- a/gnu/xml/xpath/SubstringAfterFunction.java
+++ b/gnu/xml/xpath/SubstringAfterFunction.java
@@ -58,9 +58,9 @@ final class SubstringAfterFunction
   final Expr arg1;
   final Expr arg2;
 
-  SubstringAfterFunction(List args)
+  SubstringAfterFunction(List<Expr> args)
   {
-    this((Expr) args.get(0), (Expr) args.get(1));
+    this(args.get(0), args.get(1));
   }
 
   SubstringAfterFunction(Expr arg1, Expr arg2)
diff --git a/gnu/xml/xpath/SubstringBeforeFunction.java b/gnu/xml/xpath/SubstringBeforeFunction.java
index 2d92a3e03..1bf165777 100644
--- a/gnu/xml/xpath/SubstringBeforeFunction.java
+++ b/gnu/xml/xpath/SubstringBeforeFunction.java
@@ -57,9 +57,9 @@ final class SubstringBeforeFunction
   final Expr arg1;
   final Expr arg2;
 
-  SubstringBeforeFunction(List args)
+  SubstringBeforeFunction(List<Expr> args)
   {
-    this((Expr) args.get(0), (Expr) args.get(1));
+    this(args.get(0), args.get(1));
   }
 
   SubstringBeforeFunction(Expr arg1, Expr arg2)
diff --git a/gnu/xml/xpath/SubstringFunction.java b/gnu/xml/xpath/SubstringFunction.java
index e926f6c7a..33bcade0c 100644
--- a/gnu/xml/xpath/SubstringFunction.java
+++ b/gnu/xml/xpath/SubstringFunction.java
@@ -60,10 +60,10 @@ final class SubstringFunction
   final Expr arg2;
   final Expr arg3;
 
-  SubstringFunction(List args)
+  SubstringFunction(List<Expr> args)
   {
-    this((Expr) args.get(0), (Expr) args.get(1),
-         (args.size() > 2) ? (Expr) args.get(2) : null);
+    this(args.get(0), args.get(1),
+         (args.size() > 2) ? args.get(2) : null);
   }
 
   SubstringFunction(Expr arg1, Expr arg2, Expr arg3)
@@ -73,6 +73,7 @@ final class SubstringFunction
     this.arg3 = arg3;
   }
 
+  @Override
   public Object evaluate(Node context, int pos, int len)
   {
     Object val1 = arg1.evaluate(context, pos, len);
diff --git a/gnu/xml/xpath/SumFunction.java b/gnu/xml/xpath/SumFunction.java
index 93c2e806d..ce2989b4b 100644
--- a/gnu/xml/xpath/SumFunction.java
+++ b/gnu/xml/xpath/SumFunction.java
@@ -56,9 +56,9 @@ final class SumFunction
 
   final Expr arg;
 
-  SumFunction(List args)
+  SumFunction(List<Expr> args)
   {
-    this((Expr) args.get(0));
+    this(args.get(0));
   }
 
   SumFunction(Expr arg)
@@ -66,15 +66,15 @@ final class SumFunction
     this.arg = arg;
   }
 
+  @Override @SuppressWarnings("unchecked")
   public Object evaluate(Node context, int pos, int len)
   {
     Object val = arg.evaluate(context, pos, len);
     double sum = 0.0d;
     if (val instanceof Collection)
       {
-        for (Iterator i = ((Collection) val).iterator(); i.hasNext(); )
+	for (Node node : ((Collection<Node>) val))
           {
-            Node node = (Node) i.next();
             String s = stringValue(node);
             sum += _number(context, s);
           }
diff --git a/gnu/xml/xpath/TranslateFunction.java b/gnu/xml/xpath/TranslateFunction.java
index 53e6f45b5..8b4b8b233 100644
--- a/gnu/xml/xpath/TranslateFunction.java
+++ b/gnu/xml/xpath/TranslateFunction.java
@@ -68,9 +68,9 @@ final class TranslateFunction
   final Expr arg2;
   final Expr arg3;
 
-  TranslateFunction(List args)
+  TranslateFunction(List<Expr> args)
   {
-    this((Expr) args.get(0), (Expr) args.get(1), (Expr) args.get(2));
+    this(args.get(0), args.get(1), args.get(2));
   }
 
   TranslateFunction(Expr arg1, Expr arg2, Expr arg3)
diff --git a/gnu/xml/xpath/UnionExpr.java b/gnu/xml/xpath/UnionExpr.java
index 5078713b6..fcaee3d9b 100644
--- a/gnu/xml/xpath/UnionExpr.java
+++ b/gnu/xml/xpath/UnionExpr.java
@@ -74,16 +74,17 @@ public final class UnionExpr
     return false;
   }
 
+  @Override @SuppressWarnings("unchecked")
   public Object evaluate(Node context, int pos, int len)
   {
     Object left = lhs.evaluate(context, pos, len);
     Object right = rhs.evaluate(context, pos, len);
     if (left instanceof Collection && right instanceof Collection)
       {
-        Set set = new HashSet();
-        set.addAll ((Collection) left);
-        set.addAll ((Collection) right);
-        List list = new ArrayList(set);
+        Set<Node> set = new HashSet<Node>();
+	set.addAll ((Collection<Node>) left);
+        set.addAll ((Collection<Node>) right);
+        List<Node> list = new ArrayList<Node>(set);
         Collections.sort(list, documentOrderComparator);
         return list;
       }
diff --git a/gnu/xml/xpath/XPathParser.java b/gnu/xml/xpath/XPathParser.java
index 9b7540a4a..300f3161d 100644
--- a/gnu/xml/xpath/XPathParser.java
+++ b/gnu/xml/xpath/XPathParser.java
@@ -79,7 +79,7 @@ public class XPathParser
     return qName;
   }
 
-  Expr lookupFunction(String name, List args)
+  Expr lookupFunction(String name, List<Expr> args)
   {
     int arity = args.size();
     if ("position".equals(name) && arity == 0)
@@ -391,6 +391,7 @@ public class XPathParser
       @return result of the last reduction, if any.
       @throws yyException on irrecoverable parse error.
     */
+  @SuppressWarnings("unchecked")
   public Object yyparse (yyInput yyLex)
 				throws java.io.IOException, yyException {
     if (yyMax <= 0) yyMax = 256;			// initial size
@@ -491,7 +492,7 @@ case 5:
       else
         {
           steps = new Steps();
-          steps.path.addFirst(yyVals[0+yyTop]);
+          steps.path.addFirst((Expr) yyVals[0+yyTop]);
         }
       steps.path.addFirst(new Root());
       yyVal = steps;
@@ -512,7 +513,7 @@ case 6:
       else
         {
           steps = new Steps();
-          steps.path.addFirst(yyVals[0+yyTop]);
+          steps.path.addFirst((Expr) yyVals[0+yyTop]);
         }
       steps.path.addFirst(s);
       steps.path.addFirst(new Root());
@@ -532,9 +533,9 @@ case 8:
       else
         {
           steps = new Steps();
-          steps.path.addFirst(yyVals[-2+yyTop]);
+          steps.path.addFirst((Expr) yyVals[-2+yyTop]);
         }
-      steps.path.addLast(yyVals[0+yyTop]);
+      steps.path.addLast((Expr) yyVals[0+yyTop]);
       yyVal = steps;
       /*$$ = new Step((Expr) $1, (Path) $3);*/
     }
@@ -553,10 +554,10 @@ case 9:
       else
         {
           steps = new Steps();
-          steps.path.addFirst(yyVals[-2+yyTop]);
+          steps.path.addFirst((Expr) yyVals[-2+yyTop]);
         }
       steps.path.addLast(s);
-      steps.path.addLast(yyVals[0+yyTop]);
+      steps.path.addLast((Expr) yyVals[0+yyTop]);
       yyVal = steps;
       /*Step step = new Step(s, (Path) $3);*/
       /*$$ = new Step((Expr) $1, step);*/
@@ -565,46 +566,48 @@ case 9:
 case 10:
 					// line 362 "XPathParser.y"
   {
-      yyVal = new Selector (Selector.CHILD, (List) yyVals[0+yyTop]);
+      yyVal = new Selector (Selector.CHILD, (List<Test>) yyVals[0+yyTop]);
     }
   break;
 case 11:
 					// line 366 "XPathParser.y"
   {
-      yyVal = new Selector (Selector.ATTRIBUTE, (List) yyVals[0+yyTop]);
+      yyVal = new Selector (Selector.ATTRIBUTE, (List<Test>) yyVals[0+yyTop]);
     }
   break;
 case 12:
 					// line 370 "XPathParser.y"
   {
-      yyVal = new Selector (((Integer) yyVals[-2+yyTop]).intValue (), (List) yyVals[0+yyTop]);
+      yyVal = new Selector (((Integer) yyVals[-2+yyTop]).intValue (), (List<Test>) yyVals[0+yyTop]);
     }
   break;
 case 13:
 					// line 374 "XPathParser.y"
   {
-      yyVal = new Selector (Selector.SELF, Collections.EMPTY_LIST);
-    }
+    List<Test> emptyList = Collections.emptyList();
+    yyVal = new Selector (Selector.SELF, emptyList);
+  }
   break;
 case 14:
 					// line 378 "XPathParser.y"
   {
-      yyVal = new Selector (Selector.PARENT, Collections.EMPTY_LIST);
-    }
+    List<Test> emptyList = Collections.emptyList();
+    yyVal = new Selector (Selector.PARENT, emptyList);
+  }
   break;
 case 15:
 					// line 385 "XPathParser.y"
   {
-      List list = new ArrayList();
-      list.add(yyVals[0+yyTop]);
+      List<Test> list = new ArrayList<Test>();
+      list.add((Test) yyVals[0+yyTop]);
       yyVal = list;
     }
   break;
 case 16:
 					// line 391 "XPathParser.y"
   {
-      List list = (List)yyVals[-1+yyTop];
-      list.add(yyVals[0+yyTop]);
+      List<Test> list = (List<Test>)yyVals[-1+yyTop];
+      list.add((Test) yyVals[0+yyTop]);
       yyVal = list;
     }
   break;
@@ -725,8 +728,9 @@ case 37:
 case 39:
 					// line 508 "XPathParser.y"
   {
-      yyVal = lookupFunction((String) yyVals[-2+yyTop], Collections.EMPTY_LIST);
-    }
+    List<Expr> emptyList = Collections.emptyList();
+    yyVal = lookupFunction((String) yyVals[-2+yyTop], emptyList);
+  }
   break;
 case 40:
 					// line 512 "XPathParser.y"
@@ -737,16 +741,16 @@ case 40:
 case 41:
 					// line 519 "XPathParser.y"
   {
-      List list = new ArrayList();
-      list.add(yyVals[0+yyTop]);
+      List<Expr> list = new ArrayList<Expr>();
+      list.add((Expr) yyVals[0+yyTop]);
       yyVal = list;
     }
   break;
 case 42:
 					// line 525 "XPathParser.y"
   {
-      List list = (List) yyVals[0+yyTop];
-      list.add(0, yyVals[-2+yyTop]);
+      List<Expr> list = (List<Expr>) yyVals[0+yyTop];
+      list.add(0, (Expr) yyVals[-2+yyTop]);
       yyVal = list;
     }
   break;
@@ -767,9 +771,9 @@ case 47:
       else
         {
           steps = new Steps();
-          steps.path.addFirst(yyVals[0+yyTop]);
+          steps.path.addFirst((Expr) yyVals[0+yyTop]);
         }
-      steps.path.addFirst(yyVals[-2+yyTop]);
+      steps.path.addFirst((Expr) yyVals[-2+yyTop]);
       yyVal = steps;
       /*$$ = new Step ((Expr) $1, (Path) $3);*/
     }
@@ -788,10 +792,10 @@ case 48:
       else
         {
           steps = new Steps();
-          steps.path.addFirst(yyVals[0+yyTop]);
+          steps.path.addFirst((Expr) yyVals[0+yyTop]);
         }
       steps.path.addFirst(s);
-      steps.path.addFirst(yyVals[-2+yyTop]);
+      steps.path.addFirst((Expr) yyVals[-2+yyTop]);
       yyVal = steps;
       /*Step step = new Step (s, (Path) $3);*/
       /*$$ = new Step ((Expr) $1, step);*/
@@ -811,7 +815,7 @@ case 50:
       else
         {
           steps = new Steps();
-          steps.path.addFirst(yyVals[-1+yyTop]);
+          steps.path.addFirst((Expr) yyVals[-1+yyTop]);
         }
       steps.path.addLast(s);
       yyVal = steps;
diff --git a/gnu/xml/xpath/XPathParser.y b/gnu/xml/xpath/XPathParser.y
index 550151386..520e82384 100644
--- a/gnu/xml/xpath/XPathParser.y
+++ b/gnu/xml/xpath/XPathParser.y
@@ -78,7 +78,7 @@ public class XPathParser
     return qName;
   }
 
-  Expr lookupFunction(String name, List args)
+  Expr lookupFunction(String name, List<Expr> args)
   {
     int arity = args.size();
     if ("position".equals(name) && arity == 0)
@@ -287,7 +287,7 @@ absolute_location_path:
       else
         {
           steps = new Steps();
-          steps.path.addFirst($2);
+          steps.path.addFirst((Expr) $2);
         }
       steps.path.addFirst(new Root());
       $$ = steps;
@@ -306,7 +306,7 @@ absolute_location_path:
       else
         {
           steps = new Steps();
-          steps.path.addFirst($2);
+          steps.path.addFirst((Expr) $2);
         }
       steps.path.addFirst(s);
       steps.path.addFirst(new Root());
@@ -328,9 +328,9 @@ relative_location_path:
       else
         {
           steps = new Steps();
-          steps.path.addFirst($1);
+          steps.path.addFirst((Expr) $1);
         }
-      steps.path.addLast($3);
+      steps.path.addLast((Expr) $3);
       $$ = steps;
       //$$ = new Step((Expr) $1, (Path) $3);
     }
@@ -347,10 +347,10 @@ relative_location_path:
       else
         {
           steps = new Steps();
-          steps.path.addFirst($1);
+          steps.path.addFirst((Expr) $1);
         }
       steps.path.addLast(s);
-      steps.path.addLast($3);
+      steps.path.addLast((Expr) $3);
       $$ = steps;
       //Step step = new Step(s, (Path) $3);
       //$$ = new Step((Expr) $1, step);
@@ -372,25 +372,27 @@ step:
     }
   | DOT
     {
-      $$ = new Selector (Selector.SELF, Collections.EMPTY_LIST);
+      List<Test> emptyList = Collections.emptyList();
+      $$ = new Selector (Selector.SELF, emptyList);
     }
   | DOUBLE_DOT
     {
-      $$ = new Selector (Selector.PARENT, Collections.EMPTY_LIST);
+      List<Test> emptyList = Collections.emptyList();
+      $$ = new Selector (Selector.PARENT, emptyList);
     }
   ;
 
 step_node_test:
   node_test
     {
-      List list = new ArrayList();
-      list.add($1);
+      List<Test> list = new ArrayList<Test>();
+      list.add((Test) $1);
       $$ = list;
     }
   | step_node_test predicate
     {
-      List list = (List)$1;
-      list.add($2);
+      List<Test> list = (List<Test>)$1;
+      list.add((Test) $2);
       $$ = list;
     }
   ;
@@ -506,7 +508,7 @@ primary_expr:
 function_call:
   function_name LP RP
     {
-      $$ = lookupFunction((String) $1, Collections.EMPTY_LIST);
+      $$ = lookupFunction((String) $1, Collections.emptyList());
     }
   | function_name LP argument_list RP
     {
@@ -517,14 +519,14 @@ function_call:
 argument_list:
   expr
     {
-      List list = new ArrayList();
-      list.add($1);
+      List<Expr> list = new ArrayList<Expr>();
+      list.add((Expr) $1);
       $$ = list;
     }
   | expr COMMA argument_list
     {
-      List list = (List) $3;
-      list.add(0, $1);
+      List<Expr> list = (List<Expr>) $3;
+      list.add(0, (Expr) $1);
       $$ = list;
     }
   ;
@@ -550,9 +552,9 @@ path_expr:
       else
         {
           steps = new Steps();
-          steps.path.addFirst($3);
+          steps.path.addFirst((Expr) $3);
         }
-      steps.path.addFirst($1);
+      steps.path.addFirst((Expr) $1);
       $$ = steps;
       //$$ = new Step ((Expr) $1, (Path) $3);
     }
@@ -572,7 +574,7 @@ path_expr:
           steps.path.addFirst($3);
         }
       steps.path.addFirst(s);
-      steps.path.addFirst($1);
+      steps.path.addFirst((Expr) $1);
       $$ = steps;
       //Step step = new Step (s, (Path) $3);
       //$$ = new Step ((Expr) $1, step);
@@ -594,7 +596,7 @@ filter_expr:
       else
         {
           steps = new Steps();
-          steps.path.addFirst($1);
+          steps.path.addFirst((Expr) $1);
         }
       steps.path.addLast(s);
       $$ = steps;
diff --git a/gnu/xml/xpath/XPathTokenizer.java b/gnu/xml/xpath/XPathTokenizer.java
index 78bbd9342..bf4516afa 100644
--- a/gnu/xml/xpath/XPathTokenizer.java
+++ b/gnu/xml/xpath/XPathTokenizer.java
@@ -92,7 +92,7 @@ implements XPathParser.yyInput
     
   }
 
-  static final Map keywords = new TreeMap ();
+  static final Map<String,Integer> keywords = new TreeMap<String,Integer> ();
   static
   {
     keywords.put ("ancestor", new Integer (XPathParser.ANCESTOR));
diff --git a/javax/xml/datatype/DatatypeFactory.java b/javax/xml/datatype/DatatypeFactory.java
index 06f465c35..386d5b852 100644
--- a/javax/xml/datatype/DatatypeFactory.java
+++ b/javax/xml/datatype/DatatypeFactory.java
@@ -44,7 +44,7 @@ import java.math.BigInteger;
 import java.util.GregorianCalendar;
 import java.util.Iterator;
 import java.util.Properties;
-import gnu.classpath.ServiceFactory;
+import java.util.ServiceLoader;
 
 /**
  * Factory class to create new datatype objects mapping XML to and from Java
@@ -97,11 +97,11 @@ public abstract class DatatypeFactory
               return (DatatypeFactory) Class.forName(className).newInstance();
           }
         // 3. services
-        Iterator i = ServiceFactory.lookupProviders(DatatypeFactory.class);
+        Iterator<DatatypeFactory> i = ServiceLoader.load(DatatypeFactory.class).iterator();
         if (i.hasNext())
-          return (DatatypeFactory) i.next();
+          return i.next();
         // 4. fallback
-        Class t = Class.forName(DATATYPEFACTORY_IMPLEMENTATION_CLASS);
+        Class<?> t = Class.forName(DATATYPEFACTORY_IMPLEMENTATION_CLASS);
         return (DatatypeFactory) t.newInstance();
       }
     catch (Exception e)
diff --git a/javax/xml/namespace/NamespaceContext.java b/javax/xml/namespace/NamespaceContext.java
index 1bcb85006..b9722a47a 100644
--- a/javax/xml/namespace/NamespaceContext.java
+++ b/javax/xml/namespace/NamespaceContext.java
@@ -61,6 +61,7 @@ public interface NamespaceContext
   /**
    * Returns all the prefixes currently bound to the given namespace URI.
    */
+  @SuppressWarnings("unchecked")
   public Iterator getPrefixes(String namespaceURI);
   
 }
diff --git a/javax/xml/parsers/DocumentBuilderFactory.java b/javax/xml/parsers/DocumentBuilderFactory.java
index 9312e65e0..a1350c549 100644
--- a/javax/xml/parsers/DocumentBuilderFactory.java
+++ b/javax/xml/parsers/DocumentBuilderFactory.java
@@ -99,7 +99,7 @@ public abstract class DocumentBuilderFactory
           {
             try
               {
-                Class t = (loader != null) ? loader.loadClass(className) :
+                Class<?> t = (loader != null) ? loader.loadClass(className) :
                   Class.forName(className);
                 return (DocumentBuilderFactory) t.newInstance();
               }
diff --git a/javax/xml/parsers/SAXParserFactory.java b/javax/xml/parsers/SAXParserFactory.java
index 549fe4b54..9f8f7bafe 100644
--- a/javax/xml/parsers/SAXParserFactory.java
+++ b/javax/xml/parsers/SAXParserFactory.java
@@ -99,7 +99,7 @@ public abstract class SAXParserFactory
           {
             try
               {
-                Class t = (loader != null) ? loader.loadClass(className) :
+                Class<?> t = (loader != null) ? loader.loadClass(className) :
                   Class.forName(className);
                 return (SAXParserFactory) t.newInstance();
               }
diff --git a/javax/xml/stream/XMLEventFactory.java b/javax/xml/stream/XMLEventFactory.java
index cb850baae..30e160793 100644
--- a/javax/xml/stream/XMLEventFactory.java
+++ b/javax/xml/stream/XMLEventFactory.java
@@ -116,7 +116,7 @@ public abstract class XMLEventFactory
           {
             try
               {
-                Class t = (loader != null) ? loader.loadClass(className) :
+                Class<?> t = (loader != null) ? loader.loadClass(className) :
                   Class.forName(className);
                 return (XMLEventFactory) t.newInstance();
               }
@@ -217,6 +217,7 @@ public abstract class XMLEventFactory
   /**
    * Create a start-element event.
    */
+  @SuppressWarnings("unchecked")
   public abstract StartElement createStartElement(QName name,
                                                   Iterator attributes,
                                                   Iterator namespaces);
@@ -231,6 +232,7 @@ public abstract class XMLEventFactory
   /**
    * Create a start-element event.
    */
+  @SuppressWarnings("unchecked")
   public abstract StartElement createStartElement(String prefix,
                                                   String namespaceUri,
                                                   String localName,
@@ -240,6 +242,7 @@ public abstract class XMLEventFactory
   /**
    * Create a start-element event.
    */
+  @SuppressWarnings("unchecked")
   public abstract StartElement createStartElement(String prefix,
                                                   String namespaceUri,
                                                   String localName,
@@ -250,6 +253,7 @@ public abstract class XMLEventFactory
   /**
    * Create an end-element event.
    */
+  @SuppressWarnings("unchecked")
   public abstract EndElement createEndElement(QName name,
                                               Iterator namespaces);
 
@@ -263,6 +267,7 @@ public abstract class XMLEventFactory
   /**
    * Create an end-element event.
    */
+  @SuppressWarnings("unchecked")
   public abstract EndElement createEndElement(String prefix,
                                               String namespaceUri,
                                               String localName,
diff --git a/javax/xml/stream/XMLEventReader.java b/javax/xml/stream/XMLEventReader.java
index 35ad5696e..ee0354f94 100644
--- a/javax/xml/stream/XMLEventReader.java
+++ b/javax/xml/stream/XMLEventReader.java
@@ -43,6 +43,7 @@ import javax.xml.stream.events.XMLEvent;
 /**
  * An XML parser.
  */
+@SuppressWarnings("unchecked")
 public interface XMLEventReader
   extends Iterator
 {
diff --git a/javax/xml/stream/XMLInputFactory.java b/javax/xml/stream/XMLInputFactory.java
index f88451e54..437bf83b5 100644
--- a/javax/xml/stream/XMLInputFactory.java
+++ b/javax/xml/stream/XMLInputFactory.java
@@ -229,7 +229,7 @@ public abstract class XMLInputFactory
           {
             try
               {
-                Class t = (loader != null) ? loader.loadClass(className) :
+                Class<?> t = (loader != null) ? loader.loadClass(className) :
                   Class.forName(className);
                 return (XMLInputFactory) t.newInstance();
               }
diff --git a/javax/xml/stream/XMLOutputFactory.java b/javax/xml/stream/XMLOutputFactory.java
index e4c9dd40d..908f84f26 100644
--- a/javax/xml/stream/XMLOutputFactory.java
+++ b/javax/xml/stream/XMLOutputFactory.java
@@ -116,7 +116,7 @@ public abstract class XMLOutputFactory
           {
             try
               {
-                Class t = (loader != null) ? loader.loadClass(className) :
+                Class<?> t = (loader != null) ? loader.loadClass(className) :
                   Class.forName(className);
                 return (XMLOutputFactory) t.newInstance();
               }
diff --git a/javax/xml/stream/events/DTD.java b/javax/xml/stream/events/DTD.java
index 6c7bcc4ce..943572ef3 100644
--- a/javax/xml/stream/events/DTD.java
+++ b/javax/xml/stream/events/DTD.java
@@ -60,11 +60,13 @@ public interface DTD
   /**
    * Returns the notations declared in the DTD.
    */
+  @SuppressWarnings("unchecked")
   List getNotations();
 
   /**
    * Returns the entities declared in the DTD.
    */
+  @SuppressWarnings("unchecked")
   List getEntities();
   
 }
diff --git a/javax/xml/stream/events/EndElement.java b/javax/xml/stream/events/EndElement.java
index 86a2e1617..3bde8f8ad 100644
--- a/javax/xml/stream/events/EndElement.java
+++ b/javax/xml/stream/events/EndElement.java
@@ -55,6 +55,7 @@ public interface EndElement
   /**
    * Returns the namespaces that have gone out of scope.
    */
+  @SuppressWarnings("unchecked")
   Iterator getNamespaces();
   
 }
diff --git a/javax/xml/stream/events/StartElement.java b/javax/xml/stream/events/StartElement.java
index a35b3b412..0916368c9 100644
--- a/javax/xml/stream/events/StartElement.java
+++ b/javax/xml/stream/events/StartElement.java
@@ -56,11 +56,13 @@ public interface StartElement
   /**
    * Returns the attributes declared on this element.
    */
+  @SuppressWarnings("unchecked")
   Iterator getAttributes();
 
   /**
    * Returns the namespaces declared on this element.
    */
+  @SuppressWarnings("unchecked")
   Iterator getNamespaces();
 
   /**
diff --git a/javax/xml/transform/TransformerFactory.java b/javax/xml/transform/TransformerFactory.java
index e3c895361..e3e6c0cbd 100644
--- a/javax/xml/transform/TransformerFactory.java
+++ b/javax/xml/transform/TransformerFactory.java
@@ -89,7 +89,7 @@ public abstract class TransformerFactory
           {
             try
               {
-                Class t = (loader != null) ? loader.loadClass(className) :
+                Class<?> t = (loader != null) ? loader.loadClass(className) :
                   Class.forName(className);
                 return (TransformerFactory) t.newInstance();
               }
@@ -107,7 +107,7 @@ public abstract class TransformerFactory
     while (className == null && count < 3);
     try
       {
-        Class t =
+        Class<?> t =
           Class.forName("gnu.xml.transform.TransformerFactoryImpl");
         return (TransformerFactory) t.newInstance();
       }
diff --git a/javax/xml/validation/SchemaFactory.java b/javax/xml/validation/SchemaFactory.java
index 0c2410444..0b83b6f4d 100644
--- a/javax/xml/validation/SchemaFactory.java
+++ b/javax/xml/validation/SchemaFactory.java
@@ -89,7 +89,7 @@ public abstract class SchemaFactory
           {
             try
               {
-                Class t = (loader != null) ? loader.loadClass(className) :
+                Class<?> t = (loader != null) ? loader.loadClass(className) :
                     Class.forName(className);
                 return (SchemaFactory) t.newInstance();
               }
@@ -118,7 +118,7 @@ public abstract class SchemaFactory
                 for (String line = r.readLine(); line != null;
                         line = r.readLine())
                   {
-                    Class t = (loader != null) ? loader.loadClass(className) :
+                    Class<?> t = (loader != null) ? loader.loadClass(className) :
                         Class.forName(className);
                     SchemaFactory ret = (SchemaFactory) t.newInstance();
                     if (ret.isSchemaLanguageSupported(schemaLanguage))
diff --git a/javax/xml/xpath/XPathFactory.java b/javax/xml/xpath/XPathFactory.java
index e87475f13..76a88a10c 100644
--- a/javax/xml/xpath/XPathFactory.java
+++ b/javax/xml/xpath/XPathFactory.java
@@ -117,7 +117,7 @@ public abstract class XPathFactory
           {
             try
               {
-                Class t = (loader != null) ? loader.loadClass(className) :
+                Class<?> t = (loader != null) ? loader.loadClass(className) :
                   Class.forName(className);
                 XPathFactory ret = (XPathFactory) t.newInstance();
                 if (ret.isObjectModelSupported(uri))
diff --git a/javax/xml/xpath/XPathFunction.java b/javax/xml/xpath/XPathFunction.java
index c7ea73314..dbda11bfe 100644
--- a/javax/xml/xpath/XPathFunction.java
+++ b/javax/xml/xpath/XPathFunction.java
@@ -52,6 +52,7 @@ public interface XPathFunction
    * Evaluate the function with the specified arguments.
    * @param args the list of arguments
    */
+  @SuppressWarnings("unchecked")
   Object evaluate(List args)
     throws XPathFunctionException;