1.1 --- a/rt/emul/compact/src/main/java/java/text/DateFormatSymbols.java	Thu Oct 03 15:40:35 2013 +0200
     1.2 +++ b/rt/emul/compact/src/main/java/java/text/DateFormatSymbols.java	Fri Oct 04 11:07:00 2013 +0200
     1.3 @@ -42,19 +42,11 @@
     1.4  import java.io.ObjectOutputStream;
     1.5  import java.io.Serializable;
     1.6  import java.lang.ref.SoftReference;
     1.7 -import java.text.spi.DateFormatSymbolsProvider;
     1.8  import java.util.Arrays;
     1.9 -import java.util.List;
    1.10  import java.util.Locale;
    1.11  import java.util.ResourceBundle;
    1.12 -import java.util.TimeZone;
    1.13  import java.util.concurrent.ConcurrentHashMap;
    1.14  import java.util.concurrent.ConcurrentMap;
    1.15 -import java.util.spi.LocaleServiceProvider;
    1.16 -import sun.util.LocaleServiceProviderPool;
    1.17 -import sun.util.TimeZoneNameUtility;
    1.18 -import sun.util.calendar.ZoneInfo;
    1.19 -import sun.util.resources.LocaleData;
    1.20  
    1.21  /**
    1.22   * <code>DateFormatSymbols</code> is a public class for encapsulating
    1.23 @@ -290,9 +282,10 @@
    1.24       * @since 1.6
    1.25       */
    1.26      public static Locale[] getAvailableLocales() {
    1.27 -        LocaleServiceProviderPool pool=
    1.28 -            LocaleServiceProviderPool.getPool(DateFormatSymbolsProvider.class);
    1.29 -        return pool.getAvailableLocales();
    1.30 +        return new Locale[] { Locale.US };
    1.31 +//        LocaleServiceProviderPool pool=
    1.32 +//            LocaleServiceProviderPool.getPool(DateFormatSymbolsProvider.class);
    1.33 +//        return pool.getAvailableLocales();
    1.34      }
    1.35  
    1.36      /**
    1.37 @@ -348,12 +341,12 @@
    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 -            LocaleServiceProviderPool.getPool(DateFormatSymbolsProvider.class);
    1.43 -        if (pool.hasProviders()) {
    1.44 -            providersInstance = pool.getLocalizedObject(
    1.45 -                                    DateFormatSymbolsGetter.INSTANCE, locale);
    1.46 -        }
    1.47 +//        LocaleServiceProviderPool pool =
    1.48 +//            LocaleServiceProviderPool.getPool(DateFormatSymbolsProvider.class);
    1.49 +//        if (pool.hasProviders()) {
    1.50 +//            providersInstance = pool.getLocalizedObject(
    1.51 +//                                    DateFormatSymbolsGetter.INSTANCE, locale);
    1.52 +//        }
    1.53          return providersInstance;
    1.54      }
    1.55  
    1.56 @@ -659,17 +652,17 @@
    1.57          }
    1.58  
    1.59          // Initialize the fields from the ResourceBundle for locale.
    1.60 -        ResourceBundle resource = LocaleData.getDateFormatData(locale);
    1.61 -
    1.62 -        eras = resource.getStringArray("Eras");
    1.63 -        months = resource.getStringArray("MonthNames");
    1.64 -        shortMonths = resource.getStringArray("MonthAbbreviations");
    1.65 -        ampms = resource.getStringArray("AmPmMarkers");
    1.66 -        localPatternChars = resource.getString("DateTimePatternChars");
    1.67 -
    1.68 -        // Day of week names are stored in a 1-based array.
    1.69 -        weekdays = toOneBasedArray(resource.getStringArray("DayNames"));
    1.70 -        shortWeekdays = toOneBasedArray(resource.getStringArray("DayAbbreviations"));
    1.71 +//        ResourceBundle resource = LocaleData.getDateFormatData(locale);
    1.72 +//
    1.73 +//        eras = resource.getStringArray("Eras");
    1.74 +//        months = resource.getStringArray("MonthNames");
    1.75 +//        shortMonths = resource.getStringArray("MonthAbbreviations");
    1.76 +//        ampms = resource.getStringArray("AmPmMarkers");
    1.77 +//        localPatternChars = resource.getString("DateTimePatternChars");
    1.78 +//
    1.79 +//        // Day of week names are stored in a 1-based array.
    1.80 +//        weekdays = toOneBasedArray(resource.getStringArray("DayNames"));
    1.81 +//        shortWeekdays = toOneBasedArray(resource.getStringArray("DayAbbreviations"));
    1.82      }
    1.83  
    1.84      private static String[] toOneBasedArray(String[] src) {
    1.85 @@ -718,7 +711,7 @@
    1.86  
    1.87      private final String[][] getZoneStringsImpl(boolean needsCopy) {
    1.88          if (zoneStrings == null) {
    1.89 -            zoneStrings = TimeZoneNameUtility.getZoneStrings(locale);
    1.90 +//            zoneStrings = TimeZoneNameUtility.getZoneStrings(locale);
    1.91          }
    1.92  
    1.93          if (!needsCopy) {
    1.94 @@ -765,7 +758,6 @@
    1.95       * sure the backward compatibility.
    1.96       *
    1.97       * @since 1.6
    1.98 -     */
    1.99      private void writeObject(ObjectOutputStream stream) throws IOException {
   1.100          if (zoneStrings == null) {
   1.101              zoneStrings = TimeZoneNameUtility.getZoneStrings(locale);
   1.102 @@ -776,7 +768,6 @@
   1.103      /**
   1.104       * Obtains a DateFormatSymbols instance from a DateFormatSymbolsProvider
   1.105       * implementation.
   1.106 -     */
   1.107      private static class DateFormatSymbolsGetter
   1.108          implements LocaleServiceProviderPool.LocalizedObjectGetter<DateFormatSymbolsProvider,
   1.109                                                                     DateFormatSymbols> {
   1.110 @@ -791,4 +782,5 @@
   1.111              return dateFormatSymbolsProvider.getInstance(locale);
   1.112          }
   1.113      }
   1.114 +     */
   1.115  }