organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 22:44:49 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-3850 icuservice cache needs to know about keywords

Browse source 
X-SVN-Rev: 15887
This commit is contained in:
Doug Felt 2004-06-16 05:54:19 +00:00
parent 8fe130dfa7
commit cc5dec8c89
2 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
icu4j/src/com/ibm/icu/impl/ICULocaleService.java
View file

@ -274,11 +274,15 @@ public class ICULocaleService extends ICUService {
/**
* Return the (canonical) current descriptor, or null if no current id.
* Includes the keywords, whereas the ID does not include keywords.
*/
public String currentDescriptor() {
String result = currentID();
if (result != null) {
result = "/" + result;
if (varstart != -1) {
result += primaryID.substring(varstart);
}
if (kind != KIND_ANY) {
result = prefix() + result;
}

32
icu4j/src/com/ibm/icu/impl/ICUService.java
View file

@ -380,6 +380,8 @@ public class ICUService extends ICUNotifier {
return getKey(key, actualReturn, null);
}
// debugging
// Map hardRef;
public Object getKey(Key key, String[] actualReturn, Factory factory) {
if (factories.size() == 0) {
@ -387,7 +389,7 @@ public class ICUService extends ICUNotifier {
}
boolean debug = false;
if (debug) System.out.println("Service: " + name + " key: " + key);
if (debug) System.out.println("Service: " + name + " key: " + key.canonicalID());
CacheEntry result = null;
if (key != null) {
@ -400,12 +402,15 @@ public class ICUService extends ICUNotifier {
Map cache = null;
SoftReference cref = cacheref; // copy so we don't need to sync on this
if (cref != null) {
if (debug) System.out.println("Service " + name + " ref exists");
cache = (Map)cref.get();
}
if (cache == null) {
if (debug) System.out.println("Service " + name + " cache was empty");
// synchronized since additions and queries on the cache must be atomic
// they can be interleaved, though
cache = Collections.synchronizedMap(new HashMap());
// hardRef = cache; // debug
cref = new SoftReference(cache);
}
@ -477,6 +482,7 @@ public class ICUService extends ICUNotifier {
if (result != null) {
if (putInCache) {
if (debug) System.out.println("caching '" + result.actualDescriptor + "'");
cache.put(result.actualDescriptor, result);
if (cacheDescriptorList != null) {
Iterator iter = cacheDescriptorList.iterator();
@ -635,19 +641,19 @@ public class ICUService extends ICUNotifier {
public String getDisplayName(String id, Locale locale) {
Map m = getVisibleIDMap();
Factory f = (Factory)m.get(id);
if (f != null) {
return f.getDisplayName(id, locale);
}
if (f != null) {
return f.getDisplayName(id, locale);
}
Key key = createKey(id);
while (key.fallback()) {
f = (Factory)m.get(key.currentID());
if (f != null) {
return f.getDisplayName(id, locale);
}
}
return null;
Key key = createKey(id);
while (key.fallback()) {
f = (Factory)m.get(key.currentID());
if (f != null) {
return f.getDisplayName(id, locale);
}
}
return null;
}
/**