diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/text/Collator.java | 13 | ||||
| -rw-r--r-- | java/util/Locale.java | 15 |
2 files changed, 11 insertions, 17 deletions
diff --git a/java/text/Collator.java b/java/text/Collator.java index fe9200775..08739163a 100644 --- a/java/text/Collator.java +++ b/java/text/Collator.java @@ -38,7 +38,7 @@ exception statement from your version. */ package java.text; -import gnu.classpath.NotImplementedException; +import gnu.java.locale.LocaleHelper; import java.util.Comparator; import java.util.Locale; @@ -70,10 +70,6 @@ import java.util.ResourceBundle; * @author Aaron M. Renn (arenn@urbanophile.com) * @date March 18, 1999 */ -/* Written using "Java Class Libraries", 2nd edition, plus online - * API docs for JDK 1.2 from http://www.javasoft.com. - * Status: Mostly complete, but parts stubbed out. Look for FIXME. - */ public abstract class Collator implements Comparator, Cloneable { /** @@ -245,11 +241,8 @@ public abstract class Collator implements Comparator, Cloneable * @return The list of locales for which <code>Collator</code>'s exist. */ public static synchronized Locale[] getAvailableLocales () - throws NotImplementedException { - Locale[] l = new Locale[1]; - l[0] = Locale.US; - return l; + return LocaleHelper.getCollatorLocales(); } /** @@ -294,7 +287,7 @@ public abstract class Collator implements Comparator, Cloneable * specified locale. If no <code>Collator</code> exists for the desired * locale, a <code>Collator</code> for the default locale will be returned. * - * @param loc The desired localed to load a <code>Collator</code> for. + * @param loc The desired locale to load a <code>Collator</code> for. * * @return A <code>Collator</code> for the requested locale */ diff --git a/java/util/Locale.java b/java/util/Locale.java index 9e7bbfea2..e1b1bdfbb 100644 --- a/java/util/Locale.java +++ b/java/util/Locale.java @@ -39,6 +39,7 @@ exception statement from your version. */ package java.util; import gnu.classpath.SystemProperties; +import gnu.java.locale.LocaleHelper; import java.io.IOException; import java.io.ObjectInputStream; @@ -384,15 +385,15 @@ public final class Locale implements Serializable, Cloneable { if (availableLocales == null) { - String[] localeNames = LocaleData.localeNames; - availableLocales = new Locale[localeNames.length]; + int len = LocaleHelper.getLocaleCount(); + availableLocales = new Locale[len]; - for (int i = 0; i < localeNames.length; i++) + for (int i = 0; i < len; i++) { String language; String region = ""; String variant = ""; - String name = localeNames[i]; + String name = LocaleHelper.getLocaleName(i); language = name.substring(0, 2); @@ -410,7 +411,7 @@ public final class Locale implements Serializable, Cloneable } } - return availableLocales; + return (Locale[]) availableLocales.clone(); } /** @@ -426,7 +427,7 @@ public final class Locale implements Serializable, Cloneable countryCache = getISOStrings("territories"); } - return countryCache; + return (String[]) countryCache.clone(); } /** @@ -441,7 +442,7 @@ public final class Locale implements Serializable, Cloneable { languageCache = getISOStrings("languages"); } - return languageCache; + return (String[]) languageCache.clone(); } /** |