jcharts-cvs

[<nic...@us...>]

Update of /cvsroot/jcharts/krysalis-jcharts/src/scratchpad/org/krysalis/jcharts/gantt
In directory sc8-pr-cvs1:/tmp/cvs-serv14582/src/scratchpad/org/krysalis/jcharts/gantt

Modified Files:
	DateHandler.java 
Log Message:
Fix weekday handling that was relying on the default date in a week
(Tuesday), by forcing Monday instead.

Index: DateHandler.java
===================================================================
RCS file: /cvsroot/jcharts/krysalis-jcharts/src/scratchpad/org/krysalis/jcharts/gantt/DateHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DateHandler.java	2 Sep 2003 11:33:05 -0000	1.5
--- DateHandler.java	2 Sep 2003 12:45:17 -0000	1.6
***************
*** 213,235 ****
    public static String getStringDateFromWeek(int week, boolean startDay)
      throws ParseException {
!     System.out.println("TRANSFORMING WEEK: " + String.valueOf(week));
      Calendar c = Calendar.getInstance();
      c.setTime(new Date());
      c.set(Calendar.WEEK_OF_YEAR, week);
!     if (startDay) {
!       c.roll(Calendar.DATE, -1);
!     }
!     else {
!       c.roll(Calendar.DATE, 3);
!     }
  
!     //      String resultYear = String.valueOf(c.get(Calendar.YEAR));
!     //      String resultMonth = String.valueOf(c.get(Calendar.MONTH));
!     //      if(resultMonth.length()==1){resultMonth="0"+resultMonth;}
!     //      String resultDay = String.valueOf(c.get(Calendar.DATE));
!     //      if(resultDay.length()==1){resultDay="0"+resultMonth;}
!     //      return resultYear+resultMonth+resultDay;
  
      Date result = c.getTime();
  
      return dateStampFormat.format(result);
--- 213,230 ----
    public static String getStringDateFromWeek(int week, boolean startDay)
      throws ParseException {
!     System.out.print("TRANSFORMING WEEK: " + String.valueOf(week));
      Calendar c = Calendar.getInstance();
      c.setTime(new Date());
      c.set(Calendar.WEEK_OF_YEAR, week);
!     c.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
  
!     // | S | M | T | W | T | F |
!     //       X              +4
!     if (!startDay) {
!       c.roll(Calendar.DATE, +4);
!     }
  
      Date result = c.getTime();
+     System.out.println(" into: " + result);
  
      return dateStampFormat.format(result);