Merge LocaleData and Resources, rename Resources to ICU.

Also move our ICU tests into our little tree of tests.

Bug: 2596471
Change-Id: I73b53d74c26ef9bf670f12cac58b51ba61eefead

8 files changed, 35 insertions, 73 deletions

diff --git a/text/src/main/java/java/text/BreakIterator.java b/text/src/main/java/java/text/BreakIterator.java
index 6031046..a858b46 100644
--- a/text/src/main/java/java/text/BreakIterator.java
+++ b/text/src/main/java/java/text/BreakIterator.java
@@ -18,7 +18,7 @@
 package java.text;
 
 import com.ibm.icu4jni.text.NativeBreakIterator;
-import com.ibm.icu4jni.util.Resources;
+import com.ibm.icu4jni.util.ICU;
 import java.util.Locale;
 
 /**
@@ -252,7 +252,7 @@ public abstract class BreakIterator implements Cloneable {
      * are available.
      */
     public static Locale[] getAvailableLocales() {
-        return Resources.getAvailableBreakIteratorLocales();
+        return ICU.getAvailableBreakIteratorLocales();
     }
 
     /**
diff --git a/text/src/main/java/java/text/Collator.java b/text/src/main/java/java/text/Collator.java
index 902eecc..dba931c 100644
--- a/text/src/main/java/java/text/Collator.java
+++ b/text/src/main/java/java/text/Collator.java
@@ -17,7 +17,7 @@
 
 package java.text;
 
-import com.ibm.icu4jni.util.Resources;
+import com.ibm.icu4jni.util.ICU;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.Comparator;
@@ -254,7 +254,7 @@ public abstract class Collator implements Comparator<Object>, Cloneable {
      * are available.
      */
     public static Locale[] getAvailableLocales() {
-        return Resources.getAvailableCollatorLocales();
+        return ICU.getAvailableCollatorLocales();
     }
 
     /**
diff --git a/text/src/main/java/java/text/DateFormat.java b/text/src/main/java/java/text/DateFormat.java
index 84c544e..0b44aad 100644
--- a/text/src/main/java/java/text/DateFormat.java
+++ b/text/src/main/java/java/text/DateFormat.java
@@ -18,7 +18,7 @@
 package java.text;
 
 import com.ibm.icu4jni.util.LocaleData;
-import com.ibm.icu4jni.util.Resources;
+import com.ibm.icu4jni.util.ICU;
 import java.io.InvalidObjectException;
 import java.util.Calendar;
 import java.util.Date;
@@ -406,7 +406,7 @@ public abstract class DateFormat extends Format {
      * are available.
      */
     public static Locale[] getAvailableLocales() {
-        return Resources.getAvailableDateFormatLocales();
+        return ICU.getAvailableDateFormatLocales();
     }
 
     /**
@@ -461,10 +461,7 @@ public abstract class DateFormat extends Format {
      */
     public final static DateFormat getDateInstance(int style, Locale locale) {
         checkDateStyle(style);
-        // BEGIN android-changed
-        LocaleData localeData = com.ibm.icu4jni.util.Resources.getLocaleData(locale);
-        return new SimpleDateFormat(localeData.getDateFormat(style), locale);
-        // END android-changed
+        return new SimpleDateFormat(LocaleData.get(locale).getDateFormat(style), locale);
     }
 
     /**
@@ -513,15 +510,12 @@ public abstract class DateFormat extends Format {
      *             if {@code dateStyle} or {@code timeStyle} is not one of
      *             SHORT, MEDIUM, LONG, FULL, or DEFAULT.
      */
