ICU-8474 Revert changes ULocale's class signature and comparTo method. Also removed...

X-SVN-Rev: 34289

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/PluralRules.java b/icu4j/main/classes/core/src/com/ibm/icu/text/PluralRules.java
index 3516c75d6cab21dbfbc655d39952d7556023ba15..42e6ee09c2523c48f3e2d87f024e44ae7bcddc4c 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/PluralRules.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/PluralRules.java
@@ -165,7 +165,7 @@ import com.ibm.icu.util.ULocale;
  * 
  * @stable ICU 3.8
  */
-public class PluralRules implements Serializable, Comparable<PluralRules> {
+public class PluralRules implements Serializable {
 
     static final UnicodeSet ALLOWED_ID = new UnicodeSet("[a-z]").freeze();
 

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java b/icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java
index 569f4b89a6f2b6c84a99677651d20acdf1254acb..f6e8f0bfdeb0ea24e72cdb993975d3d524a3bd27 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java
@@ -107,7 +107,7 @@ import com.ibm.icu.text.LocaleDisplayNames.DialectHandling;
  * @author Ram Viswanadha
  * @stable ICU 2.8
  */
-public final class ULocale implements Serializable, Comparable<ULocale> {
+public final class ULocale implements Serializable {
     // using serialver from jdk1.4.2_05
     private static final long serialVersionUID = 3715177670352309217L;
 
@@ -4156,12 +4156,4 @@ public final class ULocale implements Serializable, Comparable<ULocale> {
             return val;
         }
     }
-
-    /*
-     * @internal
-     * @deprecated
-     */
-    public int compareTo(ULocale other) {
-        return toLanguageTag().compareTo(other.toLanguageTag());
-    }
 }