1.1 --- a/rt/emul/compact/src/main/java/java/text/DateFormat.java Thu Oct 03 15:40:35 2013 +0200
1.2 +++ b/rt/emul/compact/src/main/java/java/text/DateFormat.java Fri Oct 04 11:07:00 2013 +0200
1.3 @@ -39,18 +39,13 @@
1.4 package java.text;
1.5
1.6 import java.io.InvalidObjectException;
1.7 -import java.text.spi.DateFormatProvider;
1.8 import java.util.Calendar;
1.9 import java.util.Date;
1.10 -import java.util.GregorianCalendar;
1.11 import java.util.HashMap;
1.12 import java.util.Locale;
1.13 import java.util.Map;
1.14 import java.util.MissingResourceException;
1.15 -import java.util.ResourceBundle;
1.16 import java.util.TimeZone;
1.17 -import java.util.spi.LocaleServiceProvider;
1.18 -import sun.util.LocaleServiceProviderPool;
1.19
1.20 /**
1.21 * {@code DateFormat} is an abstract class for date/time formatting subclasses which
1.22 @@ -570,9 +565,7 @@
1.23 */
1.24 public static Locale[] getAvailableLocales()
1.25 {
1.26 - LocaleServiceProviderPool pool =
1.27 - LocaleServiceProviderPool.getPool(DateFormatProvider.class);
1.28 - return pool.getAvailableLocales();
1.29 + return new Locale[] { Locale.US };
1.30 }
1.31
1.32 /**
1.33 @@ -755,6 +748,7 @@
1.34 try {
1.35 // Check whether a provider can provide an implementation that's closer
1.36 // to the requested locale than what the Java runtime itself can provide.
1.37 + /*
1.38 LocaleServiceProviderPool pool =
1.39 LocaleServiceProviderPool.getPool(DateFormatProvider.class);
1.40 if (pool.hasProviders()) {
1.41 @@ -768,6 +762,7 @@
1.42 return providersInstance;
1.43 }
1.44 }
1.45 + */
1.46
1.47 return new SimpleDateFormat(timeStyle, dateStyle, loc);
1.48 } catch (MissingResourceException e) {
1.49 @@ -998,7 +993,6 @@
1.50 /**
1.51 * Obtains a DateFormat instance from a DateFormatProvider
1.52 * implementation.
1.53 - */
1.54 private static class DateFormatGetter
1.55 implements LocaleServiceProviderPool.LocalizedObjectGetter<DateFormatProvider, DateFormat> {
1.56 private static final DateFormatGetter INSTANCE = new DateFormatGetter();
1.57 @@ -1027,4 +1021,5 @@
1.58 return null;
1.59 }
1.60 }
1.61 + */
1.62 }