# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1380877620 -7200
# Node ID 8cc04f85a6838e22375437a20ab7909e54557346
# Parent  aa70afac4ecaba328692915e7533fcbd9abf30ca
Commenting out stuff in java.text so the classes compile

diff -r aa70afac4eca -r 8cc04f85a683 rt/emul/compact/src/main/java/java/text/CalendarBuilder.java
--- a/rt/emul/compact/src/main/java/java/text/CalendarBuilder.java	Fri Oct 04 10:52:01 2013 +0200
+++ b/rt/emul/compact/src/main/java/java/text/CalendarBuilder.java	Fri Oct 04 11:07:00 2013 +0200
@@ -26,7 +26,7 @@
 package java.text;
 
 import java.util.Calendar;
-import static java.util.GregorianCalendar.*;
+import static java.util.Calendar.*;
 
 /**
  * {@code CalendarBuilder} keeps field-value pairs for setting
diff -r aa70afac4eca -r 8cc04f85a683 rt/emul/compact/src/main/java/java/text/DateFormat.java
--- a/rt/emul/compact/src/main/java/java/text/DateFormat.java	Fri Oct 04 10:52:01 2013 +0200
+++ b/rt/emul/compact/src/main/java/java/text/DateFormat.java	Fri Oct 04 11:07:00 2013 +0200
@@ -39,18 +39,13 @@
 package java.text;
 
 import java.io.InvalidObjectException;
-import java.text.spi.DateFormatProvider;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.MissingResourceException;
-import java.util.ResourceBundle;
 import java.util.TimeZone;
-import java.util.spi.LocaleServiceProvider;
-import sun.util.LocaleServiceProviderPool;
 
 /**
  * {@code DateFormat} is an abstract class for date/time formatting subclasses which
@@ -570,9 +565,7 @@
      */
     public static Locale[] getAvailableLocales()
     {
-        LocaleServiceProviderPool pool =
-            LocaleServiceProviderPool.getPool(DateFormatProvider.class);
-        return pool.getAvailableLocales();
+        return new Locale[] { Locale.US };
     }
 
     /**
@@ -755,6 +748,7 @@
         try {
             // Check whether a provider can provide an implementation that's closer
             // to the requested locale than what the Java runtime itself can provide.
+            /*
             LocaleServiceProviderPool pool =
                 LocaleServiceProviderPool.getPool(DateFormatProvider.class);
             if (pool.hasProviders()) {
@@ -768,6 +762,7 @@
                     return providersInstance;
                 }
             }
+            */
 
             return new SimpleDateFormat(timeStyle, dateStyle, loc);
         } catch (MissingResourceException e) {
@@ -998,7 +993,6 @@
     /**
      * Obtains a DateFormat instance from a DateFormatProvider
      * implementation.
-     */
     private static class DateFormatGetter
         implements LocaleServiceProviderPool.LocalizedObjectGetter<DateFormatProvider, DateFormat> {
         private static final DateFormatGetter INSTANCE = new DateFormatGetter();
@@ -1027,4 +1021,5 @@
             return null;
         }
     }
+     */
 }
diff -r aa70afac4eca -r 8cc04f85a683 rt/emul/compact/src/main/java/java/text/DateFormatSymbols.java
--- a/rt/emul/compact/src/main/java/java/text/DateFormatSymbols.java	Fri Oct 04 10:52:01 2013 +0200
+++ b/rt/emul/compact/src/main/java/java/text/DateFormatSymbols.java	Fri Oct 04 11:07:00 2013 +0200
@@ -42,19 +42,11 @@
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.lang.ref.SoftReference;
-import java.text.spi.DateFormatSymbolsProvider;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
-import java.util.TimeZone;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.spi.LocaleServiceProvider;
-import sun.util.LocaleServiceProviderPool;
-import sun.util.TimeZoneNameUtility;
-import sun.util.calendar.ZoneInfo;
-import sun.util.resources.LocaleData;
 
 /**
  * <code>DateFormatSymbols</code> is a public class for encapsulating
@@ -290,9 +282,10 @@
      * @since 1.6
      */
     public static Locale[] getAvailableLocales() {
-        LocaleServiceProviderPool pool=
-            LocaleServiceProviderPool.getPool(DateFormatSymbolsProvider.class);
-        return pool.getAvailableLocales();
+        return new Locale[] { Locale.US };
+//        LocaleServiceProviderPool pool=
+//            LocaleServiceProviderPool.getPool(DateFormatSymbolsProvider.class);
+//        return pool.getAvailableLocales();
     }
 
     /**
@@ -348,12 +341,12 @@
 
         // Check whether a provider can provide an implementation that's closer
         // to the requested locale than what the Java runtime itself can provide.
-        LocaleServiceProviderPool pool =
-            LocaleServiceProviderPool.getPool(DateFormatSymbolsProvider.class);
-        if (pool.hasProviders()) {
-            providersInstance = pool.getLocalizedObject(
-                                    DateFormatSymbolsGetter.INSTANCE, locale);
-        }
+//        LocaleServiceProviderPool pool =
+//            LocaleServiceProviderPool.getPool(DateFormatSymbolsProvider.class);
+//        if (pool.hasProviders()) {
+//            providersInstance = pool.getLocalizedObject(
+//                                    DateFormatSymbolsGetter.INSTANCE, locale);
+//        }
         return providersInstance;
     }
 
@@ -659,17 +652,17 @@
         }
 
         // Initialize the fields from the ResourceBundle for locale.
-        ResourceBundle resource = LocaleData.getDateFormatData(locale);
-
-        eras = resource.getStringArray("Eras");
-        months = resource.getStringArray("MonthNames");
-        shortMonths = resource.getStringArray("MonthAbbreviations");
-        ampms = resource.getStringArray("AmPmMarkers");
-        localPatternChars = resource.getString("DateTimePatternChars");
-
-        // Day of week names are stored in a 1-based array.
-        weekdays = toOneBasedArray(resource.getStringArray("DayNames"));
-        shortWeekdays = toOneBasedArray(resource.getStringArray("DayAbbreviations"));
+//        ResourceBundle resource = LocaleData.getDateFormatData(locale);
+//
+//        eras = resource.getStringArray("Eras");
+//        months = resource.getStringArray("MonthNames");
+//        shortMonths = resource.getStringArray("MonthAbbreviations");
+//        ampms = resource.getStringArray("AmPmMarkers");
+//        localPatternChars = resource.getString("DateTimePatternChars");
+//
+//        // Day of week names are stored in a 1-based array.
+//        weekdays = toOneBasedArray(resource.getStringArray("DayNames"));
+//        shortWeekdays = toOneBasedArray(resource.getStringArray("DayAbbreviations"));
     }
 
     private static String[] toOneBasedArray(String[] src) {
@@ -718,7 +711,7 @@
 
     private final String[][] getZoneStringsImpl(boolean needsCopy) {
         if (zoneStrings == null) {
-            zoneStrings = TimeZoneNameUtility.getZoneStrings(locale);
+//            zoneStrings = TimeZoneNameUtility.getZoneStrings(locale);
         }
 
         if (!needsCopy) {
@@ -765,7 +758,6 @@
      * sure the backward compatibility.
      *
      * @since 1.6
-     */
     private void writeObject(ObjectOutputStream stream) throws IOException {
         if (zoneStrings == null) {
             zoneStrings = TimeZoneNameUtility.getZoneStrings(locale);
@@ -776,7 +768,6 @@
     /**
      * Obtains a DateFormatSymbols instance from a DateFormatSymbolsProvider
      * implementation.
-     */
     private static class DateFormatSymbolsGetter
         implements LocaleServiceProviderPool.LocalizedObjectGetter<DateFormatSymbolsProvider,
                                                                    DateFormatSymbols> {
@@ -791,4 +782,5 @@
             return dateFormatSymbolsProvider.getInstance(locale);
         }
     }
+     */
 }
diff -r aa70afac4eca -r 8cc04f85a683 rt/emul/compact/src/main/java/java/text/DecimalFormat.java
--- a/rt/emul/compact/src/main/java/java/text/DecimalFormat.java	Fri Oct 04 10:52:01 2013 +0200
+++ b/rt/emul/compact/src/main/java/java/text/DecimalFormat.java	Fri Oct 04 11:07:00 2013 +0200
@@ -52,7 +52,6 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
-import sun.util.resources.LocaleData;
 
 /**
  * <code>DecimalFormat</code> is a concrete subclass of
@@ -398,11 +397,11 @@
         String pattern = cachedLocaleData.get(def);
         if (pattern == null) {  /* cache miss */
             // Get the pattern for the default locale.
-            ResourceBundle rb = LocaleData.getNumberFormatData(def);
-            String[] all = rb.getStringArray("NumberPatterns");
-            pattern = all[0];
-            /* update cache */
-            cachedLocaleData.putIfAbsent(def, pattern);
+//            ResourceBundle rb = LocaleData.getNumberFormatData(def);
+//            String[] all = rb.getStringArray("NumberPatterns");
+//            pattern = all[0];
+//            /* update cache */
+//            cachedLocaleData.putIfAbsent(def, pattern);
         }
 
         // Always applyPattern after the symbols are set
diff -r aa70afac4eca -r 8cc04f85a683 rt/emul/compact/src/main/java/java/text/DecimalFormatSymbols.java
--- a/rt/emul/compact/src/main/java/java/text/DecimalFormatSymbols.java	Fri Oct 04 10:52:01 2013 +0200
+++ b/rt/emul/compact/src/main/java/java/text/DecimalFormatSymbols.java	Fri Oct 04 11:07:00 2013 +0200
@@ -41,15 +41,11 @@
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.Serializable;
-import java.text.spi.DecimalFormatSymbolsProvider;
 import java.util.Currency;
 import java.util.Locale;
 import java.util.ResourceBundle;
 import java.util.concurrent.ConcurrentHashMap;
 
-import sun.util.LocaleServiceProviderPool;
-import sun.util.resources.LocaleData;
-
 /**
  * This class represents the set of symbols (such as the decimal separator,
  * the grouping separator, and so on) needed by <code>DecimalFormat</code>
@@ -109,9 +105,10 @@
      * @since 1.6
      */
     public static Locale[] getAvailableLocales() {
-        LocaleServiceProviderPool pool =
-            LocaleServiceProviderPool.getPool(DecimalFormatSymbolsProvider.class);
-        return pool.getAvailableLocales();
+        return new Locale[] { Locale.US };
+//        LocaleServiceProviderPool pool =
+//            LocaleServiceProviderPool.getPool(DecimalFormatSymbolsProvider.class);
+//        return pool.getAvailableLocales();
     }
 
     /**
@@ -141,7 +138,7 @@
      * @since 1.6
      */
     public static final DecimalFormatSymbols getInstance(Locale locale) {
-
+/*
         // Check whether a provider can provide an implementation that's closer
         // to the requested locale than what the Java runtime itself can provide.
         LocaleServiceProviderPool pool =
@@ -153,7 +150,7 @@
                 return providersInstance;
             }
         }
-
+*/
         return new DecimalFormatSymbols(locale);
     }
 
@@ -537,8 +534,8 @@
                 lookupLocale = new Locale("th", "TH", "TH");
             }
             data = new Object[3];
-            ResourceBundle rb = LocaleData.getNumberFormatData(lookupLocale);
-            data[0] = rb.getStringArray("NumberElements");
+//            ResourceBundle rb = LocaleData.getNumberFormatData(lookupLocale);
+//            data[0] = rb.getStringArray("NumberElements");
             needCacheUpdate = true;
         }
 
@@ -818,7 +815,6 @@
     /**
      * Obtains a DecimalFormatSymbols instance from a DecimalFormatSymbolsProvider
      * implementation.
-     */
     private static class DecimalFormatSymbolsGetter
         implements LocaleServiceProviderPool.LocalizedObjectGetter<DecimalFormatSymbolsProvider,
                                                                    DecimalFormatSymbols> {
@@ -834,4 +830,5 @@
             return decimalFormatSymbolsProvider.getInstance(locale);
         }
     }
