Index: java/text/DateFormat.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/text/DateFormat.java,v retrieving revision 1.16 diff -u -r1.16 DateFormat.java --- java/text/DateFormat.java 15 Nov 2004 14:13:26 -0000 1.16 +++ java/text/DateFormat.java 30 Dec 2004 15:17:34 -0000 @@ -288,12 +288,9 @@ * This method returns a list of available locales supported by this * class. */ - public static Locale[] getAvailableLocales () + public static Locale[] getAvailableLocales() { - // FIXME - Locale[] l = new Locale[1]; - l[0] = Locale.US; - return l; + return Locale.getAvailableLocales(); } /** Index: java/util/Locale.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/Locale.java,v retrieving revision 1.23 diff -u -r1.23 Locale.java --- java/util/Locale.java 24 Dec 2004 20:53:14 -0000 1.23 +++ java/util/Locale.java 30 Dec 2004 15:17:34 -0000 @@ -194,14 +194,14 @@ /** * Array storing all available locales. */ - private transient static Locale[] availableLocales; + private static transient Locale[] availableLocales; /** * Locale cache. Only created locale objects are stored. * Contains all supported locales when getAvailableLocales() * got called. */ - private transient static HashMap localeMap; + private static transient HashMap localeMap; /** * The default locale. Except for during bootstrapping, this should never be @@ -346,7 +346,7 @@ * * @return the installed locales */ - public synchronized static Locale[] getAvailableLocales() + public static synchronized Locale[] getAvailableLocales() { if (availableLocales == null) {