Merged gcj-eclipse branch to trunk.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120621 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 1 insertions, 16 deletions

diff --git a/libjava/classpath/java/text/CollationKey.java b/libjava/classpath/java/text/CollationKey.java
index a467869b881..1ae8abc556c 100644
--- a/libjava/classpath/java/text/CollationKey.java
+++ b/libjava/classpath/java/text/CollationKey.java
@@ -65,7 +65,7 @@ import java.util.Arrays;
  * @author Tom Tromey (tromey@cygnus.com)
  * @date March 25, 1999
  */
-public final class CollationKey implements Comparable
+public class CollationKey implements Comparable<CollationKey>
 {
   /**
    * This is the <code>Collator</code> this object was created from.
@@ -112,21 +112,6 @@ public final class CollationKey implements Comparable
   }
 
   /**
-   * This method compares the specified object to this one.  The specified
-   * object must be an instance of <code>CollationKey</code> or an exception
-   * will be thrown.  An integer is returned which indicates whether the
-   * specified object is less than, greater than, or equal to this object.
-   *
-   * @param obj The <code>Object</code> to compare against this one.
-   *
-   * @return A negative integer if this object is less than the specified object, 0 if it is equal or a positive integer if it is greater than the specified object.
-   */
-  public int compareTo (Object obj)
-  {
-    return compareTo ((CollationKey) obj);
-  }
-
-  /**
    * This method tests the specified <code>Object</code> for equality with
    * this object.  This will be true if and only if:
    * <p>