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: Google A. <goo...@go...> - 2007-01-17 05:12:40
|
Re: [M1] QALab 0.9.1 and Maven plugin released doTag(IncludeTag.java:101) >>>>> [...more...] >>>>> >>>>> ========== >>>>> Dependencies: (declared in this order) >>>>> >>>>> <!-- As required by QALab: ... <http://www.mail-archive.com/us...@ma.../msg55619.html> This once a day Google Alert is brought to you by Google... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Remove this Google Alert: http://www.google.com/alerts/remove?s=EAAAAAz0YKI0rBHPBhe0kdarm0g&hl=en Create another Google Alert: http://www.google.com/alerts?hl=en Sign in to manage your alerts: http://www.google.com/alerts/manage?hl=en |
|
From: Google A. <goo...@go...> - 2007-01-17 04:30:45
|
links for 2007-01-16 By weili StatSVN - Repository Statistics - Introduction. (tags: subversion svn tools). Discover Magazine Subscription : MagsForLess.com Magazine Subscriptions For Less. (tags: magazine) <http://technote.thedeveloperside.com/?p=216> Technical Related Notes <http://technote.thedeveloperside.com> The Daily Grind 1057 By Mike Gunderloy (Mi...@la...)(Mike Gunderloy (Mi...@la...)) StatSVN 0.3.0 - New release of this free tool for generating charts and tables of activity in your Subversion repository. (via DotNetKicks); TeamCity 1.2 - New release of the continuous integration and build management tool from ... <http://www.larkware.com/dg7/TheDailyGrind1057.aspx> The Daily Grind <http://www.larkware.com/> StatSVN 0.3.0 released: Statistics for your Subversion Repo StatSVN retrieves information from a Subversion repository and generates various ... StatSVN is open source software, released under the terms of the LGPL, ... <http://www.theserverside.com/discussions/thread.tss?thread_id=43830> StatSVN 0.3.0 released: Statistics for ... The StatSVN Team and ObjectLab are proud to announce v0.3.0 of StatSVN ... StatSVN retrieves information from a Subversion repository and generates various ... <http://www.javalobby.org/java/forums/t88399.html> This once a day Google Alert is brought to you by Google... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Remove this Google Alert: http://www.google.com/alerts/remove?s=EAAAAIq3Ab5rO6vaPuJbzfH1NiU&hl=en Create another Google Alert: http://www.google.com/alerts?hl=en Sign in to manage your alerts: http://www.google.com/alerts/manage?hl=en |
|
From: Google A. <goo...@go...> - 2007-01-16 23:11:48
|
StatSVN 0.3.0 Released ObjectLab is not new to the open-source community having used numerous OS projects, participated in a few and sponsoring: - ObjectLab Kit (http://objectlabkit.sourceforge.net), a date calculation toolkit for business and finance; ... <http://www.dotnetkicks.com/opensource/StatSVN_0_3_0_Released> DotNetKicks.com <http://www.dotnetkicks.com/> This once a day Google Alert is brought to you by Google... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Remove this Google Alert: http://www.google.com/alerts/remove?s=EAAAAIfnd2Id1jfwipBB4CiM3Aw&hl=en Create another Google Alert: http://www.google.com/alerts?hl=en Sign in to manage your alerts: http://www.google.com/alerts/manage?hl=en |
|
From: Google A. <goo...@go...> - 2007-01-16 05:56:19
|
josep.curto's bookmarks tagged with "Java" on del.icio.us QALab - Statistics for your Build - QALab - Introduction · save this. to opensource Java qalab ... saved by 114 other people ... on dec 06 ... <http://del.icio.us/josep.curto/Java> This once a day Google Alert is brought to you by Google... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Remove this Google Alert: http://www.google.com/alerts/remove?s=EAAAAAz0YKI0rBHPBhe0kdarm0g&hl=en Create another Google Alert: http://www.google.com/alerts?hl=en Sign in to manage your alerts: http://www.google.com/alerts/manage?hl=en |
|
From: Google A. <goo...@go...> - 2007-01-16 05:15:08
|
StatSVN 0.3.0 released: Statistics for your Subversion Repo The StatSVN Team and ObjectLab are proud to announce v0.3.0 of StatSVN If you want to know what happened in your Subversion repository,this is the tool for you! <http://www.javacrawl.com/clickToItem.action?itemID=2779257&source=rss> Articles from Javacrawl.com's... <http://www.javacrawl.com/> StatSVN 0.3.0 By Erik C. Thauvin(Erik C. Thauvin) StatSVN 0.3.0. <http://erik.thauvin.net/linkblog/click/www.javalobby.org/java/forums/t88399.html> Erik's Linkblog: Popular Links <http://erik.thauvin.net/linkblog/popluar.jsp> StatSVN 0.3.0 (Default branch) StatSVN retrieves information from a Subversion repository and generates various tables and charts describing the project ... The current version of StatSVN generates a static set of HTML documents containing tables and chart images. ... <http://rss.freshmeat.net/~r/freshmeat/feeds/fm-releases-unix/~3/75314585/> freshmeat.net announcements (Unix) <http://freshmeat.net> This once a day Google Alert is brought to you by Google... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Remove this Google Alert: http://www.google.com/alerts/remove?s=EAAAAIq3Ab5rO6vaPuJbzfH1NiU&hl=en Create another Google Alert: http://www.google.com/alerts?hl=en Sign in to manage your alerts: http://www.google.com/alerts/manage?hl=en |
|
From: Google A. <goo...@go...> - 2007-01-15 14:24:47
|
UserManual - StatSVN This is the manual for StatSVN, a statistics tool for Subversion repositories. ... The binaries need to be on your command-line path when executing StatSVN. ... <http://svn.statsvn.org/statsvnwiki/index.php/UserManual> freshmeat.net: Project details for StatSVN StatSVN retrieves information from a Subversion repository and generates various ... The current version of StatSVN generates a static set of HTML documents ... <http://freshmeat.net/projects/statsvn/> This once a day Google Alert is brought to you by Google... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Remove this Google Alert: http://www.google.com/alerts/remove?s=EAAAAIq3Ab5rO6vaPuJbzfH1NiU&hl=en Create another Google Alert: http://www.google.com/alerts?hl=en Sign in to manage your alerts: http://www.google.com/alerts/manage?hl=en |
|
From: Google A. <goo...@go...> - 2007-01-15 04:30:09
|
mahound's bookmarks tagged with "java" on del.icio.us QALab - Statistics for your Build - QALab - Introduction · save this. to qalab development java opensource metrics ... saved by 37 other people . ... <http://del.icio.us/mahound/java> This once a day Google Alert is brought to you by Google... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Remove this Google Alert: http://www.google.com/alerts/remove?s=EAAAAAz0YKI0rBHPBhe0kdarm0g&hl=en Create another Google Alert: http://www.google.com/alerts?hl=en Sign in to manage your alerts: http://www.google.com/alerts/manage?hl=en |
|
From: Google A. <goo...@go...> - 2007-01-10 05:11:02
|
<project> <modelVersion>4.0.0</modelVersion> <groupId>net ... description> <url>http://qalab.sourceforge.net</url> <issueManagement> ... <testSourceDirectory>src/test/java</testSourceDirectory> <resources> <resource> ... <http://www.ibiblio.org/maven/net.objectlab/poms/qalab-0.7.1.pom> This once a day Google Alert is brought to you by Google... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Remove this Google Alert: http://www.google.com/alerts/remove?s=EAAAAAz0YKI0rBHPBhe0kdarm0g&hl=en Create another Google Alert: http://www.google.com/alerts?hl=en Sign in to manage your alerts: http://www.google.com/alerts/manage?hl=en |
|
From: <ma...@us...> - 2007-01-09 15:51:33
|
Revision: 242
http://svn.sourceforge.net/objectlabkit/?rev=242&view=rev
Author: marchy
Date: 2007-01-09 07:50:09 -0800 (Tue, 09 Jan 2007)
Log Message:
-----------
changed if-else's to use switch statements with enums, and added static imports for some constants, i think it makes the code look cleaner, whadayathink mr b?
we'll see what qalab has to say about all this ;-)
Modified Paths:
--------------
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/PeriodCountBasis.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarIMMDateCalculator.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateKitCalculatorsFactory.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateIMMDateCalculator.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateKitCalculatorsFactory.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculator.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayKitCalculatorsFactory.java
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java 2007-01-08 15:50:25 UTC (rev 241)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java 2007-01-09 15:50:09 UTC (rev 242)
@@ -32,6 +32,11 @@
*/
package net.objectlab.kit.datecalc.common;
+import static net.objectlab.kit.datecalc.common.HolidayHandlerType.BACKWARD;
+import static net.objectlab.kit.datecalc.common.HolidayHandlerType.FORWARD;
+import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_FOLLOWING;
+import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_PRECEEDING;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@ -302,17 +307,13 @@
}
public DateCalculator<E> moveByBusinessDays(final int businessDays) {
- if (businessDays > 0
- && holidayHandler != null
- && (holidayHandler.getType().equals(HolidayHandlerType.BACKWARD) || holidayHandler.getType().equals(
- HolidayHandlerType.MODIFIED_PRECEEDING))) {
- throw new IllegalArgumentException("A " + HolidayHandlerType.MODIFIED_PRECEEDING + " or "
- + HolidayHandlerType.BACKWARD + " does not allow positive steps for moveByBusinessDays");
- } else if (businessDays < 0
- && holidayHandler != null
- && (holidayHandler.getType().equals(HolidayHandlerType.FORWARD) || holidayHandler.getType().equals(
- HolidayHandlerType.MODIFIED_FOLLOWING))) {
- throw new IllegalArgumentException("A " + HolidayHandlerType.MODIFIED_FOLLOWING + " or " + HolidayHandlerType.FORWARD
+ if (businessDays > 0 && holidayHandler != null
+ && (holidayHandler.getType().equals(BACKWARD) || holidayHandler.getType().equals(MODIFIED_PRECEEDING))) {
+ throw new IllegalArgumentException("A " + MODIFIED_PRECEEDING + " or " + BACKWARD
+ + " does not allow positive steps for moveByBusinessDays");
+ } else if (businessDays < 0 && holidayHandler != null
+ && (holidayHandler.getType().equals(FORWARD) || holidayHandler.getType().equals(MODIFIED_FOLLOWING))) {
+ throw new IllegalArgumentException("A " + MODIFIED_FOLLOWING + " or " + FORWARD
+ " does not allow negative steps for moveByBusinessDays");
}
@@ -405,7 +406,7 @@
public HolidayCalendar<E> getHolidayCalendar() {
return holidayCalendar;
}
-
+
protected abstract E clone(final E date);
}
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/PeriodCountBasis.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/PeriodCountBasis.java 2007-01-08 15:50:25 UTC (rev 241)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/PeriodCountBasis.java 2007-01-09 15:50:09 UTC (rev 242)
@@ -33,10 +33,13 @@
package net.objectlab.kit.datecalc.common;
/**
- * Defines some standard Day Count basis.
+ * Defines some standard Day Count bases.
*
- * You can refer to the following document to read about the most common Day Count conventions:
- * {@link http://www.fincad.com/support/developerfunc/mathref/Daycount.htm}
+ * <p/>
+ *
+ * To read about the most common Day Count Conventions, you can refer to the
+ * <a href="http://www.fincad.com/support/developerfunc/mathref/Daycount.htm">
+ * following document</a>.
*
* @author Benoit Xhenseval
* @author $LastChangedBy$
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarIMMDateCalculator.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarIMMDateCalculator.java 2007-01-08 15:50:25 UTC (rev 241)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarIMMDateCalculator.java 2007-01-09 15:50:09 UTC (rev 242)
@@ -32,6 +32,15 @@
*/
package net.objectlab.kit.datecalc.jdk;
+import static java.util.Calendar.DAY_OF_MONTH;
+import static java.util.Calendar.DECEMBER;
+import static java.util.Calendar.JUNE;
+import static java.util.Calendar.MARCH;
+import static java.util.Calendar.MONTH;
+import static java.util.Calendar.SEPTEMBER;
+import static java.util.Calendar.WEDNESDAY;
+import static net.objectlab.kit.datecalc.common.IMMPeriod.QUARTERLY;
+
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
@@ -97,25 +106,38 @@
final int delta = (requestNextIMM ? 1 : -1);
do {
- cal.add(Calendar.MONTH, delta);
+ cal.add(MONTH, delta);
} while (!isIMMMonth(cal));
moveToIMMDay(cal);
- final int month = cal.get(Calendar.MONTH);
- if ((period == IMMPeriod.BI_ANNUALY_JUN_DEC && (Calendar.MARCH == month || Calendar.SEPTEMBER == month))
- || (period == IMMPeriod.BI_ANNUALY_MAR_SEP && (Calendar.JUNE == month || Calendar.DECEMBER == month))) {
- // need to move to the next one.
- cal = getNextIMMDate(requestNextIMM, cal, period);
- } else if (period == IMMPeriod.ANNUALLY) {
+ final int month = cal.get(MONTH);
+
+ switch (period) {
+ case BI_ANNUALY_JUN_DEC:
+ if (month == MARCH || month == SEPTEMBER) {
+ // need to move to the next one.
+ cal = getNextIMMDate(requestNextIMM, cal, period);
+ }
+ break;
+
+ case BI_ANNUALY_MAR_SEP:
+ if (month == JUNE || month == DECEMBER) {
+ // need to move to the next one.
+ cal = getNextIMMDate(requestNextIMM, cal, period);
+ }
+ break;
+
+ case ANNUALLY:
// second jump
- cal = getNextIMMDate(requestNextIMM, cal, IMMPeriod.QUARTERLY);
+ cal = getNextIMMDate(requestNextIMM, cal, QUARTERLY);
// third jump
- cal = getNextIMMDate(requestNextIMM, cal, IMMPeriod.QUARTERLY);
+ cal = getNextIMMDate(requestNextIMM, cal, QUARTERLY);
// fourth jump
- cal = getNextIMMDate(requestNextIMM, cal, IMMPeriod.QUARTERLY);
+ cal = getNextIMMDate(requestNextIMM, cal, QUARTERLY);
// fifth jump
- cal = getNextIMMDate(requestNextIMM, cal, IMMPeriod.QUARTERLY);
+ cal = getNextIMMDate(requestNextIMM, cal, QUARTERLY);
+ break;
}
return cal;
@@ -130,13 +152,13 @@
// -----------------------------------------------------------------------
private boolean isIMMMonth(final Calendar cal) {
- final int month = cal.get(Calendar.MONTH);
+ final int month = cal.get(MONTH);
switch (month) {
- case Calendar.MARCH:
- case Calendar.JUNE:
- case Calendar.SEPTEMBER:
- case Calendar.DECEMBER:
+ case MARCH:
+ case JUNE:
+ case SEPTEMBER:
+ case DECEMBER:
return true;
default:
return false;
@@ -149,18 +171,18 @@
* @param cal
*/
private void moveToIMMDay(final Calendar cal) {
- cal.set(Calendar.DAY_OF_MONTH, 1);
+ cal.set(DAY_OF_MONTH, 1);
// go to 1st wed
final int dayOfWeek = cal.get(Calendar.DAY_OF_WEEK);
- if (dayOfWeek < Calendar.WEDNESDAY) {
- cal.add(Calendar.DAY_OF_MONTH, Calendar.WEDNESDAY - dayOfWeek);
- } else if (dayOfWeek > Calendar.WEDNESDAY) {
- cal.add(Calendar.DAY_OF_MONTH, (Calendar.WEDNESDAY + NUMBER_DAYS_IN_WEEK) - dayOfWeek);
+ if (dayOfWeek < WEDNESDAY) {
+ cal.add(DAY_OF_MONTH, WEDNESDAY - dayOfWeek);
+ } else if (dayOfWeek > WEDNESDAY) {
+ cal.add(DAY_OF_MONTH, (WEDNESDAY + NUMBER_DAYS_IN_WEEK) - dayOfWeek);
}
// go to 3rd wednesday - i.e. move 2 weeks forward
- cal.add(Calendar.DAY_OF_MONTH, NUMBER_DAYS_IN_WEEK * 2);
+ cal.add(DAY_OF_MONTH, NUMBER_DAYS_IN_WEEK * 2);
}
public boolean isIMMDate(final Calendar date) {
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java 2007-01-08 15:50:25 UTC (rev 241)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java 2007-01-09 15:50:09 UTC (rev 242)
@@ -32,6 +32,12 @@
*/
package net.objectlab.kit.datecalc.jdk;
+import static net.objectlab.kit.datecalc.common.HolidayHandlerType.BACKWARD;
+import static net.objectlab.kit.datecalc.common.HolidayHandlerType.FORWARD;
+import static net.objectlab.kit.datecalc.common.HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK;
+import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_FOLLOWING;
+import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_PRECEEDING;
+
import java.util.Calendar;
import net.objectlab.kit.datecalc.common.AbstractKitCalculatorsFactory;
@@ -81,15 +87,15 @@
if (holidayHandlerType == null) {
return cal;
- } else if (HolidayHandlerType.FORWARD.equals(holidayHandlerType)) {
+ } else if (FORWARD.equals(holidayHandlerType)) {
cal.setHolidayHandler(new CalendarForwardHandler());
- } else if (HolidayHandlerType.BACKWARD.equals(holidayHandlerType)) {
+ } else if (BACKWARD.equals(holidayHandlerType)) {
cal.setHolidayHandler(new CalendarBackwardHandler());
- } else if (HolidayHandlerType.MODIFIED_FOLLOWING.equals(holidayHandlerType)) {
+ } else if (MODIFIED_FOLLOWING.equals(holidayHandlerType)) {
cal.setHolidayHandler(new CalendarModifiedFollowingHandler());
- } else if (HolidayHandlerType.MODIFIED_PRECEEDING.equals(holidayHandlerType)) {
+ } else if (MODIFIED_PRECEEDING.equals(holidayHandlerType)) {
cal.setHolidayHandler(new CalendarModifiedPreceedingHandler());
- } else if (HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK.equals(holidayHandlerType)) {
+ } else if (FORWARD_UNLESS_MOVING_BACK.equals(holidayHandlerType)) {
cal.setHolidayHandler(new CalendarForwardUnlessNegativeHandler());
} else {
throw new IllegalArgumentException("Unsupported HolidayHandler: " + holidayHandlerType);
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java 2007-01-08 15:50:25 UTC (rev 241)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java 2007-01-09 15:50:09 UTC (rev 242)
@@ -53,10 +53,13 @@
public int dayDiff(final Calendar start, final Calendar end, final PeriodCountBasis basis) {
int diff = 0;
-
- if (basis == PeriodCountBasis.CONV_30_360) {
- int dayStart = start.get(Calendar.DAY_OF_MONTH);
- int dayEnd = end.get(Calendar.DAY_OF_MONTH);
+ int dayStart;
+ int dayEnd;
+
+ switch (basis) {
+ case CONV_30_360:
+ dayStart = start.get(Calendar.DAY_OF_MONTH);
+ dayEnd = end.get(Calendar.DAY_OF_MONTH);
if (dayEnd == MONTH_31_DAYS && dayStart >= MONTH_30_DAYS) {
dayEnd = MONTH_30_DAYS;
}
@@ -65,10 +68,11 @@
}
diff = (end.get(Calendar.YEAR) - start.get(Calendar.YEAR)) * YEAR_360
+ (end.get(Calendar.MONTH) - start.get(Calendar.MONTH)) * MONTH_30_DAYS + dayEnd - dayStart;
+ break;
- } else if (basis == PeriodCountBasis.CONV_360E_ISDA) {
- int dayStart = start.get(Calendar.DAY_OF_MONTH);
- int dayEnd = end.get(Calendar.DAY_OF_MONTH);
+ case CONV_360E_ISDA:
+ dayStart = start.get(Calendar.DAY_OF_MONTH);
+ dayEnd = end.get(Calendar.DAY_OF_MONTH);
final int monthStart = start.get(Calendar.MONTH);
if ((monthStart == 2 && start.getActualMaximum(Calendar.DAY_OF_MONTH) == dayStart) || dayEnd == MONTH_31_DAYS) {
dayEnd = MONTH_30_DAYS;
@@ -79,10 +83,11 @@
diff = (end.get(Calendar.YEAR) - start.get(Calendar.YEAR)) * YEAR_360
+ (end.get(Calendar.MONTH) - start.get(Calendar.MONTH)) * MONTH_30_DAYS + dayEnd - dayStart;
+ break;
- } else if (basis == PeriodCountBasis.CONV_360E_ISMA) {
- int dayStart = start.get(Calendar.DAY_OF_MONTH);
- int dayEnd = end.get(Calendar.DAY_OF_MONTH);
+ case CONV_360E_ISMA:
+ dayStart = start.get(Calendar.DAY_OF_MONTH);
+ dayEnd = end.get(Calendar.DAY_OF_MONTH);
if (dayEnd == MONTH_31_DAYS) {
dayEnd = MONTH_30_DAYS;
}
@@ -91,9 +96,12 @@
}
diff = (end.get(Calendar.YEAR) - start.get(Calendar.YEAR)) * YEAR_360
+ (end.get(Calendar.MONTH) - start.get(Calendar.MONTH)) * MONTH_30_DAYS + dayEnd - dayStart;
- } else {
+ break;
+
+ default:
diff = dayDiff(start, end);
}
+
return diff;
}
@@ -117,7 +125,9 @@
public double yearDiff(final Calendar start, final Calendar end, final PeriodCountBasis basis) {
double diff = 0.0;
- if (basis == PeriodCountBasis.ACT_ACT) {
+
+ switch (basis) {
+ case ACT_ACT:
final int startYear = start.get(Calendar.YEAR);
final int endYear = end.get(Calendar.YEAR);
if (startYear != endYear) {
@@ -132,16 +142,24 @@
diff = (diff1 + 1.0) / start.getActualMaximum(Calendar.DAY_OF_YEAR) + (endYear - startYear - 1.0) + (diff2)
/ (double) end.getActualMaximum(Calendar.DAY_OF_YEAR);
}
+ break;
- } else if (basis == PeriodCountBasis.CONV_30_360 || basis == PeriodCountBasis.CONV_360E_ISDA
- || basis == PeriodCountBasis.CONV_360E_ISMA || basis == PeriodCountBasis.ACT_360) {
+ case CONV_30_360:
+ case CONV_360E_ISDA:
+ case CONV_360E_ISMA:
+ case ACT_360:
diff = (dayDiff(start, end, basis)) / YEAR_360_0;
+ break;
- } else if (basis == PeriodCountBasis.ACT_365 || basis == PeriodCountBasis.END_365) {
+ case ACT_365:
+ case END_365:
diff = (dayDiff(start, end, basis)) / YEAR_365_0;
- } else {
+ break;
+
+ default:
throw new UnsupportedOperationException("Sorry no ACT_UST yet");
}
+
return diff;
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateKitCalculatorsFactory.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateKitCalculatorsFactory.java 2007-01-08 15:50:25 UTC (rev 241)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateKitCalculatorsFactory.java 2007-01-09 15:50:09 UTC (rev 242)
@@ -32,11 +32,16 @@
*/
package net.objectlab.kit.datecalc.jdk;
+import static net.objectlab.kit.datecalc.common.HolidayHandlerType.BACKWARD;
+import static net.objectlab.kit.datecalc.common.HolidayHandlerType.FORWARD;
+import static net.objectlab.kit.datecalc.common.HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK;
+import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_FOLLOWING;
+import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_PRECEEDING;
+
import java.util.Date;
import net.objectlab.kit.datecalc.common.AbstractKitCalculatorsFactory;
import net.objectlab.kit.datecalc.common.DateCalculator;
-import net.objectlab.kit.datecalc.common.HolidayHandlerType;
import net.objectlab.kit.datecalc.common.IMMDateCalculator;
import net.objectlab.kit.datecalc.common.PeriodCountCalculator;
@@ -81,15 +86,15 @@
if (holidayHandlerType == null) {
return cal;
- } else if (HolidayHandlerType.FORWARD.equals(holidayHandlerType)) {
+ } else if (FORWARD.equals(holidayHandlerType)) {
cal.setHolidayHandler(new DateForwardHandler());
- } else if (HolidayHandlerType.BACKWARD.equals(holidayHandlerType)) {
+ } else if (BACKWARD.equals(holidayHandlerType)) {
cal.setHolidayHandler(new DateBackwardHandler());
- } else if (HolidayHandlerType.MODIFIED_FOLLOWING.equals(holidayHandlerType)) {
+ } else if (MODIFIED_FOLLOWING.equals(holidayHandlerType)) {
cal.setHolidayHandler(new DateModifiedFollowingHandler());
- } else if (HolidayHandlerType.MODIFIED_PRECEEDING.equals(holidayHandlerType)) {
+ } else if (MODIFIED_PRECEEDING.equals(holidayHandlerType)) {
cal.setHolidayHandler(new DateModifiedPreceedingHandler());
- } else if (HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK.equals(holidayHandlerType)) {
+ } else if (FORWARD_UNLESS_MOVING_BACK.equals(holidayHandlerType)) {
cal.setHolidayHandler(new DateForwardUnlessNegativeHandler());
} else {
throw new IllegalArgumentException("Unsupported HolidayHandler: " + holidayHandlerType);
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateIMMDateCalculator.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateIMMDateCalculator.java 2007-01-08 15:50:25 UTC (rev 241)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateIMMDateCalculator.java 2007-01-09 15:50:09 UTC (rev 242)
@@ -32,6 +32,12 @@
*/
package net.objectlab.kit.datecalc.joda;
+import static net.objectlab.kit.datecalc.common.IMMPeriod.QUARTERLY;
+import static org.joda.time.DateTimeConstants.DECEMBER;
+import static org.joda.time.DateTimeConstants.JUNE;
+import static org.joda.time.DateTimeConstants.MARCH;
+import static org.joda.time.DateTimeConstants.SEPTEMBER;
+
import java.util.ArrayList;
import java.util.List;
@@ -95,19 +101,32 @@
LocalDate imm = calculate3rdWednesday(date);
final int immMonth = imm.getMonthOfYear();
- final boolean isMarchSept = DateTimeConstants.MARCH == immMonth || DateTimeConstants.SEPTEMBER == immMonth;
+ final boolean isMarchSept = immMonth == MARCH || immMonth == SEPTEMBER;
- if (period == IMMPeriod.BI_ANNUALY_JUN_DEC && isMarchSept || period == IMMPeriod.BI_ANNUALY_MAR_SEP && !isMarchSept) {
- imm = getNextIMMDate(requestNextIMM, imm, period);
- } else if (period == IMMPeriod.ANNUALLY) {
+ switch (period) {
+
+ case BI_ANNUALY_JUN_DEC:
+ if (isMarchSept) {
+ imm = getNextIMMDate(requestNextIMM, imm, period);
+ }
+ break;
+
+ case BI_ANNUALY_MAR_SEP:
+ if (!isMarchSept) {
+ imm = getNextIMMDate(requestNextIMM, imm, period);
+ }
+ break;
+
+ case ANNUALLY:
// second jump
- imm = getNextIMMDate(requestNextIMM, imm, IMMPeriod.QUARTERLY);
+ imm = getNextIMMDate(requestNextIMM, imm, QUARTERLY);
// third jump
- imm = getNextIMMDate(requestNextIMM, imm, IMMPeriod.QUARTERLY);
+ imm = getNextIMMDate(requestNextIMM, imm, QUARTERLY);
// fourth jump
- imm = getNextIMMDate(requestNextIMM, imm, IMMPeriod.QUARTERLY);
+ imm = getNextIMMDate(requestNextIMM, imm, QUARTERLY);
// fifth jump
- imm = getNextIMMDate(requestNextIMM, imm, IMMPeriod.QUARTERLY);
+ imm = getNextIMMDate(requestNextIMM, imm, QUARTERLY);
+ break;
}
return imm;
@@ -125,10 +144,10 @@
int monthOffset = 0;
switch (month) {
- case DateTimeConstants.MARCH:
- case DateTimeConstants.JUNE:
- case DateTimeConstants.SEPTEMBER:
- case DateTimeConstants.DECEMBER:
+ case MARCH:
+ case JUNE:
+ case SEPTEMBER:
+ case DECEMBER:
final LocalDate immDate = calculate3rdWednesday(date);
if (requestNextIMM && !date.isBefore(immDate)) {
date = date.plusMonths(MONTHS_IN_QUARTER);
@@ -176,7 +195,7 @@
public boolean isIMMDate(final LocalDate date) {
boolean same = false;
- final List<LocalDate> dates = getIMMDates(date.minusDays(1), date, IMMPeriod.QUARTERLY);
+ final List<LocalDate> dates = getIMMDates(date.minusDays(1), date, QUARTERLY);
if (!dates.isEmpty()) {
same = date.equals(dates.get(0));
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateKitCalculatorsFactory.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateKitCalculatorsFactory.java 2007-01-08 15:50:25 UTC (rev 241)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateKitCalculatorsFactory.java 2007-01-09 15:50:09 UTC (rev 242)
@@ -32,6 +32,10 @@
*/
package net.objectlab.kit.datecalc.joda;
+import static net.objectlab.kit.datecalc.common.HolidayHandlerType.BACKWARD;
+import static net.objectlab.kit.datecalc.common.HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK;
+import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_FOLLOWING;
+import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_PRECEEDING;
import net.objectlab.kit.datecalc.common.AbstractKitCalculatorsFactory;
import net.objectlab.kit.datecalc.common.HolidayHandlerType;
import net.objectlab.kit.datecalc.common.IMMDateCalculator;
@@ -86,13 +90,13 @@
if (HolidayHandlerType.FORWARD.equals(holidayHandlerType)) {
cal.setHolidayHandler(new LocalDateForwardHandler());
- } else if (HolidayHandlerType.BACKWARD.equals(holidayHandlerType)) {
+ } else if (BACKWARD.equals(holidayHandlerType)) {
cal.setHolidayHandler(new LocalDateBackwardHandler());
- } else if (HolidayHandlerType.MODIFIED_FOLLOWING.equals(holidayHandlerType)) {
+ } else if (MODIFIED_FOLLOWING.equals(holidayHandlerType)) {
cal.setHolidayHandler(new LocalDateModifiedFollowingHandler());
- } else if (HolidayHandlerType.MODIFIED_PRECEEDING.equals(holidayHandlerType)) {
+ } else if (MODIFIED_PRECEEDING.equals(holidayHandlerType)) {
cal.setHolidayHandler(new LocalDateModifiedPreceedingHandler());
- } else if (HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK.equals(holidayHandlerType)) {
+ } else if (FORWARD_UNLESS_MOVING_BACK.equals(holidayHandlerType)) {
cal.setHolidayHandler(new LocalDateForwardUnlessNegativeHandler());
} else if (holidayHandlerType != null) {
throw new IllegalArgumentException("Unsupported HolidayHandler: " + holidayHandlerType);
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculator.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculator.java 2007-01-08 15:50:25 UTC (rev 241)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculator.java 2007-01-09 15:50:09 UTC (rev 242)
@@ -52,10 +52,13 @@
public int dayDiff(final LocalDate start, final LocalDate end, final PeriodCountBasis basis) {
int diff = 0;
+ int dayStart;
+ int dayEnd;
- if (basis == PeriodCountBasis.CONV_30_360) {
- int dayStart = start.getDayOfMonth();
- int dayEnd = end.getDayOfMonth();
+ switch (basis) {
+ case CONV_30_360:
+ dayStart = start.getDayOfMonth();
+ dayEnd = end.getDayOfMonth();
if (dayEnd == MONTH_31_DAYS && dayStart >= MONTH_30_DAYS) {
dayEnd = MONTH_30_DAYS;
}
@@ -64,10 +67,11 @@
}
diff = (end.getYear() - start.getYear()) * YEAR_360 + (end.getMonthOfYear() - start.getMonthOfYear()) * MONTH_30_DAYS
+ dayEnd - dayStart;
+ break;
- } else if (basis == PeriodCountBasis.CONV_360E_ISDA) {
- int dayStart = start.getDayOfMonth();
- int dayEnd = end.getDayOfMonth();
+ case CONV_360E_ISDA:
+ dayStart = start.getDayOfMonth();
+ dayEnd = end.getDayOfMonth();
final int monthStart = start.getMonthOfYear();
if ((monthStart == 2 && start.monthOfYear().getMaximumValue() == dayStart) || dayEnd == MONTH_31_DAYS) {
dayEnd = MONTH_30_DAYS;
@@ -78,10 +82,11 @@
diff = (end.getYear() - start.getYear()) * YEAR_360 + (end.getMonthOfYear() - start.getMonthOfYear()) * MONTH_30_DAYS
+ dayEnd - dayStart;
+ break;
- } else if (basis == PeriodCountBasis.CONV_360E_ISMA) {
- int dayStart = start.getDayOfMonth();
- int dayEnd = end.getDayOfMonth();
+ case CONV_360E_ISMA:
+ dayStart = start.getDayOfMonth();
+ dayEnd = end.getDayOfMonth();
if (dayEnd == MONTH_31_DAYS) {
dayEnd = MONTH_30_DAYS;
}
@@ -90,11 +95,12 @@
}
diff = (end.getYear() - start.getYear()) * YEAR_360 + (end.getMonthOfYear() - start.getMonthOfYear()) * MONTH_30_DAYS
+ dayEnd - dayStart;
- } else {
-
+ break;
+ default:
final Period p = new Period(start, end, PeriodType.days());
diff = p.getDays();
}
+
return diff;
}
@@ -106,14 +112,15 @@
//
// -----------------------------------------------------------------------
- public double monthDiff(final LocalDate start, final LocalDate end, final PeriodCountBasis basis) {
+ public double monthDiff(final LocalDate start, final LocalDate end, final PeriodCountBasis basis) {
return yearDiff(start, end, basis) * MONTHS_IN_YEAR;
}
public double yearDiff(final LocalDate start, final LocalDate end, final PeriodCountBasis basis) {
double diff = 0.0;
- if (basis == PeriodCountBasis.ACT_ACT) {
+ switch (basis) {
+ case ACT_ACT:
final int startYear = start.getYear();
final int endYear = end.getYear();
if (startYear != endYear) {
@@ -125,16 +132,24 @@
diff = ((diff1 + 1.0)) / start.dayOfYear().getMaximumValue() + ((endYear - startYear - 1.0)) + ((double) (diff2))
/ (double) end.dayOfYear().getMaximumValue();
}
+ break;
- } else if (basis == PeriodCountBasis.CONV_30_360 || basis == PeriodCountBasis.CONV_360E_ISDA
- || basis == PeriodCountBasis.CONV_360E_ISMA || basis == PeriodCountBasis.ACT_360) {
+ case CONV_30_360:
+ case CONV_360E_ISDA:
+ case CONV_360E_ISMA:
+ case ACT_360:
diff = (dayDiff(start, end, basis)) / YEAR_360_0;
+ break;
+
+ case ACT_365:
+ case END_365:
+ diff = (dayDiff(start, end, basis)) / YEAR_365_0;
+ break;
- } else if (basis == PeriodCountBasis.ACT_365 || basis == PeriodCountBasis.END_365) {
- diff = (dayDiff(start, end, basis)) / YEAR_365_0;
- } else {
- throw new UnsupportedOperationException("Sorry no ACT_UST yet");
+ default:
+ throw new UnsupportedOperationException("Sorry ACT_UST is not supported");
}
+
return diff;
}
}
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayKitCalculatorsFactory.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayKitCalculatorsFactory.java 2007-01-08 15:50:25 UTC (rev 241)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayKitCalculatorsFactory.java 2007-01-09 15:50:09 UTC (rev 242)
@@ -32,9 +32,13 @@
*/
package net.objectlab.kit.datecalc.joda;
+import static net.objectlab.kit.datecalc.common.HolidayHandlerType.BACKWARD;
+import static net.objectlab.kit.datecalc.common.HolidayHandlerType.FORWARD;
+import static net.objectlab.kit.datecalc.common.HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK;
+import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_FOLLOWING;
+import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_PRECEEDING;
import net.objectlab.kit.datecalc.common.AbstractKitCalculatorsFactory;
import net.objectlab.kit.datecalc.common.DateCalculator;
-import net.objectlab.kit.datecalc.common.HolidayHandlerType;
import net.objectlab.kit.datecalc.common.IMMDateCalculator;
import net.objectlab.kit.datecalc.common.KitCalculatorsFactory;
import net.objectlab.kit.datecalc.common.PeriodCountCalculator;
@@ -90,15 +94,15 @@
cal.setName(name);
setHolidays(name, cal);
- if (HolidayHandlerType.FORWARD.equals(holidayHandlerType)) {
+ if (FORWARD.equals(holidayHandlerType)) {
cal.setHolidayHandler(new YearMonthDayForwardHandler());
- } else if (HolidayHandlerType.BACKWARD.equals(holidayHandlerType)) {
+ } else if (BACKWARD.equals(holidayHandlerType)) {
cal.setHolidayHandler(new YearMonthDayBackwardHandler());
- } else if (HolidayHandlerType.MODIFIED_FOLLOWING.equals(holidayHandlerType)) {
+ } else if (MODIFIED_FOLLOWING.equals(holidayHandlerType)) {
cal.setHolidayHandler(new YearMonthDayModifiedFollowingHandler());
- } else if (HolidayHandlerType.MODIFIED_PRECEEDING.equals(holidayHandlerType)) {
+ } else if (MODIFIED_PRECEEDING.equals(holidayHandlerType)) {
cal.setHolidayHandler(new YearMonthDayModifiedPreceedingHandler());
- } else if (HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK.equals(holidayHandlerType)) {
+ } else if (FORWARD_UNLESS_MOVING_BACK.equals(holidayHandlerType)) {
cal.setHolidayHandler(new YearMonthDayForwardUnlessNegativeHandler());
} else if (holidayHandlerType != null) {
throw new IllegalArgumentException("Unsupported HolidayHandler: " + holidayHandlerType);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Google A. <goo...@go...> - 2007-01-09 06:24:08
|
Index of /maven/net.objectlab/java-sources Index of /maven/net.objectlab/java-sources. Icon Name Last modified Size Description. [DIR] Parent Directory - [ ] maven-qalab-plugin-0.9.1-sources.jar ... <http://www.ibiblio.org/maven/net.objectlab/java-sources/> This once a day Google Alert is brought to you by Google... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Remove this Google Alert: http://www.google.com/alerts/remove?s=EAAAAAz0YKI0rBHPBhe0kdarm0g&hl=en Create another Google Alert: http://www.google.com/alerts?hl=en Sign in to manage your alerts: http://www.google.com/alerts/manage?hl=en |
|
From: <ma...@us...> - 2007-01-08 15:50:27
|
Revision: 241
http://svn.sourceforge.net/objectlabkit/?rev=241&view=rev
Author: marchy
Date: 2007-01-08 07:50:25 -0800 (Mon, 08 Jan 2007)
Log Message:
-----------
updated changes.xml with my updates
Modified Paths:
--------------
trunk/src/site/changes.xml
Modified: trunk/src/site/changes.xml
===================================================================
--- trunk/src/site/changes.xml 2007-01-08 15:44:23 UTC (rev 240)
+++ trunk/src/site/changes.xml 2007-01-08 15:50:25 UTC (rev 241)
@@ -9,6 +9,7 @@
</properties>
<body>
<release version="1.1.0" date="in SVN" description="Maintenance">
+ <action dev="marchy" type="fix">Deprecated ACT/UST and END/365 Day Count Conventions, which weren't very common. Also added a link to some documentation.</action>
<action dev="benoitx" type="add">Added method calculateTenorDates with/without a spot lag to enable calculation of a series of Tenor dates without changing the current business date in the calculator.</action>
<action dev="benoitx" type="add">Added method moveByTenor without a spot lag to allow tenor calculation based on the CURRENT date and not the spot lag.</action>
<action dev="benoitx" type="add" issue="1575498" due-to="Paul Hill">Valid Range via HolidayCalendar. HolidayCalendar should replace the simple Set<E> of dates
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-01-08 15:44:33
|
Revision: 240
http://svn.sourceforge.net/objectlabkit/?rev=240&view=rev
Author: marchy
Date: 2007-01-08 07:44:23 -0800 (Mon, 08 Jan 2007)
Log Message:
-----------
deprecated ACT/UST and END/365 - as they're not very 'common' conventions.
also added a link to document describing day count conventions
Modified Paths:
--------------
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/PeriodCountBasis.java
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/PeriodCountBasis.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/PeriodCountBasis.java 2007-01-05 21:16:25 UTC (rev 239)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/PeriodCountBasis.java 2007-01-08 15:44:23 UTC (rev 240)
@@ -35,6 +35,9 @@
/**
* Defines some standard Day Count basis.
*
+ * You can refer to the following document to read about the most common Day Count conventions:
+ * {@link http://www.fincad.com/support/developerfunc/mathref/Daycount.htm}
+ *
* @author Benoit Xhenseval
* @author $LastChangedBy$
* @version $Revision$ $Date$
@@ -90,7 +93,19 @@
* the day count fraction is equal to the number of days between the last
* payment date and the next date divided by 365.
*/
- ACT_365, ACT_UST, END_365
+ ACT_365,
+
+ /**
+ * @deprecated this is not a common convention, and won't be included in future releases
+ */
+ @Deprecated
+ ACT_UST,
+
+ /**
+ * @deprecated this is not a common convention, and won't be included in future releases
+ */
+ @Deprecated
+ END_365
}
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Google A. <goo...@go...> - 2007-01-08 04:57:19
|
<project> <modelVersion>4.0.0</modelVersion> <groupId>net ... description> <url>http://qalab.sourceforge.net</url> <issueManagement> ... <testSourceDirectory>src/test/java</testSourceDirectory> <resources> <resource> ... <http://www.ibiblio.org/maven/net.objectlab/poms/qalab-0.7.pom> This once a day Google Alert is brought to you by Google... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Remove this Google Alert: http://www.google.com/alerts/remove?s=EAAAAAz0YKI0rBHPBhe0kdarm0g&hl=en Create another Google Alert: http://www.google.com/alerts?hl=en Sign in to manage your alerts: http://www.google.com/alerts/manage?hl=en |
|
From: Google A. <goo...@go...> - 2007-01-07 04:58:06
|
Make Your Java Data More Useful with Treemap Visualization But what happens when you've got more data points than a pie chart can render? Enter the treemap! Use JTreemap to create your own Java Treemap application ... <http://www.devx.com/xml/Article/17361/0/page/3> This once a day Google Alert is brought to you by Google... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Remove this Google Alert: http://www.google.com/alerts/remove?s=EAAAADRvBmo81mJEkqrN8FH9fyQ&hl=en Create another Google Alert: http://www.google.com/alerts?hl=en Sign in to manage your alerts: http://www.google.com/alerts/manage?hl=en |
|
From: Google A. <goo...@go...> - 2007-01-07 04:58:06
|
Nabble - [jira] Created: (MPDIST-30) Dist plugin should take into ... [javadoc] C:\project\objectlabkit\datecalc-joda\src\main\java\net\objectlab\kit\ datecalc\joda\HolidayHandlerYearMonthDayWrapper.java:23: package ... <http://www.nabble.com/-jira--Created:-(MPDIST-30)-Dist-plugin-should-take-into-account-the-javadoc-properties-t2298726s177.html> This once a day Google Alert is brought to you by Google... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Remove this Google Alert: http://www.google.com/alerts/remove?s=EAAAAIfnd2Id1jfwipBB4CiM3Aw&hl=en Create another Google Alert: http://www.google.com/alerts?hl=en Sign in to manage your alerts: http://www.google.com/alerts/manage?hl=en |
|
From: Google A. <goo...@go...> - 2007-01-06 01:15:17
|
bradbeck's bookmarks tagged with "qalab" on del.icio.us QALab - Statistics for your Build - QALab - Introduction · save this. to java qa qalab pmd cpd findbugs cobertura simian metrics ... saved by 113 other ... <http://del.icio.us/bradbeck/qalab> This once a day Google Alert is brought to you by Google... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Remove this Google Alert: http://www.google.com/alerts/remove?s=EAAAAAz0YKI0rBHPBhe0kdarm0g&hl=en Create another Google Alert: http://www.google.com/alerts?hl=en Sign in to manage your alerts: http://www.google.com/alerts/manage?hl=en |
|
From: <be...@us...> - 2007-01-05 21:16:29
|
Revision: 239
http://svn.sourceforge.net/objectlabkit/?rev=239&view=rev
Author: benoitx
Date: 2007-01-05 13:16:25 -0800 (Fri, 05 Jan 2007)
Log Message:
-----------
more tests.
Modified Paths:
--------------
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardUnlessNegativeCalculatorTest.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedFollowingDateCalculatorTest.java
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardUnlessNegativeCalculatorTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardUnlessNegativeCalculatorTest.java 2007-01-05 20:45:33 UTC (rev 238)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardUnlessNegativeCalculatorTest.java 2007-01-05 21:16:25 UTC (rev 239)
@@ -32,7 +32,10 @@
*/
package net.objectlab.kit.datecalc.common;
+import java.util.ArrayList;
import java.util.Calendar;
+import java.util.Iterator;
+import java.util.List;
import junit.framework.Assert;
@@ -373,6 +376,87 @@
checkMoveByTenor("2006-08-31", StandardTenor.OVERNIGHT, 2, "2006-09-01", HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK);
checkMoveByTenor("2006-08-28", StandardTenor.OVERNIGHT, 2, "2006-08-30", HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK);
}
+
+
+ public void testCalculateTenorsZeroDaysToSpot() {
+ List<Tenor> list = new ArrayList<Tenor>();
+ list.add(StandardTenor.OVERNIGHT);
+ list.add(StandardTenor.SPOT);
+ list.add(StandardTenor.T_1D);
+ list.add(StandardTenor.T_2D);
+ list.add(StandardTenor.T_1W);
+ list.add(StandardTenor.T_1M);
+ list.add(StandardTenor.T_2M);
+ list.add(StandardTenor.T_3M);
+ list.add(StandardTenor.T_6M);
+ list.add(StandardTenor.T_9M);
+ list.add(StandardTenor.T_1Y);
+
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK);
+ cal.setHolidayCalendar(createUKHolidayCalendar());
+ String startDate = "2006-08-24";
+ cal.setStartDate(newDate(startDate));
+ List<E> expectedResults = new ArrayList<E>();
+ expectedResults.add(newDate("2006-08-25")); // ON
+ expectedResults.add(newDate("2006-08-24")); // SPOT
+ expectedResults.add(newDate("2006-08-25")); // 1D
+ expectedResults.add(newDate("2006-08-29")); // 2D
+ expectedResults.add(newDate("2006-08-31")); // 1W
+ expectedResults.add(newDate("2006-09-25")); // 1M
+ expectedResults.add(newDate("2006-10-24")); // 2M
+ expectedResults.add(newDate("2006-11-24")); // 3M
+ expectedResults.add(newDate("2007-02-26")); // 6M
+ expectedResults.add(newDate("2007-05-24")); // 9M
+ expectedResults.add(newDate("2007-08-24")); // 1Y
+
+ List<E> results = cal.calculateTenorDates(list);
+ assertEquals("Same size as tenor", list.size(), results.size());
+ Iterator<E> it = results.iterator();
+ Iterator<E> expected = expectedResults.iterator();
+ for (Tenor tenor : list) {
+ assertEquals("Move start:" + startDate + " tenor:" + tenor, expected.next(), it.next());
+ }
+ }
+
+ public void testCalculateTenorsTwoDaysToSpot() {
+ List<Tenor> list = new ArrayList<Tenor>();
+ list.add(StandardTenor.OVERNIGHT);
+ list.add(StandardTenor.SPOT);
+ list.add(StandardTenor.T_1D);
+ list.add(StandardTenor.T_2D);
+ list.add(StandardTenor.T_1W);
+ list.add(StandardTenor.T_1M);
+ list.add(StandardTenor.T_2M);
+ list.add(StandardTenor.T_3M);
+ list.add(StandardTenor.T_6M);
+ list.add(StandardTenor.T_9M);
+ list.add(StandardTenor.T_1Y);
+
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK);
+ cal.setHolidayCalendar(createUKHolidayCalendar());
+ String startDate = "2006-08-24";
+ cal.setStartDate(newDate(startDate));
+ List<E> expectedResults = new ArrayList<E>();
+ expectedResults.add(newDate("2006-08-25")); // ON
+ expectedResults.add(newDate("2006-08-29")); // SPOT
+ expectedResults.add(newDate("2006-08-30")); // 1D
+ expectedResults.add(newDate("2006-08-31")); // 2D
+ expectedResults.add(newDate("2006-09-05")); // 1W
+ expectedResults.add(newDate("2006-09-29")); // 1M
+ expectedResults.add(newDate("2006-10-30")); // 2M
+ expectedResults.add(newDate("2006-11-29")); // 3M
+ expectedResults.add(newDate("2007-02-28")); // 6M - is this correct?
+ expectedResults.add(newDate("2007-05-29")); // 9M
+ expectedResults.add(newDate("2007-08-29")); // 1Y
+
+ List<E> results = cal.calculateTenorDates(list, 2);
+ assertEquals("Same size as tenor", list.size(), results.size());
+ Iterator<E> it = results.iterator();
+ Iterator<E> expected = expectedResults.iterator();
+ for (Tenor tenor : list) {
+ assertEquals("Move start:" + startDate + " tenor:" + tenor, expected.next(), it.next());
+ }
+ }
}
/*
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedFollowingDateCalculatorTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedFollowingDateCalculatorTest.java 2007-01-05 20:45:33 UTC (rev 238)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedFollowingDateCalculatorTest.java 2007-01-05 21:16:25 UTC (rev 239)
@@ -32,7 +32,10 @@
*/
package net.objectlab.kit.datecalc.common;
+import java.util.ArrayList;
import java.util.Calendar;
+import java.util.Iterator;
+import java.util.List;
import java.util.Set;
import junit.framework.Assert;
@@ -392,6 +395,86 @@
checkMoveByTenor("2006-08-31", StandardTenor.OVERNIGHT, 2, "2006-09-01", HolidayHandlerType.MODIFIED_FOLLOWING);
checkMoveByTenor("2006-08-28", StandardTenor.OVERNIGHT, 2, "2006-08-30", HolidayHandlerType.MODIFIED_FOLLOWING);
}
+
+ public void testCalculateTenorsZeroDaysToSpot() {
+ List<Tenor> list = new ArrayList<Tenor>();
+ list.add(StandardTenor.OVERNIGHT);
+ list.add(StandardTenor.SPOT);
+ list.add(StandardTenor.T_1D);
+ list.add(StandardTenor.T_2D);
+ list.add(StandardTenor.T_1W);
+ list.add(StandardTenor.T_1M);
+ list.add(StandardTenor.T_2M);
+ list.add(StandardTenor.T_3M);
+ list.add(StandardTenor.T_6M);
+ list.add(StandardTenor.T_9M);
+ list.add(StandardTenor.T_1Y);
+
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLOWING);
+ cal.setHolidayCalendar(createUKHolidayCalendar());
+ String startDate = "2006-08-24";
+ cal.setStartDate(newDate(startDate));
+ List<E> expectedResults = new ArrayList<E>();
+ expectedResults.add(newDate("2006-08-25")); // ON
+ expectedResults.add(newDate("2006-08-24")); // SPOT
+ expectedResults.add(newDate("2006-08-25")); // 1D
+ expectedResults.add(newDate("2006-08-29")); // 2D
+ expectedResults.add(newDate("2006-08-31")); // 1W
+ expectedResults.add(newDate("2006-09-25")); // 1M
+ expectedResults.add(newDate("2006-10-24")); // 2M
+ expectedResults.add(newDate("2006-11-24")); // 3M
+ expectedResults.add(newDate("2007-02-26")); // 6M
+ expectedResults.add(newDate("2007-05-24")); // 9M
+ expectedResults.add(newDate("2007-08-24")); // 1Y
+
+ List<E> results = cal.calculateTenorDates(list);
+ assertEquals("Same size as tenor", list.size(), results.size());
+ Iterator<E> it = results.iterator();
+ Iterator<E> expected = expectedResults.iterator();
+ for (Tenor tenor : list) {
+ assertEquals("Move start:" + startDate + " tenor:" + tenor, expected.next(), it.next());
+ }
+ }
+
+ public void testCalculateTenorsTwoDaysToSpot() {
+ List<Tenor> list = new ArrayList<Tenor>();
+ list.add(StandardTenor.OVERNIGHT);
+ list.add(StandardTenor.SPOT);
+ list.add(StandardTenor.T_1D);
+ list.add(StandardTenor.T_2D);
+ list.add(StandardTenor.T_1W);
+ list.add(StandardTenor.T_1M);
+ list.add(StandardTenor.T_2M);
+ list.add(StandardTenor.T_3M);
+ list.add(StandardTenor.T_6M);
+ list.add(StandardTenor.T_9M);
+ list.add(StandardTenor.T_1Y);
+
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLOWING);
+ cal.setHolidayCalendar(createUKHolidayCalendar());
+ String startDate = "2006-08-24";
+ cal.setStartDate(newDate(startDate));
+ List<E> expectedResults = new ArrayList<E>();
+ expectedResults.add(newDate("2006-08-25")); // ON
+ expectedResults.add(newDate("2006-08-29")); // SPOT
+ expectedResults.add(newDate("2006-08-30")); // 1D
+ expectedResults.add(newDate("2006-08-31")); // 2D
+ expectedResults.add(newDate("2006-09-05")); // 1W
+ expectedResults.add(newDate("2006-09-29")); // 1M
+ expectedResults.add(newDate("2006-10-30")); // 2M
+ expectedResults.add(newDate("2006-11-29")); // 3M
+ expectedResults.add(newDate("2007-02-28")); // 6M - is this correct?
+ expectedResults.add(newDate("2007-05-29")); // 9M
+ expectedResults.add(newDate("2007-08-29")); // 1Y
+
+ List<E> results = cal.calculateTenorDates(list, 2);
+ assertEquals("Same size as tenor", list.size(), results.size());
+ Iterator<E> it = results.iterator();
+ Iterator<E> expected = expectedResults.iterator();
+ for (Tenor tenor : list) {
+ assertEquals("Move start:" + startDate + " tenor:" + tenor, expected.next(), it.next());
+ }
+ }
}
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2007-01-05 20:45:34
|
Revision: 238
http://svn.sourceforge.net/objectlabkit/?rev=238&view=rev
Author: benoitx
Date: 2007-01-05 12:45:33 -0800 (Fri, 05 Jan 2007)
Log Message:
-----------
- Added method calculateTenorDates with/without a spot lag to enable calculation of a series of Tenor dates without changing the current business date in the calculator.
- Added method moveByTenor without a spot lag to allow tenor calculation based on the CURRENT date and not the spot lag.
Modified Paths:
--------------
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculator.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/StandardTenor.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardDateCalculatorTest.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateDateCalculator.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateCalculator.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java
trunk/src/site/changes.xml
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java 2007-01-05 13:59:28 UTC (rev 237)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java 2007-01-05 20:45:33 UTC (rev 238)
@@ -32,8 +32,10 @@
*/
package net.objectlab.kit.datecalc.common;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
/**
@@ -158,7 +160,7 @@
}
TenorCode tenorCode = tenor.getCode();
- if (tenorCode != TenorCode.OVERNIGHT) {
+ if (tenorCode != TenorCode.OVERNIGHT && spotLag != 0) {
// get to the Spot date first:
moveByBusinessDays(spotLag);
}
@@ -196,6 +198,52 @@
return calc;
}
+ /**
+ * Move the current date by a given tenor, please note that all tenors are
+ * relative to the CURRENT day (and NOT from spot).
+ *
+ * @param tenor
+ * the Tenor to reach.
+ * @return the current DateCalculator
+ * @since 1.1.0
+ */
+ public DateCalculator<E> moveByTenor(final Tenor tenor) {
+ return moveByTenor(tenor, 0);
+ }
+
+ /**
+ * Calculate a series of Tenor codes in one go based on current day,
+ * this does NOT change the current business date.
+ *
+ * @return list of dates in same order as tenors.
+ * @since 1.1.0
+ */
+ public List<E> calculateTenorDates(final List<Tenor> tenors) {
+ return calculateTenorDates(tenors, 0);
+ }
+
+ /**
+ * Calculate a series of Tenor codes in one go based on SPOT day (calculated
+ * with the spot lag), this does NOT change the current business date.
+ *
+ * @return list of dates in same order as tenors.
+ * @since 1.1.0
+ */
+ public List<E> calculateTenorDates(final List<Tenor> tenors, final int spotLag) {
+ List<E> list = new ArrayList<E>();
+
+ if (tenors != null) {
+ final E date = clone(getCurrentBusinessDate());
+ for (Tenor tenor : tenors) {
+ moveByTenor(tenor, spotLag);
+ list.add(getCurrentBusinessDate());
+ setCurrentBusinessDate(date);
+ }
+ }
+
+ return list;
+ }
+
// -----------------------------------------------------------------------
//
// ObjectLab, world leaders in the design and development of bespoke
@@ -357,6 +405,8 @@
public HolidayCalendar<E> getHolidayCalendar() {
return holidayCalendar;
}
+
+ protected abstract E clone(final E date);
}
/*
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculator.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculator.java 2007-01-05 13:59:28 UTC (rev 237)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculator.java 2007-01-05 20:45:33 UTC (rev 238)
@@ -32,6 +32,7 @@
*/
package net.objectlab.kit.datecalc.common;
+import java.util.List;
import java.util.Set;
/**
@@ -247,12 +248,42 @@
* the Tenor to reach.
* @param spotLag
* number of days to "spot" days, this can vary from one market
- * to the other. It is sometimes called "settlement interval".
+ * to the other. It is sometimes called "settlement interval"
+ * or "offset".
* @return the current DateCalculator
*/
DateCalculator<E> moveByTenor(final Tenor tenor, final int spotLag);
+
+ /**
+ * Move the current date by a given tenor, please note that all tenors are
+ * relative to the CURRENT day (and NOT from spot).
+ *
+ * @param tenor
+ * the Tenor to reach.
+ * @return the current DateCalculator
+ * @since 1.1.0
+ */
+ DateCalculator<E> moveByTenor(final Tenor tenor);
/**
+ * Calculate a series of Tenor codes in one go based on current day,
+ * this does NOT change the current business date.
+ *
+ * @return list of dates in same order as tenors.
+ * @since 1.1.0
+ */
+ List<E> calculateTenorDates(final List<Tenor> tenors);
+
+ /**
+ * Calculate a series of Tenor codes in one go based on SPOT day (calculated
+ * with the spot lag), this does NOT change the current business date.
+ *
+ * @return list of dates in same order as tenors.
+ * @since 1.1.0
+ */
+ List<E> calculateTenorDates(final List<Tenor> tenors, final int spotLag);
+
+ /**
* return the current increment in the calculator, this is used by the
* handler.
*/
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/StandardTenor.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/StandardTenor.java 2007-01-05 13:59:28 UTC (rev 237)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/StandardTenor.java 2007-01-05 20:45:33 UTC (rev 238)
@@ -32,6 +32,10 @@
*/
package net.objectlab.kit.datecalc.common;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
/**
* A series of Standard Tenors used by the financial industry.
*
@@ -43,7 +47,9 @@
public final class StandardTenor {
private StandardTenor() {
}
-
+
+ private static final List<Tenor> ALL;
+
public static final Tenor SPOT = new Tenor(0, TenorCode.SPOT);
public static final Tenor OVERNIGHT = new Tenor(0, TenorCode.OVERNIGHT);
@@ -93,6 +99,36 @@
public static final Tenor T_30Y = new Tenor(30, TenorCode.YEAR);
public static final Tenor T_50Y = new Tenor(50, TenorCode.YEAR);
+
+ public static List<Tenor> getAll() {
+ return ALL;
+ }
+
+ static {
+ List<Tenor> list = new ArrayList<Tenor>();
+ list.add(OVERNIGHT);
+ list.add(SPOT);
+ list.add(T_1D);
+ list.add(T_2D);
+ list.add(T_1W);
+ list.add(T_1M);
+ list.add(T_2M);
+ list.add(T_3M);
+ list.add(T_6M);
+ list.add(T_6M);
+ list.add(T_9M);
+ list.add(T_1Y);
+ list.add(T_2Y);
+ list.add(T_3Y);
+ list.add(T_4Y);
+ list.add(T_5Y);
+ list.add(T_7Y);
+ list.add(T_10Y);
+ list.add(T_20Y);
+ list.add(T_30Y);
+ list.add(T_50Y);
+ ALL = Collections.unmodifiableList(list);
+ }
}
/*
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java 2007-01-05 13:59:28 UTC (rev 237)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java 2007-01-05 20:45:33 UTC (rev 238)
@@ -129,6 +129,23 @@
checkDate("Move start:" + startDate + " tenor:" + tenor + " daysToSpot:" + spotLag, cal.moveByTenor(tenor, spotLag),
expectedDate);
}
+
+ /**
+ * Based on UK Holidays for Aug 2006.
+ *
+ * @param startDate
+ * @param tenor
+ * @param spotLag
+ * @param expectedDate
+ * @param holidayHandlerType
+ */
+ protected void checkMoveByTenor(final String startDate, final Tenor tenor, final String expectedDate,
+ final String holidayHandlerType) {
+ final DateCalculator<E> cal = newDateCalculator("bla", holidayHandlerType);
+ cal.setHolidayCalendar(createUKHolidayCalendar());
+ cal.setStartDate(newDate(startDate));
+ checkDate("Move start:" + startDate + " tenor:" + tenor, cal.moveByTenor(tenor), expectedDate);
+ }
}
/*
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardDateCalculatorTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardDateCalculatorTest.java 2007-01-05 13:59:28 UTC (rev 237)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardDateCalculatorTest.java 2007-01-05 20:45:33 UTC (rev 238)
@@ -32,7 +32,10 @@
*/
package net.objectlab.kit.datecalc.common;
+import java.util.ArrayList;
import java.util.Calendar;
+import java.util.Iterator;
+import java.util.List;
import junit.framework.Assert;
@@ -231,7 +234,7 @@
}
- public void testMoveByTenorDays() {
+ public void testMoveByTenorDaysZeroDayToSpot() {
checkMoveByTenor("2006-08-08", StandardTenor.T_1D, 0, "2006-08-09", HolidayHandlerType.FORWARD);
checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.DAY), 0, "2006-08-10", HolidayHandlerType.FORWARD);
checkMoveByTenor("2006-08-08", new Tenor(10, TenorCode.DAY), 0, "2006-08-18", HolidayHandlerType.FORWARD);
@@ -239,6 +242,14 @@
checkMoveByTenor("2006-08-08", new Tenor(12, TenorCode.DAY), 0, "2006-08-21", HolidayHandlerType.FORWARD);
checkMoveByTenor("2006-08-08", new Tenor(13, TenorCode.DAY), 0, "2006-08-21", HolidayHandlerType.FORWARD);
checkMoveByTenor("2006-09-26", new Tenor(4, TenorCode.DAY), 0, "2006-10-02", HolidayHandlerType.FORWARD);
+
+ checkMoveByTenor("2006-08-08", StandardTenor.T_1D, 0, "2006-08-09", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.DAY), "2006-08-10", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2006-08-08", new Tenor(10, TenorCode.DAY), "2006-08-18", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2006-08-08", new Tenor(11, TenorCode.DAY), "2006-08-21", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2006-08-08", new Tenor(12, TenorCode.DAY), "2006-08-21", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2006-08-08", new Tenor(13, TenorCode.DAY), "2006-08-21", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2006-09-26", new Tenor(4, TenorCode.DAY), "2006-10-02", HolidayHandlerType.FORWARD);
}
public void testMoveByTenorDaysOneDayToSpot() {
@@ -259,10 +270,14 @@
checkMoveByTenor("2006-08-07", new Tenor(13, TenorCode.DAY), 2, "2006-08-22", HolidayHandlerType.FORWARD);
}
- public void testMoveByTenorWeek() {
+ public void testMoveByTenorWeekZeroDayToSpot() {
checkMoveByTenor("2006-08-08", StandardTenor.T_1W, 0, "2006-08-15", HolidayHandlerType.FORWARD);
checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.WEEK), 0, "2006-08-22", HolidayHandlerType.FORWARD);
checkMoveByTenor("2006-08-08", new Tenor(4, TenorCode.WEEK), 0, "2006-09-05", HolidayHandlerType.FORWARD);
+
+ checkMoveByTenor("2006-08-08", StandardTenor.T_1W, "2006-08-15", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.WEEK), "2006-08-22", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2006-08-08", new Tenor(4, TenorCode.WEEK), "2006-09-05", HolidayHandlerType.FORWARD);
}
public void testMoveByTenorWeekOneDayToSpot() {
@@ -277,7 +292,7 @@
checkMoveByTenor("2006-08-08", new Tenor(4, TenorCode.WEEK), 2, "2006-09-07", HolidayHandlerType.FORWARD);
}
- public void testMoveByTenorMonth() {
+ public void testMoveByTenorMonthZeroDayToSpot() {
checkMoveByTenor("2006-08-31", StandardTenor.T_1M, 0, "2006-10-02", HolidayHandlerType.FORWARD);
checkMoveByTenor("2006-08-31", StandardTenor.T_2M, 0, "2006-10-31", HolidayHandlerType.FORWARD);
checkMoveByTenor("2006-01-31", StandardTenor.T_1M, 0, "2006-02-28", HolidayHandlerType.FORWARD);
@@ -287,6 +302,16 @@
checkMoveByTenor("2006-08-09", StandardTenor.T_1M, 0, "2006-09-11", HolidayHandlerType.FORWARD);
checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.MONTH), 0, "2006-10-09", HolidayHandlerType.FORWARD);
checkMoveByTenor("2006-08-08", new Tenor(5, TenorCode.MONTH), 0, "2007-01-08", HolidayHandlerType.FORWARD);
+
+ checkMoveByTenor("2006-08-31", StandardTenor.T_1M, "2006-10-02", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2006-08-31", StandardTenor.T_2M, "2006-10-31", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2006-01-31", StandardTenor.T_1M, "2006-02-28", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2008-01-31", StandardTenor.T_1M, "2008-02-29", HolidayHandlerType.FORWARD);
+
+ checkMoveByTenor("2006-08-08", StandardTenor.T_1M, "2006-09-08", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2006-08-09", StandardTenor.T_1M, "2006-09-11", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.MONTH), "2006-10-09", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2006-08-08", new Tenor(5, TenorCode.MONTH), "2007-01-08", HolidayHandlerType.FORWARD);
}
public void testMoveByTenorMonthOneDayToSpot() {
@@ -313,11 +338,16 @@
checkMoveByTenor("2006-08-08", new Tenor(5, TenorCode.MONTH), 2, "2007-01-10", HolidayHandlerType.FORWARD);
}
- public void testMoveByTenorYear() {
+ public void testMoveByTenorYearZeroDayToSpot() {
checkMoveByTenor("2006-08-31", StandardTenor.T_1Y, 0, "2007-08-31", HolidayHandlerType.FORWARD);
checkMoveByTenor("2006-08-31", StandardTenor.T_2Y, 0, "2008-09-01", HolidayHandlerType.FORWARD);
checkMoveByTenor("2008-02-29", StandardTenor.T_1Y, 0, "2009-03-02", HolidayHandlerType.FORWARD);
checkMoveByTenor("2008-02-29", StandardTenor.T_4Y, 0, "2012-02-29", HolidayHandlerType.FORWARD);
+
+ checkMoveByTenor("2006-08-31", StandardTenor.T_1Y, "2007-08-31", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2006-08-31", StandardTenor.T_2Y, "2008-09-01", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2008-02-29", StandardTenor.T_1Y, "2009-03-02", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2008-02-29", StandardTenor.T_4Y, "2012-02-29", HolidayHandlerType.FORWARD);
}
public void testMoveByTenorYearOneDayToSpot() {
@@ -334,10 +364,14 @@
checkMoveByTenor("2008-02-29", StandardTenor.T_4Y, 2, "2012-03-05", HolidayHandlerType.FORWARD);
}
- public void testMoveByTenorSpot() {
+ public void testMoveByTenorSpotZeroDayToSpot() {
checkMoveByTenor("2006-08-31", StandardTenor.SPOT, 0, "2006-08-31", HolidayHandlerType.FORWARD);
checkMoveByTenor("2006-08-28", StandardTenor.SPOT, 0, "2006-08-29", HolidayHandlerType.FORWARD);
checkMoveByTenor("2006-08-25", StandardTenor.SPOT, 0, "2006-08-25", HolidayHandlerType.FORWARD);
+
+ checkMoveByTenor("2006-08-31", StandardTenor.SPOT, "2006-08-31", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2006-08-28", StandardTenor.SPOT, "2006-08-29", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2006-08-25", StandardTenor.SPOT, "2006-08-25", HolidayHandlerType.FORWARD);
}
public void testMoveByTenorSpotOneDayToSpot() {
@@ -372,6 +406,86 @@
checkMoveByTenor("2006-08-31", StandardTenor.OVERNIGHT, 2, "2006-09-01", HolidayHandlerType.FORWARD);
checkMoveByTenor("2006-08-28", StandardTenor.OVERNIGHT, 2, "2006-08-30", HolidayHandlerType.FORWARD);
}
+
+ public void testCalculateTenorsZeroDaysToSpot() {
+ List<Tenor> list = new ArrayList<Tenor>();
+ list.add(StandardTenor.OVERNIGHT);
+ list.add(StandardTenor.SPOT);
+ list.add(StandardTenor.T_1D);
+ list.add(StandardTenor.T_2D);
+ list.add(StandardTenor.T_1W);
+ list.add(StandardTenor.T_1M);
+ list.add(StandardTenor.T_2M);
+ list.add(StandardTenor.T_3M);
+ list.add(StandardTenor.T_6M);
+ list.add(StandardTenor.T_9M);
+ list.add(StandardTenor.T_1Y);
+
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.FORWARD);
+ cal.setHolidayCalendar(createUKHolidayCalendar());
+ String startDate = "2006-08-24";
+ cal.setStartDate(newDate(startDate));
+ List<E> expectedResults = new ArrayList<E>();
+ expectedResults.add(newDate("2006-08-25")); // ON
+ expectedResults.add(newDate("2006-08-24")); // SPOT
+ expectedResults.add(newDate("2006-08-25")); // 1D
+ expectedResults.add(newDate("2006-08-29")); // 2D
+ expectedResults.add(newDate("2006-08-31")); // 1W
+ expectedResults.add(newDate("2006-09-25")); // 1M
+ expectedResults.add(newDate("2006-10-24")); // 2M
+ expectedResults.add(newDate("2006-11-24")); // 3M
+ expectedResults.add(newDate("2007-02-26")); // 6M
+ expectedResults.add(newDate("2007-05-24")); // 9M
+ expectedResults.add(newDate("2007-08-24")); // 1Y
+
+ List<E> results = cal.calculateTenorDates(list);
+ assertEquals("Same size as tenor", list.size(), results.size());
+ Iterator<E> it = results.iterator();
+ Iterator<E> expected = expectedResults.iterator();
+ for (Tenor tenor : list) {
+ assertEquals("Move start:" + startDate + " tenor:" + tenor, expected.next(), it.next());
+ }
+ }
+
+ public void testCalculateTenorsTwoDaysToSpot() {
+ List<Tenor> list = new ArrayList<Tenor>();
+ list.add(StandardTenor.OVERNIGHT);
+ list.add(StandardTenor.SPOT);
+ list.add(StandardTenor.T_1D);
+ list.add(StandardTenor.T_2D);
+ list.add(StandardTenor.T_1W);
+ list.add(StandardTenor.T_1M);
+ list.add(StandardTenor.T_2M);
+ list.add(StandardTenor.T_3M);
+ list.add(StandardTenor.T_6M);
+ list.add(StandardTenor.T_9M);
+ list.add(StandardTenor.T_1Y);
+
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.FORWARD);
+ cal.setHolidayCalendar(createUKHolidayCalendar());
+ String startDate = "2006-08-24";
+ cal.setStartDate(newDate(startDate));
+ List<E> expectedResults = new ArrayList<E>();
+ expectedResults.add(newDate("2006-08-25")); // ON
+ expectedResults.add(newDate("2006-08-29")); // SPOT
+ expectedResults.add(newDate("2006-08-30")); // 1D
+ expectedResults.add(newDate("2006-08-31")); // 2D
+ expectedResults.add(newDate("2006-09-05")); // 1W
+ expectedResults.add(newDate("2006-09-29")); // 1M
+ expectedResults.add(newDate("2006-10-30")); // 2M
+ expectedResults.add(newDate("2006-11-29")); // 3M
+ expectedResults.add(newDate("2007-02-28")); // 6M - is this correct?
+ expectedResults.add(newDate("2007-05-29")); // 9M
+ expectedResults.add(newDate("2007-08-29")); // 1Y
+
+ List<E> results = cal.calculateTenorDates(list, 2);
+ assertEquals("Same size as tenor", list.size(), results.size());
+ Iterator<E> it = results.iterator();
+ Iterator<E> expected = expectedResults.iterator();
+ for (Tenor tenor : list) {
+ assertEquals("Move start:" + startDate + " tenor:" + tenor, expected.next(), it.next());
+ }
+ }
}
/*
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java 2007-01-05 13:59:28 UTC (rev 237)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java 2007-01-05 20:45:33 UTC (rev 238)
@@ -166,6 +166,13 @@
throw new IndexOutOfBoundsException(date + " is after the late boundary " + late);
}
}
+
+ @Override
+ protected Calendar clone(Calendar date) {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(date.getTime());
+ return cal;
+ }
}
/*
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateDateCalculator.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateDateCalculator.java 2007-01-05 13:59:28 UTC (rev 237)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateDateCalculator.java 2007-01-05 20:45:33 UTC (rev 238)
@@ -175,6 +175,11 @@
throw new IndexOutOfBoundsException(date + " is after the late boundary " + late);
}
}
+
+ @Override
+ protected Date clone(Date date) {
+ return new Date(date.getTime());
+ }
}
/*
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateCalculator.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateCalculator.java 2007-01-05 13:59:28 UTC (rev 237)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateCalculator.java 2007-01-05 20:45:33 UTC (rev 238)
@@ -171,6 +171,11 @@
throw new IndexOutOfBoundsException(date + " is after the late boundary " + late);
}
}
+
+ @Override
+ protected LocalDate clone(LocalDate date) {
+ return date;
+ }
}
/*
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java 2007-01-05 13:59:28 UTC (rev 237)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java 2007-01-05 20:45:33 UTC (rev 238)
@@ -181,6 +181,11 @@
throw new IndexOutOfBoundsException(date + " is after the late boundary " + late);
}
}
+
+ @Override
+ protected YearMonthDay clone(YearMonthDay date) {
+ return date;
+ }
}
/*
Modified: trunk/src/site/changes.xml
===================================================================
--- trunk/src/site/changes.xml 2007-01-05 13:59:28 UTC (rev 237)
+++ trunk/src/site/changes.xml 2007-01-05 20:45:33 UTC (rev 238)
@@ -9,6 +9,8 @@
</properties>
<body>
<release version="1.1.0" date="in SVN" description="Maintenance">
+ <action dev="benoitx" type="add">Added method calculateTenorDates with/without a spot lag to enable calculation of a series of Tenor dates without changing the current business date in the calculator.</action>
+ <action dev="benoitx" type="add">Added method moveByTenor without a spot lag to allow tenor calculation based on the CURRENT date and not the spot lag.</action>
<action dev="benoitx" type="add" issue="1575498" due-to="Paul Hill">Valid Range via HolidayCalendar. HolidayCalendar should replace the simple Set<E> of dates
for holidays. A HolidayCalendar MAY contain an eraly and late boundary, if the calculation break a boundary, an exception is thrown, if there are no
boundaries no exception would be thrown. This would ensure that calculations are not going outside the valid set of holidays.</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2007-01-05 13:59:28
|
Revision: 237
http://svn.sourceforge.net/objectlabkit/?rev=237&view=rev
Author: marchy
Date: 2007-01-05 05:59:28 -0800 (Fri, 05 Jan 2007)
Log Message:
-----------
tweaking m2 pom's - changed version to 1.1-SNAPSHOT
Modified Paths:
--------------
trunk/datecalc-common/pom.xml
trunk/datecalc-jdk/pom.xml
trunk/datecalc-joda/pom.xml
trunk/pom.xml
Modified: trunk/datecalc-common/pom.xml
===================================================================
--- trunk/datecalc-common/pom.xml 2007-01-04 21:11:42 UTC (rev 236)
+++ trunk/datecalc-common/pom.xml 2007-01-05 13:59:28 UTC (rev 237)
@@ -16,12 +16,12 @@
<parent>
<groupId>net.objectlab.kit.datecalc</groupId>
<artifactId>datecalc</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>datecalc-common</artifactId>
<packaging>jar</packaging>
<name>DateCalc commons</name>
- <description>Common Date Calculator methods</description>
+ <description>Common Date Calculator Code</description>
</project>
\ No newline at end of file
Modified: trunk/datecalc-jdk/pom.xml
===================================================================
--- trunk/datecalc-jdk/pom.xml 2007-01-04 21:11:42 UTC (rev 236)
+++ trunk/datecalc-jdk/pom.xml 2007-01-05 13:59:28 UTC (rev 237)
@@ -15,7 +15,7 @@
<parent>
<groupId>net.objectlab.kit.datecalc</groupId>
<artifactId>datecalc</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>datecalc-jdk</artifactId>
@@ -27,7 +27,7 @@
<dependency>
<groupId>net.objectlab.kit.datecalc</groupId>
<artifactId>datecalc-common</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
Modified: trunk/datecalc-joda/pom.xml
===================================================================
--- trunk/datecalc-joda/pom.xml 2007-01-04 21:11:42 UTC (rev 236)
+++ trunk/datecalc-joda/pom.xml 2007-01-05 13:59:28 UTC (rev 237)
@@ -8,7 +8,7 @@
<parent>
<groupId>net.objectlab.kit.datecalc</groupId>
<artifactId>datecalc</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
</parent>
<artifactId>datecalc-joda</artifactId>
@@ -20,7 +20,7 @@
<dependency>
<groupId>net.objectlab.kit.datecalc</groupId>
<artifactId>datecalc-common</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-01-04 21:11:42 UTC (rev 236)
+++ trunk/pom.xml 2007-01-05 13:59:28 UTC (rev 237)
@@ -8,7 +8,7 @@
<artifactId>datecalc</artifactId>
<packaging>pom</packaging>
<name>ObjectLab Kit</name>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
<url>http://objectlabkit.sourceforge.net/</url>
<description>
ObjectLab Kit provides a generic Business Calendar for calculating dates given set(s) of holidays. Why
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2007-01-04 21:11:41
|
Revision: 236
http://svn.sourceforge.net/objectlabkit/?rev=236&view=rev
Author: benoitx
Date: 2007-01-04 13:11:42 -0800 (Thu, 04 Jan 2007)
Log Message:
-----------
fixed file id (new QALab)
Modified Paths:
--------------
trunk/datecalc-common/qalab.xml
trunk/datecalc-jdk/qalab.xml
trunk/datecalc-joda/qalab.xml
Modified: trunk/datecalc-common/qalab.xml
===================================================================
--- trunk/datecalc-common/qalab.xml 2007-01-04 18:31:58 UTC (rev 235)
+++ trunk/datecalc-common/qalab.xml 2007-01-04 21:11:42 UTC (rev 236)
@@ -173,7 +173,7 @@
project="objectlabkit" statvalue="30" type="cobertura-branch"/>
</summary>
<file
- id="default-default-net_objectlab_kit_datecalc_common_package.html"
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_package.html"
module="common"
path="net/objectlab/kit/datecalc/common/package.html" project="objectlabkit">
<result date="2006-08-08" statvalue="1" type="checkstyle"/>
@@ -189,7 +189,7 @@
<result date="2006-09-05" statvalue="1" type="checkstyle"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_common_Tenor.java"
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_Tenor.java"
module="common"
path="net/objectlab/kit/datecalc/common/Tenor.java" project="objectlabkit">
<result date="2006-08-08" statvalue="1" type="checkstyle"/>
@@ -253,7 +253,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_common_WorkingWeek.java"
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_WorkingWeek.java"
module="common"
path="net/objectlab/kit/datecalc/common/WorkingWeek.java" project="objectlabkit">
<result date="2006-08-08" statvalue="3" type="checkstyle"/>
@@ -322,7 +322,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_common_TenorCode.java"
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_TenorCode.java"
module="common"
path="net/objectlab/kit/datecalc/common/TenorCode.java" project="objectlabkit">
<result date="2006-08-08" statvalue="100" type="cobertura-line"/>
@@ -383,7 +383,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_common_HolidayHandlerType.java"
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_HolidayHandlerType.java"
module="common"
path="net/objectlab/kit/datecalc/common/HolidayHandlerType.java" project="objectlabkit">
<result date="2006-08-08" statvalue="100" type="cobertura-branch"/>
@@ -416,7 +416,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_common_PeriodCountBasis.java"
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_PeriodCountBasis.java"
module="common"
path="net/objectlab/kit/datecalc/common/PeriodCountBasis.java" project="objectlabkit">
<result date="2006-08-08" statvalue="100" type="cobertura-branch"/>
@@ -447,7 +447,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_common_StandardTenor.java"
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_StandardTenor.java"
module="common"
path="net/objectlab/kit/datecalc/common/StandardTenor.java" project="objectlabkit">
<result date="2006-08-08" statvalue="100" type="cobertura-branch"/>
@@ -507,17 +507,17 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_common_AbstractDateCalculator.java"
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_AbstractDateCalculator.java"
module="common"
path="net/objectlab/kit/datecalc/common/AbstractDateCalculator.java" project="objectlabkit">
<result date="2006-08-23" statvalue="5" type="checkstyle"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_common_DateCalculatorGeneric.java"
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_DateCalculatorGeneric.java"
module="common"
path="net/objectlab/kit/datecalc/common/DateCalculatorGeneric.java" project="objectlabkit"/>
<file
- id="default-default-net_objectlab_kit_datecalc_common_DateCalculator.java"
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_DateCalculator.java"
module="common"
path="net/objectlab/kit/datecalc/common/DateCalculator.java" project="objectlabkit">
<result date="2006-08-23" statvalue="19" type="checkstyle"/>
@@ -569,7 +569,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_common_HolidayHandler.java"
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_HolidayHandler.java"
module="common"
path="net/objectlab/kit/datecalc/common/HolidayHandler.java" project="objectlabkit">
<result date="2006-08-23" statvalue="100" type="cobertura-line"/>
@@ -620,7 +620,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_common_AbstractDateCalculatorFactory.java"
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_AbstractDateCalculatorFactory.java"
module="common"
path="net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactory.java" project="objectlabkit">
<result date="2006-08-28" statvalue="2" type="checkstyle"/>
@@ -635,7 +635,7 @@
<result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_common_DateCalculatorFactory.java"
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_DateCalculatorFactory.java"
module="common"
path="net/objectlab/kit/datecalc/common/DateCalculatorFactory.java" project="objectlabkit">
<result date="2006-08-28" statvalue="100" type="cobertura-line"/>
@@ -652,7 +652,7 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_common_PeriodCountCalculator.java"
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_PeriodCountCalculator.java"
module="common"
path="net/objectlab/kit/datecalc/common/PeriodCountCalculator.java" project="objectlabkit">
<result date="2006-08-28" statvalue="100" type="cobertura-line"/>
@@ -702,7 +702,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_common_Utils.java"
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_Utils.java"
module="common"
path="net/objectlab/kit/datecalc/common/Utils.java" project="objectlabkit">
<result date="2006-09-04" statvalue="2" type="checkstyle"/>
@@ -746,7 +746,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_common_IMMPeriod.java"
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_IMMPeriod.java"
module="common"
path="net/objectlab/kit/datecalc/common/IMMPeriod.java" project="objectlabkit">
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
@@ -770,7 +770,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_common_ExcelDateUtil.java"
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_ExcelDateUtil.java"
module="common"
path="net/objectlab/kit/datecalc/common/ExcelDateUtil.java" project="objectlabkit">
<result date="2006-09-05" statvalue="84" type="cobertura-line"/>
@@ -811,7 +811,7 @@
<result date="2007-01-03" statvalue="83" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_common_IMMDateCalculator.java"
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_IMMDateCalculator.java"
module="common"
path="net/objectlab/kit/datecalc/common/IMMDateCalculator.java" project="objectlabkit">
<result date="2006-09-06" statvalue="100" type="cobertura-line"/>
@@ -850,7 +850,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_common_AbstractIMMDateCalculator.java"
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_AbstractIMMDateCalculator.java"
module="common"
path="net/objectlab/kit/datecalc/common/AbstractIMMDateCalculator.java" project="objectlabkit">
<result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
@@ -872,7 +872,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_common_KitCalculatorsFactory.java"
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_KitCalculatorsFactory.java"
module="common"
path="net/objectlab/kit/datecalc/common/KitCalculatorsFactory.java" project="objectlabkit">
<result date="2006-09-09" statvalue="100" type="cobertura-line"/>
@@ -907,20 +907,20 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_common_HolidayCalendar.java"
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_HolidayCalendar.java"
module="common"
path="net/objectlab/kit/datecalc/common/HolidayCalendar.java" project="objectlabkit">
<result date="2007-01-03" statvalue="100" type="cobertura-line"/>
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_common_DefaultHolidayCalendar.java"
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_DefaultHolidayCalendar.java"
module="common"
path="net/objectlab/kit/datecalc/common/DefaultHolidayCalendar.java" project="objectlabkit">
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_common_ImmutableHolidayCalendar.java"
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_ImmutableHolidayCalendar.java"
module="common"
path="net/objectlab/kit/datecalc/common/ImmutableHolidayCalendar.java" project="objectlabkit"/>
<file
Modified: trunk/datecalc-jdk/qalab.xml
===================================================================
--- trunk/datecalc-jdk/qalab.xml 2007-01-04 18:31:58 UTC (rev 235)
+++ trunk/datecalc-jdk/qalab.xml 2007-01-04 21:11:42 UTC (rev 236)
@@ -177,7 +177,7 @@
project="objectlabkit" statvalue="100" type="cobertura-branch"/>
</summary>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_package.html"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_package.html"
module="jdk" path="net/objectlab/kit/datecalc/jdk/package.html" project="objectlabkit">
<result date="2006-08-08" statvalue="1" type="checkstyle"/>
<result date="2006-08-09" statvalue="1" type="checkstyle"/>
@@ -191,7 +191,7 @@
<result date="2006-09-05" statvalue="1" type="checkstyle"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_BaseDateCalculator.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_BaseDateCalculator.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/BaseDateCalculator.java" project="objectlabkit">
<result date="2006-08-08" statvalue="1" type="checkstyle"/>
@@ -226,7 +226,7 @@
<result date="2006-09-02" statvalue="75" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_DefaultDateCalculatorFactory.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DefaultDateCalculatorFactory.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/DefaultDateCalculatorFactory.java" project="objectlabkit">
<result date="2006-08-08" statvalue="1" type="checkstyle"/>
@@ -249,7 +249,7 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-C:_project_objectlab-kit_datecalc-jdk_src_test_java_net_objectlab_kit_datecalc_jdk_DateCalculatorCombinationTest.java"
+ id="objectlabkit-jdk-C:_project_objectlab-kit_datecalc-jdk_src_test_java_net_objectlab_kit_datecalc_jdk_DateCalculatorCombinationTest.java"
module="jdk"
path="C:/project/objectlab-kit/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/DateCalculatorCombinationTest.java" project="objectlabkit">
<result date="2006-08-08" statvalue="3" type="pmd"/>
@@ -257,7 +257,7 @@
<result date="2006-08-10" statvalue="3" type="pmd"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_DateCalculator.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateCalculator.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/DateCalculator.java" project="objectlabkit">
<result date="2006-08-08" statvalue="100" type="cobertura-line"/>
@@ -270,7 +270,7 @@
<result date="2006-08-20" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_DateCalculatorFactory.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateCalculatorFactory.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/DateCalculatorFactory.java" project="objectlabkit">
<result date="2006-08-08" statvalue="100" type="cobertura-line"/>
@@ -287,7 +287,7 @@
<result date="2006-08-24" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_HolidayHandler.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_HolidayHandler.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/HolidayHandler.java" project="objectlabkit">
<result date="2006-08-08" statvalue="100" type="cobertura-line"/>
@@ -300,7 +300,7 @@
<result date="2006-08-20" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_PeriodCountCalculator.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_PeriodCountCalculator.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/PeriodCountCalculator.java" project="objectlabkit">
<result date="2006-08-08" statvalue="100" type="cobertura-line"/>
@@ -317,7 +317,7 @@
<result date="2006-08-24" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_DefaultPeriodCountCalculator.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DefaultPeriodCountCalculator.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/DefaultPeriodCountCalculator.java" project="objectlabkit">
<result date="2006-08-08" statvalue="100" type="cobertura-branch"/>
@@ -333,10 +333,10 @@
<result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-C:_project_objectlabkit_datecalc-jdk_src_test_java_net_objectlab_kit_datecalc_jdk_DateCalculatorCombinationTest.java"
+ id="objectlabkit-jdk-C:_project_objectlabkit_datecalc-jdk_src_test_java_net_objectlab_kit_datecalc_jdk_DateCalculatorCombinationTest.java"
module="jdk"
path="C:/project/objectlabkit/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/DateCalculatorCombinationTest.java" project="objectlabkit"/>
- <file id="default-default-net_objectlab_kit_datecalc_jdk_Utils.java"
+ <file id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_Utils.java"
module="jdk" path="net/objectlab/kit/datecalc/jdk/Utils.java" project="objectlabkit">
<result date="2006-08-20" statvalue="1" type="checkstyle"/>
<result date="2006-08-20" statvalue="75" type="cobertura-line"/>
@@ -355,7 +355,7 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_ForwardHandler.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_ForwardHandler.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/ForwardHandler.java" project="objectlabkit">
<result date="2006-08-20" statvalue="100" type="cobertura-line"/>
@@ -376,7 +376,7 @@
<result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_BackwardHandler.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_BackwardHandler.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/BackwardHandler.java" project="objectlabkit">
<result date="2006-08-28" statvalue="66" type="cobertura-line"/>
@@ -391,7 +391,7 @@
<result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_ModifiedPreceedingHandler.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_ModifiedPreceedingHandler.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/ModifiedPreceedingHandler.java" project="objectlabkit">
<result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
@@ -405,7 +405,7 @@
<result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_CalendarPeriodCountCalculator.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarPeriodCountCalculator.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java" project="objectlabkit">
<result date="2006-09-02" statvalue="9" type="checkstyle"/>
@@ -451,7 +451,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_DatePeriodCountCalculator.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DatePeriodCountCalculator.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/DatePeriodCountCalculator.java" project="objectlabkit">
<result date="2006-09-02" statvalue="1" type="checkstyle"/>
@@ -499,14 +499,14 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_ExcelDateUtil.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_ExcelDateUtil.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/ExcelDateUtil.java" project="objectlabkit">
<result date="2006-09-02" statvalue="4" type="checkstyle"/>
<result date="2006-09-04" statvalue="4" type="checkstyle"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_ModifiedFollowingHandler.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_ModifiedFollowingHandler.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/ModifiedFollowingHandler.java" project="objectlabkit">
<result date="2006-09-02" statvalue="18" type="cobertura-line"/>
@@ -518,7 +518,7 @@
<result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_HolidayHandlerDateWrapper.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_HolidayHandlerDateWrapper.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/HolidayHandlerDateWrapper.java" project="objectlabkit">
<result date="2006-09-04" statvalue="2" type="checkstyle"/>
@@ -560,7 +560,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_JdkCalendarBaseDateCalculator.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_JdkCalendarBaseDateCalculator.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/JdkCalendarBaseDateCalculator.java" project="objectlabkit">
<result date="2006-09-04" statvalue="8" type="checkstyle"/>
@@ -575,7 +575,7 @@
<result date="2006-09-07" statvalue="71" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_JdkDateCalculatorFactory.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_JdkDateCalculatorFactory.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/JdkDateCalculatorFactory.java" project="objectlabkit">
<result date="2006-09-04" statvalue="2" type="checkstyle"/>
@@ -588,7 +588,7 @@
<result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_DefaultJdkDateCalculatorFactory.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DefaultJdkDateCalculatorFactory.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/DefaultJdkDateCalculatorFactory.java" project="objectlabkit">
<result date="2006-09-04" statvalue="95" type="cobertura-line"/>
@@ -601,7 +601,7 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_JdkCalendarDateCalculator.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_JdkCalendarDateCalculator.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/JdkCalendarDateCalculator.java" project="objectlabkit">
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
@@ -612,7 +612,7 @@
<result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_JdkDateBaseDateCalculator.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_JdkDateBaseDateCalculator.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/JdkDateBaseDateCalculator.java" project="objectlabkit">
<result date="2006-09-04" statvalue="91" type="cobertura-line"/>
@@ -625,7 +625,7 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_JdkDateCalculator.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_JdkDateCalculator.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/JdkDateCalculator.java" project="objectlabkit">
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
@@ -636,7 +636,7 @@
<result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_JdkDatePeriodCountCalculator.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_JdkDatePeriodCountCalculator.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/JdkDatePeriodCountCalculator.java" project="objectlabkit">
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
@@ -649,43 +649,43 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_AbstractDateCalculatorTest.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_AbstractDateCalculatorTest.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/AbstractDateCalculatorTest.java" project="objectlabkit"/>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_DateCalculatorFactoryTest.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateCalculatorFactoryTest.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/DateCalculatorFactoryTest.java" project="objectlabkit"/>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_DatePeriodCountCalculatorTest.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DatePeriodCountCalculatorTest.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/DatePeriodCountCalculatorTest.java" project="objectlabkit"/>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_IMMDateTest.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_IMMDateTest.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/IMMDateTest.java" project="objectlabkit"/>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_JdkDateBackwardDateCalculatorTest.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_JdkDateBackwardDateCalculatorTest.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/JdkDateBackwardDateCalculatorTest.java" project="objectlabkit"/>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_JdkDateDateCalculatorCombinationTest.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_JdkDateDateCalculatorCombinationTest.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/JdkDateDateCalculatorCombinationTest.java" project="objectlabkit"/>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_JdkDateForwardDateCalculatorTest.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_JdkDateForwardDateCalculatorTest.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/JdkDateForwardDateCalculatorTest.java" project="objectlabkit"/>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_JdkDateModifiedFollowingDateCalculatorTest.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_JdkDateModifiedFollowingDateCalculatorTest.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/JdkDateModifiedFollowingDateCalculatorTest.java" project="objectlabkit"/>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_JdkDateModifiedPreceedingDateCalculatorTest.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_JdkDateModifiedPreceedingDateCalculatorTest.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/JdkDateModifiedPreceedingDateCalculatorTest.java" project="objectlabkit"/>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_DefaultJdkCalendarCalculatorFactory.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DefaultJdkCalendarCalculatorFactory.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/DefaultJdkCalendarCalculatorFactory.java" project="objectlabkit">
<result date="2006-09-06" statvalue="87" type="cobertura-line"/>
@@ -694,21 +694,21 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_JdkCalendarCalculator.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_JdkCalendarCalculator.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/JdkCalendarCalculator.java" project="objectlabkit">
<result date="2006-09-06" statvalue="100" type="cobertura-line"/>
<result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_JdkCalendarCalculatorFactory.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_JdkCalendarCalculatorFactory.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/JdkCalendarCalculatorFactory.java" project="objectlabkit">
<result date="2006-09-06" statvalue="100" type="cobertura-line"/>
<result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_JdkCalendarIMMDateCalculator.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_JdkCalendarIMMDateCalculator.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/JdkCalendarIMMDateCalculator.java" project="objectlabkit">
<result date="2006-09-06" statvalue="100" type="cobertura-line"/>
@@ -717,7 +717,7 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_JdkCalendarPeriodCountCalculator.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_JdkCalendarPeriodCountCalculator.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/JdkCalendarPeriodCountCalculator.java" project="objectlabkit">
<result date="2006-09-06" statvalue="100" type="cobertura-line"/>
@@ -726,7 +726,7 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_JdkDateIMMDateCalculator.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_JdkDateIMMDateCalculator.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/JdkDateIMMDateCalculator.java" project="objectlabkit">
<result date="2006-09-06" statvalue="100" type="cobertura-line"/>
@@ -735,7 +735,7 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_CalendarBackwardHandler.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarBackwardHandler.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/CalendarBackwardHandler.java" project="objectlabkit">
<result date="2006-09-07" statvalue="100" type="cobertura-line"/>
@@ -774,7 +774,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_CalendarForwardHandler.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarForwardHandler.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/CalendarForwardHandler.java" project="objectlabkit">
<result date="2006-09-07" statvalue="100" type="cobertura-line"/>
@@ -811,7 +811,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_CalendarModifiedFollowingHandler.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarModifiedFollowingHandler.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/CalendarModifiedFollowingHandler.java" project="objectlabkit">
<result date="2006-09-07" statvalue="100" type="cobertura-line"/>
@@ -848,7 +848,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_CalendarModifiedPreceedingHandler.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarModifiedPreceedingHandler.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/CalendarModifiedPreceedingHandler.java" project="objectlabkit">
<result date="2006-09-07" statvalue="100" type="cobertura-line"/>
@@ -887,7 +887,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_DateBackwardHandler.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateBackwardHandler.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/DateBackwardHandler.java" project="objectlabkit">
<result date="2006-09-07" statvalue="100" type="cobertura-line"/>
@@ -926,7 +926,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_DateForwardHandler.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateForwardHandler.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/DateForwardHandler.java" project="objectlabkit">
<result date="2006-09-07" statvalue="90" type="cobertura-line"/>
@@ -963,7 +963,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_DateModifiedFollowingHandler.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateModifiedFollowingHandler.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/DateModifiedFollowingHandler.java" project="objectlabkit">
<result date="2006-09-07" statvalue="100" type="cobertura-line"/>
@@ -1000,7 +1000,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_DateModifiedPreceedingHandler.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateModifiedPreceedingHandler.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/DateModifiedPreceedingHandler.java" project="objectlabkit">
<result date="2006-09-07" statvalue="100" type="cobertura-line"/>
@@ -1039,7 +1039,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_CalendarDateCalculator.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarDateCalculator.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java" project="objectlabkit">
<result date="2006-09-09" statvalue="100" type="cobertura-line"/>
@@ -1074,7 +1074,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_CalendarIMMDateCalculator.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarIMMDateCalculator.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/CalendarIMMDateCalculator.java" project="objectlabkit">
<result date="2006-09-09" statvalue="100" type="cobertura-line"/>
@@ -1111,7 +1111,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_CalendarKitCalculatorsFactory.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarKitCalculatorsFactory.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java" project="objectlabkit">
<result date="2006-09-09" statvalue="100" type="cobertura-line"/>
@@ -1146,7 +1146,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_DateDateCalculator.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateDateCalculator.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/DateDateCalculator.java" project="objectlabkit">
<result date="2006-09-09" statvalue="100" type="cobertura-line"/>
@@ -1181,7 +1181,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_DateIMMDateCalculator.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateIMMDateCalculator.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/DateIMMDateCalculator.java" project="objectlabkit">
<result date="2006-09-09" statvalue="100" type="cobertura-line"/>
@@ -1218,7 +1218,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_DateKitCalculatorsFactory.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateKitCalculatorsFactory.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/DateKitCalculatorsFactory.java" project="objectlabkit">
<result date="2006-09-09" statvalue="100" type="cobertura-line"/>
@@ -1253,7 +1253,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_CalendarForwardUnlessNegativeHandler.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_CalendarForwardUnlessNegativeHandler.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/CalendarForwardUnlessNegativeHandler.java" project="objectlabkit">
<result date="2006-11-13" statvalue="100" type="cobertura-line"/>
@@ -1262,7 +1262,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_jdk_DateForwardUnlessNegativeHandler.java"
+ id="objectlabkit-jdk-net_objectlab_kit_datecalc_jdk_DateForwardUnlessNegativeHandler.java"
module="jdk"
path="net/objectlab/kit/datecalc/jdk/DateForwardUnlessNegativeHandler.java" project="objectlabkit">
<result date="2006-11-13" statvalue="100" type="cobertura-line"/>
Modified: trunk/datecalc-joda/qalab.xml
===================================================================
--- trunk/datecalc-joda/qalab.xml 2007-01-04 18:31:58 UTC (rev 235)
+++ trunk/datecalc-joda/qalab.xml 2007-01-04 21:11:42 UTC (rev 236)
@@ -183,7 +183,7 @@
project="objectlabkit" statvalue="100" type="cobertura-branch"/>
</summary>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_package.html"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_package.html"
module="joda"
path="net/objectlab/kit/datecalc/joda/package.html" project="objectlabkit">
<result date="2006-08-08" statvalue="1" type="checkstyle"/>
@@ -194,7 +194,7 @@
<result date="2006-08-23" statvalue="1" type="checkstyle"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_BaseDateCalculator.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_BaseDateCalculator.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/BaseDateCalculator.java" project="objectlabkit">
<result date="2006-08-08" statvalue="9" type="checkstyle"/>
@@ -223,7 +223,7 @@
<result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_DefaultDateCalculatorFactory.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_DefaultDateCalculatorFactory.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/DefaultDateCalculatorFactory.java" project="objectlabkit">
<result date="2006-08-08" statvalue="1" type="checkstyle"/>
@@ -248,7 +248,7 @@
<result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_DefaultPeriodCountCalculator.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_DefaultPeriodCountCalculator.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/DefaultPeriodCountCalculator.java" project="objectlabkit">
<result date="2006-08-08" statvalue="31" type="checkstyle"/>
@@ -275,7 +275,7 @@
<result date="2006-08-28" statvalue="84" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_JodaWorkingWeek.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_JodaWorkingWeek.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/JodaWorkingWeek.java" project="objectlabkit">
<result date="2006-08-08" statvalue="1" type="checkstyle"/>
@@ -338,7 +338,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_BackwardHandler.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_BackwardHandler.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/BackwardHandler.java" project="objectlabkit">
<result date="2006-08-08" statvalue="28" type="cobertura-line"/>
@@ -356,7 +356,7 @@
<result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_DateCalculator.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_DateCalculator.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/DateCalculator.java" project="objectlabkit">
<result date="2006-08-08" statvalue="100" type="cobertura-line"/>
@@ -371,7 +371,7 @@
<result date="2006-08-20" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_DateCalculatorFactory.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_DateCalculatorFactory.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/DateCalculatorFactory.java" project="objectlabkit">
<result date="2006-08-08" statvalue="100" type="cobertura-line"/>
@@ -390,7 +390,7 @@
<result date="2006-08-24" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_ForwardHandler.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_ForwardHandler.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/ForwardHandler.java" project="objectlabkit">
<result date="2006-08-08" statvalue="100" type="cobertura-line"/>
@@ -411,7 +411,7 @@
<result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_HolidayHandler.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_HolidayHandler.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/HolidayHandler.java" project="objectlabkit">
<result date="2006-08-08" statvalue="100" type="cobertura-line"/>
@@ -426,7 +426,7 @@
<result date="2006-08-20" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_PeriodCountCalculator.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_PeriodCountCalculator.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/PeriodCountCalculator.java" project="objectlabkit">
<result date="2006-08-08" statvalue="100" type="cobertura-line"/>
@@ -445,7 +445,7 @@
<result date="2006-08-24" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_ModifiedFollowingHandler.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_ModifiedFollowingHandler.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/ModifiedFollowingHandler.java" project="objectlabkit">
<result date="2006-08-09" statvalue="16" type="cobertura-line"/>
@@ -460,7 +460,7 @@
<result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_ModifiedPreceedingHandler.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_ModifiedPreceedingHandler.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/ModifiedPreceedingHandler.java" project="objectlabkit">
<result date="2006-08-09" statvalue="16" type="cobertura-line"/>
@@ -475,14 +475,14 @@
<result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_ExcelDateUtil.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_ExcelDateUtil.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/ExcelDateUtil.java" project="objectlabkit">
<result date="2006-09-02" statvalue="4" type="checkstyle"/>
<result date="2006-09-04" statvalue="4" type="checkstyle"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_DefaultLocalDateCalculatorFactory.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_DefaultLocalDateCalculatorFactory.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/DefaultLocalDateCalculatorFactory.java" project="objectlabkit">
<result date="2006-09-02" statvalue="100" type="cobertura-line"/>
@@ -497,7 +497,7 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_DefaultLocalDatePeriodCountCalculator.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_DefaultLocalDatePeriodCountCalculator.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/DefaultLocalDatePeriodCountCalculator.java" project="objectlabkit">
<result date="2006-09-02" statvalue="81" type="cobertura-line"/>
@@ -512,7 +512,7 @@
<result date="2006-09-07" statvalue="84" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_DefaultYearMonthDayCalculatorFactory.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_DefaultYearMonthDayCalculatorFactory.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/DefaultYearMonthDayCalculatorFactory.java" project="objectlabkit">
<result date="2006-09-02" statvalue="94" type="cobertura-line"/>
@@ -527,7 +527,7 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_DefaultYearMonthDayPeriodCountCalculator.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_DefaultYearMonthDayPeriodCountCalculator.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/DefaultYearMonthDayPeriodCountCalculator.java" project="objectlabkit">
<result date="2006-09-02" statvalue="40" type="cobertura-line"/>
@@ -542,7 +542,7 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_HolidayHandlerYearMonthDayWrapper.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_HolidayHandlerYearMonthDayWrapper.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/HolidayHandlerYearMonthDayWrapper.java" project="objectlabkit">
<result date="2006-09-02" statvalue="83" type="cobertura-line"/>
@@ -585,7 +585,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_LocalDateBackwardHandler.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_LocalDateBackwardHandler.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/LocalDateBackwardHandler.java" project="objectlabkit">
<result date="2006-09-02" statvalue="100" type="cobertura-line"/>
@@ -628,7 +628,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_LocalDateCalculator.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_LocalDateCalculator.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/LocalDateCalculator.java" project="objectlabkit">
<result date="2006-09-02" statvalue="100" type="cobertura-line"/>
@@ -672,7 +672,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_LocalDateForwardHandler.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_LocalDateForwardHandler.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/LocalDateForwardHandler.java" project="objectlabkit">
<result date="2006-09-02" statvalue="100" type="cobertura-line"/>
@@ -715,7 +715,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_LocalDateModifiedFollowingHandler.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_LocalDateModifiedFollowingHandler.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingHandler.java" project="objectlabkit">
<result date="2006-09-02" statvalue="100" type="cobertura-line"/>
@@ -758,7 +758,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_LocalDateModifiedPreceedingHandler.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_LocalDateModifiedPreceedingHandler.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingHandler.java" project="objectlabkit">
<result date="2006-09-02" statvalue="100" type="cobertura-line"/>
@@ -801,7 +801,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_YearMonthDayBackwardHandler.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_YearMonthDayBackwardHandler.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/YearMonthDayBackwardHandler.java" project="objectlabkit">
<result date="2006-09-02" statvalue="100" type="cobertura-line"/>
@@ -844,7 +844,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_YearMonthDayDateCalculator.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_YearMonthDayDateCalculator.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java" project="objectlabkit">
<result date="2006-09-02" statvalue="78" type="cobertura-line"/>
@@ -887,7 +887,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_YearMonthDayForwardHandler.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_YearMonthDayForwardHandler.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/YearMonthDayForwardHandler.java" project="objectlabkit">
<result date="2006-09-02" statvalue="100" type="cobertura-line"/>
@@ -930,7 +930,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_YearMonthDayModifiedFollowingHandler.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_YearMonthDayModifiedFollowingHandler.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingHandler.java" project="objectlabkit">
<result date="2006-09-02" statvalue="100" type="cobertura-line"/>
@@ -973,7 +973,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_YearMonthDayModifiedPreceedingHandler.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_YearMonthDayModifiedPreceedingHandler.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPreceedingHandler.java" project="objectlabkit">
<result date="2006-09-02" statvalue="100" type="cobertura-line"/>
@@ -1016,7 +1016,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_JodaExcelDateUtil.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_JodaExcelDateUtil.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/JodaExcelDateUtil.java" project="objectlabkit">
<result date="2006-09-05" statvalue="85" type="cobertura-line"/>
@@ -1055,7 +1055,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_LocalDateIMMDateCalculator.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_LocalDateIMMDateCalculator.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/LocalDateIMMDateCalculator.java" project="objectlabkit">
<result date="2006-09-06" statvalue="100" type="cobertura-line"/>
@@ -1094,7 +1094,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_YearMonthDayIMMDateCalculator.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_YearMonthDayIMMDateCalculator.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/YearMonthDayIMMDateCalculator.java" project="objectlabkit">
<result date="2006-09-06" statvalue="100" type="cobertura-line"/>
@@ -1133,7 +1133,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_LocalDateKitCalculatorsFactory.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_LocalDateKitCalculatorsFactory.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/LocalDateKitCalculatorsFactory.java" project="objectlabkit">
<result date="2006-09-09" statvalue="100" type="cobertura-line"/>
@@ -1166,7 +1166,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_LocalDatePeriodCountCalculator.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_LocalDatePeriodCountCalculator.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculator.java" project="objectlabkit">
<result date="2006-09-09" statvalue="81" type="cobertura-line"/>
@@ -1199,7 +1199,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_YearMonthDayKitCalculatorsFactory.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_YearMonthDayKitCalculatorsFactory.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/YearMonthDayKitCalculatorsFactory.java" project="objectlabkit">
<result date="2006-09-09" statvalue="100" type="cobertura-line"/>
@@ -1232,7 +1232,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_YearMonthDayPeriodCountCalculator.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_YearMonthDayPeriodCountCalculator.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/YearMonthDayPeriodCountCalculator.java" project="objectlabkit">
<result date="2006-09-09" statvalue="100" type="cobertura-line"/>
@@ -1265,7 +1265,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_LocalDateForwardUnlessNegativeHandler.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_LocalDateForwardUnlessNegativeHandler.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/LocalDateForwardUnlessNegativeHandler.java" project="objectlabkit">
<result date="2006-11-13" statvalue="2" type="checkstyle"/>
@@ -1276,7 +1276,7 @@
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
- id="default-default-net_objectlab_kit_datecalc_joda_YearMonthDayForwardUnlessNegativeHandler.java"
+ id="objectlabkit-joda-net_objectlab_kit_datecalc_joda_YearMonthDayForwardUnlessNegativeHandler.java"
module="joda"
path="net/objectlab/kit/datecalc/joda/YearMonthDayForwardUnlessNegativeHandler.java" project="objectlabkit">
<result date="2006-11-13" statvalue="100" type="cobertura-line"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2007-01-04 18:31:58
|
Revision: 235
http://svn.sourceforge.net/objectlabkit/?rev=235&view=rev
Author: benoitx
Date: 2007-01-04 10:31:58 -0800 (Thu, 04 Jan 2007)
Log Message:
-----------
[Bug 1575498] Suggested by Paul Hill (thanks). Introduction of HolidayCalendar as a replacement to the simplistic Set<E> for holidays (deprecated).
The HolidayCalendar contains a set of holidays but also 2 boundaries early and late which define the VALID set of holidays.
e.g. last holiday for UK in 2006 is 26 Dec 2006 but that set should be VALID until Dec 31 2006.
Re-organised code to use only immutable Holiday calendars internally.
Modified Paths:
--------------
trunk/datecalc-common/qalab.xml
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractKitCalculatorsFactory.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculator.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DefaultHolidayCalendar.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/ExcelDateUtil.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/HolidayCalendar.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/KitCalculatorsFactory.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/Utils.java
trunk/datecalc-common/src/site/navigation.xml
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractBackwardDateCalculatorTest.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorCombinationTest.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactoryTest.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardDateCalculatorTest.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardUnlessNegativeCalculatorTest.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedFollowingDateCalculatorTest.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedPreceedingDateCalculatorTest.java
trunk/datecalc-jdk/qalab.xml
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateDateCalculator.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateKitCalculatorsFactory.java
trunk/datecalc-jdk/src/site/navigation.xml
trunk/datecalc-joda/qalab.xml
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateCalculator.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateForwardUnlessNegativeHandler.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateKitCalculatorsFactory.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayKitCalculatorsFactory.java
trunk/datecalc-joda/src/site/navigation.xml
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayBackwardDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculatorCombinationTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardUnlessNegativeDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPrecedingDateCalculatorTest.java
trunk/src/site/navigation.xml
Added Paths:
-----------
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/ImmutableHolidayCalendar.java
Modified: trunk/datecalc-common/qalab.xml
===================================================================
--- trunk/datecalc-common/qalab.xml 2007-01-04 15:33:23 UTC (rev 234)
+++ trunk/datecalc-common/qalab.xml 2007-01-04 18:31:58 UTC (rev 235)
@@ -21,155 +21,161 @@
]>
<qalab version="1.2">
<summary>
- <summaryresult date="2006-08-08" filecount="7" module="default"
- project="default" statvalue="5" type="checkstyle"/>
- <summaryresult date="2006-08-08" filecount="2" module="default"
- project="default" statvalue="3" type="pmd"/>
- <summaryresult date="2006-08-08" filecount="1" module="default"
- project="default" statvalue="1" type="findbugs"/>
- <summaryresult date="2006-08-08" filecount="6" module="default"
- project="default" statvalue="47" type="cobertura-line"/>
- <summaryresult date="2006-08-08" filecount="6" module="default"
- project="default" statvalue="57" type="cobertura-branch"/>
- <summaryresult date="2006-08-09" filecount="7" module="default"
- project="default" statvalue="5" type="checkstyle"/>
- <summaryresult date="2006-08-09" filecount="6" module="default"
- project="default" statvalue="86" type="cobertura-line"/>
- <summaryresult date="2006-08-09" filecount="6" module="default"
- project="default" statvalue="91" type="cobertura-branch"/>
- <summaryresult date="2006-08-10" filecount="7" module="default"
- project="default" statvalue="4" type="checkstyle"/>
- <summaryresult date="2006-08-10" filecount="6" module="default"
- project="default" statvalue="90" type="cobertura-line"/>
- <summaryresult date="2006-08-10" filecount="6" module="default"
- project="default" statvalue="100" type="cobertura-branch"/>
- <summaryresult date="2006-08-19" filecount="7" module="default"
- project="default" statvalue="1" type="checkstyle"/>
- <summaryresult date="2006-08-19" filecount="6" module="default"
- project="default" statvalue="91" type="cobertura-line"/>
- <summaryresult date="2006-08-19" filecount="6" module="default"
- project="default" statvalue="96" type="cobertura-branch"/>
- <summaryresult date="2006-08-20" filecount="7" module="default"
- project="default" statvalue="1" type="checkstyle"/>
- <summaryresult date="2006-08-20" filecount="6" module="default"
- project="default" statvalue="90" type="cobertura-line"/>
- <summaryresult date="2006-08-20" filecount="6" module="default"
- project="default" statvalue="100" type="cobertura-branch"/>
- <summaryresult date="2006-08-23" filecount="10" module="default"
- project="default" statvalue="25" type="checkstyle"/>
- <summaryresult date="2006-08-23" filecount="9" module="default"
- project="default" statvalue="74" type="cobertura-line"/>
- <summaryresult date="2006-08-23" filecount="9" module="default"
- project="default" statvalue="87" type="cobertura-branch"/>
- <summaryresult date="2006-08-24" filecount="10" module="default"
- project="default" statvalue="1" type="checkstyle"/>
- <summaryresult date="2006-08-24" filecount="9" module="default"
- project="default" statvalue="62" type="cobertura-line"/>
- <summaryresult date="2006-08-24" filecount="9" module="default"
- project="default" statvalue="65" type="cobertura-branch"/>
- <summaryresult date="2006-08-28" filecount="13" module="default"
- project="default" statvalue="3" type="checkstyle"/>
- <summaryresult date="2006-08-28" filecount="12" module="default"
- project="default" statvalue="60" type="cobertura-line"/>
- <summaryresult date="2006-08-28" filecount="12" module="default"
- project="default" statvalue="65" type="cobertura-branch"/>
- <summaryresult date="2006-09-02" filecount="13" module="default"
- project="default" statvalue="9" type="checkstyle"/>
- <summaryresult date="2006-09-02" filecount="12" module="default"
- project="default" statvalue="59" type="cobertura-line"/>
- <summaryresult date="2006-09-02" filecount="12" module="default"
- project="default" statvalue="61" type="cobertura-branch"/>
- <summaryresult date="2006-09-04" filecount="15" module="default"
- project="default" statvalue="12" type="checkstyle"/>
- <summaryresult date="2006-09-04" filecount="1" module="default"
- project="default" statvalue="1" type="findbugs"/>
- <summaryresult date="2006-09-04" filecount="14" module="default"
- project="default" statvalue="61" type="cobertura-line"/>
- <summaryresult date="2006-09-04" filecount="14" module="default"
- project="default" statvalue="64" type="cobertura-branch"/>
- <summaryresult date="2006-09-05" filecount="16" module="default"
- project="default" statvalue="9" type="checkstyle"/>
- <summaryresult date="2006-09-05" filecount="1" module="default"
- project="default" statvalue="1" type="findbugs"/>
- <summaryresult date="2006-09-05" filecount="15" module="default"
- project="default" statvalue="63" type="cobertura-line"/>
- <summaryresult date="2006-09-05" filecount="15" module="default"
- project="default" statvalue="67" type="cobertura-branch"/>
- <summaryresult date="2006-09-06" filecount="18" module="default"
- project="default" statvalue="1" type="checkstyle"/>
- <summaryresult date="2006-09-06" filecount="17" module="default"
- project="default" statvalue="66" type="cobertura-line"/>
- <summaryresult date="2006-09-06" filecount="17" module="default"
- project="default" statvalue="68" type="cobertura-branch"/>
- <summaryresult date="2006-09-07" filecount="17" module="default"
- project="default" statvalue="64" type="cobertura-line"/>
- <summaryresult date="2006-09-07" filecount="17" module="default"
- project="default" statvalue="64" type="cobertura-branch"/>
- <summaryresult date="2006-09-09" filecount="17" module="default"
- project="default" statvalue="63" type="cobertura-line"/>
- <summaryresult date="2006-09-09" filecount="17" module="default"
- project="default" statvalue="64" type="cobertura-branch"/>
- <summaryresult date="2006-09-12" filecount="17" module="default"
- project="default" statvalue="59" type="cobertura-line"/>
- <summaryresult date="2006-09-12" filecount="17" module="default"
- project="default" statvalue="62" type="cobertura-branch"/>
- <summaryresult date="2006-09-14" filecount="17" module="default"
- project="default" statvalue="57" type="cobertura-line"/>
- <summaryresult date="2006-09-14" filecount="17" module="default"
- project="default" statvalue="60" type="cobertura-branch"/>
- <summaryresult date="2006-09-18" filecount="17" module="default"
- project="default" statvalue="57" type="cobertura-line"/>
- <summaryresult date="2006-09-18" filecount="17" module="default"
- project="default" statvalue="60" type="cobertura-branch"/>
- <summaryresult date="2006-09-20" filecount="17" module="default"
- project="default" statvalue="57" type="cobertura-line"/>
- <summaryresult date="2006-09-20" filecount="17" module="default"
- project="default" statvalue="60" type="cobertura-branch"/>
- <summaryresult date="2006-09-21" filecount="17" module="default"
- project="default" statvalue="57" type="cobertura-line"/>
- <summaryresult date="2006-09-21" filecount="17" module="default"
- project="default" statvalue="60" type="cobertura-branch"/>
- <summaryresult date="2006-09-22" filecount="17" module="default"
- project="default" statvalue="57" type="cobertura-line"/>
- <summaryresult date="2006-09-22" filecount="17" module="default"
- project="default" statvalue="60" type="cobertura-branch"/>
- <summaryresult date="2006-10-10" filecount="17" module="default"
- project="default" statvalue="58" type="cobertura-line"/>
- <summaryresult date="2006-10-10" filecount="17" module="default"
- project="default" statvalue="60" type="cobertura-branch"/>
- <summaryresult date="2006-10-11" filecount="17" module="default"
- project="default" statvalue="58" type="cobertura-line"/>
- <summaryresult date="2006-10-11" filecount="17" module="default"
- project="default" statvalue="60" type="cobertura-branch"/>
- <summaryresult date="2006-10-12" filecount="17" module="default"
- project="default" statvalue="58" type="cobertura-line"/>
- <summaryresult date="2006-10-12" filecount="17" module="default"
- project="default" statvalue="60" type="cobertura-branch"/>
- <summaryresult date="2006-10-13" filecount="17" module="default"
- project="default" statvalue="58" type="cobertura-line"/>
- <summaryresult date="2006-10-13" filecount="17" module="default"
- project="default" statvalue="60" type="cobertura-branch"/>
- <summaryresult date="2006-10-14" filecount="17" module="default"
- project="default" statvalue="58" type="cobertura-line"/>
- <summaryresult date="2006-10-14" filecount="17" module="default"
- project="default" statvalue="60" type="cobertura-branch"/>
- <summaryresult date="2006-10-15" filecount="17" module="default"
- project="default" statvalue="58" type="cobertura-line"/>
- <summaryresult date="2006-10-15" filecount="17" module="default"
- project="default" statvalue="60" type="cobertura-branch"/>
- <summaryresult date="2006-11-13" filecount="17" module="default"
- project="default" statvalue="56" type="cobertura-line"/>
- <summaryresult date="2006-11-13" filecount="17" module="default"
- project="default" statvalue="60" type="cobertura-branch"/>
- <summaryresult date="2007-01-03" filecount="19" module="default"
- project="default" statvalue="54" type="cobertura-line"/>
- <summaryresult date="2007-01-03" filecount="19" module="default"
- project="default" statvalue="58" type="cobertura-branch"/>
+ <summaryresult date="2006-08-08" filecount="7" module="common"
+ project="objectlabkit" statvalue="5" type="checkstyle"/>
+ <summaryresult date="2006-08-08" filecount="2" module="common"
+ project="objectlabkit" statvalue="3" type="pmd"/>
+ <summaryresult date="2006-08-08" filecount="1" module="common"
+ project="objectlabkit" statvalue="1" type="findbugs"/>
+ <summaryresult date="2006-08-08" filecount="6" module="common"
+ project="objectlabkit" statvalue="47" type="cobertura-line"/>
+ <summaryresult date="2006-08-08" filecount="6" module="common"
+ project="objectlabkit" statvalue="57" type="cobertura-branch"/>
+ <summaryresult date="2006-08-09" filecount="7" module="common"
+ project="objectlabkit" statvalue="5" type="checkstyle"/>
+ <summaryresult date="2006-08-09" filecount="6" module="common"
+ project="objectlabkit" statvalue="86" type="cobertura-line"/>
+ <summaryresult date="2006-08-09" filecount="6" module="common"
+ project="objectlabkit" statvalue="91" type="cobertura-branch"/>
+ <summaryresult date="2006-08-10" filecount="7" module="common"
+ project="objectlabkit" statvalue="4" type="checkstyle"/>
+ <summaryresult date="2006-08-10" filecount="6" module="common"
+ project="objectlabkit" statvalue="90" type="cobertura-line"/>
+ <summaryresult date="2006-08-10" filecount="6" module="common"
+ project="objectlabkit" statvalue="100" type="cobertura-branch"/>
+ <summaryresult date="2006-08-19" filecount="7" module="common"
+ project="objectlabkit" statvalue="1" type="checkstyle"/>
+ <summaryresult date="2006-08-19" filecount="6" module="common"
+ project="objectlabkit" statvalue="91" type="cobertura-line"/>
+ <summaryresult date="2006-08-19" filecount="6" module="common"
+ project="objectlabkit" statvalue="96" type="cobertura-branch"/>
+ <summaryresult date="2006-08-20" filecount="7" module="common"
+ project="objectlabkit" statvalue="1" type="checkstyle"/>
+ <summaryresult date="2006-08-20" filecount="6" module="common"
+ project="objectlabkit" statvalue="90" type="cobertura-line"/>
+ <summaryresult date="2006-08-20" filecount="6" module="common"
+ project="objectlabkit" statvalue="100" type="cobertura-branch"/>
+ <summaryresult date="2006-08-23" filecount="10" module="common"
+ project="objectlabkit" statvalue="25" type="checkstyle"/>
+ <summaryresult date="2006-08-23" filecount="9" module="common"
+ project="objectlabkit" statvalue="74" type="cobertura-line"/>
+ <summaryresult date="2006-08-23" filecount="9" module="common"
+ project="objectlabkit" statvalue="87" type="cobertura-branch"/>
+ <summaryresult date="2006-08-24" filecount="10" module="common"
+ project="objectlabkit" statvalue="1" type="checkstyle"/>
+ <summaryresult date="2006-08-24" filecount="9" module="common"
+ project="objectlabkit" statvalue="62" type="cobertura-line"/>
+ <summaryresult date="2006-08-24" filecount="9" module="common"
+ project="objectlabkit" statvalue="65" type="cobertura-branch"/>
+ <summaryresult date="2006-08-28" filecount="13" module="common"
+ project="objectlabkit" statvalue="3" type="checkstyle"/>
+ <summaryresult date="2006-08-28" filecount="12" module="common"
+ project="objectlabkit" statvalue="60" type="cobertura-line"/>
+ <summaryresult date="2006-08-28" filecount="12" module="common"
+ project="objectlabkit" statvalue="65" type="cobertura-branch"/>
+ <summaryresult date="2006-09-02" filecount="13" module="common"
+ project="objectlabkit" statvalue="9" type="checkstyle"/>
+ <summaryresult date="2006-09-02" filecount="12" module="common"
+ project="objectlabkit" statvalue="59" type="cobertura-line"/>
+ <summaryresult date="2006-09-02" filecount="12" module="common"
+ project="objectlabkit" statvalue="61" type="cobertura-branch"/>
+ <summaryresult date="2006-09-04" filecount="15" module="common"
+ project="objectlabkit" statvalue="12" type="checkstyle"/>
+ <summaryresult date="2006-09-04" filecount="1" module="common"
+ project="objectlabkit" statvalue="1" type="findbugs"/>
+ <summaryresult date="2006-09-04" filecount="14" module="common"
+ project="objectlabkit" statvalue="61" type="cobertura-line"/>
+ <summaryresult date="2006-09-04" filecount="14" module="common"
+ project="objectlabkit" statvalue="64" type="cobertura-branch"/>
+ <summaryresult date="2006-09-05" filecount="16" module="common"
+ project="objectlabkit" statvalue="9" type="checkstyle"/>
+ <summaryresult date="2006-09-05" filecount="1" module="common"
+ project="objectlabkit" statvalue="1" type="findbugs"/>
+ <summaryresult date="2006-09-05" filecount="15" module="common"
+ project="objectlabkit" statvalue="63" type="cobertura-line"/>
+ <summaryresult date="2006-09-05" filecount="15" module="common"
+ project="objectlabkit" statvalue="67" type="cobertura-branch"/>
+ <summaryresult date="2006-09-06" filecount="18" module="common"
+ project="objectlabkit" statvalue="1" type="checkstyle"/>
+ <summaryresult date="2006-09-06" filecount="17" module="common"
+ project="objectlabkit" statvalue="66" type="cobertura-line"/>
+ <summaryresult date="2006-09-06" filecount="17" module="common"
+ project="objectlabkit" statvalue="68" type="cobertura-branch"/>
+ <summaryresult date="2006-09-07" filecount="17" module="common"
+ project="objectlabkit" statvalue="64" type="cobertura-line"/>
+ <summaryresult date="2006-09-07" filecount="17" module="common"
+ project="objectlabkit" statvalue="64" type="cobertura-branch"/>
+ <summaryresult date="2006-09-09" filecount="17" module="common"
+ project="objectlabkit" statvalue="63" type="cobertura-line"/>
+ <summaryresult date="2006-09-09" filecount="17" module="common"
+ project="objectlabkit" statvalue="64" type="cobertura-branch"/>
+ <summaryresult date="2006-09-12" filecount="17" module="common"
+ project="objectlabkit" statvalue="59" type="cobertura-line"/>
+ <summaryresult date="2006-09-12" filecount="17" module="common"
+ project="objectlabkit" statvalue="62" type="cobertura-branch"/>
+ <summaryresult date="2006-09-14" filecount="17" module="common"
+ project="objectlabkit" statvalue="57" type="cobertura-line"/>
+ <summaryresult date="2006-09-14" filecount="17" module="common"
+ project="objectlabkit" statvalue="60" type="cobertura-branch"/>
+ <summaryresult date="2006-09-18" filecount="17" module="common"
+ project="objectlabkit" statvalue="57" type="cobertura-line"/>
+ <summaryresult date="2006-09-18" filecount="17" module="common"
+ project="objectlabkit" statvalue="60" type="cobertura-branch"/>
+ <summaryresult date="2006-09-20" filecount="17" module="common"
+ project="objectlabkit" statvalue="57" type="cobertura-line"/>
+ <summaryresult date="2006-09-20" filecount="17" module="common"
+ project="objectlabkit" statvalue="60" type="cobertura-branch"/>
+ <summaryresult date="2006-09-21" filecount="17" module="common"
+ project="objectlabkit" statvalue="57" type="cobertura-line"/>
+ <summaryresult date="2006-09-21" filecount="17" module="common"
+ project="objectlabkit" statvalue="60" type="cobertura-branch"/>
+ <summaryresult date="2006-09-22" filecount="17" module="common"
+ project="objectlabkit" statvalue="57" type="cobertura-line"/>
+ <summaryresult date="2006-09-22" filecount="17" module="common"
+ project="objectlabkit" statvalue="60" type="cobertura-branch"/>
+ <summaryresult date="2006-10-10" filecount="17" module="common"
+ project="objectlabkit" statvalue="58" type="cobertura-line"/>
+ <summaryresult date="2006-10-10" filecount="17" module="common"
+ project="objectlabkit" statvalue="60" type="cobertura-branch"/>
+ <summaryresult date="2006-10-11" filecount="17" module="common"
+ project="objectlabkit" statvalue="58" type="cobertura-line"/>
+ <summaryresult date="2006-10-11" filecount="17" module="common"
+ project="objectlabkit" statvalue="60" type="cobertura-branch"/>
+ <summaryresult date="2006-10-12" filecount="17" module="common"
+ project="objectlabkit" statvalue="58" type="cobertura-line"/>
+ <summaryresult date="2006-10-12" filecount="17" module="common"
+ project="objectlabkit" statvalue="60" type="cobertura-branch"/>
+ <summaryresult date="2006-10-13" filecount="17" module="common"
+ project="objectlabkit" statvalue="58" type="cobertura-line"/>
+ <summaryresult date="2006-10-13" filecount="17" module="common"
+ project="objectlabkit" statvalue="60" type="cobertura-branch"/>
+ <summaryresult date="2006-10-14" filecount="17" module="common"
+ project="objectlabkit" statvalue="58" type="cobertura-line"/>
+ <summaryresult date="2006-10-14" filecount="17" module="common"
+ project="objectlabkit" statvalue="60" type="cobertura-branch"/>
+ <summaryresult date="2006-10-15" filecount="17" module="common"
+ project="objectlabkit" statvalue="58" type="cobertura-line"/>
+ <summaryresult date="2006-10-15" filecount="17" module="common"
+ project="objectlabkit" statvalue="60" type="cobertura-branch"/>
+ <summaryresult date="2006-11-13" filecount="17" module="common"
+ project="objectlabkit" statvalue="56" type="cobertura-line"/>
+ <summaryresult date="2006-11-13" filecount="17" module="common"
+ project="objectlabkit" statvalue="60" type="cobertura-branch"/>
+ <summaryresult date="2007-01-03" filecount="19" module="common"
+ project="objectlabkit" statvalue="54" type="cobertura-line"/>
+ <summaryresult date="2007-01-03" filecount="19" module="common"
+ project="objectlabkit" statvalue="58" type="cobertura-branch"/>
+ <summaryresult date="2007-01-04" filecount="21" module="common"
+ project="objectlabkit" statvalue="1" type="checkstyle"/>
+ <summaryresult date="2007-01-04" filecount="20" module="common"
+ project="objectlabkit" statvalue="34" type="cobertura-line"/>
+ <summaryresult date="2007-01-04" filecount="20" module="common"
+ project="objectlabkit" statvalue="30" type="cobertura-branch"/>
</summary>
<file
id="default-default-net_objectlab_kit_datecalc_common_package.html"
- module="default"
- path="net/objectlab/kit/datecalc/common/package.html" project="default">
+ module="common"
+ path="net/objectlab/kit/datecalc/common/package.html" project="objectlabkit">
<result date="2006-08-08" statvalue="1" type="checkstyle"/>
<result date="2006-08-09" statvalue="1" type="checkstyle"/>
<result date="2006-08-10" statvalue="1" type="checkstyle"/>
@@ -184,8 +190,8 @@
</file>
<file
id="default-default-net_objectlab_kit_datecalc_common_Tenor.java"
- module="default"
- path="net/objectlab/kit/datecalc/common/Tenor.java" project="default">
+ module="common"
+ path="net/objectlab/kit/datecalc/common/Tenor.java" project="objectlabkit">
<result date="2006-08-08" statvalue="1" type="checkstyle"/>
<result date="2006-08-08" statvalue="55" type="cobertura-line"/>
<result date="2006-08-08" statvalue="43" type="cobertura-branch"/>
@@ -248,8 +254,8 @@
</file>
<file
id="default-default-net_objectlab_kit_datecalc_common_WorkingWeek.java"
- module="default"
- path="net/objectlab/kit/datecalc/common/WorkingWeek.java" project="default">
+ module="common"
+ path="net/objectlab/kit/datecalc/common/WorkingWeek.java" project="objectlabkit">
<result date="2006-08-08" statvalue="3" type="checkstyle"/>
<result date="2006-08-08" statvalue="1" type="findbugs"/>
<result date="2006-08-08" statvalue="82" type="cobertura-line"/>
@@ -317,8 +323,8 @@
</file>
<file
id="default-default-net_objectlab_kit_datecalc_common_TenorCode.java"
- module="default"
- path="net/objectlab/kit/datecalc/common/TenorCode.java" project="default">
+ module="common"
+ path="net/objectlab/kit/datecalc/common/TenorCode.java" project="objectlabkit">
<result date="2006-08-08" statvalue="100" type="cobertura-line"/>
<result date="2006-08-08" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-09" statvalue="100" type="cobertura-line"/>
@@ -378,8 +384,8 @@
</file>
<file
id="default-default-net_objectlab_kit_datecalc_common_HolidayHandlerType.java"
- module="default"
- path="net/objectlab/kit/datecalc/common/HolidayHandlerType.java" project="default">
+ module="common"
+ path="net/objectlab/kit/datecalc/common/HolidayHandlerType.java" project="objectlabkit">
<result date="2006-08-08" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-10" statvalue="100" type="cobertura-branch"/>
@@ -411,8 +417,8 @@
</file>
<file
id="default-default-net_objectlab_kit_datecalc_common_PeriodCountBasis.java"
- module="default"
- path="net/objectlab/kit/datecalc/common/PeriodCountBasis.java" project="default">
+ module="common"
+ path="net/objectlab/kit/datecalc/common/PeriodCountBasis.java" project="objectlabkit">
<result date="2006-08-08" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-10" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-20" statvalue="100" type="cobertura-branch"/>
@@ -442,8 +448,8 @@
</file>
<file
id="default-default-net_objectlab_kit_datecalc_common_StandardTenor.java"
- module="default"
- path="net/objectlab/kit/datecalc/common/StandardTenor.java" project="default">
+ module="common"
+ path="net/objectlab/kit/datecalc/common/StandardTenor.java" project="objectlabkit">
<result date="2006-08-08" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-09" statvalue="92" type="cobertura-line"/>
<result date="2006-08-09" statvalue="100" type="cobertura-branch"/>
@@ -502,18 +508,18 @@
</file>
<file
id="default-default-net_objectlab_kit_datecalc_common_AbstractDateCalculator.java"
- module="default"
- path="net/objectlab/kit/datecalc/common/AbstractDateCalculator.java" project="default">
+ module="common"
+ path="net/objectlab/kit/datecalc/common/AbstractDateCalculator.java" project="objectlabkit">
<result date="2006-08-23" statvalue="5" type="checkstyle"/>
</file>
<file
id="default-default-net_objectlab_kit_datecalc_common_DateCalculatorGeneric.java"
- module="default"
- path="net/objectlab/kit/datecalc/common/DateCalculatorGeneric.java" project="default"/>
+ module="common"
+ path="net/objectlab/kit/datecalc/common/DateCalculatorGeneric.java" project="objectlabkit"/>
<file
id="default-default-net_objectlab_kit_datecalc_common_DateCalculator.java"
- module="default"
- path="net/objectlab/kit/datecalc/common/DateCalculator.java" project="default">
+ module="common"
+ path="net/objectlab/kit/datecalc/common/DateCalculator.java" project="objectlabkit">
<result date="2006-08-23" statvalue="19" type="checkstyle"/>
<result date="2006-08-23" statvalue="100" type="cobertura-line"/>
<result date="2006-08-23" statvalue="100" type="cobertura-branch"/>
@@ -564,8 +570,8 @@
</file>
<file
id="default-default-net_objectlab_kit_datecalc_common_HolidayHandler.java"
- module="default"
- path="net/objectlab/kit/datecalc/common/HolidayHandler.java" project="default">
+ module="common"
+ path="net/objectlab/kit/datecalc/common/HolidayHandler.java" project="objectlabkit">
<result date="2006-08-23" statvalue="100" type="cobertura-line"/>
<result date="2006-08-23" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-24" statvalue="100" type="cobertura-line"/>
@@ -615,8 +621,8 @@
</file>
<file
id="default-default-net_objectlab_kit_datecalc_common_AbstractDateCalculatorFactory.java"
- module="default"
- path="net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactory.java" project="default">
+ module="common"
+ path="net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactory.java" project="objectlabkit">
<result date="2006-08-28" statvalue="2" type="checkstyle"/>
<result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-02" statvalue="2" type="checkstyle"/>
@@ -630,8 +636,8 @@
</file>
<file
id="default-default-net_objectlab_kit_datecalc_common_DateCalculatorFactory.java"
- module="default"
- path="net/objectlab/kit/datecalc/common/DateCalculatorFactory.java" project="default">
+ module="common"
+ path="net/objectlab/kit/datecalc/common/DateCalculatorFactory.java" project="objectlabkit">
<result date="2006-08-28" statvalue="100" type="cobertura-line"/>
<result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-02" statvalue="100" type="cobertura-line"/>
@@ -647,8 +653,8 @@
</file>
<file
id="default-default-net_objectlab_kit_datecalc_common_PeriodCountCalculator.java"
- module="default"
- path="net/objectlab/kit/datecalc/common/PeriodCountCalculator.java" project="default">
+ module="common"
+ path="net/objectlab/kit/datecalc/common/PeriodCountCalculator.java" project="objectlabkit">
<result date="2006-08-28" statvalue="100" type="cobertura-line"/>
<result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-02" statvalue="6" type="checkstyle"/>
@@ -697,8 +703,8 @@
</file>
<file
id="default-default-net_objectlab_kit_datecalc_common_Utils.java"
- module="default"
- path="net/objectlab/kit/datecalc/common/Utils.java" project="default">
+ module="common"
+ path="net/objectlab/kit/datecalc/common/Utils.java" project="objectlabkit">
<result date="2006-09-04" statvalue="2" type="checkstyle"/>
<result date="2006-09-04" statvalue="90" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
@@ -741,8 +747,8 @@
</file>
<file
id="default-default-net_objectlab_kit_datecalc_common_IMMPeriod.java"
- module="default"
- path="net/objectlab/kit/datecalc/common/IMMPeriod.java" project="default">
+ module="common"
+ path="net/objectlab/kit/datecalc/common/IMMPeriod.java" project="objectlabkit">
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
@@ -765,8 +771,8 @@
</file>
<file
id="default-default-net_objectlab_kit_datecalc_common_ExcelDateUtil.java"
- module="default"
- path="net/objectlab/kit/datecalc/common/ExcelDateUtil.java" project="default">
+ module="common"
+ path="net/objectlab/kit/datecalc/common/ExcelDateUtil.java" project="objectlabkit">
<result date="2006-09-05" statvalue="84" type="cobertura-line"/>
<result date="2006-09-05" statvalue="83" type="cobertura-branch"/>
<result date="2006-09-06" statvalue="93" type="cobertura-line"/>
@@ -806,8 +812,8 @@
</file>
<file
id="default-default-net_objectlab_kit_datecalc_common_IMMDateCalculator.java"
- module="default"
- path="net/objectlab/kit/datecalc/common/IMMDateCalculator.java" project="default">
+ module="common"
+ path="net/objectlab/kit/datecalc/common/IMMDateCalculator.java" project="objectlabkit">
<result date="2006-09-06" statvalue="100" type="cobertura-line"/>
<result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-07" statvalue="100" type="cobertura-line"/>
@@ -845,8 +851,8 @@
</file>
<file
id="default-default-net_objectlab_kit_datecalc_common_AbstractIMMDateCalculator.java"
- module="default"
- path="net/objectlab/kit/datecalc/common/AbstractIMMDateCalculator.java" project="default">
+ module="common"
+ path="net/objectlab/kit/datecalc/common/AbstractIMMDateCalculator.java" project="objectlabkit">
<result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
@@ -867,8 +873,8 @@
</file>
<file
id="default-default-net_objectlab_kit_datecalc_common_KitCalculatorsFactory.java"
- module="default"
- path="net/objectlab/kit/datecalc/common/KitCalculatorsFactory.java" project="default">
+ module="common"
+ path="net/objectlab/kit/datecalc/common/KitCalculatorsFactory.java" project="objectlabkit">
<result date="2006-09-09" statvalue="100" type="cobertura-line"/>
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
@@ -902,15 +908,143 @@
</file>
<file
id="default-default-net_objectlab_kit_datecalc_common_HolidayCalendar.java"
- module="default"
- path="net/objectlab/kit/datecalc/common/HolidayCalendar.java" project="default">
+ module="common"
+ path="net/objectlab/kit/datecalc/common/HolidayCalendar.java" project="objectlabkit">
<result date="2007-01-03" statvalue="100" type="cobertura-line"/>
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="default-default-net_objectlab_kit_datecalc_common_DefaultHolidayCalendar.java"
- module="default"
- path="net/objectlab/kit/datecalc/common/DefaultHolidayCalendar.java" project="default">
+ module="common"
+ path="net/objectlab/kit/datecalc/common/DefaultHolidayCalendar.java" project="objectlabkit">
<result date="2007-01-03" statvalue="100" type="cobertura-branch"/>
</file>
+ <file
+ id="default-default-net_objectlab_kit_datecalc_common_ImmutableHolidayCalendar.java"
+ module="common"
+ path="net/objectlab/kit/datecalc/common/ImmutableHolidayCalendar.java" project="objectlabkit"/>
+ <file
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_AbstractDateCalculator.java"
+ module="common"
+ path="net/objectlab/kit/datecalc/common/AbstractDateCalculator.java" project="objectlabkit">
+ <result date="2007-01-04" statvalue="1" type="checkstyle"/>
+ </file>
+ <file
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_DefaultHolidayCalendar.java"
+ module="common"
+ path="net/objectlab/kit/datecalc/common/DefaultHolidayCalendar.java" project="objectlabkit"/>
+ <file
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_ImmutableHolidayCalendar.java"
+ module="common"
+ path="net/objectlab/kit/datecalc/common/ImmutableHolidayCalendar.java" project="objectlabkit">
+ <result date="2007-01-04" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_DateCalculator.java"
+ module="common"
+ path="net/objectlab/kit/datecalc/common/DateCalculator.java" project="objectlabkit">
+ <result date="2007-01-04" statvalue="100" type="cobertura-line"/>
+ <result date="2007-01-04" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_ExcelDateUtil.java"
+ module="common"
+ path="net/objectlab/kit/datecalc/common/ExcelDateUtil.java" project="objectlabkit">
+ <result date="2007-01-04" statvalue="82" type="cobertura-line"/>
+ <result date="2007-01-04" statvalue="83" type="cobertura-branch"/>
+ </file>
+ <file
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_HolidayCalendar.java"
+ module="common"
+ path="net/objectlab/kit/datecalc/common/HolidayCalendar.java" project="objectlabkit">
+ <result date="2007-01-04" statvalue="100" type="cobertura-line"/>
+ <result date="2007-01-04" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_HolidayHandler.java"
+ module="common"
+ path="net/objectlab/kit/datecalc/common/HolidayHandler.java" project="objectlabkit">
+ <result date="2007-01-04" statvalue="100" type="cobertura-line"/>
+ <result date="2007-01-04" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_IMMDateCalculator.java"
+ module="common"
+ path="net/objectlab/kit/datecalc/common/IMMDateCalculator.java" project="objectlabkit">
+ <result date="2007-01-04" statvalue="100" type="cobertura-line"/>
+ <result date="2007-01-04" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_KitCalculatorsFactory.java"
+ module="common"
+ path="net/objectlab/kit/datecalc/common/KitCalculatorsFactory.java" project="objectlabkit">
+ <result date="2007-01-04" statvalue="100" type="cobertura-line"/>
+ <result date="2007-01-04" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_PeriodCountCalculator.java"
+ module="common"
+ path="net/objectlab/kit/datecalc/common/PeriodCountCalculator.java" project="objectlabkit">
+ <result date="2007-01-04" statvalue="100" type="cobertura-line"/>
+ <result date="2007-01-04" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_StandardTenor.java"
+ module="common"
+ path="net/objectlab/kit/datecalc/common/StandardTenor.java" project="objectlabkit">
+ <result date="2007-01-04" statvalue="91" type="cobertura-line"/>
+ <result date="2007-01-04" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_Tenor.java"
+ module="common"
+ path="net/objectlab/kit/datecalc/common/Tenor.java" project="objectlabkit">
+ <result date="2007-01-04" statvalue="100" type="cobertura-line"/>
+ <result date="2007-01-04" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_TenorCode.java"
+ module="common"
+ path="net/objectlab/kit/datecalc/common/TenorCode.java" project="objectlabkit">
+ <result date="2007-01-04" statvalue="100" type="cobertura-line"/>
+ <result date="2007-01-04" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_Utils.java"
+ module="common"
+ path="net/objectlab/kit/datecalc/common/Utils.java" project="objectlabkit">
+ <result date="2007-01-04" statvalue="76" type="cobertura-line"/>
+ <result date="2007-01-04" statvalue="85" type="cobertura-branch"/>
+ </file>
+ <file
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_WorkingWeek.java"
+ module="common"
+ path="net/objectlab/kit/datecalc/common/WorkingWeek.java" project="objectlabkit">
+ <result date="2007-01-04" statvalue="95" type="cobertura-line"/>
+ <result date="2007-01-04" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_AbstractIMMDateCalculator.java"
+ module="common"
+ path="net/objectlab/kit/datecalc/common/AbstractIMMDateCalculator.java" project="objectlabkit">
+ <result date="2007-01-04" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_HolidayHandlerType.java"
+ module="common"
+ path="net/objectlab/kit/datecalc/common/HolidayHandlerType.java" project="objectlabkit">
+ <result date="2007-01-04" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_IMMPeriod.java"
+ module="common"
+ path="net/objectlab/kit/datecalc/common/IMMPeriod.java" project="objectlabkit">
+ <result date="2007-01-04" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="objectlabkit-common-net_objectlab_kit_datecalc_common_PeriodCountBasis.java"
+ module="common"
+ path="net/objectlab/kit/datecalc/common/PeriodCountBasis.java" project="objectlabkit">
+ <result date="2007-01-04" statvalue="100" type="cobertura-branch"/>
+ </file>
</qalab>
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java 2007-01-04 15:33:23 UTC (rev 234)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java 2007-01-04 18:31:58 UTC (rev 235)
@@ -42,7 +42,7 @@
* but basically <code>Date</code> and <code>LocalDate</code> are the only
* viable values for it for now.
*
- * @author Marcin Jekot
+ * @author Marcin Jekot and Benoit Xhenseval
* @author $LastChangedBy$
* @version $Revision$ $Date$
*
@@ -62,18 +62,35 @@
private E currentBusinessDate;
- private Set<E> nonWorkingDays;
+ private HolidayCalendar<E> holidayCalendar;
private HolidayHandler<E> holidayHandler;
-
+
private int currentIncrement = 0;
- protected AbstractDateCalculator(final String name, final Set<E> nonWorkingDays, final HolidayHandler<E> holidayHandler) {
+ protected AbstractDateCalculator(final String name, final HolidayCalendar<E> holidayCalendar,
+ final HolidayHandler<E> holidayHandler) {
this.name = name;
- this.nonWorkingDays = nonWorkingDays;
+ if (holidayCalendar != null) {
+ this.holidayCalendar = new ImmutableHolidayCalendar<E>(holidayCalendar);
+ } else {
+ this.holidayCalendar = new ImmutableHolidayCalendar<E>(new DefaultHolidayCalendar<E>());
+ }
this.holidayHandler = holidayHandler;
}
+ public void setHolidayCalendar(final HolidayCalendar<E> calendar) {
+ if (calendar != null) {
+ if (calendar instanceof ImmutableHolidayCalendar) {
+ holidayCalendar = calendar;
+ } else {
+ holidayCalendar = new ImmutableHolidayCalendar<E>(calendar);
+ }
+ } else {
+ holidayCalendar = new ImmutableHolidayCalendar<E>(new DefaultHolidayCalendar<E>());
+ }
+ }
+
public String getName() {
return name;
}
@@ -102,15 +119,24 @@
return currentBusinessDate;
}
+ /**
+ * @deprecated should use getHolidayCalendar
+ */
+ @Deprecated
public Set<E> getNonWorkingDays() {
- return Collections.unmodifiableSet(nonWorkingDays);
+ return Collections.unmodifiableSet(holidayCalendar.getHolidays());
}
+ /**
+ * @deprecated use the HolidayCalendar
+ */
+ @Deprecated
public void setNonWorkingDays(final Set<E> holidays) {
if (holidays == null) {
- nonWorkingDays = Collections.emptySet();
+ final Set<E> col = Collections.emptySet();
+ holidayCalendar = new DefaultHolidayCalendar<E>(col);
} else {
- nonWorkingDays = holidays;
+ holidayCalendar = new DefaultHolidayCalendar<E>(holidays);
}
}
@@ -192,9 +218,19 @@
* is the given date a non working day?
*/
public boolean isNonWorkingDay(final E date) {
- return (isWeekend(date) || nonWorkingDays.contains(date));
+ if (date != null && (holidayCalendar.getEarlyBoundary() != null || holidayCalendar.getLateBoundary() != null)) {
+ checkBoundary(date);
+ }
+ return (isWeekend(date) || holidayCalendar.isHoliday(date));
}
+ /**
+ * This may throw an {@link IndexOutOfBoundsException} if the date is not within the
+ * boundaries.
+ * @param date
+ */
+ protected abstract void checkBoundary(E date);
+
public boolean isCurrentDateNonWorking() {
if (currentBusinessDate == null) {
currentBusinessDate = getToday();
@@ -207,6 +243,9 @@
if (holidayHandler != null && date != null) {
currentBusinessDate = holidayHandler.moveCurrentDate(this);
}
+ if (date != null && (holidayCalendar.getEarlyBoundary() != null || holidayCalendar.getLateBoundary() != null)) {
+ checkBoundary(date);
+ }
return currentBusinessDate;
}
@@ -262,14 +301,30 @@
}
final Set<E> newSet = new HashSet<E>();
- if (nonWorkingDays != null) {
- newSet.addAll(nonWorkingDays);
+ if (holidayCalendar != null) {
+ newSet.addAll(holidayCalendar.getHolidays());
}
- if (calculator.getNonWorkingDays() != null) {
- newSet.addAll(calculator.getNonWorkingDays());
+
+ final HolidayCalendar<E> calendarToCombine = calculator.getHolidayCalendar();
+ if (calendarToCombine.getEarlyBoundary() != null && holidayCalendar.getEarlyBoundary() == null
+ || calendarToCombine.getEarlyBoundary() == null && holidayCalendar.getEarlyBoundary() != null) {
+ throw new IllegalArgumentException("Both Calendar to be combined must either have each Early boundaries or None.");
}
- final DateCalculator<E> cal = createNewCalculator(getName() + "/" + calculator.getName(), getStartDate(), newSet,
+ if (calendarToCombine.getLateBoundary() != null && holidayCalendar.getLateBoundary() == null
+ || calendarToCombine.getLateBoundary() == null && holidayCalendar.getLateBoundary() != null) {
+ throw new IllegalArgumentException("Both Calendar to be combined must either have each Late boundaries or None.");
+ }
+
+ if (calendarToCombine.getHolidays() != null) {
+ newSet.addAll(calendarToCombine.getHolidays());
+ }
+
+ final HolidayCalendar<E> newCal = new DefaultHolidayCalendar<E>(newSet, compareDate(holidayCalendar.getEarlyBoundary(),
+ calendarToCombine.getEarlyBoundary(), false), compareDate(holidayCalendar.getLateBoundary(), calendarToCombine
+ .getLateBoundary(), true));
+
+ final DateCalculator<E> cal = createNewCalculator(getName() + "/" + calculator.getName(), getStartDate(), newCal,
holidayHandler);
return cal;
@@ -277,7 +332,9 @@
protected abstract E getToday();
- protected abstract DateCalculator<E> createNewCalculator(String calcName, E theStartDate, Set<E> holidays,
+ protected abstract E compareDate(E date1, E date2, boolean returnEarliest);
+
+ protected abstract DateCalculator<E> createNewCalculator(String calcName, E theStartDate, HolidayCalendar<E> holidays,
HolidayHandler<E> handler);
/**
@@ -290,9 +347,16 @@
/**
* @param currentIncrement The currentIncrement to set.
*/
- public void setCurrentIncrement(int currentIncrement) {
+ public void setCurrentIncrement(final int currentIncrement) {
this.currentIncrement = currentIncrement;
}
+
+ /**
+ * @return Returns the holidayCalendar.
+ */
+ public HolidayCalendar<E> getHolidayCalendar() {
+ return holidayCalendar;
+ }
}
/*
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractKitCalculatorsFactory.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractKitCalculatorsFactory.java 2007-01-04 15:33:23 UTC (rev 234)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractKitCalculatorsFactory.java 2007-01-04 18:31:58 UTC (rev 235)
@@ -32,6 +32,7 @@
*/
package net.objectlab.kit.datecalc.common;
+import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -64,17 +65,22 @@
* the set of holidays (non-working days).
* @deprecated use the HolidayCalendar
*/
+ @Deprecated
public void registerHolidays(final String name, final Set<E> holidaysSet) {
if (name != null) {
- DefaultHolidayCalendar<E> defaultHolidayCalendar = new DefaultHolidayCalendar<E>(holidaysSet);
- calculateDefaultBoundaries(defaultHolidayCalendar);
- this.holidays.put(name, defaultHolidayCalendar);
+ final Set<E> hol = new HashSet<E>();
+ if (holidaysSet != null) {
+ hol.addAll(holidaysSet);
+ }
+ final DefaultHolidayCalendar<E> defaultHolidayCalendar = new DefaultHolidayCalendar<E>(hol);
+ this.holidays.put(name, new ImmutableHolidayCalendar<E>(defaultHolidayCalendar));
}
}
/**
* Use this method to register a given calendar, it will replace any
- * existing set. It won't update any existing DateCalculator as these should
+ * existing one with the same name. An immutable copy is made so that any changes outside this class
+ * will have no affect. It won't update any existing DateCalculator as these should
* not be amended whilst in existence (we could otherwise get inconsistent
* results).
*
@@ -85,11 +91,16 @@
*/
public void registerHolidays(final String name, final HolidayCalendar<E> holidaysCalendar) {
if (name != null) {
- if (holidaysCalendar != null && holidaysCalendar.getHolidays() != null && !holidaysCalendar.getHolidays().isEmpty()
- && (holidaysCalendar.getEarlyBoundary() == null || holidaysCalendar.getLateBoundary() == null)) {
- calculateDefaultBoundaries(holidaysCalendar);
+ final Set<E> hol = new HashSet<E>();
+ if (holidaysCalendar != null && holidaysCalendar.getHolidays() != null) {
+ hol.addAll(holidaysCalendar.getHolidays());
}
- this.holidays.put(name, holidaysCalendar);
+ final DefaultHolidayCalendar<E> defaultHolidayCalendar = new DefaultHolidayCalendar<E>(hol);
+ if (holidaysCalendar != null) {
+ defaultHolidayCalendar.setEarlyBoundary(holidaysCalendar.getEarlyBoundary());
+ defaultHolidayCalendar.setLateBoundary(holidaysCalendar.getLateBoundary());
+ }
+ this.holidays.put(name, new ImmutableHolidayCalendar<E>(holidaysCalendar));
}
}
@@ -102,24 +113,25 @@
* the date calculator to configure.
*/
protected void setHolidays(final String name, final DateCalculator<E> dc) {
- if (name != null && holidays.containsKey(name)) {
- dc.setNonWorkingDays(holidays.get(name).getHolidays());
+ if (name != null) {
+ dc.setHolidayCalendar(holidays.get(name));
}
}
-
- protected abstract void calculateDefaultBoundaries(final HolidayCalendar<E> holidaysCalendar);
}
/*
* ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
*
- * Based in London, we are world leaders in the design and development of
- * bespoke applications for the securities financing markets.
+ * Based in London, we are world leaders in the design and development
+ * of bespoke applications for the securities financing markets.
*
* <a href="http://www.objectlab.co.uk/open">Click here to learn more about us</a>
- * ___ _ _ _ _ _ / _ \| |__ (_) ___ ___| |_| | __ _| |__ | | | | '_ \| |/ _ \/
- * __| __| | / _` | '_ \ | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
- * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/ |__/
- *
- * www.ObjectLab.co.uk
+ * ___ _ _ _ _ _
+ * / _ \| |__ (_) ___ ___| |_| | __ _| |__
+ * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
+ * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
+ * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
+ * |__/
+ *
+ * www.ObjectLab.co.uk
*/
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculator.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculator.java 2007-01-04 15:33:23 UTC (rev 234)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculator.java 2007-01-04 18:31:58 UTC (rev 235)
@@ -121,9 +121,22 @@
*
* @param holidays
* the holiday (if null, an empty set will be put in place)
+ * @deprecated should use setHolidayCalendar
*/
+ @Deprecated
void setNonWorkingDays(final Set<E> holidays);
+ /**
+ * This is typically used at the construction of a DateCalculator to give a
+ * reference to a Holiday Calendar, if not the case, the calculator will
+ * make an immutable copy of the HolidayCalendar.
+ *
+ * @param holidays
+ * the holiday calendar (if null, no holidays taken into account)
+ * @since 1.1.0
+ */
+ void setHolidayCalendar(final HolidayCalendar<E> calendar);
+
// -----------------------------------------------------------------------
//
// ObjectLab, world leaders in the design and development of bespoke
@@ -136,8 +149,17 @@
* Gives a immutable copy of the set of registered holidays.
*
* @return an immutable copy of the holiday set.
+ * @deprecated use getHolidayCalendar, likely to be REMOVED next release.
*/
+ @Deprecated
Set<E> getNonWorkingDays();
+
+ /**
+ * Returns an immutable version of the HolidayCalendar.
+ * @return a copy of the holiday calendar
+ * @since 1.1.0
+ */
+ HolidayCalendar<E> getHolidayCalendar();
/**
* Allows user to define what their Working Week should be (default is
@@ -200,13 +222,17 @@
* Allows DateCalculators to be combined into a new one, the startDate and
* currentBusinessDate will be the ones from the existing calendar (not the
* parameter one). The name will be combined name1+"/"+calendar.getName().
+ * If the Calendars have Early or Late boundaries, the result is the
+ * narrowest interval (e.g. the later Early boundary and the earliest
+ * Late boundary).
*
* @param calculator
* return the same DateCalculator if calender is null or the
* original calendar (but why would you want to do that?)
* @throws IllegalArgumentException
* if both calendars have different types of HolidayHandlers or
- * WorkingWeek;
+ * WorkingWeek; Also, it is required that BOTH calendars either
+ * have Early/Late Boundaries or none.
*/
DateCalculator<E> combine(DateCalculator<E> calculator);
@@ -221,7 +247,7 @@
* the Tenor to reach.
* @param spotLag
* number of days to "spot" days, this can vary from one market
- * to the other.
+ * to the other. It is sometimes called "settlement interval".
* @return the current DateCalculator
*/
DateCalculator<E> moveByTenor(final Tenor tenor, final int spotLag);
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DefaultHolidayCalendar.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DefaultHolidayCalendar.java 2007-01-04 15:33:23 UTC (rev 234)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecal...
[truncated message content] |
|
From: <be...@us...> - 2007-01-04 15:33:24
|
Revision: 234
http://svn.sourceforge.net/objectlabkit/?rev=234&view=rev
Author: benoitx
Date: 2007-01-04 07:33:23 -0800 (Thu, 04 Jan 2007)
Log Message:
-----------
Ensure look consistency and update doco with view of the new HolidayCalendar.
Modified Paths:
--------------
trunk/common-build/project.properties
trunk/datecalc-common/src/site/style/maven-objectlabkit.css
trunk/datecalc-jdk/project.properties
trunk/datecalc-jdk/src/site/style/maven-objectlabkit.css
trunk/datecalc-joda/src/site/style/maven-objectlabkit.css
trunk/src/site/changes.xml
trunk/src/site/index.xml
trunk/src/site/navigation.xml
trunk/src/site/style/maven-objectlabkit.css
Added Paths:
-----------
trunk/datecalc-common/project.properties
trunk/datecalc-joda/project.properties
Modified: trunk/common-build/project.properties
===================================================================
--- trunk/common-build/project.properties 2007-01-04 14:34:42 UTC (rev 233)
+++ trunk/common-build/project.properties 2007-01-04 15:33:23 UTC (rev 234)
@@ -42,6 +42,8 @@
# enabling RUNNING with assertions!
maven.junit.jvmargs=-ea
maven.test.failure.ignore=true
+maven.test.error.ignore=true
+maven.test.skip=false
# As we're using SVN we need to have this property set to tell the changelog plugin to use SVN
# and not CVS (which is its default)
Added: trunk/datecalc-common/project.properties
===================================================================
--- trunk/datecalc-common/project.properties (rev 0)
+++ trunk/datecalc-common/project.properties 2007-01-04 15:33:23 UTC (rev 234)
@@ -0,0 +1,2 @@
+qalab.merge.projectName=objectlabkit
+qalab.merge.moduleName=common
Modified: trunk/datecalc-common/src/site/style/maven-objectlabkit.css
===================================================================
--- trunk/datecalc-common/src/site/style/maven-objectlabkit.css 2007-01-04 14:34:42 UTC (rev 233)
+++ trunk/datecalc-common/src/site/style/maven-objectlabkit.css 2007-01-04 15:33:23 UTC (rev 234)
@@ -78,11 +78,11 @@
font-size: 12px;
padding-top: 2px;
}
-
+/*
div#navcolumn li {
background: #eeeeee !important;
}
-
+*/
div#navcolumn div a {
color: #002070;
font-size: 11px;
Modified: trunk/datecalc-jdk/project.properties
===================================================================
--- trunk/datecalc-jdk/project.properties 2007-01-04 14:34:42 UTC (rev 233)
+++ trunk/datecalc-jdk/project.properties 2007-01-04 15:33:23 UTC (rev 234)
@@ -1,3 +1,2 @@
-maven.test.failure.ignore=true
-maven.test.error.ignore=true
-maven.test.skip=false
+qalab.merge.projectName=objectlabkit
+qalab.merge.moduleName=jdk
Modified: trunk/datecalc-jdk/src/site/style/maven-objectlabkit.css
===================================================================
--- trunk/datecalc-jdk/src/site/style/maven-objectlabkit.css 2007-01-04 14:34:42 UTC (rev 233)
+++ trunk/datecalc-jdk/src/site/style/maven-objectlabkit.css 2007-01-04 15:33:23 UTC (rev 234)
@@ -78,11 +78,11 @@
font-size: 12px;
padding-top: 2px;
}
-
+/*
div#navcolumn li {
background: #eeeeee !important;
}
-
+*/
div#navcolumn div a {
color: #002070;
font-size: 11px;
Added: trunk/datecalc-joda/project.properties
===================================================================
--- trunk/datecalc-joda/project.properties (rev 0)
+++ trunk/datecalc-joda/project.properties 2007-01-04 15:33:23 UTC (rev 234)
@@ -0,0 +1,2 @@
+qalab.merge.projectName=objectlabkit
+qalab.merge.moduleName=joda
Modified: trunk/datecalc-joda/src/site/style/maven-objectlabkit.css
===================================================================
--- trunk/datecalc-joda/src/site/style/maven-objectlabkit.css 2007-01-04 14:34:42 UTC (rev 233)
+++ trunk/datecalc-joda/src/site/style/maven-objectlabkit.css 2007-01-04 15:33:23 UTC (rev 234)
@@ -78,11 +78,11 @@
font-size: 12px;
padding-top: 2px;
}
-
+/*
div#navcolumn li {
background: #eeeeee !important;
}
-
+*/
div#navcolumn div a {
color: #002070;
font-size: 11px;
Modified: trunk/src/site/changes.xml
===================================================================
--- trunk/src/site/changes.xml 2007-01-04 14:34:42 UTC (rev 233)
+++ trunk/src/site/changes.xml 2007-01-04 15:33:23 UTC (rev 234)
@@ -9,6 +9,9 @@
</properties>
<body>
<release version="1.1.0" date="in SVN" description="Maintenance">
+ <action dev="benoitx" type="add" issue="1575498" due-to="Paul Hill">Valid Range via HolidayCalendar. HolidayCalendar should replace the simple Set<E> of dates
+ for holidays. A HolidayCalendar MAY contain an eraly and late boundary, if the calculation break a boundary, an exception is thrown, if there are no
+ boundaries no exception would be thrown. This would ensure that calculations are not going outside the valid set of holidays.</action>
<action dev="benoitx" type="fix" due-to="David Owen">The calculation of Spot date should take into account holidays BETWEEN now and spot (aka moveByBusinessDay).</action>
<action dev="benoitx" type="add" issue="1601540" due-to="Anthony Whitford">Added a standard Tenor 2D.</action>
<action dev="benoitx" type="fix" issue="1601542" due-to="Anthony Whitford">Spelling mistake in the code,
Modified: trunk/src/site/index.xml
===================================================================
--- trunk/src/site/index.xml 2007-01-04 14:34:42 UTC (rev 233)
+++ trunk/src/site/index.xml 2007-01-04 15:33:23 UTC (rev 234)
@@ -20,12 +20,18 @@
</head>
<body>
<!-- The body of the document contains a number of sections -->
+ <section name="Quick News">
+ <p>2007-01-xx: version 1.1.0 is out and contains a couple of changes, a new HolidayHandler and the ability to define a valid range for the holiday (and
+ if the calculation is beyond that range, an exception is thrown). This is done via HolidayCalendar which should replace the simple Set<E> for holidays.
+ More info on the changes <a href="changes-report.html">here</a>.</p>
+ </section>
+
<section name="ObjectLab Kit Introduction">
<p>ObjectLab Kit came out of our frustration to have to re-do the same kind of code over and over each time we
joined a new company and Bank. Most banks will require basic Date calculation, we did spot another open source
project for this but their licence forbids most financial institution from using it. This one is released under
- the business-friendly Apache 2.0 license. <a href="http://digg.com/submit?phase=2&url=objectlabkit.sourceforge.net&title=ObjectLab%20Kit%3A%20Open%20Source%20Date%20Calculators%20for%20Business%20and%20Finance&bodytext=ObjectLab%20released%20version%201%2E0%2E1%20of%20ObjectLab%20Kit%20for%20Java%201%2E5,%20available%20for%20download%20via%20SourceForge%20or%20the%20Maven%20Central%20Repository%2E%20The%20Kit%20provides%20a%20Date%20Calculator%20that%20handle%20holidays,%20a%20IMM%20Date%20and%20Period%20Count%20Calculator%20and%20comes%20in%20two%20versions%3A%20one%20based%20on%20pure%20JDK%20(1%2E5)%20and%20one%20based%20on%20the%20Joda-time%20library%20(1%2E3%2B,%20JDK%201%2E5)%2E&topic=programming">
+ the business-friendly Apache 2.0 license. <a href="http://digg.com/submit?phase=2&url=objectlabkit.sourceforge.net&title=ObjectLab%20Kit%3A%20Open%20Source%20Date%20Calculators%20for%20Business%20and%20Finance&bodytext=ObjectLab%20released%20version%201%2E1%2E0%20of%20ObjectLab%20Kit%20for%20Java%201%2E5,%20available%20for%20download%20via%20SourceForge%20or%20the%20Maven%20Central%20Repository%2E%20The%20Kit%20provides%20a%20Date%20Calculator%20that%20handle%20holidays,%20a%20IMM%20Date%20and%20Period%20Count%20Calculator%20and%20comes%20in%20two%20versions%3A%20one%20based%20on%20pure%20JDK%20(1%2E5)%20and%20one%20based%20on%20the%20Joda-time%20library%20(1%2E3%2B,%20JDK%201%2E5)%2E&topic=programming">
<img src="http://digg.com/img/badges/91x17-digg-button.png" width="91" height="17" alt="Digg!" style="vertical-align:middle" /></a></p>
@@ -54,7 +60,7 @@
<subsection name ="Ok, what algorithm for handling a holiday do you support?">
- <p>At the moment, we support the following 5 algorithms:</p>
+ <p>At the moment, we support the following 6 algorithms:</p>
<ol>
<li><strong>Do Nothing</strong>, i.e. leave the date as-is, even if it is a non-working day.</li>
<li><strong>Forward</strong>, if the date is a non-working day, move forward to the next working day.</li>
@@ -63,6 +69,7 @@
UNLESS it crosses over a new month, in which case we revert to find the last working day of the current month.</li>
<li><strong>Modified Preceeding</strong>, if the date is a non-working day, move backward to the previous working day,
UNLESS it crosses over a new month, in which case we revert to find the next working day of the current month.</li>
+ <li><strong>ForwardUnlessNegative</strong> (new with v1.1.0), acts like a Forward algo unless the increment is negative, in which case it behaves like Backward.</li>
</ol>
<p>See this page for some <a href="algo.html">examples</a>.</p>
</subsection>
@@ -124,12 +131,12 @@
<section name="How do I use it?">
<p>There are several steps</p>
<ul>
- <li>Register holidays in the factory by calling registerHolidays(final String name, Set<Date> holidays)</li>
+ <li>Register holidays in the factory by calling registerHolidays(final String name, HolidayCalendar<Date> holidays)</li>
<li>Use the factory to get a DateCalculator with a given Handler (forward/backward etc), it is a disposable object that should <strong>not</strong> be shared accross threads, each thread
should get its own!</li>
<li>when you get a DateCalculator, you can set the startDate, this sets the currentDate too. The startDate does not move. The current date is
the result of your calculations. If the startDate is a non-working day, it may be moved automatically according to the HolidayHandler.</li>
- <li>when you call moveByDays(..), moveByBusinessDays(..) the currentDate is moved in the Calculator.</li>
+ <li>when you call moveByDays(..), moveByBusinessDays(..), moveByTenor the currentDate is moved in the Calculator.</li>
</ul>
<subsection name="Using Joda-time LocalDate">
@@ -138,9 +145,13 @@
// create or get the Holidays
final Set<LocalDate> holidays = new HashSet<LocalDate>();
holidays.add(new LocalDate("2006-08-28"));
+//... keep adding all holidays for 2006
+
+// create the HolidayCalendar ASSUMING that the set covers 2006!
+final HolidayCalendar<LocalDate> calendar = new DefaultHolidayCalendar<LocalDate>(holidays, new LocalDate("2006-01-01"), new LocalDate("2006-12-31"));
-// register the holidays (any calculator with name "UK" asked from now on will receive a reference to this set
-LocalDateKitCalculatorsFactory.getDefaultInstance().registerHolidays("UK", holidays);
+// register the holiday calendar (any calculator with name "UK" asked from now on will receive an IMMUTABLE reference to this calendar)
+LocalDateKitCalculatorsFactory.getDefaultInstance().registerHolidays("UK", calendar);
// ask for a LocalDate calculator for "UK" (even if a new set of holidays is registered, this one calculator is not affected
DateCalculator<LocalDate> cal = LocalDateKitCalculatorsFactory.getDefaultInstance().getDateCalculator("UK", HolidayHandlerType.FORWARD);
@@ -152,6 +163,9 @@
LocalDate current = cal.getCurrentBusinessDate(); // 29 Aug 06
LocalDate newCurrent = cal.moveByDays(4).getCurrentBusinessDate(); // 4 Sept 06 due to weekend!
+
+// Example with Tenor, 1W with a 2 day spot lag
+LocalDate date1WeekFromSpot = cal.moveByTenor(StandardTenor.T_1W, 2).getCurrentBusinessDate();
</pre></div>
</subsection>
@@ -166,11 +180,15 @@
calendar.set(Calendar.DAY_OF_MONTH,28);
calendar.set(Calendar.MONTH,Calendar.AUGUST);
calendar.set(Calendar.YEAR,2006);
-holidays.add(calendar);
-
-// register the holidays (any calculator with name "UK" asked from now on will receive a reference to this set
-CalendarKitCalculatorsFactory.getDefaultInstance().registerHolidays("UK", holidays);
+holidays.add(calendar);
+//... keep adding all holidays for 2006
+// create the HolidayCalendar ASSUMING that the set covers 2006!
+final HolidayCalendar<Calendar> calendar = new DefaultHolidayCalendar<Calendar>(holidays, new Calendar("2006-01-01"), new Calendar("2006-12-31"));
+
+// register the holidays (any calculator with name "UK" asked from now on will receive an IMMUTABLE reference to this calendar
+CalendarKitCalculatorsFactory.getDefaultInstance().registerHolidays("UK", calendar);
+
// ask for a LocalDate calculator for "UK" (even if a new set of holidays is registered, this one calculator is not affected
DateCalculator<Calendar> cal = LocalDateKitCalculatorsFactory.getDefaultInstance().getDateCalculator("UK", HolidayHandlerType.FORWARD);
Calendar initial = Calendar.getInstance();
@@ -186,6 +204,9 @@
Calendar current = cal.getCurrentBusinessDate(); // 29 Aug 06
Calendar newCurrent = cal.moveByDays(4).getCurrentBusinessDate(); // 4 Sept 06 due to weekend!
+
+// Example with Tenor, 1W with a 2 day spot lag
+Calendar date1WeekFromSpot = cal.moveByTenor(StandardTenor.T_1W, 2).getCurrentBusinessDate();
</pre></div>
</subsection>
Modified: trunk/src/site/navigation.xml
===================================================================
--- trunk/src/site/navigation.xml 2007-01-04 14:34:42 UTC (rev 233)
+++ trunk/src/site/navigation.xml 2007-01-04 15:33:23 UTC (rev 234)
@@ -29,7 +29,9 @@
<footer>
<a href="http://sourceforge.net">
<img src="http://sourceforge.net/sflogo.php?group_id=97367&type=2" width="125" height="37" border="0" alt="SourceForge.net Logo" />
- </a>
+ </a>
+ <a href="http://digg.com/submit?phase=2&url=objectlabkit.sourceforge.net&title=ObjectLab%20Kit%3A%20Open%20Source%20Date%20Calculators%20for%20Business%20and%20Finance&bodytext=ObjectLab%20released%20version%201%2E1%2E0%20of%20ObjectLab%20Kit%20for%20Java%201%2E5,%20available%20for%20download%20via%20SourceForge%20or%20the%20Maven%20Central%20Repository%2E%20The%20Kit%20provides%20a%20Date%20Calculator%20that%20handle%20holidays,%20a%20IMM%20Date%20and%20Period%20Count%20Calculator%20and%20comes%20in%20two%20versions%3A%20one%20based%20on%20pure%20JDK%20(1%2E5)%20and%20one%20based%20on%20the%20Joda-time%20library%20(1%2E3%2B,%20JDK%201%2E5)%2E&topic=programming">
+ <img src="http://digg.com/img/badges/91x17-digg-button.png" width="91" height="17" alt="Digg!" style="vertical-align:middle" /></a>
<script src="http://www.google-analytics.com/urchin.js"
type="text/javascript">
</script>
Modified: trunk/src/site/style/maven-objectlabkit.css
===================================================================
--- trunk/src/site/style/maven-objectlabkit.css 2007-01-04 14:34:42 UTC (rev 233)
+++ trunk/src/site/style/maven-objectlabkit.css 2007-01-04 15:33:23 UTC (rev 234)
@@ -78,11 +78,11 @@
font-size: 12px;
padding-top: 2px;
}
-
+/*
div#navcolumn li {
background: #eeeeee !important;
}
-
+*/
div#navcolumn div a {
color: #002070;
font-size: 11px;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2007-01-04 14:34:45
|
Revision: 233
http://svn.sourceforge.net/objectlabkit/?rev=233&view=rev
Author: benoitx
Date: 2007-01-04 06:34:42 -0800 (Thu, 04 Jan 2007)
Log Message:
-----------
Good idea to keep a copy of this around...
Added Paths:
-----------
trunk/src/site/ref/
trunk/src/site/ref/DayCountAndAccrualCalc.pdf
Added: trunk/src/site/ref/DayCountAndAccrualCalc.pdf
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/ref/DayCountAndAccrualCalc.pdf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2007-01-04 12:43:04
|
Revision: 232
http://svn.sourceforge.net/objectlabkit/?rev=232&view=rev
Author: benoitx
Date: 2007-01-04 04:43:01 -0800 (Thu, 04 Jan 2007)
Log Message:
-----------
removed the linkckeck page... way too slow.
Modified Paths:
--------------
trunk/project.xml
Modified: trunk/project.xml
===================================================================
--- trunk/project.xml 2007-01-04 00:33:01 UTC (rev 231)
+++ trunk/project.xml 2007-01-04 12:43:01 UTC (rev 232)
@@ -37,6 +37,6 @@
<report>maven-changelog-plugin</report>
<report>maven-developer-activity-plugin</report>
<report>maven-file-activity-plugin</report>
- <report>maven-linkcheck-plugin</report>
+ <!--<report>maven-linkcheck-plugin</report>-->
</reports>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2007-01-04 00:33:05
|
Revision: 231
http://svn.sourceforge.net/objectlabkit/?rev=231&view=rev
Author: benoitx
Date: 2007-01-03 16:33:01 -0800 (Wed, 03 Jan 2007)
Log Message:
-----------
fixed script following upgrade to StatSVN 0.3.x
Modified Paths:
--------------
trunk/statsvn.bat
Property Changed:
----------------
trunk/src/site/statsvn/
Property changes on: trunk/src/site/statsvn
___________________________________________________________________
Name: svn:ignore
- *.png
*.xml
objectlab-statcvs-xdoc.css
objectlab-statcvs.css
*.jar
*.jtree
+ *.png
*.xml
objectlab-statcvs-xdoc.css
objectlab-statcvs.css
*.jar
*.jtree
repomap.txt
Modified: trunk/statsvn.bat
===================================================================
--- trunk/statsvn.bat 2007-01-03 23:40:15 UTC (rev 230)
+++ trunk/statsvn.bat 2007-01-04 00:33:01 UTC (rev 231)
@@ -1,3 +1,3 @@
-svn log -v --xml https://svn.sourceforge.net/svnroot/objectlabkit/ > logfile.log
-rem mkdir qalab\target\docs\statsvn
-java -jar c:\java\statsvn\statsvn.jar -xdoc -verbose -output-dir src\site\statsvn -tags "^1.0.1|^1.1.0" -title ObjectLabKit -exclude "**/qalab.xml" -viewvc http://svn.sourceforge.net/viewvc/objectlabkit/trunk ./logfile.log .
\ No newline at end of file
+svn log -v --xml https://svn.sourceforge.net/svnroot/objectlabkit/ > svn.log
+rem mkdir src\site\statsvn
+java -jar c:\java\statsvn\statsvn.jar -xdoc -verbose -output-dir src\site\statsvn -tags "^1.0.1|^1.1.0" -title ObjectLabKit -exclude "**/qalab.xml" -viewvc http://svn.sourceforge.net/viewvc/objectlabkit/trunk ./svn.log .
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
![http://digg.com/img/badges/91x17-digg-button.png"](http://digg.com/img/badges/91x17-digg-button.png"){kind=link}