-    public final static DateFormat getDateTimeInstance(int dateStyle,
-            int timeStyle, Locale locale) {
+    public final static DateFormat getDateTimeInstance(int dateStyle, int timeStyle, Locale locale) {
         checkTimeStyle(timeStyle);
         checkDateStyle(dateStyle);
-        // BEGIN android-changed
-        LocaleData localeData = com.ibm.icu4jni.util.Resources.getLocaleData(locale);
+        LocaleData localeData = LocaleData.get(locale);
         String pattern = localeData.getDateFormat(dateStyle) + " " + localeData.getTimeFormat(timeStyle);
         return new SimpleDateFormat(pattern, locale);
-        // END android-changed
     }
 
     /**
@@ -587,10 +581,7 @@ public abstract class DateFormat extends Format {
      */
     public final static DateFormat getTimeInstance(int style, Locale locale) {
         checkTimeStyle(style);
-        // BEGIN android-changed
-        LocaleData localeData = com.ibm.icu4jni.util.Resources.getLocaleData(locale);
-        return new SimpleDateFormat(localeData.getTimeFormat(style), locale);
-        // END android-changed
+        return new SimpleDateFormat(LocaleData.get(locale).getTimeFormat(style), locale);
     }
 
     /**
diff --git a/text/src/main/java/java/text/DateFormatSymbols.java b/text/src/main/java/java/text/DateFormatSymbols.java
index 73e89e0..d586ae1 100644
--- a/text/src/main/java/java/text/DateFormatSymbols.java
+++ b/text/src/main/java/java/text/DateFormatSymbols.java
@@ -18,7 +18,7 @@
 package java.text;
 
 import com.ibm.icu4jni.util.LocaleData;
-import com.ibm.icu4jni.util.Resources;
+import com.ibm.icu4jni.util.ICU;
 import java.io.IOException;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
@@ -94,7 +94,7 @@ public class DateFormatSymbols implements Serializable, Cloneable {
      */
     synchronized String[][] internalZoneStrings() {
         if (zoneStrings == null) {
-            zoneStrings = Resources.getDisplayTimeZones(locale.toString());
+            zoneStrings = ICU.getDisplayTimeZones(locale.toString());
         }
         return zoneStrings;
     }
@@ -118,16 +118,14 @@ public class DateFormatSymbols implements Serializable, Cloneable {
      */
     public DateFormatSymbols(Locale locale) {
         this.locale = locale;
-        // BEGIN android-changed
         this.localPatternChars = SimpleDateFormat.patternChars;
-        LocaleData localeData = com.ibm.icu4jni.util.Resources.getLocaleData(locale);
+        LocaleData localeData = LocaleData.get(locale);
         this.ampms = localeData.amPm;
         this.eras = localeData.eras;
         this.months = localeData.longMonthNames;
         this.shortMonths = localeData.shortMonthNames;
         this.weekdays = localeData.longWeekdayNames;
         this.shortWeekdays = localeData.shortWeekdayNames;
-        // END android-changed
     }
 
     /**
@@ -165,7 +163,7 @@ public class DateFormatSymbols implements Serializable, Cloneable {
      * @hide
      */
     public static Locale[] getAvailableLocales() {
-        return Resources.getAvailableDateFormatSymbolsLocales();
+        return ICU.getAvailableDateFormatSymbolsLocales();
     }
 
     private void writeObject(ObjectOutputStream oos) throws IOException {
@@ -344,9 +342,7 @@ public class DateFormatSymbols implements Serializable, Cloneable {
      * @return a two-dimensional array of strings.
      */
     public String[][] getZoneStrings() {
-        // BEGIN android-changed
-        return Resources.clone2dStringArray(internalZoneStrings());
-        // END android-changed
+        return ICU.clone2dStringArray(internalZoneStrings());
     }
 
     @Override
@@ -483,7 +479,7 @@ public class DateFormatSymbols implements Serializable, Cloneable {
      *            the two-dimensional array of strings.
      */
     public void setZoneStrings(String[][] data) {
-        zoneStrings = Resources.clone2dStringArray(data);
+        zoneStrings = ICU.clone2dStringArray(data);
         customZoneStrings = true;
     }
 }
diff --git a/text/src/main/java/java/text/DecimalFormat.java b/text/src/main/java/java/text/DecimalFormat.java
index 2776575..d7ac012 100644
--- a/text/src/main/java/java/text/DecimalFormat.java
+++ b/text/src/main/java/java/text/DecimalFormat.java
@@ -17,6 +17,8 @@
 
 package java.text;
 
+import com.ibm.icu4jni.text.NativeDecimalFormat;
+import com.ibm.icu4jni.util.LocaleData;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
@@ -29,9 +31,6 @@ import java.security.PrivilegedAction;
 import java.util.Currency;
 import java.util.Locale;
 
-import com.ibm.icu4jni.text.NativeDecimalFormat;
-import com.ibm.icu4jni.util.LocaleData;
-
 /**
  * A concrete subclass of {@link NumberFormat} that formats decimal numbers. It
  * has a variety of features designed to make it possible to parse and format
@@ -238,7 +237,7 @@ import com.ibm.icu4jni.util.LocaleData;
  * </tr>
  * </table> </blockquote>
  * <p>
- * A {@code DecimalFormat} pattern contains a postive and negative subpattern,
+ * A {@code DecimalFormat} pattern contains a positive and negative subpattern,
  * for example, "#,##0.00;(#,##0.00)". Each subpattern has a prefix, a numeric
  * part and a suffix. If there is no explicit negative subpattern, the negative
  * subpattern is the localized minus sign prefixed to the positive subpattern.
@@ -353,7 +352,7 @@ import com.ibm.icu4jni.util.LocaleData;
  * example, 0.125 is formatted as "0.12" if the maximum fraction digits is 2.
  * <li>If the number of actual fraction digits is less than the
  * <em>minimum fraction digits</em>, then trailing zeros are added. For
- * example, 0.125 is formatted as "0.1250" if the mimimum fraction digits is set
+ * example, 0.125 is formatted as "0.1250" if the minimum fraction digits is set
  * to 4.
  * <li>Trailing fractional zeros are not displayed if they occur <em>j</em>
  * positions after the decimal, where <em>j</em> is less than the maximum
@@ -499,7 +498,7 @@ import com.ibm.icu4jni.util.LocaleData;
  * number of '@' characters in the pattern - 1, and a maximum fraction digit
  * count of the number of '@' and '#' characters in the pattern - 1. For
  * example, the pattern {@code "@@###E0"} is equivalent to {@code "0.0###E0"}.
- * <li>If signficant digits are in use then the integer and fraction digit
+ * <li>If significant digits are in use then the integer and fraction digit
  * counts, as set via the API, are ignored.
  * </ul>
  * <h4> <strong><font color="red">NEW</font>&nbsp;</strong> Padding</h4>
@@ -558,12 +557,9 @@ public class DecimalFormat extends NumberFormat {
      * See "<a href="../util/Locale.html#default_locale">Be wary of the default locale</a>".
      */
     public DecimalFormat() {
-        // BEGIN android-changed: reduce duplication.
         Locale locale = Locale.getDefault();
         this.symbols = new DecimalFormatSymbols(locale);
-        LocaleData localeData = com.ibm.icu4jni.util.Resources.getLocaleData(locale);
-        initNative(localeData.numberPattern);
-        // END android-changed
+        initNative(LocaleData.get(locale).numberPattern);
     }
 
     /**
@@ -576,9 +572,7 @@ public class DecimalFormat extends NumberFormat {
      *            if the pattern cannot be parsed.
      */
     public DecimalFormat(String pattern) {
-        // BEGIN android-changed: reduce duplication.
         this(pattern, Locale.getDefault());
-        // END android-changed
     }
 
     /**
@@ -593,20 +587,16 @@ public class DecimalFormat extends NumberFormat {
      *            if the pattern cannot be parsed.
      */
     public DecimalFormat(String pattern, DecimalFormatSymbols value) {
-        // BEGIN android-changed: reduce duplication.
         this.symbols = (DecimalFormatSymbols) value.clone();
         initNative(pattern);
-        // END android-changed
     }
 
-    // BEGIN android-added: used by NumberFormat.getInstance because cloning DecimalFormatSymbols is slow.
+    // Used by NumberFormat.getInstance because cloning DecimalFormatSymbols is slow.
     DecimalFormat(String pattern, Locale locale) {
         this.symbols = new DecimalFormatSymbols(locale);
         initNative(pattern);
     }
-    // END android-added
 
-    // BEGIN android-changed: reduce duplication.
     private void initNative(String pattern) {
         try {
             this.dform = new NativeDecimalFormat(pattern, symbols);
@@ -618,7 +608,6 @@ public class DecimalFormat extends NumberFormat {
         super.setMinimumFractionDigits(dform.getMinimumFractionDigits());
         super.setMinimumIntegerDigits(dform.getMinimumIntegerDigits());
     }
-    // END android-added
 
     /**
      * Changes the pattern of this decimal format to the specified pattern which
diff --git a/text/src/main/java/java/text/DecimalFormatSymbols.java b/text/src/main/java/java/text/DecimalFormatSymbols.java
index b1144a8..a32f6cf 100644
--- a/text/src/main/java/java/text/DecimalFormatSymbols.java
+++ b/text/src/main/java/java/text/DecimalFormatSymbols.java
@@ -18,7 +18,7 @@
 package java.text;
 
 import com.ibm.icu4jni.util.LocaleData;
-import com.ibm.icu4jni.util.Resources;
+import com.ibm.icu4jni.util.ICU;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
@@ -82,8 +82,7 @@ public final class DecimalFormatSymbols implements Cloneable, Serializable {
      *            the locale.
      */
     public DecimalFormatSymbols(Locale locale) {
-        // BEGIN android-changed
-        LocaleData localeData = com.ibm.icu4jni.util.Resources.getLocaleData(locale);
+        LocaleData localeData = LocaleData.get(locale);
         this.zeroDigit = localeData.zeroDigit;
         this.digit = localeData.digit;
         this.decimalSeparator = localeData.decimalSeparator;
@@ -106,7 +105,6 @@ public final class DecimalFormatSymbols implements Cloneable, Serializable {
             currencySymbol = localeData.currencySymbol;
             intlCurrencySymbol = localeData.internationalCurrencySymbol;
         }
-        // END android-changed
     }
 
     /**
@@ -144,7 +142,7 @@ public final class DecimalFormatSymbols implements Cloneable, Serializable {
      * @hide
      */
     public static Locale[] getAvailableLocales() {
-        return Resources.getAvailableDecimalFormatSymbolsLocales();
+        return ICU.getAvailableDecimalFormatSymbolsLocales();
     }
 
     @Override
diff --git a/text/src/main/java/java/text/NumberFormat.java b/text/src/main/java/java/text/NumberFormat.java
index ace2697..a4cccc0 100644
--- a/text/src/main/java/java/text/NumberFormat.java
+++ b/text/src/main/java/java/text/NumberFormat.java
@@ -18,7 +18,7 @@
 package java.text;
 
 import com.ibm.icu4jni.util.LocaleData;
-import com.ibm.icu4jni.util.Resources;
+import com.ibm.icu4jni.util.ICU;
 import java.io.IOException;
 import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;
@@ -314,7 +314,7 @@ public abstract class NumberFormat extends Format {
      * are available.
      */
     public static Locale[] getAvailableLocales() {
-        return Resources.getAvailableNumberFormatLocales();
+        return ICU.getAvailableNumberFormatLocales();
     }
 
     /**
@@ -353,10 +353,7 @@ public abstract class NumberFormat extends Format {
      * @return a {@code NumberFormat} for handling currency values.
      */
     public static NumberFormat getCurrencyInstance(Locale locale) {
-        // BEGIN android-changed
-        LocaleData localeData = com.ibm.icu4jni.util.Resources.getLocaleData(locale);
-        return getInstance(localeData.currencyPattern, locale);
-        // END android-changed
+        return getInstance(LocaleData.get(locale).currencyPattern, locale);
     }
 
     /**
@@ -379,12 +376,9 @@ public abstract class NumberFormat extends Format {
      * @return a {@code NumberFormat} for handling integers.
      */
     public static NumberFormat getIntegerInstance(Locale locale) {
-        // BEGIN android-changed
-        LocaleData localeData = com.ibm.icu4jni.util.Resources.getLocaleData(locale);
-        NumberFormat result = getInstance(localeData.integerPattern, locale);
+        NumberFormat result = getInstance(LocaleData.get(locale).integerPattern, locale);
         result.setParseIntegerOnly(true);
         return result;
-        // END android-changed
     }
 
     /**
@@ -477,10 +471,7 @@ public abstract class NumberFormat extends Format {
      * @return a {@code NumberFormat} for handling {@code Number} objects.
      */
     public static NumberFormat getNumberInstance(Locale locale) {
-        // BEGIN android-changed
-        LocaleData localeData = com.ibm.icu4jni.util.Resources.getLocaleData(locale);
-        return getInstance(localeData.numberPattern, locale);
-        // END android-changed
+        return getInstance(LocaleData.get(locale).numberPattern, locale);
     }
 
     /**
@@ -503,10 +494,7 @@ public abstract class NumberFormat extends Format {
      * @return a {@code NumberFormat} for handling percentage values.
      */
     public static NumberFormat getPercentInstance(Locale locale) {
-        // BEGIN android-changed
-        LocaleData localeData = com.ibm.icu4jni.util.Resources.getLocaleData(locale);
-        return getInstance(localeData.percentPattern, locale);
-        // END android-changed
+        return getInstance(LocaleData.get(locale).percentPattern, locale);
     }
 
     @Override
diff --git a/text/src/main/java/java/text/SimpleDateFormat.java b/text/src/main/java/java/text/SimpleDateFormat.java
index e3669ad..cb114a3 100644
--- a/text/src/main/java/java/text/SimpleDateFormat.java
+++ b/text/src/main/java/java/text/SimpleDateFormat.java
@@ -18,7 +18,7 @@
 package java.text;
 
 import com.ibm.icu4jni.util.LocaleData;
-import com.ibm.icu4jni.util.Resources;
+import com.ibm.icu4jni.util.ICU;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
@@ -569,7 +569,7 @@ public class SimpleDateFormat extends DateFormat {
     }
 
     private static String defaultPattern() {
-        LocaleData localeData = com.ibm.icu4jni.util.Resources.getLocaleData(Locale.getDefault());
+        LocaleData localeData = LocaleData.get(Locale.getDefault());
         return localeData.getDateFormat(SHORT) + " " + localeData.getTimeFormat(SHORT);
     }
 
@@ -886,7 +886,7 @@ public class SimpleDateFormat extends DateFormat {
             }
             // We can't call TimeZone.getDisplayName() because it would not use
             // the custom DateFormatSymbols of this SimpleDateFormat.
-            String custom = Resources.lookupDisplayTimeZone(formatData.zoneStrings, tz.getID(), daylight, style);
+            String custom = ICU.lookupDisplayTimeZone(formatData.zoneStrings, tz.getID(), daylight, style);
             if (custom != null) {
                 buffer.append(custom);
                 return;