[PATCH] Regenerate TimeZone.java from tzdata2007a

[Andrew Haley]

When we're setting a date in the form "First day of week starting on
or after", the third argument (day of week) must be negative.

Andrew.


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

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

Index: TimeZone.java
===================================================================
*** TimeZone.java	(revision 121844)
--- TimeZone.java	(working copy)
***************
*** 1090,1107 ****
  	int day;
  
  	// Month, week of month, day of week
  	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.
  	month--; // Java month is zero-based.
  	return new int[] { month, day, dayOfWeek };
        }
--- 1090,1119 ----
  	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));
  	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 };
        }