ICU-9644 use public Normalizer2 factory methods

X-SVN-Rev: 36402

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/UCharacterProperty.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/UCharacterProperty.java
index 010682564f5c0adb2c61db39d11bfd21d7130a77..5683ce8b5e71dca45680e4bdc68c72b022d25f11 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/UCharacterProperty.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/UCharacterProperty.java
@@ -18,6 +18,7 @@ import com.ibm.icu.lang.UCharacter.NumericType;
 import com.ibm.icu.lang.UCharacterCategory;
 import com.ibm.icu.lang.UProperty;
 import com.ibm.icu.lang.UScript;
+import com.ibm.icu.text.Normalizer2;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
 import com.ibm.icu.util.ICUException;
@@ -489,7 +490,7 @@ public final class UCharacterProperty
         new IntProperty(0, BLOCK_MASK_, BLOCK_SHIFT_),
         new CombiningClassIntProperty(SRC_NFC) {  // CANONICAL_COMBINING_CLASS
             int getValue(int c) {
-                return Norm2AllModes.getNFCInstance().decomp.getCombiningClass(c);
+                return Normalizer2.getNFDInstance().getCombiningClass(c);
             }
         },
         new IntProperty(2, DECOMPOSITION_TYPE_MASK_, 0),

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/lang/UCharacter.java b/icu4j/main/classes/core/src/com/ibm/icu/lang/UCharacter.java
index 0d9b520b2f7bba7670c39b60b0086b65193850ea..c451f1e84b15598532bc2d0aa190ede8e388f8c0 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/lang/UCharacter.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/lang/UCharacter.java
@@ -26,6 +26,7 @@ import com.ibm.icu.impl.UPropertyAliases;
 import com.ibm.icu.lang.UCharacterEnums.ECharacterCategory;
 import com.ibm.icu.lang.UCharacterEnums.ECharacterDirection;
 import com.ibm.icu.text.BreakIterator;
+import com.ibm.icu.text.Normalizer2;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.util.RangeValueIterator;
 import com.ibm.icu.util.ULocale;
