diff options
| author | Sven de Marothy <sven@physto.se> | 2005-03-23 22:26:00 +0100 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2005-03-23 21:26:00 +0000 |
| commit | 8d3ece5d900e311a6b1548885a2535bd93fa86df (patch) | |
| tree | fdb34ce03f86ab0625684dbe5615ad44586e2228 /libjava/java/util/Calendar.java | |
| parent | 85c4f26a8651192648d1d4ce37009d838abe4152 (diff) | |
| download | gcc-8d3ece5d900e311a6b1548885a2535bd93fa86df.zip gcc-8d3ece5d900e311a6b1548885a2535bd93fa86df.tar.gz gcc-8d3ece5d900e311a6b1548885a2535bd93fa86df.tar.bz2 | |
PR libgcj/2641, PR libgcj/9854, PR libgcj/14892, PR libgcj/18083,
2005-03-23 Sven de Marothy <sven@physto.se>
PR libgcj/2641, PR libgcj/9854, PR libgcj/14892, PR libgcj/18083,
PR libgcj/11085:
* java/util/Calendar.java
(set): Use starting day of week when one is needed if none is given.
* java/text/SimpleDateFormat.java
(parse): Handle 1-12 and 1-24 timestamps correctly.
* java/util/GregorianCalendar.java
(computeTime, computeFields): HOUR should be in 0-11 format.
(nonLeniencyCheck): Adjust leniency checking to that fact.
(getLinearDay): Should be private.
From-SVN: r96951
Diffstat (limited to 'libjava/java/util/Calendar.java')
| -rw-r--r-- | libjava/java/util/Calendar.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libjava/java/util/Calendar.java b/libjava/java/util/Calendar.java index 0e9284c..7faaeee 100644 --- a/libjava/java/util/Calendar.java +++ b/libjava/java/util/Calendar.java @@ -706,6 +706,8 @@ public abstract class Calendar implements Serializable, Cloneable isSet[WEEK_OF_YEAR] = false; break; case WEEK_OF_MONTH: // pattern 2 + if (! isSet[DAY_OF_WEEK]) + fields[DAY_OF_WEEK] = getFirstDayOfWeek(); isSet[YEAR] = true; isSet[MONTH] = true; isSet[DAY_OF_WEEK] = true; @@ -715,6 +717,8 @@ public abstract class Calendar implements Serializable, Cloneable isSet[WEEK_OF_YEAR] = false; break; case DAY_OF_WEEK_IN_MONTH: // pattern 3 + if (! isSet[DAY_OF_WEEK]) + fields[DAY_OF_WEEK] = getFirstDayOfWeek(); isSet[YEAR] = true; isSet[MONTH] = true; isSet[DAY_OF_WEEK] = true; @@ -733,6 +737,8 @@ public abstract class Calendar implements Serializable, Cloneable isSet[DAY_OF_WEEK_IN_MONTH] = false; break; case WEEK_OF_YEAR: // pattern 5 + if (! isSet[DAY_OF_WEEK]) + fields[DAY_OF_WEEK] = getFirstDayOfWeek(); isSet[YEAR] = true; isSet[DAY_OF_WEEK] = true; isSet[MONTH] = false; |