[kaffe] CVS kaffe (dalibor): Resynced with GNU Classpath: TimeZone fixes

Kaffe CVS cvs-commits at kaffe.org
Sun Sep 12 01:17:49 PDT 2004


PatchSet 5156 
Date: 2004/09/12 07:55:00
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: TimeZone fixes

2004-09-12  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/util/VMTimeZone.java:
        New file, taken from GNU Classpath.

        * include/Makefile.am: Generate header for VMTimeZone.

        * include/Makefile.in: Regenerated.

        * libraries/clib/native/System.c (getenv0):
        Fixed prototype.

        * libraries/clib/native/TimeZone.c: Changed to VMTimeZone
        prototype.

        * libraries/javalib/Klasses.jar.bootstrap: Regenerated.

        * libraries/javalib/Makefile.am,
        libraries/javalib/Makefile.in,
        libraries/javalib/all.files:
        Regenerated.

        * libraries/javalib/bootstrap.classlist:
       Added VMTimeZone and other necessary files for kjc's
        bootstrap.

        * libraries/javalib/java/util/TimeZone.java:
        Resynced with GNU Classpath.

        2004-08-29  Mark Wielaard  <mark at klomp.org>

        * java/util/TimeZone.java (defaultZone): Use VMTimeZone.
        (getDefaultTimeZone): Make package private. Check that GMToffset
        contains at least one digit.
        (getDefaultTimeZoneId, readTimeZoneFile, readtzFile): (Re)Moved to
        VMTimeZone.
        * vm/reference/java/util/VMTimeZone.java: New file with above methods.

        2004-08-28  Mark Wielaard  <mark at klomp.org>

        * java/util/TimeZone.java (defaultZone): Try a couple of ways to get
        a TimeZoneId string and then try to convert that to a TimeZone with
        getDefaultSystemTimeZone(String).
        (timezones0): Changed type from Hashtable to HashMap.
        (timezones): Create HashMap, not Hashtable.
        (getDefaultTimeZone): New method, rewritten from CNI version.
        (readTimeZoneFile): New method.
        (readtzFile): Likewise.
        (skipFully): Likewise.

Members: 
	ChangeLog:1.2711->1.2712 
	include/Makefile.am:1.73->1.74 
	include/Makefile.in:1.186->1.187 
	libraries/clib/native/System.c:1.53->1.54 
	libraries/clib/native/TimeZone.c:1.5->1.6 
	libraries/javalib/Klasses.jar.bootstrap:1.69->1.70 
	libraries/javalib/Makefile.am:1.228->1.229 
	libraries/javalib/Makefile.in:1.306->1.307 
	libraries/javalib/all.files:1.19->1.20 
	libraries/javalib/bootstrap.classlist:1.59->1.60 
	libraries/javalib/java/util/TimeZone.java:1.18->1.19 
	libraries/javalib/java/util/VMTimeZone.java:INITIAL->1.1 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2711 kaffe/ChangeLog:1.2712