@@ -4207,7 +4208,7 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection
      */
     public static int getCombiningClass(int ch)
     {
-        return Norm2AllModes.getNFCInstance().decomp.getCombiningClass(ch);
+        return Normalizer2.getNFDInstance().getCombiningClass(ch);
     }
 
     /**

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/Normalizer.java b/icu4j/main/classes/core/src/com/ibm/icu/text/Normalizer.java
index c1a83e243bf5b35d33a446af8d6642ee040928c1..3cf1f92abdf15de1885a06766dde591b0764b6de 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/Normalizer.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/Normalizer.java
@@ -149,24 +149,19 @@ public final class Normalizer implements Cloneable {
         private final Normalizer2 normalizer2;
     }
     private static final class NFDModeImpl {
-        private static final ModeImpl INSTANCE =
-            new ModeImpl(Norm2AllModes.getNFCInstance().decomp);
+        private static final ModeImpl INSTANCE = new ModeImpl(Normalizer2.getNFDInstance());
     }
     private static final class NFKDModeImpl {
-        private static final ModeImpl INSTANCE =
-            new ModeImpl(Norm2AllModes.getNFKCInstance().decomp);
+        private static final ModeImpl INSTANCE = new ModeImpl(Normalizer2.getNFKDInstance());
     }
     private static final class NFCModeImpl {
-        private static final ModeImpl INSTANCE =
-            new ModeImpl(Norm2AllModes.getNFCInstance().comp);
+        private static final ModeImpl INSTANCE = new ModeImpl(Normalizer2.getNFCInstance());
     }
     private static final class NFKCModeImpl {
-        private static final ModeImpl INSTANCE =
-            new ModeImpl(Norm2AllModes.getNFKCInstance().comp);
+        private static final ModeImpl INSTANCE = new ModeImpl(Normalizer2.getNFKCInstance());
     }
     private static final class FCDModeImpl {
-        private static final ModeImpl INSTANCE =
-            new ModeImpl(Norm2AllModes.getFCDNormalizer2());
+        private static final ModeImpl INSTANCE = new ModeImpl(Norm2AllModes.getFCDNormalizer2());
     }
 
     private static final class Unicode32 {
@@ -174,22 +169,22 @@ public final class Normalizer implements Cloneable {
     }
     private static final class NFD32ModeImpl {
         private static final ModeImpl INSTANCE =
-            new ModeImpl(new FilteredNormalizer2(Norm2AllModes.getNFCInstance().decomp,
+            new ModeImpl(new FilteredNormalizer2(Normalizer2.getNFDInstance(),
                                                  Unicode32.INSTANCE));
     }
     private static final class NFKD32ModeImpl {
         private static final ModeImpl INSTANCE =
-            new ModeImpl(new FilteredNormalizer2(Norm2AllModes.getNFKCInstance().decomp,
+            new ModeImpl(new FilteredNormalizer2(Normalizer2.getNFKDInstance(),
                                                  Unicode32.INSTANCE));
     }
     private static final class NFC32ModeImpl {
         private static final ModeImpl INSTANCE =
-            new ModeImpl(new FilteredNormalizer2(Norm2AllModes.getNFCInstance().comp,
+            new ModeImpl(new FilteredNormalizer2(Normalizer2.getNFCInstance(),
                                                  Unicode32.INSTANCE));
     }
     private static final class NFKC32ModeImpl {
         private static final ModeImpl INSTANCE =
-            new ModeImpl(new FilteredNormalizer2(Norm2AllModes.getNFKCInstance().comp,
+            new ModeImpl(new FilteredNormalizer2(Normalizer2.getNFKCInstance(),
                                                  Unicode32.INSTANCE));
     }
     private static final class FCD32ModeImpl {
@@ -875,8 +870,7 @@ public final class Normalizer implements Cloneable {
      */
     public static String normalize(int char32, Mode mode, int options) {
         if(mode == NFD && options == 0) {
-            String decomposition =
-                Norm2AllModes.getNFCInstance().impl.getDecomposition(char32);
+            String decomposition = Normalizer2.getNFCInstance().getDecomposition(char32);
             if(decomposition == null) {
                 decomposition = UTF16.valueOf(char32);
             }

diff --git a/icu4j/main/classes/translit/src/com/ibm/icu/text/NormalizationTransliterator.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/NormalizationTransliterator.java
index 02ae4c2dd3493f2e6f205be81c8e11af21cbb159..36dab9a1ee8a0dc6b6e20d2c8232d357e266ba28 100644 (file)
--- a/icu4j/main/classes/translit/src/com/ibm/icu/text/NormalizationTransliterator.java
+++ b/icu4j/main/classes/translit/src/com/ibm/icu/text/NormalizationTransliterator.java
@@ -1,6 +1,6 @@
 /*
  **********************************************************************
- *   Copyright (C) 2001-2010, International Business Machines
+ *   Copyright (C) 2001-2014, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  **********************************************************************
  *   Date        Name        Description
@@ -27,38 +27,32 @@ final class NormalizationTransliterator extends Transliterator {
     static void register() {
         Transliterator.registerFactory("Any-NFC", new Transliterator.Factory() {
             public Transliterator getInstance(String ID) {
-                return new NormalizationTransliterator(
-                        "NFC", Norm2AllModes.getNFCInstance().comp);
+                return new NormalizationTransliterator("NFC", Normalizer2.getNFCInstance());
             }
         });
         Transliterator.registerFactory("Any-NFD", new Transliterator.Factory() {
             public Transliterator getInstance(String ID) {
-                return new NormalizationTransliterator(
-                        "NFD", Norm2AllModes.getNFCInstance().decomp);
+                return new NormalizationTransliterator("NFD", Normalizer2.getNFDInstance());
             }
         });
         Transliterator.registerFactory("Any-NFKC", new Transliterator.Factory() {
             public Transliterator getInstance(String ID) {
-                return new NormalizationTransliterator(
-                        "NFKC", Norm2AllModes.getNFKCInstance().comp);
+                return new NormalizationTransliterator("NFKC", Normalizer2.getNFKCInstance());
             }
         });
         Transliterator.registerFactory("Any-NFKD", new Transliterator.Factory() {
             public Transliterator getInstance(String ID) {
-                return new NormalizationTransliterator(
-                        "NFKD", Norm2AllModes.getNFKCInstance().decomp);
+                return new NormalizationTransliterator("NFKD", Normalizer2.getNFKDInstance());
             }
         });
         Transliterator.registerFactory("Any-FCD", new Transliterator.Factory() {
             public Transliterator getInstance(String ID) {
-                return new NormalizationTransliterator(
-                        "FCD", Norm2AllModes.getFCDNormalizer2());
+                return new NormalizationTransliterator("FCD", Norm2AllModes.getFCDNormalizer2());
             }
         });
         Transliterator.registerFactory("Any-FCC", new Transliterator.Factory() {
             public Transliterator getInstance(String ID) {
-                return new NormalizationTransliterator(
-                        "FCC", Norm2AllModes.getNFCInstance().fcc);
+                return new NormalizationTransliterator("FCC", Norm2AllModes.getNFCInstance().fcc);
             }
         });
         Transliterator.registerSpecialInverse("NFC", "NFD", true);