organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 06:53:45 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-2203 Java version of NumberFormat registration

Browse source 
X-SVN-Rev: 11162
This commit is contained in:
Doug Felt 2003-02-25 23:39:44 +00:00
parent 07a8be151c
commit 76aa91b7db
5 changed files with 299 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
icu4j/src/com/ibm/icu/dev/test/format/NumberFormatRegistrationTest.java Normal file
View file

@ -0,0 +1,72 @@
/*
*******************************************************************************
* Copyright (C) 2003, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatRegistrationTest.java,v $
* $Date: 2003/02/25 23:39:44 $
* $Revision: 1.1 $
*******************************************************************************
*/
package com.ibm.icu.dev.test.format;
import com.ibm.icu.text.*;
import com.ibm.icu.text.NumberFormat.*;
import java.util.Locale;
public class NumberFormatRegistrationTest extends com.ibm.icu.dev.test.TestFmwk {
public static void main(String[] args) {
new NumberFormatRegistrationTest().run(args);
}
public void TestRegistration() {
final Locale SRC_LOC = Locale.FRANCE;
final Locale SWAP_LOC = Locale.US;
class TestFactory extends SimpleNumberFormatFactory {
NumberFormat currencyStyle;
TestFactory() {
super(SRC_LOC, true);
currencyStyle = NumberFormat.getIntegerInstance(SWAP_LOC);
}
public NumberFormat createFormat(Locale loc, int formatType) {
if (formatType == FORMAT_CURRENCY) {
return currencyStyle;
}
return null;
}
}
NumberFormat f0 = NumberFormat.getIntegerInstance(SWAP_LOC);
NumberFormat f1 = NumberFormat.getIntegerInstance(SRC_LOC);
NumberFormat f2 = NumberFormat.getCurrencyInstance(SRC_LOC);
Object key = NumberFormat.registerFactory(new TestFactory());
NumberFormat f3 = NumberFormat.getCurrencyInstance(SRC_LOC);
NumberFormat f4 = NumberFormat.getIntegerInstance(SRC_LOC);
NumberFormat.unregister(key); // restore for other tests
NumberFormat f5 = NumberFormat.getCurrencyInstance(SRC_LOC);
float n = 1234.567f;
logln("f0 swap int: " + f0.format(n));
logln("f1 src int: " + f1.format(n));
logln("f2 src cur: " + f2.format(n));
logln("f3 reg cur: " + f3.format(n));
logln("f4 reg int: " + f4.format(n));
logln("f5 unreg cur: " + f5.format(n));
if (!f3.format(n).equals(f0.format(n))) {
errln("registered service did not match");
}
if (!f4.format(n).equals(f1.format(n))) {
errln("registered service did not inherit");
}
if (!f5.format(n).equals(f2.format(n))) {
errln("unregistered service did not match original");
}
}
}

56
icu4j/src/com/ibm/icu/dev/test/format/NumberFormatTest.java
View file

