diff options
| author | warrenl <warrenl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-12-28 05:55:56 +0000 |
|---|---|---|
| committer | warrenl <warrenl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-12-28 05:55:56 +0000 |
| commit | e959c67a675cd5169be86a25f79f87c6aca84827 (patch) | |
| tree | 4527372c96022ef87de67514404688cc3687737d /libjava/java/util/Calendar.java | |
| parent | 6c364243010034ce2d629daebe8e654bc4215b7e (diff) | |
| download | ppe42-gcc-e959c67a675cd5169be86a25f79f87c6aca84827.tar.gz ppe42-gcc-e959c67a675cd5169be86a25f79f87c6aca84827.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38508 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/util/Calendar.java')
| -rw-r--r-- | libjava/java/util/Calendar.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libjava/java/util/Calendar.java b/libjava/java/util/Calendar.java index f31577a9dcf..05c3f633eb1 100644 --- a/libjava/java/util/Calendar.java +++ b/libjava/java/util/Calendar.java @@ -257,7 +257,7 @@ public abstract class Calendar implements Serializable, Cloneable */ 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; @@ -581,9 +581,9 @@ public abstract class Calendar implements Serializable, Cloneable 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; } /** |
