Menu
▾
▴
objectlabkit-svn — Shows the SVN Checkins for Dev
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(49) |
Sep
(134) |
Oct
(33) |
Nov
(18) |
Dec
(51) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(50) |
Feb
(32) |
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(9) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(1) |
Feb
(4) |
Mar
(8) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
(1) |
Feb
|
Mar
(54) |
Apr
(21) |
May
(13) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(9) |
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(13) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <be...@us...> - 2006-08-23 12:15:05
|
Revision: 35 Author: benoitx Date: 2006-08-23 05:14:53 -0700 (Wed, 23 Aug 2006) ViewCVS: http://svn.sourceforge.net/objectlabkit/?rev=35&view=rev Log Message: ----------- moved package from net.objectlab to net.objectlab.kit all dependencies need to be updated. Modified Paths: -------------- trunk/common-build/project.xml trunk/datecalc-jdk/project.xml trunk/datecalc-joda/project.xml Modified: trunk/common-build/project.xml =================================================================== --- trunk/common-build/project.xml 2006-08-23 11:02:06 UTC (rev 34) +++ trunk/common-build/project.xml 2006-08-23 12:14:53 UTC (rev 35) @@ -11,7 +11,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/3.0.0 http://maven.apache.org/maven-v3_0_0.xsd"> <pomVersion>3</pomVersion> - <groupId>net.objectlab</groupId> + <groupId>net.objectlab.kit</groupId> <currentVersion>1.0</currentVersion> <organization> <name>ObjectLab Financial Ltd</name> Modified: trunk/datecalc-jdk/project.xml =================================================================== --- trunk/datecalc-jdk/project.xml 2006-08-23 11:02:06 UTC (rev 34) +++ trunk/datecalc-jdk/project.xml 2006-08-23 12:14:53 UTC (rev 35) @@ -21,7 +21,7 @@ </repository> <dependencies> <dependency> - <groupId>net.objectlab</groupId> + <groupId>net.objectlab.kit</groupId> <artifactId>datecalc-common</artifactId> <version>${pom.currentVersion}</version> <type>jar</type> Modified: trunk/datecalc-joda/project.xml =================================================================== --- trunk/datecalc-joda/project.xml 2006-08-23 11:02:06 UTC (rev 34) +++ trunk/datecalc-joda/project.xml 2006-08-23 12:14:53 UTC (rev 35) @@ -21,7 +21,7 @@ </repository> <dependencies> <dependency> - <groupId>net.objectlab</groupId> + <groupId>net.objectlab.kit</groupId> <artifactId>datecalc-common</artifactId> <version>${pom.currentVersion}</version> <type>jar</type> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: Marcin J. <ma...@us...> - 2006-08-23 11:32:18
|
shouldn't the group id be net.objectlab.kit? On 8/23/06, be...@us... <be...@us...> wrote: > > Revision: 34 > Author: benoitx > Date: 2006-08-23 04:02:06 -0700 (Wed, 23 Aug 2006) > ViewCVS: http://svn.sourceforge.net/objectlabkit/?rev=34&view=rev > > Log Message: > ----------- > fix the group id for Maven 1 > > Modified Paths: > -------------- > trunk/datecalc-jdk/project.xml > Modified: trunk/datecalc-jdk/project.xml > =================================================================== > --- trunk/datecalc-jdk/project.xml 2006-08-21 16:23:12 UTC (rev 33) > +++ trunk/datecalc-jdk/project.xml 2006-08-23 11:02:06 UTC (rev 34) > @@ -21,7 +21,7 @@ > </repository> > <dependencies> > <dependency> > - <groupId>objectlab</groupId> > + <groupId>net.objectlab</groupId> > <artifactId>datecalc-common</artifactId> > <version>${pom.currentVersion}</version> > <type>jar</type> > > > This was sent by the SourceForge.net collaborative development platform, > the world's largest Open Source development site. > > > ------------------------------------------------------------------------- > Using Tomcat but need to do more? Need to support web services, security? > Get stuff done quickly with pre-integrated technology to make your job > easier > Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo > http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 > _______________________________________________ > Objectlabkit-svn mailing list > Obj...@li... > https://lists.sourceforge.net/lists/listinfo/objectlabkit-svn > |
|
From: <be...@us...> - 2006-08-23 11:02:17
|
Revision: 34 Author: benoitx Date: 2006-08-23 04:02:06 -0700 (Wed, 23 Aug 2006) ViewCVS: http://svn.sourceforge.net/objectlabkit/?rev=34&view=rev Log Message: ----------- fix the group id for Maven 1 Modified Paths: -------------- trunk/datecalc-jdk/project.xml Modified: trunk/datecalc-jdk/project.xml =================================================================== --- trunk/datecalc-jdk/project.xml 2006-08-21 16:23:12 UTC (rev 33) +++ trunk/datecalc-jdk/project.xml 2006-08-23 11:02:06 UTC (rev 34) @@ -21,7 +21,7 @@ </repository> <dependencies> <dependency> - <groupId>objectlab</groupId> + <groupId>net.objectlab</groupId> <artifactId>datecalc-common</artifactId> <version>${pom.currentVersion}</version> <type>jar</type> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <be...@us...> - 2006-08-21 16:23:17
|
Revision: 33 Author: benoitx Date: 2006-08-21 09:23:12 -0700 (Mon, 21 Aug 2006) ViewCVS: http://svn.sourceforge.net/objectlabkit/?rev=33&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 Added Paths: ----------- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/ModifiedFollowingDateCalculatorTest.java trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/ModifiedPreceedingDateCalculatorTest.java Added: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/ModifiedFollowingDateCalculatorTest.java =================================================================== --- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/ModifiedFollowingDateCalculatorTest.java (rev 0) +++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/ModifiedFollowingDateCalculatorTest.java 2006-08-21 16:23:12 UTC (rev 33) @@ -0,0 +1,281 @@ +package net.objectlab.kit.datecalc.joda; + +import java.util.HashSet; +import java.util.Set; + +import junit.framework.Assert; +import junit.framework.TestCase; +import net.objectlab.kit.datecalc.common.HolidayHandlerType; +import net.objectlab.kit.datecalc.common.StandardTenor; +import net.objectlab.kit.datecalc.common.Tenor; +import net.objectlab.kit.datecalc.common.TenorCode; + +import org.joda.time.DateTimeConstants; +import org.joda.time.LocalDate; + +public class ModifiedFollowingDateCalculatorTest extends TestCase { + + public void testSimpleForwardWithWeekend() { + final DateCalculator cal = DefaultDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla", + HolidayHandlerType.MODIFIED_FOLLLOWING); + Assert.assertEquals("Name", "bla", cal.getName()); + Assert.assertEquals("Holidays size", 0, cal.getNonWorkingDays().size()); + + final LocalDate startDate = new LocalDate("2006-08-01"); + cal.setStartDate(startDate); + checkDate("Move by 0 days", cal.addDays(0), "2006-08-01"); + checkDate("Move by 1 days", cal.addDays(1), "2006-08-02"); + checkDate("Move by 1 more days", cal.addDays(1), "2006-08-03"); + checkDate("Move by 1 more more days", cal.addDays(1), "2006-08-04"); + checkDate("Move by 1 more more more days (across weekend)", cal.addDays(1), "2006-08-07"); + } + + public void testSimpleForwardStartDateWithWeekend() { + final DateCalculator cal = DefaultDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla", + HolidayHandlerType.MODIFIED_FOLLLOWING); + Assert.assertEquals("Name", "bla", cal.getName()); + Assert.assertEquals("Holidays size", 0, cal.getNonWorkingDays().size()); + + cal.setStartDate(new LocalDate("2006-07-31")); // start date Monday + checkDate("start date Monday", cal, "2006-07-31"); + + cal.setStartDate(new LocalDate("2006-08-01")); // start date Tuesday + checkDate("start date Tuesday", cal, "2006-08-01"); + + cal.setStartDate(new LocalDate("2006-08-02")); // start date Wednesday + checkDate("start date Wednesday", cal, "2006-08-02"); + + cal.setStartDate(new LocalDate("2006-08-03")); // start date Thursday + checkDate("start date Thursday", cal, "2006-08-03"); + + cal.setStartDate(new LocalDate("2006-08-04")); // set on a Friday + checkDate("start date friday", cal, "2006-08-04"); + + cal.setStartDate(new LocalDate("2006-08-05")); // set on a Saturday + checkDate("start date Saturday", cal, "2006-08-07"); + + cal.setStartDate(new LocalDate("2006-08-06")); // set on a Sunday + checkDate("start date Sunday", cal, "2006-08-07"); + } + + public void testSimpleForwardStartDateNoWeekend() { + final DateCalculator cal = DefaultDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla", + HolidayHandlerType.MODIFIED_FOLLLOWING); + JodaWorkingWeek ww = new JodaWorkingWeek(); + ww = ww.withWorkingDayFromDateTimeConstant(true, DateTimeConstants.SATURDAY); + ww = ww.withWorkingDayFromDateTimeConstant(true, DateTimeConstants.SUNDAY); + cal.setWorkingWeek(ww); + Assert.assertEquals("Name", "bla", cal.getName()); + Assert.assertEquals("Holidays size", 0, cal.getNonWorkingDays().size()); + + cal.setStartDate(new LocalDate("2006-07-31")); // start date Monday + checkDate("start date Monday", cal, "2006-07-31"); + + cal.setStartDate(new LocalDate("2006-08-01")); // start date Tuesday + checkDate("start date Tuesday", cal, "2006-08-01"); + + cal.setStartDate(new LocalDate("2006-08-02")); // start date Wednesday + checkDate("start date Wednesday", cal, "2006-08-02"); + + cal.setStartDate(new LocalDate("2006-08-03")); // start date Thursday + checkDate("start date Thursday", cal, "2006-08-03"); + + cal.setStartDate(new LocalDate("2006-08-04")); // set on a Friday + checkDate("start date friday", cal, "2006-08-04"); + + cal.setStartDate(new LocalDate("2006-08-05")); // set on a Saturday + checkDate("start date Saturday", cal, "2006-08-05"); + + cal.setStartDate(new LocalDate("2006-08-06")); // set on a Sunday + checkDate("start date Sunday", cal, "2006-08-06"); + } + + public void testSimpleForwardStartDateWhackyWeek() { + final DateCalculator cal = DefaultDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla", + HolidayHandlerType.MODIFIED_FOLLLOWING); + Assert.assertEquals("Name", "bla", cal.getName()); + Assert.assertEquals("Holidays size", 0, cal.getNonWorkingDays().size()); + + JodaWorkingWeek ww = new JodaWorkingWeek(); + ww = ww.withWorkingDayFromDateTimeConstant(false, DateTimeConstants.MONDAY); + ww = ww.withWorkingDayFromDateTimeConstant(true, DateTimeConstants.TUESDAY); + ww = ww.withWorkingDayFromDateTimeConstant(false, DateTimeConstants.WEDNESDAY); + ww = ww.withWorkingDayFromDateTimeConstant(true, DateTimeConstants.THURSDAY); + ww = ww.withWorkingDayFromDateTimeConstant(false, DateTimeConstants.FRIDAY); + ww = ww.withWorkingDayFromDateTimeConstant(true, DateTimeConstants.SATURDAY); + ww = ww.withWorkingDayFromDateTimeConstant(false, DateTimeConstants.SUNDAY); + cal.setWorkingWeek(ww); + + cal.setStartDate(new LocalDate("2006-07-31")); // start date Monday + checkDate("start date Monday", cal, "2006-07-29"); + + cal.setStartDate(new LocalDate("2006-08-01")); // start date Tuesday + checkDate("start date Tuesday", cal, "2006-08-01"); + + cal.setStartDate(new LocalDate("2006-08-02")); // start date Wednesday + checkDate("start date Wednesday", cal, "2006-08-03"); + + cal.setStartDate(new LocalDate("2006-08-03")); // start date Thursday + checkDate("start date Thursday", cal, "2006-08-03"); + + cal.setStartDate(new LocalDate("2006-08-04")); // set on a Friday + checkDate("start date friday", cal, "2006-08-05"); + + cal.setStartDate(new LocalDate("2006-08-05")); // set on a Saturday + checkDate("start date Saturday", cal, "2006-08-05"); + + cal.setStartDate(new LocalDate("2006-08-06")); // set on a Sunday + checkDate("start date Sunday", cal, "2006-08-08"); + } + + public void testSimpleForwardStartDateIdealWeekend() { + final DateCalculator cal = DefaultDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla", + HolidayHandlerType.MODIFIED_FOLLLOWING); + Assert.assertEquals("Name", "bla", cal.getName()); + Assert.assertEquals("Holidays size", 0, cal.getNonWorkingDays().size()); + + JodaWorkingWeek ww = new JodaWorkingWeek(); + ww = ww.withWorkingDayFromDateTimeConstant(false, DateTimeConstants.MONDAY); + ww = ww.withWorkingDayFromDateTimeConstant(true, DateTimeConstants.TUESDAY); + ww = ww.withWorkingDayFromDateTimeConstant(true, DateTimeConstants.WEDNESDAY); + ww = ww.withWorkingDayFromDateTimeConstant(true, DateTimeConstants.THURSDAY); + ww = ww.withWorkingDayFromDateTimeConstant(true, DateTimeConstants.FRIDAY); + ww = ww.withWorkingDayFromDateTimeConstant(false, DateTimeConstants.SATURDAY); + ww = ww.withWorkingDayFromDateTimeConstant(false, DateTimeConstants.SUNDAY); + cal.setWorkingWeek(ww); + + cal.setStartDate(new LocalDate("2006-07-31")); // start date Monday + checkDate("start date Monday", cal, "2006-07-28"); + + cal.setStartDate(new LocalDate("2006-08-01")); // start date Tuesday + checkDate("start date Tuesday", cal, "2006-08-01"); + + cal.setStartDate(new LocalDate("2006-08-02")); // start date Wednesday + checkDate("start date Wednesday", cal, "2006-08-02"); + + cal.setStartDate(new LocalDate("2006-08-03")); // start date Thursday + checkDate("start date Thursday", cal, "2006-08-03"); + + cal.setStartDate(new LocalDate("2006-08-04")); // set on a Friday + checkDate("start date friday", cal, "2006-08-04"); + + cal.setStartDate(new LocalDate("2006-08-05")); // set on a Saturday + checkDate("start date Saturday", cal, "2006-08-08"); + + cal.setStartDate(new LocalDate("2006-08-06")); // set on a Sunday + checkDate("start date Sunday", cal, "2006-08-08"); + } + + public void testSimpleForwardWithHolidays() { + final DateCalculator cal = DefaultDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla", + HolidayHandlerType.MODIFIED_FOLLLOWING); + final Set<LocalDate> holidays = new HashSet<LocalDate>(); + holidays.add(new LocalDate("2006-08-28")); + holidays.add(new LocalDate("2006-12-25")); + holidays.add(new LocalDate("2006-12-26")); + Assert.assertEquals("Name", "bla", cal.getName()); + cal.setNonWorkingDays(holidays); + Assert.assertEquals("Holidays", holidays, cal.getNonWorkingDays()); + Assert.assertEquals("Holidays size", 3, cal.getNonWorkingDays().size()); + + Assert.assertTrue("contains", holidays.contains(new LocalDate("2006-08-28"))); + Assert.assertTrue("contains", cal.getNonWorkingDays().contains(new LocalDate("2006-08-28"))); + + cal.setStartDate(new LocalDate("2006-08-28")); + checkDate("Move given Bank Holiday", cal, "2006-08-29"); + + cal.setStartDate(new LocalDate("2006-12-24")); + checkDate("Xmas Eve", cal, "2006-12-27"); + + cal.setStartDate(new LocalDate("2006-12-21")); + checkDate("21/12 + 1", cal.addDays(1), "2006-12-22"); + + cal.setStartDate(new LocalDate("2006-12-21")); + checkDate("21/12 + 1", cal.addDays(2), "2006-12-27"); + + cal.setStartDate(new LocalDate("2006-12-22")); + checkDate("22/12 + 1", cal.addDays(1), "2006-12-27"); + + cal.setStartDate(new LocalDate("2006-12-23")); + checkDate("23/12 + 1", cal.addDays(1), "2006-12-28"); + } + + public void testMoveByBusinessDays() { + final DateCalculator cal = DefaultDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla", + HolidayHandlerType.MODIFIED_FOLLLOWING); + final Set<LocalDate> holidays = new HashSet<LocalDate>(); + holidays.add(new LocalDate("2006-08-28")); + holidays.add(new LocalDate("2006-12-25")); + holidays.add(new LocalDate("2006-12-26")); + Assert.assertEquals("Name", "bla", cal.getName()); + cal.setNonWorkingDays(holidays); + Assert.assertEquals("Holidays", holidays, cal.getNonWorkingDays()); + Assert.assertEquals("Holidays size", 3, cal.getNonWorkingDays().size()); + + cal.setStartDate(new LocalDate("2006-08-24")); + checkDate("Move 1 BD", cal.moveByBusinessDays(1), "2006-08-25"); + + cal.setStartDate(new LocalDate("2006-08-24")); + checkDate("Add 1 week", cal.addDays(7), "2006-08-31"); + cal.setStartDate(new LocalDate("2006-08-24")); + checkDate("Move by 1W with 1 bank holiday", cal.moveByBusinessDays(7), "2006-09-05"); + + } + + public void testMoveByTenorDays() { + final DateCalculator cal = DefaultDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla", + HolidayHandlerType.MODIFIED_FOLLLOWING); + + cal.setStartDate(new LocalDate("2006-08-08")); + checkDate("Move 1D", cal.moveByTenor(StandardTenor.T_1D), "2006-08-09"); + + cal.setStartDate(new LocalDate("2006-08-08")); + checkDate("Move 2D", cal.moveByTenor(new Tenor(2, TenorCode.DAY)), "2006-08-10"); + + cal.setStartDate(new LocalDate("2006-08-08")); + checkDate("Move 10D", cal.moveByTenor(new Tenor(10, TenorCode.DAY)), "2006-08-18"); + + cal.setStartDate(new LocalDate("2006-08-08")); + checkDate("Move 11D", cal.moveByTenor(new Tenor(11, TenorCode.DAY)), "2006-08-21"); + + } + + public void testMoveByTenorWeek() { + final DateCalculator cal = DefaultDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla", + HolidayHandlerType.MODIFIED_FOLLLOWING); + + cal.setStartDate(new LocalDate("2006-08-08")); + checkDate("Move 1W", cal.moveByTenor(StandardTenor.T_1W), "2006-08-15"); + + cal.setStartDate(new LocalDate("2006-08-08")); + checkDate("Move 2W", cal.moveByTenor(new Tenor(2, TenorCode.WEEK)), "2006-08-22"); + + cal.setStartDate(new LocalDate("2006-08-08")); + checkDate("Move 4W", cal.moveByTenor(new Tenor(4, TenorCode.WEEK)), "2006-09-05"); + } + + public void testAddAcrossMonth() { + final DateCalculator cal = DefaultDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla", + HolidayHandlerType.MODIFIED_FOLLLOWING); + + cal.setStartDate(new LocalDate("2006-07-28")); + cal.addDays(1); + checkDate("31/7", cal, "2006-07-31"); + + cal.addDays(1); + checkDate("do move to next month", cal, "2006-08-01"); + + // now if it due to roll over: + cal.setStartDate(new LocalDate("2006-07-28")); + Set<LocalDate> hol = new HashSet<LocalDate>(); + hol.add(new LocalDate("2006-07-31")); + cal.setNonWorkingDays(hol); + cal.addDays(1); + + checkDate("do NOT move to next month", cal, "2006-07-28"); + } + + private void checkDate(final String string, final DateCalculator calendar, final String string2) { + Assert.assertEquals(string, new LocalDate(string2), calendar.getCurrentDate()); + } +} Added: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/ModifiedPreceedingDateCalculatorTest.java =================================================================== --- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/ModifiedPreceedingDateCalculatorTest.java (rev 0) +++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/ModifiedPreceedingDateCalculatorTest.java 2006-08-21 16:23:12 UTC (rev 33) @@ -0,0 +1,281 @@ +package net.objectlab.kit.datecalc.joda; + +import java.util.HashSet; +import java.util.Set; + +import junit.framework.Assert; +import junit.framework.TestCase; +import net.objectlab.kit.datecalc.common.HolidayHandlerType; +import net.objectlab.kit.datecalc.common.StandardTenor; +import net.objectlab.kit.datecalc.common.Tenor; +import net.objectlab.kit.datecalc.common.TenorCode; + +import org.joda.time.DateTimeConstants; +import org.joda.time.LocalDate; + +public class ModifiedPreceedingDateCalculatorTest extends TestCase { + + public void testSimpleForwardWithWeekend() { + final DateCalculator cal = DefaultDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla", + HolidayHandlerType.MODIFIED_PRECEEDING); + Assert.assertEquals("Name", "bla", cal.getName()); + Assert.assertEquals("Holidays size", 0, cal.getNonWorkingDays().size()); + + final LocalDate startDate = new LocalDate("2006-08-01"); + cal.setStartDate(startDate); + checkDate("Move by 0 days", cal.addDays(0), "2006-08-01"); + checkDate("Move by 1 days", cal.addDays(1), "2006-08-02"); + checkDate("Move by 1 more days", cal.addDays(1), "2006-08-03"); + checkDate("Move by 1 more more days", cal.addDays(1), "2006-08-04"); + checkDate("Move by 1 more more more days (across weekend)", cal.addDays(1), "2006-08-04"); + } + + public void testSimpleForwardStartDateWithWeekend() { + final DateCalculator cal = DefaultDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla", + HolidayHandlerType.MODIFIED_PRECEEDING); + Assert.assertEquals("Name", "bla", cal.getName()); + Assert.assertEquals("Holidays size", 0, cal.getNonWorkingDays().size()); + + cal.setStartDate(new LocalDate("2006-07-31")); // start date Monday + checkDate("start date Monday", cal, "2006-07-31"); + + cal.setStartDate(new LocalDate("2006-08-01")); // start date Tuesday + checkDate("start date Tuesday", cal, "2006-08-01"); + + cal.setStartDate(new LocalDate("2006-08-02")); // start date Wednesday + checkDate("start date Wednesday", cal, "2006-08-02"); + + cal.setStartDate(new LocalDate("2006-08-03")); // start date Thursday + checkDate("start date Thursday", cal, "2006-08-03"); + + cal.setStartDate(new LocalDate("2006-08-04")); // set on a Friday + checkDate("start date friday", cal, "2006-08-04"); + + cal.setStartDate(new LocalDate("2006-08-05")); // set on a Saturday + checkDate("start date Saturday", cal, "2006-08-04"); + + cal.setStartDate(new LocalDate("2006-08-06")); // set on a Sunday + checkDate("start date Sunday", cal, "2006-08-04"); + } + + public void testSimpleForwardStartDateNoWeekend() { + final DateCalculator cal = DefaultDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla", + HolidayHandlerType.MODIFIED_FOLLLOWING); + JodaWorkingWeek ww = new JodaWorkingWeek(); + ww = ww.withWorkingDayFromDateTimeConstant(true, DateTimeConstants.SATURDAY); + ww = ww.withWorkingDayFromDateTimeConstant(true, DateTimeConstants.SUNDAY); + cal.setWorkingWeek(ww); + Assert.assertEquals("Name", "bla", cal.getName()); + Assert.assertEquals("Holidays size", 0, cal.getNonWorkingDays().size()); + + cal.setStartDate(new LocalDate("2006-07-31")); // start date Monday + checkDate("start date Monday", cal, "2006-07-31"); + + cal.setStartDate(new LocalDate("2006-08-01")); // start date Tuesday + checkDate("start date Tuesday", cal, "2006-08-01"); + + cal.setStartDate(new LocalDate("2006-08-02")); // start date Wednesday + checkDate("start date Wednesday", cal, "2006-08-02"); + + cal.setStartDate(new LocalDate("2006-08-03")); // start date Thursday + checkDate("start date Thursday", cal, "2006-08-03"); + + cal.setStartDate(new LocalDate("2006-08-04")); // set on a Friday + checkDate("start date friday", cal, "2006-08-04"); + + cal.setStartDate(new LocalDate("2006-08-05")); // set on a Saturday + checkDate("start date Saturday", cal, "2006-08-05"); + + cal.setStartDate(new LocalDate("2006-08-06")); // set on a Sunday + checkDate("start date Sunday", cal, "2006-08-06"); + } + + public void testSimpleForwardStartDateWhackyWeek() { + final DateCalculator cal = DefaultDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla", + HolidayHandlerType.MODIFIED_FOLLLOWING); + Assert.assertEquals("Name", "bla", cal.getName()); + Assert.assertEquals("Holidays size", 0, cal.getNonWorkingDays().size()); + + JodaWorkingWeek ww = new JodaWorkingWeek(); + ww = ww.withWorkingDayFromDateTimeConstant(false, DateTimeConstants.MONDAY); + ww = ww.withWorkingDayFromDateTimeConstant(true, DateTimeConstants.TUESDAY); + ww = ww.withWorkingDayFromDateTimeConstant(false, DateTimeConstants.WEDNESDAY); + ww = ww.withWorkingDayFromDateTimeConstant(true, DateTimeConstants.THURSDAY); + ww = ww.withWorkingDayFromDateTimeConstant(false, DateTimeConstants.FRIDAY); + ww = ww.withWorkingDayFromDateTimeConstant(true, DateTimeConstants.SATURDAY); + ww = ww.withWorkingDayFromDateTimeConstant(false, DateTimeConstants.SUNDAY); + cal.setWorkingWeek(ww); + + cal.setStartDate(new LocalDate("2006-07-31")); // start date Monday + checkDate("start date Monday", cal, "2006-07-29"); + + cal.setStartDate(new LocalDate("2006-08-01")); // start date Tuesday + checkDate("start date Tuesday", cal, "2006-08-01"); + + cal.setStartDate(new LocalDate("2006-08-02")); // start date Wednesday + checkDate("start date Wednesday", cal, "2006-08-03"); + + cal.setStartDate(new LocalDate("2006-08-03")); // start date Thursday + checkDate("start date Thursday", cal, "2006-08-03"); + + cal.setStartDate(new LocalDate("2006-08-04")); // set on a Friday + checkDate("start date friday", cal, "2006-08-05"); + + cal.setStartDate(new LocalDate("2006-08-05")); // set on a Saturday + checkDate("start date Saturday", cal, "2006-08-05"); + + cal.setStartDate(new LocalDate("2006-08-06")); // set on a Sunday + checkDate("start date Sunday", cal, "2006-08-08"); + } + + public void testSimpleForwardStartDateIdealWeekend() { + final DateCalculator cal = DefaultDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla", + HolidayHandlerType.MODIFIED_FOLLLOWING); + Assert.assertEquals("Name", "bla", cal.getName()); + Assert.assertEquals("Holidays size", 0, cal.getNonWorkingDays().size()); + + JodaWorkingWeek ww = new JodaWorkingWeek(); + ww = ww.withWorkingDayFromDateTimeConstant(false, DateTimeConstants.MONDAY); + ww = ww.withWorkingDayFromDateTimeConstant(true, DateTimeConstants.TUESDAY); + ww = ww.withWorkingDayFromDateTimeConstant(true, DateTimeConstants.WEDNESDAY); + ww = ww.withWorkingDayFromDateTimeConstant(true, DateTimeConstants.THURSDAY); + ww = ww.withWorkingDayFromDateTimeConstant(true, DateTimeConstants.FRIDAY); + ww = ww.withWorkingDayFromDateTimeConstant(false, DateTimeConstants.SATURDAY); + ww = ww.withWorkingDayFromDateTimeConstant(false, DateTimeConstants.SUNDAY); + cal.setWorkingWeek(ww); + + cal.setStartDate(new LocalDate("2006-07-31")); // start date Monday + checkDate("start date Monday", cal, "2006-07-28"); + + cal.setStartDate(new LocalDate("2006-08-01")); // start date Tuesday + checkDate("start date Tuesday", cal, "2006-08-01"); + + cal.setStartDate(new LocalDate("2006-08-02")); // start date Wednesday + checkDate("start date Wednesday", cal, "2006-08-02"); + + cal.setStartDate(new LocalDate("2006-08-03")); // start date Thursday + checkDate("start date Thursday", cal, "2006-08-03"); + + cal.setStartDate(new LocalDate("2006-08-04")); // set on a Friday + checkDate("start date friday", cal, "2006-08-04"); + + cal.setStartDate(new LocalDate("2006-08-05")); // set on a Saturday + checkDate("start date Saturday", cal, "2006-08-08"); + + cal.setStartDate(new LocalDate("2006-08-06")); // set on a Sunday + checkDate("start date Sunday", cal, "2006-08-08"); + } + + public void testSimpleForwardWithHolidays() { + final DateCalculator cal = DefaultDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla", + HolidayHandlerType.MODIFIED_FOLLLOWING); + final Set<LocalDate> holidays = new HashSet<LocalDate>(); + holidays.add(new LocalDate("2006-08-28")); + holidays.add(new LocalDate("2006-12-25")); + holidays.add(new LocalDate("2006-12-26")); + Assert.assertEquals("Name", "bla", cal.getName()); + cal.setNonWorkingDays(holidays); + Assert.assertEquals("Holidays", holidays, cal.getNonWorkingDays()); + Assert.assertEquals("Holidays size", 3, cal.getNonWorkingDays().size()); + + Assert.assertTrue("contains", holidays.contains(new LocalDate("2006-08-28"))); + Assert.assertTrue("contains", cal.getNonWorkingDays().contains(new LocalDate("2006-08-28"))); + + cal.setStartDate(new LocalDate("2006-08-28")); + checkDate("Move given Bank Holiday", cal, "2006-08-29"); + + cal.setStartDate(new LocalDate("2006-12-24")); + checkDate("Xmas Eve", cal, "2006-12-27"); + + cal.setStartDate(new LocalDate("2006-12-21")); + checkDate("21/12 + 1", cal.addDays(1), "2006-12-22"); + + cal.setStartDate(new LocalDate("2006-12-21")); + checkDate("21/12 + 1", cal.addDays(2), "2006-12-27"); + + cal.setStartDate(new LocalDate("2006-12-22")); + checkDate("22/12 + 1", cal.addDays(1), "2006-12-27"); + + cal.setStartDate(new LocalDate("2006-12-23")); + checkDate("23/12 + 1", cal.addDays(1), "2006-12-28"); + } + + public void testMoveByBusinessDays() { + final DateCalculator cal = DefaultDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla", + HolidayHandlerType.MODIFIED_FOLLLOWING); + final Set<LocalDate> holidays = new HashSet<LocalDate>(); + holidays.add(new LocalDate("2006-08-28")); + holidays.add(new LocalDate("2006-12-25")); + holidays.add(new LocalDate("2006-12-26")); + Assert.assertEquals("Name", "bla", cal.getName()); + cal.setNonWorkingDays(holidays); + Assert.assertEquals("Holidays", holidays, cal.getNonWorkingDays()); + Assert.assertEquals("Holidays size", 3, cal.getNonWorkingDays().size()); + + cal.setStartDate(new LocalDate("2006-08-24")); + checkDate("Move 1 BD", cal.moveByBusinessDays(1), "2006-08-25"); + + cal.setStartDate(new LocalDate("2006-08-24")); + checkDate("Add 1 week", cal.addDays(7), "2006-08-31"); + cal.setStartDate(new LocalDate("2006-08-24")); + checkDate("Move by 1W with 1 bank holiday", cal.moveByBusinessDays(7), "2006-09-05"); + + } + + public void testMoveByTenorDays() { + final DateCalculator cal = DefaultDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla", + HolidayHandlerType.MODIFIED_FOLLLOWING); + + cal.setStartDate(new LocalDate("2006-08-08")); + checkDate("Move 1D", cal.moveByTenor(StandardTenor.T_1D), "2006-08-09"); + + cal.setStartDate(new LocalDate("2006-08-08")); + checkDate("Move 2D", cal.moveByTenor(new Tenor(2, TenorCode.DAY)), "2006-08-10"); + + cal.setStartDate(new LocalDate("2006-08-08")); + checkDate("Move 10D", cal.moveByTenor(new Tenor(10, TenorCode.DAY)), "2006-08-18"); + + cal.setStartDate(new LocalDate("2006-08-08")); + checkDate("Move 11D", cal.moveByTenor(new Tenor(11, TenorCode.DAY)), "2006-08-21"); + + } + + public void testMoveByTenorWeek() { + final DateCalculator cal = DefaultDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla", + HolidayHandlerType.MODIFIED_FOLLLOWING); + + cal.setStartDate(new LocalDate("2006-08-08")); + checkDate("Move 1W", cal.moveByTenor(StandardTenor.T_1W), "2006-08-15"); + + cal.setStartDate(new LocalDate("2006-08-08")); + checkDate("Move 2W", cal.moveByTenor(new Tenor(2, TenorCode.WEEK)), "2006-08-22"); + + cal.setStartDate(new LocalDate("2006-08-08")); + checkDate("Move 4W", cal.moveByTenor(new Tenor(4, TenorCode.WEEK)), "2006-09-05"); + } + + public void testAddAcrossMonth() { + final DateCalculator cal = DefaultDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla", + HolidayHandlerType.MODIFIED_FOLLLOWING); + + cal.setStartDate(new LocalDate("2006-08-02")); + cal.addDays(-1); + checkDate("1/8", cal, "2006-08-01"); + + cal.addDays(-1); + checkDate("do move to next month", cal, "2006-07-31"); + + // now if it due to roll over: + cal.setStartDate(new LocalDate("2006-08-02")); + Set<LocalDate> hol = new HashSet<LocalDate>(); + hol.add(new LocalDate("2006-08-01")); + cal.setNonWorkingDays(hol); + cal.addDays(-1); + + checkDate("do NOT move to next month", cal, "2006-08-02"); + } + + private void checkDate(final String string, final DateCalculator calendar, final String string2) { + Assert.assertEquals(string, new LocalDate(string2), calendar.getCurrentDate()); + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
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. |
|
From: <be...@us...> - 2006-08-21 14:08:41
|
Revision: 31 Author: benoitx Date: 2006-08-21 07:08:29 -0700 (Mon, 21 Aug 2006) ViewCVS: http://svn.sourceforge.net/objectlabkit/?rev=31&view=rev Log Message: ----------- added some SVN ignore. Property Changed: ---------------- trunk/datecalc-joda/ Property changes on: trunk/datecalc-joda ___________________________________________________________________ Name: svn:ignore - target + target .fbwarnings This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <be...@us...> - 2006-08-21 13:45:50
|
Revision: 30 Author: benoitx Date: 2006-08-21 06:45:46 -0700 (Mon, 21 Aug 2006) ViewCVS: http://svn.sourceforge.net/objectlabkit/?rev=30&view=rev Log Message: ----------- Remove unnecessary import Modified Paths: -------------- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/BaseDateCalculator.java Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/BaseDateCalculator.java =================================================================== --- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/BaseDateCalculator.java 2006-08-20 20:52:45 UTC (rev 29) +++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/BaseDateCalculator.java 2006-08-21 13:45:46 UTC (rev 30) @@ -22,7 +22,6 @@ import java.util.Set; import net.objectlab.kit.datecalc.common.Tenor; -import net.objectlab.kit.datecalc.common.TenorCode; import net.objectlab.kit.datecalc.common.WorkingWeek; import org.joda.time.DateTimeConstants; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <be...@us...> - 2006-08-20 20:52:56
|
Revision: 29 Author: benoitx Date: 2006-08-20 13:52:45 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/objectlabkit/?rev=29&view=rev Log Message: ----------- run the tests but ignore failures and errors Modified Paths: -------------- trunk/datecalc-jdk/project.properties Modified: trunk/datecalc-jdk/project.properties =================================================================== --- trunk/datecalc-jdk/project.properties 2006-08-20 17:30:59 UTC (rev 28) +++ trunk/datecalc-jdk/project.properties 2006-08-20 20:52:45 UTC (rev 29) @@ -1,2 +1,3 @@ maven.test.failure.ignore=true -maven.test.skip=true +maven.test.error.ignore=true +maven.test.skip=false This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ma...@us...> - 2006-08-20 17:31:10
|
Revision: 28 Author: marchy Date: 2006-08-20 10:30:59 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/objectlabkit/?rev=28&view=rev Log Message: ----------- have got some of the tests passing Modified Paths: -------------- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/BaseDateCalculator.java trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DefaultDateCalculatorFactory.java Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/BaseDateCalculator.java =================================================================== --- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/BaseDateCalculator.java 2006-08-20 17:29:52 UTC (rev 27) +++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/BaseDateCalculator.java 2006-08-20 17:30:59 UTC (rev 28) @@ -243,23 +243,25 @@ Calendar cal = Utils.getCal(startDate); - if (isIMMMonth(cal.getTime())) { - Date date = calculateIMMDay(startDate); - if (date.after(startDate)) { - return date; + if (isIMMMonth(cal)) { + moveToIMMDay(cal); + //TODO simplify this if condition + if ((forward && cal.getTime().after(startDate)) || + (!forward && cal.getTime().before(startDate))) { + return cal.getTime(); } } int delta = (forward ? 1 : -1); do { cal.add(Calendar.MONTH, delta); - } while (!isIMMMonth(cal.getTime())); + } while (!isIMMMonth(cal)); - return calculateIMMDay(cal.getTime()); + moveToIMMDay(cal); + return cal.getTime(); } - private boolean isIMMMonth(final Date date) { - Calendar cal = Utils.getCal(date); + private boolean isIMMMonth(final Calendar cal) { int month = cal.get(Calendar.MONTH); return (month == Calendar.MARCH || month == Calendar.JUNE || month == Calendar.SEPTEMBER || month == Calendar.DECEMBER); @@ -271,8 +273,7 @@ * @param first * @return */ - private Date calculateIMMDay(final Date date) { - Calendar cal = Calendar.getInstance(); + private void moveToIMMDay(final Calendar cal) { cal.set(Calendar.DAY_OF_MONTH, 1); // go to 1st wed @@ -287,8 +288,6 @@ // go to 3rd wednesday - i.e. move 2 weeks forward cal.add(Calendar.DAY_OF_MONTH, 7 * 2); - - return cal.getTime(); } /** Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DefaultDateCalculatorFactory.java =================================================================== --- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DefaultDateCalculatorFactory.java 2006-08-20 17:29:52 UTC (rev 27) +++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DefaultDateCalculatorFactory.java 2006-08-20 17:30:59 UTC (rev 28) @@ -20,6 +20,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import net.objectlab.kit.datecalc.common.HolidayHandlerType; + public class DefaultDateCalculatorFactory implements DateCalculatorFactory { private static final DateCalculatorFactory DEFAULT = new DefaultDateCalculatorFactory(); @@ -46,10 +48,15 @@ if (holidays.containsKey(name)) { cal.setNonWorkingDays(holidays.get(name)); } - throw new UnsupportedOperationException("Not yet implemented"); - // if (HolidayHandlerType.FORWARD.equals(holidayHandlerType)) { - // cal.setHolidayHandler(new ForwardHandler()); + if (HolidayHandlerType.FORWARD.equals(holidayHandlerType)) { + cal.setHolidayHandler(new ForwardHandler()); + } else { + throw new UnsupportedOperationException("only forward supported"); + } + + return cal; + // } else if (HolidayHandlerType.BACKWARD.equals(holidayHandlerType)) { // cal.setHolidayHandler(new BackwardHandler()); // } else if This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ma...@us...> - 2006-08-20 17:30:06
|
Revision: 27 Author: marchy Date: 2006-08-20 10:29:52 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/objectlabkit/?rev=27&view=rev Log Message: ----------- corrected the date format Modified Paths: -------------- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/AbstractDateCalculatorTest.java Modified: trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/AbstractDateCalculatorTest.java =================================================================== --- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/AbstractDateCalculatorTest.java 2006-08-20 17:25:50 UTC (rev 26) +++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/AbstractDateCalculatorTest.java 2006-08-20 17:29:52 UTC (rev 27) @@ -15,7 +15,7 @@ super(); } - private static final SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-DD"); + private static final SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd"); protected Date createDate(final String str) { try { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ma...@us...> - 2006-08-20 17:26:05
|
Revision: 26 Author: marchy Date: 2006-08-20 10:25:50 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/objectlabkit/?rev=26&view=rev Log Message: ----------- changed if statement to a switch Modified Paths: -------------- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/BaseDateCalculator.java Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/BaseDateCalculator.java =================================================================== --- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/BaseDateCalculator.java 2006-08-20 17:22:17 UTC (rev 25) +++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/BaseDateCalculator.java 2006-08-20 17:25:50 UTC (rev 26) @@ -356,14 +356,17 @@ if (tenor == null) { throw new IllegalArgumentException("Tenor cannot be null"); } - if (tenor.getCode() == TenorCode.IMM) { + + switch (tenor.getCode()) { + case IMM: setCurrentBusinessDate(getNextIMMDate()); return this; - } else if (tenor.getCode() == TenorCode.DAY) { + case DAY: return addDays(tenor.getUnits()); - } else if (tenor.getCode() == TenorCode.WEEK) { + case WEEK: return addDays(tenor.getUnits() * DAYS_IN_WEEK); + default: + throw new UnsupportedOperationException("Sorry not yet..."); } - throw new UnsupportedOperationException("Sorry not yet..."); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ma...@us...> - 2006-08-20 17:22:28
|
Revision: 25 Author: marchy Date: 2006-08-20 10:22:17 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/objectlabkit/?rev=25&view=rev Log Message: ----------- not incrementing date to start off with Modified Paths: -------------- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/ForwardHandler.java Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/ForwardHandler.java =================================================================== --- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/ForwardHandler.java 2006-08-20 17:20:04 UTC (rev 24) +++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/ForwardHandler.java 2006-08-20 17:22:17 UTC (rev 25) @@ -31,9 +31,9 @@ Calendar cal = Utils.getCal(calendar.getCurrentDate()); - do { + while (calendar.isNonWorkingDay(cal.getTime())) { cal.add(Calendar.DAY_OF_MONTH, 1); - } while (calendar.isCurrentDateNonWorking()); + } return cal.getTime(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ma...@us...> - 2006-08-20 17:20:15
|
Revision: 24 Author: marchy Date: 2006-08-20 10:20:04 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/objectlabkit/?rev=24&view=rev Log Message: ----------- removed my TODO comment query Modified Paths: -------------- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ForwardHandler.java Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ForwardHandler.java =================================================================== --- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ForwardHandler.java 2006-08-20 17:16:26 UTC (rev 23) +++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ForwardHandler.java 2006-08-20 17:20:04 UTC (rev 24) @@ -29,8 +29,6 @@ public LocalDate moveCurrentDate(final BaseDateCalculator calendar) { LocalDate date = calendar.getCurrentDate(); - //TODO should this not increment the date 1st before the check? - //i.e. should it be a do/while? take a look at JDK please while (calendar.isNonWorkingDay(date)) { date = date.plusDays(1); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <be...@us...> - 2006-08-20 17:16:46
|
Revision: 23 Author: benoitx Date: 2006-08-20 10:16:26 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/objectlabkit/?rev=23&view=rev Log Message: ----------- little checking to test the list. Modified Paths: -------------- trunk/src/site/index.xml Added Paths: ----------- trunk/src/site/navigation.xml Modified: trunk/src/site/index.xml =================================================================== --- trunk/src/site/index.xml 2006-08-20 17:00:59 UTC (rev 22) +++ trunk/src/site/index.xml 2006-08-20 17:16:26 UTC (rev 23) @@ -70,8 +70,8 @@ DateCalculator cal = DefaultDateCalculatorFactory.getDefaultInstance().getDateCalculator("UK", HolidayHandlerType.FORWARD); cal.setStartDate(new LocalDate("2006-08-28)); - // the startDate stays 28 Aug 06 BUT the currentDate has moved, according - // to Forward handler to 29 Aug 2006. + // the startDate stays 28 Aug 06 BUT the currentDate has moved, + // according to Forward handler to 29 Aug 2006. cal.getStartDate(); // 28 Aug 06 cal.getCurrentDate(); // 29 Aug 06 </pre> Added: trunk/src/site/navigation.xml =================================================================== --- trunk/src/site/navigation.xml (rev 0) +++ trunk/src/site/navigation.xml 2006-08-20 17:16:26 UTC (rev 23) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="QALab"> + <title>ObjectLab Kit</title> + <body> + <links> + <item name="Kit Project Page on SourceForge.net" + href="http://sourceforge.net/projects/objectlabkit" /> + </links> + + <menu name="Kit"> + <item name="DateCalc Common" href="multiproject/datecalc-common/index.html"/> + <item name="DateCalc JDK" href="multiproject/datecalc-jdk/index.html"/> + <item name="DateCalc JODA" href="multiproject/datecalc-joda/index.html"/> + </menu> +<!-- + <menu name="Related Projects"> + <item name="CheckStyle" href="http://checkstyle.sourceforge.net/" /> + <item name="PMD" href="http://pmd.sourceforge.net/" /> + <item name="FindBugs" href="http://findbugs.sourceforge.net/" /> + <item name="Cobertura" href="http://cobertura.sourceforge.net/" /> + <item name="Simian" href="http://www.redhillconsulting.com.au/products/simian/" /> + <item name="Hosted by SourceForge" href="http://sourceforge.net/projects/qalab" + img="http://sourceforge.net/sflogo.php?group_id=140880&type=1"/> + </menu> + --> + </body> +</project> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
