diff --git a/icu4j/src/com/ibm/icu/dev/test/util/BNF.java b/icu4j/src/com/ibm/icu/dev/test/util/BNF.java
index edda1c6a4c6..71283e2156c 100644
--- a/icu4j/src/com/ibm/icu/dev/test/util/BNF.java
+++ b/icu4j/src/com/ibm/icu/dev/test/util/BNF.java
@@ -5,14 +5,13 @@
  *******************************************************************************
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/util/BNF.java,v $
- * $Date: 2003/11/21 01:03:38 $
- * $Revision: 1.1 $
+ * $Date: 2003/12/17 04:55:28 $
+ * $Revision: 1.2 $
  *
  *****************************************************************************************
  */
 package com.ibm.icu.dev.test.util;
 
-import java.text.ParsePosition;
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.Set;
@@ -20,10 +19,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 
-import com.ibm.icu.text.SymbolTable;
-import com.ibm.icu.text.UnicodeMatcher;
 import com.ibm.icu.text.UnicodeSet;
-import com.ibm.icu.text.UTF16;
 import java.util.Random;
 
 public class BNF {
@@ -155,8 +151,8 @@ public class BNF {
     
     private boolean addRule() {
         int type = t.next();
-        if (type == t.DONE) return false;
-        if (type != t.STRING) error("missing weight");
+        if (type == Tokenizer.DONE) return false;
+        if (type != Tokenizer.STRING) error("missing weight");
         String s = t.getString();
         if (s.length() == 0 || s.charAt(0) != '$') error("missing $ in variable");
         if (t.next() != '=') error("missing =");
@@ -207,14 +203,14 @@ public class BNF {
                 weights = getWeights();
                 return Pick.repeat(1, maxRepeat, weights, item);
             case '{':
-                if (t.next() != t.NUMBER) error("missing number");
+                if (t.next() != Tokenizer.NUMBER) error("missing number");
                 int start = (int) t.getNumber();
                 int end = start;
                 type = t.next();
                 if (type == ',') {
                     end = maxRepeat;
                     type = t.next();
-                    if (type == t.NUMBER) {
+                    if (type == Tokenizer.NUMBER) {
                         end = (int)t.getNumber();
                         type = t.next();
                     }
@@ -229,12 +225,12 @@ public class BNF {
     
     Pick getCore() {
         int token = t.next();
-        if (token == t.STRING) {
+        if (token == Tokenizer.STRING) {
             String s = t.getString();
             if (s.charAt(0) == '$') variables.add(s);
             return Pick.string(s);
         }
-        if (token == t.UNICODESET) {
+        if (token == Tokenizer.UNICODESET) {
             return Pick.codePoint(t.getUnicodeSet());            
         }
         if (token != '(') {
@@ -304,7 +300,7 @@ public class BNF {
     int getWeight() {       
         int weight;
         int token = t.next();
-        if (token != t.NUMBER) {
+        if (token != Tokenizer.NUMBER) {
             t.backup();
             return NO_WEIGHT;
         }
diff --git a/icu4j/src/com/ibm/icu/dev/test/util/BagFormatter.java b/icu4j/src/com/ibm/icu/dev/test/util/BagFormatter.java
index bb8c63f004a..f872257d4b5 100644
--- a/icu4j/src/com/ibm/icu/dev/test/util/BagFormatter.java
+++ b/icu4j/src/com/ibm/icu/dev/test/util/BagFormatter.java
@@ -5,8 +5,8 @@
  *******************************************************************************
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/util/BagFormatter.java,v $
- * $Date: 2003/11/21 19:10:43 $
- * $Revision: 1.2 $
+ * $Date: 2003/12/17 04:55:27 $
+ * $Revision: 1.3 $
  *
  *****************************************************************************************
  */
@@ -14,7 +14,6 @@ package com.ibm.icu.dev.test.util;
 
 import com.ibm.icu.text.*;
 import com.ibm.icu.lang.*;
-import com.ibm.icu.util.*;
 import com.ibm.icu.impl.*;
 
 import java.io.*;
@@ -150,7 +149,7 @@ public class BagFormatter {
      * @internal
      */
     public void showSetNames(String filename, String title, Object c) throws IOException {
-        PrintWriter pw = new PrintWriter(
+      /*  PrintWriter pw = */new PrintWriter(
             new OutputStreamWriter(
                 new FileOutputStream(filename),"utf-8"));
     }
diff --git a/icu4j/src/com/ibm/icu/dev/test/util/Pick.java b/icu4j/src/com/ibm/icu/dev/test/util/Pick.java
index c620dd31657..a7fa42310f6 100644
--- a/icu4j/src/com/ibm/icu/dev/test/util/Pick.java
+++ b/icu4j/src/com/ibm/icu/dev/test/util/Pick.java
@@ -5,15 +5,14 @@
  *******************************************************************************
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/util/Pick.java,v $
- * $Date: 2003/11/21 01:03:38 $
- * $Revision: 1.1 $
+ * $Date: 2003/12/17 04:55:28 $
+ * $Revision: 1.2 $
  *
  *****************************************************************************************
  */
 package com.ibm.icu.dev.test.util;
 
 import com.ibm.icu.text.UnicodeSet;
-import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.impl.Utility;
 
@@ -22,10 +21,6 @@ import java.util.Random;
 import java.util.Arrays;
 import java.util.Set;
 import java.util.HashSet;
-import java.text.ParsePosition;
-import java.text.ParseException;
-import java.util.Map;
-import java.util.HashMap;
 
 abstract public class Pick {
     private static boolean DEBUG = false;
@@ -218,7 +213,7 @@ abstract public class Pick {
                 throw new ArrayIndexOutOfBoundsException(
                     "or lengths must be equal: " + newItems.length + " != " + itemWeights.length);
             }
-            int lastLen = this.items.length;
+           // int lastLen = this.items.length;
             addInternal(newItems);
             weightedIndex.add(itemWeights);
             return this; // for chaining
@@ -277,7 +272,7 @@ abstract public class Pick {
         }
         */
         protected void addTo(Target target) {
-            int count ;
+            //int count ;
             for (int i = weightedIndex.toIndex(target.nextDouble()); i > 0; --i) {
                 item.addTo(target);
             }
diff --git a/icu4j/src/com/ibm/icu/dev/test/util/TestBNF.java b/icu4j/src/com/ibm/icu/dev/test/util/TestBNF.java
index f1b6df2490a..35840c1464b 100644
--- a/icu4j/src/com/ibm/icu/dev/test/util/TestBNF.java
+++ b/icu4j/src/com/ibm/icu/dev/test/util/TestBNF.java
@@ -5,14 +5,13 @@
  *******************************************************************************
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/util/TestBNF.java,v $
- * $Date: 2003/11/21 01:03:39 $
- * $Revision: 1.1 $
+ * $Date: 2003/12/17 04:55:28 $
+ * $Revision: 1.2 $
  *
  *****************************************************************************************
  */
 package com.ibm.icu.dev.test.util;
 
-import java.text.ParseException;
 import java.util.Random;
 
 //TODO integrate this into the test framework
@@ -237,7 +236,7 @@ public class TestBNF {
             System.out.println();
             System.out.println("Input: " + t.getSource());
             int type = 0;
-            while (type != t.DONE) {
+            while (type != Tokenizer.DONE) {
                 type = t.next();
                 System.out.println(t.toString(type, false));
             }
diff --git a/icu4j/src/com/ibm/icu/dev/test/util/TestBagFormatter.java b/icu4j/src/com/ibm/icu/dev/test/util/TestBagFormatter.java
index 00c46cfeff9..0401245139a 100644
--- a/icu4j/src/com/ibm/icu/dev/test/util/TestBagFormatter.java
+++ b/icu4j/src/com/ibm/icu/dev/test/util/TestBagFormatter.java
@@ -5,8 +5,8 @@
  *******************************************************************************
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/util/TestBagFormatter.java,v $
- * $Date: 2003/11/21 19:10:43 $
- * $Revision: 1.2 $
+ * $Date: 2003/12/17 04:55:27 $
+ * $Revision: 1.3 $
  *
  *****************************************************************************************
  */
@@ -16,23 +16,15 @@ package com.ibm.icu.dev.test.util;
 
 import java.util.TreeSet;
 import java.util.Iterator;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.text.Collator;
 import java.util.Locale;
-
-import java.io.*;
-import java.util.Random;
-import java.text.ParseException;
 import java.util.Set;
-import java.util.Iterator;
-import java.util.TreeSet;
-import java.util.Locale;
-//import java.util.regex.*;
-
-import com.ibm.icu.text.*;
 
 import com.ibm.icu.lang.UScript;
 import com.ibm.icu.lang.UProperty;
-import com.ibm.icu.lang.UCharacter;
+import com.ibm.icu.text.Transliterator;
 import com.ibm.icu.text.UnicodeSet;
 
 public class TestBagFormatter {
diff --git a/icu4j/src/com/ibm/icu/dev/test/util/Tokenizer.java b/icu4j/src/com/ibm/icu/dev/test/util/Tokenizer.java
index dd1d2756259..3bdfdbeff48 100644
--- a/icu4j/src/com/ibm/icu/dev/test/util/Tokenizer.java
+++ b/icu4j/src/com/ibm/icu/dev/test/util/Tokenizer.java
@@ -5,8 +5,8 @@
  *******************************************************************************
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/util/Tokenizer.java,v $
- * $Date: 2003/11/21 01:03:39 $
- * $Revision: 1.1 $
+ * $Date: 2003/12/17 04:55:28 $
+ * $Revision: 1.2 $
  *
  *****************************************************************************************
  */
@@ -16,7 +16,6 @@ import java.text.ParsePosition;
 
 import com.ibm.icu.text.*;
 import com.ibm.icu.lang.*;
-import com.ibm.icu.util.*;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/icu4j/src/com/ibm/icu/dev/test/util/UnicodePropertySource.java b/icu4j/src/com/ibm/icu/dev/test/util/UnicodePropertySource.java
index 8e8639610e4..bdca4aa683c 100644
--- a/icu4j/src/com/ibm/icu/dev/test/util/UnicodePropertySource.java
+++ b/icu4j/src/com/ibm/icu/dev/test/util/UnicodePropertySource.java
@@ -6,8 +6,8 @@
  *******************************************************************************
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/util/UnicodePropertySource.java,v $
- * $Date: 2003/11/21 19:10:43 $
- * $Revision: 1.2 $
+ * $Date: 2003/12/17 04:55:28 $
+ * $Revision: 1.3 $
  *
  *****************************************************************************************
  */
@@ -20,10 +20,13 @@ import java.util.Map;
 import java.util.List;
 import java.util.Arrays;
 
-import com.ibm.icu.lang.*;
-import com.ibm.icu.util.*;
-import com.ibm.icu.impl.*;
-import com.ibm.icu.text.*;
+import com.ibm.icu.lang.UProperty;
+import com.ibm.icu.lang.UCharacter;
+import com.ibm.icu.text.Normalizer;
+import com.ibm.icu.text.UTF16;
+import com.ibm.icu.text.UnicodeSet;
+import com.ibm.icu.text.UnicodeSetIterator;
+
 
 /**
  * Provides a general interface for Unicode Properties, and
@@ -301,7 +304,7 @@ public abstract class UnicodePropertySource implements Cloneable {
      */
     static public void addAll(UnicodeSetIterator source, UnicodeSet result) {
         while (source.nextRange()) {
-            if (source.codepoint == source.IS_STRING) {
+            if (source.codepoint == UnicodeSetIterator.IS_STRING) {
                 result.add(source.string);
             } else {
                 result.add(source.codepoint, source.codepointEnd);
diff --git a/icu4j/src/com/ibm/icu/dev/test/util/Visitor.java b/icu4j/src/com/ibm/icu/dev/test/util/Visitor.java
index 4d3e2ea2781..7b656deb90e 100644
--- a/icu4j/src/com/ibm/icu/dev/test/util/Visitor.java
+++ b/icu4j/src/com/ibm/icu/dev/test/util/Visitor.java
@@ -6,8 +6,8 @@
  *******************************************************************************
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/util/Visitor.java,v $
- * $Date: 2003/11/21 01:03:39 $
- * $Revision: 1.1 $
+ * $Date: 2003/12/17 04:55:28 $
+ * $Revision: 1.2 $
  *
  *****************************************************************************************
  */
@@ -94,7 +94,7 @@ public abstract class Visitor {
         CodePointRange cpr;
         
         while(it.nextRange()) {
-            if (it.codepoint == it.IS_STRING) {
+            if (it.codepoint == UnicodeSetIterator.IS_STRING) {
                 item = it.string;
             } else {
                 cpr = last == cpr0 ? cpr1 : cpr0;   // make sure we don't override last
diff --git a/icu4j/src/com/ibm/icu/dev/tool/layout/ArabicGSUBBuilder.java b/icu4j/src/com/ibm/icu/dev/tool/layout/ArabicGSUBBuilder.java
index 93d50f0f9da..27a03e9cf2c 100644
--- a/icu4j/src/com/ibm/icu/dev/tool/layout/ArabicGSUBBuilder.java
+++ b/icu4j/src/com/ibm/icu/dev/tool/layout/ArabicGSUBBuilder.java
@@ -7,19 +7,15 @@
  * Created on Dec 3, 2003
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/Attic/ArabicGSUBBuilder.java,v $
- * $Date: 2003/12/09 01:18:11 $
- * $Revision: 1.1 $
+ * $Date: 2003/12/17 04:54:40 $
+ * $Revision: 1.2 $
  * 
  *******************************************************************************
  */
 package com.ibm.icu.dev.tool.layout;
 
 import com.ibm.icu.lang.UCharacter;
-import com.ibm.icu.lang.UCharacterCategory;
-import com.ibm.icu.text.Normalizer;
-import com.ibm.icu.text.Transliterator;
 import com.ibm.icu.text.UnicodeSet;
-import com.ibm.icu.text.UnicodeSetIterator;
 import com.ibm.icu.text.UTF16;
 
 public class ArabicGSUBBuilder
@@ -47,14 +43,14 @@ public class ArabicGSUBBuilder
                break;
                
            default:
-               return decomp + UTF16.toString(ligature);
+               return decomp + UCharacter.toString(ligature);
         }
         
         char[] chars = decomp.toCharArray();
               
         ArabicShaping.shape(chars, leftType, rightType, isolClassTable);
   
-        return new String(chars) + UTF16.toString(ligature);
+        return new String(chars) + UCharacter.toString(ligature);
     }
     
     static void buildContextualForms(CharacterData data, ClassTable initClassTable, ClassTable mediClassTable,
@@ -119,7 +115,7 @@ public class ArabicGSUBBuilder
                     break;
                     
                 case UCharacter.DecompositionType.CANONICAL:
-                    cannonicalTree.insert(decomposition + UTF16.toString(ligature));
+                    cannonicalTree.insert(decomposition + UCharacter.toString(ligature));
                     break;
                 }
             }
diff --git a/icu4j/src/com/ibm/icu/dev/tool/layout/CharacterData.java b/icu4j/src/com/ibm/icu/dev/tool/layout/CharacterData.java
index 67d851a309d..440bd8b49df 100644
--- a/icu4j/src/com/ibm/icu/dev/tool/layout/CharacterData.java
+++ b/icu4j/src/com/ibm/icu/dev/tool/layout/CharacterData.java
@@ -7,8 +7,8 @@
  * Created on Dec 3, 2003
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/Attic/CharacterData.java,v $
- * $Date: 2003/12/09 01:18:11 $
- * $Revision: 1.1 $
+ * $Date: 2003/12/17 04:54:40 $
+ * $Revision: 1.2 $
  * 
  *******************************************************************************
  */
@@ -18,8 +18,6 @@ import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.lang.UProperty;
 import com.ibm.icu.text.Normalizer;
 import com.ibm.icu.text.UnicodeSet;
-import com.ibm.icu.text.UnicodeSetIterator;
-import com.ibm.icu.text.UTF16;
 
 public class CharacterData
 {
@@ -56,11 +54,11 @@ public class CharacterData
             case UCharacter.DecompositionType.INITIAL:
             case UCharacter.DecompositionType.ISOLATED:
             case UCharacter.DecompositionType.MEDIAL:
-                decomposition = Normalizer.compose(UTF16.toString(character), true);
+                decomposition = Normalizer.compose(UCharacter.toString(character), true);
                 break;
                 
             case UCharacter.DecompositionType.CANONICAL:
-                decomposition = Normalizer.decompose(UTF16.toString(character), true);
+                decomposition = Normalizer.decompose(UCharacter.toString(character), true);
                 break;
                 
             default:
diff --git a/icu4j/src/com/ibm/icu/dev/tool/layout/ClassTable.java b/icu4j/src/com/ibm/icu/dev/tool/layout/ClassTable.java
index 0d4d5cddbd8..582b630d2d8 100644
--- a/icu4j/src/com/ibm/icu/dev/tool/layout/ClassTable.java
+++ b/icu4j/src/com/ibm/icu/dev/tool/layout/ClassTable.java
@@ -7,16 +7,14 @@
  * Created on Dec 3, 2003
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/ClassTable.java,v $
- * $Date: 2003/12/09 01:18:11 $
- * $Revision: 1.1 $
+ * $Date: 2003/12/17 04:54:39 $
+ * $Revision: 1.2 $
  * 
  *******************************************************************************
  */
 package com.ibm.icu.dev.tool.layout;
 
-import java.io.*;
 import java.util.*;
-import java.lang.*;
 
 import com.ibm.icu.impl.Utility;
 
diff --git a/icu4j/src/com/ibm/icu/dev/tool/layout/FeatureList.java b/icu4j/src/com/ibm/icu/dev/tool/layout/FeatureList.java
index b91ec12381f..c29225dc789 100644
--- a/icu4j/src/com/ibm/icu/dev/tool/layout/FeatureList.java
+++ b/icu4j/src/com/ibm/icu/dev/tool/layout/FeatureList.java
@@ -7,16 +7,13 @@
  * Created on Dec 3, 2003
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/FeatureList.java,v $
- * $Date: 2003/12/09 01:18:11 $
- * $Revision: 1.1 $
+ * $Date: 2003/12/17 04:54:40 $
+ * $Revision: 1.2 $
  * 
  *******************************************************************************
  */
 package com.ibm.icu.dev.tool.layout;
 
-import java.io.*;
-import java.lang.*;
-import java.util.*;
 
 public class FeatureList
 {
diff --git a/icu4j/src/com/ibm/icu/dev/tool/layout/GDEFWriter.java b/icu4j/src/com/ibm/icu/dev/tool/layout/GDEFWriter.java
index 0e5c2bbfccf..50be47c3853 100644
--- a/icu4j/src/com/ibm/icu/dev/tool/layout/GDEFWriter.java
+++ b/icu4j/src/com/ibm/icu/dev/tool/layout/GDEFWriter.java
@@ -7,16 +7,16 @@
  * Created on Dec 3, 2003
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/GDEFWriter.java,v $
- * $Date: 2003/12/09 01:18:11 $
- * $Revision: 1.1 $
+ * $Date: 2003/12/17 04:54:42 $
+ * $Revision: 1.2 $
  * 
  *******************************************************************************
  */
 package com.ibm.icu.dev.tool.layout;
 
-import java.io.*;
-import java.util.*;
-import java.lang.*;
+import java.io.PrintStream;
+
+
 
 class GDEFWriter extends OpenTypeTableWriter
 {
diff --git a/icu4j/src/com/ibm/icu/dev/tool/layout/GSUBWriter.java b/icu4j/src/com/ibm/icu/dev/tool/layout/GSUBWriter.java
index e4b571b3f56..5d8e6be4c15 100644
--- a/icu4j/src/com/ibm/icu/dev/tool/layout/GSUBWriter.java
+++ b/icu4j/src/com/ibm/icu/dev/tool/layout/GSUBWriter.java
@@ -7,16 +7,15 @@
  * Created on Dec 3, 2003
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/GSUBWriter.java,v $
- * $Date: 2003/12/09 01:18:11 $
- * $Revision: 1.1 $
+ * $Date: 2003/12/17 04:54:42 $
+ * $Revision: 1.2 $
  * 
  *******************************************************************************
  */
 package com.ibm.icu.dev.tool.layout;
 
-import java.io.*;
-import java.util.*;
-import java.lang.*;
+import java.io.PrintStream;
+
 
 public class GSUBWriter extends OpenTypeTableWriter
 {
diff --git a/icu4j/src/com/ibm/icu/dev/tool/layout/LigatureEntry.java b/icu4j/src/com/ibm/icu/dev/tool/layout/LigatureEntry.java
index e8b0561e954..6524bd45b99 100644
--- a/icu4j/src/com/ibm/icu/dev/tool/layout/LigatureEntry.java
+++ b/icu4j/src/com/ibm/icu/dev/tool/layout/LigatureEntry.java
@@ -7,16 +7,13 @@
  * Created on Dec 3, 2003
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/LigatureEntry.java,v $
- * $Date: 2003/12/09 01:18:11 $
- * $Revision: 1.1 $
+ * $Date: 2003/12/17 04:54:42 $
+ * $Revision: 1.2 $
  * 
  *******************************************************************************
  */
 package com.ibm.icu.dev.tool.layout;
 
-import java.util.*;
-import java.lang.*;
-
 public class LigatureEntry
 {
     private int[] componentChars;
diff --git a/icu4j/src/com/ibm/icu/dev/tool/layout/LigatureModuleWriter.java b/icu4j/src/com/ibm/icu/dev/tool/layout/LigatureModuleWriter.java
index 3ea870be7ae..126aabaccbf 100644
--- a/icu4j/src/com/ibm/icu/dev/tool/layout/LigatureModuleWriter.java
+++ b/icu4j/src/com/ibm/icu/dev/tool/layout/LigatureModuleWriter.java
@@ -7,17 +7,13 @@
  * Created on Dec 3, 2003
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/LigatureModuleWriter.java,v $
- * $Date: 2003/12/09 01:18:11 $
- * $Revision: 1.1 $
+ * $Date: 2003/12/17 04:54:42 $
+ * $Revision: 1.2 $
  * 
  *******************************************************************************
  */
 package com.ibm.icu.dev.tool.layout;
 
-import java.io.PrintStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.*;
 
 public class LigatureModuleWriter extends ModuleWriter
 {
diff --git a/icu4j/src/com/ibm/icu/dev/tool/layout/LigatureTree.java b/icu4j/src/com/ibm/icu/dev/tool/layout/LigatureTree.java
index f4156d676f2..7e2bb36951f 100644
--- a/icu4j/src/com/ibm/icu/dev/tool/layout/LigatureTree.java
+++ b/icu4j/src/com/ibm/icu/dev/tool/layout/LigatureTree.java
@@ -7,16 +7,17 @@
  * Created on Dec 3, 2003
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/LigatureTree.java,v $
- * $Date: 2003/12/09 01:18:11 $
- * $Revision: 1.1 $
+ * $Date: 2003/12/17 04:54:41 $
+ * $Revision: 1.2 $
  * 
  *******************************************************************************
  */
 package com.ibm.icu.dev.tool.layout;
 
-import java.io.*;
-import java.lang.*;
-import java.util.*;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Writer;
 
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.impl.Utility;
diff --git a/icu4j/src/com/ibm/icu/dev/tool/layout/LigatureTreeWalker.java b/icu4j/src/com/ibm/icu/dev/tool/layout/LigatureTreeWalker.java
index acd421b60eb..d1ab929c5b6 100644
--- a/icu4j/src/com/ibm/icu/dev/tool/layout/LigatureTreeWalker.java
+++ b/icu4j/src/com/ibm/icu/dev/tool/layout/LigatureTreeWalker.java
@@ -7,16 +7,14 @@
  * Created on Dec 3, 2003
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/LigatureTreeWalker.java,v $
- * $Date: 2003/12/09 01:18:11 $
- * $Revision: 1.1 $
+ * $Date: 2003/12/17 04:54:40 $
+ * $Revision: 1.2 $
  * 
  *******************************************************************************
  */
 package com.ibm.icu.dev.tool.layout;
 
-import java.io.*;
-import java.util.*;
-import java.lang.*;
+import java.util.Vector;
 
 import com.ibm.icu.impl.Utility;
 
diff --git a/icu4j/src/com/ibm/icu/dev/tool/layout/Lookup.java b/icu4j/src/com/ibm/icu/dev/tool/layout/Lookup.java
index 9b9f1938a24..7756ce87a6c 100644
--- a/icu4j/src/com/ibm/icu/dev/tool/layout/Lookup.java
+++ b/icu4j/src/com/ibm/icu/dev/tool/layout/Lookup.java
@@ -7,16 +7,13 @@
  * Created on Dec 3, 2003
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/Lookup.java,v $
- * $Date: 2003/12/09 01:18:11 $
- * $Revision: 1.1 $
+ * $Date: 2003/12/17 04:54:40 $
+ * $Revision: 1.2 $
  * 
  *******************************************************************************
  */
 package com.ibm.icu.dev.tool.layout;
 
-import java.io.*;
-import java.lang.*;
-import java.util.*;
 
 public /*abstract*/ class Lookup
 {
diff --git a/icu4j/src/com/ibm/icu/dev/tool/layout/LookupList.java b/icu4j/src/com/ibm/icu/dev/tool/layout/LookupList.java
index 9f6f6bc9217..4d90cd57fb4 100644
--- a/icu4j/src/com/ibm/icu/dev/tool/layout/LookupList.java
+++ b/icu4j/src/com/ibm/icu/dev/tool/layout/LookupList.java
@@ -7,17 +7,13 @@
  * Created on Dec 3, 2003
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/LookupList.java,v $
- * $Date: 2003/12/09 01:18:12 $
- * $Revision: 1.1 $
+ * $Date: 2003/12/17 04:54:39 $
+ * $Revision: 1.2 $
  * 
  *******************************************************************************
  */
 package com.ibm.icu.dev.tool.layout;
 
-import java.io.*;
-import java.util.*;
-import java.lang.*;
-
 public class LookupList
 {
     private Lookup[] lookups;
diff --git a/icu4j/src/com/ibm/icu/dev/tool/layout/LookupSubtable.java b/icu4j/src/com/ibm/icu/dev/tool/layout/LookupSubtable.java
index 638f0810960..9f1759403fd 100644
--- a/icu4j/src/com/ibm/icu/dev/tool/layout/LookupSubtable.java
+++ b/icu4j/src/com/ibm/icu/dev/tool/layout/LookupSubtable.java
@@ -7,17 +7,13 @@
  * Created on Dec 3, 2003
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/LookupSubtable.java,v $
- * $Date: 2003/12/09 01:18:11 $
- * $Revision: 1.1 $
+ * $Date: 2003/12/17 04:54:41 $
+ * $Revision: 1.2 $
  * 
  *******************************************************************************
  */
 package com.ibm.icu.dev.tool.layout;
 
-import java.io.*;
-import java.lang.*;
-import java.util.*;
-
 public interface LookupSubtable
 {
     void writeLookupSubtable(OpenTypeTableWriter writer);
diff --git a/icu4j/src/com/ibm/icu/dev/tool/layout/ModuleWriter.java b/icu4j/src/com/ibm/icu/dev/tool/layout/ModuleWriter.java
index dfc4bfada39..ed28671dda4 100644
--- a/icu4j/src/com/ibm/icu/dev/tool/layout/ModuleWriter.java
+++ b/icu4j/src/com/ibm/icu/dev/tool/layout/ModuleWriter.java
@@ -7,8 +7,8 @@
  * Created on Dec 3, 2003
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/ModuleWriter.java,v $
- * $Date: 2003/12/09 01:18:11 $
- * $Revision: 1.5 $
+ * $Date: 2003/12/17 04:54:41 $
+ * $Revision: 1.6 $
  * 
  *******************************************************************************
  */
@@ -18,7 +18,6 @@ package com.ibm.icu.dev.tool.layout;
 import java.io.PrintStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.*;
 
 public class ModuleWriter
 {
diff --git a/icu4j/src/com/ibm/icu/dev/tool/layout/OpenTypeTableWriter.java b/icu4j/src/com/ibm/icu/dev/tool/layout/OpenTypeTableWriter.java
index 258542b4cf4..9e5e9be20f0 100644
--- a/icu4j/src/com/ibm/icu/dev/tool/layout/OpenTypeTableWriter.java
+++ b/icu4j/src/com/ibm/icu/dev/tool/layout/OpenTypeTableWriter.java
@@ -7,15 +7,15 @@
  * Created on Dec 3, 2003
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/OpenTypeTableWriter.java,v $
- * $Date: 2003/12/09 01:18:11 $
- * $Revision: 1.1 $
+ * $Date: 2003/12/17 04:54:41 $
+ * $Revision: 1.2 $
  * 
  *******************************************************************************
  */
 package com.ibm.icu.dev.tool.layout;
 
-import java.io.*;
-import java.util.*;
+
+import java.io.PrintStream;
 
 import com.ibm.icu.impl.Utility;
 
diff --git a/icu4j/src/com/ibm/icu/dev/tool/layout/ScriptList.java b/icu4j/src/com/ibm/icu/dev/tool/layout/ScriptList.java
index e2f24dd5543..9401d3f8bc3 100644
--- a/icu4j/src/com/ibm/icu/dev/tool/layout/ScriptList.java
+++ b/icu4j/src/com/ibm/icu/dev/tool/layout/ScriptList.java
@@ -7,16 +7,13 @@
  * Created on Dec 3, 2003
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/ScriptList.java,v $
- * $Date: 2003/12/09 01:18:12 $
- * $Revision: 1.1 $
+ * $Date: 2003/12/17 04:54:41 $
+ * $Revision: 1.2 $
  * 
  *******************************************************************************
  */
 package com.ibm.icu.dev.tool.layout;
 
-import java.io.*;
-import java.lang.*;
-import java.util.*;
 
 public class ScriptList
 {
diff --git a/icu4j/src/com/ibm/icu/dev/tool/layout/ScriptModuleWriter.java b/icu4j/src/com/ibm/icu/dev/tool/layout/ScriptModuleWriter.java
index 3f4662f0d73..cc7ba28f7f7 100644
--- a/icu4j/src/com/ibm/icu/dev/tool/layout/ScriptModuleWriter.java
+++ b/icu4j/src/com/ibm/icu/dev/tool/layout/ScriptModuleWriter.java
@@ -5,16 +5,13 @@
  *******************************************************************************
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/ScriptModuleWriter.java,v $
- * $Date: 2003/12/09 01:18:11 $
- * $Revision: 1.4 $
+ * $Date: 2003/12/17 04:54:42 $
+ * $Revision: 1.5 $
  *
  *******************************************************************************
  */
 package com.ibm.icu.dev.tool.layout;
 
-import java.io.PrintStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
 
 public class ScriptModuleWriter extends ModuleWriter
 {
diff --git a/icu4j/src/com/ibm/icu/dev/tool/layout/TaggedRecord.java b/icu4j/src/com/ibm/icu/dev/tool/layout/TaggedRecord.java
index df03f389050..1892ce1993e 100644
--- a/icu4j/src/com/ibm/icu/dev/tool/layout/TaggedRecord.java
+++ b/icu4j/src/com/ibm/icu/dev/tool/layout/TaggedRecord.java
@@ -7,16 +7,13 @@
  * Created on Dec 3, 2003
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/TaggedRecord.java,v $
- * $Date: 2003/12/09 01:18:12 $
- * $Revision: 1.1 $
+ * $Date: 2003/12/17 04:54:40 $
+ * $Revision: 1.2 $
  * 
  *******************************************************************************
  */
 package com.ibm.icu.dev.tool.layout;
 
-import java.io.*;
-import java.lang.*;
-import java.util.*;
 
 import com.ibm.icu.impl.Utility;
 
diff --git a/icu4j/src/com/ibm/icu/dev/tool/layout/ThaiStateTable.java b/icu4j/src/com/ibm/icu/dev/tool/layout/ThaiStateTable.java
index 332cbce85c6..06d6aa28260 100644
--- a/icu4j/src/com/ibm/icu/dev/tool/layout/ThaiStateTable.java
+++ b/icu4j/src/com/ibm/icu/dev/tool/layout/ThaiStateTable.java
@@ -7,19 +7,15 @@
  * Created on Dec 09, 2003
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/ThaiStateTable.java,v $
- * $Date: 2003/12/09 23:55:16 $
- * $Revision: 1.1 $
+ * $Date: 2003/12/17 04:54:39 $
+ * $Revision: 1.2 $
  * 
  *******************************************************************************
  */
 package com.ibm.icu.dev.tool.layout;
 
-import com.ibm.icu.impl.Utility;
-import java.io.*;
-import java.util.*;
-import java.lang.*;
-
-import java.awt.*;
+import java.io.PrintStream;
+import java.util.Vector;
 
 public class ThaiStateTable
 {
diff --git a/icu4j/src/com/ibm/icu/dev/tool/layout/ThaiStateTableBuilder.java b/icu4j/src/com/ibm/icu/dev/tool/layout/ThaiStateTableBuilder.java
index 7186741524f..84981e32b06 100644
--- a/icu4j/src/com/ibm/icu/dev/tool/layout/ThaiStateTableBuilder.java
+++ b/icu4j/src/com/ibm/icu/dev/tool/layout/ThaiStateTableBuilder.java
@@ -7,21 +7,13 @@
  * Created on Dec 09, 2003
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/ThaiStateTableBuilder.java,v $
- * $Date: 2003/12/09 23:55:16 $
- * $Revision: 1.1 $
+ * $Date: 2003/12/17 04:54:41 $
+ * $Revision: 1.2 $
  * 
  *******************************************************************************
  */
 package com.ibm.icu.dev.tool.layout;
 
-import com.ibm.icu.impl.Utility;
-import java.io.*;
-import java.util.*;
-import java.lang.*;
-
-import java.awt.*;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
 
 public class ThaiStateTableBuilder
 {
diff --git a/icu4j/src/com/ibm/icu/dev/tool/layout/ThaiStateTableModuleWriter.java b/icu4j/src/com/ibm/icu/dev/tool/layout/ThaiStateTableModuleWriter.java
index 4092f2446b4..ee340986446 100644
--- a/icu4j/src/com/ibm/icu/dev/tool/layout/ThaiStateTableModuleWriter.java
+++ b/icu4j/src/com/ibm/icu/dev/tool/layout/ThaiStateTableModuleWriter.java
@@ -7,19 +7,13 @@
  * Created on Dec 09, 2003
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/ThaiStateTableModuleWriter.java,v $
- * $Date: 2003/12/09 23:55:16 $
- * $Revision: 1.1 $
+ * $Date: 2003/12/17 04:54:39 $
+ * $Revision: 1.2 $
  * 
  *******************************************************************************
  */
 package com.ibm.icu.dev.tool.layout;
 
-import com.ibm.icu.impl.Utility;
-import java.io.PrintStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.*;
-
 public class ThaiStateTableModuleWriter extends ModuleWriter
 {
     public ThaiStateTableModuleWriter()
diff --git a/icu4j/src/com/ibm/icu/dev/tool/layout/ThaiStateTransition.java b/icu4j/src/com/ibm/icu/dev/tool/layout/ThaiStateTransition.java
index 6ce054befd0..64c66711718 100644
--- a/icu4j/src/com/ibm/icu/dev/tool/layout/ThaiStateTransition.java
+++ b/icu4j/src/com/ibm/icu/dev/tool/layout/ThaiStateTransition.java
@@ -7,14 +7,13 @@
  * Created on Dec 09, 2003
  *
  * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/tool/layout/ThaiStateTransition.java,v $
- * $Date: 2003/12/09 23:55:16 $
- * $Revision: 1.1 $
+ * $Date: 2003/12/17 04:54:42 $
+ * $Revision: 1.2 $
  * 
  *******************************************************************************
  */
 package com.ibm.icu.dev.tool.layout;
 
-import com.ibm.icu.impl.Utility;
 import java.io.PrintStream;
 
 public class ThaiStateTransition
diff --git a/icu4j/src/com/ibm/icu/impl/UCharacterProperty.java b/icu4j/src/com/ibm/icu/impl/UCharacterProperty.java
index cca01189a40..f53c2bbfa44 100644
--- a/icu4j/src/com/ibm/icu/impl/UCharacterProperty.java
+++ b/icu4j/src/com/ibm/icu/impl/UCharacterProperty.java
@@ -6,8 +6,8 @@
 *
 * $Source: 
 *         /usr/cvs/icu4j/icu4j/src/com/ibm/icu/text/UCharacterPropertyDB.java $ 
-* $Date: 2003/10/04 00:37:18 $ 
-* $Revision: 1.34 $
+* $Date: 2003/12/17 04:56:04 $ 
+* $Revision: 1.35 $
 *
 *******************************************************************************
 */
@@ -1595,6 +1595,9 @@ public final class UCharacterProperty implements Trie.DataManipulate
     {
         // jar access
         InputStream i = getClass().getResourceAsStream(DATA_FILE_NAME_);
+        if(i==null){
+            throw new IOException("Could not load the file: "+DATA_FILE_NAME_);
+        }
         BufferedInputStream b = new BufferedInputStream(i, 
                                                         DATA_BUFFER_SIZE_);
         UCharacterPropertyReader reader = new UCharacterPropertyReader(b);