mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-07 22:44:49 +00:00
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
This commit is contained in:
Yoshito Umaoka
parent
35f8e12864
commit
a9ced99c1f
44 changed files with 174 additions and 131 deletions
|
|
@ -58,6 +58,8 @@
|
|||
<!-- directories -->
|
||||
<property name="release.dir" value="release"/>
|
||||
<property name="doc.dir" value="doc"/>
|
||||
<property name="cldr.util.out.dir" value="${out.dir}/cldr_util"/>
|
||||
<property name="cldr.release.dir" value="release_cldr"/>
|
||||
|
||||
<!-- Java version check -->
|
||||
<condition property="is.java6.plus">
|
||||
|
|
@ -134,6 +136,7 @@
|
|||
<delete dir="${doc.dir}"/>
|
||||
<delete dir="${out.dir}"/>
|
||||
<delete dir="${module.dir}"/>
|
||||
<delete dir="${cldr.release.dir}"/>
|
||||
|
||||
<available file="eclipse-build" type="dir" property="eclipse-build.dir.present"/>
|
||||
<antcall target="_clean.eclipse-build"/>
|
||||
|
|
@ -389,6 +392,22 @@
|
|||
</jar>
|
||||
</target>
|
||||
|
||||
<target name="icu4jSrcJar" description="Build icu4j-src.jar">
|
||||
<jar jarfile="${icu4j-src.jar.file}"
|
||||
compress="true">
|
||||
<fileset dir="${icu4j.core.dir}/${src.dir}" includes="**/*.java"/>
|
||||
<fileset dir="${icu4j.collate.dir}/${src.dir}" includes="**/*.java"/>
|
||||
<fileset dir="${icu4j.currdata.dir}/${src.dir}" includes="**/*.java"/>
|
||||
<fileset dir="${icu4j.langdata.dir}/${src.dir}" includes="**/*.java"/>
|
||||
<fileset dir="${icu4j.regiondata.dir}/${src.dir}" includes="**/*.java"/>
|
||||
<fileset dir="${icu4j.translit.dir}/${src.dir}" includes="**/*.java"/>
|
||||
<fileset dir="${shared.dir}/licenses">
|
||||
<include name="license.html"/>
|
||||
<include name="unicode-license.txt"/>
|
||||
</fileset>
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
<target name="icu4jtestsJar" depends="info, tests" description="Build ICU4J all-in-one test jar">
|
||||
<jar jarfile="${icu4jtests.jar.file}"
|
||||
compress="true">
|
||||
|
|
@ -469,22 +488,11 @@
|
|||
<copy file="${icu4j.localespi.jar}" tofile="${release.dir}/${icu4j-localespi.jar.file}"/>
|
||||
</target>
|
||||
|
||||
<target name="releaseSrcJars" description="Build ICU4J src jar files for distribution">
|
||||
<!-- icu4j src-jar -->
|
||||
<target name="releaseSrcJars" depends="icu4jSrcJar" description="Build ICU4J src jar files for distribution">
|
||||
<mkdir dir="${release.dir}"/>
|
||||
<jar jarfile="${release.dir}/${icu4j-src.jar.file}"
|
||||
compress="true">
|
||||
<fileset dir="${icu4j.core.dir}/${src.dir}" includes="**/*.java"/>
|
||||
<fileset dir="${icu4j.collate.dir}/${src.dir}" includes="**/*.java"/>
|
||||
<fileset dir="${icu4j.currdata.dir}/${src.dir}" includes="**/*.java"/>
|
||||
<fileset dir="${icu4j.langdata.dir}/${src.dir}" includes="**/*.java"/>
|
||||
<fileset dir="${icu4j.regiondata.dir}/${src.dir}" includes="**/*.java"/>
|
||||
<fileset dir="${icu4j.translit.dir}/${src.dir}" includes="**/*.java"/>
|
||||
<fileset dir="${shared.dir}/licenses">
|
||||
<include name="license.html"/>
|
||||
<include name="unicode-license.txt"/>
|
||||
</fileset>
|
||||
</jar>
|
||||
|
||||
<!-- icu4j src-jar -->
|
||||
<copy file="${icu4j-src.jar.file}" tofile="${release.dir}/${icu4j-src.jar.file}"/>
|
||||
|
||||
<!-- charset/localespi src-jar -->
|
||||
<ant dir="${icu4j.charset.dir}" target="src-jar" inheritAll="false"/>
|
||||
|
|
@ -1126,25 +1134,21 @@
|
|||
</jar>
|
||||
</target>
|
||||
|
||||
<target name="cldrUtil" depends="info" description="Build Utilities for CLDR">
|
||||
<property name="cldr.util.out.dir" value="${out.dir}/cldr_util"/>
|
||||
<target name="cldrUtil" depends="icu4jJar" description="Build Utilities for CLDR tooling">
|
||||
<mkdir dir="${cldr.util.out.dir}/bin"/>
|
||||
|
||||
<javac destdir="${cldr.util.out.dir}/bin"
|
||||
source="${javac.source}"
|
||||
target="${javac.target}"
|
||||
encoding="${java.src.encoding}"
|
||||
debug="on" deprecation="off">
|
||||
debug="on" deprecation="off"
|
||||
classpath="${icu4j.jar.file}">
|
||||
|
||||
<src path="${icu4j.core.dir}/src"/>
|
||||
<src path="${icu4j.translit.dir}/src"/>
|
||||
<src path="${icu4j.core-tests.dir}/src"/> <!-- still needed? -->
|
||||
<src path="${icu4j.tools.dir}/src"/>
|
||||
<src path="${icu4j.translit-tests.dir}/src"/>
|
||||
<src path="${icu4j.test-framework.dir}/src"/>
|
||||
<src path="${icu4j.tools.dir}/src"/>
|
||||
|
||||
<include name="com/ibm/icu/dev/test/TestFmwk.java" />
|
||||
<include name="com/ibm/icu/dev/test/util/*.java" />
|
||||
<include name="com/ibm/icu/dev/util/*.java" />
|
||||
<include name="com/ibm/icu/dev/tool/UOption.java" />
|
||||
</javac>
|
||||
|
||||
|
|
@ -1152,16 +1156,35 @@
|
|||
<jar jarfile="${cldr.util.out.dir}/lib/utilities.jar"
|
||||
compress="true"
|
||||
basedir="${cldr.util.out.dir}/bin">
|
||||
<include name="com/ibm/icu/dev/test/util/*.class"/>
|
||||
<include name="com/ibm/icu/dev/test/TestFmwk*.class"/>
|
||||
<include name="com/ibm/icu/dev/test/AbstractTest*.class"/>
|
||||
<include name="com/ibm/icu/dev/test/TestLog*.class"/>
|
||||
<include name="com/ibm/icu/dev/test/TestUtil*.class"/>
|
||||
<include name="com/ibm/icu/dev/test/UTF16Util*.class"/>
|
||||
<include name="com/ibm/icu/dev/test/*.class"/>
|
||||
<include name="com/ibm/icu/dev/util/*.class"/>
|
||||
<include name="com/ibm/icu/dev/tool/UOption*.class"/>
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
<target name="releaseCLDR" depends="icu4jJar,icu4jSrcJar,cldrUtil" description="Build release files for CLDR tooling">
|
||||
<mkdir dir="${cldr.release.dir}"/>
|
||||
<!-- icu4j.jar -->
|
||||
<copy file="${icu4j.jar.file}" todir="${cldr.release.dir}"/>
|
||||
<!-- icu4j-src.jar -->
|
||||
<copy file="${icu4j-src.jar.file}" todir="${cldr.release.dir}"/>
|
||||
<!-- utilities.jar -->
|
||||
<copy file="${cldr.util.out.dir}/lib/utilities.jar" todir="${cldr.release.dir}"/>
|
||||
<!-- utilities-src.jar -->
|
||||
<jar jarfile="${cldr.release.dir}/utilities-src.jar"
|
||||
compress="true">
|
||||
<fileset dir="${icu4j.test-framework.dir}/${src.dir}">
|
||||
<filename name="com/ibm/icu/dev/test/TestFmwk.java"/>
|
||||
<filename name="com/ibm/icu/dev/test/*Log*.java"/>
|
||||
<filename name="com/ibm/icu/dev/test/TestUtil.java"/>
|
||||
<filename name="com/ibm/icu/dev/test/UTF16Util.java"/>
|
||||
</fileset>
|
||||
<fileset dir="${icu4j.test-framework.dir}/${src.dir}" includes="com/ibm/icu/dev/util/*.java"/>
|
||||
<fileset dir="${icu4j.translit-tests.dir}/${src.dir}" includes="com/ibm/icu/dev/util/*.java"/>
|
||||
<fileset dir="${icu4j.tools.dir}/${src.dir}" includes="com/ibm/icu/dev/tool/UOption.java"/>
|
||||
</jar>
|
||||
</target>
|
||||
|
||||
<target name="xliff" description="Build xliff converter tool">
|
||||
<property name="xliff.out.dir" value="${out.dir}/xliff"/>
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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);
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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 {
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -3,9 +3,10 @@
|
|||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/icu4j-core"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/icu4j-core-tests"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/icu4j-translit-tests"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/icu4j-translit"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/icu4j-collate"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/icu4j-test-framework"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/icu4j-core-tests"/>
|
||||
<classpathentry kind="output" path="out/bin"/>
|
||||
</classpath>
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue