1.1 --- a/rt/emul/compact/src/main/java/java/text/DecimalFormatSymbols.java Thu Oct 03 15:40:35 2013 +0200
1.2 +++ b/rt/emul/compact/src/main/java/java/text/DecimalFormatSymbols.java Fri Oct 04 11:07:00 2013 +0200
1.3 @@ -41,15 +41,11 @@
1.4 import java.io.IOException;
1.5 import java.io.ObjectInputStream;
1.6 import java.io.Serializable;
1.7 -import java.text.spi.DecimalFormatSymbolsProvider;
1.8 import java.util.Currency;
1.9 import java.util.Locale;
1.10 import java.util.ResourceBundle;
1.11 import java.util.concurrent.ConcurrentHashMap;
1.12
1.13 -import sun.util.LocaleServiceProviderPool;
1.14 -import sun.util.resources.LocaleData;
1.15 -
1.16 /**
1.17 * This class represents the set of symbols (such as the decimal separator,
1.18 * the grouping separator, and so on) needed by <code>DecimalFormat</code>
1.19 @@ -109,9 +105,10 @@
1.20 * @since 1.6
1.21 */
1.22 public static Locale[] getAvailableLocales() {
1.23 - LocaleServiceProviderPool pool =
1.24 - LocaleServiceProviderPool.getPool(DecimalFormatSymbolsProvider.class);
1.25 - return pool.getAvailableLocales();
1.26 + return new Locale[] { Locale.US };
1.27 +// LocaleServiceProviderPool pool =
1.28 +// LocaleServiceProviderPool.getPool(DecimalFormatSymbolsProvider.class);
1.29 +// return pool.getAvailableLocales();
1.30 }
1.31
1.32 /**
1.33 @@ -141,7 +138,7 @@
1.34 * @since 1.6
1.35 */
1.36 public static final DecimalFormatSymbols getInstance(Locale locale) {
1.37 -
1.38 +/*
1.39 // Check whether a provider can provide an implementation that's closer
1.40 // to the requested locale than what the Java runtime itself can provide.
1.41 LocaleServiceProviderPool pool =
1.42 @@ -153,7 +150,7 @@
1.43 return providersInstance;
1.44 }
1.45 }
1.46 -
1.47 +*/
1.48 return new DecimalFormatSymbols(locale);
1.49 }
1.50
1.51 @@ -537,8 +534,8 @@
1.52 lookupLocale = new Locale("th", "TH", "TH");
1.53 }
1.54 data = new Object[3];
1.55 - ResourceBundle rb = LocaleData.getNumberFormatData(lookupLocale);
1.56 - data[0] = rb.getStringArray("NumberElements");
1.57 +// ResourceBundle rb = LocaleData.getNumberFormatData(lookupLocale);
1.58 +// data[0] = rb.getStringArray("NumberElements");
1.59 needCacheUpdate = true;
1.60 }
1.61
1.62 @@ -818,7 +815,6 @@
1.63 /**
1.64 * Obtains a DecimalFormatSymbols instance from a DecimalFormatSymbolsProvider
1.65 * implementation.
1.66 - */
1.67 private static class DecimalFormatSymbolsGetter
1.68 implements LocaleServiceProviderPool.LocalizedObjectGetter<DecimalFormatSymbolsProvider,
1.69 DecimalFormatSymbols> {
1.70 @@ -834,4 +830,5 @@
1.71 return decimalFormatSymbolsProvider.getInstance(locale);
1.72 }
1.73 }
1.74 + */
1.75 }