1 files changed, 51 insertions, 57 deletions
diff --git a/libjava/classpath/gnu/xml/transform/XSLComparator.java b/libjava/classpath/gnu/xml/transform/XSLComparator.java
index 222f370c8b9..88243693d7f 100644
--- a/libjava/classpath/gnu/xml/transform/XSLComparator.java
+++ b/libjava/classpath/gnu/xml/transform/XSLComparator.java
@@ -51,72 +51,66 @@ import gnu.xml.xpath.Expr;
  * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a>
  */
 class XSLComparator
-  implements Comparator
+  implements Comparator<Node>
 {
 
-  final List sortKeys;
+  final List<SortKey> sortKeys;
 
-  XSLComparator(List sortKeys)
+  XSLComparator(List<SortKey> sortKeys)
   {
     this.sortKeys = sortKeys;
   }
 
-  public int compare(Object o1, Object o2)
+  public int compare(Node n1, Node n2)
   {
-    if (o1 instanceof Node && o2 instanceof Node)
+    for (SortKey sortKey : sortKeys)
       {
-        Node n1 = (Node) o1;
-        Node n2 = (Node) o2;
-        for (Iterator i = sortKeys.iterator(); i.hasNext(); )
-          {
-            SortKey sortKey = (SortKey) i.next();
-            String k1 = sortKey.key(n1);
-            String k2 = sortKey.key(n2);
-            if ("text".equals(sortKey.dataType))
-              {
-                Locale locale = (sortKey.lang == null) ? Locale.getDefault() :
-                  new Locale(sortKey.lang);
-                Collator collator = Collator.getInstance(locale);
-                int d = collator.compare(k1, k2);
-                if (d != 0)
-                  {
-                    switch (sortKey.caseOrder)
-                      {
-                      case SortKey.UPPER_FIRST:
-                        // TODO
-                        break;
-                      case SortKey.LOWER_FIRST:
-                        // TODO
-                        break;
-                      }
-                    if (sortKey.descending)
-                      {
-                        d = -d;
-                      }
-                    return d;
-                  }
-              }
-            else if ("number".equals(sortKey.dataType))
-              {
-                double kn1 = Expr._number(n1, k1);
-                double kn2 = Expr._number(n2, k2);
-                int d;
-                if (Double.isNaN(kn1) || Double.isInfinite(kn2))
-                  {
-                    d = -1;
-                  }
-                else if (Double.isNaN(kn2) || Double.isInfinite(kn1))
-                  {
-                    d = 1;
-                  }
-                else
-                  {
-                    // conversion to int may give 0 for small numbers
-                    d = (kn1 > kn2) ? 1 : (kn1 < kn2) ? -1 : 0;
-                  }
-                return (sortKey.descending) ? -d : d;
-              }
-          }
+	String k1 = sortKey.key(n1);
+	String k2 = sortKey.key(n2);
+	if ("text".equals(sortKey.dataType))
+	  {
+	    Locale locale = (sortKey.lang == null) ? Locale.getDefault() :
+	      new Locale(sortKey.lang);
+	    Collator collator = Collator.getInstance(locale);
+	    int d = collator.compare(k1, k2);
+	    if (d != 0)
+	      {
+		switch (sortKey.caseOrder)
+		  {
+		  case SortKey.UPPER_FIRST:
+		    // TODO
+		    break;
+		  case SortKey.LOWER_FIRST:
+		    // TODO
+		    break;
+		  }
+		if (sortKey.descending)
+		  {
+		    d = -d;
+		  }
+		return d;
+	      }
+	  }
+	else if ("number".equals(sortKey.dataType))
+	  {
+	    double kn1 = Expr._number(n1, k1);
+	    double kn2 = Expr._number(n2, k2);
+	    int d;
+	    if (Double.isNaN(kn1) || Double.isInfinite(kn2))
+	      {
+		d = -1;
+	      }
+	    else if (Double.isNaN(kn2) || Double.isInfinite(kn1))
+	      {
+		d = 1;
+	      }
+	    else
+	      {
+		// conversion to int may give 0 for small numbers
+		d = (kn1 > kn2) ? 1 : (kn1 < kn2) ? -1 : 0;
+	      }
+	    return (sortKey.descending) ? -d : d;
+	  }
       }
     return 0;
   }