2 files changed, 14 insertions, 3 deletions
diff --git a/libjava/java/text/CollationKey.java b/libjava/java/text/CollationKey.java
index 725b66a..966c64d 100644
--- a/libjava/java/text/CollationKey.java
+++ b/libjava/java/text/CollationKey.java
@@ -1,6 +1,6 @@
 // CollationKey.java - Sort key for locale-sensitive String.
 
-/* Copyright (C) 1999  Free Software Foundation
+/* Copyright (C) 1999, 2000  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -19,7 +19,7 @@ package java.text;
  * Status: Believed complete and correct.
  */
 
-public final class CollationKey
+public final class CollationKey implements Comparable
 {
   public int compareTo (CollationKey target)
   {
@@ -34,6 +34,11 @@ public final class CollationKey
     return key.length - target.key.length;
   }
 
+  public int compareTo (Object o)
+  {
+    return compareTo ((CollationKey) o);
+  }
+
   public boolean equals (Object obj)
   {
     if (! (obj instanceof CollationKey))
diff --git a/libjava/java/text/Collator.java b/libjava/java/text/Collator.java
index 4280ea2..60da531 100644
--- a/libjava/java/text/Collator.java
+++ b/libjava/java/text/Collator.java
@@ -13,6 +13,7 @@ package java.text;
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
+import java.util.Comparator;
 
 /**
  * @author Tom Tromey <tromey@cygnus.com>
@@ -23,7 +24,7 @@ import java.util.ResourceBundle;
  * Status: Mostly complete, but parts stubbed out.  Look for FIXME.
  */
 
-public abstract class Collator implements Cloneable
+public abstract class Collator implements Comparator, Cloneable
 {
   public static final int NO_DECOMPOSITION = 0;
   public static final int CANONICAL_DECOMPOSITION = 1;
@@ -42,6 +43,11 @@ public abstract class Collator implements Cloneable
 
   public abstract int compare (String source, String target);
 
+  public int compare (Object o1, Object o2)
+  {
+    return compare ((String) o1, (String) o2);
+  }
+
   public boolean equals (Object obj)
   {
     if (! (obj instanceof Collator))