From 9a5257d5e9116150c217314ae19f5a591dec1a22 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 15 Sep 2001 01:22:39 +0000 Subject: [PATCH] TimeZone.java: Updated list of timezones from Classpath. * java/util/TimeZone.java: Updated list of timezones from Classpath. From-SVN: r45622 --- libjava/ChangeLog | 3 +++ libjava/java/util/TimeZone.java | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 5f9f539e8d3..3bb6a365351 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,8 @@ 2001-09-14 Tom Tromey + * java/util/TimeZone.java: Updated list of timezones from + Classpath. + * java/lang/CloneNotSupportedException.java: Re-merged with Classpath. diff --git a/libjava/java/util/TimeZone.java b/libjava/java/util/TimeZone.java index 2ee5208ead5..4808963efa2 100644 --- a/libjava/java/util/TimeZone.java +++ b/libjava/java/util/TimeZone.java @@ -118,6 +118,7 @@ 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("PST", tz); + timezones.put("PST8PDT", tz); timezones.put("America/Dawson", tz); timezones.put("America/Los_Angeles", tz); timezones.put("America/Tijuana", tz); @@ -131,6 +132,7 @@ 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("MST", tz); + timezones.put("MST7MDT", tz); timezones.put("America/Boise", tz); timezones.put("America/Chihuahua", tz); timezones.put("America/Denver", tz); @@ -139,7 +141,8 @@ 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(-7000 * 3600, "PNT"); + 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); @@ -149,6 +152,7 @@ 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("CST", tz); + timezones.put("CST6CDT", tz); timezones.put("America/Cambridge_Bay", tz); timezones.put("America/Cancun", tz); timezones.put("America/Chicago", tz); @@ -179,7 +183,8 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable Calendar.OCTOBER, -1, Calendar.SUNDAY, 0 * 3600); timezones.put("America/Grand_Turk", tz); timezones.put("America/Havana", tz); - tz = new SimpleTimeZone(-5000 * 3600, "IET"); + tz = new SimpleTimeZone(-5000 * 3600, "EST5"); + timezones.put("EST5", tz); timezones.put("IET", tz); timezones.put("America/Bogota", tz); timezones.put("America/Cayman", tz); @@ -203,6 +208,7 @@ 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("EST", tz); + timezones.put("EST5EDT", tz); timezones.put("America/Detroit", tz); timezones.put("America/Kentucky/Louisville", tz); timezones.put("America/Kentucky/Monticello", tz);