@ -4,8 +4,8 @@
* others. All Rights Reserved. *
*******************************************************************************
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/NumberFormatTest.java,v $
* $Date: 2002/11/20 19:48:09 $
* $Revision: 1.9 $
* $Date: 2003/02/25 23:39:43 $
* $Revision: 1.10 $
*
*****************************************************************************************
*/
@ -19,7 +19,9 @@ package com.ibm.icu.dev.test.format;
import com.ibm.icu.lang.*;
import com.ibm.icu.text.*;
import com.ibm.icu.text.NumberFormat.*;
import com.ibm.icu.util.*;
import java.util.Locale;
import java.text.ParsePosition;
import java.text.ParseException;
@ -791,7 +793,55 @@ public class NumberFormatTest extends com.ibm.icu.dev.test.TestFmwk {
// 12 34567890123456
expectPat(fmt, "AA*^#,###,##0.00ZZ");
}
public void TestRegistration() {
final Locale SRC_LOC = Locale.FRANCE;
final Locale SWAP_LOC = Locale.US;
class TestFactory extends SimpleNumberFormatFactory {
NumberFormat currencyStyle;
TestFactory() {
super(SRC_LOC, true);
currencyStyle = NumberFormat.getIntegerInstance(SWAP_LOC);
}
public NumberFormat createFormat(Locale loc, int formatType) {
if (formatType == FORMAT_CURRENCY) {
return currencyStyle;
}
return null;
}
}
NumberFormat f0 = NumberFormat.getIntegerInstance(SWAP_LOC);
NumberFormat f1 = NumberFormat.getIntegerInstance(SRC_LOC);
NumberFormat f2 = NumberFormat.getCurrencyInstance(SRC_LOC);
Object key = NumberFormat.registerFactory(new TestFactory());
NumberFormat f3 = NumberFormat.getCurrencyInstance(SRC_LOC);
NumberFormat f4 = NumberFormat.getIntegerInstance(SRC_LOC);
NumberFormat.unregister(key); // restore for other tests
NumberFormat f5 = NumberFormat.getCurrencyInstance(SRC_LOC);
float n = 1234.567f;
logln("f0 swap int: " + f0.format(n));
logln("f1 src int: " + f1.format(n));
logln("f2 src cur: " + f2.format(n));
logln("f3 reg cur: " + f3.format(n));
logln("f4 reg int: " + f4.format(n));
logln("f5 unreg cur: " + f5.format(n));
if (!f3.format(n).equals(f0.format(n))) {
errln("registered service did not match");
}
if (!f4.format(n).equals(f1.format(n))) {
errln("registered service did not inherit");
}
if (!f5.format(n).equals(f2.format(n))) {
errln("unregistered service did not match original");
}
}
public void expectPad(DecimalFormat fmt, String pat, int pos) {
expectPad(fmt, pat, pos, 0, (char)0);
}

5
icu4j/src/com/ibm/icu/dev/test/format/TestAll.java
View file

