diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-07-26 11:21:45 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-07-26 11:21:45 +0000 |
| commit | 5f329d591ca02004500101b7ffe6c2ed96925617 (patch) | |
| tree | f1888f988daa008faa5d48c983f690f3067987c7 /libjava/java/util/Calendar.java | |
| parent | 2bbbdf1a822ddcdbd2352dbd9f2a3c15bbce32c3 (diff) | |
| download | gcc-5f329d591ca02004500101b7ffe6c2ed96925617.tar.gz | |
* java/util/Calendar.java (set): Never recompute fields here. They
will already be set if someone set time explicitly, and it can cause
problems to do so. Don't invalidate AM_PM setting if HOUR is set.
* java/util/GregorianCalendar.java (computeTime): Don't ignore an
HOUR setting if AM_PM is set. Don't try to ensure the HOUR value is
sane.
* java/text/SimpleDateFormat.java (defaultCentury): New field.
(readObject): Call set2DigitYearStart if appropriate so that
defaultCentury is calculated.
(SimpleDateFormat): Don't bother clearing calendar here. Call
computeCenturyStart().
(set2DigitYearStart): Calculate and set defaultCentury.
(format): Don't clone the calendar. Use "calendar" not "theCalendar"
everywhere.
(parse): Likewise. If the pattern is "y" or "yy" and it found exactly
2 numeric digits, use the 80-20 heuristic to parse the value into a
default century based on defaultCenturyStart.
(computeCenturyStart): Rewritten. Call set2DigitYearStart().
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44395 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/util/Calendar.java')
| -rw-r--r-- | libjava/java/util/Calendar.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libjava/java/util/Calendar.java b/libjava/java/util/Calendar.java index 17f4c7756e5..81494112533 100644 --- a/libjava/java/util/Calendar.java +++ b/libjava/java/util/Calendar.java @@ -549,8 +549,6 @@ public abstract class Calendar implements Serializable, Cloneable */ public final void set(int field, int value) { - if (!areFieldsSet) - computeFields(); isTimeSet = false; fields[field] = value; isSet[field] = true; @@ -573,7 +571,6 @@ public abstract class Calendar implements Serializable, Cloneable isSet[HOUR] = false; break; case HOUR: - isSet[AM_PM] = false; isSet[HOUR_OF_DAY] = false; break; } @@ -587,8 +584,6 @@ public abstract class Calendar implements Serializable, Cloneable */ public final void set(int year, int month, int date) { - if (!areFieldsSet) - computeFields(); isTimeSet = false; fields[YEAR] = year; fields[MONTH] = month; |