organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 06:53:45 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-6658 Merging back misc changes for eclipse build from 4.0.1 to the trunk.

Browse source 
X-SVN-Rev: 25247
This commit is contained in:
Yoshito Umaoka 2009-01-14 16:29:17 +00:00
parent f63f334671
commit a16b7c3c0c
9 changed files with 28 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
icu4j/build.properties
View file

@ -20,11 +20,11 @@ icu4j.data.version.number=41
icu4j.version.number=412
icu4j.previous.version.number=401
current.year=2008
current.year=2009
api.report.out=${api.dir}/icu4j_compare_${icu4j.previous.version.number}_${icu4j.version.number}.html
copyright=Copyright (c) 2000-2008, International Business Machines Corporation and others. All Rights Reserved.
copyright=Copyright (c) 2000-2009, International Business Machines Corporation and others. All Rights Reserved.
corp=IBM Corporation
default.target.rt.version=J2SE15
icu4j.plugin.impl.version.string=4.1.2
copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2008. All Rights Reserved. \n IBM is a registered trademark of IBM Corp.
copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2009. All Rights Reserved. \n IBM is a registered trademark of IBM Corp.

2
icu4j/license.html
View file

@ -11,7 +11,7 @@
<p>COPYRIGHT AND PERMISSION NOTICE</p>
<p>
Copyright (c) 1995-2008 International Business Machines Corporation and others
Copyright (c) 1995-2009 International Business Machines Corporation and others
</p>
<p>
All rights reserved.

3
icu4j/preprocessor.txt
View file

@ -1,4 +1,4 @@
# Copyright (C) 2007-2008, International Business Machines Corporation and
# Copyright (C) 2007-2009, International Business Machines Corporation and
# others. All Rights Reserved.
## core sources
@ -56,7 +56,6 @@ src/com/ibm/icu/dev/test/TestDataModule.java
src/com/ibm/icu/dev/test/TestFmwk.java
src/com/ibm/icu/dev/test/TestUtil.java
src/com/ibm/icu/dev/test/timezone/TimeZoneAliasTest.java
src/com/ibm/icu/dev/test/timezone/TimeZoneBoundaryTest.java
src/com/ibm/icu/dev/test/timezone/TimeZoneRegression.java
src/com/ibm/icu/dev/test/translit/UnicodeMapTest.java
src/com/ibm/icu/dev/test/util/BagFormatter.java

6
icu4j/src/com/ibm/icu/dev/eclipse/misc/about_icu_base.html
View file

@ -8,7 +8,7 @@
<body lang="EN-US">
<h2>About This Content</h2>
<p>July 2, 2008</p>
<p>January 9, 2009</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
@ -31,13 +31,13 @@ and such source code may be obtained at <a href="http://www.eclipse.org/">http:/
for informational purposes only, and you should look to the Redistributor's license for
terms and conditions of use.</p>
<p><strong>ICU4J 4.0</strong> <br/><br/>
<p><strong>ICU4J 4.0.1</strong> <br/><br/>
The plug-in includes software (&quot;ICU4J&quot;) developed by International Business Machines
Corporation and others.
<br/><br/>
ICU4J is:
<blockquote>
Copyright (c) 1995-2008 International Business Machines Corporation and others<br/>
Copyright (c) 1995-2009 International Business Machines Corporation and others<br/>
All rights reserved.
</blockquote>
<p>

2
icu4j/src/com/ibm/icu/dev/eclipse/plugins/com.ibm.icu.base.tests/META-INF/MANIFEST.MF
View file

@ -5,7 +5,7 @@ Bundle-SymbolicName: com.ibm.icu.base.tests
Bundle-Version: 1.0.0
Bundle-Vendor: IBM
Bundle-Copyright: @COPYRIGHT@
Fragment-Host: com.ibm.icu.base;bundle-version="[3.4.3,4.1.0)"
Fragment-Host: com.ibm.icu.base;bundle-version="[4.0.0,4.2.0)"
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.3,
CDC-1.0/Foundation-1.0

5
icu4j/src/com/ibm/icu/dev/eclipse/plugins/com.ibm.icu.tests/META-INF/MANIFEST.MF
View file

