[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: Ito's SimpleDateFormat fix

[Kaffe CVS]

PatchSet 5920 
Date: 2005/01/26 14:19:41
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: Ito's SimpleDateFormat fix

2005-01-26  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-01-25  Ito Kazumitsu  <kaz at maczuka.gcd.org>

        * java/text/SimpleDateFormat.java:
        (parse): Use offset to set ZONE_OFFSET
        rather than the DST_OFFSET, so that
        GMT offset timezones change the right
        one.

Members: 
	ChangeLog:1.3459->1.3460 
	libraries/javalib/java/text/SimpleDateFormat.java:1.40->1.41 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3459 kaffe/ChangeLog:1.3460
--- kaffe/ChangeLog:1.3459	Wed Jan 26 14:13:18 2005
+++ kaffe/ChangeLog	Wed Jan 26 14:19:41 2005
@@ -2,6 +2,18 @@
 
         Resynced with GNU Classpath.
 
+	2005-01-25  Ito Kazumitsu  <kaz at maczuka.gcd.org>
+
+        * java/text/SimpleDateFormat.java:
+        (parse): Use offset to set ZONE_OFFSET
+        rather than the DST_OFFSET, so that
+        GMT offset timezones change the right
+        one.
+
+2005-01-26  Dalibor Topic  <robilad at kaffe.org>
+
+        Resynced with GNU Classpath.
+
 	2005-01-25  Michael Koch  <konqueror at gmx.de>
 
         * javax/swing/DefaultCellRenderer.java: Removed.
Index: kaffe/libraries/javalib/java/text/SimpleDateFormat.java
diff -u kaffe/libraries/javalib/java/text/SimpleDateFormat.java:1.40 kaffe/libraries/javalib/java/text/SimpleDateFormat.java:1.41
--- kaffe/libraries/javalib/java/text/SimpleDateFormat.java:1.40	Mon Jan 24 15:47:15 2005
+++ kaffe/libraries/javalib/java/text/SimpleDateFormat.java	Wed Jan 26 14:19:44 2005
@@ -840,7 +840,7 @@
 		// We need a special case for the timezone, because it
 		// uses a different data structure than the other cases.
 		is_numeric = false;
-		calendar_field = Calendar.DST_OFFSET;
+		calendar_field = Calendar.ZONE_OFFSET;
 		String[][] zoneStrings = formatData.getZoneStrings();
 		int zoneCount = zoneStrings.length;
 		int index = pos.getIndex();
@@ -868,8 +868,8 @@
 			    found_zone = true;
 			    saw_timezone = true;
 			    TimeZone tz = TimeZone.getTimeZone (strings[0]);
-			    calendar.set (Calendar.ZONE_OFFSET, tz.getRawOffset ());
-			    offset = tz.getDSTSavings();
+			    calendar.set (Calendar.DST_OFFSET, tz.getDSTSavings());
+                            offset = tz.getRawOffset ();
 			    pos.setIndex(index + strings[k].length());
 			    break;
 			  }