OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SimpleDateFormat.java (format): Compute hour for cases HOUR_OF_DAY1_FIELD (1-24)... 

* java/text/SimpleDateFormat.java (format): Compute hour for cases
	HOUR_OF_DAY1_FIELD (1-24), HOUR1_FIELD (1-12), and HOUR0_FIELD (0-11)
	correctly.  Adjust properly from 0-23 clock hour.

Fixes failure in Mauve test java.text.SimpleDateFormat.Test (format).

From-SVN: r39147
This commit is contained in:
Warren Levy 2001-01-20 00:37:09 +00:00 committed by Warren Levy
parent 03bbd83fa4
commit 1aa605c814
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
2001-01-19 Warren Levy <warrenl@redhat.com>
* java/text/SimpleDateFormat.java (format): Compute hour for cases
HOUR_OF_DAY1_FIELD (1-24), HOUR1_FIELD (1-12), and HOUR0_FIELD (0-11)
correctly. Adjust properly from 0-23 clock hour.
2001-01-17 Mark Wielaard <mark@klomp.org>
* java/bean/Beans.java (instantiate): enable Applet code from Classpath
@ -104,7 +110,6 @@
non-standard ones.
(getDefaultTimeZoneId): Removed.
(zoneGMT): Removed.
(getDefaultTimeZoneId): Removed.
* java/util/natTimeZone.cc: Removed.
2001-01-08 Bryce McKinlay <bryce@albatross.co.nz>

12
libjava/java/text/SimpleDateFormat.java
View File

@ -1,6 +1,6 @@
/* SimpleDateFormat.java -- A class for parsing/formating simple
date constructs
Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -411,8 +411,8 @@ public class SimpleDateFormat extends DateFormat
case DATE_FIELD:
withLeadingZeros(theCalendar.get(Calendar.DATE),p.size,buffer);
break;
case HOUR_OF_DAY1_FIELD: // 1-12
withLeadingZeros(theCalendar.get(Calendar.HOUR),p.size,buffer);
case HOUR_OF_DAY1_FIELD: // 1-24
withLeadingZeros(((theCalendar.get(Calendar.HOUR_OF_DAY)+23)%24)+1,p.size,buffer);
break;
case HOUR_OF_DAY0_FIELD: // 0-23
withLeadingZeros(theCalendar.get(Calendar.HOUR_OF_DAY),p.size,buffer);
@ -447,11 +447,11 @@ public class SimpleDateFormat extends DateFormat
case AM_PM_FIELD:
buffer.append(formatData.ampms[theCalendar.get(Calendar.AM_PM)]);
break;
case HOUR1_FIELD: // 1-24
withLeadingZeros(theCalendar.get(Calendar.HOUR_OF_DAY)+1,p.size,buffer);
case HOUR1_FIELD: // 1-12
withLeadingZeros(((theCalendar.get(Calendar.HOUR)+11)%12)+1,p.size,buffer);
break;
case HOUR0_FIELD: // 0-11
withLeadingZeros(theCalendar.get(Calendar.HOUR)-1,p.size,buffer);
withLeadingZeros(theCalendar.get(Calendar.HOUR),p.size,buffer);
break;
case TIMEZONE_FIELD:
TimeZone zone = theCalendar.getTimeZone();