1 files changed, 26 insertions, 23 deletions
diff --git a/libjava/classpath/java/lang/Boolean.java b/libjava/classpath/java/lang/Boolean.java
index 902c93b..2399252 100644
--- a/libjava/classpath/java/lang/Boolean.java
+++ b/libjava/classpath/java/lang/Boolean.java
@@ -1,5 +1,5 @@
 /* Boolean.java -- object wrapper for boolean
-   Copyright (C) 1998, 2001, 2002, 2005  Free Software Foundation, Inc.
+   Copyright (C) 1998, 2001, 2002, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -47,9 +47,9 @@ import java.io.Serializable;
  * @author Paul Fisher
  * @author Eric Blake (ebb9@email.byu.edu)
  * @since 1.0
- * @status updated to 1.4
+ * @status updated to 1.5
  */
-public final class Boolean implements Serializable
+public final class Boolean implements Serializable, Comparable
 {
   /**
    * Compatible with JDK 1.0.2+.
@@ -223,34 +223,37 @@ public final class Boolean implements Serializable
   }
 
   /**
-   * If the String argument is "true", ignoring case, return true.
-   * Otherwise, return false.
+   * Compares this Boolean to another.
    *
-   * @param b String to parse
+   * @param other the Boolean to compare this Boolean to
+   * @return 0 if both Booleans represent the same value, a positive number 
+   * if this Boolean represents true and the other false, and a negative
+   * number otherwise.
    * @since 1.5
    */
-  public static boolean parseBoolean(String b)
+  public int compareTo(Boolean other)
   {
-    return "true".equalsIgnoreCase(b) ? true : false;
+    return value == other.value ? 0 : (value ? 1 : -1);
   }
-  
+
   /**
-   * Compares this Boolean to another.
-   * @param b the Boolean to compare this Boolean to
-   * @return 0 if both Booleans represent the same value, a positive number 
-   * if this Boolean represents true and b represents false, or a negative
-   * number otherwise.
+   * Bridge method
+   */
+  public int compareTo(Object other)
+  {
+    return compareTo((Boolean)other);
+  }
+
+  /**
+   * If the String argument is "true", ignoring case, return true.
+   * Otherwise, return false.
+   *
+   * @param b String to parse
    * @since 1.5
    */
-  public int compareTo (Boolean b)
+  public static boolean parseBoolean(String b)
   {
-    if (b == null)
-      throw new NullPointerException("argument passed to compareTo(Boolean) cannot be null");
-    
-    if (this.value == b.value)
-      return 0;
-    if (this.value == true)
-      return 1;
-    return -1;
+    return "true".equalsIgnoreCase(b) ? true : false;
   }
+
 }