FYI: Patch: java.util.GregorianCalendar

[Michael Koch <konqueror at gmx dot de>]

Hi list,


I commited the attached patch to merge java.util.GregorianCalendar with 
classpath. This fixes 9 mauve tests, one of them was xfailed.


Michael

Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2501
diff -u -b -B -r1.2501 ChangeLog
--- ChangeLog	30 Dec 2003 15:51:14 -0000	1.2501
+++ ChangeLog	30 Dec 2003 19:52:29 -0000
@@ -1,3 +1,17 @@
+2003-12-30 Guilhem Lavaux <guilhem@kaffe.org>
+
+	* java/util/GregorianCalendar.java
+	(computeFields): Reported by Ito Kazumitsu <kaz@maczuka.gcd.org>.
+	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  <konqueror@gmx.de>
+
+	* testsuite/libjava.mauve/xfails: Removed the following testcase
+	because it passes now:
+	FAIL: gnu.testlet.java.text.SimpleDateFormat.Test: parse() strict
+	(number 1)
+
 2003-12-30  Michael Koch  <konqueror@gmx.de>
 
 	* java/io/ObjectInputStream.java,
Index: java/util/GregorianCalendar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/GregorianCalendar.java,v
retrieving revision 1.18
diff -u -b -B -r1.18 GregorianCalendar.java
--- java/util/GregorianCalendar.java	27 Nov 2003 09:16:13 -0000	1.18
+++ java/util/GregorianCalendar.java	30 Dec 2003 19:52:29 -0000
@@ -402,7 +402,11 @@
       {
 	hour = fields[HOUR];
         if (isSet[AM_PM] && fields[AM_PM] == PM)
+	  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 @@
 	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;
Index: testsuite/libjava.mauve/xfails
===================================================================
RCS file: /cvs/gcc/gcc/libjava/testsuite/libjava.mauve/xfails,v
retrieving revision 1.18
diff -u -b -B -r1.18 xfails
--- testsuite/libjava.mauve/xfails	18 Dec 2003 20:23:48 -0000	1.18
+++ testsuite/libjava.mauve/xfails	30 Dec 2003 19:52:29 -0000
@@ -34,7 +34,6 @@
 FAIL: gnu.testlet.java.lang.String.getBytes14: String.getBytes("UTF-16LE") (number 1)
 FAIL: gnu.testlet.java.text.AttributedString.Test: Attribute key count (number 1)
 FAIL: gnu.testlet.java.text.DateFormatSymbols.Test: patterns (number 2)
-FAIL: gnu.testlet.java.text.SimpleDateFormat.Test: parse() strict (number 1)
 FAIL: gnu.testlet.java.text.SimpleDateFormat.getAndSet2DigitYearStart: get2DigitYearStart() initial (number 1)
 FAIL: gnu.testlet.java.text.DateFormatSymbols.Test: invalid locale (number 1)
 FAIL: gnu.testlet.java.text.CollationElementIterator.jdk11: CollationElementIterator (number 1)