Fix build (accidental API leak).
Move a couple of methods into LocaleData -- where they should have been from
the beginning -- so they're automatically hidden from our users.
diff --git a/libcore/icu/src/main/java/com/ibm/icu4jni/util/LocaleData.java b/libcore/icu/src/main/java/com/ibm/icu4jni/util/LocaleData.java
index 1e91574..24d3323 100644
--- a/libcore/icu/src/main/java/com/ibm/icu4jni/util/LocaleData.java
+++ b/libcore/icu/src/main/java/com/ibm/icu4jni/util/LocaleData.java
@@ -16,6 +16,8 @@
package com.ibm.icu4jni.util;
+import java.text.DateFormat;
+
/**
* Passes locale-specific from ICU native code to Java.
* <p>
@@ -166,4 +168,32 @@
percentPattern = overrides.percentPattern;
}
}
+
+ public String getDateFormat(int style) {
+ switch (style) {
+ case DateFormat.SHORT:
+ return shortDateFormat;
+ case DateFormat.MEDIUM:
+ return mediumDateFormat;
+ case DateFormat.LONG:
+ return longDateFormat;
+ case DateFormat.FULL:
+ return fullDateFormat;
+ }
+ throw new AssertionError();
+ }
+
+ public String getTimeFormat(int style) {
+ switch (style) {
+ case DateFormat.SHORT:
+ return shortTimeFormat;
+ case DateFormat.MEDIUM:
+ return mediumTimeFormat;
+ case DateFormat.LONG:
+ return longTimeFormat;
+ case DateFormat.FULL:
+ return fullTimeFormat;
+ }
+ throw new AssertionError();
+ }
}
diff --git a/libcore/text/src/main/java/java/text/DateFormat.java b/libcore/text/src/main/java/java/text/DateFormat.java
index 80f38c9..8c9ded5 100644
--- a/libcore/text/src/main/java/java/text/DateFormat.java
+++ b/libcore/text/src/main/java/java/text/DateFormat.java
@@ -472,7 +472,7 @@
checkDateStyle(style);
// BEGIN android-changed
LocaleData localeData = com.ibm.icu4jni.util.Resources.getLocaleData(locale);
- return new SimpleDateFormat(getDateFormat(localeData, style), locale);
+ return new SimpleDateFormat(localeData.getDateFormat(style), locale);
// END android-changed
}
@@ -529,7 +529,7 @@
checkDateStyle(dateStyle);
// BEGIN android-changed
LocaleData localeData = com.ibm.icu4jni.util.Resources.getLocaleData(locale);
- String pattern = getDateFormat(localeData, dateStyle) + " " + getTimeFormat(localeData, timeStyle);
+ String pattern = localeData.getDateFormat(dateStyle) + " " + localeData.getTimeFormat(timeStyle);
return new SimpleDateFormat(pattern, locale);
// END android-changed
}
@@ -554,38 +554,6 @@
return numberFormat;
}
- // BEGIN android-added
- protected static String getDateFormat(LocaleData localeData, int style) {
- switch (style) {
- case SHORT:
- return localeData.shortDateFormat;
- case MEDIUM:
- return localeData.mediumDateFormat;
- case LONG:
- return localeData.longDateFormat;
- case FULL:
- return localeData.fullDateFormat;
- }
- throw new AssertionError();
- }
- // END android-added
-
- // BEGIN android-added
- protected static String getTimeFormat(LocaleData localeData, int style) {
- switch (style) {
- case SHORT:
- return localeData.shortTimeFormat;
- case MEDIUM:
- return localeData.mediumTimeFormat;
- case LONG:
- return localeData.longTimeFormat;
- case FULL:
- return localeData.fullTimeFormat;
- }
- throw new AssertionError();
- }
- // END android-added
-
/**
* Returns a {@code DateFormat} instance for formatting and parsing time
* values in the DEFAULT style for the default locale.
@@ -631,7 +599,7 @@
checkTimeStyle(style);
// BEGIN android-changed
LocaleData localeData = com.ibm.icu4jni.util.Resources.getLocaleData(locale);
- return new SimpleDateFormat(getTimeFormat(localeData, style), locale);
+ return new SimpleDateFormat(localeData.getTimeFormat(style), locale);
// END android-changed
}
diff --git a/libcore/text/src/main/java/java/text/SimpleDateFormat.java b/libcore/text/src/main/java/java/text/SimpleDateFormat.java
index 9f54ba1..01a4418 100644
--- a/libcore/text/src/main/java/java/text/SimpleDateFormat.java
+++ b/libcore/text/src/main/java/java/text/SimpleDateFormat.java
@@ -620,7 +620,7 @@
// BEGIN android-added
private static String defaultPattern() {
LocaleData localeData = com.ibm.icu4jni.util.Resources.getLocaleData(Locale.getDefault());
- return getDateFormat(localeData, SHORT) + " " + getTimeFormat(localeData, SHORT);
+ return localeData.getDateFormat(SHORT) + " " + localeData.getTimeFormat(SHORT);
}
// END android-added
