diff --git a/icu4j/src/com/ibm/icu/text/LowercaseTransliterator.java b/icu4j/src/com/ibm/icu/text/LowercaseTransliterator.java index cf83919c207..3fb12731d42 100755 --- a/icu4j/src/com/ibm/icu/text/LowercaseTransliterator.java +++ b/icu4j/src/com/ibm/icu/text/LowercaseTransliterator.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/LowercaseTransliterator.java,v $ - * $Date: 2001/06/29 22:49:52 $ - * $Revision: 1.2 $ + * $Date: 2001/10/17 17:43:03 $ + * $Revision: 1.3 $ * ***************************************************************************************** */ @@ -29,7 +29,7 @@ public class LowercaseTransliterator extends TransformTransliterator { */ static void register() { Transliterator.registerFactory(_ID, new Transliterator.Factory() { - public Transliterator getInstance() { + public Transliterator getInstance(String ID) { return new LowercaseTransliterator(); } }); diff --git a/icu4j/src/com/ibm/icu/text/NameUnicodeTransliterator.java b/icu4j/src/com/ibm/icu/text/NameUnicodeTransliterator.java index 992917eae2e..05c6c2cf294 100755 --- a/icu4j/src/com/ibm/icu/text/NameUnicodeTransliterator.java +++ b/icu4j/src/com/ibm/icu/text/NameUnicodeTransliterator.java @@ -3,8 +3,8 @@ * others. All Rights Reserved. * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/NameUnicodeTransliterator.java,v $ - * $Date: 2001/09/28 20:27:02 $ - * $Revision: 1.2 $ + * $Date: 2001/10/17 17:43:03 $ + * $Revision: 1.3 $ */ package com.ibm.text; import java.util.*; @@ -25,7 +25,7 @@ public class NameUnicodeTransliterator extends Transliterator { */ static void register() { Transliterator.registerFactory(_ID, new Transliterator.Factory() { - public Transliterator getInstance() { + public Transliterator getInstance(String ID) { return new NameUnicodeTransliterator(null); } }); diff --git a/icu4j/src/com/ibm/icu/text/NormalizationTransliterator.java b/icu4j/src/com/ibm/icu/text/NormalizationTransliterator.java index 32bdf435056..fa4bd7a8dc3 100755 --- a/icu4j/src/com/ibm/icu/text/NormalizationTransliterator.java +++ b/icu4j/src/com/ibm/icu/text/NormalizationTransliterator.java @@ -13,7 +13,7 @@ import java.util.*; /* * @author Alan Liu - * @version $RCSfile: NormalizationTransliterator.java,v $ $Revision: 1.4 $ $Date: 2001/10/04 20:10:30 $ + * @version $RCSfile: NormalizationTransliterator.java,v $ $Revision: 1.5 $ $Date: 2001/10/17 17:43:03 $ */ public class NormalizationTransliterator extends Transliterator { @@ -32,25 +32,25 @@ public class NormalizationTransliterator extends Transliterator { */ static void register() { Transliterator.registerFactory("Any-NFC", new Transliterator.Factory() { - public Transliterator getInstance() { + public Transliterator getInstance(String ID) { return NormalizationTransliterator. getInstance(Normalizer.COMPOSE); } }); Transliterator.registerFactory("Any-NFD", new Transliterator.Factory() { - public Transliterator getInstance() { + public Transliterator getInstance(String ID) { return NormalizationTransliterator. getInstance(Normalizer.DECOMP); } }); Transliterator.registerFactory("Any-NFKC", new Transliterator.Factory() { - public Transliterator getInstance() { + public Transliterator getInstance(String ID) { return NormalizationTransliterator. getInstance(Normalizer.COMPOSE_COMPAT); } }); Transliterator.registerFactory("Any-NFKD", new Transliterator.Factory() { - public Transliterator getInstance() { + public Transliterator getInstance(String ID) { return NormalizationTransliterator. getInstance(Normalizer.DECOMP_COMPAT); } diff --git a/icu4j/src/com/ibm/icu/text/TitlecaseTransliterator.java b/icu4j/src/com/ibm/icu/text/TitlecaseTransliterator.java index b8905afe3cc..930d531af00 100755 --- a/icu4j/src/com/ibm/icu/text/TitlecaseTransliterator.java +++ b/icu4j/src/com/ibm/icu/text/TitlecaseTransliterator.java @@ -3,8 +3,8 @@ * others. All Rights Reserved. * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/TitlecaseTransliterator.java,v $ - * $Date: 2001/09/28 20:27:02 $ - * $Revision: 1.2 $ + * $Date: 2001/10/17 17:43:03 $ + * $Revision: 1.3 $ */ package com.ibm.text; import java.util.*; @@ -25,7 +25,7 @@ public class TitlecaseTransliterator extends Transliterator { */ static void register() { Transliterator.registerFactory(_ID, new Transliterator.Factory() { - public Transliterator getInstance() { + public Transliterator getInstance(String ID) { return new TitlecaseTransliterator(); } }); diff --git a/icu4j/src/com/ibm/icu/text/Transliterator.java b/icu4j/src/com/ibm/icu/text/Transliterator.java index a061ef6149b..8e85daf06b5 100755 --- a/icu4j/src/com/ibm/icu/text/Transliterator.java +++ b/icu4j/src/com/ibm/icu/text/Transliterator.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/Transliterator.java,v $ - * $Date: 2001/10/10 20:26:27 $ - * $Revision: 1.47 $ + * $Date: 2001/10/17 17:43:03 $ + * $Revision: 1.48 $ * ***************************************************************************************** */ @@ -241,7 +241,7 @@ import com.ibm.util.CaseInsensitiveString; *
Copyright © IBM Corporation 1999. All rights reserved. * * @author Alan Liu - * @version $RCSfile: Transliterator.java,v $ $Revision: 1.47 $ $Date: 2001/10/10 20:26:27 $ + * @version $RCSfile: Transliterator.java,v $ $Revision: 1.48 $ $Date: 2001/10/17 17:43:03 $ */ public abstract class Transliterator { /** @@ -1596,9 +1596,13 @@ public abstract class Transliterator { /** * The factory interface for transliterators. Transliterator * subclasses can register factory objects for IDs using the - * registerFactory() method of Transliterator. + * registerFactory() method of Transliterator. When invoked, the + * factory object will be passed the ID being instantiated. This + * makes it possible to register one factory method to more than + * one ID, or for a factory method to parameterize its result + * based on the variant. */ public static interface Factory { - Transliterator getInstance(); + Transliterator getInstance(String ID); } } diff --git a/icu4j/src/com/ibm/icu/text/TransliteratorRegistry.java b/icu4j/src/com/ibm/icu/text/TransliteratorRegistry.java index 6486902257c..91b4b83c913 100755 --- a/icu4j/src/com/ibm/icu/text/TransliteratorRegistry.java +++ b/icu4j/src/com/ibm/icu/text/TransliteratorRegistry.java @@ -825,7 +825,7 @@ class TransliteratorRegistry { aliasReturn.append(((AliasEntry) entry).alias); return null; } else if (entry instanceof Transliterator.Factory) { - return ((Transliterator.Factory) entry).getInstance(); + return ((Transliterator.Factory) entry).getInstance(ID); } else if (entry instanceof CompoundRBTEntry) { return ((CompoundRBTEntry) entry).getInstance(); } diff --git a/icu4j/src/com/ibm/icu/text/UnicodeNameTransliterator.java b/icu4j/src/com/ibm/icu/text/UnicodeNameTransliterator.java index 5bf6b7b0e83..7df6bead1e8 100755 --- a/icu4j/src/com/ibm/icu/text/UnicodeNameTransliterator.java +++ b/icu4j/src/com/ibm/icu/text/UnicodeNameTransliterator.java @@ -3,8 +3,8 @@ * others. All Rights Reserved. * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/UnicodeNameTransliterator.java,v $ - * $Date: 2001/09/28 20:24:09 $ - * $Revision: 1.2 $ + * $Date: 2001/10/17 17:43:03 $ + * $Revision: 1.3 $ */ package com.ibm.text; import java.util.*; @@ -25,7 +25,7 @@ public class UnicodeNameTransliterator extends Transliterator { */ static void register() { Transliterator.registerFactory(_ID, new Transliterator.Factory() { - public Transliterator getInstance() { + public Transliterator getInstance(String ID) { return new UnicodeNameTransliterator(null); } }); diff --git a/icu4j/src/com/ibm/icu/text/UppercaseTransliterator.java b/icu4j/src/com/ibm/icu/text/UppercaseTransliterator.java index 81935748663..c95e012c602 100755 --- a/icu4j/src/com/ibm/icu/text/UppercaseTransliterator.java +++ b/icu4j/src/com/ibm/icu/text/UppercaseTransliterator.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/text/UppercaseTransliterator.java,v $ - * $Date: 2001/06/29 22:50:25 $ - * $Revision: 1.2 $ + * $Date: 2001/10/17 17:43:03 $ + * $Revision: 1.3 $ * ***************************************************************************************** */ @@ -29,7 +29,7 @@ public class UppercaseTransliterator extends TransformTransliterator { */ static void register() { Transliterator.registerFactory(_ID, new Transliterator.Factory() { - public Transliterator getInstance() { + public Transliterator getInstance(String ID) { return new UppercaseTransliterator(); } }); diff --git a/icu4j/src/com/ibm/text/LowercaseTransliterator.java b/icu4j/src/com/ibm/text/LowercaseTransliterator.java index 98dd5c03c96..19bcf9fd847 100755 --- a/icu4j/src/com/ibm/text/LowercaseTransliterator.java +++ b/icu4j/src/com/ibm/text/LowercaseTransliterator.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/text/Attic/LowercaseTransliterator.java,v $ - * $Date: 2001/06/29 22:49:52 $ - * $Revision: 1.2 $ + * $Date: 2001/10/17 17:43:03 $ + * $Revision: 1.3 $ * ***************************************************************************************** */ @@ -29,7 +29,7 @@ public class LowercaseTransliterator extends TransformTransliterator { */ static void register() { Transliterator.registerFactory(_ID, new Transliterator.Factory() { - public Transliterator getInstance() { + public Transliterator getInstance(String ID) { return new LowercaseTransliterator(); } }); diff --git a/icu4j/src/com/ibm/text/NameUnicodeTransliterator.java b/icu4j/src/com/ibm/text/NameUnicodeTransliterator.java index 55322ddbe43..213b32520f4 100755 --- a/icu4j/src/com/ibm/text/NameUnicodeTransliterator.java +++ b/icu4j/src/com/ibm/text/NameUnicodeTransliterator.java @@ -3,8 +3,8 @@ * others. All Rights Reserved. * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/text/Attic/NameUnicodeTransliterator.java,v $ - * $Date: 2001/09/28 20:27:02 $ - * $Revision: 1.2 $ + * $Date: 2001/10/17 17:43:03 $ + * $Revision: 1.3 $ */ package com.ibm.text; import java.util.*; @@ -25,7 +25,7 @@ public class NameUnicodeTransliterator extends Transliterator { */ static void register() { Transliterator.registerFactory(_ID, new Transliterator.Factory() { - public Transliterator getInstance() { + public Transliterator getInstance(String ID) { return new NameUnicodeTransliterator(null); } }); diff --git a/icu4j/src/com/ibm/text/NormalizationTransliterator.java b/icu4j/src/com/ibm/text/NormalizationTransliterator.java index 32bdf435056..fa4bd7a8dc3 100755 --- a/icu4j/src/com/ibm/text/NormalizationTransliterator.java +++ b/icu4j/src/com/ibm/text/NormalizationTransliterator.java @@ -13,7 +13,7 @@ import java.util.*; /* * @author Alan Liu - * @version $RCSfile: NormalizationTransliterator.java,v $ $Revision: 1.4 $ $Date: 2001/10/04 20:10:30 $ + * @version $RCSfile: NormalizationTransliterator.java,v $ $Revision: 1.5 $ $Date: 2001/10/17 17:43:03 $ */ public class NormalizationTransliterator extends Transliterator { @@ -32,25 +32,25 @@ public class NormalizationTransliterator extends Transliterator { */ static void register() { Transliterator.registerFactory("Any-NFC", new Transliterator.Factory() { - public Transliterator getInstance() { + public Transliterator getInstance(String ID) { return NormalizationTransliterator. getInstance(Normalizer.COMPOSE); } }); Transliterator.registerFactory("Any-NFD", new Transliterator.Factory() { - public Transliterator getInstance() { + public Transliterator getInstance(String ID) { return NormalizationTransliterator. getInstance(Normalizer.DECOMP); } }); Transliterator.registerFactory("Any-NFKC", new Transliterator.Factory() { - public Transliterator getInstance() { + public Transliterator getInstance(String ID) { return NormalizationTransliterator. getInstance(Normalizer.COMPOSE_COMPAT); } }); Transliterator.registerFactory("Any-NFKD", new Transliterator.Factory() { - public Transliterator getInstance() { + public Transliterator getInstance(String ID) { return NormalizationTransliterator. getInstance(Normalizer.DECOMP_COMPAT); } diff --git a/icu4j/src/com/ibm/text/TitlecaseTransliterator.java b/icu4j/src/com/ibm/text/TitlecaseTransliterator.java index 2baa3664097..8f0ac52e14a 100755 --- a/icu4j/src/com/ibm/text/TitlecaseTransliterator.java +++ b/icu4j/src/com/ibm/text/TitlecaseTransliterator.java @@ -3,8 +3,8 @@ * others. All Rights Reserved. * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/text/TitlecaseTransliterator.java,v $ - * $Date: 2001/09/28 20:27:02 $ - * $Revision: 1.2 $ + * $Date: 2001/10/17 17:43:03 $ + * $Revision: 1.3 $ */ package com.ibm.text; import java.util.*; @@ -25,7 +25,7 @@ public class TitlecaseTransliterator extends Transliterator { */ static void register() { Transliterator.registerFactory(_ID, new Transliterator.Factory() { - public Transliterator getInstance() { + public Transliterator getInstance(String ID) { return new TitlecaseTransliterator(); } }); diff --git a/icu4j/src/com/ibm/text/Transliterator.java b/icu4j/src/com/ibm/text/Transliterator.java index 0b50d2805cd..a8e5e0f843e 100755 --- a/icu4j/src/com/ibm/text/Transliterator.java +++ b/icu4j/src/com/ibm/text/Transliterator.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/text/Attic/Transliterator.java,v $ - * $Date: 2001/10/10 20:26:27 $ - * $Revision: 1.47 $ + * $Date: 2001/10/17 17:43:03 $ + * $Revision: 1.48 $ * ***************************************************************************************** */ @@ -241,7 +241,7 @@ import com.ibm.util.CaseInsensitiveString; *
Copyright © IBM Corporation 1999. All rights reserved. * * @author Alan Liu - * @version $RCSfile: Transliterator.java,v $ $Revision: 1.47 $ $Date: 2001/10/10 20:26:27 $ + * @version $RCSfile: Transliterator.java,v $ $Revision: 1.48 $ $Date: 2001/10/17 17:43:03 $ */ public abstract class Transliterator { /** @@ -1596,9 +1596,13 @@ public abstract class Transliterator { /** * The factory interface for transliterators. Transliterator * subclasses can register factory objects for IDs using the - * registerFactory() method of Transliterator. + * registerFactory() method of Transliterator. When invoked, the + * factory object will be passed the ID being instantiated. This + * makes it possible to register one factory method to more than + * one ID, or for a factory method to parameterize its result + * based on the variant. */ public static interface Factory { - Transliterator getInstance(); + Transliterator getInstance(String ID); } } diff --git a/icu4j/src/com/ibm/text/TransliteratorRegistry.java b/icu4j/src/com/ibm/text/TransliteratorRegistry.java index 6486902257c..91b4b83c913 100755 --- a/icu4j/src/com/ibm/text/TransliteratorRegistry.java +++ b/icu4j/src/com/ibm/text/TransliteratorRegistry.java @@ -825,7 +825,7 @@ class TransliteratorRegistry { aliasReturn.append(((AliasEntry) entry).alias); return null; } else if (entry instanceof Transliterator.Factory) { - return ((Transliterator.Factory) entry).getInstance(); + return ((Transliterator.Factory) entry).getInstance(ID); } else if (entry instanceof CompoundRBTEntry) { return ((CompoundRBTEntry) entry).getInstance(); } diff --git a/icu4j/src/com/ibm/text/UnicodeNameTransliterator.java b/icu4j/src/com/ibm/text/UnicodeNameTransliterator.java index 525ba03cad1..c74203843e3 100755 --- a/icu4j/src/com/ibm/text/UnicodeNameTransliterator.java +++ b/icu4j/src/com/ibm/text/UnicodeNameTransliterator.java @@ -3,8 +3,8 @@ * others. All Rights Reserved. * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/text/Attic/UnicodeNameTransliterator.java,v $ - * $Date: 2001/09/28 20:24:09 $ - * $Revision: 1.2 $ + * $Date: 2001/10/17 17:43:03 $ + * $Revision: 1.3 $ */ package com.ibm.text; import java.util.*; @@ -25,7 +25,7 @@ public class UnicodeNameTransliterator extends Transliterator { */ static void register() { Transliterator.registerFactory(_ID, new Transliterator.Factory() { - public Transliterator getInstance() { + public Transliterator getInstance(String ID) { return new UnicodeNameTransliterator(null); } }); diff --git a/icu4j/src/com/ibm/text/UppercaseTransliterator.java b/icu4j/src/com/ibm/text/UppercaseTransliterator.java index 74b0237c353..e5893772962 100755 --- a/icu4j/src/com/ibm/text/UppercaseTransliterator.java +++ b/icu4j/src/com/ibm/text/UppercaseTransliterator.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/text/Attic/UppercaseTransliterator.java,v $ - * $Date: 2001/06/29 22:50:25 $ - * $Revision: 1.2 $ + * $Date: 2001/10/17 17:43:03 $ + * $Revision: 1.3 $ * ***************************************************************************************** */ @@ -29,7 +29,7 @@ public class UppercaseTransliterator extends TransformTransliterator { */ static void register() { Transliterator.registerFactory(_ID, new Transliterator.Factory() { - public Transliterator getInstance() { + public Transliterator getInstance(String ID) { return new UppercaseTransliterator(); } });