procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TimeZone.java (getDateParams): Negate dayOfWeek.

Browse source 
2007-02-14  Jakub Jelinek  <jakub@redhat.com>
	Andrew Haley  <aph@redhat.com>

	* java/util/TimeZone.java (getDateParams): Negate dayOfWeek.


Co-Authored-By: Andrew Haley <aph@redhat.com>

From-SVN: r121955
This commit is contained in:
Jakub Jelinek 2007-02-14 20:31:58 +01:00 • committed by Andrew Haley
parent 029f45bdc1
commit 70def3c8db
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libjava/classpath/ChangeLog
View file

@ -1,3 +1,8 @@
2007-02-14 Jakub Jelinek <jakub@redhat.com>
Andrew Haley <aph@redhat.com>
* java/util/TimeZone.java (getDateParams): Negate dayOfWeek.
2007-02-09 Tom Tromey <tromey@redhat.com>
PR libgcj/30647:

24
libjava/classpath/java/util/TimeZone.java
View file

@ -1090,18 +1090,30 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
int day;
// Month, week of month, day of week
// "Mm.w.d". d is between 0 (Sunday) and 6. Week w is
// between 1 and 5; Week 1 is the first week in which day d
// occurs and Week 5 specifies the last d day in the month.
// Month m is between 1 and 12.
month = Integer.parseInt(date.substring(1, date.indexOf('.')));
int week = Integer.parseInt(date.substring(date.indexOf('.') + 1,
date.lastIndexOf('.')));
int dayOfWeek = Integer.parseInt(date.substring(date.lastIndexOf('.')
+ 1));
if (week == 5)
day = -1; // last day of month is -1 in java, 5 in TZ
else
// first day of week starting on or after.
day = (week - 1) * 7 + 1;
dayOfWeek++; // Java day of week is one-based, Sunday is first day.
if (week == 5)
day = -1; // last day of month is -1 in java, 5 in TZ
else
{
// First day of week starting on or after. For example,
// to specify the second Sunday of April, set month to
// APRIL, day-of-month to 8, and day-of-week to -SUNDAY.
day = (week - 1) * 7 + 1;
dayOfWeek = -dayOfWeek;
}
month--; // Java month is zero-based.
return new int[] { month, day, dayOfWeek };
}