aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/util/Calendar.java
diff options
context:
space:
mode:
authorWarren Levy <warrenl@redhat.com>2000-12-28 05:55:56 +0000
committerWarren Levy <warrenl@gcc.gnu.org>2000-12-28 05:55:56 +0000
commited55bdc47f78302e9f7271300cef11be655bccc0 (patch)
tree4527372c96022ef87de67514404688cc3687737d /libjava/java/util/Calendar.java
parent5da1e2c4897295fb32739724224a86c866dff1d5 (diff)
downloadgcc-ed55bdc47f78302e9f7271300cef11be655bccc0.zip
gcc-ed55bdc47f78302e9f7271300cef11be655bccc0.tar.gz
gcc-ed55bdc47f78302e9f7271300cef11be655bccc0.tar.bz2
re PR libgcj/1358 (java.util.Date.toString() doesn't seem to behave properly.)
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. From-SVN: r38508
Diffstat (limited to 'libjava/java/util/Calendar.java')
-rw-r--r--libjava/java/util/Calendar.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/libjava/java/util/Calendar.java b/libjava/java/util/Calendar.java
index f31577a..05c3f63 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;
}
/**