summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog12
-rw-r--r--java/util/TimeZone.java213
-rwxr-xr-xscripts/timezones.pl96
-rw-r--r--scripts/tzabbrevs40
4 files changed, 220 insertions, 141 deletions
diff --git a/ChangeLog b/ChangeLog
index 37553f053..2637a6ef6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2001-02-20 Jochen Hoenicke <jochen@gnu.org>
+
+ * scripts/timezones.pl (parseOffset): Parse negative times
+ correctly. (parseTime): Likewise.
+ Adapted to new indentation in TimeZone.java.
+ Read in tzabbrevs. Improved time zone sort order.
+ * scripts/tzabbrevs: New file containing abbreviated timezone as
+ specified in the JCL. Corresponds to the change from Warren Levy
+ from 2001-01-09.
+ * java/util/TimeZone.java: Rebuild Timezone database from
+ tzdata2000h.
+
2001-02-20 Tom Tromey <tromey@redhat.com>
* java/io/PipedWriter.java (flush): Throw exception if stream
diff --git a/java/util/TimeZone.java b/java/util/TimeZone.java
index d76c9f0b9..9dfd577a5 100644
--- a/java/util/TimeZone.java
+++ b/java/util/TimeZone.java
@@ -84,9 +84,9 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
// XXX - Should we read this data from a file?
tz = new SimpleTimeZone(-11000 * 3600, "MIT");
timezones.put("MIT", tz);
- timezones.put("Pacific/Niue", tz);
timezones.put("Pacific/Apia", tz);
timezones.put("Pacific/Midway", tz);
+ timezones.put("Pacific/Niue", tz);
timezones.put("Pacific/Pago_Pago", tz);
tz = new SimpleTimeZone
(-10000 * 3600, "America/Adak",
@@ -100,25 +100,24 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
timezones.put("Pacific/Johnston", tz);
timezones.put("Pacific/Rarotonga", tz);
timezones.put("Pacific/Tahiti", tz);
+ tz = new SimpleTimeZone(-9500 * 3600, "Pacific/Marquesas");
+ timezones.put("Pacific/Marquesas", tz);
tz = new SimpleTimeZone
(-9000 * 3600, "AST",
Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,
Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
timezones.put("AST", tz);
- timezones.put("America/Juneau", tz);
timezones.put("America/Anchorage", tz);
+ timezones.put("America/Juneau", tz);
timezones.put("America/Nome", tz);
timezones.put("America/Yakutat", tz);
tz = new SimpleTimeZone(-9000 * 3600, "Pacific/Gambier");
timezones.put("Pacific/Gambier", tz);
- tz = new SimpleTimeZone(-8500 * 3600, "Pacific/Marquesas");
- timezones.put("Pacific/Marquesas", tz);
tz = new SimpleTimeZone
(-8000 * 3600, "PST",
Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,
Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
timezones.put("PST", tz);
- // XXX: Remove PST8PDT after java.lang.System is merged with libgcj.
timezones.put("PST8PDT", tz);
timezones.put("America/Dawson", tz);
timezones.put("America/Los_Angeles", tz);
@@ -128,18 +127,11 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
timezones.put("US/Pacific-New", tz);
tz = new SimpleTimeZone(-8000 * 3600, "Pacific/Pitcairn");
timezones.put("Pacific/Pitcairn", tz);
- tz = new SimpleTimeZone(-7000 * 3600, "PNT");
- timezones.put("PNT", tz);
- // XXX: Remove MST7 after java.lang.System is merged with libgcj.
- timezones.put("MST7", tz);
- timezones.put("America/Dawson_Creek", tz);
- timezones.put("America/Phoenix", tz);
tz = new SimpleTimeZone
(-7000 * 3600, "MST",
Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,
Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
timezones.put("MST", tz);
- // XXX: Remove MST7MDT after java.lang.System is merged with libgcj.
timezones.put("MST7MDT", tz);
timezones.put("America/Boise", tz);
timezones.put("America/Chihuahua", tz);
@@ -149,33 +141,37 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
timezones.put("America/Mazatlan", tz);
timezones.put("America/Shiprock", tz);
timezones.put("America/Yellowknife", tz);
- tz = new SimpleTimeZone(-6000 * 3600, "America/Regina");
- timezones.put("America/Regina", tz);
- timezones.put("America/Belize", tz);
- timezones.put("America/Costa_Rica", tz);
- timezones.put("America/El_Salvador", tz);
- timezones.put("America/Guatemala", tz);
- timezones.put("America/Managua", tz);
- timezones.put("America/Swift_Current", tz);
- timezones.put("America/Tegucigalpa", tz);
- timezones.put("Pacific/Galapagos", tz);
+ tz = new SimpleTimeZone(-7000 * 3600, "MST7");
+ timezones.put("MST7", tz);
+ timezones.put("PNT", tz);
+ timezones.put("America/Dawson_Creek", tz);
+ timezones.put("America/Hermosillo", tz);
+ timezones.put("America/Phoenix", tz);
tz = new SimpleTimeZone
(-6000 * 3600, "CST",
Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,
Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
timezones.put("CST", tz);
- // XXX: Remove CST6CDT after java.lang.System is merged with libgcj.
timezones.put("CST6CDT", tz);
timezones.put("America/Cambridge_Bay", tz);
timezones.put("America/Cancun", tz);
timezones.put("America/Chicago", tz);
- timezones.put("America/Iqaluit", tz);
timezones.put("America/Menominee", tz);
+ timezones.put("America/Merida", tz);
timezones.put("America/Mexico_City", tz);
- timezones.put("America/Pangnirtung", tz);
+ timezones.put("America/Monterrey", tz);
timezones.put("America/Rainy_River", tz);
- timezones.put("America/Rankin_Inlet", tz);
timezones.put("America/Winnipeg", tz);
+ tz = new SimpleTimeZone(-6000 * 3600, "America/Belize");
+ timezones.put("America/Belize", tz);
+ timezones.put("America/Costa_Rica", tz);
+ timezones.put("America/El_Salvador", tz);
+ timezones.put("America/Guatemala", tz);
+ timezones.put("America/Managua", tz);
+ timezones.put("America/Regina", tz);
+ timezones.put("America/Swift_Current", tz);
+ timezones.put("America/Tegucigalpa", tz);
+ timezones.put("Pacific/Galapagos", tz);
tz = new SimpleTimeZone
(-6000 * 3600, "Pacific/Easter",
Calendar.OCTOBER, 9, -Calendar.SUNDAY, 0 * 3600,
@@ -186,36 +182,36 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
Calendar.APRIL, 1, Calendar.SUNDAY, 0 * 3600,
Calendar.OCTOBER, -1, Calendar.SUNDAY, 0 * 3600);
timezones.put("America/Grand_Turk", tz);
- tz = new SimpleTimeZone
- (-5000 * 3600, "America/Havana",
- Calendar.APRIL, 1, 0, 0 * 3600,
- Calendar.OCTOBER, -1, Calendar.SUNDAY, 0 * 3600);
timezones.put("America/Havana", tz);
- tz = new SimpleTimeZone(-5000 * 3600, "IET");
- timezones.put("IET", tz);
- // XXX: Remove EST5 after java.lang.System is merged with libgcj.
+ tz = new SimpleTimeZone(-5000 * 3600, "EST5");
timezones.put("EST5", tz);
+ timezones.put("IET", tz);
timezones.put("America/Bogota", tz);
timezones.put("America/Cayman", tz);
+ timezones.put("America/Eirunepe", tz);
timezones.put("America/Guayaquil", tz);
timezones.put("America/Indiana/Indianapolis", tz);
timezones.put("America/Indiana/Knox", tz);
timezones.put("America/Indiana/Marengo", tz);
timezones.put("America/Indiana/Vevay", tz);
timezones.put("America/Indianapolis", tz);
+ timezones.put("America/Iqaluit", tz);
timezones.put("America/Jamaica", tz);
timezones.put("America/Lima", tz);
timezones.put("America/Panama", tz);
+ timezones.put("America/Pangnirtung", tz);
timezones.put("America/Port-au-Prince", tz);
timezones.put("America/Porto_Acre", tz);
+ timezones.put("America/Rankin_Inlet", tz);
tz = new SimpleTimeZone
(-5000 * 3600, "EST",
Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,
Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
timezones.put("EST", tz);
- // XXX: Remove EST5EDT after java.lang.System is merged with libgcj.
timezones.put("EST5EDT", tz);
timezones.put("America/Detroit", tz);
+ timezones.put("America/Kentucky/Louisville", tz);
+ timezones.put("America/Kentucky/Monticello", tz);
timezones.put("America/Louisville", tz);
timezones.put("America/Montreal", tz);
timezones.put("America/Nassau", tz);
@@ -228,6 +224,7 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
timezones.put("America/Antigua", tz);
timezones.put("America/Aruba", tz);
timezones.put("America/Barbados", tz);
+ timezones.put("America/Boa_Vista", tz);
timezones.put("America/Caracas", tz);
timezones.put("America/Curacao", tz);
timezones.put("America/Dominica", tz);
@@ -248,53 +245,67 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
timezones.put("America/St_Vincent", tz);
timezones.put("America/Tortola", tz);
tz = new SimpleTimeZone
- (-4000 * 3600, "America/Cuiaba",
+ (-4000 * 3600, "America/Asuncion",
Calendar.OCTOBER, 1, Calendar.SUNDAY, 0 * 3600,
Calendar.FEBRUARY, -1, Calendar.SUNDAY, 0 * 3600);
- timezones.put("America/Cuiaba", tz);
timezones.put("America/Asuncion", tz);
- timezones.put("America/Boa_Vista", tz);
tz = new SimpleTimeZone
- (-4000 * 3600, "America/Thule",
+ (-4000 * 3600, "America/Cuiaba",
+ Calendar.OCTOBER, 2, Calendar.SUNDAY, 0 * 3600,
+ Calendar.FEBRUARY, 3, Calendar.SUNDAY, 0 * 3600);
+ timezones.put("America/Cuiaba", tz);
+ tz = new SimpleTimeZone
+ (-4000 * 3600, "America/Goose_Bay",
+ Calendar.APRIL, 1, Calendar.SUNDAY, 60000,
+ Calendar.OCTOBER, -1, Calendar.SUNDAY, 60000);
+ timezones.put("America/Goose_Bay", tz);
+ tz = new SimpleTimeZone
+ (-4000 * 3600, "America/Glace_Bay",
Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,
Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
- timezones.put("America/Thule", tz);
timezones.put("America/Glace_Bay", tz);
- timezones.put("America/Goose_Bay", tz);
timezones.put("America/Halifax", tz);
+ timezones.put("America/Thule", tz);
timezones.put("Atlantic/Bermuda", tz);
tz = new SimpleTimeZone
- (-4000 * 3600, "Antarctica/Palmer",
+ (-4000 * 3600, "America/Santiago",
Calendar.OCTOBER, 9, -Calendar.SUNDAY, 0 * 3600,
Calendar.MARCH, 9, -Calendar.SUNDAY, 0 * 3600);
- timezones.put("Antarctica/Palmer", tz);
timezones.put("America/Santiago", tz);
+ timezones.put("Antarctica/Palmer", tz);
tz = new SimpleTimeZone
(-4000 * 3600, "Atlantic/Stanley",
Calendar.SEPTEMBER, 2, Calendar.SUNDAY, 0 * 3600,
Calendar.APRIL, 16, -Calendar.SUNDAY, 0 * 3600);
timezones.put("Atlantic/Stanley", tz);
+ tz = new SimpleTimeZone
+ (-3500 * 3600, "CNT",
+ Calendar.APRIL, 1, Calendar.SUNDAY, 60000,
+ Calendar.OCTOBER, -1, Calendar.SUNDAY, 60000);
+ timezones.put("CNT", tz);
+ timezones.put("America/St_Johns", tz);
+ tz = new SimpleTimeZone
+ (-3000 * 3600, "America/Araguaina",
+ Calendar.OCTOBER, 2, Calendar.SUNDAY, 0 * 3600,
+ Calendar.FEBRUARY, 3, Calendar.SUNDAY, 0 * 3600);
+ timezones.put("America/Araguaina", tz);
+ timezones.put("America/Sao_Paulo", tz);
tz = new SimpleTimeZone(-3000 * 3600, "AGT");
timezones.put("AGT", tz);
- timezones.put("America/Buenos_Aires", tz);
timezones.put("America/Belem", tz);
+ timezones.put("America/Buenos_Aires", tz);
timezones.put("America/Catamarca", tz);
timezones.put("America/Cayenne", tz);
timezones.put("America/Cordoba", tz);
+ timezones.put("America/Fortaleza", tz);
timezones.put("America/Jujuy", tz);
+ timezones.put("America/Maceio", tz);
timezones.put("America/Mendoza", tz);
timezones.put("America/Montevideo", tz);
timezones.put("America/Paramaribo", tz);
+ timezones.put("America/Recife", tz);
timezones.put("America/Rosario", tz);
tz = new SimpleTimeZone
- (-3000 * 3600, "America/Fortaleza",
- Calendar.OCTOBER, 1, Calendar.SUNDAY, 0 * 3600,
- Calendar.FEBRUARY, -1, Calendar.SUNDAY, 0 * 3600);
- timezones.put("America/Fortaleza", tz);
- timezones.put("America/Araguaina", tz);
- timezones.put("America/Maceio", tz);
- timezones.put("America/Sao_Paulo", tz);
- tz = new SimpleTimeZone
(-3000 * 3600, "America/Godthab",
Calendar.MARCH, 30, -Calendar.SATURDAY, 22000 * 3600,
Calendar.OCTOBER, 30, -Calendar.SATURDAY, 22000 * 3600);
@@ -304,12 +315,6 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,
Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
timezones.put("America/Miquelon", tz);
- tz = new SimpleTimeZone
- (-3500 * 3600, "CNT",
- Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,
- Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
- timezones.put("CNT", tz);
- timezones.put("America/St_Johns", tz);
tz = new SimpleTimeZone(-2000 * 3600, "America/Noronha");
timezones.put("America/Noronha", tz);
timezones.put("Atlantic/South_Georgia", tz);
@@ -324,6 +329,7 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
timezones.put("Atlantic/Jan_Mayen", tz);
tz = new SimpleTimeZone(0 * 3600, "GMT");
timezones.put("GMT", tz);
+ timezones.put("UTC", tz);
timezones.put("Africa/Abidjan", tz);
timezones.put("Africa/Accra", tz);
timezones.put("Africa/Bamako", tz);
@@ -345,7 +351,6 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
timezones.put("Europe/Belfast", tz);
timezones.put("Europe/Dublin", tz);
timezones.put("Europe/London", tz);
- timezones.put("UTC", tz);
tz = new SimpleTimeZone
(0 * 3600, "WET",
Calendar.MARCH, -1, Calendar.SUNDAY, 1000 * 3600,
@@ -380,6 +385,7 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
timezones.put("CET", tz);
timezones.put("ECT", tz);
+ timezones.put("MET", tz);
timezones.put("Africa/Ceuta", tz);
timezones.put("Arctic/Longyearbyen", tz);
timezones.put("Europe/Amsterdam", tz);
@@ -411,21 +417,19 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
timezones.put("Europe/Warsaw", tz);
timezones.put("Europe/Zagreb", tz);
timezones.put("Europe/Zurich", tz);
- timezones.put("MET", tz);
tz = new SimpleTimeZone
- (2000 * 3600, "Africa/Cairo",
+ (2000 * 3600, "ART",
Calendar.APRIL, -1, Calendar.FRIDAY, 0 * 3600,
Calendar.SEPTEMBER, -1, Calendar.THURSDAY, 23000 * 3600);
- timezones.put("Africa/Cairo", tz);
timezones.put("ART", tz);
+ timezones.put("Africa/Cairo", tz);
tz = new SimpleTimeZone(2000 * 3600, "CAT");
timezones.put("CAT", tz);
- timezones.put("Africa/Gaborone", tz);
timezones.put("Africa/Blantyre", tz);
timezones.put("Africa/Bujumbura", tz);
+ timezones.put("Africa/Gaborone", tz);
timezones.put("Africa/Harare", tz);
timezones.put("Africa/Johannesburg", tz);
- timezones.put("Africa/Khartoum", tz);
timezones.put("Africa/Kigali", tz);
timezones.put("Africa/Lubumbashi", tz);
timezones.put("Africa/Lusaka", tz);
@@ -433,26 +437,33 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
timezones.put("Africa/Maseru", tz);
timezones.put("Africa/Mbabane", tz);
timezones.put("Africa/Tripoli", tz);
+ timezones.put("Europe/Riga", tz);
timezones.put("Europe/Tallinn", tz);
+ timezones.put("Europe/Vilnius", tz);
tz = new SimpleTimeZone
(2000 * 3600, "Asia/Amman",
- Calendar.APRIL, 1, 0, 0 * 3600, Calendar.OCTOBER, 1, 0, 0 * 3600);
+ Calendar.MARCH, -1, Calendar.THURSDAY, 0 * 3600,
+ Calendar.SEPTEMBER, -1, Calendar.THURSDAY, 0 * 3600);
timezones.put("Asia/Amman", tz);
- timezones.put("Asia/Damascus", tz);
tz = new SimpleTimeZone
(2000 * 3600, "Asia/Beirut",
Calendar.MARCH, -1, Calendar.SUNDAY, 0 * 3600,
Calendar.OCTOBER, -1, Calendar.SUNDAY, 0 * 3600);
timezones.put("Asia/Beirut", tz);
tz = new SimpleTimeZone
+ (2000 * 3600, "Asia/Damascus",
+ Calendar.APRIL, 1, 0, 0 * 3600,
+ Calendar.OCTOBER, 1, 0, 0 * 3600);
+ timezones.put("Asia/Damascus", tz);
+ tz = new SimpleTimeZone
(2000 * 3600, "Asia/Gaza",
Calendar.APRIL, 3, Calendar.FRIDAY, 0 * 3600,
Calendar.OCTOBER, 3, Calendar.FRIDAY, 0 * 3600);
timezones.put("Asia/Gaza", tz);
tz = new SimpleTimeZone
(2000 * 3600, "Asia/Jerusalem",
- Calendar.APRIL, 1, Calendar.FRIDAY, 2000 * 3600,
- Calendar.SEPTEMBER, 1, Calendar.FRIDAY, 2000 * 3600);
+ Calendar.APRIL, 1, 0, 1000 * 3600,
+ Calendar.OCTOBER, 1, 0, 1000 * 3600);
timezones.put("Asia/Jerusalem", tz);
tz = new SimpleTimeZone
(2000 * 3600, "EET",
@@ -467,37 +478,36 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
timezones.put("Europe/Helsinki", tz);
timezones.put("Europe/Istanbul", tz);
timezones.put("Europe/Kiev", tz);
- timezones.put("Europe/Riga", tz);
+ timezones.put("Europe/Nicosia", tz);
timezones.put("Europe/Simferopol", tz);
timezones.put("Europe/Sofia", tz);
timezones.put("Europe/Uzhgorod", tz);
- timezones.put("Europe/Vilnius", tz);
timezones.put("Europe/Zaporozhye", tz);
tz = new SimpleTimeZone
- (2000 * 3600, "Europe/Minsk",
+ (2000 * 3600, "Europe/Kaliningrad",
Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
- timezones.put("Europe/Minsk", tz);
timezones.put("Europe/Kaliningrad", tz);
+ timezones.put("Europe/Minsk", tz);
tz = new SimpleTimeZone
(3000 * 3600, "Asia/Baghdad",
Calendar.APRIL, 1, 0, 3000 * 3600,
Calendar.OCTOBER, 1, 0, 3000 * 3600);
timezones.put("Asia/Baghdad", tz);
tz = new SimpleTimeZone
- (3000 * 3600, "Europe/Tiraspol",
+ (3000 * 3600, "Europe/Moscow",
Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
- timezones.put("Europe/Tiraspol", tz);
timezones.put("Europe/Moscow", tz);
+ timezones.put("Europe/Tiraspol", tz);
tz = new SimpleTimeZone(3000 * 3600, "EAT");
timezones.put("EAT", tz);
- timezones.put("Indian/Comoro", tz);
timezones.put("Africa/Addis_Ababa", tz);
timezones.put("Africa/Asmera", tz);
timezones.put("Africa/Dar_es_Salaam", tz);
timezones.put("Africa/Djibouti", tz);
timezones.put("Africa/Kampala", tz);
+ timezones.put("Africa/Khartoum", tz);
timezones.put("Africa/Mogadishu", tz);
timezones.put("Africa/Nairobi", tz);
timezones.put("Antarctica/Syowa", tz);
@@ -507,6 +517,7 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
timezones.put("Asia/Qatar", tz);
timezones.put("Asia/Riyadh", tz);
timezones.put("Indian/Antananarivo", tz);
+ timezones.put("Indian/Comoro", tz);
timezones.put("Indian/Mayotte", tz);
tz = new SimpleTimeZone(3500 * 3600, "Asia/Tehran");
timezones.put("Asia/Tehran", tz);
@@ -516,11 +527,11 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
Calendar.OCTOBER, -1, Calendar.SUNDAY, 1000 * 3600);
timezones.put("Asia/Baku", tz);
tz = new SimpleTimeZone
- (4000 * 3600, "Asia/Tbilisi",
+ (4000 * 3600, "Asia/Aqtau",
Calendar.MARCH, -1, Calendar.SUNDAY, 0 * 3600,
Calendar.OCTOBER, -1, Calendar.SUNDAY, 0 * 3600);
- timezones.put("Asia/Tbilisi", tz);
timezones.put("Asia/Aqtau", tz);
+ timezones.put("Asia/Tbilisi", tz);
tz = new SimpleTimeZone
(4000 * 3600, "Asia/Yerevan",
Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
@@ -529,10 +540,10 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
timezones.put("Europe/Samara", tz);
tz = new SimpleTimeZone(4000 * 3600, "NET");
timezones.put("NET", tz);
- timezones.put("Indian/Mauritius", tz);
timezones.put("Asia/Dubai", tz);
timezones.put("Asia/Muscat", tz);
timezones.put("Indian/Mahe", tz);
+ timezones.put("Indian/Mauritius", tz);
timezones.put("Indian/Reunion", tz);
tz = new SimpleTimeZone(4500 * 3600, "Asia/Kabul");
timezones.put("Asia/Kabul", tz);
@@ -553,13 +564,13 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
timezones.put("Asia/Yekaterinburg", tz);
tz = new SimpleTimeZone(5000 * 3600, "PLT");
timezones.put("PLT", tz);
- timezones.put("Indian/Kerguelen", tz);
- timezones.put("Asia/Ashkhabad", tz);
+ timezones.put("Asia/Ashgabat", tz);
timezones.put("Asia/Dushanbe", tz);
timezones.put("Asia/Karachi", tz);
timezones.put("Asia/Samarkand", tz);
timezones.put("Asia/Tashkent", tz);
timezones.put("Indian/Chagos", tz);
+ timezones.put("Indian/Kerguelen", tz);
timezones.put("Indian/Maldives", tz);
tz = new SimpleTimeZone(5500 * 3600, "IST");
timezones.put("IST", tz);
@@ -570,19 +581,19 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
timezones.put("BST", tz);
timezones.put("Antarctica/Mawson", tz);
timezones.put("Asia/Colombo", tz);
- timezones.put("Asia/Dacca", tz);
- timezones.put("Asia/Thimbu", tz);
+ timezones.put("Asia/Dhaka", tz);
+ timezones.put("Asia/Thimphu", tz);
tz = new SimpleTimeZone
(6000 * 3600, "Asia/Almaty",
Calendar.MARCH, -1, Calendar.SUNDAY, 0 * 3600,
Calendar.OCTOBER, -1, Calendar.SUNDAY, 0 * 3600);
timezones.put("Asia/Almaty", tz);
tz = new SimpleTimeZone
- (6000 * 3600, "Asia/Omsk",
+ (6000 * 3600, "Asia/Novosibirsk",
Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
- timezones.put("Asia/Omsk", tz);
timezones.put("Asia/Novosibirsk", tz);
+ timezones.put("Asia/Omsk", tz);
tz = new SimpleTimeZone(6500 * 3600, "Asia/Rangoon");
timezones.put("Asia/Rangoon", tz);
timezones.put("Indian/Cocos", tz);
@@ -590,6 +601,7 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
timezones.put("VST", tz);
timezones.put("Antarctica/Davis", tz);
timezones.put("Asia/Bangkok", tz);
+ timezones.put("Asia/Hovd", tz);
timezones.put("Asia/Jakarta", tz);
timezones.put("Asia/Phnom_Penh", tz);
timezones.put("Asia/Saigon", tz);
@@ -605,7 +617,6 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
timezones.put("Antarctica/Casey", tz);
timezones.put("Asia/Brunei", tz);
timezones.put("Asia/Chungking", tz);
- timezones.put("Asia/Dili", tz);
timezones.put("Asia/Harbin", tz);
timezones.put("Asia/Hong_Kong", tz);
timezones.put("Asia/Kashgar", tz);
@@ -617,6 +628,7 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
timezones.put("Asia/Singapore", tz);
timezones.put("Asia/Taipei", tz);
timezones.put("Asia/Ujung_Pandang", tz);
+ timezones.put("Asia/Ulaanbaatar", tz);
timezones.put("Asia/Urumqi", tz);
timezones.put("Australia/Perth", tz);
tz = new SimpleTimeZone
@@ -624,13 +636,9 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
timezones.put("Asia/Irkutsk", tz);
- tz = new SimpleTimeZone
- (8000 * 3600, "Asia/Ulan_Bator",
- Calendar.MARCH, -1, Calendar.SUNDAY, 0 * 3600,
- Calendar.SEPTEMBER, -1, Calendar.SUNDAY, 0 * 3600);
- timezones.put("Asia/Ulan_Bator", tz);
tz = new SimpleTimeZone(9000 * 3600, "JST");
timezones.put("JST", tz);
+ timezones.put("Asia/Dili", tz);
timezones.put("Asia/Jayapura", tz);
timezones.put("Asia/Pyongyang", tz);
timezones.put("Asia/Seoul", tz);
@@ -670,12 +678,12 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600);
timezones.put("Australia/Hobart", tz);
tz = new SimpleTimeZone
- (10000 * 3600, "Australia/Melbourne",
+ (10000 * 3600, "AET",
Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600,
Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600);
+ timezones.put("AET", tz);
timezones.put("Australia/Melbourne", tz);
timezones.put("Australia/Sydney", tz);
- timezones.put("AET", tz);
tz = new SimpleTimeZone
(10500 * 3600, "Australia/Lord_Howe",
Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600,
@@ -688,38 +696,34 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
timezones.put("Asia/Magadan", tz);
tz = new SimpleTimeZone(11000 * 3600, "SST");
timezones.put("SST", tz);
- timezones.put("Pacific/Ponape", tz);
timezones.put("Pacific/Efate", tz);
timezones.put("Pacific/Guadalcanal", tz);
timezones.put("Pacific/Kosrae", tz);
timezones.put("Pacific/Noumea", tz);
+ timezones.put("Pacific/Ponape", tz);
tz = new SimpleTimeZone(11500 * 3600, "Pacific/Norfolk");
timezones.put("Pacific/Norfolk", tz);
tz = new SimpleTimeZone
- (12000 * 3600, "Antarctica/McMurdo",
+ (12000 * 3600, "NST",
Calendar.OCTOBER, 1, Calendar.SUNDAY, 2000 * 3600,
Calendar.MARCH, 3, Calendar.SUNDAY, 2000 * 3600);
+ timezones.put("NST", tz);
timezones.put("Antarctica/McMurdo", tz);
timezones.put("Antarctica/South_Pole", tz);
timezones.put("Pacific/Auckland", tz);
- timezones.put("NST", tz);
tz = new SimpleTimeZone
- (12000 * 3600, "Asia/Kamchatka",
+ (12000 * 3600, "Asia/Anadyr",
Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
- timezones.put("Asia/Kamchatka", tz);
timezones.put("Asia/Anadyr", tz);
- tz = new SimpleTimeZone
- (12000 * 3600, "Pacific/Fiji",
- Calendar.NOVEMBER, 1, Calendar.SUNDAY, 2000 * 3600,
- Calendar.FEBRUARY, -1, Calendar.SUNDAY, 3000 * 3600);
+ timezones.put("Asia/Kamchatka", tz);
+ tz = new SimpleTimeZone(12000 * 3600, "Pacific/Fiji");
timezones.put("Pacific/Fiji", tz);
- tz = new SimpleTimeZone(12000 * 3600, "Pacific/Tarawa");
- timezones.put("Pacific/Tarawa", tz);
timezones.put("Pacific/Funafuti", tz);
timezones.put("Pacific/Kwajalein", tz);
timezones.put("Pacific/Majuro", tz);
timezones.put("Pacific/Nauru", tz);
+ timezones.put("Pacific/Tarawa", tz);
timezones.put("Pacific/Wake", tz);
timezones.put("Pacific/Wallis", tz);
tz = new SimpleTimeZone
@@ -729,10 +733,6 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
timezones.put("Pacific/Chatham", tz);
tz = new SimpleTimeZone(13000 * 3600, "Pacific/Enderbury");
timezones.put("Pacific/Enderbury", tz);
- tz = new SimpleTimeZone
- (13000 * 3600, "Pacific/Tongatapu",
- Calendar.OCTOBER, 1, Calendar.SATURDAY, 2000 * 3600,
- Calendar.APRIL, 16, -Calendar.SUNDAY, 2000 * 3600);
timezones.put("Pacific/Tongatapu", tz);
tz = new SimpleTimeZone(14000 * 3600, "Pacific/Kiritimati");
timezones.put("Pacific/Kiritimati", tz);
@@ -956,7 +956,6 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
* @return The time zone for the identifier or GMT, if no such time
* zone exists.
*/
- // FIXME: XXX: JCL indicates this and other methods are synchronized.
public static TimeZone getTimeZone(String ID)
{
// First check timezones hash
diff --git a/scripts/timezones.pl b/scripts/timezones.pl
index 72f7d0752..47f71370c 100755
--- a/scripts/timezones.pl
+++ b/scripts/timezones.pl
@@ -2,12 +2,13 @@
# Create the timezone tables for java/util/TimeZone from the
# standard timezone sources by Arthur David Olson (as used by glibc)
#
-# This needs the files from the package tzdata1999c which may be found
-# at ftp://elsie.nic.nih.gov/pub/.
+# This needs the files from the package tzdata2000h which may be found
+# at ftp://ftp.cs.mu.oz.au/pub/.
-$TIMEZONEDIR = "/usr/src/scratch/glibc-2.1.1/timezone";
+$TIMEZONEDIR = "tzdata";
@TIMEZONEFILES = ("africa", "antarctica", "asia", "australasia",
- "europe", "northamerica", "pacificnew", "southamerica");
+ "europe", "northamerica", "pacificnew", "southamerica",
+ "../tzabbrevs");
# rules hash table:
# key is a rule name
@@ -30,11 +31,14 @@ my @timezones = ( [ "GMT", 0, "-", [ "GMT", "UTC" ] ]);
# in milliseconds against UTC
sub parseOffset($) {
my $offset = $_[0];
- $offset =~ /^([+-]?\d+)(:(\d+)(:(\d+))?)?$/
+ $offset =~ /^([+-]?)(\d+)(:(\d+)(:(\d+))?)?$/
or die "Can't parse offset $offset";
- my $seconds = $1 * 3600;
- $seconds += $3 * 60 if ($2);
- $seconds += $5 if ($2 && $4);
+ my $seconds = $2 * 3600;
+ $seconds += $4 * 60 if ($3);
+ $seconds += $6 if ($3 && $5);
+ if ($1 eq "-") {
+ $seconds = - $seconds;
+ }
return $seconds * 1000;
}
@@ -43,14 +47,17 @@ sub parseOffset($) {
my $timezonename;
sub parseTime($$$) {
my ($rawoffset, $stdoffset, $time) = @_;
- $time =~ /^([+-]?\d+):(\d+)(:(\d+))?([swguz]?)$/
+ $time =~ /^([+-]?)(\d+):(\d+)(:(\d+))?([swguz]?)$/
or die "Can't parse time $time";
- my ($hour, $min) = ($1, $2);
- my $sec = ($3) ? $4 : 0;
+ my ($hour, $min) = ($2, $3);
+ my $sec = ($4) ? $5 : 0;
my $millis = ((($hour * 60) + $min) * 60 + $sec) * 1000;
- if ($5 =~ /[guz]/) {
+ if ($1 eq "-") {
+ $millis = -$millis;
+ }
+ if ($6 =~ /[guz]/) {
$millis += $rawoffset;
- } elsif ($5 =~ /w/) {
+ } elsif ($6 =~ /w/) {
print STDERR "$timezonename not in standard time\n" if $stdoffset;
$millis -= $stdoffset;
}
@@ -193,6 +200,15 @@ sub makePretty($) {
}
}
+sub tzcompare($$) {
+ my ($a, $b) = @_;
+ if (($a =~ /\//) != ($b =~ /\//)) {
+ return ($a =~ /\//) ? 1 : -1;
+ } else {
+ return $a cmp $b;
+ }
+}
+
foreach $file (@TIMEZONEFILES) {
# print STDERR "$file\n";
open INPUT, "$TIMEZONEDIR/$file" or die "Can't open $TIMEZONEDIR/$file";
@@ -224,6 +240,27 @@ foreach $file (@TIMEZONEFILES) {
$in_time_zone = 1;
shift @entries;
$timezonename = shift @entries;
+ } elsif ($entries[0] eq "Remove") {
+ my $found = 0;
+ foreach $tz (@timezones) {
+ my @newaliases;
+ foreach $tzname (@{$tz->[3]}) {
+ if ($tzname eq $entries[1]) {
+ $found = 1;
+ } else {
+ push @newaliases, $tzname;
+ }
+ }
+ if ($found) {
+ if ($tz->[0] eq $entries[1]) {
+ $tz->[0] = $newaliases[0];
+ }
+ $tz->[3] = \@newaliases;
+ last;
+ }
+ }
+
+ die "Unknown link $_" if ! $found;
} elsif ($entries[0] eq "Link") {
my $alias = 0;
foreach $tz (@timezones) {
@@ -236,14 +273,6 @@ foreach $file (@TIMEZONEFILES) {
}
die "Unknown link $_" if ! $alias;
-
- if (($entries[1] =~ /\//)
- && ($entries[2] !~ /\//)) {
- # alias is of Country/City form, linkname not
- # make timezonename the real zone and add an alias
- # the otherway round.
- $alias->[0] = $entries[2];
- }
die "@entries" if $entries[1] =~ /^\d+$/;
push @{$alias->[3]}, $entries[2];
} else {
@@ -297,10 +326,12 @@ foreach $file (@TIMEZONEFILES) {
else { $a->[0] cmp $b->[0] } } @timezones;
for (@timezones) {
my ($name, $rawoffset, $rule, $aliaslist) = @{$_};
+ my @aliases = sort { tzcompare($a, $b); } @{$aliaslist};
+ $name = $aliases[0];
$rawoffset = makePretty($rawoffset);
if ($rule eq "-") {
print <<EOF
- tz = new SimpleTimeZone($rawoffset, \"$name\");
+ tz = new SimpleTimeZone($rawoffset, \"$name\");
EOF
} else {
my ($endmonth, $endday, $endtime) = @{$rule->[0]};
@@ -310,27 +341,24 @@ EOF
my $savings = $rule->[2];
if ($savings == 3600 * 1000) {
print <<EOF
- tz = new SimpleTimeZone
- ($rawoffset, \"$name\",
- $startmonth, $startday, $starttime,
- $endmonth, $endday, $endtime);
+ tz = new SimpleTimeZone
+ ($rawoffset, \"$name\",
+ $startmonth, $startday, $starttime,
+ $endmonth, $endday, $endtime);
EOF
} else {
$savings = makePretty($savings);
print <<EOF
- tz = new SimpleTimeZone
- ($rawoffset, \"$name\",
- $startmonth, $startday, $starttime,
- $endmonth, $endday, $endtime, $savings);
+ tz = new SimpleTimeZone
+ ($rawoffset, \"$name\",
+ $startmonth, $startday, $starttime,
+ $endmonth, $endday, $endtime, $savings);
EOF
}
}
- my @aliases = sort { return ($a eq $name) ? -1
- : ($b eq $name) ? 1
- : $a cmp $b } @{$aliaslist};
for (@aliases) {
print <<EOF
- timezones.put(\"$_\", tz);
+ timezones.put(\"$_\", tz);
EOF
}
}
diff --git a/scripts/tzabbrevs b/scripts/tzabbrevs
new file mode 100644
index 000000000..73bb19047
--- /dev/null
+++ b/scripts/tzabbrevs
@@ -0,0 +1,40 @@
+Link Pacific/Niue MIT
+Link America/Juneau AST
+Link PST8PDT PST
+# XXX: Remove PST8PDT after java.lang.System is merged with libgcj?
+# Remove PST8PDT
+Link MST PNT
+# XXX: Remove MST7 after java.lang.System is merged with libgcj?
+Link MST MST7
+Remove MST
+Link MST7MDT MST
+# XXX: Remove MST7MDT after java.lang.System is merged with libgcj?
+# Remove MST7MDT
+Link CST6CDT CST
+# XXX: Remove CST6CDT after java.lang.System is merged with libgcj?
+# Remove CST6CDT
+Link EST IET
+# XXX: Remove EST5 after java.lang.System is merged with libgcj?
+Link EST EST5
+Remove EST
+Link EST5EDT EST
+# XXX: Remove EST5EDT after java.lang.System is merged with libgcj?
+# Remove EST5EDT
+Link America/Anguilla PRT
+Link America/Buenos_Aires AGT
+Link America/St_Johns CNT
+Link CET ECT
+Link Africa/Cairo ART
+Link Africa/Gaborone CAT
+Link Indian/Comoro EAT
+Link Indian/Mauritius NET
+Link Indian/Kerguelen PLT
+Link Asia/Calcutta IST
+Link Asia/Colombo BST
+Link Asia/Bangkok VST
+Link Asia/Brunei CTT
+Link Asia/Seoul JST
+Link Australia/Darwin ACT
+Link Australia/Sydney AET
+Link Pacific/Ponape SST
+Link Pacific/Auckland NST
View Lorry Controller Status