diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/LocaleData.java b/icu4j/main/classes/core/src/com/ibm/icu/util/LocaleData.java index 688cf4a6bbc..e088fcd1784 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/LocaleData.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/LocaleData.java @@ -335,4 +335,22 @@ public final class LocaleData { String localeSeparator = locDispBundle.getStringWithFallback(SEPARATOR); return localeSeparator; } + + private static VersionInfo gCLDRVersion = null; + + /** + * Returns the current CLDR version + * @draft ICU 4.2 + * @provisional This API might change or be removed in a future release. + */ + public static VersionInfo getCLDRVersion() { + // fetching this data should be idempotent. + if(gCLDRVersion == null) { + // from ZoneMeta.java + UResourceBundle supplementalDataBundle = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, "supplementalData", ICUResourceBundle.ICU_DATA_CLASS_LOADER); + UResourceBundle cldrVersionBundle = supplementalDataBundle.get("cldrVersion"); + gCLDRVersion = VersionInfo.getInstance(cldrVersionBundle.getString()); + } + return gCLDRVersion; + } } diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java b/icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java index 31b8d32c008..cd6c03614b3 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java @@ -1000,24 +1000,6 @@ public final class ULocale implements Serializable { public static ULocale[] getAvailableLocales() { return ICUResourceBundle.getAvailableULocales(); } - - private static VersionInfo gCLDRVersion = null; - - /** - * Returns the current CLDR version - * @draft ICU 4.2 - * @provisional This API might change or be removed in a future release. - */ - public static VersionInfo getCLDRVersion() { - // fetching this data should be idempotent. - if(gCLDRVersion == null) { - // from ZoneMeta.java - UResourceBundle supplementalDataBundle = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, "supplementalData", ICUResourceBundle.ICU_DATA_CLASS_LOADER); - UResourceBundle cldrVersionBundle = supplementalDataBundle.get("cldrVersion"); - gCLDRVersion = VersionInfo.getInstance(cldrVersionBundle.getString()); - } - return gCLDRVersion; - } /** * Returns a list of all 2-letter country codes defined in ISO 3166. diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java index f3b9ac89c92..f635b600bb1 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java @@ -28,6 +28,7 @@ import com.ibm.icu.text.SimpleDateFormat; import com.ibm.icu.text.NumberFormat.SimpleNumberFormatFactory; import com.ibm.icu.util.Calendar; import com.ibm.icu.util.IllformedLocaleException; +import com.ibm.icu.util.LocaleData; import com.ibm.icu.util.ULocale; import com.ibm.icu.util.UResourceBundle; import com.ibm.icu.util.VersionInfo; @@ -3714,7 +3715,7 @@ public class ULocaleTest extends TestFmwk { VersionInfo testCurrent; VersionInfo cldrVersion; - cldrVersion = ULocale.getCLDRVersion(); + cldrVersion = LocaleData.getCLDRVersion(); this.logln("uloc_getCLDRVersion() returned: '"+cldrVersion+"'");