[cp-patches] [generics] Patch: FYI: String fixlet

[Tom Tromey]

I'm checking this in on the generics branch.

This fixes a couple generics problems in String, found thanks to
Stuart's new japi.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>
        * java/lang/String.java (CASE_INSENSITIVE_ORDER): Now a
        Comparator<String>.
        (CaseInsensitiveComparator): Updated.
        (CaseInsensitiveComparator.compare): Changed argument types.
Index: java/lang/String.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/String.java,v
retrieving revision 1.58.2.12
diff -u -r1.58.2.12 String.java
--- java/lang/String.java 25 Sep 2005 02:55:12 -0000 1.58.2.12
+++ java/lang/String.java 27 Sep 2005 16:41:38 -0000
@@ -148,7 +148,7 @@
    * compatibility with Sun's JDK.
    */
   private static final class CaseInsensitiveComparator
-    implements Comparator, Serializable
+    implements Comparator<String>, Serializable
   {
     /**
      * Compatible with JDK 1.2.
@@ -172,9 +172,9 @@
      * @throws ClassCastException if either argument is not a String
      * @see #compareToIgnoreCase(String)
      */
-    public int compare(Object o1, Object o2)
+    public int compare(String o1, String o2)
     {
-      return ((String) o1).compareToIgnoreCase((String) o2);
+      return o1.compareToIgnoreCase(o2);
     }
   } // class CaseInsensitiveComparator
 
@@ -186,7 +186,7 @@
    * @see Collator#compare(String, String)
    * @since 1.2
    */
-  public static final Comparator CASE_INSENSITIVE_ORDER
+  public static final Comparator<String> CASE_INSENSITIVE_ORDER
     = new CaseInsensitiveComparator();
 
   /**