AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-4767 fix loading from jars

Browse Source 
X-SVN-Rev: 18644
This commit is contained in:
Ram Viswanadha 2005-10-08 18:32:35 +00:00
parent 97bd046db5
commit 35860269cd
5 changed files with 57 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
icu4j/src/com/ibm/icu/impl/ICUResourceBundle.java
View File

@ -469,8 +469,7 @@ public abstract class ICUResourceBundle extends UResourceBundle {
// Check top level locale first
ICUResourceBundle r = null;
r = (ICUResourceBundle) UResourceBundle.getBundleInstance(baseName,
parent);
r = (ICUResourceBundle) UResourceBundle.getBundleInstance(baseName, parent);
found = r.getULocale();
if (fillinIsAvailable != null) {
if (!found.equals(parent)) {
@ -498,8 +497,7 @@ public abstract class ICUResourceBundle extends UResourceBundle {
// Now, search for the named resource
parent = new ULocale(baseLoc);
r = (ICUResourceBundle) UResourceBundle.getBundleInstance(baseName,
parent);
r = (ICUResourceBundle) UResourceBundle.getBundleInstance(baseName, parent);
// determine in which locale (if any) the named resource is located
do {
try {
@ -651,33 +649,6 @@ public abstract class ICUResourceBundle extends UResourceBundle {
return getWithFallback(path).getString();
}
/**
* Gets a resource bundle using the specified base name, locale, and class root.
*
* @param baseName the base name of the resource bundle, a fully qualified class name
* @param localeName the locale for which a resource bundle is desired
* @param disableFallback Option to disable locale inheritence.
* If true the fallback chain will not be built.
* @exception MissingResourceException
* if no resource bundle for the specified base name can be found
* @return a resource bundle for the given base name and locale
* @draft ICU 3.0
*
*/
public static UResourceBundle getBundleInstance(String baseName,
String localeName, boolean disableFallback) {
return instantiateBundle(baseName, localeName, ICU_DATA_CLASS_LOADER,
disableFallback);
}
/**
* @internal
*/
public static UResourceBundle getBundleInstance(ClassLoader loader,
String baseName, String localeName, boolean disableFallback) {
return instantiateBundle(baseName, localeName, loader, disableFallback);
}
/**
* Return a set of the locale names supported by a collection of resource
* bundles.
@ -916,8 +887,8 @@ public abstract class ICUResourceBundle extends UResourceBundle {
// all. gotta be a better way to do this, since to add a locale you have
// to update this list,
// and it's embedded in our binary resources.
ICUResourceBundle bundle = (ICUResourceBundle) instantiateBundle(
baseName, ICU_RESOURCE_INDEX, root, true);
ICUResourceBundle bundle = (ICUResourceBundle) createBundle(baseName, ICU_RESOURCE_INDEX, root);
bundle = bundle.get(INSTALLED_LOCALES);
int length = bundle.getSize();
int i = 0;
@ -938,8 +909,7 @@ public abstract class ICUResourceBundle extends UResourceBundle {
private static final String[] createLocaleNameArray(String baseName,
ClassLoader root) {
ICUResourceBundle bundle = (ICUResourceBundle) instantiateBundle(
baseName, ICU_RESOURCE_INDEX, root, true);
ICUResourceBundle bundle = (ICUResourceBundle) createBundle( baseName, ICU_RESOURCE_INDEX, root);
bundle = bundle.get(INSTALLED_LOCALES);
int length = bundle.getSize();
int i = 0;
@ -1145,22 +1115,23 @@ public abstract class ICUResourceBundle extends UResourceBundle {
}
return false;
}
/**
* Creates a new ICUResourceBundle for the given locale, baseName and class loader
* @param baseName the base name of the resource bundle, a fully qualified class name
* @param localeID the locale for which a resource bundle is desired
* @param root the class object from which to load the resource bundle
* @exception MissingResourceException
* if no resource bundle for the specified base name can be found
* @return a resource bundle for the given base name and locale
* @draft ICU 3.0
* @deprecated This is a draft API and might change in a future release of ICU.
*/
// recursively build bundle
synchronized public static UResourceBundle instantiateBundle(String baseName, String localeID,
// This method is for super class's instantiateBundle method
public static UResourceBundle getBundleInstance(String baseName, String localeID,
ClassLoader root, boolean disableFallback){
UResourceBundle b = instantiateBundle(baseName, localeID, root, disableFallback);
if(b==null){
throw new MissingResourceException("Could not find the bundle "+ baseName+"/"+ localeID+".res","","");
}
return b;
}
// recursively build bundle .. over-ride super class method.
protected synchronized static UResourceBundle instantiateBundle(String baseName, String localeID,
ClassLoader root, boolean disableFallback){
ULocale defaultLocale = ULocale.getDefault();
String localeName = ULocale.getBaseName(localeID);
String localeName = localeID;
if(localeName.indexOf('@')>0){
localeName = ULocale.getBaseName(localeID);
}
String fullName = ICUResourceBundleReader.getFullName(baseName, localeName);
ICUResourceBundle b = (ICUResourceBundle)loadFromCache(root, fullName, defaultLocale);
@ -1177,9 +1148,14 @@ public abstract class ICUResourceBundle extends UResourceBundle {
if(localeName.equals("")){
localeName = rootLocale;
}
if(DEBUG) System.out.println("Creating "+fullName+ " currently b is "+b);
if (b == null) {
b = ICUResourceBundle.createBundle(baseName, localeName, root);
if(DEBUG)System.out.println("The bundle created is: "+b+" and disableFallback="+disableFallback);
if(disableFallback==true){
return b;
}
if(b == null){
int i = localeName.lastIndexOf('_');
if (i != -1) {

13
icu4j/src/com/ibm/icu/impl/ResourceBundleWrapper.java
View File

@ -95,8 +95,17 @@ public class ResourceBundleWrapper extends UResourceBundle {
// Flag for enabling/disabling debugging code
private static final boolean DEBUG = ICUDebug.enabled("resourceBundleWrapper");
// recursively build bundle
static public synchronized UResourceBundle instantiateBundle(String baseName, String localeID,
// This method is for super class's instantiateBundle method
public static UResourceBundle getBundleInstance(String baseName, String localeID,
ClassLoader root, boolean disableFallback){
UResourceBundle b = instantiateBundle(baseName, localeID, root, disableFallback);
if(b==null){
throw new MissingResourceException("Could not find the bundle "+ baseName+"_"+ localeID,"","");
}
return b;
}
// recursively build bundle and override the super-class method
protected static synchronized UResourceBundle instantiateBundle(String baseName, String localeID,
ClassLoader root, boolean disableFallback) {
if (root == null) {
// we're on the bootstrap

2
icu4j/src/com/ibm/icu/util/Currency.java
View File

@ -131,7 +131,7 @@ public class Currency extends MeasureUnit implements Serializable {
if (variant.equals("PREEURO") || variant.equals("EURO")) {
country = country + '_' + variant;
}
ICUResourceBundle bundle = (ICUResourceBundle) ICUResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME,"CurrencyData", true);
ICUResourceBundle bundle = (ICUResourceBundle) ICUResourceBundle.createBundle(ICUResourceBundle.ICU_BASE_NAME,"CurrencyData", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
if(bundle==null){
//throw new MissingResourceException()
}

40
icu4j/src/com/ibm/icu/util/UResourceBundle.java
View File

@ -389,14 +389,17 @@ public abstract class UResourceBundle extends ResourceBundle{
if (rootType == null) {
String rootLocale = (baseName.indexOf('.')==-1) ? "root" : "";
UResourceBundle b = ICUResourceBundle.instantiateBundle(baseName, rootLocale, root, true);
int rt = ROOT_ICU;
if (b == null) {
int rt = ROOT_MISSING;
UResourceBundle b = null;
try{
b = ICUResourceBundle.getBundleInstance(baseName, rootLocale, root, true);
rt = ROOT_ICU;
}catch(MissingResourceException ex){
try{
b = ResourceBundleWrapper.getBundleInstance(baseName, rootLocale, root, true);
rt = ROOT_JAVA;
b = ResourceBundleWrapper.instantiateBundle(baseName, rootLocale, root, true);
if(b==null) {
rt = ROOT_MISSING;
}catch(MissingResourceException e){
//throw away the exception
}
}
@ -452,34 +455,27 @@ public abstract class UResourceBundle extends ResourceBundle{
b = loadFromCache(cacheKey);
if (b == null) {
b = ICUResourceBundle.createBundle(baseName, localeName, root);
b = ICUResourceBundle.getBundleInstance(baseName, localeName, root, disableFallback);
cacheKey.setKeyValues(root, fullName, defaultLocale);
addToCache(cacheKey, b);
}
} else {
b = ICUResourceBundle.instantiateBundle(baseName, localeName, root, disableFallback);
b = ICUResourceBundle.getBundleInstance(baseName, localeName, root, disableFallback);
}
return b;
case ROOT_JAVA:
return ResourceBundleWrapper.instantiateBundle(baseName, localeName, root, disableFallback);
return ResourceBundleWrapper.getBundleInstance(baseName, localeName, root, disableFallback);
default:
b = ICUResourceBundle.instantiateBundle(baseName, localeName, root, disableFallback);
if (b == null) {
b = ResourceBundleWrapper.instantiateBundle(baseName, localeName, root, disableFallback);
if (b == null){
throw new MissingResourceException("Could not find the bundle ", baseName, localeName);
} else {
try{
b = ICUResourceBundle.getBundleInstance(baseName, localeName, root, disableFallback);
setRootType(baseName, ROOT_ICU);
}catch(MissingResourceException ex){
b = ResourceBundleWrapper.getBundleInstance(baseName, localeName, root, disableFallback);
setRootType(baseName, ROOT_JAVA);
}
} else {
setRootType(baseName, ROOT_ICU);
}
return b;
}
}