diff --git a/icu4j/src/com/ibm/icu/dev/test/normalizer/ExhaustiveTest.java b/icu4j/src/com/ibm/icu/dev/test/normalizer/ExhaustiveTest.java
index df97c35c8a..e177a520b3 100755
--- a/icu4j/src/com/ibm/icu/dev/test/normalizer/ExhaustiveTest.java
+++ b/icu4j/src/com/ibm/icu/dev/test/normalizer/ExhaustiveTest.java
@@ -5,8 +5,8 @@
  *******************************************************************************
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/normalizer/Attic/ExhaustiveTest.java,v $ 
- * $Date: 2000/07/12 16:43:38 $ 
- * $Revision: 1.5 $
+ * $Date: 2000/07/13 21:26:01 $ 
+ * $Revision: 1.6 $
  *
  *****************************************************************************************
  */
@@ -29,7 +29,7 @@ public class ExhaustiveTest extends TestFmwk
         for (int i = 0; i < args.length; i++)
         {
             if (args[i].equals("-data")) {
-                tempInfo = new UInfo(args[++i]);
+                tempInfo = new UInfo(args[++i], args[++i]);
             } else {
                 tempArgs[count++] = args[i];
             }
diff --git a/icu4j/src/com/ibm/icu/dev/tool/normalizer/NormalizerBuilder.java b/icu4j/src/com/ibm/icu/dev/tool/normalizer/NormalizerBuilder.java
index cf160fb28e..cf299d5c7d 100755
--- a/icu4j/src/com/ibm/icu/dev/tool/normalizer/NormalizerBuilder.java
+++ b/icu4j/src/com/ibm/icu/dev/tool/normalizer/NormalizerBuilder.java
@@ -5,8 +5,8 @@
  *******************************************************************************
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/normalizer/Attic/NormalizerBuilder.java,v $ 
- * $Date: 2000/07/12 16:49:22 $ 
- * $Revision: 1.5 $
+ * $Date: 2000/07/13 21:25:51 $ 
+ * $Revision: 1.6 $
  *
  *****************************************************************************************
  */
@@ -66,7 +66,7 @@ public final class NormalizerBuilder
         for (int i = 0; i < args.length; i++)
         {
             if (args[i].equals("-data")) {
-                uinfo = new UInfo(args[++i]);
+                uinfo = new UInfo(args[++i], args[++i]);
             }
             else if (args[i].equals("-write")) {
                 fWriteData = true;
@@ -372,11 +372,12 @@ public final class NormalizerBuilder
             if (category == uinfo.SURROGATE) continue;
 
             boolean canon = uinfo.hasCanonicalDecomposition(ch);
+            boolean compat = uinfo.hasCompatibilityDecomposition(ch);
 
-            if (uinfo.hasCanonicalDecomposition(ch)) canonCount++;
-            if (uinfo.hasCompatibilityDecomposition(ch)) compatCount++;
+            if (canon) canonCount++;
+            if (compat) compatCount++;
 
-            if (canon || uinfo.hasCompatibilityDecomposition(ch)) {
+            if (canon || compat) {
                 String decomp = uinfo.getFullDecomposition(ch, canon);
                 temp.setLength(0);
                 temp.append(decomp);
diff --git a/icu4j/src/com/ibm/test/normalizer/ExhaustiveTest.java b/icu4j/src/com/ibm/test/normalizer/ExhaustiveTest.java
index 2a100fb3b5..5911f95a43 100755
--- a/icu4j/src/com/ibm/test/normalizer/ExhaustiveTest.java
+++ b/icu4j/src/com/ibm/test/normalizer/ExhaustiveTest.java
@@ -5,8 +5,8 @@
  *******************************************************************************
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/test/normalizer/Attic/ExhaustiveTest.java,v $ 
- * $Date: 2000/07/12 16:43:38 $ 
- * $Revision: 1.5 $
+ * $Date: 2000/07/13 21:26:01 $ 
+ * $Revision: 1.6 $
  *
  *****************************************************************************************
  */
@@ -29,7 +29,7 @@ public class ExhaustiveTest extends TestFmwk
         for (int i = 0; i < args.length; i++)
         {
             if (args[i].equals("-data")) {
-                tempInfo = new UInfo(args[++i]);
+                tempInfo = new UInfo(args[++i], args[++i]);
             } else {
                 tempArgs[count++] = args[i];
             }
diff --git a/icu4j/src/com/ibm/tools/normalizer/NormalizerBuilder.java b/icu4j/src/com/ibm/tools/normalizer/NormalizerBuilder.java
index 1951d3d30b..922966bc44 100755
--- a/icu4j/src/com/ibm/tools/normalizer/NormalizerBuilder.java
+++ b/icu4j/src/com/ibm/tools/normalizer/NormalizerBuilder.java
@@ -5,8 +5,8 @@
  *******************************************************************************
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/tools/normalizer/Attic/NormalizerBuilder.java,v $ 
- * $Date: 2000/07/12 16:49:22 $ 
- * $Revision: 1.5 $
+ * $Date: 2000/07/13 21:25:51 $ 
+ * $Revision: 1.6 $
  *
  *****************************************************************************************
  */
@@ -66,7 +66,7 @@ public final class NormalizerBuilder
         for (int i = 0; i < args.length; i++)
         {
             if (args[i].equals("-data")) {
-                uinfo = new UInfo(args[++i]);
+                uinfo = new UInfo(args[++i], args[++i]);
             }
             else if (args[i].equals("-write")) {
                 fWriteData = true;
@@ -372,11 +372,12 @@ public final class NormalizerBuilder
             if (category == uinfo.SURROGATE) continue;
 
             boolean canon = uinfo.hasCanonicalDecomposition(ch);
+            boolean compat = uinfo.hasCompatibilityDecomposition(ch);
 
-            if (uinfo.hasCanonicalDecomposition(ch)) canonCount++;
-            if (uinfo.hasCompatibilityDecomposition(ch)) compatCount++;
+            if (canon) canonCount++;
+            if (compat) compatCount++;
 
-            if (canon || uinfo.hasCompatibilityDecomposition(ch)) {
+            if (canon || compat) {
                 String decomp = uinfo.getFullDecomposition(ch, canon);
                 temp.setLength(0);
                 temp.append(decomp);