mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-15 01:42:37 +00:00
ICU-1949 icuservice
X-SVN-Rev: 10365
This commit is contained in:
Doug Felt
parent
9d30c08f22
commit
f194e6800b
5 changed files with 168 additions and 171 deletions
|
|
@ -333,14 +333,12 @@ public:
|
|||
return ((BreakIterator*)instance)->clone();
|
||||
}
|
||||
|
||||
// not currently called because ICUBreakIteratorFactory is always registered and always handles the local
|
||||
// eventually
|
||||
virtual UObject* handleDefault(const ICUServiceKey& key, UnicodeString* actualID, UErrorCode& status) const {
|
||||
LocaleKey& lkey = (LocaleKey&)key;
|
||||
int32_t kind = lkey.kind();
|
||||
Locale loc;
|
||||
lkey.currentLocale(loc);
|
||||
return BreakIterator::makeInstance(loc, kind, status); // default to root
|
||||
return BreakIterator::makeInstance(loc, kind, status);
|
||||
}
|
||||
|
||||
virtual UBool isDefault() const {
|
||||
|
|
|
|||
|
|
@ -354,9 +354,17 @@ LocaleKeyFactory::updateVisibleIDs(Hashtable& result, UErrorCode& status) const
|
|||
|
||||
UnicodeString&
|
||||
LocaleKeyFactory::getDisplayName(const UnicodeString& id, const Locale& locale, UnicodeString& result) const {
|
||||
Locale loc;
|
||||
LocaleUtility::initLocaleFromName(id, loc);
|
||||
return loc.getDisplayName(locale, result);
|
||||
if ((_coverage & 0x1) == 0) {
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
const Hashtable* ids = getSupportedIDs(status);
|
||||
if (ids && (ids->get(id) != NULL)) {
|
||||
Locale loc;
|
||||
LocaleUtility::initLocaleFromName(id, loc);
|
||||
return loc.getDisplayName(locale, result);
|
||||
}
|
||||
}
|
||||
result.setToBogus();
|
||||
return result;
|
||||
}
|
||||
|
||||
UObject*
|
||||
|
|
@ -516,8 +524,8 @@ ICULocaleService::ICULocaleService()
|
|||
{
|
||||
}
|
||||
|
||||
ICULocaleService::ICULocaleService(const UnicodeString& name)
|
||||
: ICUService(name)
|
||||
ICULocaleService::ICULocaleService(const UnicodeString& dname)
|
||||
: ICUService(dname)
|
||||
, fallbackLocale(Locale::getDefault())
|
||||
, llock(0)
|
||||
{
|
||||
|
|
@ -634,7 +642,7 @@ ICULocaleService::registerInstance(UObject* objToAdopt, const UnicodeString& loc
|
|||
}
|
||||
#endif
|
||||
|
||||
class ServiceEnumeration : public StringEnumeration {
|
||||
class ServiceEnumeration : public UMemory, public StringEnumeration {
|
||||
private:
|
||||
const ICULocaleService* _service;
|
||||
int32_t _timestamp;
|
||||
|
|
@ -750,6 +758,7 @@ public:
|
|||
_service->getVisibleIDs(_ids, status);
|
||||
}
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
StringEnumeration*
|
||||
|
|
|
|||
|
|
@ -218,6 +218,11 @@ public:
|
|||
INVISIBLE = 1
|
||||
};
|
||||
|
||||
/**
|
||||
* Destructor.
|
||||
*/
|
||||
virtual ~LocaleKeyFactory();
|
||||
|
||||
protected:
|
||||
/**
|
||||
* Constructor used by subclasses.
|
||||
|
|
@ -229,11 +234,6 @@ protected:
|
|||
*/
|
||||
LocaleKeyFactory(int32_t coverage, const UnicodeString& name);
|
||||
|
||||
/**
|
||||
* Destructor.
|
||||
*/
|
||||
virtual ~LocaleKeyFactory();
|
||||
|
||||
/**
|
||||
* Implement superclass abstract method. This checks the currentID of
|
||||
* the key against the supported IDs, and passes the canonicalLocale and
|
||||
|
|
@ -437,6 +437,8 @@ class U_COMMON_API ICULocaleService : public ICUService
|
|||
|
||||
#if 0
|
||||
// redeclare because of overload resolution rules?
|
||||
// no, causes ambiguities since both UnicodeString and Locale have constructors that take a const char*
|
||||
// need some compiler flag to remove warnings
|
||||
UObject* get(const UnicodeString& descriptor, UErrorCode& status) const {
|
||||
return ICUService::get(descriptor, status);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -567,8 +567,8 @@ ICUService::ICUService()
|
|||
{
|
||||
}
|
||||
|
||||
ICUService::ICUService(const UnicodeString& name)
|
||||
: name(name)
|
||||
ICUService::ICUService(const UnicodeString& newName)
|
||||
: name(newName)
|
||||
, lock(0)
|
||||
, timestamp(0)
|
||||
, factories(NULL)
|
||||
|
|
@ -962,12 +962,12 @@ ICUService::getDisplayNames(UVector& result,
|
|||
while (entry = m->nextElement(pos)) {
|
||||
const UnicodeString* id = (const UnicodeString*)entry->key.pointer;
|
||||
ICUServiceFactory* f = (ICUServiceFactory*)entry->value.pointer;
|
||||
UnicodeString name;
|
||||
f->getDisplayName(*id, locale, name);
|
||||
if (name.isBogus()) {
|
||||
UnicodeString dname;
|
||||
f->getDisplayName(*id, locale, dname);
|
||||
if (dname.isBogus()) {
|
||||
status = U_MEMORY_ALLOCATION_ERROR;
|
||||
} else {
|
||||
dnCache->cache.put(name, (void*)id, status); // share pointer with visibleIDMap
|
||||
dnCache->cache.put(dname, (void*)id, status); // share pointer with visibleIDMap
|
||||
if (U_SUCCESS(status)) {
|
||||
continue;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,17 +35,20 @@ class ICUNSubclass : public ICUNotifier {
|
|||
};
|
||||
|
||||
class LKFSubclass : public LocaleKeyFactory {
|
||||
Hashtable table;
|
||||
|
||||
public:
|
||||
LKFSubclass(UBool visible)
|
||||
: LocaleKeyFactory(visible ? VISIBLE : INVISIBLE)
|
||||
: LocaleKeyFactory(visible ? VISIBLE : INVISIBLE, "LKFSubclass")
|
||||
{
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
table.put("en_US", this, status);
|
||||
}
|
||||
|
||||
protected:
|
||||
virtual const Hashtable* getSupportedIDs(UErrorCode& status) const {
|
||||
// return Collections.EMPTY_SET;
|
||||
return NULL;
|
||||
}
|
||||
virtual const Hashtable* getSupportedIDs(UErrorCode &status) const {
|
||||
return &table;
|
||||
}
|
||||
};
|
||||
|
||||
class Integer : public UObject {
|
||||
|
|
@ -1164,12 +1167,17 @@ void ICUServiceTest::testLocale() {
|
|||
|
||||
class WrapFactory : public ICUServiceFactory {
|
||||
public:
|
||||
static const UnicodeString& greetingID;
|
||||
static const UnicodeString& getGreetingID() {
|
||||
if (greetingID == NULL) {
|
||||
greetingID = new UnicodeString("greeting");
|
||||
}
|
||||
return *greetingID;
|
||||
}
|
||||
|
||||
UObject* create(const ICUServiceKey& key, const ICUService* service, UErrorCode& status) const {
|
||||
if (U_SUCCESS(status)) {
|
||||
UnicodeString temp;
|
||||
if (key.currentID(temp).compare(greetingID) == 0) {
|
||||
if (key.currentID(temp).compare(getGreetingID()) == 0) {
|
||||
UnicodeString* previous = (UnicodeString*)service->getKey((ICUServiceKey&)key, NULL, this, status);
|
||||
if (previous) {
|
||||
previous->insert(0, "A different greeting: \"");
|
||||
|
|
@ -1207,9 +1215,10 @@ class WrapFactory : public ICUServiceFactory {
|
|||
|
||||
private:
|
||||
static const char fgClassID;
|
||||
static UnicodeString* greetingID;
|
||||
};
|
||||
|
||||
const UnicodeString& WrapFactory::greetingID = UnicodeString("greeting");
|
||||
UnicodeString* WrapFactory::greetingID = NULL;
|
||||
const char WrapFactory::fgClassID = '\0';
|
||||
|
||||
void
|
||||
|
|
@ -1243,172 +1252,151 @@ ICUServiceTest::testWrapFactory()
|
|||
// misc coverage tests
|
||||
void ICUServiceTest::testCoverage()
|
||||
{
|
||||
#if 0
|
||||
// ICUServiceKey
|
||||
ICUServiceKey key = new ICUServiceKey("foobar");
|
||||
logln("ID: " + key.id());
|
||||
logln("canonicalID: " + key.canonicalID());
|
||||
logln("currentID: " + key.currentID());
|
||||
logln("has fallback: " + key.fallback());
|
||||
// ICUServiceKey
|
||||
{
|
||||
UnicodeString temp;
|
||||
ICUServiceKey key("foobar");
|
||||
logln("ID: " + key.getID());
|
||||
logln("canonicalID: " + key.canonicalID(temp));
|
||||
logln("currentID: " + key.currentID(temp.remove()));
|
||||
logln("has fallback: " + UnicodeString(key.fallback() ? "true" : "false"));
|
||||
|
||||
// SimpleFactory
|
||||
Object obj = new Object();
|
||||
SimpleFactory sf = new SimpleFactory(obj, "object");
|
||||
try {
|
||||
sf = new SimpleFactory(null, null);
|
||||
errln("didn't throw exception");
|
||||
if (key.getDynamicClassID() != ICUServiceKey::getStaticClassID()) {
|
||||
errln("service key rtt failed.");
|
||||
}
|
||||
catch (IllegalArgumentException e) {
|
||||
logln("OK: " + e.getMessage());
|
||||
}
|
||||
|
||||
// SimpleFactory
|
||||
{
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
|
||||
UnicodeString* obj = new UnicodeString("An Object");
|
||||
SimpleFactory* sf = new SimpleFactory(obj, "object");
|
||||
|
||||
UnicodeString temp;
|
||||
logln(sf->getDisplayName("object", Locale::getDefault(), temp));
|
||||
|
||||
if (sf->getDynamicClassID() != SimpleFactory::getStaticClassID()) {
|
||||
errln("simple factory rtti failed.");
|
||||
}
|
||||
catch (Exception e) {
|
||||
errln("threw wrong exception" + e);
|
||||
}
|
||||
logln(sf.getDisplayName("object", null));
|
||||
|
||||
// ICUService
|
||||
ICUService service = new ICUService();
|
||||
service.registerFactory(sf);
|
||||
TestStringService service;
|
||||
service.registerFactory(sf, status);
|
||||
|
||||
try {
|
||||
service.get(null, null);
|
||||
errln("didn't throw exception");
|
||||
}
|
||||
catch (NullPointerException e) {
|
||||
logln("OK: " + e.getMessage());
|
||||
}
|
||||
/*
|
||||
catch (Exception e) {
|
||||
errln("threw wrong exception" + e);
|
||||
{
|
||||
UnicodeString* result = (UnicodeString*)service.get("object", status);
|
||||
if (result) {
|
||||
logln("object is: " + *result);
|
||||
delete result;
|
||||
} else {
|
||||
errln("could not get object");
|
||||
}
|
||||
*/
|
||||
try {
|
||||
service.registerFactory(null);
|
||||
errln("didn't throw exception");
|
||||
}
|
||||
catch (NullPointerException e) {
|
||||
logln("OK: " + e.getMessage());
|
||||
}
|
||||
catch (Exception e) {
|
||||
errln("threw wrong exception" + e);
|
||||
}
|
||||
|
||||
// ICULocaleService
|
||||
|
||||
// LocaleKey
|
||||
{
|
||||
UnicodeString primary("en_US");
|
||||
UnicodeString fallback("ja_JP");
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
LocaleKey* key = LocaleKey::createWithCanonicalFallback(&primary, &fallback, status);
|
||||
|
||||
if (key->getDynamicClassID() != LocaleKey::getStaticClassID()) {
|
||||
errln("localekey rtti error");
|
||||
}
|
||||
|
||||
try {
|
||||
service.unregister(null);
|
||||
errln("didn't throw exception");
|
||||
if (!key->isFallbackOf("en_US_FOOBAR")) {
|
||||
errln("localekey should be fallback for en_US_FOOBAR");
|
||||
}
|
||||
catch (NullPointerException e) {
|
||||
logln("OK: " + e.getMessage());
|
||||
if (!key->isFallbackOf("en_US")) {
|
||||
errln("localekey should be fallback for en_US");
|
||||
}
|
||||
catch (Exception e) {
|
||||
errln("threw wrong exception" + e);
|
||||
if (key->isFallbackOf("en")) {
|
||||
errln("localekey should not be fallback for en");
|
||||
}
|
||||
|
||||
logln("object is: " + service.get("object"));
|
||||
|
||||
logln("stats: " + service.stats());
|
||||
|
||||
// ICURWLock
|
||||
|
||||
ICURWLock rwlock = new ICURWLock();
|
||||
rwlock.acquireRead();
|
||||
rwlock.releaseRead();
|
||||
|
||||
rwlock.acquireWrite();
|
||||
rwlock.releaseWrite();
|
||||
logln("stats: " + rwlock.getStats());
|
||||
logln("stats: " + rwlock.clearStats());
|
||||
rwlock.acquireRead();
|
||||
rwlock.releaseRead();
|
||||
rwlock.acquireWrite();
|
||||
rwlock.releaseWrite();
|
||||
logln("stats: " + rwlock.getStats());
|
||||
|
||||
try {
|
||||
rwlock.releaseRead();
|
||||
errln("no error thrown");
|
||||
}
|
||||
catch (InternalError e) {
|
||||
logln("OK: " + e.getMessage());
|
||||
}
|
||||
|
||||
try {
|
||||
rwlock.releaseWrite();
|
||||
errln("no error thrown");
|
||||
}
|
||||
catch (InternalError e) {
|
||||
logln("OK: " + e.getMessage());
|
||||
}
|
||||
|
||||
// ICULocaleService
|
||||
|
||||
// LocaleKey
|
||||
|
||||
// LocaleKey lkey = LocaleKey.create("en_US", "ja_JP");
|
||||
// lkey = LocaleKey.create(null, null);
|
||||
LocaleKey lkey = LocaleKey.createWithCanonicalFallback("en_US", "ja_JP");
|
||||
logln("lkey: " + lkey);
|
||||
|
||||
lkey = LocaleKey.createWithCanonicalFallback(null, null);
|
||||
logln("lkey from null,null: " + lkey);
|
||||
do {
|
||||
Locale loc;
|
||||
logln(UnicodeString("current locale: ") + key->currentLocale(loc).getName());
|
||||
logln(UnicodeString("canonical locale: ") + key->canonicalLocale(loc).getName());
|
||||
logln(UnicodeString("is fallback of en: ") + (key->isFallbackOf("en") ? "true" : " false"));
|
||||
} while (key->fallback());
|
||||
delete key;
|
||||
|
||||
// LocaleKeyFactory
|
||||
LocaleKeyFactory lkf = new LKFSubclass(false);
|
||||
logln("lkf: " + lkf);
|
||||
logln("obj: " + lkf.create(lkey, null));
|
||||
logln(lkf.getDisplayName("foo", null));
|
||||
logln(lkf.getDisplayName("bar", null));
|
||||
lkf.updateVisibleIDs(new HashMap());
|
||||
key = LocaleKey::createWithCanonicalFallback(&primary, &fallback, status);
|
||||
|
||||
LocaleKeyFactory invisibleLKF = new LKFSubclass(false);
|
||||
logln("obj: " + invisibleLKF.create(lkey, null));
|
||||
logln(invisibleLKF.getDisplayName("foo", null));
|
||||
logln(invisibleLKF.getDisplayName("bar", null));
|
||||
invisibleLKF.updateVisibleIDs(new HashMap());
|
||||
UnicodeString result;
|
||||
LKFSubclass lkf(true); // empty
|
||||
Hashtable table;
|
||||
|
||||
// ResourceBundleFactory
|
||||
ICUResourceBundleFactory rbf = new ICUResourceBundleFactory();
|
||||
logln("RB: " + rbf.create(lkey, null));
|
||||
|
||||
// ICUNotifier
|
||||
ICUNotifier nf = new ICUNSubclass();
|
||||
try {
|
||||
nf.addListener(null);
|
||||
errln("added null listener");
|
||||
}
|
||||
catch (NullPointerException e) {
|
||||
logln(e.getMessage());
|
||||
}
|
||||
catch (Exception e) {
|
||||
errln("got wrong exception");
|
||||
UObject *obj = lkf.create(*key, NULL, status);
|
||||
logln("obj: " + UnicodeString(obj ? "obj" : "null"));
|
||||
logln(lkf.getDisplayName("en_US", Locale::getDefault(), result));
|
||||
lkf.updateVisibleIDs(table, status);
|
||||
delete obj;
|
||||
if (table.count() != 1) {
|
||||
errln("visible IDs does not contain en_US");
|
||||
}
|
||||
|
||||
try {
|
||||
nf.addListener(new WrongListener());
|
||||
errln("added wrong listener");
|
||||
}
|
||||
catch (InternalError e) {
|
||||
logln(e.getMessage());
|
||||
}
|
||||
catch (Exception e) {
|
||||
errln("got wrong exception");
|
||||
LKFSubclass invisibleLKF(false);
|
||||
obj = lkf.create(*key, NULL, status);
|
||||
logln("obj: " + UnicodeString(obj ? "obj" : "null"));
|
||||
logln(invisibleLKF.getDisplayName("en_US", Locale::getDefault(), result.remove()));
|
||||
invisibleLKF.updateVisibleIDs(table, status);
|
||||
if (table.count() != 0) {
|
||||
errln("visible IDs contains en_US");
|
||||
}
|
||||
delete obj;
|
||||
}
|
||||
|
||||
try {
|
||||
nf.removeListener(null);
|
||||
errln("removed null listener");
|
||||
}
|
||||
catch (NullPointerException e) {
|
||||
logln(e.getMessage());
|
||||
}
|
||||
catch (Exception e) {
|
||||
errln("got wrong exception");
|
||||
}
|
||||
#if 0
|
||||
// ResourceBundleFactory
|
||||
ICUResourceBundleFactory rbf = new ICUResourceBundleFactory();
|
||||
logln("RB: " + rbf.create(lkey, null));
|
||||
|
||||
nf.removeListener(new MyListener());
|
||||
nf.notifyChanged();
|
||||
nf.addListener(new MyListener());
|
||||
nf.removeListener(new MyListener());
|
||||
// ICUNotifier
|
||||
ICUNotifier nf = new ICUNSubclass();
|
||||
try {
|
||||
nf.addListener(null);
|
||||
errln("added null listener");
|
||||
}
|
||||
catch (NullPointerException e) {
|
||||
logln(e.getMessage());
|
||||
}
|
||||
catch (Exception e) {
|
||||
errln("got wrong exception");
|
||||
}
|
||||
|
||||
try {
|
||||
nf.addListener(new WrongListener());
|
||||
errln("added wrong listener");
|
||||
}
|
||||
catch (InternalError e) {
|
||||
logln(e.getMessage());
|
||||
}
|
||||
catch (Exception e) {
|
||||
errln("got wrong exception");
|
||||
}
|
||||
|
||||
try {
|
||||
nf.removeListener(null);
|
||||
errln("removed null listener");
|
||||
}
|
||||
catch (NullPointerException e) {
|
||||
logln(e.getMessage());
|
||||
}
|
||||
catch (Exception e) {
|
||||
errln("got wrong exception");
|
||||
}
|
||||
|
||||
nf.removeListener(new MyListener());
|
||||
nf.notifyChanged();
|
||||
nf.addListener(new MyListener());
|
||||
nf.removeListener(new MyListener());
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue