diff --git a/.gitattributes b/.gitattributes index c5c891de776..42e7b1a693f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -85,6 +85,8 @@ icu4j/src/com/ibm/icu/dev/data/rbbi/english.dict -text icu4j/src/com/ibm/icu/dev/data/thai6.ucs -text icu4j/src/com/ibm/icu/dev/data/unicode/Draft-TestSuite.txt -text icu4j/src/com/ibm/icu/impl/data/thai_dict -text +icu4j/src/com/ibm/icu/impl/data/unames.dat -text +icu4j/src/com/ibm/icu/impl/data/uprops.dat -text icu4j/src/com/ibm/text/resources/Transliterator_Fullwidth_Halfwidth.utf8.txt -text icu4j/src/com/ibm/text/resources/Transliterator_Han_Pinyin.utf8.txt -text icu4j/src/com/ibm/text/resources/Transliterator_Hiragana_Katakana.utf8.txt -text @@ -92,8 +94,8 @@ icu4j/src/com/ibm/text/resources/Transliterator_Kanji_English.utf8.txt -text icu4j/src/com/ibm/text/resources/Transliterator_Kanji_OnRomaji.utf8.txt -text icu4j/src/com/ibm/text/resources/Transliterator_Latin_Jamo.utf8.txt -text icu4j/src/com/ibm/text/resources/thai_dict -text -icu4j/src/com/ibm/text/unames.dat -text -icu4j/src/com/ibm/text/uprops.dat -text +icu4j/src/com/ibm/text/resources/unames.dat -text +icu4j/src/com/ibm/text/resources/uprops.dat -text icu4j/src/data/holidays_jp.ucs -text icu4j/src/data/thai6.ucs -text icu4j/src/data/unicode/Draft-TestSuite.txt -text diff --git a/icu4j/build.xml b/icu4j/build.xml index e29a3019a24..37c63faeea5 100644 --- a/icu4j/build.xml +++ b/icu4j/build.xml @@ -6,8 +6,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/build.xml,v $ -* $Date: 2001/10/19 20:53:54 $ -* $Revision: 1.36 $ +* $Date: 2001/10/19 22:15:37 $ +* $Revision: 1.37 $ * ******************************************************************************* * This is the ant build file for ICU4J. See readme.html for more information. @@ -94,11 +94,7 @@ - - - + includes="Transliterator_*.txt,*.dat"/> diff --git a/icu4j/src/com/ibm/text/unames.dat b/icu4j/src/com/ibm/icu/impl/data/unames.dat similarity index 100% rename from icu4j/src/com/ibm/text/unames.dat rename to icu4j/src/com/ibm/icu/impl/data/unames.dat diff --git a/icu4j/src/com/ibm/icu/impl/data/uprops.dat b/icu4j/src/com/ibm/icu/impl/data/uprops.dat new file mode 100755 index 00000000000..e79841e8e5b --- /dev/null +++ b/icu4j/src/com/ibm/icu/impl/data/uprops.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0f9176f6d01494ef1bc6ed2b3cc3c2e3897345747667b644befecc1cc7dcccb +size 29652 diff --git a/icu4j/src/com/ibm/text/UCharacterNameDB.java b/icu4j/src/com/ibm/text/UCharacterNameDB.java index 65716f3597e..be819a9f273 100755 --- a/icu4j/src/com/ibm/text/UCharacterNameDB.java +++ b/icu4j/src/com/ibm/text/UCharacterNameDB.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/text/Attic/UCharacterNameDB.java,v $ -* $Date: 2001/08/22 22:38:30 $ -* $Revision: 1.5 $ +* $Date: 2001/10/19 22:15:53 $ +* $Revision: 1.6 $ * ******************************************************************************* */ @@ -59,7 +59,7 @@ final class UCharacterNameDB extends UCharacterDB /** * Default name of the name datafile */ - private static final String NAME_FILE_NAME_ = "unames.dat"; + private static final String NAME_FILE_NAME_ = "resources/unames.dat"; /** * Default buffer size of datafile diff --git a/icu4j/src/com/ibm/text/UCharacterPropertyDB.java b/icu4j/src/com/ibm/text/UCharacterPropertyDB.java index d5e961c62b2..92cefc21da0 100755 --- a/icu4j/src/com/ibm/text/UCharacterPropertyDB.java +++ b/icu4j/src/com/ibm/text/UCharacterPropertyDB.java @@ -6,8 +6,8 @@ * * $Source: * /usr/cvs/icu4j/icu4j/src/com/ibm/icu/text/UCharacterPropertyDB.java $ -* $Date: 2001/06/21 23:20:53 $ -* $Revision: 1.4 $ +* $Date: 2001/10/19 22:15:53 $ +* $Revision: 1.5 $ * ******************************************************************************* */ @@ -16,6 +16,7 @@ package com.ibm.text; import java.io.InputStream; import java.io.DataInputStream; +import java.io.FileInputStream; import java.io.BufferedInputStream; import java.io.IOException; @@ -98,7 +99,7 @@ final class UCharacterPropertyDB extends UCharacterDB /** * Default name of the datafile */ - private static final String DATA_FILE_NAME_ = "uprops.dat"; + private static final String DATA_FILE_NAME_ = "resources/uprops.dat"; /** * Default buffer size of datafile @@ -197,6 +198,7 @@ final class UCharacterPropertyDB extends UCharacterDB { UGenPropReader reader = new UGenPropReader(); + // jar access InputStream i = getClass().getResourceAsStream(DATA_FILE_NAME_); BufferedInputStream b = new BufferedInputStream(i, DATA_BUFFER_SIZE_); DataInputStream d = new DataInputStream(b); diff --git a/icu4j/src/com/ibm/text/resources/unames.dat b/icu4j/src/com/ibm/text/resources/unames.dat new file mode 100755 index 00000000000..84f30c20f3d --- /dev/null +++ b/icu4j/src/com/ibm/text/resources/unames.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be46b526e1f2ba8f154b7f393dd5f717b650620397ebf6c6f1ba332ff1617634 +size 100428 diff --git a/icu4j/src/com/ibm/text/resources/uprops.dat b/icu4j/src/com/ibm/text/resources/uprops.dat new file mode 100755 index 00000000000..e79841e8e5b --- /dev/null +++ b/icu4j/src/com/ibm/text/resources/uprops.dat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0f9176f6d01494ef1bc6ed2b3cc3c2e3897345747667b644befecc1cc7dcccb +size 29652 diff --git a/icu4j/src/com/ibm/text/uprops.dat b/icu4j/src/com/ibm/text/uprops.dat deleted file mode 100755 index 9eb3b0c656c..00000000000 --- a/icu4j/src/com/ibm/text/uprops.dat +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b218cde43dde10421810d0b33f159f8967308ea26b899853cb29d50e72ad5547 -size 29548