[Jfreechart-commit] jfreechart/source/org/jfree/data/time Week.java, 1.7.2.4, 1.7.2.5

[David G. <mu...@us...>]

Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/data/time
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22082/source/org/jfree/data/time

Modified Files:
      Tag: STABLE_1-0-0
	Week.java 
Log Message:
2007-01-10  David Gilbert  <dav...@ob...>

	* source/org/jfree/data/time/Week.java
	(next): Don't go past maximum week in year.



Index: Week.java
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/data/time/Week.java,v
retrieving revision 1.7.2.4
retrieving revision 1.7.2.5
diff -C2 -d -r1.7.2.4 -r1.7.2.5
*** Week.java	6 Oct 2006 14:00:15 -0000	1.7.2.4
--- Week.java	10 Jan 2007 11:43:46 -0000	1.7.2.5
***************
*** 3,7 ****
   * ===========================================================
   *
!  * (C) Copyright 2000-2006, by Object Refinery Limited and Contributors.
   *
   * Project Info:  http://www.jfree.org/jfreechart/index.html
--- 3,7 ----
   * ===========================================================
   *
!  * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
   *
   * Project Info:  http://www.jfree.org/jfreechart/index.html
***************
*** 28,32 ****
   * Week.java
   * ---------
!  * (C) Copyright 2001-2004, by Object Refinery Limited and Contributors.
   *
   * Original Author:  David Gilbert (for Object Refinery Limited);
--- 28,32 ----
   * Week.java
   * ---------
!  * (C) Copyright 2001-2007, by Object Refinery Limited and Contributors.
   *
   * Original Author:  David Gilbert (for Object Refinery Limited);
***************
*** 65,68 ****
--- 65,69 ----
   * 05-Oct-2006 : Updated API docs (DG);
   * 06-Oct-2006 : Refactored to cache first and last millisecond values (DG);
+  * 09-Jan-2007 : Fixed bug in next() (DG);
   *
   */
***************
*** 319,323 ****
              int actualMaxWeek 
                  = calendar.getActualMaximum(Calendar.WEEK_OF_YEAR);
!             if (this.week != actualMaxWeek) {
                  result = new Week(this.week + 1, this.year);
              }
--- 320,324 ----
              int actualMaxWeek 
                  = calendar.getActualMaximum(Calendar.WEEK_OF_YEAR);
!             if (this.week < actualMaxWeek) {
                  result = new Week(this.week + 1, this.year);
              }