+     */
 }
diff -r aa70afac4eca -r 8cc04f85a683 rt/emul/compact/src/main/java/java/text/NumberFormat.java
--- a/rt/emul/compact/src/main/java/java/text/NumberFormat.java	Fri Oct 04 10:52:01 2013 +0200
+++ b/rt/emul/compact/src/main/java/java/text/NumberFormat.java	Fri Oct 04 11:07:00 2013 +0200
@@ -44,7 +44,6 @@
 import java.io.ObjectOutputStream;
 import java.math.BigInteger;
 import java.math.RoundingMode;
-import java.text.spi.NumberFormatProvider;
 import java.util.Currency;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -53,9 +52,6 @@
 import java.util.ResourceBundle;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
-import java.util.spi.LocaleServiceProvider;
-import sun.util.LocaleServiceProviderPool;
-import sun.util.resources.LocaleData;
 
 /**
  * <code>NumberFormat</code> is the abstract base class for all number
@@ -393,8 +389,7 @@
         return getInstance(inLocale, NUMBERSTYLE);
     }
 
-    /**
-     * Returns a general-purpose number format for the current default locale.
+    /**     * Returns a general-purpose number format for the current default locale.
      */
     public final static NumberFormat getNumberInstance() {
         return getInstance(Locale.getDefault(Locale.Category.FORMAT), NUMBERSTYLE);
@@ -495,9 +490,10 @@
      *         <code>NumberFormat</code> instances are available.
      */
     public static Locale[] getAvailableLocales() {
-        LocaleServiceProviderPool pool =
-            LocaleServiceProviderPool.getPool(NumberFormatProvider.class);
-        return pool.getAvailableLocales();
+        return new Locale[] { Locale.US };
+//        LocaleServiceProviderPool pool =
+//            LocaleServiceProviderPool.getPool(NumberFormatProvider.class);
+//        return pool.getAvailableLocales();
     }
 
     /**
@@ -743,26 +739,26 @@
                                            int choice) {
         // Check whether a provider can provide an implementation that's closer
         // to the requested locale than what the Java runtime itself can provide.
-        LocaleServiceProviderPool pool =
-            LocaleServiceProviderPool.getPool(NumberFormatProvider.class);
-        if (pool.hasProviders()) {
-            NumberFormat providersInstance = pool.getLocalizedObject(
-                                    NumberFormatGetter.INSTANCE,
-                                    desiredLocale,
-                                    choice);
-            if (providersInstance != null) {
-                return providersInstance;
-            }
-        }
+//        LocaleServiceProviderPool pool =
+//            LocaleServiceProviderPool.getPool(NumberFormatProvider.class);
+//        if (pool.hasProviders()) {
+//            NumberFormat providersInstance = pool.getLocalizedObject(
+//                                    NumberFormatGetter.INSTANCE,
+//                                    desiredLocale,
+//                                    choice);
+//            if (providersInstance != null) {
+//                return providersInstance;
+//            }
+//        }
 
         /* try the cache first */
         String[] numberPatterns = (String[])cachedLocaleData.get(desiredLocale);
-        if (numberPatterns == null) { /* cache miss */
-            ResourceBundle resource = LocaleData.getNumberFormatData(desiredLocale);
-            numberPatterns = resource.getStringArray("NumberPatterns");
-            /* update cache */
-            cachedLocaleData.put(desiredLocale, numberPatterns);
-        }
+//        if (numberPatterns == null) { /* cache miss */
+//            ResourceBundle resource = LocaleData.getNumberFormatData(desiredLocale);
+//            numberPatterns = resource.getStringArray("NumberPatterns");
+//            /* update cache */
+//            cachedLocaleData.put(desiredLocale, numberPatterns);
+//        }
 
         DecimalFormatSymbols symbols = DecimalFormatSymbols.getInstance(desiredLocale);
         int entry = (choice == INTEGERSTYLE) ? NUMBERSTYLE : choice;
@@ -1130,7 +1126,7 @@
 
     /**
      * Obtains a NumberFormat instance from a NumberFormatProvider implementation.
-     */
+     *
     private static class NumberFormatGetter
         implements LocaleServiceProviderPool.LocalizedObjectGetter<NumberFormatProvider,
                                                                    NumberFormat> {
@@ -1159,4 +1155,5 @@
             return null;
         }
     }
+    */
 }
diff -r aa70afac4eca -r 8cc04f85a683 rt/emul/compact/src/main/java/java/text/SimpleDateFormat.java
--- a/rt/emul/compact/src/main/java/java/text/SimpleDateFormat.java	Fri Oct 04 10:52:01 2013 +0200
+++ b/rt/emul/compact/src/main/java/java/text/SimpleDateFormat.java	Fri Oct 04 11:07:00 2013 +0200
@@ -43,7 +43,6 @@
 import java.io.ObjectInputStream;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.GregorianCalendar;
 import java.util.Locale;
 import java.util.Map;
 import java.util.MissingResourceException;
@@ -52,9 +51,6 @@
 import java.util.TimeZone;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import sun.util.calendar.CalendarUtils;
-import sun.util.calendar.ZoneInfoFile;
-import sun.util.resources.LocaleData;
 
 import static java.text.DateFormatSymbols.*;
 
@@ -621,7 +617,7 @@
         /* try the cache first */
         String[] dateTimePatterns = cachedLocaleData.get(loc);
         if (dateTimePatterns == null) { /* cache miss */
-            ResourceBundle r = LocaleData.getDateFormatData(loc);
+            ResourceBundle r = null; // LocaleData.getDateFormatData(loc);
             if (!isGregorianCalendar()) {
                 try {
                     dateTimePatterns = r.getStringArray(getCalendarName() + ".DateTimePatterns");
@@ -1196,7 +1192,7 @@
                     if (zoneIndex == -1) {
                         value = calendar.get(Calendar.ZONE_OFFSET) +
                             calendar.get(Calendar.DST_OFFSET);
-                        buffer.append(ZoneInfoFile.toCustomID(value));
+//                        buffer.append(ZoneInfoFile.toCustomID(value));
                     } else {
                         int index = (calendar.get(Calendar.DST_OFFSET) == 0) ? 1: 3;
                         if (count < 4) {
@@ -1227,7 +1223,7 @@
             }
 
             int num = (value / 60) * 100 + (value % 60);
-            CalendarUtils.sprintf0d(buffer, num, width);
+//            CalendarUtils.sprintf0d(buffer, num, width);
             break;
 
         case PATTERN_ISO_ZONE:   // 'X'
@@ -1247,7 +1243,7 @@
                 value = -value;
             }
 
-            CalendarUtils.sprintf0d(buffer, value / 60, 2);
+//            CalendarUtils.sprintf0d(buffer, value / 60, 2);
             if (count == 1) {
                 break;
             }
@@ -1255,7 +1251,7 @@
             if (count == 3) {
                 buffer.append(':');
             }
-            CalendarUtils.sprintf0d(buffer, value % 60, 2);
+//            CalendarUtils.sprintf0d(buffer, value % 60, 2);
             break;
 
         default:
@@ -2347,4 +2343,41 @@
         }
     }
 
+    private static final class GregorianCalendar extends Calendar {
+        @Override
+        protected void computeTime() {
+        }
+
+        @Override
+        protected void computeFields() {
+        }
+
+        @Override
+        public void add(int field, int amount) {
+        }
+
+        @Override
+        public void roll(int field, boolean up) {
+        }
+
+        @Override
+        public int getMinimum(int field) {
+            return 0;
+        }
+
+        @Override
+        public int getMaximum(int field) {
+            return 0;
+        }
+
+        @Override
+        public int getGreatestMinimum(int field) {
+            return 0;
+        }
+
+        @Override
+        public int getLeastMaximum(int field) {
+            return 0;
+        }
+    }
 }