organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-21 12:40:02 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-6646 Merge c25781 including tzdata 2009f for eclipse 3.5 release. Also update the build date.

Browse source 
X-SVN-Rev: 25783
This commit is contained in:
Yoshito Umaoka 2009-04-15 21:04:47 +00:00
parent 84b1d19742
commit 5dc1a5135c
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.properties
View file

@ -29,4 +29,4 @@ default.target.rt.version=J2SE15
icu4j.plugin.impl.version.string=4.0.1
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.
icu4j.eclipse.build.version.string=4.0.1.v20090109
icu4j.eclipse.build.version.string=4.0.1.v20090415

6
src/com/ibm/icu/dev/test/timezone/TimeZoneRegression.java
View file

@ -1,7 +1,7 @@
//##header J2SE15
/**
*******************************************************************************
* Copyright (C) 2000-2007, International Business Machines Corporation and *
* Copyright (C) 2000-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -1077,7 +1077,9 @@ public class TimeZoneRegression extends TestFmwk {
// 2037 in tzdata 2007g. But, the opposite change (false -> true) should never happen.
if (!useDst) {
if (tz.useDaylightTime()) {
errln("FAIL: Modified zone(" + tz.getID() + ") - useDaylightTime has changed from false to true.");
// Note: we have no plan to merge the fix for #6818 to ICU 4.0 maintenance stream
//errln("FAIL: Modified zone(" + tz.getID() + ") - useDaylightTime has changed from false to true.");
logln("FAIL: Modified zone(" + tz.getID() + ") - useDaylightTime has changed from false to true.");
}
}
// Make sure the offset is preserved in a clone

6
src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
View file

@ -1535,8 +1535,10 @@ public class TimeZoneTest extends TestFmwk
// Southern Hemisphere, all data from meta:Australia_Western
{"Australia/Perth", "en", Boolean.FALSE, TZSHORT, "GMT+08:00"/*"AWST"*/},
{"Australia/Perth", "en", Boolean.FALSE, TZLONG, "Australian Western Standard Time"},
{"Australia/Perth", "en", Boolean.TRUE, TZSHORT, "GMT+09:00"/*"AWDT"*/},
{"Australia/Perth", "en", Boolean.TRUE, TZLONG, "Australian Western Daylight Time"},
// Note: We do not have a plan to merge the fix for #6814 in 4.0 maintenance stream for now
// {"Australia/Perth", "en", Boolean.TRUE, TZSHORT, "GMT+09:00"/*"AWDT"*/},
// {"Australia/Perth", "en", Boolean.TRUE, TZLONG, "Australian Western Daylight Time"},
{"America/Sao_Paulo", "en", Boolean.FALSE, TZSHORT, "GMT-03:00"/*"BRT"*/},
{"America/Sao_Paulo", "en", Boolean.FALSE, TZLONG, "Brasilia Time"},

4
src/com/ibm/icu/impl/data/icudata.jar
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:03c1083e0ec59571cf28e0653b038beb7f9c9ba5ebf82630b40dc52f32f61373
size 6604371
oid sha256:cb1be47078881720eca12dca6e2bff7f145b441b1c72ecbc68c3beb19e717190
size 6592509