--- kaffe/ChangeLog:1.2711	Sat Sep 11 18:24:45 2004
+++ kaffe/ChangeLog	Sun Sep 12 07:55:00 2004
@@ -1,3 +1,54 @@
+2004-09-12  Dalibor Topic  <robilad at kaffe.org>
+
+	* libraries/javalib/java/util/VMTimeZone.java:
+	New file, taken from GNU Classpath.
+
+	* include/Makefile.am: Generate header for VMTimeZone.
+
+	* include/Makefile.in: Regenerated.
+
+	* libraries/clib/native/System.c (getenv0): 
+	Fixed prototype.
+
+	* libraries/clib/native/TimeZone.c: Changed to VMTimeZone
+	prototype.
+
+	* libraries/javalib/Klasses.jar.bootstrap: Regenerated.
+
+	* libraries/javalib/Makefile.am,
+	libraries/javalib/Makefile.in,
+	libraries/javalib/all.files:
+	Regenerated.
+
+	* libraries/javalib/bootstrap.classlist:
+	Added VMTimeZone and other necessary files for kjc's
+	bootstrap.
+
+	* libraries/javalib/java/util/TimeZone.java:
+	Resynced with GNU Classpath.
+
+	2004-08-29  Mark Wielaard  <mark at klomp.org>
+
+        * java/util/TimeZone.java (defaultZone): Use VMTimeZone.
+        (getDefaultTimeZone): Make package private. Check that GMToffset
+        contains at least one digit.
+        (getDefaultTimeZoneId, readTimeZoneFile, readtzFile): (Re)Moved to
+        VMTimeZone.
+        * vm/reference/java/util/VMTimeZone.java: New file with above methods.
+
+	2004-08-28  Mark Wielaard  <mark at klomp.org>
+
+        * java/util/TimeZone.java (defaultZone): Try a couple of ways to get
+        a TimeZoneId string and then try to convert that to a TimeZone with
+        getDefaultSystemTimeZone(String).
+        (timezones0): Changed type from Hashtable to HashMap.
+        (timezones): Create HashMap, not Hashtable.
+        (getDefaultTimeZone): New method, rewritten from CNI version.
+        (readTimeZoneFile): New method.
+        (readtzFile): Likewise.
+        (skipFully): Likewise.
+
+
 2004-09-11  Guilhem Lavaux  <guilhem at kaffe.org>
 
 	* config/m68k/openbsd2/md.h: Fixed another typo in sysdepCallMethod.
Index: kaffe/include/Makefile.am
diff -u kaffe/include/Makefile.am:1.73 kaffe/include/Makefile.am:1.74
--- kaffe/include/Makefile.am:1.73	Mon Aug 23 16:01:22 2004
+++ kaffe/include/Makefile.am	Sun Sep 12 07:55:04 2004
@@ -89,7 +89,7 @@
 	java_text_DateFormat.h \
 	java_util_Arrays.h \
 	java_util_Comparator.h \
-	java_util_TimeZone.h \
+	java_util_VMTimeZone.h \
 	java_util_Vector.h \
 	java_util_zip_Adler32.h \
 	java_util_zip_CRC32.h \
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.186 kaffe/include/Makefile.in:1.187
--- kaffe/include/Makefile.in:1.186	Mon Sep  6 19:07:17 2004
+++ kaffe/include/Makefile.in	Sun Sep 12 07:55:04 2004
@@ -435,7 +435,7 @@
 	java_text_DateFormat.h \
 	java_util_Arrays.h \
 	java_util_Comparator.h \
-	java_util_TimeZone.h \
+	java_util_VMTimeZone.h \
 	java_util_Vector.h \
 	java_util_zip_Adler32.h \
 	java_util_zip_CRC32.h \
Index: kaffe/libraries/clib/native/System.c
diff -u kaffe/libraries/clib/native/System.c:1.53 kaffe/libraries/clib/native/System.c:1.54
--- kaffe/libraries/clib/native/System.c:1.53	Fri Sep 10 15:46:59 2004
+++ kaffe/libraries/clib/native/System.c	Sun Sep 12 07:55:04 2004
@@ -162,7 +162,7 @@
 
 
 /* Adapted from GNU Classpath */
-void
+struct Hjava_lang_String*
 java_lang_System_getenv0(struct Hjava_lang_String *str) 
 {
   const char *cname;
Index: kaffe/libraries/clib/native/TimeZone.c
diff -u kaffe/libraries/clib/native/TimeZone.c:1.5 kaffe/libraries/clib/native/TimeZone.c:1.6
--- kaffe/libraries/clib/native/TimeZone.c:1.5	Mon Jul 19 06:57:32 2004
+++ kaffe/libraries/clib/native/TimeZone.c	Sun Sep 12 07:55:04 2004
@@ -21,7 +21,7 @@
 #include "java_util_TimeZone.h"
 
 struct Hjava_lang_String*
-java_util_TimeZone_getDefaultTimeZoneId(void)
+java_util_VMTimeZone_getSystemTimeZoneId(void)
 {
 	        char *tempZoneName = NULL;
 #if defined(HAVE_TM_ZONE)
Index: kaffe/libraries/javalib/Klasses.jar.bootstrap
cvs rdiff: failed to read diff file header /tmp/cvsO0nszQ for Klasses.jar.bootstrap,v: end of file
system command returned non-zero exit status: 1: aborting




More information about the kaffe mailing list