organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-14 17:24:01 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-6968 Moved getCLDRVersion to LocaleData

Browse source 
X-SVN-Rev: 26146
This commit is contained in:
John Vu 2009-06-23 20:26:25 +00:00
parent 22ca909a67
commit 076f16ad5c
3 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
icu4j/main/classes/core/src/com/ibm/icu/util/LocaleData.java
View file

@ -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;
}
}

18
icu4j/main/classes/core/src/com/ibm/icu/util/ULocale.java
View file

@ -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.

3
icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ULocaleTest.java
View file

@ -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+"'");