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, 12 deletions

diff --git a/libjava/classpath/java/util/UUID.java b/libjava/classpath/java/util/UUID.java
index 6a57d27b448..9a402d15922 100644
--- a/libjava/classpath/java/util/UUID.java
+++ b/libjava/classpath/java/util/UUID.java
@@ -77,7 +77,7 @@ import java.security.NoSuchAlgorithmException;
  */
 public final class UUID 
   extends Object 
-  implements Serializable, Comparable // genericizeme!
+  implements Serializable, Comparable<UUID>
 {
   private static final long serialVersionUID = -4856846361193249489L;
 
@@ -127,17 +127,6 @@ public final class UUID
    *
    * @return -1 if this < val, 0 if they are equal, 1 if this > val.
    */
-  public int compareTo(Object val)
-  {
-    return compareTo((UUID)val);
-  }
-
-  /**
-   * Compare this UUID to another.
-   * The comparison is performed as between two 128-bit integers.
-   *
-   * @return -1 if this < val, 0 if they are equal, 1 if this > val.
-   */
   public int compareTo(UUID o)
   {
     if( mostSigBits < o.mostSigBits )