From cca9b4b54d86897efe9f691274a2a9fbd0c15b5e Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Tue, 30 Dec 2003 19:56:49 +0000 Subject: [multiple changes] 2003-12-30 Guilhem Lavaux * java/util/GregorianCalendar.java (computeFields): Reported by Ito Kazumitsu . Fixed the computation of DAY_OF_WEEK_IN_MONTH. (computeTime): 12:00 midnight is AM and 12:00 noon is PM. 2003-12-30 Michael Koch * testsuite/libjava.mauve/xfails: Removed the following testcase because it passes now: FAIL: gnu.testlet.java.text.SimpleDateFormat.Test: parse() strict (number 1) From-SVN: r75244 --- libjava/java/util/GregorianCalendar.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'libjava/java') diff --git a/libjava/java/util/GregorianCalendar.java b/libjava/java/util/GregorianCalendar.java index 624924c..1d3d2f0 100644 --- a/libjava/java/util/GregorianCalendar.java +++ b/libjava/java/util/GregorianCalendar.java @@ -402,7 +402,11 @@ public class GregorianCalendar extends Calendar { hour = fields[HOUR]; if (isSet[AM_PM] && fields[AM_PM] == PM) - hour += 12; + if (hour != 12) /* not Noon */ + hour += 12; + /* Fix the problem of the status of 12:00 AM (midnight). */ + if (isSet[AM_PM] && fields[AM_PM] == AM && hour == 12) + hour = 0; } int minute = isSet[MINUTE] ? fields[MINUTE] : 0; @@ -606,7 +610,7 @@ public class GregorianCalendar extends Calendar calculateDay(++day, gregorian); } - fields[DAY_OF_WEEK_IN_MONTH] = (fields[DAY_OF_MONTH] + 12) / 7; + fields[DAY_OF_WEEK_IN_MONTH] = (fields[DAY_OF_MONTH] + 6) / 7; // which day of the week are we (0..6), relative to getFirstDayOfWeek int relativeWeekday = (7 + fields[DAY_OF_WEEK] - getFirstDayOfWeek()) % 7; -- cgit v1.1