From: David G. <mu...@us...> - 2006-09-25 13:19:19
|
Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/axis In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1131/source/org/jfree/chart/axis Modified Files: Tag: STABLE_1-0-0 DateAxis.java Log Message: 2006-09-25 David Gilbert <dav...@ob...> * source/org/jfree/chart/axis/DateAxis.java (previousStandardDate): Handle tick mark position properly, * source/org/jfree/chart/axis/junit/DateAxisTests.java (MyDateAxis): New class, (testPreviousStandardDateYear): New method, (testPreviousStandardDateMonth): New method, (testPreviousStandardDateDay): New method, (testPreviousStandardDateHour): New method, (testPreviousStandardDateMinute): New method. Index: DateAxis.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/axis/DateAxis.java,v retrieving revision 1.17.2.5 retrieving revision 1.17.2.6 diff -C2 -d -r1.17.2.5 -r1.17.2.6 *** DateAxis.java 25 Sep 2006 11:44:15 -0000 1.17.2.5 --- DateAxis.java 25 Sep 2006 13:19:16 -0000 1.17.2.6 *************** *** 108,111 **** --- 108,112 ---- * 10-Feb-2006 : Added some API doc comments in respect of bug 821046 (DG); * 19-Apr-2006 : Fixed bug 1472942 in equals() method (DG); + * 25-Sep-2006 : Fixed bug 1564977 missing tick labels (DG); * */ *************** *** 810,814 **** calendar.clear(Calendar.MILLISECOND); calendar.set(years, months, days, hours, value, seconds); ! return calendar.getTime(); case (DateTickUnit.HOUR) : --- 811,820 ---- calendar.clear(Calendar.MILLISECOND); calendar.set(years, months, days, hours, value, seconds); ! Date d0 = calendar.getTime(); ! if (d0.getTime() >= date.getTime()) { ! calendar.set(Calendar.MINUTE, value - 1); ! d0 = calendar.getTime(); ! } ! return d0; case (DateTickUnit.HOUR) : *************** *** 830,834 **** calendar.clear(Calendar.MILLISECOND); calendar.set(years, months, days, value, minutes, seconds); ! return calendar.getTime(); case (DateTickUnit.DAY) : --- 836,845 ---- calendar.clear(Calendar.MILLISECOND); calendar.set(years, months, days, value, minutes, seconds); ! Date d1 = calendar.getTime(); ! if (d1.getTime() >= date.getTime()) { ! calendar.set(Calendar.HOUR_OF_DAY, value - 1); ! d1 = calendar.getTime(); ! } ! return d1; case (DateTickUnit.DAY) : *************** *** 854,862 **** // long result = calendar.getTimeInMillis(); // won't work with JDK 1.3 ! long result = calendar.getTime().getTime(); ! if (result > date.getTime()) { ! calendar.set(years, months, value - 1, hours, 0, 0); } ! return calendar.getTime(); case (DateTickUnit.MONTH) : --- 865,874 ---- // long result = calendar.getTimeInMillis(); // won't work with JDK 1.3 ! Date d2 = calendar.getTime(); ! if (d2.getTime() >= date.getTime()) { ! calendar.set(Calendar.DATE, value - 1); ! d2 = calendar.getTime(); } ! return d2; case (DateTickUnit.MONTH) : *************** *** 890,894 **** calendar.clear(Calendar.MILLISECOND); calendar.set(value, months, days, 0, 0, 0); ! return calendar.getTime(); default: return null; --- 902,911 ---- calendar.clear(Calendar.MILLISECOND); calendar.set(value, months, days, 0, 0, 0); ! Date d3 = calendar.getTime(); ! if (d3.getTime() >= date.getTime()) { ! calendar.set(Calendar.YEAR, value - 1); ! d3 = calendar.getTime(); ! } ! return d3; default: return null; |