+2000-12-27 Warren Levy <warrenl@redhat.com>
+
+ Fix for PR libgcj/1358:
+ * java/lang/System.java: Update Copyright date properly.
+ * java/util/Calendar.java: Fix typo in comment.
+ (set): Set 24-hour clock hour instead of 12-hour clock hour.
+ * java/util/GregorianCalendar.java (GregorianCalendar): Properly
+ initialize times. Spec says to set H:M:S values to zero only if
+ a date is given.
+ * java/util/TimeZone.java (getDefaultDisplayName): Casts to char
+ needed for evaluating numbers '0' to '9' in printouts of GMT offsets.
+ * java/util/natGregorianCalendar.cc (computeTime): Properly handle
+ timezones and GMT offsets, being careful to account for units of
+ milliseconds vs. seconds.
+
2000-12-28 Bryce McKinlay <bryce@albatross.co.nz>
* java/lang/natClass.cc (_Jv_IsAssignableFrom): Primitive TYPEs can
// System.java - System-specific info.
-/* Copyright (C) 1998, 1999 Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000 Free Software Foundation
This file is part of libgcj.
*/
public static final int DECEMBER = 11;
/**
- * Constant representing Undecimber. This is an artifical name useful
+ * Constant representing Undecimber. This is an artificial name useful
* for lunar calendars.
*/
public static final int UNDECIMBER = 12;
public final void set(int year, int month, int date, int hour, int minute)
{
set(year, month, date);
- fields[HOUR] = hour;
+ fields[HOUR_OF_DAY] = hour;
fields[MINUTE] = minute;
- isSet[HOUR] = isSet[MINUTE] = true;
+ isSet[HOUR_OF_DAY] = isSet[MINUTE] = true;
}
/**
public GregorianCalendar (int year, int month, int date)
{
this();
- setDefaultTime ();
- set (year, month, date);
+ set (year, month, date, 0, 0, 0);
}
public GregorianCalendar (int year, int month, int date,
int hour, int minute)
{
this();
- setDefaultTime ();
- set (year, month, date, hour, minute);
+ set (year, month, date, hour, minute, 0);
}
public GregorianCalendar (int year, int month, int date,
int hour, int minute, int second)
{
this();
- setDefaultTime ();
set (year, month, date, hour, minute, second);
}
int hours = offset / 60;
int minutes = offset % 60;
- sb.append('0' + hours / 10).append('0' + hours % 10).append(':');
- sb.append('0' + minutes / 10).append('0' + minutes % 10);
+ sb.append((char) ('0' + hours / 10)).append((char) ('0' + hours % 10));
+ sb.append(':');
+ sb.append((char) ('0' + minutes / 10)).append((char) ('0' + minutes % 10));
return sb.toString();
}
// Adjust for local timezone (introduced by mktime) and our
// timezone.
#if defined (STRUCT_TM_HAS_GMTOFF)
- t += tim.tm_gmtoff;
+ t -= tim.tm_gmtoff;
#elif defined (HAVE_TIMEZONE)
- t -= timezone;
+ t += timezone;
#endif
- java::util::TimeZone *zone = getTimeZone ();
- t += zone->getRawOffset();
-
// Adjust for milliseconds.
time = t * (jlong) 1000 + elements(fields)[MILLISECOND];
+ // Now adjust for the real timezone, i.e. our timezone, which is in millis.
+ java::util::TimeZone *zone = getTimeZone ();
+ time += zone->getRawOffset();
+
isTimeSet = true;
}