From e27c77829da834fe5d6ff869665fd0fc96112189 Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Thu, 12 Sep 2013 20:53:12 +0000 Subject: [PATCH] ICU-8474 Revert changes ULocale's class signature and comparTo method. Also removed Comparable from PluralRule's class signature, but preserved compareTo method as @internal. X-SVN-Rev: 34289 --- .../classes/core/src/com/ibm/icu/text/PluralRules.java | 2 +- .../classes/core/src/com/ibm/icu/util/ULocale.java | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) 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 3516c75d6ca..42e6ee09c25 100644 --- 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 { +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 569f4b89a6f..f6e8f0bfdeb 100644 --- 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 { +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 { return val; } } - - /* - * @internal - * @deprecated - */ - public int compareTo(ULocale other) { - return toLanguageTag().compareTo(other.toLanguageTag()); - } } -- 2.40.0