@ -5,8 +5,8 @@
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/format/TestAll.java,v $
* $Date: 2003/02/05 05:45:16 $
* $Revision: 1.2 $
* $Date: 2003/02/25 23:39:43 $
* $Revision: 1.3 $
*
*******************************************************************************
*/
@ -49,6 +49,7 @@ public class TestAll extends TestGroup {
"IntlTestNumberFormat",
"IntlTestNumberFormatAPI",
"NumberFormatTest",
"NumberFormatRegistrationTest",
"NumberFormatRoundTripTest",
"NumberRegression",
"NumberFormatRegressionTest",

130
icu4j/src/com/ibm/icu/text/NumberFormat.java
View file

@ -5,8 +5,8 @@
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/NumberFormat.java,v $
* $Date: 2002/12/11 23:36:58 $
* $Revision: 1.22 $
* $Date: 2003/02/25 23:39:44 $
* $Revision: 1.23 $
*
*****************************************************************************************
*/
@ -28,11 +28,6 @@ import java.util.ResourceBundle;
import java.util.Set;
import com.ibm.icu.impl.ICULocaleData;
import com.ibm.icu.impl.ICUService;
import com.ibm.icu.impl.ICUService.Factory;
import com.ibm.icu.impl.ICULocaleService;
import com.ibm.icu.impl.ICULocaleService.ICUResourceBundleFactory;
import com.ibm.icu.impl.ICULocaleService.LocaleKeyFactory;
import com.ibm.icu.impl.LocaleUtility;
/**
@ -506,9 +501,15 @@ public abstract class NumberFormat extends Format{
}
// ===== Factory stuff =====
///CLOVER:OFF
/* @prototype */
/* public */ static abstract class NumberFormatFactory {
/**
* A NumberFormatFactory is used to register new number formats. The factory
* should be able to create any of the predefined formats for each locale it
* supports. When registered, the locales it supports extend or override the
* locale already supported by ICU.
*
* @prototype
*/
public static abstract class NumberFormatFactory {
public static final int FORMAT_NUMBER = NUMBERSTYLE;
public static final int FORMAT_CURRENCY = CURRENCYSTYLE;
public static final int FORMAT_PERCENT = PERCENTSTYLE;
@ -516,7 +517,10 @@ public abstract class NumberFormat extends Format{
public static final int FORMAT_INTEGER = INTEGERSTYLE;
/**
* Return true if this factory will be visible. Default is true. */
* Return true if this factory will be visible. Default is true.
* If not visible, the locales supported by this factory will not
* be listed by getAvailableLocales.
*/
public boolean visible() {
return true;
}
@ -529,14 +533,18 @@ public abstract class NumberFormat extends Format{
/**
* Return a number format of the appropriate type. If the locale
* is not supported, return null. All the defined types must be
* supported.
* is not supported, return null. If the locale is supported, but
* the type is not provided by this service, return null. Otherwise
* return an appropriate instance of NumberFormat.
*/
public abstract NumberFormat createFormat(Locale loc, int formatType);
}
/* @prototype */
/* public */ static abstract class SimpleNumberFormatFactory extends NumberFormatFactory {
/**
* A NumberFormatFactory that supports a single locale. It can be visible or invisible.
* @prototype
*/
public static abstract class SimpleNumberFormatFactory extends NumberFormatFactory {
final Set localeNames;
final boolean visible;
@ -558,48 +566,52 @@ public abstract class NumberFormat extends Format{
}
}
private static final class NFFactory extends LocaleKeyFactory {
private NumberFormatFactory delegate;
NFFactory(NumberFormatFactory delegate) {
super(delegate.visible() ? VISIBLE : INVISIBLE);
this.delegate = delegate;
}
protected Object handleCreate(Locale loc, int kind, ICUService service) {
return delegate.createFormat(loc, kind);
}
protected Set getSupportedIDs() {
return delegate.getSupportedLocaleNames();
}
// shim so we can build without service code
static abstract class NumberFormatShim {
abstract Locale[] getAvailableLocales();
abstract Object registerFactory(NumberFormatFactory f);
abstract boolean unregister(Object k);
abstract NumberFormat createInstance(Locale l, int k);
}
///CLOVER:ON
private static NumberFormatShim shim;
private static NumberFormatShim getShim() {
if (shim == null) {
try {
Class cls = Class.forName("com.ibm.icu.text.NumberFormatServiceShim");
shim = (NumberFormatShim)cls.newInstance();
}
catch (Exception e) {
e.printStackTrace();
throw new RuntimeException(e.getMessage());
}
}
return shim;
}
/**
* Get the set of Locales for which NumberFormats are installed
* @return available locales
* @stable ICU 2.0
*/
public static Locale[] getAvailableLocales() {
if (service == null) {
if (shim == null) {
return ICULocaleData.getAvailableLocales();
} else {
return service.getAvailableLocales();
}
return getShim().getAvailableLocales();
}
///CLOVER:OFF
/**
* Registers a new NumberFormat for the provided locale of the defined
* type. The returned object is a key that can be used to unregister this
* NumberFormat object.
* @prototype
*/
/* public */ static Object register(NumberFormatFactory factory) {
public static Object registerFactory(NumberFormatFactory factory) {
if (factory == null) {
throw new IllegalArgumentException("factory must not be null");
}
return getService().registerFactory(new NFFactory(factory));
return getShim().registerFactory(factory);
}
/**
@ -607,35 +619,18 @@ public abstract class NumberFormat extends Format{
* registerInstance).
* @prototype
*/
/* public */ static boolean unregister(Object registryKey) {
if (service == null) {
return false;
} else {
return service.unregisterFactory((Factory)registryKey);
public static boolean unregister(Object registryKey) {
if (registryKey == null) {
throw new IllegalArgumentException("registryKey must not be null");
}
if (shim == null) {
return false;
}
return shim.unregister(registryKey);
}
private static ICULocaleService service = null;
private static ICULocaleService getService() {
if (service == null) {
class RBNumberFormatFactory extends ICUResourceBundleFactory {
protected Object handleCreate(Locale loc, int kind, ICUService service) {
return createInstance(loc, kind);
}
}
ICULocaleService newService = new ICULocaleService("NumberFormat");
newService.registerFactory(new RBNumberFormatFactory());
synchronized (NumberFormat.class) {
if (service == null) {
service = newService;
}
}
}
return service;
}
///CLOVER:OFF
// ===== End of factory stuff =====
/**
@ -813,16 +808,15 @@ public abstract class NumberFormat extends Format{
// Hook for service
private static NumberFormat getInstance(Locale desiredLocale, int choice) {
if (service == null) {
if (shim == null) {
return createInstance(desiredLocale, choice);
} else {
NumberFormat result = (NumberFormat)service.get(desiredLocale, choice);
return (NumberFormat)result.clone();
return getShim().createInstance(desiredLocale, choice);
}
}
// [NEW]
private static NumberFormat createInstance(Locale desiredLocale,
static NumberFormat createInstance(Locale desiredLocale,
int choice) {
String pattern = getPattern(desiredLocale, choice);
DecimalFormatSymbols symbols = new DecimalFormatSymbols(desiredLocale);

109
icu4j/src/com/ibm/icu/text/NumberFormatServiceShim.java Normal file
View file

@ -0,0 +1,109 @@
/*
*******************************************************************************
* Copyright (C) 2003, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/NumberFormatServiceShim.java,v $
* $Date: 2003/02/25 23:39:44 $
* $Revision: 1.1 $
*
*******************************************************************************
*/
package com.ibm.icu.text;
import java.util.Locale;
import java.util.Set;
import com.ibm.icu.impl.ICULocaleData;
import com.ibm.icu.impl.ICUService;
import com.ibm.icu.impl.ICUService.Factory;
import com.ibm.icu.impl.ICUService.Key;
import com.ibm.icu.impl.ICULocaleService;
import com.ibm.icu.impl.ICULocaleService.ICUResourceBundleFactory;
import com.ibm.icu.impl.ICULocaleService.LocaleKey;
import com.ibm.icu.impl.ICULocaleService.LocaleKeyFactory;
import com.ibm.icu.text.NumberFormat;
import com.ibm.icu.text.NumberFormat.NumberFormatFactory;
class NumberFormatServiceShim extends NumberFormat.NumberFormatShim {
Locale[] getAvailableLocales() {
if (service == null) {
return ICULocaleData.getAvailableLocales();
} else {
return service.getAvailableLocales();
}
}
private static final class NFFactory extends LocaleKeyFactory {
private NumberFormatFactory delegate;
NFFactory(NumberFormatFactory delegate) {
super(delegate.visible() ? VISIBLE : INVISIBLE);
this.delegate = delegate;
}
public Object create(Key key, ICUService service) {
if (handlesKey(key)) {
LocaleKey lkey = (LocaleKey)key;
Locale loc = lkey.canonicalLocale();
int kind = lkey.kind();
Object result = delegate.createFormat(loc, kind);
if (result == null) {
result = service.getKey(key, null, this);
}
return result;
}
return null;
}
protected Set getSupportedIDs() {
return delegate.getSupportedLocaleNames();
}
}
Object registerFactory(NumberFormatFactory factory) {
return getService().registerFactory(new NFFactory(factory));
}
boolean unregister(Object registryKey) {
if (service == null) {
return false;
} else {
return service.unregisterFactory((Factory)registryKey);
}
}
NumberFormat createInstance(Locale desiredLocale, int choice) {
if (service == null) {
return NumberFormat.createInstance(desiredLocale, choice);
}
NumberFormat result = (NumberFormat)service.get(desiredLocale, choice);
return (NumberFormat)result.clone();
}
private ICULocaleService service = null;
private ICULocaleService getService() {
if (service == null) {
class RBNumberFormatFactory extends ICUResourceBundleFactory {
protected Object handleCreate(Locale loc, int kind, ICUService service) {
return NumberFormat.createInstance(loc, kind);
}
}
ICULocaleService newService = new ICULocaleService("NumberFormat");
newService.registerFactory(new RBNumberFormatFactory());
synchronized (NumberFormatServiceShim.class) {
if (service == null) {
service = newService;
}
}
}
return service;
}
}