From 1997f5bee2b53bf20b4eeba45287ec47ff72f4df Mon Sep 17 00:00:00 2001 From: Markus Scherer Date: Thu, 3 Mar 2011 16:57:36 +0000 Subject: [PATCH] ICU-8167 move string tries to public packages X-SVN-Rev: 29527 --- .../core/src/com/ibm/icu/impl/UPropertyAliases.java | 1 + .../src/com/ibm/icu/{impl => util}/BytesTrie.java | 2 +- .../com/ibm/icu/{impl => util}/BytesTrieBuilder.java | 2 +- .../src/com/ibm/icu/{impl => util}/CharsTrie.java | 4 ++-- .../com/ibm/icu/{impl => util}/CharsTrieBuilder.java | 2 +- .../ibm/icu/{impl => util}/StringTrieBuilder.java | 2 +- .../src/com/ibm/icu/dev/test/util/BytesTrieTest.java | 6 +++--- .../src/com/ibm/icu/dev/test/util/CharsTrieTest.java | 8 ++++---- .../core/src/com/ibm/icu/dev/test/util/TrieMap.java | 12 ++++++------ .../src/com/ibm/icu/dev/test/util/TrieMapTest.java | 2 +- 10 files changed, 21 insertions(+), 20 deletions(-) rename icu4j/main/classes/core/src/com/ibm/icu/{impl => util}/BytesTrie.java (99%) rename icu4j/main/classes/core/src/com/ibm/icu/{impl => util}/BytesTrieBuilder.java (99%) rename icu4j/main/classes/core/src/com/ibm/icu/{impl => util}/CharsTrie.java (99%) rename icu4j/main/classes/core/src/com/ibm/icu/{impl => util}/CharsTrieBuilder.java (99%) rename icu4j/main/classes/core/src/com/ibm/icu/{impl => util}/StringTrieBuilder.java (99%) diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/UPropertyAliases.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/UPropertyAliases.java index 05344a37f89..a69758d48df 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/UPropertyAliases.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/UPropertyAliases.java @@ -19,6 +19,7 @@ import java.io.InputStream; import java.util.MissingResourceException; import com.ibm.icu.lang.UProperty; +import com.ibm.icu.util.BytesTrie; /** * Wrapper for the pnames.icu binary data file. This data file is diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/BytesTrie.java b/icu4j/main/classes/core/src/com/ibm/icu/util/BytesTrie.java similarity index 99% rename from icu4j/main/classes/core/src/com/ibm/icu/impl/BytesTrie.java rename to icu4j/main/classes/core/src/com/ibm/icu/util/BytesTrie.java index 6bcc7896df4..9c1a580b449 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/BytesTrie.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/BytesTrie.java @@ -7,7 +7,7 @@ * created by: Markus W. Scherer * ported from ICU4C bytestrie.h/.cpp */ -package com.ibm.icu.impl; +package com.ibm.icu.util; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/BytesTrieBuilder.java b/icu4j/main/classes/core/src/com/ibm/icu/util/BytesTrieBuilder.java similarity index 99% rename from icu4j/main/classes/core/src/com/ibm/icu/impl/BytesTrieBuilder.java rename to icu4j/main/classes/core/src/com/ibm/icu/util/BytesTrieBuilder.java index 6359b2e791d..2851067c849 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/BytesTrieBuilder.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/BytesTrieBuilder.java @@ -8,7 +8,7 @@ * ported from ICU4C bytestriebuilder.h/.cpp */ -package com.ibm.icu.impl; +package com.ibm.icu.util; import java.nio.ByteBuffer; diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/CharsTrie.java b/icu4j/main/classes/core/src/com/ibm/icu/util/CharsTrie.java similarity index 99% rename from icu4j/main/classes/core/src/com/ibm/icu/impl/CharsTrie.java rename to icu4j/main/classes/core/src/com/ibm/icu/util/CharsTrie.java index 41895341511..b1c09de528d 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/CharsTrie.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/CharsTrie.java @@ -8,13 +8,13 @@ * ported from ICU4C ucharstrie.h/.cpp */ -package com.ibm.icu.impl; +package com.ibm.icu.util; import java.io.IOException; import java.util.ArrayList; import java.util.NoSuchElementException; -import com.ibm.icu.impl.BytesTrie.Result; +import com.ibm.icu.util.BytesTrie.Result; import com.ibm.icu.text.UTF16; /** diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/CharsTrieBuilder.java b/icu4j/main/classes/core/src/com/ibm/icu/util/CharsTrieBuilder.java similarity index 99% rename from icu4j/main/classes/core/src/com/ibm/icu/impl/CharsTrieBuilder.java rename to icu4j/main/classes/core/src/com/ibm/icu/util/CharsTrieBuilder.java index 5dea13c54e7..33559cbe756 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/CharsTrieBuilder.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/CharsTrieBuilder.java @@ -8,7 +8,7 @@ * ported from ICU4C ucharstriebuilder/.cpp */ -package com.ibm.icu.impl; +package com.ibm.icu.util; import java.nio.CharBuffer; diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/StringTrieBuilder.java b/icu4j/main/classes/core/src/com/ibm/icu/util/StringTrieBuilder.java similarity index 99% rename from icu4j/main/classes/core/src/com/ibm/icu/impl/StringTrieBuilder.java rename to icu4j/main/classes/core/src/com/ibm/icu/util/StringTrieBuilder.java index cd7d63fa627..42d6dd1a774 100644 --- a/icu4j/main/classes/core/src/com/ibm/icu/impl/StringTrieBuilder.java +++ b/icu4j/main/classes/core/src/com/ibm/icu/util/StringTrieBuilder.java @@ -7,7 +7,7 @@ * created by: Markus W. Scherer * ported from ICU4C stringtriebuilder.h/.cpp */ -package com.ibm.icu.impl; +package com.ibm.icu.util; import java.util.ArrayList; import java.util.HashMap; diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/BytesTrieTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/BytesTrieTest.java index 1477bc1126f..b9baface1c2 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/BytesTrieTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/BytesTrieTest.java @@ -14,9 +14,9 @@ import java.nio.ByteBuffer; import java.util.NoSuchElementException; import com.ibm.icu.dev.test.TestFmwk; -import com.ibm.icu.impl.BytesTrie; -import com.ibm.icu.impl.BytesTrieBuilder; -import com.ibm.icu.impl.StringTrieBuilder; +import com.ibm.icu.util.BytesTrie; +import com.ibm.icu.util.BytesTrieBuilder; +import com.ibm.icu.util.StringTrieBuilder; public class BytesTrieTest extends TestFmwk { public static void main(String[] args) throws Exception { diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/CharsTrieTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/CharsTrieTest.java index c66c2990c23..803e8d642bf 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/CharsTrieTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/CharsTrieTest.java @@ -13,10 +13,10 @@ package com.ibm.icu.dev.test.util; import java.util.NoSuchElementException; import com.ibm.icu.dev.test.TestFmwk; -import com.ibm.icu.impl.BytesTrie; -import com.ibm.icu.impl.CharsTrie; -import com.ibm.icu.impl.CharsTrieBuilder; -import com.ibm.icu.impl.StringTrieBuilder; +import com.ibm.icu.util.BytesTrie; +import com.ibm.icu.util.CharsTrie; +import com.ibm.icu.util.CharsTrieBuilder; +import com.ibm.icu.util.StringTrieBuilder; import com.ibm.icu.text.UnicodeSet; public class CharsTrieTest extends TestFmwk { diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TrieMap.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TrieMap.java index c638f35da0f..81452641e3a 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TrieMap.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TrieMap.java @@ -13,12 +13,12 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import com.ibm.icu.impl.BytesTrie; -import com.ibm.icu.impl.BytesTrie.Result; -import com.ibm.icu.impl.BytesTrieBuilder; -import com.ibm.icu.impl.CharsTrie; -import com.ibm.icu.impl.CharsTrieBuilder; -import com.ibm.icu.impl.StringTrieBuilder.Option; +import com.ibm.icu.util.BytesTrie; +import com.ibm.icu.util.BytesTrie.Result; +import com.ibm.icu.util.BytesTrieBuilder; +import com.ibm.icu.util.CharsTrie; +import com.ibm.icu.util.CharsTrieBuilder; +import com.ibm.icu.util.StringTrieBuilder.Option; import com.ibm.icu.impl.Utility; // would be nice to have a BytesTrieBuilder.add(aByte); diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TrieMapTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TrieMapTest.java index 114416d819d..09f35c42f12 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TrieMapTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TrieMapTest.java @@ -20,7 +20,7 @@ import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.dev.test.util.TrieMap.Style; import com.ibm.icu.impl.Row; import com.ibm.icu.impl.Row.R3; -import com.ibm.icu.impl.StringTrieBuilder.Option; +import com.ibm.icu.util.StringTrieBuilder.Option; import com.ibm.icu.impl.Utility; import com.ibm.icu.lang.UCharacter; import com.ibm.icu.lang.UScript;