From f06268c1751aafb48698bf5e29083f5bba550a81 Mon Sep 17 00:00:00 2001 From: Yoshito Umaoka Date: Fri, 13 Jun 2008 20:06:16 +0000 Subject: [PATCH] ICU-6289 Resovled compiler warnings in Eclipse plug-in build. Updated license files. Add new tests in the Eclipse plug-in unit test. X-SVN-Rev: 24176 --- icu4j/build.xml | 2 +- .../ibm/icu/dev/eclipse/misc/about_icu.html | 10 +++- .../icu/dev/eclipse/misc/about_icu_base.html | 51 +++++++++++++++++++ .../src/com/ibm/icu/tests/UnitTest.java | 8 +++ icu4j/src/com/ibm/icu/text/DecimalFormat.java | 2 +- icu4j/src/com/ibm/icu/text/MessageFormat.java | 5 +- 6 files changed, 73 insertions(+), 5 deletions(-) create mode 100644 icu4j/src/com/ibm/icu/dev/eclipse/misc/about_icu_base.html diff --git a/icu4j/build.xml b/icu4j/build.xml index 573455847da..493b211e730 100644 --- a/icu4j/build.xml +++ b/icu4j/build.xml @@ -1800,7 +1800,7 @@ - diff --git a/icu4j/src/com/ibm/icu/dev/eclipse/misc/about_icu.html b/icu4j/src/com/ibm/icu/dev/eclipse/misc/about_icu.html index 1935fd8a05c..cddd060cdab 100644 --- a/icu4j/src/com/ibm/icu/dev/eclipse/misc/about_icu.html +++ b/icu4j/src/com/ibm/icu/dev/eclipse/misc/about_icu.html @@ -40,9 +40,15 @@ and such source code may be obtained at http:/ Copyright (c) 1995-2008 International Business Machines Corporation and others
All rights reserved. +

Your use of ICU4J is subject to the terms and conditions of the ICU4J license. A copy of the - license is contained in the file about_files/license.html. -

+ license is contained in the file about_files/license.html.

+

+ ICU4J bundles data files imported from the Unicode Character Database and the Locale Data. A copy of the + Unicode Data and Software license is contained in the file about_files/ucdterms.txt.

+

+ The project information including source code, documentations and demo programs are available on + the ICU public web site.

diff --git a/icu4j/src/com/ibm/icu/dev/eclipse/misc/about_icu_base.html b/icu4j/src/com/ibm/icu/dev/eclipse/misc/about_icu_base.html new file mode 100644 index 00000000000..eb56ad1287a --- /dev/null +++ b/icu4j/src/com/ibm/icu/dev/eclipse/misc/about_icu_base.html @@ -0,0 +1,51 @@ + + + + +About + + +

About This Content

+ +

July 2, 2008

+

License

+ +

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.

+ + +

Third Party Content

+

The Content includes items that have been sourced from third parties as set out below. If you + did not receive this Content directly from the Eclipse Foundation, the following is provided + for informational purposes only, and you should look to the Redistributor's license for + terms and conditions of use.

+ +

ICU4J 4.0

+ The plug-in includes software ("ICU4J") developed by International Business Machines + Corporation and others. +

+ ICU4J is: +

+ Copyright (c) 1995-2008 International Business Machines Corporation and others
+ All rights reserved. +
+

+ Your use of ICU4J is subject to the terms and conditions of the ICU4J license. A copy of the + license is contained in the file about_files/license.html.

+

+ The project information including source code, documentations and demo programs are available on + the ICU public web site.

+ + + diff --git a/icu4j/src/com/ibm/icu/dev/eclipse/plugins/com.ibm.icu.tests/src/com/ibm/icu/tests/UnitTest.java b/icu4j/src/com/ibm/icu/dev/eclipse/plugins/com.ibm.icu.tests/src/com/ibm/icu/tests/UnitTest.java index 4933ab05cec..bc4263b8115 100644 --- a/icu4j/src/com/ibm/icu/dev/eclipse/plugins/com.ibm.icu.tests/src/com/ibm/icu/tests/UnitTest.java +++ b/icu4j/src/com/ibm/icu/dev/eclipse/plugins/com.ibm.icu.tests/src/com/ibm/icu/tests/UnitTest.java @@ -19,6 +19,10 @@ import com.ibm.icu.dev.test.TestFmwk.TestParams; public class UnitTest extends TestCase { + public void testBidi() throws Exception { + runUtility("Bidi"); + } + public void testCalendar() throws Exception { runUtility("Calendar"); } @@ -31,6 +35,10 @@ public class UnitTest extends TestCase { runUtility("Compression"); } + public void testDuration() throws Exception { + runUtility("Duration"); + } + public void testDiagBigDecimal() throws Exception { runUtility("DiagBigDecimal"); } diff --git a/icu4j/src/com/ibm/icu/text/DecimalFormat.java b/icu4j/src/com/ibm/icu/text/DecimalFormat.java index 3ae86e6178d..fb98881713e 100644 --- a/icu4j/src/com/ibm/icu/text/DecimalFormat.java +++ b/icu4j/src/com/ibm/icu/text/DecimalFormat.java @@ -13,7 +13,6 @@ import java.math.BigInteger; import java.text.ChoiceFormat; import java.text.FieldPosition; import java.text.ParsePosition; -import java.util.ArrayList; //#if defined(FOUNDATION10) //#else @@ -25,6 +24,7 @@ import java.io.ObjectOutputStream; import java.text.AttributedCharacterIterator; import java.text.AttributedString; import java.text.Format; +import java.util.ArrayList; //#endif import com.ibm.icu.impl.UCharacterProperty; diff --git a/icu4j/src/com/ibm/icu/text/MessageFormat.java b/icu4j/src/com/ibm/icu/text/MessageFormat.java index 21adfd32571..b55f6d0d102 100644 --- a/icu4j/src/com/ibm/icu/text/MessageFormat.java +++ b/icu4j/src/com/ibm/icu/text/MessageFormat.java @@ -14,7 +14,6 @@ package com.ibm.icu.text; import java.io.IOException; import java.io.InvalidObjectException; import java.io.ObjectInputStream; -import java.text.CharacterIterator; import java.text.ChoiceFormat; import java.text.FieldPosition; import java.text.Format; @@ -31,6 +30,7 @@ import java.util.HashMap; import java.text.AttributedCharacterIterator; import java.text.AttributedString; import java.util.ArrayList; +import java.text.CharacterIterator; //#endif import com.ibm.icu.impl.Utility; @@ -1751,6 +1751,8 @@ public class MessageFormat extends UFormat { return result; } +//#if defined(FOUNDATION10) || defined(J2SE13) +//#else /** * Convenience method to append all the characters in * iterator to the StringBuffer result. @@ -1765,6 +1767,7 @@ public class MessageFormat extends UFormat { } } } +//#endif private static final String[] typeList = {"", "number", "date", "time", "choice", "spellout", "ordinal",