This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: TimeZone partial re-merge
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Subject: Patch: FYI: TimeZone partial re-merge
- From: Tom Tromey <tromey at redhat dot com>
- Date: 14 Sep 2001 19:36:28 -0600
- Reply-To: tromey at redhat dot com
This re-merges part but not all of TimeZone with Classpath.
The non-merged parts require a change to Classpath (or libgcj) that
I'm not yet prepared to make.
Built on x86.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
* java/util/TimeZone.java: Updated list of timezones from
Classpath.
Index: java/util/TimeZone.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/TimeZone.java,v
retrieving revision 1.11
diff -u -r1.11 TimeZone.java
--- java/util/TimeZone.java 2001/03/20 10:05:45 1.11
+++ java/util/TimeZone.java 2001/09/15 01:21:42
@@ -118,6 +118,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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);