MONDRIAN: retro fix for JDK 1.4 non-Comparable Boolean

[git-p4: depot-paths = "//open/mondrian/": change = 8462]

src/main/mondrian/olap/Util.java

@@ -222,6 +222,22 @@ public static String normalizeName(String s) {
                 s.toUpperCase();
     }
 
+    /**
+     * Returns the result of ((Comparable) k1).compareTo(k2), with
+     * special-casing for the fact that Boolean only became
+     * comparable in JDK 1.5.
+     *
+     * @see Comparable#compareTo
+     */
+    public static int compareKey(Object k1, Object k2) {
+        if (k1 instanceof Boolean) {
+            // Luckily, "F" comes before "T" in the alphabet.
+            k1 = k1.toString();
+            k2 = k2.toString();
+        }
+        return ((Comparable) k1).compareTo(k2);
+    }
+
     /**
      * Returns a string with every occurrence of a seek string replaced with
      * another.

src/main/mondrian/rolap/RolapMember.java

@@ -605,7 +605,7 @@ public int compareTo(Object o) {
             if (this.key instanceof String) {
                 return Util.compareName((String) this.key, (String) other.key);
             } else {
-                return ((Comparable) this.key).compareTo(other.key);
+                return Util.compareKey(this.key, other.key);
             }
         }
         // Compare by unique name in case of different key classes.