From a25960797a72e63d5f328808bed9aac7a74e84ae Mon Sep 17 00:00:00 2001 From: Doug Felt Date: Thu, 9 Jul 2009 23:49:42 +0000 Subject: [PATCH] ICU-7044 merge translit modularization into trunk X-SVN-Rev: 26280 --- .gitattributes | 9 + .gitignore | 2 + icu4j/build.xml | 58 ++- icu4j/main/classes/core/build.xml | 1 + icu4j/main/classes/translit/.classpath | 7 + .../copy-data-translit.launch | 25 ++ icu4j/main/classes/translit/.project | 29 ++ .../.settings/org.eclipse.jdt.core.prefs | 332 ++++++++++++++++++ .../.settings/org.eclipse.jdt.ui.prefs | 10 + icu4j/main/classes/translit/build.properties | 5 + icu4j/main/classes/translit/build.xml | 35 ++ icu4j/main/classes/translit/manifest.stub | 11 + .../com/ibm/icu/impl/UtilityExtensions.java | 0 .../com/ibm/icu/text/AnyTransliterator.java | 0 .../com/ibm/icu/text/BreakTransliterator.java | 0 .../ibm/icu/text/CaseFoldTransliterator.java | 0 .../ibm/icu/text/CompoundTransliterator.java | 0 .../ibm/icu/text/EscapeTransliterator.java | 0 .../com/ibm/icu/text/FunctionReplacer.java | 0 .../ibm/icu/text/LowercaseTransliterator.java | 0 .../icu/text/NameUnicodeTransliterator.java | 0 .../icu/text/NormalizationTransliterator.java | 0 .../com/ibm/icu/text/NullTransliterator.java | 0 .../ibm/icu/text/RemoveTransliterator.java | 0 .../ibm/icu/text/RuleBasedTransliterator.java | 0 .../src/com/ibm/icu/text/StringMatcher.java | 0 .../src/com/ibm/icu/text/StringReplacer.java | 0 .../ibm/icu/text/TitlecaseTransliterator.java | 0 .../ibm/icu/text/TransformTransliterator.java | 0 .../com/ibm/icu/text/TransliterationRule.java | 0 .../ibm/icu/text/TransliterationRuleSet.java | 0 .../src/com/ibm/icu/text/Transliterator.java | 0 .../ibm/icu/text/TransliteratorIDParser.java | 0 .../ibm/icu/text/TransliteratorParser.java | 0 .../ibm/icu/text/TransliteratorRegistry.java | 0 .../ibm/icu/text/UnescapeTransliterator.java | 0 .../icu/text/UnicodeNameTransliterator.java | 0 .../ibm/icu/text/UppercaseTransliterator.java | 0 .../classes/translit/translit-build.launch | 26 ++ icu4j/main/shared/build/common-targets.xml | 21 ++ icu4j/main/shared/build/common.properties | 2 + .../shared/build/locations-eclipse.properties | 4 + icu4j/main/shared/build/locations.properties | 2 + .../src/com/ibm/icu/dev/test/TestAllCore.java | 1 - .../ibm/icu/dev/test/cldr/TestCLDRVsICU.java | 28 +- .../com/ibm/icu/dev/test/lang/TestAll.java | 11 +- .../{translit => lang}/UnicodeSetTest.java | 2 +- .../test/stringprep/NamePrepTransform.java | 14 +- .../ibm/icu/dev/test/stringprep/TestAll.java | 23 +- .../dev/test/timezone/TimeZoneAliasTest.java | 33 +- .../src/com/ibm/icu/dev/test/TestAll.java | 3 +- icu4j/main/tests/translit/.classpath | 10 + .../copy-translit-test-data.launch | 25 ++ icu4j/main/tests/translit/.project | 31 ++ .../.settings/org.eclipse.jdt.core.prefs | 332 ++++++++++++++++++ .../.settings/org.eclipse.jdt.ui.prefs | 10 + icu4j/main/tests/translit/build.properties | 5 + icu4j/main/tests/translit/build.xml | 36 ++ icu4j/main/tests/translit/manifest.stub | 11 + .../com/ibm/icu/dev/test/TestAllTranslit.java | 32 ++ .../icu/dev/test/translit/AnyScriptTest.java | 0 .../translit/CompoundTransliteratorTest.java | 0 .../ibm/icu/dev/test/translit/ErrorTest.java | 0 .../ibm/icu/dev/test/translit/JamoTest.java | 0 .../dev/test/translit/RegexUtilitiesTest.java | 0 .../dev/test/translit/ReplaceableTest.java | 0 .../icu/dev/test/translit/RoundTripTest.java | 0 .../ibm/icu/dev/test/translit/TestAll.java | 1 - .../icu/dev/test/translit/TestUtility.java | 0 .../dev/test/translit/TransliteratorTest.java | 35 +- .../icu/dev/test/translit/UnicodeMapTest.java | 0 .../icu/dev/test/translit/WriteCharts.java | 0 .../icu/dev/test/translit/langtagRegex.txt | 0 .../ibm/icu/dev/test/translit/package.html | 0 .../src/com/ibm/icu/dev/test/util/BNF.java | 0 .../ibm/icu/dev/test/util/BagFormatter.java | 0 .../ibm/icu/dev/test/util/CaseIterator.java | 0 .../dev/test/util/CollectionUtilities.java | 0 .../dev/test/util/DataInputCompressor.java | 0 .../dev/test/util/DataOutputCompressor.java | 0 .../ibm/icu/dev/test/util/FileUtilities.java | 0 .../icu/dev/test/util/ICUPropertyFactory.java | 0 .../src/com/ibm/icu/dev/test/util/Pick.java | 0 .../ibm/icu/dev/test/util/PrettyPrinter.java | 0 .../src/com/ibm/icu/dev/test/util/Quoter.java | 0 .../src/com/ibm/icu/dev/test/util/Tabber.java | 0 .../com/ibm/icu/dev/test/util/TestBNF.java | 0 .../icu/dev/test/util/TestBagFormatter.java | 0 .../ibm/icu/dev/test/util/TestUtilities.java | 0 .../com/ibm/icu/dev/test/util/Tokenizer.java | 0 .../test/util/TransliteratorUtilities.java | 0 .../ibm/icu/dev/test/util/UnicodeLabel.java | 0 .../com/ibm/icu/dev/test/util/UnicodeMap.java | 0 .../icu/dev/test/util/UnicodeProperty.java | 0 .../com/ibm/icu/dev/test/util/Visitor.java | 0 .../translit/translit-tests-build.launch | 20 ++ .../main/tests/translit/translit-tests.launch | 13 + .../translit/TransliteratorInputMethod.java | 9 +- 98 files changed, 1188 insertions(+), 76 deletions(-) create mode 100644 icu4j/main/classes/translit/.classpath create mode 100644 icu4j/main/classes/translit/.externalToolBuilders/copy-data-translit.launch create mode 100644 icu4j/main/classes/translit/.project create mode 100644 icu4j/main/classes/translit/.settings/org.eclipse.jdt.core.prefs create mode 100644 icu4j/main/classes/translit/.settings/org.eclipse.jdt.ui.prefs create mode 100644 icu4j/main/classes/translit/build.properties create mode 100644 icu4j/main/classes/translit/build.xml create mode 100644 icu4j/main/classes/translit/manifest.stub rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/impl/UtilityExtensions.java (100%) rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/text/AnyTransliterator.java (100%) rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/text/BreakTransliterator.java (100%) rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/text/CaseFoldTransliterator.java (100%) rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/text/CompoundTransliterator.java (100%) rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/text/EscapeTransliterator.java (100%) rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/text/FunctionReplacer.java (100%) rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/text/LowercaseTransliterator.java (100%) rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/text/NameUnicodeTransliterator.java (100%) rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/text/NormalizationTransliterator.java (100%) rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/text/NullTransliterator.java (100%) rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/text/RemoveTransliterator.java (100%) rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/text/RuleBasedTransliterator.java (100%) rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/text/StringMatcher.java (100%) rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/text/StringReplacer.java (100%) rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/text/TitlecaseTransliterator.java (100%) rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/text/TransformTransliterator.java (100%) rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/text/TransliterationRule.java (100%) rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/text/TransliterationRuleSet.java (100%) rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/text/Transliterator.java (100%) rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/text/TransliteratorIDParser.java (100%) rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/text/TransliteratorParser.java (100%) rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/text/TransliteratorRegistry.java (100%) rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/text/UnescapeTransliterator.java (100%) rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/text/UnicodeNameTransliterator.java (100%) rename icu4j/main/classes/{core => translit}/src/com/ibm/icu/text/UppercaseTransliterator.java (100%) create mode 100644 icu4j/main/classes/translit/translit-build.launch rename icu4j/main/tests/core/src/com/ibm/icu/dev/test/{translit => lang}/UnicodeSetTest.java (99%) create mode 100644 icu4j/main/tests/translit/.classpath create mode 100644 icu4j/main/tests/translit/.externalToolBuilders/copy-translit-test-data.launch create mode 100644 icu4j/main/tests/translit/.project create mode 100644 icu4j/main/tests/translit/.settings/org.eclipse.jdt.core.prefs create mode 100644 icu4j/main/tests/translit/.settings/org.eclipse.jdt.ui.prefs create mode 100644 icu4j/main/tests/translit/build.properties create mode 100644 icu4j/main/tests/translit/build.xml create mode 100644 icu4j/main/tests/translit/manifest.stub create mode 100644 icu4j/main/tests/translit/src/com/ibm/icu/dev/test/TestAllTranslit.java rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/translit/AnyScriptTest.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/translit/CompoundTransliteratorTest.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/translit/ErrorTest.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/translit/JamoTest.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/translit/RegexUtilitiesTest.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/translit/ReplaceableTest.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/translit/RoundTripTest.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/translit/TestAll.java (96%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/translit/TestUtility.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java (99%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/translit/UnicodeMapTest.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/translit/WriteCharts.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/translit/langtagRegex.txt (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/translit/package.html (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/util/BNF.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/util/BagFormatter.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/util/CaseIterator.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/util/CollectionUtilities.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/util/DataInputCompressor.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/util/DataOutputCompressor.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/util/FileUtilities.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/util/ICUPropertyFactory.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/util/Pick.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/util/PrettyPrinter.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/util/Quoter.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/util/Tabber.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/util/TestBNF.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/util/TestBagFormatter.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/util/TestUtilities.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/util/Tokenizer.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/util/TransliteratorUtilities.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/util/UnicodeLabel.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/util/UnicodeMap.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/util/UnicodeProperty.java (100%) rename icu4j/main/tests/{core => translit}/src/com/ibm/icu/dev/test/util/Visitor.java (100%) create mode 100644 icu4j/main/tests/translit/translit-tests-build.launch create mode 100644 icu4j/main/tests/translit/translit-tests.launch diff --git a/.gitattributes b/.gitattributes index 8eac9da5b39..c5f94bc695d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -87,6 +87,10 @@ icu4j/main/classes/localespi/src/META-INF/services/java.util.spi.CurrencyNamePro icu4j/main/classes/localespi/src/META-INF/services/java.util.spi.LocaleNameProvider -text icu4j/main/classes/localespi/src/META-INF/services/java.util.spi.TimeZoneNameProvider -text icu4j/main/classes/localespi/src/com/ibm/icu/impl/javaspi/ICULocaleServiceProviderConfig.properties -text +icu4j/main/classes/translit/.externalToolBuilders/copy-data-translit.launch -text +icu4j/main/classes/translit/.settings/org.eclipse.jdt.core.prefs -text +icu4j/main/classes/translit/.settings/org.eclipse.jdt.ui.prefs -text +icu4j/main/classes/translit/translit-build.launch -text icu4j/main/shared/.project -text icu4j/main/shared/data/icudata.jar -text icu4j/main/shared/data/testdata.jar -text @@ -244,6 +248,11 @@ icu4j/main/tests/framework/manifest.stub -text icu4j/main/tests/localespi/.classpath -text icu4j/main/tests/localespi/.project -text icu4j/main/tests/localespi/manifest.stub -text +icu4j/main/tests/translit/.externalToolBuilders/copy-translit-test-data.launch -text +icu4j/main/tests/translit/.settings/org.eclipse.jdt.core.prefs -text +icu4j/main/tests/translit/.settings/org.eclipse.jdt.ui.prefs -text +icu4j/main/tests/translit/translit-tests-build.launch -text +icu4j/main/tests/translit/translit-tests.launch -text icu4j/tools/build/icu4j28.api.gz -text icu4j/tools/build/icu4j30.api.gz -text icu4j/tools/build/icu4j32.api.gz -text diff --git a/.gitignore b/.gitignore index 3a72f11dfae..886f0411263 100644 --- a/.gitignore +++ b/.gitignore @@ -771,11 +771,13 @@ icu4j/main/classes/charset/out icu4j/main/classes/collate/out icu4j/main/classes/core/out icu4j/main/classes/localespi/out +icu4j/main/classes/translit/out icu4j/main/tests/charset/out icu4j/main/tests/collate/out icu4j/main/tests/core/out icu4j/main/tests/framework/out icu4j/main/tests/localespi/out +icu4j/main/tests/translit/out icu4j/out icu4j/tools/build/out icu4j/tools/misc/out diff --git a/icu4j/build.xml b/icu4j/build.xml index 3c705422165..3a3435084b4 100644 --- a/icu4j/build.xml +++ b/icu4j/build.xml @@ -14,6 +14,7 @@ + @@ -63,11 +64,13 @@ + + @@ -76,6 +79,7 @@ + @@ -87,8 +91,8 @@ - - + + @@ -131,7 +135,7 @@ - + @@ -142,10 +146,12 @@ + - + + @@ -189,12 +195,25 @@ + + + + + + + + + + + + + @@ -239,6 +258,10 @@ + + + + @@ -263,7 +286,11 @@ - + + + + + @@ -297,6 +324,9 @@ + + + @@ -325,6 +355,9 @@ + + + @@ -337,6 +370,9 @@ + + + @@ -345,10 +381,12 @@ + + @@ -391,6 +429,9 @@ + + + @@ -463,6 +504,7 @@ target="${javac.target}" debug="on" deprecation="off"> + @@ -516,7 +558,9 @@ debug="on" deprecation="off"> - + + + @@ -705,6 +749,7 @@ + + + diff --git a/icu4j/main/classes/translit/.classpath b/icu4j/main/classes/translit/.classpath new file mode 100644 index 00000000000..2c3febc3077 --- /dev/null +++ b/icu4j/main/classes/translit/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/icu4j/main/classes/translit/.externalToolBuilders/copy-data-translit.launch b/icu4j/main/classes/translit/.externalToolBuilders/copy-data-translit.launch new file mode 100644 index 00000000000..886dce86d6b --- /dev/null +++ b/icu4j/main/classes/translit/.externalToolBuilders/copy-data-translit.launch @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icu4j/main/classes/translit/.project b/icu4j/main/classes/translit/.project new file mode 100644 index 00000000000..29a64c839f2 --- /dev/null +++ b/icu4j/main/classes/translit/.project @@ -0,0 +1,29 @@ + + + icu4j-translit + + + icu4j-core + icu4j-shared + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.ui.externaltools.ExternalToolBuilder + full,incremental, + + + LaunchConfigHandle + <project>/.externalToolBuilders/copy-data-translit.launch + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/icu4j/main/classes/translit/.settings/org.eclipse.jdt.core.prefs b/icu4j/main/classes/translit/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..7306f7bf1c4 --- /dev/null +++ b/icu4j/main/classes/translit/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,332 @@ +#Wed Jul 08 12:16:38 EDT 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=ignore +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=120 +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=true +org.eclipse.jdt.core.formatter.join_wrapped_lines=true +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=120 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/icu4j/main/classes/translit/.settings/org.eclipse.jdt.ui.prefs b/icu4j/main/classes/translit/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 00000000000..977a256edd2 --- /dev/null +++ b/icu4j/main/classes/translit/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,10 @@ +#Wed Jul 08 12:14:39 EDT 2009 +eclipse.preferences.version=1 +formatter_profile=_ICU4J Standard +formatter_settings_version=11 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=java;javax;org;com; +org.eclipse.jdt.ui.javadoc=true +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates= diff --git a/icu4j/main/classes/translit/build.properties b/icu4j/main/classes/translit/build.properties new file mode 100644 index 00000000000..3dc6ef566f1 --- /dev/null +++ b/icu4j/main/classes/translit/build.properties @@ -0,0 +1,5 @@ +#******************************************************************************* +#* Copyright (C) 2009, International Business Machines Corporation and * +#* others. All Rights Reserved. * +#******************************************************************************* +shared.dir = ../../shared diff --git a/icu4j/main/classes/translit/build.xml b/icu4j/main/classes/translit/build.xml new file mode 100644 index 00000000000..f5ac7af1909 --- /dev/null +++ b/icu4j/main/classes/translit/build.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icu4j/main/classes/translit/manifest.stub b/icu4j/main/classes/translit/manifest.stub new file mode 100644 index 00000000000..d2149b5ead0 --- /dev/null +++ b/icu4j/main/classes/translit/manifest.stub @@ -0,0 +1,11 @@ +Manifest-Version: 1.0 + +Name: com/ibm/icu/text +Specification-Title: ICU for Java Transliteration +Specification-Version: @SPECVERSION@ +Specification-Vendor: ICU +Implementation-Title: ICU for Java Transliteration +Implementation-Version: @IMPLVERSION@ +Implementation-Vendor: IBM Corporation +Implementation-Vendor-Id: com.ibm +Copyright-Info: @COPYRIGHT@ \ No newline at end of file diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/UtilityExtensions.java b/icu4j/main/classes/translit/src/com/ibm/icu/impl/UtilityExtensions.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/impl/UtilityExtensions.java rename to icu4j/main/classes/translit/src/com/ibm/icu/impl/UtilityExtensions.java diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/AnyTransliterator.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/AnyTransliterator.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/text/AnyTransliterator.java rename to icu4j/main/classes/translit/src/com/ibm/icu/text/AnyTransliterator.java diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/BreakTransliterator.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/BreakTransliterator.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/text/BreakTransliterator.java rename to icu4j/main/classes/translit/src/com/ibm/icu/text/BreakTransliterator.java diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/CaseFoldTransliterator.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/CaseFoldTransliterator.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/text/CaseFoldTransliterator.java rename to icu4j/main/classes/translit/src/com/ibm/icu/text/CaseFoldTransliterator.java diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/CompoundTransliterator.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/CompoundTransliterator.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/text/CompoundTransliterator.java rename to icu4j/main/classes/translit/src/com/ibm/icu/text/CompoundTransliterator.java diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/EscapeTransliterator.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/EscapeTransliterator.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/text/EscapeTransliterator.java rename to icu4j/main/classes/translit/src/com/ibm/icu/text/EscapeTransliterator.java diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/FunctionReplacer.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/FunctionReplacer.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/text/FunctionReplacer.java rename to icu4j/main/classes/translit/src/com/ibm/icu/text/FunctionReplacer.java diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/LowercaseTransliterator.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/LowercaseTransliterator.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/text/LowercaseTransliterator.java rename to icu4j/main/classes/translit/src/com/ibm/icu/text/LowercaseTransliterator.java diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/NameUnicodeTransliterator.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/NameUnicodeTransliterator.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/text/NameUnicodeTransliterator.java rename to icu4j/main/classes/translit/src/com/ibm/icu/text/NameUnicodeTransliterator.java diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/NormalizationTransliterator.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/NormalizationTransliterator.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/text/NormalizationTransliterator.java rename to icu4j/main/classes/translit/src/com/ibm/icu/text/NormalizationTransliterator.java diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/NullTransliterator.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/NullTransliterator.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/text/NullTransliterator.java rename to icu4j/main/classes/translit/src/com/ibm/icu/text/NullTransliterator.java diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/RemoveTransliterator.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/RemoveTransliterator.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/text/RemoveTransliterator.java rename to icu4j/main/classes/translit/src/com/ibm/icu/text/RemoveTransliterator.java diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedTransliterator.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/RuleBasedTransliterator.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedTransliterator.java rename to icu4j/main/classes/translit/src/com/ibm/icu/text/RuleBasedTransliterator.java diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/StringMatcher.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/StringMatcher.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/text/StringMatcher.java rename to icu4j/main/classes/translit/src/com/ibm/icu/text/StringMatcher.java diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/StringReplacer.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/StringReplacer.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/text/StringReplacer.java rename to icu4j/main/classes/translit/src/com/ibm/icu/text/StringReplacer.java diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/TitlecaseTransliterator.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/TitlecaseTransliterator.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/text/TitlecaseTransliterator.java rename to icu4j/main/classes/translit/src/com/ibm/icu/text/TitlecaseTransliterator.java diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/TransformTransliterator.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/TransformTransliterator.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/text/TransformTransliterator.java rename to icu4j/main/classes/translit/src/com/ibm/icu/text/TransformTransliterator.java diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/TransliterationRule.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/TransliterationRule.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/text/TransliterationRule.java rename to icu4j/main/classes/translit/src/com/ibm/icu/text/TransliterationRule.java diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/TransliterationRuleSet.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/TransliterationRuleSet.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/text/TransliterationRuleSet.java rename to icu4j/main/classes/translit/src/com/ibm/icu/text/TransliterationRuleSet.java diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/Transliterator.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/Transliterator.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/text/Transliterator.java rename to icu4j/main/classes/translit/src/com/ibm/icu/text/Transliterator.java diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/TransliteratorIDParser.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/TransliteratorIDParser.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/text/TransliteratorIDParser.java rename to icu4j/main/classes/translit/src/com/ibm/icu/text/TransliteratorIDParser.java diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/TransliteratorParser.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/TransliteratorParser.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/text/TransliteratorParser.java rename to icu4j/main/classes/translit/src/com/ibm/icu/text/TransliteratorParser.java diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/TransliteratorRegistry.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/TransliteratorRegistry.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/text/TransliteratorRegistry.java rename to icu4j/main/classes/translit/src/com/ibm/icu/text/TransliteratorRegistry.java diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/UnescapeTransliterator.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/UnescapeTransliterator.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/text/UnescapeTransliterator.java rename to icu4j/main/classes/translit/src/com/ibm/icu/text/UnescapeTransliterator.java diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/UnicodeNameTransliterator.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/UnicodeNameTransliterator.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/text/UnicodeNameTransliterator.java rename to icu4j/main/classes/translit/src/com/ibm/icu/text/UnicodeNameTransliterator.java diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/UppercaseTransliterator.java b/icu4j/main/classes/translit/src/com/ibm/icu/text/UppercaseTransliterator.java similarity index 100% rename from icu4j/main/classes/core/src/com/ibm/icu/text/UppercaseTransliterator.java rename to icu4j/main/classes/translit/src/com/ibm/icu/text/UppercaseTransliterator.java diff --git a/icu4j/main/classes/translit/translit-build.launch b/icu4j/main/classes/translit/translit-build.launch new file mode 100644 index 00000000000..9678f7d68b1 --- /dev/null +++ b/icu4j/main/classes/translit/translit-build.launch @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icu4j/main/shared/build/common-targets.xml b/icu4j/main/shared/build/common-targets.xml index ffdcf3f757f..2e903ff70f6 100644 --- a/icu4j/main/shared/build/common-targets.xml +++ b/icu4j/main/shared/build/common-targets.xml @@ -108,6 +108,16 @@ + + + + + + + + + + @@ -161,6 +171,17 @@ + + + + + + + + + + + diff --git a/icu4j/main/shared/build/common.properties b/icu4j/main/shared/build/common.properties index 6813777db46..e42c02351ec 100644 --- a/icu4j/main/shared/build/common.properties +++ b/icu4j/main/shared/build/common.properties @@ -38,12 +38,14 @@ icu4j.core.jar = ${icu4j.core.dir}/${jar.dir}/icu4j.jar icu4j.collate.jar = ${icu4j.collate.dir}/${jar.dir}/icu4j-collate.jar icu4j.charset.jar = ${icu4j.charset.dir}/${jar.dir}/icu4j-charsets.jar icu4j.localespi.jar = ${icu4j.localespi.dir}/${jar.dir}/icu4j-localespi.jar +icu4j.translit.jar = ${icu4j.translit.dir}/${jar.dir}/icu4j-translit.jar icu4j.test-framework.jar = ${icu4j.test-framework.dir}/${jar.dir}/icu4j-test-framework.jar icu4j.core-tests.jar = ${icu4j.core-tests.dir}/${jar.dir}/icu4j-core-tests.jar icu4j.collate-tests.jar = ${icu4j.collate-tests.dir}/${jar.dir}/icu4j-collate-tests.jar icu4j.charset-tests.jar = ${icu4j.charset-tests.dir}/${jar.dir}/icu4j-charset-tests.jar icu4j.localespi-tests.jar = ${icu4j.localespi-tests.dir}/${jar.dir}/icu4j-localespi-tests.jar +icu4j.translit-tests.jar = ${icu4j.translit-tests.dir}/${jar.dir}/icu4j-translit-tests.jar icu4j.build-tools.jar = ${icu4j.build-tools.dir}/${jar.dir}/icu4j-build-tools.jar icu4j.tools.jar = ${icu4j.tools.dir}/${jar.dir}/icu4j-tools.jar diff --git a/icu4j/main/shared/build/locations-eclipse.properties b/icu4j/main/shared/build/locations-eclipse.properties index cbf48e3a5a7..f009df569b8 100644 --- a/icu4j/main/shared/build/locations-eclipse.properties +++ b/icu4j/main/shared/build/locations-eclipse.properties @@ -6,12 +6,16 @@ shared.dir = ${workspace_loc:/icu4j-shared} icu4j.core.dir = ${workspace_loc:/icu4j-core} icu4j.charset.dir = ${workspace_loc:/icu4j-charset} +icu4j.collate.dir = ${workspace_loc:/icu4j-collate} icu4j.localespi.dir = ${workspace_loc:/icu4j-localespi} +icu4j.translit.dir = ${workspace_loc:/icu4j-translit} icu4j.test-framework.dir = ${workspace_loc:/icu4j-test-framework} icu4j.core-tests.dir = ${workspace_loc:/icu4j-core-tests} +icu4j.collate-tests.dir = ${workspace_loc:/icu4j-collate-tests} icu4j.charset-tests.dir = ${workspace_loc:/icu4j-charset-tests} icu4j.localespi-tests.dir = ${workspace_loc:/icu4j-localespi-tests} +icu4j.translit-tests.dir = ${workspace_loc:/icu4j-translit-tests} icu4j.build-tools.dir = ${workspace_loc:/icu4j-build-tools} icu4j.tools.dir = ${workspace_loc:/icu4j-tools} diff --git a/icu4j/main/shared/build/locations.properties b/icu4j/main/shared/build/locations.properties index 2942040ec1b..f67526ac027 100644 --- a/icu4j/main/shared/build/locations.properties +++ b/icu4j/main/shared/build/locations.properties @@ -7,12 +7,14 @@ icu4j.collate.dir = ${shared.dir}/../classes/collate icu4j.core.dir = ${shared.dir}/../classes/core icu4j.charset.dir = ${shared.dir}/../classes/charset icu4j.localespi.dir = ${shared.dir}/../classes/localespi +icu4j.translit.dir = ${shared.dir}/../classes/translit icu4j.test-framework.dir = ${shared.dir}/../tests/framework icu4j.core-tests.dir = ${shared.dir}/../tests/core icu4j.collate-tests.dir = ${shared.dir}/../tests/collate icu4j.charset-tests.dir = ${shared.dir}/../tests/charset icu4j.localespi-tests.dir = ${shared.dir}/../tests/localespi +icu4j.translit-tests.dir = ${shared.dir}/../tests/translit icu4j.build-tools.dir = ${shared.dir}/../../tools/build icu4j.tools.dir = ${shared.dir}/../../tools/misc diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/TestAllCore.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/TestAllCore.java index d0f18395b68..a7028e66fd9 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/TestAllCore.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/TestAllCore.java @@ -20,7 +20,6 @@ public class TestAllCore extends TestGroup { "com.ibm.icu.dev.test.format.TestAll", "com.ibm.icu.dev.test.compression.TestAll", "com.ibm.icu.dev.test.rbbi.TestAll", - "com.ibm.icu.dev.test.translit.TestAll", "com.ibm.icu.dev.test.shaping.ArabicShapingRegTest", "com.ibm.icu.dev.test.calendar.TestAll", "com.ibm.icu.dev.test.timezone.TestAll", diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/cldr/TestCLDRVsICU.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/cldr/TestCLDRVsICU.java index 75e8ee5765e..e9d9b3d7497 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/cldr/TestCLDRVsICU.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/cldr/TestCLDRVsICU.java @@ -39,7 +39,8 @@ import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.text.DateFormat; import com.ibm.icu.text.NumberFormat; import com.ibm.icu.text.SimpleDateFormat; -import com.ibm.icu.text.Transliterator; +// dlf transliterator is also not in core +// import com.ibm.icu.text.Transliterator; import com.ibm.icu.text.UTF16; import com.ibm.icu.text.UnicodeSet; import com.ibm.icu.util.Currency; @@ -141,7 +142,30 @@ public class TestCLDRVsICU extends TestFmwk { SAX.parse(f, DEFAULT_HANDLER); } - static Transliterator toUnicode = Transliterator.getInstance("any-hex"); + // static Transliterator toUnicode = Transliterator.getInstance("any-hex"); + + private static class ToHex { + public String transliterate(String in) { + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < in.length(); ++i) { + char c = in.charAt(i); + sb.append("\\u"); + if (c < 1000) { + sb.append('0'); + if (c < 100) { + sb.append('0'); + if (c < 10) { + sb.append('0'); + } + } + } + sb.append(Integer.toHexString((int)c)); + } + return sb.toString(); + } + } + private static final ToHex toUnicode = new ToHex(); + static public String showString(String in) { return "\u00AB" + in + "\u00BB (" + toUnicode.transliterate(in) + ")"; } diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/TestAll.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/TestAll.java index 6e72fe1b2f2..15cdd2a7679 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/TestAll.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/TestAll.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 1996-2004, International Business Machines Corporation and * + * Copyright (C) 1996-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -18,10 +18,11 @@ public class TestAll extends TestGroup { public TestAll() { super( - new String[] { - "TestCharacter", - "TestUScript", - "TestUScriptRun" + new String[] { + "TestCharacter", + "TestUScript", + "TestUScriptRun", + "UnicodeSetTest" }, "Character and Script Tests"); } diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/UnicodeSetTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UnicodeSetTest.java similarity index 99% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/UnicodeSetTest.java rename to icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UnicodeSetTest.java index ac96e17729d..5df1f609de2 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/UnicodeSetTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UnicodeSetTest.java @@ -4,7 +4,7 @@ * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.translit; +package com.ibm.icu.dev.test.lang; import java.text.ParsePosition; import java.util.ArrayList; diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/stringprep/NamePrepTransform.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/stringprep/NamePrepTransform.java index 6fb202cf7d7..a538c0ea063 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/stringprep/NamePrepTransform.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/stringprep/NamePrepTransform.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2003-2007, International Business Machines Corporation and * + * Copyright (C) 2003-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -14,7 +14,8 @@ import com.ibm.icu.lang.UCharacterDirection; import com.ibm.icu.text.StringPrepParseException; import com.ibm.icu.text.UCharacterIterator; import com.ibm.icu.text.UnicodeSet; -import com.ibm.icu.text.Transliterator; +// disable tests that have dependency on Transliterator for now +// import com.ibm.icu.text.Transliterator; /** * @author ram @@ -29,7 +30,7 @@ public class NamePrepTransform { private UnicodeSet labelSeparatorSet; private UnicodeSet prohibitedSet; private UnicodeSet unassignedSet; - private Transliterator mapTransform; + // private Transliterator mapTransform; public static final int NONE = 0; public static final int ALLOW_UNASSIGNED = 1; @@ -38,7 +39,8 @@ public class NamePrepTransform { ICUResourceBundle bundle = (ICUResourceBundle)ICUResourceBundle.getBundleInstance("com/ibm/icu/dev/data/testdata","idna_rules", NamePrepTransform.class.getClassLoader(), true); String mapRules = bundle.getString("MapNoNormalization"); mapRules += bundle.getString("MapNFKC"); - mapTransform = Transliterator.createFromRules("CaseMap",mapRules,Transliterator.FORWARD); + // disable + // mapTransform = Transliterator.createFromRules("CaseMap",mapRules,Transliterator.FORWARD); labelSeparatorSet = new UnicodeSet(bundle.getString("LabelSeparatorSet")); prohibitedSet = new UnicodeSet(bundle.getString("ProhibitedSet")); unassignedSet = new UnicodeSet(bundle.getString("UnassignedSet")); @@ -98,7 +100,9 @@ public class NamePrepTransform { throws StringPrepParseException{ // map boolean allowUnassigned = ((options & ALLOW_UNASSIGNED)>0); - String caseMapOut = transform.mapTransform.transliterate(src); + // disable test + // String caseMapOut = transform.mapTransform.transliterate(src); + String caseMapOut = src; UCharacterIterator iter = UCharacterIterator.getInstance(caseMapOut); int ch; while((ch=iter.nextCodePoint())!=UCharacterIterator.DONE){ diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/stringprep/TestAll.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/stringprep/TestAll.java index cc7cd217a01..704775f3fb1 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/stringprep/TestAll.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/stringprep/TestAll.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2003-2005, International Business Machines Corporation and * + * Copyright (C) 2003-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -15,24 +15,23 @@ import com.ibm.icu.dev.test.TestFmwk.TestGroup; * Window>Preferences>Java>Code Generation>Code and Comments */ public class TestAll extends TestGroup { - + public static void main(String[] args) throws Exception { new TestAll().run(args); } public TestAll() { super( - new String[] { - "TestIDNA", - "TestStringPrep", - "TestIDNARef", - "IDNAConformanceTest", - }, - "StringPrep and IDNA test" - ); + new String[] { + // disable these tests while translit is not available + // "TestIDNA", + // "TestStringPrep", + // "TestIDNARef", + "IDNAConformanceTest", + }, + "StringPrep and IDNA test" + ); } public static final String CLASS_TARGET_NAME = "StringPrep"; - - } diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneAliasTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneAliasTest.java index 896110081e8..f5913bc1cca 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneAliasTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneAliasTest.java @@ -10,6 +10,7 @@ import java.text.DateFormat; import java.text.NumberFormat; import java.util.ArrayList; import java.util.Calendar; +import java.util.Collection; import java.util.Date; import java.util.GregorianCalendar; import java.util.HashMap; @@ -21,7 +22,8 @@ import java.util.Set; import java.util.TreeSet; import com.ibm.icu.dev.test.TestFmwk; -import com.ibm.icu.dev.test.util.BagFormatter; +// remove dependency on this for now +// import com.ibm.icu.dev.test.util.BagFormatter; import com.ibm.icu.util.TimeZone; @@ -115,18 +117,24 @@ public class TimeZoneAliasTest extends TestFmwk { /** Utility; ought to be someplace common */ - /* - static String join(Collection c, String separator) { - StringBuffer result = new StringBuffer(); - boolean isFirst = true; - for (Iterator it = c.iterator(); it.hasNext(); ) { - if (!isFirst) result.append(separator); - else isFirst = false; - result.append(it.next().toString()); + // remove dependency on bagformatter for now + static class CollectionJoiner { + private String separator; + CollectionJoiner(String separator) { + this.separator = separator; + } + String join(Collection c) { + StringBuffer result = new StringBuffer(); + boolean isFirst = true; + for (Iterator it = c.iterator(); it.hasNext(); ) { + if (!isFirst) result.append(separator); + else isFirst = false; + result.append(it.next().toString()); + } + return result.toString(); } - return result.toString(); } - */ + /** * The guts is in this subclass. It sucks in all the data from the zones, @@ -140,7 +148,8 @@ public class TimeZoneAliasTest extends TestFmwk { */ static class Zone implements Comparable { // class fields - static private final BagFormatter bf = new BagFormatter().setSeparator(", "); + // static private final BagFormatter bf = new BagFormatter().setSeparator(", "); + private static final CollectionJoiner bf = new CollectionJoiner(", "); static private final DateFormat df = DateFormat.getDateInstance(DateFormat.LONG, Locale.US); static private final NumberFormat nf = NumberFormat.getInstance(Locale.US); static private final long HOUR = 1000*60*60; diff --git a/icu4j/main/tests/framework/src/com/ibm/icu/dev/test/TestAll.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/test/TestAll.java index ac9a57b85f7..2b2e3181609 100644 --- a/icu4j/main/tests/framework/src/com/ibm/icu/dev/test/TestAll.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/test/TestAll.java @@ -20,8 +20,9 @@ public class TestAll extends TestGroup { public TestAll() { super( new String[] { - "com.ibm.icu.dev.test.TestAllCollate", "com.ibm.icu.dev.test.TestAllCore", + "com.ibm.icu.dev.test.TestAllCollate", + "com.ibm.icu.dev.test.TestAllTranslit", "com.ibm.icu.dev.test.charset.TestAll", }, "All tests in ICU"); diff --git a/icu4j/main/tests/translit/.classpath b/icu4j/main/tests/translit/.classpath new file mode 100644 index 00000000000..da02b011427 --- /dev/null +++ b/icu4j/main/tests/translit/.classpath @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/icu4j/main/tests/translit/.externalToolBuilders/copy-translit-test-data.launch b/icu4j/main/tests/translit/.externalToolBuilders/copy-translit-test-data.launch new file mode 100644 index 00000000000..34a684f9511 --- /dev/null +++ b/icu4j/main/tests/translit/.externalToolBuilders/copy-translit-test-data.launch @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icu4j/main/tests/translit/.project b/icu4j/main/tests/translit/.project new file mode 100644 index 00000000000..b9d63b5ebe4 --- /dev/null +++ b/icu4j/main/tests/translit/.project @@ -0,0 +1,31 @@ + + + icu4j-translit-tests + + + icu4j-translit + icu4j-core + icu4j-shared + icu4j-test-framework + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.ui.externaltools.ExternalToolBuilder + full,incremental, + + + LaunchConfigHandle + <project>/.externalToolBuilders/copy-translit-test-data.launch + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/icu4j/main/tests/translit/.settings/org.eclipse.jdt.core.prefs b/icu4j/main/tests/translit/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..91c4068480e --- /dev/null +++ b/icu4j/main/tests/translit/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,332 @@ +#Wed Jul 08 12:24:33 EDT 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=ignore +org.eclipse.jdt.core.compiler.problem.deprecation=ignore +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=120 +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=4 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=true +org.eclipse.jdt.core.formatter.join_wrapped_lines=true +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=120 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/icu4j/main/tests/translit/.settings/org.eclipse.jdt.ui.prefs b/icu4j/main/tests/translit/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 00000000000..a799eb0bacf --- /dev/null +++ b/icu4j/main/tests/translit/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,10 @@ +#Wed Jul 08 12:22:42 EDT 2009 +eclipse.preferences.version=1 +formatter_profile=_ICU4J Standard +formatter_settings_version=11 +org.eclipse.jdt.ui.ignorelowercasenames=true +org.eclipse.jdt.ui.importorder=java;javax;org;com; +org.eclipse.jdt.ui.javadoc=true +org.eclipse.jdt.ui.ondemandthreshold=99 +org.eclipse.jdt.ui.staticondemandthreshold=99 +org.eclipse.jdt.ui.text.custom_code_templates= diff --git a/icu4j/main/tests/translit/build.properties b/icu4j/main/tests/translit/build.properties new file mode 100644 index 00000000000..3dc6ef566f1 --- /dev/null +++ b/icu4j/main/tests/translit/build.properties @@ -0,0 +1,5 @@ +#******************************************************************************* +#* Copyright (C) 2009, International Business Machines Corporation and * +#* others. All Rights Reserved. * +#******************************************************************************* +shared.dir = ../../shared diff --git a/icu4j/main/tests/translit/build.xml b/icu4j/main/tests/translit/build.xml new file mode 100644 index 00000000000..1546c6cd951 --- /dev/null +++ b/icu4j/main/tests/translit/build.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icu4j/main/tests/translit/manifest.stub b/icu4j/main/tests/translit/manifest.stub new file mode 100644 index 00000000000..d4fdf4dfa14 --- /dev/null +++ b/icu4j/main/tests/translit/manifest.stub @@ -0,0 +1,11 @@ +Manifest-Version: 1.0 + +Name: com/ibm/icu/dev/test +Specification-Title: ICU for Java Transliteration Tests +Specification-Version: @SPECVERSION@ +Specification-Vendor: ICU +Implementation-Title: ICU for Java Transliteration Tests +Implementation-Version: @IMPLVERSION@ +Implementation-Vendor: IBM Corporation +Implementation-Vendor-Id: com.ibm +Copyright-Info: @COPYRIGHT@ diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/TestAllTranslit.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/TestAllTranslit.java new file mode 100644 index 00000000000..f4467f4a5e3 --- /dev/null +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/TestAllTranslit.java @@ -0,0 +1,32 @@ +/* + ******************************************************************************* + * Copyright (C) 1996-2009, International Business Machines Corporation and * + * others. All Rights Reserved. * + ******************************************************************************* + */ +package com.ibm.icu.dev.test; + +import com.ibm.icu.dev.test.TestFmwk.TestGroup; + +/** + * Top level test used to run all other tests as a batch. + */ +public class TestAllTranslit extends TestGroup { + + public static void main(String[] args) { + new TestAllTranslit().run(args); + } + + public TestAllTranslit() { + super( + new String[] { + "com.ibm.icu.dev.test.translit.TestAll", + // funky tests of test code + // "com.ibm.icu.dev.test.util.TestBNF", + // "com.ibm.icu.dev.test.util.TestBagFormatter", + }, + "All tests in ICU translit"); + } + + public static final String CLASS_TARGET_NAME = "Translit"; +} diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/AnyScriptTest.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/AnyScriptTest.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/AnyScriptTest.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/AnyScriptTest.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/CompoundTransliteratorTest.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/CompoundTransliteratorTest.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/CompoundTransliteratorTest.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/CompoundTransliteratorTest.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/ErrorTest.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/ErrorTest.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/ErrorTest.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/ErrorTest.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/JamoTest.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/JamoTest.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/JamoTest.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/JamoTest.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/RegexUtilitiesTest.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/RegexUtilitiesTest.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/RegexUtilitiesTest.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/RegexUtilitiesTest.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/ReplaceableTest.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/ReplaceableTest.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/ReplaceableTest.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/ReplaceableTest.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/RoundTripTest.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/RoundTripTest.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/RoundTripTest.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/RoundTripTest.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/TestAll.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TestAll.java similarity index 96% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/TestAll.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TestAll.java index 3c36f8d6adc..83012308a34 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/TestAll.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TestAll.java @@ -26,7 +26,6 @@ public class TestAll extends TestGroup { "ReplaceableTest", "RoundTripTest", "TransliteratorTest", - "UnicodeSetTest", "RegexUtilitiesTest", "UnicodeMapTest", }); diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/TestUtility.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TestUtility.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/TestUtility.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TestUtility.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java similarity index 99% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java index 2f07c54b47f..2780ba351ba 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java @@ -6,29 +6,14 @@ */ package com.ibm.icu.dev.test.translit; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Locale; -import java.util.Vector; - +import com.ibm.icu.lang.*; +import com.ibm.icu.text.*; import com.ibm.icu.dev.test.*; import com.ibm.icu.impl.Utility; import com.ibm.icu.impl.UtilityExtensions; -import com.ibm.icu.lang.UCharacter; -import com.ibm.icu.lang.UScript; -import com.ibm.icu.text.Replaceable; -import com.ibm.icu.text.ReplaceableString; -import com.ibm.icu.text.StringTransform; -import com.ibm.icu.text.Transliterator; -import com.ibm.icu.text.UTF16; -import com.ibm.icu.text.UnicodeFilter; -import com.ibm.icu.text.UnicodeSet; -import com.ibm.icu.text.UnicodeSetIterator; import com.ibm.icu.util.CaseInsensitiveString; import com.ibm.icu.util.ULocale; - +import java.util.*; /*********************************************************************** @@ -3706,32 +3691,30 @@ the ::BEGIN/::END stuff) assertEquals(message + " " +source2, expected, t.transform(source2)); assertEquals(message + " " + expected, source, back.transform(expected)); } - + /* Tests the method * public Enumeration getAvailableTargets(String source) */ public void TestGetAvailableTargets(){ - try{ + try { // Tests when if (targets == null) is true Transliterator.getAvailableTargets(""); } catch(Exception e){ errln("TransliteratorRegistry.getAvailableTargets(String) was not " + - "suppose to return an exception."); + "supposed to return an exception."); } } - + /* Tests the method * public Enumeration getAvailableVariants(String source, String target) */ public void TestGetAvailableVariants(){ - try{ + try { // Tests when if (targets == null) is true Transliterator.getAvailableVariants("",""); } catch(Exception e){ errln("TransliteratorRegistry.getAvailableVariants(String) was not " + - "suppose to return an exception."); + "supposed to return an exception."); } } } - - diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/UnicodeMapTest.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/UnicodeMapTest.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/UnicodeMapTest.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/UnicodeMapTest.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/WriteCharts.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/WriteCharts.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/WriteCharts.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/WriteCharts.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/langtagRegex.txt b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/langtagRegex.txt similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/langtagRegex.txt rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/langtagRegex.txt diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/package.html b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/package.html similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/translit/package.html rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/package.html diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/BNF.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/BNF.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/BNF.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/BNF.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/BagFormatter.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/BagFormatter.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/BagFormatter.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/BagFormatter.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/CaseIterator.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/CaseIterator.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/CaseIterator.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/CaseIterator.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/CollectionUtilities.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/CollectionUtilities.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/CollectionUtilities.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/CollectionUtilities.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DataInputCompressor.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/DataInputCompressor.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DataInputCompressor.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/DataInputCompressor.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DataOutputCompressor.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/DataOutputCompressor.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DataOutputCompressor.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/DataOutputCompressor.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/FileUtilities.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/FileUtilities.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/FileUtilities.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/FileUtilities.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ICUPropertyFactory.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/ICUPropertyFactory.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ICUPropertyFactory.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/ICUPropertyFactory.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/Pick.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Pick.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/Pick.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Pick.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/PrettyPrinter.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/PrettyPrinter.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/PrettyPrinter.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/PrettyPrinter.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/Quoter.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Quoter.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/Quoter.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Quoter.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/Tabber.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Tabber.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/Tabber.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Tabber.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TestBNF.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/TestBNF.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TestBNF.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/TestBNF.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TestBagFormatter.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/TestBagFormatter.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TestBagFormatter.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/TestBagFormatter.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TestUtilities.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/TestUtilities.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TestUtilities.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/TestUtilities.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/Tokenizer.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Tokenizer.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/Tokenizer.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Tokenizer.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TransliteratorUtilities.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/TransliteratorUtilities.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TransliteratorUtilities.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/TransliteratorUtilities.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/UnicodeLabel.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/UnicodeLabel.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/UnicodeLabel.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/UnicodeLabel.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/UnicodeMap.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/UnicodeMap.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/UnicodeMap.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/UnicodeMap.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/UnicodeProperty.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/UnicodeProperty.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/UnicodeProperty.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/UnicodeProperty.java diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/Visitor.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Visitor.java similarity index 100% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/Visitor.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Visitor.java diff --git a/icu4j/main/tests/translit/translit-tests-build.launch b/icu4j/main/tests/translit/translit-tests-build.launch new file mode 100644 index 00000000000..f9107846ea7 --- /dev/null +++ b/icu4j/main/tests/translit/translit-tests-build.launch @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/icu4j/main/tests/translit/translit-tests.launch b/icu4j/main/tests/translit/translit-tests.launch new file mode 100644 index 00000000000..11b18f01c02 --- /dev/null +++ b/icu4j/main/tests/translit/translit-tests.launch @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/icu4j/tools/misc/src/com/ibm/icu/dev/tool/ime/translit/TransliteratorInputMethod.java b/icu4j/tools/misc/src/com/ibm/icu/dev/tool/ime/translit/TransliteratorInputMethod.java index 80d6a0db403..2261c22608d 100644 --- a/icu4j/tools/misc/src/com/ibm/icu/dev/tool/ime/translit/TransliteratorInputMethod.java +++ b/icu4j/tools/misc/src/com/ibm/icu/dev/tool/ime/translit/TransliteratorInputMethod.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2004-2007, International Business Machines Corporation and * + * Copyright (C) 2004-2009, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -41,7 +41,10 @@ import javax.swing.ListCellRenderer; import com.ibm.icu.impl.Utility; import com.ibm.icu.lang.UCharacter; -import com.ibm.icu.text.Collator; + +// remove dependency on ICU collator, restore if we actually need it +// import com.ibm.icu.text.Collator; +import java.text.Collator; import com.ibm.icu.text.ReplaceableString; import com.ibm.icu.text.Transliterator; @@ -716,5 +719,3 @@ class LabelComparator implements Comparator { return this.equals(obj1); } } - -