|
From: <be...@us...> - 2006-08-21 16:20:52
|
Revision: 32 Author: benoitx Date: 2006-08-21 09:20:36 -0700 (Mon, 21 Aug 2006) ViewCVS: http://svn.sourceforge.net/objectlabkit/?rev=32&view=rev Log Message: ----------- Added Tests for Modified Following and Preceeding... you can use them for JDK... BUT I'm not sure it is 100%. For instance at the moment, the date moves FIRST by the number of days given and it handles the holiday only for that calculated date. So it would be possible to jump to another month e.g. 31/7/06 + 1 day or 30/7/06 +5 days... i do not think it is wrong, need to be checked Modified Paths: -------------- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ModifiedFollowingHandler.java trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ModifiedPreceedingHandler.java Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ModifiedFollowingHandler.java =================================================================== --- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ModifiedFollowingHandler.java 2006-08-21 14:08:29 UTC (rev 31) +++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ModifiedFollowingHandler.java 2006-08-21 16:20:36 UTC (rev 32) @@ -33,11 +33,11 @@ final int month = date.getMonthOfYear(); int step = 1; while (calendar.isNonWorkingDay(date)) { - date = date.minusDays(step); + date = date.plusDays(step); if (date.getMonthOfYear() != month) { // flick to backward step = -1; - date = date.minusDays(step); + date = date.plusDays(step); } } return date; Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ModifiedPreceedingHandler.java =================================================================== --- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ModifiedPreceedingHandler.java 2006-08-21 14:08:29 UTC (rev 31) +++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ModifiedPreceedingHandler.java 2006-08-21 16:20:36 UTC (rev 32) @@ -33,11 +33,11 @@ final int month = date.getMonthOfYear(); int step = -1; while (calendar.isNonWorkingDay(date)) { - date = date.minusDays(step); + date = date.plusDays(step); if (date.getMonthOfYear() != month) { // flick to backward step = 1; - date = date.minusDays(step); + date = date.plusDays(step); } } return date; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |