From adf615e62a9b7313adb3847d8611d023854e9dc8 Mon Sep 17 00:00:00 2001 From: Doug Felt Date: Sat, 16 Mar 2002 07:13:36 +0000 Subject: [PATCH] ICU-1761 move jar file, update build.xml, remove old localeelements sources X-SVN-Rev: 8077 --- .gitattributes | 2 +- icu4j/build.xml | 28 +- icu4j/src/com/ibm/icu/impl/ICULocaleData.java | 3 + .../icu/{dev => impl}/data/ICULocaleData.jar | 0 .../com/ibm/icu/impl/data/LocaleElements.java | 31 --- .../ibm/icu/impl/data/LocaleElements_el.java | 255 ------------------ .../ibm/icu/impl/data/LocaleElements_en.java | 39 --- .../icu/impl/data/LocaleElements_xx_CH.java | 26 -- .../icu/impl/data/LocaleElements_xx_ES.java | 27 -- .../icu/impl/data/LocaleElements_xx_IN.java | 26 -- 10 files changed, 26 insertions(+), 411 deletions(-) rename icu4j/src/com/ibm/icu/{dev => impl}/data/ICULocaleData.jar (100%) delete mode 100755 icu4j/src/com/ibm/icu/impl/data/LocaleElements.java delete mode 100755 icu4j/src/com/ibm/icu/impl/data/LocaleElements_el.java delete mode 100755 icu4j/src/com/ibm/icu/impl/data/LocaleElements_en.java delete mode 100755 icu4j/src/com/ibm/icu/impl/data/LocaleElements_xx_CH.java delete mode 100755 icu4j/src/com/ibm/icu/impl/data/LocaleElements_xx_ES.java delete mode 100755 icu4j/src/com/ibm/icu/impl/data/LocaleElements_xx_IN.java diff --git a/.gitattributes b/.gitattributes index a361768871f..4634f36f2d2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -69,11 +69,11 @@ icu4c/source/samples/ucnv/data02.bin -text icu4c/source/test/testdata/importtest.bin -text icu4c/source/test/testdata/ja_data.bin -text icu4c/source/test/testdata/uni-text.bin -text -icu4j/src/com/ibm/icu/dev/data/ICULocaleData.jar -text icu4j/src/com/ibm/icu/dev/data/holidays_jp.ucs -text 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/ICULocaleData.jar -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/unorm.dat -text diff --git a/icu4j/build.xml b/icu4j/build.xml index 806259de700..a9ac91a1cfb 100644 --- a/icu4j/build.xml +++ b/icu4j/build.xml @@ -6,8 +6,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/build.xml,v $ -* $Date: 2002/03/10 19:40:11 $ -* $Revision: 1.47 $ +* $Date: 2002/03/16 07:11:30 $ +* $Revision: 1.48 $ * ******************************************************************************* * This is the ant build file for ICU4J. See readme.html for more information. @@ -33,15 +33,31 @@ - + + + + + + - - + + + + + + + + + + + + + + - \\? ;"+ -"\u00b7 <> \\: ;"+ - -"# Fix any ancient characters that creep in\n"+ - -"\u0342 > \u0301 ;"+ -"\u0302 > \u0301 ;"+ -"\u0300 > \u0301 ;"+ -"$smooth > ;"+ -"$rough > ;"+ -"$iotasub > ;"+ -"\u037A > ;"+ - -"# need to have these up here so the rules don't mask\n"+ - -"\u03b7 <> i $under ;"+ -"\u0397 <> I $under ;"+ - -"\u03a8 } $beforeLower <> Ps ; "+ -"\u03a8 <> PS ; "+ -"\u03c8 <> ps ; "+ - -"\u03c9 <> o $under ;"+ -"\u03a9 <> O $under;"+ - -"# at begining or end of word, convert mp to b\n"+ - -"[^[:L:][:M:]] { \u03bc\u03c0 > b ; "+ -"\u03bc\u03c0 } [^[:L:][:M:]] > b ; "+ -"[^[:L:][:M:]] { [\u039c\u03bc][\u03a0\u03c0] > B ; "+ -"[\u039c\u03bc][\u03a0\u03c0] } [^[:L:][:M:]] > B ;"+ - -"\u03bc\u03c0 < b ; "+ -"\u039c\u03c0 < B } $beforeLower ; "+ -"\u039c\u03a0 < B ; "+ - -"# handle diphthongs ending with upsilon\n"+ - -"$vowel { \u03c5 } $softener <> v $under ; "+ -"$vowel { \u03c5 } <> f $under; "+ -"\u03c5 <> y ; "+ -"$vowel { \u03a5 } $softener <> V $under ; "+ -"$vowel { \u03a5 <> U $under ; "+ -"\u03a5 <> Y ; "+ - -"# NORMAL\n"+ - -"\u03b1 <> a ; "+ -"\u0391 <> A ; "+ - -"\u03b2 <> v ; "+ -"\u0392 <> V ; "+ - -"\u03b3 } $gammaLike <> n } $egammaLike ; "+ -"\u03b3 <> g ; "+ -"\u0393 } $gammaLike <> N } $egammaLike ; "+ -"\u0393 <> G ; "+ - -"\u03b4 <> d ; "+ -"\u0394 <> D ; "+ - -"\u03b5 <> e ; "+ -"\u0395 <> E ; "+ - -"\u03b6 <> z ; "+ -"\u0396 <> Z ; "+ - -"\u03b8 <> th ; "+ -"\u0398 } $beforeLower <> Th ; "+ -"\u0398 <> TH ; "+ - -"\u03b9 <> i ; "+ -"\u0399 <> I ; "+ - -"\u03ba <> k ;"+ -"\u039a <> K ; "+ - -"\u03bb <> l ; "+ -"\u039b <> L ; "+ - -"\u03bc <> m ; "+ -"\u039c <> M ; "+ - -"\u03bd } $gammaLike > n\\' ; "+ -"\u03bd <> n ; "+ -"\u039d } $gammaLike <> N\\' ; "+ -"\u039d <> N ; "+ - -"\u03be <> x ; "+ -"\u039e <> X ; "+ - -"\u03bf <> o ; "+ -"\u039f <> O ; "+ - -"\u03c0 <> p ; "+ -"\u03a0 <> P ; "+ - -"\u03c1 <> r ; "+ -"\u03a1 <> R ; "+ - -"[Pp] { } \u03c2 > \\' ; "+ -"[Pp] { } \u03c3 > \\' ;"+ - -"# Caron means exception\n"+ - -"# before a letter, initial\n"+ -"\u03c2 } $beforeLetter <> s $under } $beforeLetter;"+ -"\u03c3 } $beforeLetter <> s } $beforeLetter;"+ - -"# otherwise, after a letter = final\n"+ -"$afterLetter { \u03c3 <> $afterLetter { s $under;"+ -"$afterLetter { \u03c2 <> $afterLetter { s ;"+ - -"# otherwise (isolated) = initial\n"+ -"\u03c2 <> s $under;"+ -"\u03c3 <> s ;"+ - -"[Pp] { \u03a3 <> \\'S ; "+ -"\u03a3 <> S ; "+ - -"\u03c4 <> t ; "+ -"\u03a4 <> T ; "+ - -"\u03c6 <> f ; "+ -"\u03a6 <> F ;"+ - -"\u03c7 <> ch ; "+ -"\u03a7 } $beforeLower <> Ch ; "+ -"\u03a7 <> CH ; "+ - -"# Completeness for ASCII\n"+ - -// "$ignore = [[:Mark:]''] * ;"+ - -"| ch < h ;"+ -"| k < c ;"+ -"| i < j ;"+ -"| k < q ;"+ -"| b < u } $vowel ;"+ -"| b < w } $vowel ;"+ -"| y < u ;"+ -"| y < w ;"+ - -"| Ch < H ;"+ -"| K < C ;"+ -"| I < J ;"+ -"| K < Q ;"+ -"| B < W } $vowel ;"+ -"| B < U } $vowel ;"+ -"| Y < W ;"+ -"| Y < U ;"+ - -"# Completeness for Greek\n"+ - -"\u03d0 > | \u03b2 ;"+ -"\u03d1 > | \u03b8 ;"+ -"\u03d2 > | \u03a5 ;"+ -"\u03d5 > | \u03c6 ;"+ -"\u03d6 > | \u03c0 ;"+ - -"\u03f0 > | \u03ba ;"+ -"\u03f1 > | \u03c1 ;"+ -"\u03f2 > | \u03c3 ;"+ -"\u03f3 > j ;"+ -"\u03f4 > | \u0398 ;"+ -"\u03f5 > | \u03b5 ;"+ -"\u00B5 > | \u03BC ; " + - -"# delete any trailing ' marks used for roundtripping\n"+ - -" < [\u03a0\u03c0] { \\' } [Ss] ;"+ -" < [\u039d\u03bd] { \\' } $egammaLike ;"+ - -"::NFC (NFD) ; "+ - -// MINIMAL FILTER GENERATED FOR: Latin-Greek/UNGEGN BACKWARD -":: ( [\u0301\u0304\u0306\u0308':?A-Za-z\u00C0-\u00C5\u00C7-\u00CF\u00D1-\u00D6\u00D9-\u00DD\u00E0-\u00E5\u00E7-\u00EF\u00F1-\u00F6\u00F9-\u00FD\u00FF-\u010F\u0112-\u0125\u0128-\u0130\u0134-\u0137\u0139-\u013E\u0143-\u0148\u014C-\u0151\u0154-\u0165\u0168-\u017E\u01A0-\u01A1\u01AF-\u01B0\u01CD-\u01DC\u01DE-\u01E1\u01E6-\u01ED\u01F0\u01F4-\u01F5\u01F8-\u01FB\u0200-\u021B\u021E-\u021F\u0226-\u0233\u0331\u1E00-\u1E99\u1EA0-\u1EF9\u212A-\u212B] ) ;" - -// ":: ([\\u0000-\\u007F [:Latin:] [:nonspacing mark:]]) ;" - - } - } - }; - } -} diff --git a/icu4j/src/com/ibm/icu/impl/data/LocaleElements_en.java b/icu4j/src/com/ibm/icu/impl/data/LocaleElements_en.java deleted file mode 100755 index b151349478a..00000000000 --- a/icu4j/src/com/ibm/icu/impl/data/LocaleElements_en.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - ******************************************************************************* - * Copyright (C) 1996-2000, International Business Machines Corporation and * - * others. All Rights Reserved. * - ******************************************************************************* - * - * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/impl/data/Attic/LocaleElements_en.java,v $ - * $Date: 2002/02/16 03:05:51 $ - * $Revision: 1.3 $ - * - ***************************************************************************************** - */ - -// WARNING : the format of this file may change in the future! - -package com.ibm.icu.impl.data; - -import java.util.ListResourceBundle; - -public class LocaleElements_en extends ListResourceBundle { - /** - * Overrides ListResourceBundle - */ - public Object[][] getContents() { - return new Object[][] { - { "TransliteratorNamePattern", - /* Format for the display name of a Transliterator. - * This is the English form of this resource. - */ - "{0,choice,0#|1#{1}|2#{1} to {2}}" - }, - - // Transliterator display names - { "%Translit%Hex", "Hex Escape" }, - { "%Translit%UnicodeName", "Unicode Name" }, - { "%Translit%UnicodeChar", "Unicode Character" }, - }; - } -} diff --git a/icu4j/src/com/ibm/icu/impl/data/LocaleElements_xx_CH.java b/icu4j/src/com/ibm/icu/impl/data/LocaleElements_xx_CH.java deleted file mode 100755 index e8c3341da10..00000000000 --- a/icu4j/src/com/ibm/icu/impl/data/LocaleElements_xx_CH.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 1996-2000, International Business Machines Corporation and - * others. All Rights Reserved. - */ -package com.ibm.icu.impl.data; - -import java.util.ListResourceBundle; - -public class LocaleElements_xx_CH extends ListResourceBundle { - /** - * Overrides ListResourceBundle - */ - public Object[][] getContents() { - return new Object[][] { - // The purpose of this overlay is to implement nickel - // rounding for Switzerland - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", - "\u00A4 #,##0.05;\u00A4-#,##0.05", - "#,##0%", - } - }, - }; - } -} diff --git a/icu4j/src/com/ibm/icu/impl/data/LocaleElements_xx_ES.java b/icu4j/src/com/ibm/icu/impl/data/LocaleElements_xx_ES.java deleted file mode 100755 index f89ed786b42..00000000000 --- a/icu4j/src/com/ibm/icu/impl/data/LocaleElements_xx_ES.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 1996-2000, International Business Machines Corporation and - * others. All Rights Reserved. - */ -package com.ibm.icu.impl.data; - -import java.util.ListResourceBundle; - -public class LocaleElements_xx_ES extends ListResourceBundle { - /** - * Overrides ListResourceBundle - */ - public Object[][] getContents() { - return new Object[][] { - // The purpose of this overlay is to make sure the number - // of fractional digits for Pesetas is zero; it is - // non-zero in some JDKs. - { "NumberPatterns", - new String[] { - "#,##0.###;-#,##0.###", // decimal pattern - "#,##0 \u00A4;-#,##0 \u00A4", // currency pattern - "#,##0%" // percent pattern - } - }, - }; - } -} diff --git a/icu4j/src/com/ibm/icu/impl/data/LocaleElements_xx_IN.java b/icu4j/src/com/ibm/icu/impl/data/LocaleElements_xx_IN.java deleted file mode 100755 index 3af4125fb20..00000000000 --- a/icu4j/src/com/ibm/icu/impl/data/LocaleElements_xx_IN.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 1996-2000, International Business Machines Corporation and - * others. All Rights Reserved. - */ -package com.ibm.icu.impl.data; - -import java.util.ListResourceBundle; - -public class LocaleElements_xx_IN extends ListResourceBundle { - /** - * Overrides ListResourceBundle - */ - public Object[][] getContents() { - return new Object[][] { - // The purpose of this overlay is to specify the secondary - // grouping separator for Indian numbers. - { "NumberPatterns", - new String[] { - "#,##,##0.###", - "\u00A4 #,##,##0.00;-\u00A4 #,##,##0.00", - "#,##,##0%" - } - }, - }; - } -}