@ -4,8 +4,9 @@ Bundle-Name: ICU Test Fragment
Bundle-SymbolicName: com.ibm.icu.tests
Bundle-Version: 1.0.0
Bundle-Vendor: IBM
Fragment-Host: com.ibm.icu;bundle-version="[3.9.0,4.1.0)"
Bundle-Localization: plugin
Fragment-Host: com.ibm.icu;bundle-version="[4.0.0,4.2.0)"
Bundle-Copyright: @COPYRIGHT@
Require-Bundle: org.junit
Bundle-ClassPath: .,icu4jtests.jar
Bundle-RequiredExecutionEnvironment: J2SE-1.3,
CDC-1.0/Foundation-1.0

10
icu4j/src/com/ibm/icu/dev/test/calendar/CalendarRegression.java
View file

@ -1,7 +1,7 @@
//##header J2SE15
/**
*******************************************************************************
* Copyright (C) 2000-2008, International Business Machines Corporation and *
* Copyright (C) 2000-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -773,13 +773,13 @@ public class CalendarRegression extends com.ibm.icu.dev.test.TestFmwk {
public void Test4108764() {
java.util.Calendar tempcal = java.util.Calendar.getInstance();
tempcal.clear();
tempcal.set(1997, Calendar.MARCH, 15, 12, 00, 00);
tempcal.set(1997, Calendar.FEBRUARY, 15, 12, 00, 00);
Date d00 = tempcal.getTime();
tempcal.set(1997, Calendar.MARCH, 15, 12, 00, 56);
tempcal.set(1997, Calendar.FEBRUARY, 15, 12, 00, 56);
Date d01 = tempcal.getTime();
tempcal.set(1997, Calendar.MARCH, 15, 12, 34, 00);
tempcal.set(1997, Calendar.FEBRUARY, 15, 12, 34, 00);
Date d10 = tempcal.getTime();
tempcal.set(1997, Calendar.MARCH, 15, 12, 34, 56);
tempcal.set(1997, Calendar.FEBRUARY, 15, 12, 34, 56);
Date d11 = tempcal.getTime();
tempcal.set(1997, Calendar.JANUARY, 15, 12, 34, 56);
Date dM = tempcal.getTime();

6
icu4j/src/com/ibm/icu/dev/test/calendar/CompatibilityTest.java
View file

@ -1,7 +1,7 @@
//##header J2SE15
/**
*******************************************************************************
* Copyright (C) 2000-2008, International Business Machines Corporation and *
* Copyright (C) 2000-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -347,9 +347,9 @@ public class CompatibilityTest extends com.ibm.icu.dev.test.TestFmwk {
//## // is in DST (which is actually wrong).
//#else
cal.clear();
cal.set(1985, 3, 2, 11, 49);
cal.set(1985, 2, 2, 11, 49);
tempcal.clear();
tempcal.set(1985, 3, 2, 11, 49);
tempcal.set(1985, 2, 2, 11, 49);
if (cal.getTime().getTime() != tempcal.getTime().getTime()) {
errln("FAIL: Calendar.set(5 args) failed");
logln(" Got: " + cal.getTime() + " Expected: " + tempcal.getTime());

18
icu4j/src/com/ibm/icu/dev/test/timezone/TimeZoneBoundaryTest.java
View file

@ -1,7 +1,6 @@
//##header J2SE15
/**
*******************************************************************************
* Copyright (C) 2000-2008, International Business Machines Corporation and *
* Copyright (C) 2000-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -431,13 +430,13 @@ public class TimeZoneBoundaryTest extends TestFmwk
TimeZone.setDefault(save);
}
//#if defined(FOUNDATION10) || defined(J2SE13)
//## // This test case does not work well with JRE1.3 with
//## // the timezone update for US 2007 rule. Java 1.3 only
//## // supports single DST rule for all years. Thus, the
//## // new rule is also applied to year 1997 incorrectly.
//#else
if (true)
// We no longer use ICU TimeZone implementation for Java
// default TimeZone. Java 1.3 or older version do not
// support historic transitions, therefore, the test below
// will fail on such environment (with the latest TimeZone
// patch for US 2007+ rule).
String javaver = System.getProperty("java.version", "1.3");
if (!javaver.startsWith("1.3"))
{
// This only works in PST/PDT
TimeZone.setDefault(safeGetTimeZone("PST"));
@ -448,7 +447,6 @@ public class TimeZoneBoundaryTest extends TestFmwk
tempcal.set(1997, 6, 1);
findDaylightBoundaryUsingDate(tempcal.getTime(), "PDT", PST_1997_END);
}
//#endif
// if (true)
// {