/*
*******************************************************************************
- * Copyright (C) 2006-2015, International Business Machines Corporation and
+ * Copyright (C) 2006-2016, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
- *
- *******************************************************************************
*/
package com.ibm.icu.charset;
import com.ibm.icu.charset.UConverterSharedData.UConverterType;
import com.ibm.icu.impl.ICUBinary;
import com.ibm.icu.impl.ICUData;
-import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.impl.InvalidFormatException;
import com.ibm.icu.lang.UCharacter;
import com.ibm.icu.text.UTF16;
public CharsetMBCS(String icuCanonicalName, String javaCanonicalName, String[] aliases)
throws InvalidFormatException {
- this(icuCanonicalName, javaCanonicalName, aliases, ICUResourceBundle.ICU_BUNDLE, null);
+ this(icuCanonicalName, javaCanonicalName, aliases, ICUData.ICU_BUNDLE, null);
}
private UConverterSharedData loadConverter(int nestedLoads, String myName, String classPath, ClassLoader loader)
/*
*******************************************************************************
*
-* Copyright (C) 1996-2015, International Business Machines
+* Copyright (C) 1996-2016, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
import java.nio.ByteBuffer;
import java.util.MissingResourceException;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.util.ICUUncheckedIOException;
import com.ibm.icu.util.Output;
synchronized(CollationLoader.class) {
if (rootRules == null) {
UResourceBundle rootBundle = UResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_COLLATION_BASE_NAME, ULocale.ROOT);
+ ICUData.ICU_COLLATION_BASE_NAME, ULocale.ROOT);
rootRules = rootBundle.getString("UCARules");
}
}
static String loadRules(ULocale locale, String collationType) {
UResourceBundle bundle = UResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_COLLATION_BASE_NAME, locale);
+ ICUData.ICU_COLLATION_BASE_NAME, locale);
UResourceBundle data = ((ICUResourceBundle)bundle).getWithFallback(
"collations/" + ASCII.toLowerCase(collationType));
String rules = data.getString("Sequence");
UResourceBundle bundle = null;
try {
bundle = ICUResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_COLLATION_BASE_NAME, locale,
+ ICUData.ICU_COLLATION_BASE_NAME, locale,
ICUResourceBundle.OpenType.LOCALE_ROOT);
} catch (MissingResourceException e) {
outValidLocale.value = ULocale.ROOT;
if (!actualLocale.equals(validLocale)) {
// Opening a bundle for the actual locale should always succeed.
UResourceBundle actualBundle = UResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_COLLATION_BASE_NAME, actualLocale);
+ ICUData.ICU_COLLATION_BASE_NAME, actualLocale);
defT = ((ICUResourceBundle)actualBundle).findStringWithFallback("collations/default");
if (defT != null) {
defaultType = defT;
import java.util.MissingResourceException;
import java.util.Set;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUDebug;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.impl.UResource;
// TODO make this wrap getAvailableULocales later
if (shim == null) {
return ICUResourceBundle.getAvailableLocales(
- ICUResourceBundle.ICU_COLLATION_BASE_NAME, ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+ ICUData.ICU_COLLATION_BASE_NAME, ICUResourceBundle.ICU_DATA_CLASS_LOADER);
}
return shim.getAvailableLocales();
}
public static final ULocale[] getAvailableULocales() {
if (shim == null) {
return ICUResourceBundle.getAvailableULocales(
- ICUResourceBundle.ICU_COLLATION_BASE_NAME, ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+ ICUData.ICU_COLLATION_BASE_NAME, ICUResourceBundle.ICU_DATA_CLASS_LOADER);
}
return shim.getAvailableULocales();
}
* *since ICU 3.0
*/
- private static final String BASE = ICUResourceBundle.ICU_COLLATION_BASE_NAME;
+ private static final String BASE = ICUData.ICU_COLLATION_BASE_NAME;
/**
* {@icu} Returns an array of all possible keywords that are relevant to
// Read available collation values from collation bundles.
ICUResourceBundle bundle = (ICUResourceBundle)
UResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_COLLATION_BASE_NAME, locale);
+ ICUData.ICU_COLLATION_BASE_NAME, locale);
KeywordsSink sink = new KeywordsSink();
bundle.getAllItemsWithFallback("collations", sink);
return sink.values.toArray(new String[sink.values.size()]);
/**
*******************************************************************************
-* Copyright (C) 2003-2014, International Business Machines Corporation and
+* Copyright (C) 2003-2016, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
import java.util.MissingResourceException;
import java.util.Set;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICULocaleService;
import com.ibm.icu.impl.ICULocaleService.LocaleKeyFactory;
import com.ibm.icu.impl.ICUResourceBundle;
// TODO rewrite this to just wrap getAvailableULocales later
Locale[] result;
if (service.isDefault()) {
- result = ICUResourceBundle.getAvailableLocales(ICUResourceBundle.ICU_COLLATION_BASE_NAME,
+ result = ICUResourceBundle.getAvailableLocales(ICUData.ICU_COLLATION_BASE_NAME,
ICUResourceBundle.ICU_DATA_CLASS_LOADER);
} else {
result = service.getAvailableLocales();
ULocale[] getAvailableULocales() {
ULocale[] result;
if (service.isDefault()) {
- result = ICUResourceBundle.getAvailableULocales(ICUResourceBundle.ICU_COLLATION_BASE_NAME,
+ result = ICUResourceBundle.getAvailableULocales(ICUData.ICU_COLLATION_BASE_NAME,
ICUResourceBundle.ICU_DATA_CLASS_LOADER);
} else {
result = service.getAvailableULocales();
class CollatorFactory extends ICUResourceBundleFactory {
CollatorFactory() {
- super(ICUResourceBundle.ICU_COLLATION_BASE_NAME);
+ super(ICUData.ICU_COLLATION_BASE_NAME);
}
@Override
/*
*******************************************************************************
- * Copyright (C) 2004-2014, International Business Machines Corporation and *
- * others. All Rights Reserved. *
+ * Copyright (C) 2004-2016, International Business Machines Corporation and
+ * others. All Rights Reserved.
*******************************************************************************
*/
package com.ibm.icu.impl;
* No default lookup is done.
*/
public CalendarData(ULocale loc, String type) {
- this((ICUResourceBundle)UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, loc), type);
+ this((ICUResourceBundle)UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, loc), type);
}
public CalendarData(ICUResourceBundle b, String type) {
/*
*******************************************************************************
- * Copyright (C) 2009,2016 International Business Machines Corporation and *
- * others. All Rights Reserved. *
+ * Copyright (C) 2009,2016 International Business Machines Corporation and
+ * others. All Rights Reserved.
*******************************************************************************
*/
package com.ibm.icu.impl;
// the locale's region
try {
UResourceBundle rb = UResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_BASE_NAME,
+ ICUData.ICU_BASE_NAME,
"supplementalData",
ICUResourceBundle.ICU_DATA_CLASS_LOADER);
UResourceBundle calPref = rb.get("calendarPreferenceData");
/*
*******************************************************************************
-* Copyright (C) 2007-2014, International Business Machines
+* Copyright (C) 2007-2016, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*/
if (elems == null) {
// Missed cache
String minusString;
- ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, loc);
+ ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, loc);
try {
minusString = rb.getStringWithFallback("NumberElements/"+nsName+"/symbols/minusSign");
} catch (MissingResourceException ex) {
private static DayPeriodRulesData loadData() {
DayPeriodRulesData data = new DayPeriodRulesData();
ICUResourceBundle rb = (ICUResourceBundle)ICUResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_BASE_NAME,
+ ICUData.ICU_BASE_NAME,
"dayPeriods",
ICUResourceBundle.ICU_DATA_CLASS_LOADER,
true);
/*
*******************************************************************************
-* Copyright (C) 2009-2012, International Business Machines
+* Copyright (C) 2009-2016, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*/
public static VersionInfo getDataVersion() {
UResourceBundle icudatares = null;
try {
- icudatares = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, ICUDataVersion.U_ICU_VERSION_BUNDLE, ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+ icudatares = UResourceBundle.getBundleInstance(
+ ICUData.ICU_BASE_NAME,
+ ICUDataVersion.U_ICU_VERSION_BUNDLE,
+ ICUResourceBundle.ICU_DATA_CLASS_LOADER);
icudatares = icudatares.get(ICUDataVersion.U_ICU_DATA_KEY);
} catch (MissingResourceException ex) {
return null;
/**
*******************************************************************************
- * Copyright (C) 2001-2015, International Business Machines Corporation and *
- * others. All Rights Reserved. *
+ * Copyright (C) 2001-2016, International Business Machines Corporation and
+ * others. All Rights Reserved.
*******************************************************************************
*/
package com.ibm.icu.impl;
* Convenience constructor that uses the main ICU bundle name.
*/
public ICUResourceBundleFactory() {
- this(ICUResourceBundle.ICU_BASE_NAME);
+ this(ICUData.ICU_BASE_NAME);
}
/**
import com.ibm.icu.util.UResourceTypeMismatchException;
public class ICUResourceBundle extends UResourceBundle {
- /**
- * The data path to be used with getBundleInstance API
- * @deprecated because not specific to resource bundles; use the ICUData constants instead
- */
- @Deprecated
- protected static final String ICU_DATA_PATH = ICUData.ICU_DATA_PATH;
- /**
- * The data path to be used with getBundleInstance API
- * @deprecated because not specific to resource bundles; use the ICUData constants instead
- */
- @Deprecated
- public static final String ICU_BUNDLE = ICUData.ICU_BUNDLE;
-
- /**
- * The base name of ICU data to be used with getBundleInstance API
- * @deprecated because not specific to resource bundles; use the ICUData constants instead
- */
- @Deprecated
- public static final String ICU_BASE_NAME = ICUData.ICU_BASE_NAME;
-
- /**
- * The base name of collation data to be used with getBundleInstance API
- * @deprecated because not specific to resource bundles; use the ICUData constants instead
- */
- @Deprecated
- public static final String ICU_COLLATION_BASE_NAME = ICUData.ICU_COLLATION_BASE_NAME;
-
- /**
- * The base name of rbbi data to be used with getBundleInstance API
- * @deprecated because not specific to resource bundles; use the ICUData constants instead
- */
- @Deprecated
- public static final String ICU_BRKITR_BASE_NAME = ICUData.ICU_BRKITR_BASE_NAME;
-
- /**
- * The base name of rbnf data to be used with getBundleInstance API
- * @deprecated because not specific to resource bundles; use the ICUData constants instead
- */
- @Deprecated
- public static final String ICU_RBNF_BASE_NAME = ICUData.ICU_RBNF_BASE_NAME;
-
- /**
- * The base name of transliterator data to be used with getBundleInstance API
- * @deprecated because not specific to resource bundles; use the ICUData constants instead
- */
- @Deprecated
- public static final String ICU_TRANSLIT_BASE_NAME = ICUData.ICU_TRANSLIT_BASE_NAME;
-
- /**
- * @deprecated because not specific to resource bundles; use the ICUData constants instead
- */
- @Deprecated
- public static final String ICU_LANG_BASE_NAME = ICUData.ICU_LANG_BASE_NAME;
- /**
- * @deprecated because not specific to resource bundles; use the ICUData constants instead
- */
- @Deprecated
- public static final String ICU_CURR_BASE_NAME = ICUData.ICU_CURR_BASE_NAME;
- /**
- * @deprecated because not specific to resource bundles; use the ICUData constants instead
- */
- @Deprecated
- public static final String ICU_REGION_BASE_NAME = ICUData.ICU_REGION_BASE_NAME;
- /**
- * @deprecated because not specific to resource bundles; use the ICUData constants instead
- */
- @Deprecated
- public static final String ICU_ZONE_BASE_NAME = ICUData.ICU_ZONE_BASE_NAME;
-
/**
* CLDR string value "∅∅∅" prevents fallback to the parent bundle.
*/
* resource bundles.
*/
public static Set<String> getFullLocaleNameSet() {
- return getFullLocaleNameSet(ICU_BASE_NAME, ICU_DATA_CLASS_LOADER);
+ return getFullLocaleNameSet(ICUData.ICU_BASE_NAME, ICU_DATA_CLASS_LOADER);
}
/**
* bundles.
*/
public static Set<String> getAvailableLocaleNameSet() {
- return getAvailableLocaleNameSet(ICU_BASE_NAME, ICU_DATA_CLASS_LOADER);
+ return getAvailableLocaleNameSet(ICUData.ICU_BASE_NAME, ICU_DATA_CLASS_LOADER);
}
/**
* @return the list of available locales
*/
public static final ULocale[] getAvailableULocales() {
- return getAvailableULocales(ICU_BASE_NAME, ICU_DATA_CLASS_LOADER);
+ return getAvailableULocales(ICUData.ICU_BASE_NAME, ICU_DATA_CLASS_LOADER);
}
/**
* @return the list of available locales
*/
public static final Locale[] getAvailableLocales() {
- return getAvailEntry(ICU_BASE_NAME, ICU_DATA_CLASS_LOADER).getLocaleList();
+ return getAvailEntry(ICUData.ICU_BASE_NAME, ICU_DATA_CLASS_LOADER).getLocaleList();
}
/**
}
//there is a path included
if (bundleName.equals(ICUDATA)) {
- bundleName = ICU_BASE_NAME;
+ bundleName = ICUData.ICU_BASE_NAME;
loaderToUse = ICU_DATA_CLASS_LOADER;
}else if(bundleName.indexOf(ICUDATA)>-1){
int idx = bundleName.indexOf(HYPHEN);
if(idx>-1){
- bundleName = ICU_BASE_NAME+RES_PATH_SEP_STR+bundleName.substring(idx+1,bundleName.length());
+ bundleName = ICUData.ICU_BASE_NAME+RES_PATH_SEP_STR+bundleName.substring(idx+1,bundleName.length());
loaderToUse = ICU_DATA_CLASS_LOADER;
}
}
if (capitalization == DisplayContext.CAPITALIZATION_FOR_UI_LIST_OR_MENU ||
capitalization == DisplayContext.CAPITALIZATION_FOR_STANDALONE) {
capitalizationUsage = new boolean[CapitalizationContextUsage.values().length]; // initialized to all false
- ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, locale);
+ ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, locale);
UResourceBundle contextTransformsBundle = null;
try {
contextTransformsBundle = (UResourceBundle)rb.getWithFallback("contextTransforms");
/*
*******************************************************************************
- * Copyright (C) 2005-2014, International Business Machines Corporation and *
- * others. All Rights Reserved. *
+ * Copyright (C) 2005-2016, International Business Machines Corporation and
+ * others. All Rights Reserved.
*******************************************************************************
*/
package com.ibm.icu.impl;
// This constructor is used for testing purpose only
public OlsonTimeZone(String id){
super(id);
- UResourceBundle top = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME,
+ UResourceBundle top = UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME,
ZONEINFORES, ICUResourceBundle.ICU_DATA_CLASS_LOADER);
UResourceBundle res = ZoneMeta.openOlsonResource(top, id);
construct(top, res);
String tzid = getID();
if (tzid != null) {
try {
- UResourceBundle top = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME,
+ UResourceBundle top = UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME,
ZONEINFORES, ICUResourceBundle.ICU_DATA_CLASS_LOADER);
UResourceBundle res = ZoneMeta.openOlsonResource(top, tzid);
construct(top, res);
/*
*******************************************************************************
- * Copyright (C) 2008-2015, International Business Machines Corporation and
+ * Copyright (C) 2008-2016, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
*/
public UResourceBundle getPluralBundle() throws MissingResourceException {
return ICUResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_BASE_NAME, "plurals",
+ ICUData.ICU_BASE_NAME, "plurals",
ICUResourceBundle.ICU_DATA_CLASS_LOADER, true);
}
/*
*******************************************************************************
- * Copyright (C) 2007-2014, International Business Machines Corporation and *
- * others. All Rights Reserved. *
+ * Copyright (C) 2007-2016, International Business Machines Corporation and
+ * others. All Rights Reserved.
*******************************************************************************
*/
package com.ibm.icu.impl;
* Load the Date string array
*/
private synchronized void loadDates() {
- ICUResourceBundle rb = (ICUResourceBundle) UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, fLocale);
+ ICUResourceBundle rb = (ICUResourceBundle) UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, fLocale);
ICUResourceBundle rdb = rb.getWithFallback("fields/day/relative");
Set<URelativeString> datesSet = new TreeSet<URelativeString>(new Comparator<URelativeString>() {
* Set capitalizationOfRelativeUnitsForListOrMenu, capitalizationOfRelativeUnitsForStandAlone
*/
private void initCapitalizationContextInfo(ULocale locale) {
- ICUResourceBundle rb = (ICUResourceBundle) UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, locale);
+ ICUResourceBundle rb = (ICUResourceBundle) UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, locale);
try {
ICUResourceBundle rdb = rb.getWithFallback("contextTransforms/relative");
int[] intVector = rdb.getIntVector();
*/
public Builder(ULocale loc) {
ICUResourceBundle rb = (ICUResourceBundle) UResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_BRKITR_BASE_NAME, loc);
+ ICUData.ICU_BRKITR_BASE_NAME, loc);
ICUResourceBundle exceptions = rb.findWithFallback("exceptions");
if (exceptions != null) {
ICUResourceBundle breaks = exceptions.findWithFallback("SentenceBreak");
/*
*******************************************************************************
- * Copyright (C) 2014-2015, International Business Machines Corporation and
+ * Copyright (C) 2014-2016, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
private static final ICUResourceBundle ZONESTRINGS;
static {
UResourceBundle bundle = ICUResourceBundle
- .getBundleInstance(ICUResourceBundle.ICU_ZONE_BASE_NAME, "tzdbNames");
+ .getBundleInstance(ICUData.ICU_ZONE_BASE_NAME, "tzdbNames");
ZONESTRINGS = (ICUResourceBundle)bundle.get("zoneStrings");
}
/*
*******************************************************************************
- * Copyright (C) 2011-2014, International Business Machines Corporation and *
- * others. All Rights Reserved. *
+ * Copyright (C) 2011-2016, International Business Machines Corporation and
+ * others. All Rights Reserved.
*******************************************************************************
*/
package com.ibm.icu.impl;
String patText;
try {
ICUResourceBundle bundle = (ICUResourceBundle) ICUResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_ZONE_BASE_NAME, _locale);
+ ICUData.ICU_ZONE_BASE_NAME, _locale);
patText = bundle.getStringWithFallback("zoneStrings/" + pat.key());
} catch (MissingResourceException e) {
patText = pat.defaultValue();
if (METAZONE_IDS == null) {
synchronized (TimeZoneNamesImpl.class) {
if (METAZONE_IDS == null) {
- UResourceBundle bundle = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, "metaZones");
+ UResourceBundle bundle = UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, "metaZones");
UResourceBundle mapTimezones = bundle.get("mapTimezones");
Set<String> keys = mapTimezones.keySet();
METAZONE_IDS = Collections.unmodifiableSet(keys);
*/
private void initialize(ULocale locale) {
ICUResourceBundle bundle = (ICUResourceBundle)ICUResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_ZONE_BASE_NAME, locale);
+ ICUData.ICU_ZONE_BASE_NAME, locale);
_zoneStrings = (ICUResourceBundle)bundle.get(ZONE_STRINGS_BUNDLE);
// TODO: Access is synchronized, can we use a non-concurrent map?
protected List<MZMapEntry> createInstance(String key, String data) {
List<MZMapEntry> mzMaps = null;
- UResourceBundle bundle = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, "metaZones");
+ UResourceBundle bundle = UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, "metaZones");
UResourceBundle metazoneInfoBundle = bundle.get("metazoneInfo");
String tzkey = data.replace('/', ':');
protected Map<String, String> createInstance(String key, String data) {
Map<String, String> map = null;
- UResourceBundle bundle = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, "metaZones");
+ UResourceBundle bundle = UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, "metaZones");
UResourceBundle mapTimezones = bundle.get("mapTimezones");
try {
static {
Map<Datatype, Map<Datasubtype, ValiditySet>> _data = new EnumMap<Datatype,Map<Datasubtype,ValiditySet>>(Datatype.class);
UResourceBundle suppData = UResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_BASE_NAME,
+ ICUData.ICU_BASE_NAME,
"supplementalData",
ICUResourceBundle.ICU_DATA_CLASS_LOADER);
UResourceBundle validityInfo = suppData.get("idValidity");
/*
**********************************************************************
-* Copyright (c) 2003-2015 International Business Machines
+* Copyright (c) 2003-2016 International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Author: Alan Liu
if (ZONEIDS == null) {
try {
UResourceBundle top = UResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_BASE_NAME, ZONEINFORESNAME, ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+ ICUData.ICU_BASE_NAME, ZONEINFORESNAME, ICUResourceBundle.ICU_DATA_CLASS_LOADER);
ZONEIDS = top.getStringArray(kNAMES);
} catch (MissingResourceException ex) {
// throw away..
try {
int zoneIdx = getZoneIndex(tzid);
if (zoneIdx >= 0) {
- UResourceBundle top = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME,
+ UResourceBundle top = UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME,
ZONEINFORESNAME, ICUResourceBundle.ICU_DATA_CLASS_LOADER);
UResourceBundle zones = top.get(kZONES);
UResourceBundle zone = zones.get(zoneIdx);
try {
// First, try check if the given ID is canonical
- UResourceBundle keyTypeData = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME,
+ UResourceBundle keyTypeData = UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME,
"keyTypeData", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
UResourceBundle typeMap = keyTypeData.get("typeMap");
UResourceBundle typeKeys = typeMap.get("timezone");
if (zoneIdx >= 0) {
try {
UResourceBundle top = UResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_BASE_NAME, ZONEINFORESNAME, ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+ ICUData.ICU_BASE_NAME, ZONEINFORESNAME, ICUResourceBundle.ICU_DATA_CLASS_LOADER);
UResourceBundle regions = top.get(kREGIONS);
if (zoneIdx < regions.getSize()) {
region = regions.getString(zoneIdx);
// Even a country has multiple zones, one of them might be
// dominant and treated as a primary zone.
try {
- UResourceBundle bundle = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, "metaZones");
+ UResourceBundle bundle = UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, "metaZones");
UResourceBundle primaryZones = bundle.get("primaryZones");
String primaryZone = primaryZones.getString(country);
if (tzid.equals(primaryZone)) {
try {
if (top == null) {
top = UResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_BASE_NAME, ZONEINFORESNAME, ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+ ICUData.ICU_BASE_NAME, ZONEINFORESNAME, ICUResourceBundle.ICU_DATA_CLASS_LOADER);
}
UResourceBundle zones = top.get(kZONES);
UResourceBundle zone = zones.get(zoneIdx);
protected OlsonTimeZone createInstance(String key, String data) {
OlsonTimeZone tz = null;
try {
- UResourceBundle top = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME,
+ UResourceBundle top = UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME,
ZONEINFORESNAME, ICUResourceBundle.ICU_DATA_CLASS_LOADER);
UResourceBundle res = openOlsonResource(top, data);
if (res != null) {
try {
// First, try check if the given ID is canonical
- UResourceBundle keyTypeData = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME,
+ UResourceBundle keyTypeData = UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME,
"keyTypeData", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
UResourceBundle typeMap = keyTypeData.get("typeMap");
UResourceBundle typeKeys = typeMap.get("timezone");
import java.util.Set;
import java.util.regex.Pattern;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.util.Output;
import com.ibm.icu.util.UResourceBundle;
private static void initFromResourceBundle() {
UResourceBundle keyTypeDataRes = UResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_BASE_NAME,
+ ICUData.ICU_BASE_NAME,
"keyTypeData",
ICUResourceBundle.ICU_DATA_CLASS_LOADER);
/*
*******************************************************************************
- * Copyright (C) 2002-2015, International Business Machines Corporation and
+ * Copyright (C) 2002-2016, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
RuleBasedBreakIterator iter = null;
ICUResourceBundle rb = (ICUResourceBundle)ICUResourceBundle.
- getBundleInstance(ICUResourceBundle.ICU_BRKITR_BASE_NAME, locale,
+ getBundleInstance(ICUData.ICU_BRKITR_BASE_NAME, locale,
ICUResourceBundle.OpenType.LOCALE_ROOT);
//
/*
*******************************************************************************
- * Copyright (C) 2012-2016, International Business Machines Corporation and *
- * others. All Rights Reserved. *
+ * Copyright (C) 2012-2016, International Business Machines Corporation and
+ * others. All Rights Reserved.
*******************************************************************************
*/
package com.ibm.icu.text;
import java.util.MissingResourceException;
import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.impl.SimpleCache;
import com.ibm.icu.util.ULocale;
private static DataBundle load(ULocale ulocale) {
NumberingSystem ns = NumberingSystem.getInstance(ulocale);
ICUResourceBundle r = (ICUResourceBundle)UResourceBundle.
- getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, ulocale);
+ getBundleInstance(ICUData.ICU_BASE_NAME, ulocale);
r = r.getWithFallback(NUMBER_ELEMENTS);
String numberingSystemName = ns.getName();
import com.ibm.icu.impl.CalendarData;
import com.ibm.icu.impl.CalendarUtil;
import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.impl.SimpleCache;
import com.ibm.icu.impl.Utility;
ICUResourceBundle rb =
(ICUResourceBundle)UResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_BASE_NAME, desiredLocale);
+ ICUData.ICU_BASE_NAME, desiredLocale);
// Because localized date/time pattern characters will be obsolete in CLDR,
// we decided not to maintain localized pattern characters in ICU any more.
import java.util.TreeSet;
import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.impl.PatternTokenizer;
import com.ibm.icu.impl.SimpleCache;
}
}
- ICUResourceBundle rb = (ICUResourceBundle) UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, uLocale);
+ ICUResourceBundle rb = (ICUResourceBundle) UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, uLocale);
// Get the correct calendar type
String calendarTypeToUse = uLocale.getKeywordValue("calendar");
if ( calendarTypeToUse == null ) {
static {
HashMap<String, String[]> temp = new HashMap<String, String[]>();
ICUResourceBundle suppData = (ICUResourceBundle)ICUResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_BASE_NAME,
+ ICUData.ICU_BASE_NAME,
"supplementalData",
ICUResourceBundle.ICU_DATA_CLASS_LOADER);
import com.ibm.icu.impl.CurrencyData.CurrencyFormatInfo;
import com.ibm.icu.impl.CurrencyData.CurrencySpacingInfo;
import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.impl.SimpleCache;
import com.ibm.icu.util.Currency;
// Open the resource bundle and get the locale IDs
// TODO: Is there a better way to get the locale than making an ICUResourceBundle instance?
ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.
- getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, locale);
+ getBundleInstance(ICUData.ICU_BASE_NAME, locale);
// TODO: Determine actual and valid locale correctly.
ULocale uloc = rb.getULocale();
setLocale(uloc, uloc);
/*
*******************************************************************************
- * Copyright (C) 2012-2015, International Business Machines Corporation and
+ * Copyright (C) 2012-2016, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
private static final int DATA_FORMAT_ID = 0x44696374;
public static DictionaryMatcher loadDictionaryFor(String dictType) throws IOException {
- ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BRKITR_BASE_NAME);
+ ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUData.ICU_BRKITR_BASE_NAME);
String dictFileName = rb.getStringWithFallback("dictionaries/" + dictType);
dictFileName = ICUData.ICU_BRKITR_NAME + '/' + dictFileName;
ByteBuffer bytes = ICUBinary.getRequiredData(dictFileName);
import java.util.Locale;
import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.impl.SimpleCache;
import com.ibm.icu.impl.SimpleFormatterImpl;
private static ListFormatter load(ULocale ulocale, String style) {
ICUResourceBundle r = (ICUResourceBundle)UResourceBundle.
- getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, ulocale);
+ getBundleInstance(ICUData.ICU_BASE_NAME, ulocale);
StringBuilder sb = new StringBuilder();
return new ListFormatter(
compilePattern(r.getWithFallback("listPattern/" + style + "/2").getString(), sb),
/*
*******************************************************************************
- * Copyright (C) 1996-2016, International Business Machines Corporation and *
- * others. All Rights Reserved. *
+ * Copyright (C) 1996-2016, International Business Machines Corporation and
+ * others. All Rights Reserved.
*******************************************************************************
*/
import java.util.MissingResourceException;
import java.util.Set;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.util.Currency;
import com.ibm.icu.util.Currency.CurrencyUsage;
}
ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.
- getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, forLocale);
+ getBundleInstance(ICUData.ICU_BASE_NAME, forLocale);
NumberingSystem ns = NumberingSystem.getInstance(forLocale);
String result = null;
/*
*******************************************************************************
- * Copyright (C) 2009-2012, International Business Machines Corporation and *
- * others. All Rights Reserved. *
+ * Copyright (C) 2009-2016, International Business Machines Corporation and
+ * others. All Rights Reserved.
*******************************************************************************
*/
import java.util.MissingResourceException;
import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.impl.SimpleCache;
import com.ibm.icu.lang.UCharacter;
String resolvedNumberingSystem = null;
while (!nsResolved) {
try {
- ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME,locale);
+ ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME,locale);
rb = rb.getWithFallback("NumberElements");
resolvedNumberingSystem = rb.getStringWithFallback(numbersKeyword);
nsResolved = true;
}
try {
- UResourceBundle numberingSystemsInfo = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, "numberingSystems");
+ UResourceBundle numberingSystemsInfo = UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, "numberingSystems");
UResourceBundle nsCurrent = numberingSystemsInfo.get("numberingSystems");
UResourceBundle nsTop = nsCurrent.get(name);
*/
public static String [] getAvailableNames() {
- UResourceBundle numberingSystemsInfo = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, "numberingSystems");
+ UResourceBundle numberingSystemsInfo = UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, "numberingSystems");
UResourceBundle nsCurrent = numberingSystemsInfo.get("numberingSystems");
UResourceBundle temp;
import com.ibm.icu.impl.CalendarData;
import com.ibm.icu.impl.DontCareFieldPosition;
import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.impl.SimpleCache;
import com.ibm.icu.impl.SimpleFormatterImpl;
// Sink for traversing data.
RelDateTimeFmtDataSink sink = new RelDateTimeFmtDataSink(ulocale);
ICUResourceBundle r = (ICUResourceBundle)UResourceBundle.
- getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, ulocale);
+ getBundleInstance(ICUData.ICU_BASE_NAME, ulocale);
// Use sink mechanism to traverse data structure.
r.getAllTableItemsWithFallback("fields", sink);
/*
*******************************************************************************
- * Copyright (C) 1996-2016, International Business Machines Corporation and *
- * others. All Rights Reserved. *
+ * Copyright (C) 1996-2016, International Business Machines Corporation and
+ * others. All Rights Reserved.
*******************************************************************************
*/
import java.util.MissingResourceException;
import java.util.Set;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUDebug;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.impl.PatternProps;
this.locale = locale;
ICUResourceBundle bundle = (ICUResourceBundle)UResourceBundle.
- getBundleInstance(ICUResourceBundle.ICU_RBNF_BASE_NAME, locale);
+ getBundleInstance(ICUData.ICU_RBNF_BASE_NAME, locale);
// TODO: determine correct actual/valid locale. Note ambiguity
// here -- do actual/valid refer to pattern, DecimalFormatSymbols,
* Set capitalizationForListOrMenu, capitalizationForStandAlone
*/
private void initCapitalizationContextInfo(ULocale theLocale) {
- ICUResourceBundle rb = (ICUResourceBundle) UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, theLocale);
+ ICUResourceBundle rb = (ICUResourceBundle) UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, theLocale);
try {
ICUResourceBundle rdb = rb.getWithFallback("contextTransforms/number-spellout");
int[] intVector = rdb.getIntVector();
/*
*******************************************************************************
- * Copyright (C) 2011-2016, International Business Machines Corporation and *
- * others. All Rights Reserved. *
+ * Copyright (C) 2011-2016, International Business Machines Corporation and
+ * others. All Rights Reserved.
*******************************************************************************
*/
package com.ibm.icu.text;
import java.util.MissingResourceException;
import java.util.Set;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.impl.SoftCache;
import com.ibm.icu.impl.TZDBTimeZoneNames;
try {
ICUResourceBundle bundle = (ICUResourceBundle) ICUResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_ZONE_BASE_NAME, locale);
+ ICUData.ICU_ZONE_BASE_NAME, locale);
try {
gmtPattern = bundle.getStringWithFallback("zoneStrings/gmtFormat");
} catch (MissingResourceException e) {
import com.ibm.icu.impl.CalendarData;
import com.ibm.icu.impl.CalendarUtil;
import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.impl.SimpleCache;
import com.ibm.icu.impl.SimpleFormatterImpl;
ArrayList<String> values = new ArrayList<String>();
UResourceBundle rb = UResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_BASE_NAME,
+ ICUData.ICU_BASE_NAME,
"supplementalData",
ICUResourceBundle.ICU_DATA_CLASS_LOADER);
UResourceBundle calPref = rb.get("calendarPreferenceData");
}
UResourceBundle rb = UResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_BASE_NAME,
+ ICUData.ICU_BASE_NAME,
"supplementalData",
ICUResourceBundle.ICU_DATA_CLASS_LOADER);
UResourceBundle weekDataInfo = rb.get("weekData");
import java.util.Set;
import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUDebug;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.impl.SimpleCache;
int result = 0;
try {
UResourceBundle bundle = UResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_BASE_NAME,
+ ICUData.ICU_BASE_NAME,
"currencyNumericCodes",
ICUResourceBundle.ICU_DATA_CLASS_LOADER);
UResourceBundle codeMap = bundle.get("codeMap");
/*
********************************************************************************
- * Copyright (C) 2003-2014, Google, International Business Machines Corporation *
- * and others. All Rights Reserved. *
+ * Copyright (C) 2003-2016, Google, International Business Machines Corporation
+ * and others. All Rights Reserved.
********************************************************************************
*/
package com.ibm.icu.util;
import java.util.MissingResourceException;
import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.impl.SimpleCache;
private static GenderInfo load(ULocale ulocale) {
UResourceBundle rb = UResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_BASE_NAME,
+ ICUData.ICU_BASE_NAME,
"genderList",
ICUResourceBundle.ICU_DATA_CLASS_LOADER, true);
UResourceBundle genderList = rb.get("genderList");
/*
**************************************************************************************
- * Copyright (C) 2009-2016, International Business Machines Corporation, *
- * Google, Inc. and others. All Rights Reserved. *
+ * Copyright (C) 2009-2016, International Business Machines Corporation,
+ * Google, Inc. and others. All Rights Reserved.
**************************************************************************************
*/
package com.ibm.icu.util;
import java.util.MissingResourceException;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.text.UnicodeSet;
import com.ibm.icu.util.ULocale.Category;
*/
public static final LocaleData getInstance(ULocale locale) {
LocaleData ld = new LocaleData();
- ld.bundle = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, locale);
- ld.langBundle = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_LANG_BASE_NAME, locale);
+ ld.bundle = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, locale);
+ ld.langBundle = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUData.ICU_LANG_BASE_NAME, locale);
ld.noSubstitute = false;
return ld;
}
String region = ULocale.getRegionForSupplementalData(locale, true);
try {
UResourceBundle rb = UResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_BASE_NAME,
+ ICUData.ICU_BASE_NAME,
"supplementalData",
ICUResourceBundle.ICU_DATA_CLASS_LOADER);
UResourceBundle measurementData = rb.get("measurementData");
// 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 supplementalDataBundle = UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, "supplementalData", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
UResourceBundle cldrVersionBundle = supplementalDataBundle.get("cldrVersion");
gCLDRVersion = VersionInfo.getInstance(cldrVersionBundle.getString());
}
/*
****************************************************************************************
- * Copyright (C) 2009-2016, Google, Inc.; International Business Machines Corporation *
- * and others. All Rights Reserved. *
+ * Copyright (C) 2009-2016, Google, Inc.; International Business Machines Corporation
+ * and others. All Rights Reserved.
****************************************************************************************
*/
package com.ibm.icu.util;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.impl.Relation;
import com.ibm.icu.impl.Row;
@Deprecated
public static ICUResourceBundle getICUSupplementalData() {
ICUResourceBundle suppData = (ICUResourceBundle) UResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_BASE_NAME,
+ ICUData.ICU_BASE_NAME,
"supplementalData",
ICUResourceBundle.ICU_DATA_CLASS_LOADER);
return suppData;
/*
*******************************************************************************
- * Copyright (C) 2004-2016, Google Inc, International Business Machines *
- * Corporation and others. All Rights Reserved. *
+ * Copyright (C) 2004-2016, Google Inc, International Business Machines
+ * Corporation and others. All Rights Reserved.
*******************************************************************************
*/
package com.ibm.icu.util;
import java.util.MissingResourceException;
import java.util.Set;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.impl.Pair;
import com.ibm.icu.text.UnicodeSet;
if (cacheIsPopulated) {
return;
}
- ICUResourceBundle resource = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, "en");
+ ICUResourceBundle resource = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, "en");
for (String key : unitKeys) {
try {
ICUResourceBundle unitsTypeRes = resource.getWithFallback(key);
// preallocate currencies
try {
UResourceBundle bundle = UResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_BASE_NAME,
+ ICUData.ICU_BASE_NAME,
"currencyNumericCodes",
ICUResourceBundle.ICU_DATA_CLASS_LOADER);
UResourceBundle codeMap = bundle.get("codeMap");
/*
*******************************************************************************
- * Copyright (C) 2011-2015, International Business Machines Corporation *
- * All Rights Reserved. *
+ * Copyright (C) 2011-2016, International Business Machines Corporation
+ * All Rights Reserved.
*******************************************************************************
*/
package com.ibm.icu.util;
import java.util.Set;
import java.util.TreeSet;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
/**
UResourceBundle territoryContainment = null;
UResourceBundle groupingContainment = null;
- UResourceBundle metadata = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME,"metadata",ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+ UResourceBundle metadata = UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME,"metadata",ICUResourceBundle.ICU_DATA_CLASS_LOADER);
metadataAlias = metadata.get("alias");
territoryAlias = metadataAlias.get("territory");
- UResourceBundle supplementalData = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME,"supplementalData", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+ UResourceBundle supplementalData = UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME,"supplementalData", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
codeMappings = supplementalData.get("codeMappings");
idValidity = supplementalData.get("idValidity");
regionList = idValidity.get("region");
import com.ibm.icu.impl.Grego;
import com.ibm.icu.impl.ICUConfig;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.impl.JavaTimeZone;
import com.ibm.icu.impl.TimeZoneAdapter;
}
UResourceBundle top = UResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_BASE_NAME, "windowsZones", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+ ICUData.ICU_BASE_NAME, "windowsZones", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
UResourceBundle mapTimezones = top.get("mapTimezones");
UResourceBundleIterator resitr = mapTimezones.getIterator();
String id = null;
UResourceBundle top = UResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_BASE_NAME, "windowsZones", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
+ ICUData.ICU_BASE_NAME, "windowsZones", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
UResourceBundle mapTimezones = top.get("mapTimezones");
try {
import java.util.TreeSet;
import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.impl.ICUResourceTableAccess;
import com.ibm.icu.impl.LocaleIDParser;
* @stable ICU 4.0
*/
public String getCharacterOrientation() {
- return ICUResourceTableAccess.getTableString(ICUResourceBundle.ICU_BASE_NAME, this,
+ return ICUResourceTableAccess.getTableString(ICUData.ICU_BASE_NAME, this,
"layout", "characters");
}
* @stable ICU 4.0
*/
public String getLineOrientation() {
- return ICUResourceTableAccess.getTableString(ICUResourceBundle.ICU_BASE_NAME, this,
+ return ICUResourceTableAccess.getTableString(ICUData.ICU_BASE_NAME, this,
"layout", "lines");
}
private static String lookupLikelySubtags(String localeId) {
UResourceBundle bundle =
UResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_BASE_NAME, "likelySubtags");
+ ICUData.ICU_BASE_NAME, "likelySubtags");
try {
return bundle.getString(localeId);
}
import java.util.concurrent.ConcurrentHashMap;
import com.ibm.icu.impl.ICUCache;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.impl.ICUResourceBundleReader;
import com.ibm.icu.impl.ResourceBundleWrapper;
if (locale==null) {
locale = ULocale.getDefault();
}
- return getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, locale.toString(),
+ return getBundleInstance(ICUData.ICU_BASE_NAME, locale.toString(),
ICUResourceBundle.ICU_DATA_CLASS_LOADER, false);
}
*/
public static UResourceBundle getBundleInstance(String baseName) {
if (baseName == null) {
- baseName = ICUResourceBundle.ICU_BASE_NAME;
+ baseName = ICUData.ICU_BASE_NAME;
}
ULocale uloc = ULocale.getDefault();
return getBundleInstance(baseName, uloc.toString(), ICUResourceBundle.ICU_DATA_CLASS_LOADER,
public static UResourceBundle getBundleInstance(String baseName, Locale locale) {
if (baseName == null) {
- baseName = ICUResourceBundle.ICU_BASE_NAME;
+ baseName = ICUData.ICU_BASE_NAME;
}
ULocale uloc = locale == null ? ULocale.getDefault() : ULocale.forLocale(locale);
*/
public static UResourceBundle getBundleInstance(String baseName, ULocale locale) {
if (baseName == null) {
- baseName = ICUResourceBundle.ICU_BASE_NAME;
+ baseName = ICUData.ICU_BASE_NAME;
}
if (locale == null) {
locale = ULocale.getDefault();
public static UResourceBundle getBundleInstance(String baseName, Locale locale,
ClassLoader loader) {
if (baseName == null) {
- baseName = ICUResourceBundle.ICU_BASE_NAME;
+ baseName = ICUData.ICU_BASE_NAME;
}
ULocale uloc = locale == null ? ULocale.getDefault() : ULocale.forLocale(locale);
return getBundleInstance(baseName, uloc.toString(), loader, false);
public static UResourceBundle getBundleInstance(String baseName, ULocale locale,
ClassLoader loader) {
if (baseName == null) {
- baseName = ICUResourceBundle.ICU_BASE_NAME;
+ baseName = ICUData.ICU_BASE_NAME;
}
if (locale == null) {
locale = ULocale.getDefault();
/*
*******************************************************************************
- * Copyright (C) 2009-2014, International Business Machines Corporation and
+ * Copyright (C) 2009-2016, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
public CurrencyDisplayInfo getInstance(ULocale locale, boolean withFallback) {
ICUResourceBundle rb = (ICUResourceBundle) UResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_CURR_BASE_NAME, locale);
+ ICUData.ICU_CURR_BASE_NAME, locale);
if (!withFallback) {
int status = rb.getLoadingStatus();
if (status == ICUResourceBundle.FROM_DEFAULT || status == ICUResourceBundle.FROM_ROOT) {
ULocale locale = rb.getULocale();
for (;locale != null; locale = locale.getFallback()) {
ICUResourceBundle r = (ICUResourceBundle) UResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_CURR_BASE_NAME, locale);
+ ICUData.ICU_CURR_BASE_NAME, locale);
if (r == null) {
continue;
}
for (ULocale locale = rb.getULocale(); locale != null; locale = locale.getFallback()) {
ICUResourceBundle bundle = (ICUResourceBundle)
- UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_CURR_BASE_NAME, locale);
+ UResourceBundle.getBundleInstance(ICUData.ICU_CURR_BASE_NAME, locale);
ICUResourceBundle curr = bundle.findTopLevel("Currencies");
if (curr == null) {
continue;
Map<String, Set<String>> visitedPlurals = new HashMap<String, Set<String>>();
for (ULocale locale = rb.getULocale(); locale != null; locale = locale.getFallback()) {
ICUResourceBundle bundle = (ICUResourceBundle)
- UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_CURR_BASE_NAME, locale);
+ UResourceBundle.getBundleInstance(ICUData.ICU_CURR_BASE_NAME, locale);
ICUResourceBundle curr = bundle.findTopLevel("Currencies");
if (curr != null) {
for (int i = 0; i < curr.getSize(); ++i) {
/*
*******************************************************************************
- * Copyright (C) 2009-2014, International Business Machines Corporation and *
- * others. All Rights Reserved. *
+ * Copyright (C) 2009-2016, International Business Machines Corporation and
+ * others. All Rights Reserved.
*******************************************************************************
*/
package com.ibm.icu.impl;
public ICUCurrencyMetaInfo() {
ICUResourceBundle bundle = (ICUResourceBundle) ICUResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_CURR_BASE_NAME, "supplementalData",
+ ICUData.ICU_CURR_BASE_NAME, "supplementalData",
ICUResourceBundle.ICU_DATA_CLASS_LOADER);
regionInfo = bundle.findTopLevel("CurrencyMap");
digitInfo = bundle.findTopLevel("CurrencyMeta");
/*
*******************************************************************************
- * Copyright (C) 2009, International Business Machines Corporation and *
- * others. All Rights Reserved. *
+ * Copyright (C) 2009-2016, International Business Machines Corporation and
+ * others. All Rights Reserved.
*******************************************************************************
*/
package com.ibm.icu.impl;
public class ICULangDataTables extends LocaleDisplayNamesImpl.ICUDataTables {
public ICULangDataTables() {
- super(ICUResourceBundle.ICU_LANG_BASE_NAME);
+ super(ICUData.ICU_LANG_BASE_NAME);
}
}
/*
*******************************************************************************
- * Copyright (C) 2009, International Business Machines Corporation and *
- * others. All Rights Reserved. *
+ * Copyright (C) 2009-2016, International Business Machines Corporation and
+ * others. All Rights Reserved.
*******************************************************************************
*/
package com.ibm.icu.impl;
public class ICURegionDataTables extends LocaleDisplayNamesImpl.ICUDataTables {
public ICURegionDataTables() {
- super(ICUResourceBundle.ICU_REGION_BASE_NAME);
+ super(ICUData.ICU_REGION_BASE_NAME);
}
}
/*
*******************************************************************************
- * Copyright (C) 1996-2016, International Business Machines Corporation and *
- * others. All Rights Reserved. *
+ * Copyright (C) 1996-2016, International Business Machines Corporation and
+ * others. All Rights Reserved.
*******************************************************************************
*/
package com.ibm.icu.text;
import java.util.Map;
import java.util.MissingResourceException;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.impl.Utility;
import com.ibm.icu.impl.UtilityExtensions;
// root will change to sun.text.resources.LocaleElements
ICUResourceBundle bundle = (ICUResourceBundle)UResourceBundle.
- getBundleInstance(ICUResourceBundle.ICU_TRANSLIT_BASE_NAME, inLocale);
+ getBundleInstance(ICUData.ICU_TRANSLIT_BASE_NAME, inLocale);
// Normalize the ID
String stv[] = TransliteratorIDParser.IDtoSTV(id);
* The extra blank field on "alias" lines is to make the array square.
*/
UResourceBundle bundle, transIDs, colBund;
- bundle = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_TRANSLIT_BASE_NAME, ROOT);
+ bundle = UResourceBundle.getBundleInstance(ICUData.ICU_TRANSLIT_BASE_NAME, ROOT);
transIDs = bundle.get(RB_RULE_BASED_IDS);
int row, maxRows;
/*
**********************************************************************
-* Copyright (c) 2001-2011, International Business Machines
+* Copyright (c) 2001-2016, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Date Name Description
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.impl.LocaleUtility;
import com.ibm.icu.lang.UScript;
// If 'top' is not a script name, try a locale lookup
if (script == UScript.INVALID_CODE) {
Locale toploc = LocaleUtility.getLocaleFromName(top);
- res = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_TRANSLIT_BASE_NAME,toploc);
+ res = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUData.ICU_TRANSLIT_BASE_NAME,toploc);
// Make sure we got the bundle we wanted; otherwise, don't use it
if (res!=null && LocaleUtility.isFallbackOf(res.getULocale().toString(), top)) {
isSpecLocale = true;
/*
*******************************************************************************
- * Copyright (C) 2002-2015, International Business Machines Corporation and
+ * Copyright (C) 2002-2016, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
import java.util.TreeSet;
import com.ibm.icu.dev.test.TestFmwk;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.impl.Utility;
import com.ibm.icu.lang.UScript;
private static final boolean hasCollationElements(Locale locale)
{
- ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_COLLATION_BASE_NAME,locale);
+ ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUData.ICU_COLLATION_BASE_NAME,locale);
if (rb != null) {
try {
String collkey = rb.getStringWithFallback("collations/default");
for (int i = 0; i < locale.length; i ++) {
Locale l = locale[i];
try {
- ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_COLLATION_BASE_NAME,l);
+ ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUData.ICU_COLLATION_BASE_NAME,l);
String collkey = rb.getStringWithFallback("collations/default");
ICUResourceBundle elements = rb.getWithFallback("collations/" + collkey);
if (elements == null) {
/**
*******************************************************************************
- * Copyright (C) 2009-2014, International Business Machines Corporation and *
- * others. All Rights Reserved. *
+ * Copyright (C) 2009-2016, International Business Machines Corporation and
+ * others. All Rights Reserved.
*******************************************************************************
*/
package com.ibm.icu.dev.test.util;
import java.util.MissingResourceException;
import com.ibm.icu.dev.test.TestFmwk;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.text.Collator;
import com.ibm.icu.util.ULocale;
};
logln("Testing functional equivalents for collation...");
- getFunctionalEquivalentTestCases(ICUResourceBundle.ICU_COLLATION_BASE_NAME,
+ getFunctionalEquivalentTestCases(ICUData.ICU_COLLATION_BASE_NAME,
Collator.class.getClassLoader(),
COLLATION_RESNAME, COLLATION_KEYWORD, true, collCases);
}
ICUResourceBundle bundle = null;
String key = null;
try{
- bundle = (ICUResourceBundle) UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_COLLATION_BASE_NAME,ULocale.canonicalize("de__PHONEBOOK"));
+ bundle = (ICUResourceBundle) UResourceBundle.getBundleInstance(ICUData.ICU_COLLATION_BASE_NAME,ULocale.canonicalize("de__PHONEBOOK"));
if(!bundle.getULocale().getName().equals("de")){
errln("did not get the expected bundle");
}
- bundle = (ICUResourceBundle) UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_COLLATION_BASE_NAME,"fr_FR");
+ bundle = (ICUResourceBundle) UResourceBundle.getBundleInstance(ICUData.ICU_COLLATION_BASE_NAME,"fr_FR");
key = bundle.getStringWithFallback("collations/default");
if(!key.equals("standard")){
errln("Did not get the expected result from getStringWithFallback method.");
int n;
logln("Testing getting collation values:");
- kwVals = ICUResourceBundle.getKeywordValues(ICUResourceBundle.ICU_COLLATION_BASE_NAME,COLLATION_RESNAME);
+ kwVals = ICUResourceBundle.getKeywordValues(ICUData.ICU_COLLATION_BASE_NAME,COLLATION_RESNAME);
for(n=0;n<kwVals.length;n++) {
logln(new Integer(n).toString() + ": " + kwVals[n]);
if(DEFAULT_NAME.equals(kwVals[n])) {
}
public void TestOpen(){
- UResourceBundle bundle = (UResourceBundle)UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_COLLATION_BASE_NAME, "en_US_POSIX");
+ UResourceBundle bundle = (UResourceBundle)UResourceBundle.getBundleInstance(ICUData.ICU_COLLATION_BASE_NAME, "en_US_POSIX");
if(bundle==null){
errln("could not load the stream");
}
import java.util.ResourceBundle;
import java.util.Set;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.text.ChineseDateFormat;
import com.ibm.icu.text.ChineseDateFormat.Field;
f = DateFormat.getDateInstance();
logln("time yet again: " + f.format(now));
- ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME,"de_DE");
+ ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME,"de_DE");
DateFormatSymbols sym = new DateFormatSymbols(rb, Locale.GERMANY);
DateFormatSymbols sym2 = (DateFormatSymbols)sym.clone();
if (sym.hashCode() != sym2.hashCode()) {
/*****************************************************************************************
*
- * Copyright (C) 1996-2014, International Business Machines
+ * Copyright (C) 1996-2016, International Business Machines
* Corporation and others. All Rights Reserved.
**/
import java.util.Date;
import java.util.Locale;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.text.DateFormat;
import com.ibm.icu.text.DecimalFormat;
Locale[] locales = NumberFormat.getAvailableLocales();
for (int i = 0; i < locales.length; i++) {
- ICUResourceBundle rb = (ICUResourceBundle)ICUResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME,locales[i]);
+ ICUResourceBundle rb = (ICUResourceBundle)ICUResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME,locales[i]);
//
// Get the currency pattern for this locale. We have to fish it
/**
*******************************************************************************
- * Copyright (C) 2000-2016, International Business Machines Corporation and *
- * others. All Rights Reserved. *
+ * Copyright (C) 2000-2016, International Business Machines Corporation and
+ * others. All Rights Reserved.
*******************************************************************************
*/
import java.util.Set;
import com.ibm.icu.dev.test.TestFmwk;
-import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.text.SimpleDateFormat;
import com.ibm.icu.util.BasicTimeZone;
import com.ibm.icu.util.Calendar;
// in icu4j 2.1 we know we have the zh_CN locale data, though it's incomplete
// /"DateFormatZoneData",
- UResourceBundle enRB = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME,Locale.ENGLISH);
- UResourceBundle mtRB = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, mt_MT);
+ UResourceBundle enRB = UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME,Locale.ENGLISH);
+ UResourceBundle mtRB = UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, mt_MT);
boolean noZH = enRB == mtRB;
if (noZH) {
/**
*******************************************************************************
- * Copyright (C) 2001-2015, International Business Machines Corporation and
+ * Copyright (C) 2001-2016, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
import java.util.jar.JarEntry;
import com.ibm.icu.dev.test.TestFmwk;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.impl.Utility;
import com.ibm.icu.text.BreakIterator;
errln("Did not get the expected output for Weekend data");
}
- bundle = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, "bogus");
+ bundle = UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, "bogus");
if(bundle instanceof UResourceBundle && bundle.getULocale().getName().equals("en_US")){
logln("wrapper mechanism works for bogus locale");
}else{
}
}
public void TestOpen(){
- UResourceBundle bundle = (UResourceBundle) UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, "en_US_POSIX");
+ UResourceBundle bundle = (UResourceBundle) UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, "en_US_POSIX");
if(bundle==null){
errln("could not create the resource bundle");
errln("could not create the resource bundle");
}
- bundle = (UResourceBundle) UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, "zzz_ZZ_very_very_very_long_bogus_bundle");
+ bundle = (UResourceBundle) UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, "zzz_ZZ_very_very_very_long_bogus_bundle");
if(!bundle.getULocale().equals(ULocale.getDefault())){
errln("UResourceBundle did not load the default bundle when bundle was not found. Default: " + ULocale.getDefault() +
", Bundle locale: " + bundle.getULocale());
}
public void TestAlias(){
logln("Testing %%ALIAS");
- UResourceBundle rb = (UResourceBundle) UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME,"iw_IL");
+ UResourceBundle rb = (UResourceBundle) UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME,"iw_IL");
UResourceBundle b = rb.get("NumberElements");
if(b != null){
if(b.getSize()>0){
*/
ICUResourceBundle bundle = null;
- bundle = (ICUResourceBundle) UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME,"fr_FR");
+ bundle = (ICUResourceBundle) UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME,"fr_FR");
ICUResourceBundle b1 = bundle.getWithFallback("calendar");
String defaultCal = b1.getStringWithFallback("default");
if(!defaultCal.equals("gregorian")){
};
logln("Testing functional equivalents for calendar...");
- getFunctionalEquivalentTestCases(ICUResourceBundle.ICU_BASE_NAME,
+ getFunctionalEquivalentTestCases(ICUData.ICU_BASE_NAME,
Calendar.class.getClassLoader(),
CALENDAR_RESNAME, CALENDAR_KEYWORD, false, calCases);
logln("Testing error conditions:");
try {
ClassLoader cl = BreakIterator.class.getClassLoader();
- ICUResourceBundle.getFunctionalEquivalent(ICUResourceBundle.ICU_BRKITR_BASE_NAME, cl, "calendar",
+ ICUResourceBundle.getFunctionalEquivalent(ICUData.ICU_BRKITR_BASE_NAME, cl, "calendar",
"calendar", new ULocale("ar_EG@calendar=islamic"), new boolean[1], true);
errln("Err: expected MissingResourceException");
} catch ( MissingResourceException t ) {
public void TestNorwegian(){
try{
- UResourceBundle rb = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_REGION_BASE_NAME, "no_NO_NY");
+ UResourceBundle rb = UResourceBundle.getBundleInstance(ICUData.ICU_REGION_BASE_NAME, "no_NO_NY");
UResourceBundle sub = rb.get("Countries");
String s1 = sub.getString("NO");
if(s1.equals("Noreg")){
}
public void TestJB4102(){
try {
- ICUResourceBundle root =(ICUResourceBundle) UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, "root");
+ ICUResourceBundle root =(ICUResourceBundle) UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, "root");
ICUResourceBundle t = null;
// AmPmMarkers now exist in root/islamic calendar, so this test is rendered useless.
// try{
}
public void TestLoadingStatus(){
- ICUResourceBundle bundle = (ICUResourceBundle) UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, "yi_IL");
+ ICUResourceBundle bundle = (ICUResourceBundle) UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, "yi_IL");
assertFallbackLoadingStatus("base/yi_IL", bundle.getLoadingStatus());
- bundle = (ICUResourceBundle) UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, "eo_DE");
+ bundle = (ICUResourceBundle) UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, "eo_DE");
assertFallbackLoadingStatus("base/eo_DE", bundle.getLoadingStatus());
logln("Test to verify loading status of get(String)");
- bundle = (ICUResourceBundle) UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_LANG_BASE_NAME, "zh_Hant_TW");
+ bundle = (ICUResourceBundle) UResourceBundle.getBundleInstance(ICUData.ICU_LANG_BASE_NAME, "zh_Hant_TW");
ICUResourceBundle countries = (ICUResourceBundle) bundle.get("Languages");
assertFallbackLoadingStatus("lang/Languages/zh_Hant_TW", countries.getLoadingStatus());
*/
logln("Test to verify root loading status of get()");
- bundle = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, "te_IN");
+ bundle = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, "te_IN");
ICUResourceBundle ms = (ICUResourceBundle) bundle.get("layout");
assertRootLoadingStatus("base/layout/te_IN", ms.getLoadingStatus());
public void TestCoverage(){
UResourceBundle bundle;
- bundle = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME);
+ bundle = UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME);
if (bundle == null){
errln("UResourceBundle.getBundleInstance(String baseName) failed");
}
public void TestAliasFallback(){
try{
ULocale loc = new ULocale("en_US");
- ICUResourceBundle b = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, loc);
+ ICUResourceBundle b = (ICUResourceBundle)UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, loc);
ICUResourceBundle b1 = (ICUResourceBundle)b.getWithFallback("calendar/hebrew/monthNames/format/abbreviated");
if(b1!=null){
logln("loaded data for abbreviated month names: "+ b1.getKey());
/*
*******************************************************************************
- * Copyright (C) 2005-2009, International Business Machines Corporation and *
- * others. All Rights Reserved. *
+ * Copyright (C) 2005-2016, International Business Machines Corporation and
+ * others. All Rights Reserved.
*******************************************************************************
*/
import java.util.HashMap;
-import com.ibm.icu.impl.ICUResourceBundle;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.text.DateFormat;
import com.ibm.icu.util.Calendar;
import com.ibm.icu.util.ULocale;
UResourceBundle urb1 = null;
UResourceBundle urb2 = null;
- urb1 = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, oldLoc);
- urb2 = UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, newLoc);
+ urb1 = UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, oldLoc);
+ urb2 = UResourceBundle.getBundleInstance(ICUData.ICU_BASE_NAME, newLoc);
ULocale l1 = urb1.getULocale();
ULocale l2 = urb2.getULocale();
if (!newLoc.equals(l1)) {
/*
*******************************************************************************
- * Copyright (C) 2013, International Business Machines Corporation and *
- * others. All Rights Reserved. *
+ * Copyright (C) 2013-2016, International Business Machines Corporation and
+ * others. All Rights Reserved.
*******************************************************************************
*/
package com.ibm.icu.samples.iuc;
+import com.ibm.icu.impl.ICUData;
import com.ibm.icu.impl.ICUResourceBundle;
import com.ibm.icu.util.UResourceBundle;
*/
public static UResourceBundle getICUSupplementalData() {
UResourceBundle suppData = UResourceBundle.getBundleInstance(
- ICUResourceBundle.ICU_BASE_NAME,
+ ICUData.ICU_BASE_NAME,
"supplementalData",
ICUResourceBundle.ICU_DATA_CLASS_LOADER);
return suppData;
projects / icu / commitdiff