From: Markus Scherer Date: Mon, 2 May 2016 22:24:30 +0000 (+0000) Subject: ICU-12440 replace old ICUResourceBundle constants with lower-level ICUData constants X-Git-Tag: milestone-59-0-1~465 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1cb09a85a385dfffefbfee1db029f2b860e4fe08;p=icu ICU-12440 replace old ICUResourceBundle constants with lower-level ICUData constants X-SVN-Rev: 38685 --- diff --git a/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetMBCS.java b/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetMBCS.java index 7ca3fc534e3..a51bfa4e15a 100644 --- a/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetMBCS.java +++ b/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetMBCS.java @@ -1,10 +1,8 @@ /* ******************************************************************************* - * 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; @@ -24,7 +22,6 @@ import java.util.Locale; 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; @@ -196,7 +193,7 @@ class CharsetMBCS extends CharsetICU { 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) diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/impl/coll/CollationLoader.java b/icu4j/main/classes/collate/src/com/ibm/icu/impl/coll/CollationLoader.java index af28dcd03da..5083c76b63e 100644 --- a/icu4j/main/classes/collate/src/com/ibm/icu/impl/coll/CollationLoader.java +++ b/icu4j/main/classes/collate/src/com/ibm/icu/impl/coll/CollationLoader.java @@ -1,7 +1,7 @@ /* ******************************************************************************* * -* Copyright (C) 1996-2015, International Business Machines +* Copyright (C) 1996-2016, International Business Machines * Corporation and others. All Rights Reserved. * ******************************************************************************* @@ -17,6 +17,7 @@ import java.io.IOException; 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; @@ -41,7 +42,7 @@ public final class CollationLoader { 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"); } } @@ -78,7 +79,7 @@ public final class CollationLoader { 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"); @@ -105,7 +106,7 @@ public final class CollationLoader { 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; @@ -226,7 +227,7 @@ public final class CollationLoader { 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; diff --git a/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java b/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java index 017499433ab..b56fd51e829 100644 --- a/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java +++ b/icu4j/main/classes/collate/src/com/ibm/icu/text/Collator.java @@ -12,6 +12,7 @@ import java.util.Locale; 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; @@ -897,7 +898,7 @@ public abstract class Collator implements Comparator, Freezable, Freezable, Freezable, Freezable getFullLocaleNameSet() { - return getFullLocaleNameSet(ICU_BASE_NAME, ICU_DATA_CLASS_LOADER); + return getFullLocaleNameSet(ICUData.ICU_BASE_NAME, ICU_DATA_CLASS_LOADER); } /** @@ -581,7 +512,7 @@ public class ICUResourceBundle extends UResourceBundle { * bundles. */ public static Set getAvailableLocaleNameSet() { - return getAvailableLocaleNameSet(ICU_BASE_NAME, ICU_DATA_CLASS_LOADER); + return getAvailableLocaleNameSet(ICUData.ICU_BASE_NAME, ICU_DATA_CLASS_LOADER); } /** @@ -597,7 +528,7 @@ public class ICUResourceBundle extends UResourceBundle { * @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); } /** @@ -613,7 +544,7 @@ public class ICUResourceBundle extends UResourceBundle { * @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(); } /** @@ -1513,12 +1444,12 @@ public class ICUResourceBundle extends UResourceBundle { } //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; } } diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/LocaleDisplayNamesImpl.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/LocaleDisplayNamesImpl.java index 50cec65ca37..65715cff9de 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/LocaleDisplayNamesImpl.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/LocaleDisplayNamesImpl.java @@ -172,7 +172,7 @@ public class LocaleDisplayNamesImpl extends LocaleDisplayNames { 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"); diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/OlsonTimeZone.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/OlsonTimeZone.java index 8c5a0e80ee0..bd0a9ecdc84 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/OlsonTimeZone.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/OlsonTimeZone.java @@ -1,7 +1,7 @@ /* ******************************************************************************* - * 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; @@ -633,7 +633,7 @@ public class OlsonTimeZone extends BasicTimeZone { // 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); @@ -1238,7 +1238,7 @@ public class OlsonTimeZone extends BasicTimeZone { 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); diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/PluralRulesLoader.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/PluralRulesLoader.java index f2097fcd29b..f14556ccc54 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/PluralRulesLoader.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/PluralRulesLoader.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2008-2015, International Business Machines Corporation and + * Copyright (C) 2008-2016, International Business Machines Corporation and * others. All Rights Reserved. ******************************************************************************* */ @@ -224,7 +224,7 @@ public class PluralRulesLoader extends PluralRules.Factory { */ public UResourceBundle getPluralBundle() throws MissingResourceException { return ICUResourceBundle.getBundleInstance( - ICUResourceBundle.ICU_BASE_NAME, "plurals", + ICUData.ICU_BASE_NAME, "plurals", ICUResourceBundle.ICU_DATA_CLASS_LOADER, true); } diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/RelativeDateFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/RelativeDateFormat.java index c2e7287612c..ea130bbc3cd 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/RelativeDateFormat.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/RelativeDateFormat.java @@ -1,7 +1,7 @@ /* ******************************************************************************* - * 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; @@ -246,7 +246,7 @@ public class RelativeDateFormat extends DateFormat { * 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 datesSet = new TreeSet(new Comparator() { @@ -277,7 +277,7 @@ public class RelativeDateFormat extends DateFormat { * 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(); diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/SimpleFilteredSentenceBreakIterator.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/SimpleFilteredSentenceBreakIterator.java index 5d04eb8c2e6..d22e4771f63 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/SimpleFilteredSentenceBreakIterator.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/SimpleFilteredSentenceBreakIterator.java @@ -212,7 +212,7 @@ public class SimpleFilteredSentenceBreakIterator extends BreakIterator { */ 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"); diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/TZDBTimeZoneNames.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/TZDBTimeZoneNames.java index 4e5e9836db2..05d20e040b2 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/TZDBTimeZoneNames.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/TZDBTimeZoneNames.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2014-2015, International Business Machines Corporation and + * Copyright (C) 2014-2016, International Business Machines Corporation and * others. All Rights Reserved. ******************************************************************************* */ @@ -46,7 +46,7 @@ public class TZDBTimeZoneNames extends TimeZoneNames { 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"); } diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/TimeZoneGenericNames.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/TimeZoneGenericNames.java index 7ddf1b00d51..3a6a5a74934 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/TimeZoneGenericNames.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/TimeZoneGenericNames.java @@ -1,7 +1,7 @@ /* ******************************************************************************* - * 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; @@ -448,7 +448,7 @@ public class TimeZoneGenericNames implements Serializable, Freezable keys = mapTimezones.keySet(); METAZONE_IDS = Collections.unmodifiableSet(keys); @@ -395,7 +395,7 @@ public class TimeZoneNamesImpl extends TimeZoneNames { */ 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? @@ -795,7 +795,7 @@ public class TimeZoneNamesImpl extends TimeZoneNames { protected List createInstance(String key, String data) { List 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('/', ':'); @@ -902,7 +902,7 @@ public class TimeZoneNamesImpl extends TimeZoneNames { protected Map createInstance(String key, String data) { Map 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 { diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/ValidIdentifiers.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/ValidIdentifiers.java index 712a167d5ac..dc032bae077 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/ValidIdentifiers.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/ValidIdentifiers.java @@ -117,7 +117,7 @@ public class ValidIdentifiers { static { Map> _data = new EnumMap>(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"); diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/ZoneMeta.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/ZoneMeta.java index b89bbf9eda7..0ad26ceaa58 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/ZoneMeta.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/ZoneMeta.java @@ -1,6 +1,6 @@ /* ********************************************************************** -* Copyright (c) 2003-2015 International Business Machines +* Copyright (c) 2003-2016 International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** * Author: Alan Liu @@ -285,7 +285,7 @@ public final class ZoneMeta { 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.. @@ -364,7 +364,7 @@ public final class ZoneMeta { 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); @@ -394,7 +394,7 @@ public final class ZoneMeta { 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"); @@ -428,7 +428,7 @@ public final class ZoneMeta { 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); @@ -486,7 +486,7 @@ public final class ZoneMeta { // 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)) { @@ -522,7 +522,7 @@ public final class ZoneMeta { 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); @@ -551,7 +551,7 @@ public final class ZoneMeta { 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) { @@ -868,7 +868,7 @@ public final class ZoneMeta { 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"); diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/KeyTypeData.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/KeyTypeData.java index 437f1acf0d7..499e36570f9 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/KeyTypeData.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/locale/KeyTypeData.java @@ -17,6 +17,7 @@ import java.util.MissingResourceException; 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; @@ -203,7 +204,7 @@ public class KeyTypeData { private static void initFromResourceBundle() { UResourceBundle keyTypeDataRes = UResourceBundle.getBundleInstance( - ICUResourceBundle.ICU_BASE_NAME, + ICUData.ICU_BASE_NAME, "keyTypeData", ICUResourceBundle.ICU_DATA_CLASS_LOADER); diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/BreakIteratorFactory.java b/icu4j/main/classes/core/src/com/ibm/icu/text/BreakIteratorFactory.java index 9cf9d0261ce..ed01ffd315c 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/BreakIteratorFactory.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/BreakIteratorFactory.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2002-2015, International Business Machines Corporation and + * Copyright (C) 2002-2016, International Business Machines Corporation and * others. All Rights Reserved. ******************************************************************************* */ @@ -114,7 +114,7 @@ final class BreakIteratorFactory extends BreakIterator.BreakIteratorServiceShim 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); // diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/CompactDecimalDataCache.java b/icu4j/main/classes/core/src/com/ibm/icu/text/CompactDecimalDataCache.java index 6aa386bd1bb..7277b0037fc 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/CompactDecimalDataCache.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/CompactDecimalDataCache.java @@ -1,7 +1,7 @@ /* ******************************************************************************* - * 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; @@ -11,6 +11,7 @@ import java.util.Map; 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; @@ -128,7 +129,7 @@ class CompactDecimalDataCache { 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(); diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/DateFormatSymbols.java b/icu4j/main/classes/core/src/com/ibm/icu/text/DateFormatSymbols.java index c394b2878c8..237d3029889 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/DateFormatSymbols.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/DateFormatSymbols.java @@ -19,6 +19,7 @@ import java.util.ResourceBundle; 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; @@ -1704,7 +1705,7 @@ public class DateFormatSymbols implements Serializable, Cloneable { 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. diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java b/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java index 73cc701b5dc..c48044b4517 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java @@ -26,6 +26,7 @@ import java.util.TreeMap; 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; @@ -149,7 +150,7 @@ public class DateTimePatternGenerator implements Freezable temp = new HashMap(); ICUResourceBundle suppData = (ICUResourceBundle)ICUResourceBundle.getBundleInstance( - ICUResourceBundle.ICU_BASE_NAME, + ICUData.ICU_BASE_NAME, "supplementalData", ICUResourceBundle.ICU_DATA_CLASS_LOADER); diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormatSymbols.java b/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormatSymbols.java index 13ac7795a79..e44b887902e 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormatSymbols.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormatSymbols.java @@ -18,6 +18,7 @@ import com.ibm.icu.impl.CurrencyData.CurrencyDisplayInfo; 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; @@ -963,7 +964,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable { // 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); diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/DictionaryData.java b/icu4j/main/classes/core/src/com/ibm/icu/text/DictionaryData.java index 86105669f4c..ed472a054bf 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/DictionaryData.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/DictionaryData.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2012-2015, International Business Machines Corporation and + * Copyright (C) 2012-2016, International Business Machines Corporation and * others. All Rights Reserved. ******************************************************************************* */ @@ -42,7 +42,7 @@ final class DictionaryData { 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); diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/ListFormatter.java b/icu4j/main/classes/core/src/com/ibm/icu/text/ListFormatter.java index cc1c76c098d..56e15be33ac 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/ListFormatter.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/ListFormatter.java @@ -13,6 +13,7 @@ import java.util.Iterator; 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; @@ -316,7 +317,7 @@ final public class ListFormatter { 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), diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/NumberFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/NumberFormat.java index 4145cbe3621..1546f5c23f2 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/NumberFormat.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/NumberFormat.java @@ -1,7 +1,7 @@ /* ******************************************************************************* - * 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. ******************************************************************************* */ @@ -21,6 +21,7 @@ import java.util.Locale; 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; @@ -1523,7 +1524,7 @@ public abstract class NumberFormat extends UFormat { } ICUResourceBundle rb = (ICUResourceBundle)UResourceBundle. - getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, forLocale); + getBundleInstance(ICUData.ICU_BASE_NAME, forLocale); NumberingSystem ns = NumberingSystem.getInstance(forLocale); String result = null; diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/NumberingSystem.java b/icu4j/main/classes/core/src/com/ibm/icu/text/NumberingSystem.java index 0a6519872a4..131e188c88e 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/NumberingSystem.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/NumberingSystem.java @@ -1,7 +1,7 @@ /* ******************************************************************************* - * 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. ******************************************************************************* */ @@ -12,6 +12,7 @@ import java.util.Locale; 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; @@ -153,7 +154,7 @@ public class NumberingSystem { 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; @@ -212,7 +213,7 @@ public class NumberingSystem { } 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); @@ -240,7 +241,7 @@ public class NumberingSystem { */ 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; diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/RelativeDateTimeFormatter.java b/icu4j/main/classes/core/src/com/ibm/icu/text/RelativeDateTimeFormatter.java index f3e39357a49..d72bbb1883d 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/RelativeDateTimeFormatter.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/RelativeDateTimeFormatter.java @@ -12,6 +12,7 @@ import java.util.Locale; 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; @@ -1231,7 +1232,7 @@ public final class RelativeDateTimeFormatter { // 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); diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedNumberFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedNumberFormat.java index d69da437bb0..ef42ec15952 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedNumberFormat.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedNumberFormat.java @@ -1,7 +1,7 @@ /* ******************************************************************************* - * 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. ******************************************************************************* */ @@ -17,6 +17,7 @@ import java.util.Map; 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; @@ -826,7 +827,7 @@ public class RuleBasedNumberFormat extends NumberFormat { 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, @@ -1843,7 +1844,7 @@ public class RuleBasedNumberFormat extends NumberFormat { * 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(); diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/TimeZoneFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/TimeZoneFormat.java index d1828c23cb5..cc70555536a 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/text/TimeZoneFormat.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/text/TimeZoneFormat.java @@ -1,7 +1,7 @@ /* ******************************************************************************* - * 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; @@ -28,6 +28,7 @@ import java.util.Locale; 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; @@ -423,7 +424,7 @@ public class TimeZoneFormat extends UFormat implements Freezable 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) { diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java b/icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java index 049333e73f5..e5459cb53d6 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java @@ -18,6 +18,7 @@ import java.util.MissingResourceException; 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; @@ -1932,7 +1933,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable values = new ArrayList(); UResourceBundle rb = UResourceBundle.getBundleInstance( - ICUResourceBundle.ICU_BASE_NAME, + ICUData.ICU_BASE_NAME, "supplementalData", ICUResourceBundle.ICU_DATA_CLASS_LOADER); UResourceBundle calPref = rb.get("calendarPreferenceData"); @@ -4811,7 +4812,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable { 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"); diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/TimeZone.java b/icu4j/main/classes/core/src/com/ibm/icu/util/TimeZone.java index 53b0e88ff0e..bc371a430a8 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/TimeZone.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/TimeZone.java @@ -16,6 +16,7 @@ import java.util.logging.Logger; 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; @@ -1156,7 +1157,7 @@ abstract public class TimeZone implements Serializable, Cloneable, Freezable { * @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"); } @@ -1976,7 +1977,7 @@ public final class ULocale implements Serializable, Comparable { * @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"); } @@ -2955,7 +2956,7 @@ public final class ULocale implements Serializable, Comparable { 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); } diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/UResourceBundle.java b/icu4j/main/classes/core/src/com/ibm/icu/util/UResourceBundle.java index 0298c1bbbef..417e6e3c98f 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/util/UResourceBundle.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/UResourceBundle.java @@ -20,6 +20,7 @@ import java.util.TreeSet; 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; @@ -166,7 +167,7 @@ public abstract class UResourceBundle extends ResourceBundle { 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); } @@ -180,7 +181,7 @@ public abstract class UResourceBundle extends ResourceBundle { */ 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, @@ -200,7 +201,7 @@ public abstract class UResourceBundle extends ResourceBundle { 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); @@ -220,7 +221,7 @@ public abstract class UResourceBundle extends ResourceBundle { */ 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(); @@ -243,7 +244,7 @@ public abstract class UResourceBundle extends ResourceBundle { 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); @@ -266,7 +267,7 @@ public abstract class UResourceBundle extends ResourceBundle { 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(); diff --git a/icu4j/main/classes/currdata/src/com/ibm/icu/impl/ICUCurrencyDisplayInfoProvider.java b/icu4j/main/classes/currdata/src/com/ibm/icu/impl/ICUCurrencyDisplayInfoProvider.java index fbda76c1704..d2d46e63f83 100644 --- a/icu4j/main/classes/currdata/src/com/ibm/icu/impl/ICUCurrencyDisplayInfoProvider.java +++ b/icu4j/main/classes/currdata/src/com/ibm/icu/impl/ICUCurrencyDisplayInfoProvider.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2009-2014, International Business Machines Corporation and + * Copyright (C) 2009-2016, International Business Machines Corporation and * others. All Rights Reserved. ******************************************************************************* */ @@ -27,7 +27,7 @@ public class ICUCurrencyDisplayInfoProvider implements CurrencyDisplayInfoProvid 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) { @@ -141,7 +141,7 @@ public class ICUCurrencyDisplayInfoProvider implements CurrencyDisplayInfoProvid 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; } @@ -206,7 +206,7 @@ public class ICUCurrencyDisplayInfoProvider implements CurrencyDisplayInfoProvid 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; @@ -235,7 +235,7 @@ public class ICUCurrencyDisplayInfoProvider implements CurrencyDisplayInfoProvid Map> visitedPlurals = new HashMap>(); 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) { diff --git a/icu4j/main/classes/currdata/src/com/ibm/icu/impl/ICUCurrencyMetaInfo.java b/icu4j/main/classes/currdata/src/com/ibm/icu/impl/ICUCurrencyMetaInfo.java index b2329bd221e..716e7cc3605 100644 --- a/icu4j/main/classes/currdata/src/com/ibm/icu/impl/ICUCurrencyMetaInfo.java +++ b/icu4j/main/classes/currdata/src/com/ibm/icu/impl/ICUCurrencyMetaInfo.java @@ -1,7 +1,7 @@ /* ******************************************************************************* - * 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; @@ -24,7 +24,7 @@ public class ICUCurrencyMetaInfo extends CurrencyMetaInfo { 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"); diff --git a/icu4j/main/classes/langdata/src/com/ibm/icu/impl/ICULangDataTables.java b/icu4j/main/classes/langdata/src/com/ibm/icu/impl/ICULangDataTables.java index 4cb94b339be..271524630e6 100644 --- a/icu4j/main/classes/langdata/src/com/ibm/icu/impl/ICULangDataTables.java +++ b/icu4j/main/classes/langdata/src/com/ibm/icu/impl/ICULangDataTables.java @@ -1,13 +1,13 @@ /* ******************************************************************************* - * 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); } } diff --git a/icu4j/main/classes/regiondata/src/com/ibm/icu/impl/ICURegionDataTables.java b/icu4j/main/classes/regiondata/src/com/ibm/icu/impl/ICURegionDataTables.java index b146f831897..5d974e02bcb 100644 --- a/icu4j/main/classes/regiondata/src/com/ibm/icu/impl/ICURegionDataTables.java +++ b/icu4j/main/classes/regiondata/src/com/ibm/icu/impl/ICURegionDataTables.java @@ -1,13 +1,13 @@ /* ******************************************************************************* - * 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); } } diff --git a/icu4j/main/classes/translit/src/com/ibm/icu/text/Transliterator.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/Transliterator.java index b8bbf42a201..f319463574d 100644 --- a/icu4j/main/classes/translit/src/com/ibm/icu/text/Transliterator.java +++ b/icu4j/main/classes/translit/src/com/ibm/icu/text/Transliterator.java @@ -1,7 +1,7 @@ /* ******************************************************************************* - * 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; @@ -16,6 +16,7 @@ import java.util.Locale; 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; @@ -1226,7 +1227,7 @@ public abstract class Transliterator implements StringTransform { // 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); @@ -1913,7 +1914,7 @@ public abstract class Transliterator implements StringTransform { * 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; diff --git a/icu4j/main/classes/translit/src/com/ibm/icu/text/TransliteratorRegistry.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/TransliteratorRegistry.java index 48333b5ec22..f4c5f5155c8 100644 --- a/icu4j/main/classes/translit/src/com/ibm/icu/text/TransliteratorRegistry.java +++ b/icu4j/main/classes/translit/src/com/ibm/icu/text/TransliteratorRegistry.java @@ -1,6 +1,6 @@ /* ********************************************************************** -* Copyright (c) 2001-2011, International Business Machines +* Copyright (c) 2001-2016, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** * Date Name Description @@ -20,6 +20,7 @@ import java.util.Map; 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; @@ -120,7 +121,7 @@ class TransliteratorRegistry { // 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; diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java index 1ac0c72bbcf..510ccc578a5 100644 --- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java +++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationMiscTest.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2002-2015, International Business Machines Corporation and + * Copyright (C) 2002-2016, International Business Machines Corporation and * others. All Rights Reserved. ******************************************************************************* */ @@ -18,6 +18,7 @@ import java.util.Set; 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; @@ -52,7 +53,7 @@ public class CollationMiscTest extends TestFmwk { 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"); @@ -1578,7 +1579,7 @@ public class CollationMiscTest extends TestFmwk { 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) { diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ICUResourceBundleCollationTest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ICUResourceBundleCollationTest.java index 589ad2a6624..8baeb11b525 100644 --- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ICUResourceBundleCollationTest.java +++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ICUResourceBundleCollationTest.java @@ -1,7 +1,7 @@ /** ******************************************************************************* - * 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; @@ -9,6 +9,7 @@ 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; @@ -70,7 +71,7 @@ public final class ICUResourceBundleCollationTest extends TestFmwk { }; 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); } @@ -90,7 +91,7 @@ public final class ICUResourceBundleCollationTest extends TestFmwk { 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"); @@ -105,7 +106,7 @@ public final class ICUResourceBundleCollationTest extends TestFmwk { } - 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."); @@ -118,7 +119,7 @@ public final class ICUResourceBundleCollationTest extends TestFmwk { 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;n0){ @@ -660,7 +661,7 @@ public final class ICUResourceBundleTest extends TestFmwk { */ 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")){ @@ -728,14 +729,14 @@ public final class ICUResourceBundleTest extends TestFmwk { }; 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 ) { @@ -771,7 +772,7 @@ public final class ICUResourceBundleTest extends TestFmwk { 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")){ @@ -785,7 +786,7 @@ public final class ICUResourceBundleTest extends TestFmwk { } 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{ @@ -868,14 +869,14 @@ public final class ICUResourceBundleTest extends TestFmwk { } 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()); @@ -889,7 +890,7 @@ public final class ICUResourceBundleTest extends TestFmwk { */ 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()); @@ -907,7 +908,7 @@ public final class ICUResourceBundleTest extends TestFmwk { 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"); } @@ -1003,7 +1004,7 @@ public final class ICUResourceBundleTest extends TestFmwk { 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()); diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/LocaleAliasTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/LocaleAliasTest.java index e141246765c..70252aef662 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/LocaleAliasTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/LocaleAliasTest.java @@ -1,7 +1,7 @@ /* ******************************************************************************* - * 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. ******************************************************************************* */ @@ -14,7 +14,7 @@ package com.ibm.icu.dev.test.util; 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; @@ -197,8 +197,8 @@ public class LocaleAliasTest extends com.ibm.icu.dev.test.TestFmwk { 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)) { diff --git a/icu4j/samples/src/com/ibm/icu/samples/iuc/SupplementalUtilities.java b/icu4j/samples/src/com/ibm/icu/samples/iuc/SupplementalUtilities.java index e1a3cbc4d3e..4c3c4d87dfd 100644 --- a/icu4j/samples/src/com/ibm/icu/samples/iuc/SupplementalUtilities.java +++ b/icu4j/samples/src/com/ibm/icu/samples/iuc/SupplementalUtilities.java @@ -1,11 +1,12 @@ /* ******************************************************************************* - * 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; @@ -73,7 +74,7 @@ public class SupplementalUtilities { */ public static UResourceBundle getICUSupplementalData() { UResourceBundle suppData = UResourceBundle.getBundleInstance( - ICUResourceBundle.ICU_BASE_NAME, + ICUData.ICU_BASE_NAME, "supplementalData", ICUResourceBundle.ICU_DATA_CLASS_LOADER); return suppData;