Skip to content

R
riscv-gcc-1
Commit ffe2e220 by Mark Wielaard
Options

[multiple changes] 

2004-09-25  Mark Wielaard  <mark@klomp.org>

        * Makefile.am (core_java_source_files): Add VMTimeZone.java.
        (nat_source_files): Rename natTimeZone.cc to natVMTimeZone.cc.
        * Makefile.in: Regenerated.

        * gcj/javaprims.h: Regenerated.

        * 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.
        * util/VMTimeZone.java: New file with above methods.

        * java/util/natTimeZone.cc: Removed (renamed).
        * java/util/natVMTimeZone.cc: Added (renamed).

2004-09-25  Jeroen Frijters  <jeroen@frijters.net>

        * java/util/TimeZone.java
        (getDefaultTimeZone): Fixed test to distinguish between hours and
        minutes in specified timezone.

From-SVN: r88112
parent bfe0d06b
Showing with 59 additions and 294 deletions
libjava/ChangeLog
2004-09-25 Mark Wielaard <mark@klomp.org>
* Makefile.am (core_java_source_files): Add VMTimeZone.java.
(nat_source_files): Rename natTimeZone.cc to natVMTimeZone.cc.
* Makefile.in: Regenerated.
* gcj/javaprims.h: Regenerated.
* 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.
* util/VMTimeZone.java: New file with above methods.
* java/util/natTimeZone.cc: Removed (renamed).
* java/util/natVMTimeZone.cc: Added (renamed).
2004-09-25 Jeroen Frijters <jeroen@frijters.net>
* java/util/TimeZone.java
(getDefaultTimeZone): Fixed test to distinguish between hours and
minutes in specified timezone.
2004-09-25 Jeroen Frijters <jeroen@frijters.net>
* java/lang/reflect/Proxy.java (getPackage, ClassFactory): Fixed
......
libjava/Makefile.am
......@@ -2424,6 +2424,7 @@ java/util/TreeMap.java \
java/util/TreeSet.java \
java/util/TooManyListenersException.java \
java/util/Vector.java \
java/util/VMTimeZone.java \
java/util/WeakHashMap.java \
java/util/logging/ConsoleHandler.java \
java/util/logging/ErrorManager.java \
......@@ -3191,7 +3192,7 @@ java/nio/channels/natChannels.cc \
java/nio/natDirectByteBufferImpl.cc \
java/text/natCollator.cc \
java/util/natResourceBundle.cc \
java/util/natTimeZone.cc \
java/util/natVMTimeZone.cc \
java/util/zip/natDeflater.cc \
java/util/zip/natInflater.cc
......
libjava/Makefile.in
......@@ -410,7 +410,7 @@ am__libgcj_la_SOURCES_DIST = prims.cc jni.cc exception.cc resolve.cc \
java/lang/reflect/natProxy.cc java/net/natNetworkInterface.cc \
java/net/natInetAddress.cc java/nio/channels/natChannels.cc \
java/nio/natDirectByteBufferImpl.cc java/text/natCollator.cc \
java/util/natResourceBundle.cc java/util/natTimeZone.cc \
java/util/natResourceBundle.cc java/util/natVMTimeZone.cc \
java/util/zip/natDeflater.cc java/util/zip/natInflater.cc \
java/lang/dtoa.c java/lang/k_rem_pio2.c java/lang/s_tan.c \
java/lang/e_acos.c java/lang/k_sin.c java/lang/strtod.c \
......@@ -562,7 +562,7 @@ am__libgcj_la_SOURCES_DIST = prims.cc jni.cc exception.cc resolve.cc \
java/util/TimerTask.java java/util/TreeMap.java \
java/util/TreeSet.java \
java/util/TooManyListenersException.java java/util/Vector.java \
java/util/WeakHashMap.java \
java/util/VMTimeZone.java java/util/WeakHashMap.java \
java/util/logging/ConsoleHandler.java \
java/util/logging/ErrorManager.java \
java/util/logging/FileHandler.java \
......@@ -2299,7 +2299,7 @@ am__objects_6 = gnu/gcj/natCore.lo \
java/lang/reflect/natProxy.lo java/net/natNetworkInterface.lo \
java/net/natInetAddress.lo java/nio/channels/natChannels.lo \
java/nio/natDirectByteBufferImpl.lo java/text/natCollator.lo \
java/util/natResourceBundle.lo java/util/natTimeZone.lo \
java/util/natResourceBundle.lo java/util/natVMTimeZone.lo \
java/util/zip/natDeflater.lo java/util/zip/natInflater.lo
am__objects_7 = java/lang/dtoa.lo java/lang/k_rem_pio2.lo \
java/lang/s_tan.lo java/lang/e_acos.lo java/lang/k_sin.lo \
......@@ -2440,8 +2440,8 @@ am__objects_9 = java/lang/AbstractMethodError.lo \
java/util/TimeZone.lo java/util/Timer.lo \
java/util/TimerTask.lo java/util/TreeMap.lo \
java/util/TreeSet.lo java/util/TooManyListenersException.lo \
java/util/Vector.lo java/util/WeakHashMap.lo \
java/util/logging/ConsoleHandler.lo \
java/util/Vector.lo java/util/VMTimeZone.lo \
java/util/WeakHashMap.lo java/util/logging/ConsoleHandler.lo \
java/util/logging/ErrorManager.lo \
java/util/logging/FileHandler.lo java/util/logging/Filter.lo \
java/util/logging/Formatter.lo java/util/logging/Handler.lo \
......@@ -6235,6 +6235,7 @@ java/util/TreeMap.java \
java/util/TreeSet.java \
java/util/TooManyListenersException.java \
java/util/Vector.java \
java/util/VMTimeZone.java \
java/util/WeakHashMap.java \
java/util/logging/ConsoleHandler.java \
java/util/logging/ErrorManager.java \
......@@ -6991,7 +6992,7 @@ java/nio/channels/natChannels.cc \
java/nio/natDirectByteBufferImpl.cc \
java/text/natCollator.cc \
java/util/natResourceBundle.cc \
java/util/natTimeZone.cc \
java/util/natVMTimeZone.cc \
java/util/zip/natDeflater.cc \
java/util/zip/natInflater.cc
......@@ -8012,7 +8013,7 @@ java/util/$(DEPDIR)/$(am__dirstamp):
@: > java/util/$(DEPDIR)/$(am__dirstamp)
java/util/natResourceBundle.lo: java/util/$(am__dirstamp) \
java/util/$(DEPDIR)/$(am__dirstamp)
java/util/natTimeZone.lo: java/util/$(am__dirstamp) \
java/util/natVMTimeZone.lo: java/util/$(am__dirstamp) \
java/util/$(DEPDIR)/$(am__dirstamp)
java/util/zip/$(am__dirstamp):
@$(mkdir_p) java/util/zip
......@@ -8536,6 +8537,8 @@ java/util/TooManyListenersException.lo: java/util/$(am__dirstamp) \
java/util/$(DEPDIR)/$(am__dirstamp)
java/util/Vector.lo: java/util/$(am__dirstamp) \
java/util/$(DEPDIR)/$(am__dirstamp)
java/util/VMTimeZone.lo: java/util/$(am__dirstamp) \
java/util/$(DEPDIR)/$(am__dirstamp)
java/util/WeakHashMap.lo: java/util/$(am__dirstamp) \
java/util/$(DEPDIR)/$(am__dirstamp)
java/util/logging/$(am__dirstamp):
......@@ -17139,6 +17142,8 @@ mostlyclean-compile:
-rm -f java/util/TreeMap.lo
-rm -f java/util/TreeSet.$(OBJEXT)
-rm -f java/util/TreeSet.lo
-rm -f java/util/VMTimeZone.$(OBJEXT)
-rm -f java/util/VMTimeZone.lo
-rm -f java/util/Vector.$(OBJEXT)
-rm -f java/util/Vector.lo
-rm -f java/util/WeakHashMap.$(OBJEXT)
......@@ -17191,8 +17196,8 @@ mostlyclean-compile:
-rm -f java/util/logging/XMLFormatter.lo
-rm -f java/util/natResourceBundle.$(OBJEXT)
-rm -f java/util/natResourceBundle.lo
-rm -f java/util/natTimeZone.$(OBJEXT)
-rm -f java/util/natTimeZone.lo
-rm -f java/util/natVMTimeZone.$(OBJEXT)
-rm -f java/util/natVMTimeZone.lo
-rm -f java/util/prefs/AbstractPreferences.$(OBJEXT)
-rm -f java/util/prefs/AbstractPreferences.lo
-rm -f java/util/prefs/BackingStoreException.$(OBJEXT)
......@@ -20538,10 +20543,11 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@java/util/$(DEPDIR)/TooManyListenersException.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/util/$(DEPDIR)/TreeMap.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/util/$(DEPDIR)/TreeSet.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/util/$(DEPDIR)/VMTimeZone.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/util/$(DEPDIR)/Vector.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/util/$(DEPDIR)/WeakHashMap.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/util/$(DEPDIR)/natResourceBundle.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/util/$(DEPDIR)/natTimeZone.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/util/$(DEPDIR)/natVMTimeZone.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/util/jar/$(DEPDIR)/Attributes.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/util/jar/$(DEPDIR)/JarEntry.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/util/jar/$(DEPDIR)/JarException.Plo@am__quote@
libjava/gcj/javaprims.h
......@@ -151,6 +151,7 @@ extern "Java"
class Comparable;
class Compiler;
class ConcreteProcess;
class ConcreteProcess$EOFInputStream;
class ConcreteProcess$ProcessManager;
class Double;
class Error;
......@@ -359,6 +360,7 @@ extern "Java"
class TreeMap$SubMap;
class TreeMap$TreeIterator;
class TreeSet;
class VMTimeZone;
class Vector;
class WeakHashMap;
class WeakHashMap$WeakBucket;
......
libjava/java/util/natTimeZone.cc → libjava/java/util/natVMTimeZone.cc
// natTimeZone.cc -- Native side of TimeZone class.
// natVMTimeZone.cc -- Native side of VMTimeZone class.
/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
Free Software Foundation
......@@ -15,7 +15,7 @@ details. */
#include <gcj/cni.h>
#include <jvm.h>
#include <java/util/TimeZone.h>
#include <java/util/VMTimeZone.h>
#include <java/lang/Character.h>
#include <java/lang/Integer.h>
......@@ -51,7 +51,7 @@ details. */
* TimeZone object.
*/
jstring
java::util::TimeZone::getDefaultTimeZoneId ()
java::util::VMTimeZone::getSystemTimeZoneId()
{
struct tm tim;
#ifndef HAVE_LOCALTIME_R
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment