From a9ced99c1fba5be0b26dc96d75de79c558834ba1 Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Fri, 14 Sep 2012 03:57:54 +0000 Subject: [PATCH] ICU-9435 Refactoring ICU non-core utilities. Added releaseCLDR target in build.xml for generating all CLDR release files including new source jar archives. X-SVN-Rev: 32381 --- icu4j/build.xml | 83 ++++++++++++------- .../test/collator/AlphabeticIndexTest.java | 4 +- .../ibm/icu/dev/test/util/TrieMapTest.java | 3 +- .../ibm/icu/dev}/util/ArrayComparator.java | 4 +- .../{test => }/util/CollectionUtilities.java | 4 +- .../icu/dev}/util/DataInputCompressor.java | 4 +- .../icu/dev}/util/DataOutputCompressor.java | 4 +- .../com/ibm/icu/dev}/util/ElapsedTimer.java | 4 +- .../util/IcuUnicodeNormalizerFactory.java | 6 +- .../com/ibm/icu/dev}/util/ImmutableEntry.java | 4 +- .../src/com/ibm/icu/dev}/util/Pick.java | 20 ++--- .../com/ibm/icu/dev}/util/PrettyPrinter.java | 4 +- .../src/com/ibm/icu/dev}/util/Quoter.java | 4 +- .../src/com/ibm/icu/dev}/util/Relation.java | 2 +- .../src/com/ibm/icu/dev}/util/SortedBag.java | 4 +- .../src/com/ibm/icu/dev}/util/Tabber.java | 4 +- .../src/com/ibm/icu/dev}/util/Timer.java | 4 +- .../com/ibm/icu/dev}/util/UnicodeLabel.java | 4 +- .../src/com/ibm/icu/dev}/util/UnicodeMap.java | 4 +- .../ibm/icu/dev}/util/UnicodeMapIterator.java | 4 +- .../icu/dev}/util/UnicodePropertySource.java | 4 +- .../ibm/icu/dev}/util/UnicodeTransform.java | 4 +- .../ibm/icu/dev}/util/VariableReplacer.java | 6 +- .../src/com/ibm/icu/dev}/util/Visitor.java | 4 +- .../ibm/icu/dev}/util/XEquivalenceClass.java | 4 +- .../ibm/icu/dev}/util/XEquivalenceMap.java | 4 +- .../dev/test/translit/PrettyPrinterTest.java | 4 +- .../test/translit/TestUnicodeProperty.java | 10 +-- .../dev/test/translit/TransliteratorTest.java | 4 +- .../icu/dev/test/translit/UnicodeMapTest.java | 4 +- .../com/ibm/icu/dev/test/util/TestBNF.java | 6 +- .../icu/dev/test/util/TestBagFormatter.java | 6 +- .../ibm/icu/dev/test/util/TestUtilities.java | 6 +- .../com/ibm/icu/dev/{test => }/util/BNF.java | 4 +- .../icu/dev/{test => }/util/BagFormatter.java | 4 +- .../icu/dev/{test => }/util/CaseIterator.java | 5 +- .../dev/{test => }/util/FileUtilities.java | 6 +- .../{test => }/util/ICUPropertyFactory.java | 2 +- .../icu/dev/{test => }/util/Tokenizer.java | 4 +- .../util/TransliteratorUtilities.java | 5 +- .../dev/{test => }/util/UnicodeProperty.java | 10 +-- .../util/UnicodePropertySymbolTable.java | 6 +- icu4j/tools/misc/.classpath | 3 +- .../icu/dev/tool/cldr/CheckSystemFonts.java | 16 ++-- 44 files changed, 174 insertions(+), 131 deletions(-) rename icu4j/main/tests/{core/src/com/ibm/icu/dev/test => framework/src/com/ibm/icu/dev}/util/ArrayComparator.java (96%) rename icu4j/main/tests/framework/src/com/ibm/icu/dev/{test => }/util/CollectionUtilities.java (99%) rename icu4j/main/tests/{translit/src/com/ibm/icu/dev/test => framework/src/com/ibm/icu/dev}/util/DataInputCompressor.java (98%) rename icu4j/main/tests/{translit/src/com/ibm/icu/dev/test => framework/src/com/ibm/icu/dev}/util/DataOutputCompressor.java (98%) rename icu4j/main/tests/{core/src/com/ibm/icu/dev/test => framework/src/com/ibm/icu/dev}/util/ElapsedTimer.java (97%) rename icu4j/main/tests/{translit/src/com/ibm/icu/dev/test => framework/src/com/ibm/icu/dev}/util/IcuUnicodeNormalizerFactory.java (90%) rename icu4j/main/tests/{translit/src/com/ibm/icu/dev/test => framework/src/com/ibm/icu/dev}/util/ImmutableEntry.java (90%) rename icu4j/main/tests/{translit/src/com/ibm/icu/dev/test => framework/src/com/ibm/icu/dev}/util/Pick.java (97%) rename icu4j/main/tests/{translit/src/com/ibm/icu/dev/test => framework/src/com/ibm/icu/dev}/util/PrettyPrinter.java (99%) rename icu4j/main/tests/{translit/src/com/ibm/icu/dev/test => framework/src/com/ibm/icu/dev}/util/Quoter.java (95%) rename icu4j/main/tests/{core/src/com/ibm/icu/dev/test => framework/src/com/ibm/icu/dev}/util/Relation.java (99%) rename icu4j/main/tests/{core/src/com/ibm/icu/dev/test => framework/src/com/ibm/icu/dev}/util/SortedBag.java (97%) rename icu4j/main/tests/{translit/src/com/ibm/icu/dev/test => framework/src/com/ibm/icu/dev}/util/Tabber.java (98%) rename icu4j/main/tests/{core/src/com/ibm/icu/dev/test => framework/src/com/ibm/icu/dev}/util/Timer.java (96%) rename icu4j/main/tests/{translit/src/com/ibm/icu/dev/test => framework/src/com/ibm/icu/dev}/util/UnicodeLabel.java (95%) rename icu4j/main/tests/{translit/src/com/ibm/icu/dev/test => framework/src/com/ibm/icu/dev}/util/UnicodeMap.java (99%) rename icu4j/main/tests/{translit/src/com/ibm/icu/dev/test => framework/src/com/ibm/icu/dev}/util/UnicodeMapIterator.java (98%) rename icu4j/main/tests/{core/src/com/ibm/icu/dev/test => framework/src/com/ibm/icu/dev}/util/UnicodePropertySource.java (99%) rename icu4j/main/tests/{translit/src/com/ibm/icu/dev/test => framework/src/com/ibm/icu/dev}/util/UnicodeTransform.java (92%) rename icu4j/main/tests/{core/src/com/ibm/icu/dev/test => framework/src/com/ibm/icu/dev}/util/VariableReplacer.java (91%) rename icu4j/main/tests/{translit/src/com/ibm/icu/dev/test => framework/src/com/ibm/icu/dev}/util/Visitor.java (97%) rename icu4j/main/tests/{core/src/com/ibm/icu/dev/test => framework/src/com/ibm/icu/dev}/util/XEquivalenceClass.java (99%) rename icu4j/main/tests/{core/src/com/ibm/icu/dev/test => framework/src/com/ibm/icu/dev}/util/XEquivalenceMap.java (97%) rename icu4j/main/tests/translit/src/com/ibm/icu/dev/{test => }/util/BNF.java (99%) rename icu4j/main/tests/translit/src/com/ibm/icu/dev/{test => }/util/BagFormatter.java (99%) rename icu4j/main/tests/translit/src/com/ibm/icu/dev/{test => }/util/CaseIterator.java (99%) rename icu4j/main/tests/translit/src/com/ibm/icu/dev/{test => }/util/FileUtilities.java (96%) rename icu4j/main/tests/translit/src/com/ibm/icu/dev/{test => }/util/ICUPropertyFactory.java (99%) rename icu4j/main/tests/translit/src/com/ibm/icu/dev/{test => }/util/Tokenizer.java (99%) rename icu4j/main/tests/translit/src/com/ibm/icu/dev/{test => }/util/TransliteratorUtilities.java (97%) rename icu4j/main/tests/translit/src/com/ibm/icu/dev/{test => }/util/UnicodeProperty.java (99%) rename icu4j/main/tests/translit/src/com/ibm/icu/dev/{test => }/util/UnicodePropertySymbolTable.java (98%) diff --git a/icu4j/build.xml b/icu4j/build.xml index 150a72156e8..c32af7667b4 100644 --- a/icu4j/build.xml +++ b/icu4j/build.xml @@ -58,6 +58,8 @@ + + @@ -134,6 +136,7 @@ + @@ -389,6 +392,22 @@ + + + + + + + + + + + + + + + @@ -469,22 +488,11 @@ - - + - - - - - - - - - - - - + + + @@ -1126,25 +1134,21 @@ - - + - + debug="on" deprecation="off" + classpath="${icu4j.jar.file}"> - - - + - - + @@ -1152,16 +1156,35 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/AlphabeticIndexTest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/AlphabeticIndexTest.java index 7e1988e3dcd..dc57a67d778 100644 --- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/AlphabeticIndexTest.java +++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/AlphabeticIndexTest.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2008-2011, International Business Machines Corporation and * + * Copyright (C) 2008-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -18,7 +18,7 @@ import java.util.Set; import java.util.TreeSet; import com.ibm.icu.dev.test.TestFmwk; -import com.ibm.icu.dev.test.util.CollectionUtilities; +import com.ibm.icu.dev.util.CollectionUtilities; import com.ibm.icu.impl.ICUDebug; import com.ibm.icu.impl.Row; import com.ibm.icu.impl.Row.R4; diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TrieMapTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TrieMapTest.java index afa85268acb..ea1698dc2cd 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TrieMapTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/TrieMapTest.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2011, Google, International Business Machines Corporation and + * Copyright (C) 2011-2012, Google, International Business Machines Corporation and * others. All Rights Reserved. ******************************************************************************* */ @@ -18,6 +18,7 @@ import java.util.TreeMap; import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.dev.test.util.TrieMap.Style; +import com.ibm.icu.dev.util.Timer; import com.ibm.icu.impl.Row; import com.ibm.icu.impl.Row.R3; import com.ibm.icu.impl.Utility; diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ArrayComparator.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/ArrayComparator.java similarity index 96% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ArrayComparator.java rename to icu4j/main/tests/framework/src/com/ibm/icu/dev/util/ArrayComparator.java index a7f37a59be0..8127e81c379 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ArrayComparator.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/ArrayComparator.java @@ -1,10 +1,10 @@ /* ******************************************************************************* - * Copyright (C) 2002-2009, International Business Machines Corporation and * + * Copyright (C) 2002-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import java.util.Comparator; public class ArrayComparator implements Comparator { diff --git a/icu4j/main/tests/framework/src/com/ibm/icu/dev/test/util/CollectionUtilities.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/CollectionUtilities.java similarity index 99% rename from icu4j/main/tests/framework/src/com/ibm/icu/dev/test/util/CollectionUtilities.java rename to icu4j/main/tests/framework/src/com/ibm/icu/dev/util/CollectionUtilities.java index e1654c8a4f6..f6ce7835b2b 100644 --- a/icu4j/main/tests/framework/src/com/ibm/icu/dev/test/util/CollectionUtilities.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/CollectionUtilities.java @@ -1,10 +1,10 @@ /* ******************************************************************************* - * Copyright (C) 1996-2010, International Business Machines Corporation and * + * Copyright (C) 1996-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import java.util.Collection; import java.util.Comparator; diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/DataInputCompressor.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/DataInputCompressor.java similarity index 98% rename from icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/DataInputCompressor.java rename to icu4j/main/tests/framework/src/com/ibm/icu/dev/util/DataInputCompressor.java index 17b38b2b3e2..e38c06cc7e8 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/DataInputCompressor.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/DataInputCompressor.java @@ -1,10 +1,10 @@ /* ******************************************************************************* - * Copyright (C) 1996-2009, International Business Machines Corporation and * + * Copyright (C) 1996-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import java.io.DataInput; import java.io.IOException; diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/DataOutputCompressor.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/DataOutputCompressor.java similarity index 98% rename from icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/DataOutputCompressor.java rename to icu4j/main/tests/framework/src/com/ibm/icu/dev/util/DataOutputCompressor.java index 0d31009141d..98825222460 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/DataOutputCompressor.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/DataOutputCompressor.java @@ -1,10 +1,10 @@ /* ******************************************************************************* - * Copyright (C) 1996-2009, International Business Machines Corporation and * + * Copyright (C) 1996-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import java.io.DataOutput; import java.io.IOException; diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ElapsedTimer.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/ElapsedTimer.java similarity index 97% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ElapsedTimer.java rename to icu4j/main/tests/framework/src/com/ibm/icu/dev/util/ElapsedTimer.java index b5ba2f9b233..f05bed89b00 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/ElapsedTimer.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/ElapsedTimer.java @@ -2,10 +2,10 @@ // ElapsedTimer.java // // Created by Steven R. Loomis on 11/11/2005. -// Copyright 2005-2010 IBM. All rights reserved. +// Copyright 2005-2012 IBM. All rights reserved. // -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import java.util.Locale; diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/IcuUnicodeNormalizerFactory.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/IcuUnicodeNormalizerFactory.java similarity index 90% rename from icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/IcuUnicodeNormalizerFactory.java rename to icu4j/main/tests/framework/src/com/ibm/icu/dev/util/IcuUnicodeNormalizerFactory.java index b5c4f74beef..43c3eb44062 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/IcuUnicodeNormalizerFactory.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/IcuUnicodeNormalizerFactory.java @@ -1,12 +1,12 @@ /* ******************************************************************************* - * Copyright (C) 2011, International Business Machines Corporation and * + * Copyright (C) 2011-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; -import com.ibm.icu.dev.test.util.UnicodeTransform.Type; +import com.ibm.icu.dev.util.UnicodeTransform.Type; import com.ibm.icu.lang.UCharacter; import com.ibm.icu.text.Normalizer2; diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/ImmutableEntry.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/ImmutableEntry.java similarity index 90% rename from icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/ImmutableEntry.java rename to icu4j/main/tests/framework/src/com/ibm/icu/dev/util/ImmutableEntry.java index be5e88c43cb..357fed58ae4 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/ImmutableEntry.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/ImmutableEntry.java @@ -1,10 +1,10 @@ /* ******************************************************************************* - * Copyright (C) 2009, International Business Machines Corporation and * + * Copyright (C) 2009-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import java.util.Map; diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Pick.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/Pick.java similarity index 97% rename from icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Pick.java rename to icu4j/main/tests/framework/src/com/ibm/icu/dev/util/Pick.java index f8c142aa5e6..4ea803e56fd 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Pick.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/Pick.java @@ -1,10 +1,10 @@ /* ******************************************************************************* - * Copyright (C) 2002-2010, International Business Machines Corporation and * + * Copyright (C) 2002-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import java.util.ArrayList; import java.util.Arrays; @@ -139,7 +139,7 @@ abstract public class Pick { protected String name; protected abstract void addTo(Target target); - protected abstract boolean match(String input, Position p); + public abstract boolean match(String input, Position p); public static class Sequence extends ListPick { public Sequence and2 (Pick item) { @@ -168,7 +168,7 @@ abstract public class Pick { } // keep private private Sequence() {} - protected boolean match(String input, Position p) { + public boolean match(String input, Position p) { int originalIndex = p.index; for (int i = 0; i < items.length; ++i) { if (!items[i].match(input, p)) { @@ -228,7 +228,7 @@ abstract public class Pick { // keep private private Alternation() {} // take first matching option - protected boolean match(String input, Position p) { + public boolean match(String input, Position p) { for (int i = 0; i < weightedIndex.weights.length; ++i) { if (p.isFailure(this,i)) continue; if (items[i].match(input, p)) return true; @@ -280,7 +280,7 @@ abstract public class Pick { } // match longest, e.g. up to just before a failure - protected boolean match(String input, Position p) { + public boolean match(String input, Position p) { //int bestMatch = p.index; int count = 0; for (int i = 0; i < weightedIndex.weights.length; ++i) { @@ -309,7 +309,7 @@ abstract public class Pick { protected void addTo(Target target) { target.append(source.charAt(pick(target.random,0,source.size()-1))); } - protected boolean match(String s, Position p) { + public boolean match(String s, Position p) { int cp = UTF16.charAt(s, p.index); if (source.contains(cp)) { p.index += UTF16.getCharCount(cp); @@ -386,7 +386,7 @@ abstract public class Pick { /* (non-Javadoc) * @see Pick#match(java.lang.String, Pick.Position) */ - protected boolean match(String input, Position p) { + public boolean match(String input, Position p) { // TODO Auto-generated method stub return false; } @@ -423,7 +423,7 @@ abstract public class Pick { target.quoter.setQuoting(false); } - protected boolean match(String s, Position p) { + public boolean match(String s, Position p) { return false; } @@ -445,7 +445,7 @@ abstract public class Pick { protected void addTo(Target target) { target.append(name); } - protected boolean match(String input, Position p) { + public boolean match(String input, Position p) { int len = name.length(); if (input.regionMatches(p.index, name, 0, len)) { p.index += len; diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/PrettyPrinter.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/PrettyPrinter.java similarity index 99% rename from icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/PrettyPrinter.java rename to icu4j/main/tests/framework/src/com/ibm/icu/dev/util/PrettyPrinter.java index 12ac18e88da..8e9254f6562 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/PrettyPrinter.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/PrettyPrinter.java @@ -1,13 +1,13 @@ /** ******************************************************************************* - * Copyright (C) 1996-2010, International Business Machines Corporation and * + * Copyright (C) 1996-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ********************************************************************** * Author: Mark Davis ********************************************************************** */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import java.io.IOException; import java.text.FieldPosition; diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Quoter.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/Quoter.java similarity index 95% rename from icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Quoter.java rename to icu4j/main/tests/framework/src/com/ibm/icu/dev/util/Quoter.java index de7f419ed33..99cd97b821b 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Quoter.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/Quoter.java @@ -1,10 +1,10 @@ /* ******************************************************************************* - * Copyright (C) 2002-2010, International Business Machines Corporation and * + * Copyright (C) 2002-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import com.ibm.icu.impl.Utility; import com.ibm.icu.text.UTF16; diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/Relation.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/Relation.java similarity index 99% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/Relation.java rename to icu4j/main/tests/framework/src/com/ibm/icu/dev/util/Relation.java index 6317469fda2..2657a529616 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/Relation.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/Relation.java @@ -6,7 +6,7 @@ * Author: Mark Davis ********************************************************************** */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import java.lang.reflect.Constructor; import java.util.Arrays; diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/SortedBag.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/SortedBag.java similarity index 97% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/SortedBag.java rename to icu4j/main/tests/framework/src/com/ibm/icu/dev/util/SortedBag.java index 170e7148ce2..77ae52fb36d 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/SortedBag.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/SortedBag.java @@ -1,11 +1,11 @@ /* ********************************************************************** -* Copyright (c) 2002-2006, International Business Machines +* Copyright (c) 2002-2012, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** * Author: Mark Davis ********************************************************************** -*/package com.ibm.icu.dev.test.util; +*/package com.ibm.icu.dev.util; import java.util.Collection; import java.util.Comparator; diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Tabber.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/Tabber.java similarity index 98% rename from icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Tabber.java rename to icu4j/main/tests/framework/src/com/ibm/icu/dev/util/Tabber.java index aa75fa63ab7..3e42d697526 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Tabber.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/Tabber.java @@ -1,11 +1,11 @@ /* ******************************************************************************* - * Copyright (C) 2002-2009, International Business Machines Corporation and * + * Copyright (C) 2002-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import java.util.ArrayList; import java.util.List; diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/Timer.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/Timer.java similarity index 96% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/Timer.java rename to icu4j/main/tests/framework/src/com/ibm/icu/dev/util/Timer.java index 02ade39d278..65f04ab4d73 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/Timer.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/Timer.java @@ -1,10 +1,10 @@ /* ******************************************************************************* - * Copyright (C) 2011, Google, International Business Machines Corporation and + * Copyright (C) 2011-2012, Google, International Business Machines Corporation and * others. All Rights Reserved. ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import com.ibm.icu.text.DecimalFormat; import com.ibm.icu.text.NumberFormat; diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/UnicodeLabel.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/UnicodeLabel.java similarity index 95% rename from icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/UnicodeLabel.java rename to icu4j/main/tests/framework/src/com/ibm/icu/dev/util/UnicodeLabel.java index 8031111ae79..9febe831a7e 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/UnicodeLabel.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/UnicodeLabel.java @@ -1,10 +1,10 @@ /* ******************************************************************************* - * Copyright (C) 1996-2010, International Business Machines Corporation and * + * Copyright (C) 1996-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import com.ibm.icu.impl.Utility; import com.ibm.icu.text.UTF16; diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/UnicodeMap.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/UnicodeMap.java similarity index 99% rename from icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/UnicodeMap.java rename to icu4j/main/tests/framework/src/com/ibm/icu/dev/util/UnicodeMap.java index e25e85f19b9..801402456ec 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/UnicodeMap.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/UnicodeMap.java @@ -1,10 +1,10 @@ /* ******************************************************************************* - * Copyright (C) 1996-2011, International Business Machines Corporation and * + * Copyright (C) 1996-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import java.util.ArrayList; import java.util.Collection; diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/UnicodeMapIterator.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/UnicodeMapIterator.java similarity index 98% rename from icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/UnicodeMapIterator.java rename to icu4j/main/tests/framework/src/com/ibm/icu/dev/util/UnicodeMapIterator.java index eed7f125556..163d376b3bf 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/UnicodeMapIterator.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/UnicodeMapIterator.java @@ -1,10 +1,10 @@ /* ******************************************************************************* - * Copyright (C) 1996-2010, International Business Machines Corporation and * + * Copyright (C) 1996-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import java.util.Iterator; import java.util.Set; diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/UnicodePropertySource.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/UnicodePropertySource.java similarity index 99% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/UnicodePropertySource.java rename to icu4j/main/tests/framework/src/com/ibm/icu/dev/util/UnicodePropertySource.java index cf795e016f2..2172ad35b18 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/UnicodePropertySource.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/UnicodePropertySource.java @@ -1,11 +1,11 @@ /* ******************************************************************************* - * Copyright (C) 2002-2010, International Business Machines Corporation and * + * Copyright (C) 2002-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import java.util.Arrays; import java.util.List; diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/UnicodeTransform.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/UnicodeTransform.java similarity index 92% rename from icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/UnicodeTransform.java rename to icu4j/main/tests/framework/src/com/ibm/icu/dev/util/UnicodeTransform.java index b54194a34c5..c0636457f39 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/UnicodeTransform.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/UnicodeTransform.java @@ -1,10 +1,10 @@ /* ******************************************************************************* - * Copyright (C) 2011, Google, International Business Machines Corporation and * + * Copyright (C) 2011-2012, Google, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import com.ibm.icu.text.Transform; import com.ibm.icu.text.UTF16; diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/VariableReplacer.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/VariableReplacer.java similarity index 91% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/VariableReplacer.java rename to icu4j/main/tests/framework/src/com/ibm/icu/dev/util/VariableReplacer.java index a3c255881ed..c3fa9384027 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/VariableReplacer.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/VariableReplacer.java @@ -1,10 +1,12 @@ /* ******************************************************************************* - * Copyright (C) 2002-2008, International Business Machines Corporation and * + * Copyright (C) 2002-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util;import java.util.Collections; +package com.ibm.icu.dev.util; + +import java.util.Collections; import java.util.Iterator; import java.util.Map; import java.util.TreeMap; diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Visitor.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/Visitor.java similarity index 97% rename from icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Visitor.java rename to icu4j/main/tests/framework/src/com/ibm/icu/dev/util/Visitor.java index 83fecf4ab62..077101e3b1b 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Visitor.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/Visitor.java @@ -1,10 +1,10 @@ /* ******************************************************************************* - * Copyright (C) 2002-2010, International Business Machines Corporation and * + * Copyright (C) 2002-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import java.util.Collection; import java.util.Iterator; diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/XEquivalenceClass.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/XEquivalenceClass.java similarity index 99% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/XEquivalenceClass.java rename to icu4j/main/tests/framework/src/com/ibm/icu/dev/util/XEquivalenceClass.java index c0abef06ea7..16b2b0e0978 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/XEquivalenceClass.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/XEquivalenceClass.java @@ -1,10 +1,10 @@ /* ******************************************************************************* - * Copyright (C) 1996-2009, International Business Machines Corporation and * + * Copyright (C) 1996-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import java.util.ArrayList; import java.util.Collections; diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/XEquivalenceMap.java b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/XEquivalenceMap.java similarity index 97% rename from icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/XEquivalenceMap.java rename to icu4j/main/tests/framework/src/com/ibm/icu/dev/util/XEquivalenceMap.java index b28d46062a9..7d09a952800 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/XEquivalenceMap.java +++ b/icu4j/main/tests/framework/src/com/ibm/icu/dev/util/XEquivalenceMap.java @@ -1,10 +1,10 @@ /* ******************************************************************************* - * Copyright (C) 1996-2010, International Business Machines Corporation and * + * Copyright (C) 1996-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import java.util.Collections; import java.util.HashMap; diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/PrettyPrinterTest.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/PrettyPrinterTest.java index 9c4ae0afaf3..5f8032f5a68 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/PrettyPrinterTest.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/PrettyPrinterTest.java @@ -1,6 +1,6 @@ /* ********************************************************************** - * Copyright (c) 2009, Google, International Business Machines + * Copyright (c) 2009-2012, Google, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** */ @@ -10,7 +10,7 @@ import java.text.Collator; import java.util.Locale; import com.ibm.icu.dev.test.TestFmwk; -import com.ibm.icu.dev.test.util.PrettyPrinter; +import com.ibm.icu.dev.util.PrettyPrinter; import com.ibm.icu.text.UnicodeSet; public class PrettyPrinterTest extends TestFmwk { diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TestUnicodeProperty.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TestUnicodeProperty.java index 718a2d8e8a4..3448d39582e 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TestUnicodeProperty.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TestUnicodeProperty.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2011, International Business Machines Corporation and * + * Copyright (C) 2011-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -9,10 +9,10 @@ package com.ibm.icu.dev.test.translit; import java.util.List; import com.ibm.icu.dev.test.TestFmwk; -import com.ibm.icu.dev.test.util.ICUPropertyFactory; -import com.ibm.icu.dev.test.util.UnicodeProperty; -import com.ibm.icu.dev.test.util.UnicodeProperty.Factory; -import com.ibm.icu.dev.test.util.UnicodePropertySymbolTable; +import com.ibm.icu.dev.util.ICUPropertyFactory; +import com.ibm.icu.dev.util.UnicodeProperty; +import com.ibm.icu.dev.util.UnicodeProperty.Factory; +import com.ibm.icu.dev.util.UnicodePropertySymbolTable; import com.ibm.icu.text.UnicodeSet; /** diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java index 3a6ed982d50..33fb8a64ea3 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 1996-2011, International Business Machines Corporation and * + * Copyright (C) 1996-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -17,7 +17,7 @@ import java.util.Map.Entry; import com.ibm.icu.dev.test.TestFmwk; import com.ibm.icu.dev.test.TestUtil; -import com.ibm.icu.dev.test.util.UnicodeMap; +import com.ibm.icu.dev.util.UnicodeMap; import com.ibm.icu.impl.Utility; import com.ibm.icu.impl.UtilityExtensions; import com.ibm.icu.lang.CharSequences; diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/UnicodeMapTest.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/UnicodeMapTest.java index de140d9a142..ef5395fecf5 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/UnicodeMapTest.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/UnicodeMapTest.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 1996-2010, International Business Machines Corporation and * + * Copyright (C) 1996-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -17,7 +17,7 @@ import java.util.TreeMap; import java.util.TreeSet; import com.ibm.icu.dev.test.TestFmwk; -import com.ibm.icu.dev.test.util.UnicodeMap; +import com.ibm.icu.dev.util.UnicodeMap; import com.ibm.icu.impl.Utility; import com.ibm.icu.text.UTF16; import com.ibm.icu.text.UnicodeSet; diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/TestBNF.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/TestBNF.java index e2f9017f39c..525f7af0a0c 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/TestBNF.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/TestBNF.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2002-2009, International Business Machines Corporation and * + * Copyright (C) 2002-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -8,6 +8,10 @@ package com.ibm.icu.dev.test.util; import java.util.Random; +import com.ibm.icu.dev.util.BNF; +import com.ibm.icu.dev.util.Pick; +import com.ibm.icu.dev.util.Quoter; +import com.ibm.icu.dev.util.Tokenizer; import com.ibm.icu.text.UnicodeSet; public class TestBNF { diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/TestBagFormatter.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/TestBagFormatter.java index 3107dfde1e3..b3b04410296 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/TestBagFormatter.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/TestBagFormatter.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 2002-2009, International Business Machines Corporation and * + * Copyright (C) 2002-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -17,6 +17,10 @@ import java.util.Locale; import java.util.Set; import java.util.TreeSet; +import com.ibm.icu.dev.util.BagFormatter; +import com.ibm.icu.dev.util.ICUPropertyFactory; +import com.ibm.icu.dev.util.UnicodeMap; +import com.ibm.icu.dev.util.UnicodeProperty; import com.ibm.icu.lang.UProperty; import com.ibm.icu.lang.UScript; import com.ibm.icu.text.Transliterator; diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/TestUtilities.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/TestUtilities.java index 597c40e1b0e..6605038c52b 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/TestUtilities.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/TestUtilities.java @@ -1,6 +1,6 @@ /* ******************************************************************************* - * Copyright (C) 1996-2009, International Business Machines Corporation and * + * Copyright (C) 1996-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ @@ -23,6 +23,10 @@ import java.util.TreeSet; import com.ibm.icu.dev.test.TestBoilerplate; import com.ibm.icu.dev.test.TestFmwk; +import com.ibm.icu.dev.util.CollectionUtilities; +import com.ibm.icu.dev.util.ICUPropertyFactory; +import com.ibm.icu.dev.util.UnicodeMap; +import com.ibm.icu.dev.util.UnicodeMapIterator; import com.ibm.icu.impl.Utility; import com.ibm.icu.lang.UCharacter; import com.ibm.icu.lang.UProperty; diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/BNF.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/util/BNF.java similarity index 99% rename from icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/BNF.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/util/BNF.java index b1ab87f99d6..691e3373a7b 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/BNF.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/util/BNF.java @@ -1,10 +1,10 @@ /* ******************************************************************************* - * Copyright (C) 2002-2009, International Business Machines Corporation and * + * Copyright (C) 2002-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import java.util.ArrayList; import java.util.HashMap; diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/BagFormatter.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/util/BagFormatter.java similarity index 99% rename from icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/BagFormatter.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/util/BagFormatter.java index 5a5d8e086b1..5ca583ecee0 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/BagFormatter.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/util/BagFormatter.java @@ -1,10 +1,10 @@ /* ******************************************************************************* - * Copyright (C) 2002-2011, International Business Machines Corporation and * + * Copyright (C) 2002-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/CaseIterator.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/util/CaseIterator.java similarity index 99% rename from icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/CaseIterator.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/util/CaseIterator.java index ce0e2a3d509..312292e77ae 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/CaseIterator.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/util/CaseIterator.java @@ -1,13 +1,14 @@ /** ******************************************************************************* -* Copyright (C) 1996-2010, International Business Machines Corporation and * +* Copyright (C) 1996-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ // copied from the Transliterator demo -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; + import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/FileUtilities.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/util/FileUtilities.java similarity index 96% rename from icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/FileUtilities.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/util/FileUtilities.java index 2df2f280fb7..adaf43e2c22 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/FileUtilities.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/util/FileUtilities.java @@ -1,16 +1,18 @@ /* ******************************************************************************* - * Copyright (C) 2002-2009, International Business Machines Corporation and * + * Copyright (C) 2002-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import java.io.BufferedReader; import java.io.IOException; import java.io.PrintWriter; import java.util.Locale; +import com.ibm.icu.dev.util.BagFormatter; + public class FileUtilities { public static void appendFile(String filename, String encoding, PrintWriter output) throws IOException { appendFile(filename, encoding, output, null); diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/ICUPropertyFactory.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/util/ICUPropertyFactory.java similarity index 99% rename from icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/ICUPropertyFactory.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/util/ICUPropertyFactory.java index 4b8141b377a..5e047918431 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/ICUPropertyFactory.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/util/ICUPropertyFactory.java @@ -4,7 +4,7 @@ * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import java.util.ArrayList; import java.util.Arrays; diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Tokenizer.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/util/Tokenizer.java similarity index 99% rename from icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Tokenizer.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/util/Tokenizer.java index cd5a84d416d..0a1d30b3093 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/Tokenizer.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/util/Tokenizer.java @@ -1,10 +1,10 @@ /* ******************************************************************************* - * Copyright (C) 2002-2009, International Business Machines Corporation and * + * Copyright (C) 2002-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import java.text.ParsePosition; import java.util.HashMap; diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/TransliteratorUtilities.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/util/TransliteratorUtilities.java similarity index 97% rename from icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/TransliteratorUtilities.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/util/TransliteratorUtilities.java index d100a11590a..37d7312060a 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/TransliteratorUtilities.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/util/TransliteratorUtilities.java @@ -1,14 +1,15 @@ /* ******************************************************************************* - * Copyright (C) 2002-2009, International Business Machines Corporation and * + * Copyright (C) 2002-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import java.io.BufferedReader; import java.io.IOException; +import com.ibm.icu.dev.util.BagFormatter; import com.ibm.icu.text.Transliterator; public class TransliteratorUtilities { diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/UnicodeProperty.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/util/UnicodeProperty.java similarity index 99% rename from icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/UnicodeProperty.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/util/UnicodeProperty.java index d892731116a..0752f3740e9 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/UnicodeProperty.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/util/UnicodeProperty.java @@ -1,10 +1,10 @@ /* ******************************************************************************* - * Copyright (C) 1996-2011, International Business Machines Corporation and * + * Copyright (C) 1996-2012, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import java.io.PrintWriter; import java.io.StringWriter; @@ -21,8 +21,8 @@ import java.util.Map; import java.util.TreeMap; import java.util.regex.Pattern; -import com.ibm.icu.dev.test.util.CollectionUtilities.InverseMatcher; -import com.ibm.icu.dev.test.util.CollectionUtilities.ObjectMatcher; +import com.ibm.icu.dev.util.CollectionUtilities.InverseMatcher; +import com.ibm.icu.dev.util.CollectionUtilities.ObjectMatcher; import com.ibm.icu.impl.Utility; import com.ibm.icu.text.SymbolTable; import com.ibm.icu.text.UFormat; @@ -457,7 +457,7 @@ public abstract class UnicodeProperty extends UnicodeLabel { /** * @return the unicode map */ - protected UnicodeMap getUnicodeMap_internal() { + public UnicodeMap getUnicodeMap_internal() { if (unicodeMap == null) unicodeMap = _getUnicodeMap(); return unicodeMap; diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/UnicodePropertySymbolTable.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/util/UnicodePropertySymbolTable.java similarity index 98% rename from icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/UnicodePropertySymbolTable.java rename to icu4j/main/tests/translit/src/com/ibm/icu/dev/util/UnicodePropertySymbolTable.java index 1cecc663c8f..d57659057e5 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/util/UnicodePropertySymbolTable.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/util/UnicodePropertySymbolTable.java @@ -1,16 +1,16 @@ /* ******************************************************************************* - * Copyright (C) 1996-2011, Google, International Business Machines Corporation and * + * Copyright (C) 1996-2012, Google, International Business Machines Corporation and * * others. All Rights Reserved. * ******************************************************************************* */ -package com.ibm.icu.dev.test.util; +package com.ibm.icu.dev.util; import java.util.Comparator; import java.util.HashMap; import java.util.List; -import com.ibm.icu.dev.test.util.UnicodeProperty.PatternMatcher; +import com.ibm.icu.dev.util.UnicodeProperty.PatternMatcher; import com.ibm.icu.impl.UnicodeRegex; import com.ibm.icu.text.UTF16; import com.ibm.icu.text.UnicodeSet; diff --git a/icu4j/tools/misc/.classpath b/icu4j/tools/misc/.classpath index 31a873c394b..4468231cb9b 100644 --- a/icu4j/tools/misc/.classpath +++ b/icu4j/tools/misc/.classpath @@ -3,9 +3,10 @@ - + + diff --git a/icu4j/tools/misc/src/com/ibm/icu/dev/tool/cldr/CheckSystemFonts.java b/icu4j/tools/misc/src/com/ibm/icu/dev/tool/cldr/CheckSystemFonts.java index d959bb7f90d..92de7f61196 100644 --- a/icu4j/tools/misc/src/com/ibm/icu/dev/tool/cldr/CheckSystemFonts.java +++ b/icu4j/tools/misc/src/com/ibm/icu/dev/tool/cldr/CheckSystemFonts.java @@ -1,6 +1,6 @@ /* ********************************************************************** - * Copyright (c) 2009-2011, Google, International Business Machines + * Copyright (c) 2009-2012, Google, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** * Author: Mark Davis @@ -32,13 +32,13 @@ import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.ibm.icu.dev.test.util.BagFormatter; -import com.ibm.icu.dev.test.util.Tabber.HTMLTabber; -import com.ibm.icu.dev.test.util.TransliteratorUtilities; -import com.ibm.icu.dev.test.util.UnicodeMap; -import com.ibm.icu.dev.test.util.UnicodeMap.Composer; -import com.ibm.icu.dev.test.util.UnicodeMapIterator; -import com.ibm.icu.dev.test.util.XEquivalenceClass.SetMaker; +import com.ibm.icu.dev.util.BagFormatter; +import com.ibm.icu.dev.util.Tabber.HTMLTabber; +import com.ibm.icu.dev.util.TransliteratorUtilities; +import com.ibm.icu.dev.util.UnicodeMap; +import com.ibm.icu.dev.util.UnicodeMap.Composer; +import com.ibm.icu.dev.util.UnicodeMapIterator; +import com.ibm.icu.dev.util.XEquivalenceClass.SetMaker; import com.ibm.icu.impl.Row; import com.ibm.icu.impl.Row.R2; import com.ibm.icu.impl.Utility; -- 2.40.0