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: <ma...@us...> - 2006-09-15 06:54:02
|
Revision: 182
http://svn.sourceforge.net/objectlabkit/?rev=182&view=rev
Author: marchy
Date: 2006-09-14 23:53:50 -0700 (Thu, 14 Sep 2006)
Log Message:
-----------
fixed the problem with the 30/31 days... on to the standardizing the timezone - local vs. UTC
Modified Paths:
--------------
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java
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 2006-09-15 06:30:38 UTC (rev 181)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java 2006-09-15 06:53:50 UTC (rev 182)
@@ -85,7 +85,7 @@
private int dayDiff(final Calendar start, final Calendar end) {
final long diff = Math.abs(start.getTimeInMillis() - end.getTimeInMillis());
final double dayDiff = ((double) diff) / MILLIS_IN_DAY;
- return (int) (dayDiff);
+ return (int) Math.round(dayDiff);
}
public double monthDiff(final Calendar start, final Calendar end, final PeriodCountBasis basis) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-09-15 06:30:47
|
Revision: 181
http://svn.sourceforge.net/objectlabkit/?rev=181&view=rev
Author: marchy
Date: 2006-09-14 23:30:38 -0700 (Thu, 14 Sep 2006)
Log Message:
-----------
removed unused import
Modified Paths:
--------------
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/UtilsTest.java
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/UtilsTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/UtilsTest.java 2006-09-15 06:29:03 UTC (rev 180)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/UtilsTest.java 2006-09-15 06:30:38 UTC (rev 181)
@@ -8,7 +8,6 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import java.util.TimeZone;
import junit.framework.TestCase;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-09-15 06:29:18
|
Revision: 180
http://svn.sourceforge.net/objectlabkit/?rev=180&view=rev
Author: marchy
Date: 2006-09-14 23:29:03 -0700 (Thu, 14 Sep 2006)
Log Message:
-----------
fixed the prob with ACT_ACT test failing
Modified Paths:
--------------
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java
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 2006-09-14 20:28:58 UTC (rev 179)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java 2006-09-15 06:29:03 UTC (rev 180)
@@ -106,8 +106,8 @@
final int diff1 = dayDiff(start, endOfStartYear);
final int diff2 = dayDiff(startOfEndYear, end);
- diff = (diff1 + 1.0) / start.getMaximum(Calendar.DAY_OF_YEAR) + (endYear - startYear - 1.0) + (diff2)
- / (double) end.getMaximum(Calendar.DAY_OF_YEAR);
+ diff = (diff1 + 1.0) / start.getActualMaximum(Calendar.DAY_OF_YEAR) + (endYear - startYear - 1.0) + (diff2)
+ / (double) end.getActualMaximum(Calendar.DAY_OF_YEAR);
}
} else if (basis == PeriodCountBasis.CONV_30_360 || basis == PeriodCountBasis.CONV_360E_ISDA
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2006-09-14 20:29:22
|
Revision: 179
http://svn.sourceforge.net/objectlabkit/?rev=179&view=rev
Author: benoitx
Date: 2006-09-14 13:28:58 -0700 (Thu, 14 Sep 2006)
Log Message:
-----------
new build.
Modified Paths:
--------------
trunk/common-build/project.xml
trunk/datecalc-common/qalab.xml
trunk/datecalc-jdk/qalab.xml
trunk/datecalc-joda/qalab.xml
Modified: trunk/common-build/project.xml
===================================================================
--- trunk/common-build/project.xml 2006-09-14 08:18:13 UTC (rev 178)
+++ trunk/common-build/project.xml 2006-09-14 20:28:58 UTC (rev 179)
@@ -44,7 +44,7 @@
<repository>
<url>https://svn.sourceforge.net/viewvc/objectlabkit/</url>
<connection>
- https://svn.sourceforge.net/svnroot/objectlabkit/trunk
+ scm:svn:https://svn.sourceforge.net/svnroot/objectlabkit/trunk
</connection>
<developerConnection>
scm:svn:https://svn.sourceforge.net/svnroot/objectlabkit/trunk
Modified: trunk/datecalc-common/qalab.xml
===================================================================
--- trunk/datecalc-common/qalab.xml 2006-09-14 08:18:13 UTC (rev 178)
+++ trunk/datecalc-common/qalab.xml 2006-09-14 20:28:58 UTC (rev 179)
@@ -63,6 +63,8 @@
<summaryresult date="2006-09-09" filecount="17" statvalue="64" type="cobertura-branch"/>
<summaryresult date="2006-09-12" filecount="17" statvalue="59" type="cobertura-line"/>
<summaryresult date="2006-09-12" filecount="17" statvalue="62" type="cobertura-branch"/>
+ <summaryresult date="2006-09-14" filecount="17" statvalue="57" type="cobertura-line"/>
+ <summaryresult date="2006-09-14" filecount="17" statvalue="60" type="cobertura-branch"/>
</summary>
<file id="net_objectlab_kit_datecalc_common_package.html" path="net/objectlab/kit/datecalc/common/package.html">
<result date="2006-08-08" statvalue="1" type="checkstyle"/>
@@ -111,6 +113,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_common_WorkingWeek.java" path="net/objectlab/kit/datecalc/common/WorkingWeek.java">
<result date="2006-08-08" statvalue="3" type="checkstyle"/>
@@ -151,6 +155,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="95" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="95" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_common_TenorCode.java" path="net/objectlab/kit/datecalc/common/TenorCode.java">
<result date="2006-08-08" statvalue="100" type="cobertura-line"/>
@@ -183,6 +189,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_common_HolidayHandlerType.java" path="net/objectlab/kit/datecalc/common/HolidayHandlerType.java">
<result date="2006-08-08" statvalue="100" type="cobertura-branch"/>
@@ -200,6 +208,7 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_common_PeriodCountBasis.java" path="net/objectlab/kit/datecalc/common/PeriodCountBasis.java">
<result date="2006-08-08" statvalue="100" type="cobertura-branch"/>
@@ -215,6 +224,7 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_common_StandardTenor.java" path="net/objectlab/kit/datecalc/common/StandardTenor.java">
<result date="2006-08-08" statvalue="100" type="cobertura-branch"/>
@@ -246,6 +256,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="90" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="90" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_common_AbstractDateCalculator.java" path="net/objectlab/kit/datecalc/common/AbstractDateCalculator.java">
@@ -275,6 +287,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_common_HolidayHandler.java" path="net/objectlab/kit/datecalc/common/HolidayHandler.java">
<result date="2006-08-23" statvalue="100" type="cobertura-line"/>
@@ -297,6 +311,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_common_AbstractDateCalculatorFactory.java" path="net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactory.java">
@@ -347,6 +363,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_common_Utils.java" path="net/objectlab/kit/datecalc/common/Utils.java">
<result date="2006-09-04" statvalue="2" type="checkstyle"/>
@@ -362,6 +380,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="88" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="88" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_common_IMMPeriod.java" path="net/objectlab/kit/datecalc/common/IMMPeriod.java">
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
@@ -370,6 +390,7 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_common_ExcelDateUtil.java" path="net/objectlab/kit/datecalc/common/ExcelDateUtil.java">
<result date="2006-09-05" statvalue="84" type="cobertura-line"/>
@@ -382,6 +403,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="93" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="82" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="83" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_common_IMMDateCalculator.java" path="net/objectlab/kit/datecalc/common/IMMDateCalculator.java">
<result date="2006-09-06" statvalue="100" type="cobertura-line"/>
@@ -392,6 +415,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_common_AbstractIMMDateCalculator.java" path="net/objectlab/kit/datecalc/common/AbstractIMMDateCalculator.java">
@@ -399,6 +424,7 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_common_KitCalculatorsFactory.java" path="net/objectlab/kit/datecalc/common/KitCalculatorsFactory.java">
@@ -406,5 +432,7 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
</qalab>
Modified: trunk/datecalc-jdk/qalab.xml
===================================================================
--- trunk/datecalc-jdk/qalab.xml 2006-09-14 08:18:13 UTC (rev 178)
+++ trunk/datecalc-jdk/qalab.xml 2006-09-14 20:28:58 UTC (rev 179)
@@ -66,6 +66,8 @@
<summaryresult date="2006-09-12" filecount="6" statvalue="6" type="pmd"/>
<summaryresult date="2006-09-12" filecount="17" statvalue="99" type="cobertura-line"/>
<summaryresult date="2006-09-12" filecount="17" statvalue="100" type="cobertura-branch"/>
+ <summaryresult date="2006-09-14" filecount="17" statvalue="99" type="cobertura-line"/>
+ <summaryresult date="2006-09-14" filecount="17" statvalue="100" type="cobertura-branch"/>
</summary>
<file id="net_objectlab_kit_datecalc_jdk_package.html" path="net/objectlab/kit/datecalc/jdk/package.html">
<result date="2006-08-08" statvalue="1" type="checkstyle"/>
@@ -278,6 +280,8 @@
<result date="2006-09-09" statvalue="84" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_DatePeriodCountCalculator.java" path="net/objectlab/kit/datecalc/jdk/DatePeriodCountCalculator.java">
@@ -298,6 +302,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_jdk_ExcelDateUtil.java" path="net/objectlab/kit/datecalc/jdk/ExcelDateUtil.java">
<result date="2006-09-02" statvalue="4" type="checkstyle"/>
@@ -326,6 +332,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="91" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="91" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_JdkCalendarBaseDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/JdkCalendarBaseDateCalculator.java">
@@ -465,6 +473,8 @@
<result date="2006-09-12" statvalue="1" type="pmd"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarForwardHandler.java" path="net/objectlab/kit/datecalc/jdk/CalendarForwardHandler.java">
@@ -474,6 +484,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/jdk/CalendarModifiedFollowingHandler.java">
@@ -483,6 +495,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/jdk/CalendarModifiedPreceedingHandler.java">
@@ -494,6 +508,8 @@
<result date="2006-09-12" statvalue="1" type="pmd"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_jdk_DateBackwardHandler.java" path="net/objectlab/kit/datecalc/jdk/DateBackwardHandler.java">
<result date="2006-09-07" statvalue="100" type="cobertura-line"/>
@@ -504,6 +520,8 @@
<result date="2006-09-12" statvalue="1" type="pmd"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_jdk_DateForwardHandler.java" path="net/objectlab/kit/datecalc/jdk/DateForwardHandler.java">
<result date="2006-09-07" statvalue="90" type="cobertura-line"/>
@@ -512,6 +530,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_DateModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/jdk/DateModifiedFollowingHandler.java">
@@ -521,6 +541,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_DateModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/jdk/DateModifiedPreceedingHandler.java">
@@ -532,6 +554,8 @@
<result date="2006-09-12" statvalue="1" type="pmd"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java">
@@ -539,6 +563,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarIMMDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/CalendarIMMDateCalculator.java">
@@ -548,6 +574,8 @@
<result date="2006-09-12" statvalue="1" type="pmd"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarKitCalculatorsFactory.java" path="net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java">
@@ -555,12 +583,16 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_jdk_DateDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/DateDateCalculator.java">
<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"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_jdk_DateIMMDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/DateIMMDateCalculator.java">
<result date="2006-09-09" statvalue="100" type="cobertura-line"/>
@@ -569,6 +601,8 @@
<result date="2006-09-12" statvalue="1" type="pmd"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_DateKitCalculatorsFactory.java" path="net/objectlab/kit/datecalc/jdk/DateKitCalculatorsFactory.java">
@@ -576,5 +610,7 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
</qalab>
Modified: trunk/datecalc-joda/qalab.xml
===================================================================
--- trunk/datecalc-joda/qalab.xml 2006-09-14 08:18:13 UTC (rev 178)
+++ trunk/datecalc-joda/qalab.xml 2006-09-14 20:28:58 UTC (rev 179)
@@ -69,6 +69,8 @@
<summaryresult date="2006-09-12" filecount="2" statvalue="2" type="pmd"/>
<summaryresult date="2006-09-12" filecount="19" statvalue="98" type="cobertura-line"/>
<summaryresult date="2006-09-12" filecount="19" statvalue="100" type="cobertura-branch"/>
+ <summaryresult date="2006-09-14" filecount="19" statvalue="98" type="cobertura-line"/>
+ <summaryresult date="2006-09-14" filecount="19" statvalue="100" type="cobertura-branch"/>
</summary>
<file id="net_objectlab_kit_datecalc_joda_package.html" path="net/objectlab/kit/datecalc/joda/package.html">
<result date="2006-08-08" statvalue="1" type="checkstyle"/>
@@ -187,6 +189,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_joda_BackwardHandler.java" path="net/objectlab/kit/datecalc/joda/BackwardHandler.java">
<result date="2006-08-08" statvalue="28" type="cobertura-line"/>
@@ -377,6 +381,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="91" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="91" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateBackwardHandler.java" path="net/objectlab/kit/datecalc/joda/LocalDateBackwardHandler.java">
@@ -394,6 +400,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_joda_LocalDateCalculator.java" path="net/objectlab/kit/datecalc/joda/LocalDateCalculator.java">
<result date="2006-09-02" statvalue="100" type="cobertura-line"/>
@@ -411,6 +419,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateForwardHandler.java" path="net/objectlab/kit/datecalc/joda/LocalDateForwardHandler.java">
@@ -428,6 +438,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingHandler.java">
@@ -445,6 +457,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingHandler.java">
@@ -462,6 +476,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayBackwardHandler.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayBackwardHandler.java">
@@ -479,6 +495,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayDateCalculator.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java">
@@ -496,6 +514,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayForwardHandler.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayForwardHandler.java">
@@ -513,6 +533,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingHandler.java">
@@ -530,6 +552,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPreceedingHandler.java">
@@ -547,6 +571,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_joda_JodaExcelDateUtil.java" path="net/objectlab/kit/datecalc/joda/JodaExcelDateUtil.java">
<result date="2006-09-05" statvalue="85" type="cobertura-line"/>
@@ -559,6 +585,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="85" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="85" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateIMMDateCalculator.java" path="net/objectlab/kit/datecalc/joda/LocalDateIMMDateCalculator.java">
@@ -572,6 +600,8 @@
<result date="2006-09-12" statvalue="1" type="pmd"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayIMMDateCalculator.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayIMMDateCalculator.java">
@@ -585,6 +615,8 @@
<result date="2006-09-12" statvalue="1" type="pmd"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateKitCalculatorsFactory.java" path="net/objectlab/kit/datecalc/joda/LocalDateKitCalculatorsFactory.java">
@@ -592,6 +624,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDatePeriodCountCalculator.java" path="net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculator.java">
@@ -599,6 +633,8 @@
<result date="2006-09-09" statvalue="84" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayKitCalculatorsFactory.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayKitCalculatorsFactory.java">
@@ -606,6 +642,8 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayPeriodCountCalculator.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayPeriodCountCalculator.java">
@@ -613,5 +651,7 @@
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-12" statvalue="100" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-14" statvalue="100" type="cobertura-branch"/>
</file>
</qalab>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-09-14 08:18:38
|
Revision: 178
http://svn.sourceforge.net/objectlabkit/?rev=178&view=rev
Author: marchy
Date: 2006-09-14 01:18:13 -0700 (Thu, 14 Sep 2006)
Log Message:
-----------
Problem with setting UTC timezone - when you get the date object from the calendar, it has the default timezone anyways
Modified Paths:
--------------
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/Utils.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/UtilsTest.java
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/Utils.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/Utils.java 2006-09-14 08:10:22 UTC (rev 177)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/Utils.java 2006-09-14 08:18:13 UTC (rev 178)
@@ -25,7 +25,6 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import java.util.TimeZone;
/**
* Utilities class for <code>Date/Calendar</code> conversions
@@ -53,7 +52,6 @@
* @return the calendar object modified (same instance)
*/
public static Calendar blastTime(final Calendar cal) {
- cal.setTimeZone(TimeZone.getTimeZone("UTC"));
cal.set(Calendar.HOUR_OF_DAY, 0);
cal.set(Calendar.MINUTE, 0);
cal.set(Calendar.SECOND, 0);
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/UtilsTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/UtilsTest.java 2006-09-14 08:10:22 UTC (rev 177)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/UtilsTest.java 2006-09-14 08:18:13 UTC (rev 178)
@@ -35,7 +35,6 @@
private Calendar getCal(final int year, final int month, final int day) {
final Calendar cal = Calendar.getInstance();
cal.clear();
- cal.setTimeZone(TimeZone.getTimeZone("UTC"));
cal.set(year, month - 1, day, 0, 0, 0);
return cal;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-09-14 08:10:31
|
Revision: 177
http://svn.sourceforge.net/objectlabkit/?rev=177&view=rev
Author: marchy
Date: 2006-09-14 01:10:22 -0700 (Thu, 14 Sep 2006)
Log Message:
-----------
strange issue with Joda DateTime pre 1900 (in CAT time zone anyways)
Modified Paths:
--------------
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateTimeExcelDateUtilTest.java
Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateTimeExcelDateUtilTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateTimeExcelDateUtilTest.java 2006-09-14 08:08:17 UTC (rev 176)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateTimeExcelDateUtilTest.java 2006-09-14 08:10:22 UTC (rev 177)
@@ -1,6 +1,7 @@
package net.objectlab.kit.datecalc.joda;
import net.objectlab.kit.datecalc.common.AbstractExcelDateUtilTest;
+import net.objectlab.kit.datecalc.common.Utils;
import org.joda.time.DateTime;
@@ -8,7 +9,7 @@
@Override
protected DateTime createDate(final String str) {
- return new DateTime(str);
+ return new DateTime(Utils.createDate(str));
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-09-14 08:08:27
|
Revision: 176
http://svn.sourceforge.net/objectlabkit/?rev=176&view=rev
Author: marchy
Date: 2006-09-14 01:08:17 -0700 (Thu, 14 Sep 2006)
Log Message:
-----------
remove unused import
Modified Paths:
--------------
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/ExcelDateUtil.java
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/ExcelDateUtil.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/ExcelDateUtil.java 2006-09-14 08:07:44 UTC (rev 175)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/ExcelDateUtil.java 2006-09-14 08:08:17 UTC (rev 176)
@@ -20,7 +20,6 @@
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
-import java.util.TimeZone;
/**
* Convert Excel Date to Jdk <code>Date</code> or <code>Calendar</code>.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-09-14 08:07:57
|
Revision: 175
http://svn.sourceforge.net/objectlabkit/?rev=175&view=rev
Author: marchy
Date: 2006-09-14 01:07:44 -0700 (Thu, 14 Sep 2006)
Log Message:
-----------
swapped around getJavaCalendar() and getJavaDate() methods, as the getJavaDate() had the juicy code in it, and was dealing with a Calendar object
Modified Paths:
--------------
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/ExcelDateUtil.java
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/ExcelDateUtil.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/ExcelDateUtil.java 2006-09-13 16:17:59 UTC (rev 174)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/ExcelDateUtil.java 2006-09-14 08:07:44 UTC (rev 175)
@@ -23,7 +23,7 @@
import java.util.TimeZone;
/**
- * Convert Excel Date to LocalDate, YearMonthDay or DateTime.
+ * Convert Excel Date to Jdk <code>Date</code> or <code>Calendar</code>.
*
* @author Benoit Xhenseval
* @author $LastChangedBy: marchy $
@@ -48,7 +48,7 @@
* Given an Excel date with either 1900 or 1904 date windowing, converts it
* to a java.util.Date.
*
- * @param date
+ * @param excelDate
* The Excel date.
* @param use1904windowing
* true if date uses 1904 windowing, or false if using 1900 date
@@ -57,26 +57,38 @@
*
* @see java.util.TimeZone
*/
- public static Calendar getJavaCalendar(final double date, final boolean use1904windowing) {
- final Calendar cal = Calendar.getInstance();
- final Date javaDate = getJavaDate(date, use1904windowing);
- if (javaDate == null) {
+ public static Calendar getJavaCalendar(final double excelDate, final boolean use1904windowing) {
+ if (isValidExcelDate(excelDate)) {
+ int startYear = EXCEL_BASE_YEAR;
+ int dayAdjust = -1; // Excel thinks 2/29/1900 is a valid date, which
+ // it isn't
+ final int wholeDays = (int) Math.floor(excelDate);
+ if (use1904windowing) {
+ startYear = EXCEL_WINDOWING_1904;
+ dayAdjust = 1; // 1904 date windowing uses 1/2/1904 as the
+ // first day
+ } else if (wholeDays < EXCEL_FUDGE_19000229) {
+ // Date is prior to 3/1/1900, so adjust because Excel thinks
+ // 2/29/1900 exists
+ // If Excel date == 2/29/1900, will become 3/1/1900 in Java
+ // representation
+ dayAdjust = 0;
+ }
+ final GregorianCalendar calendar = new GregorianCalendar(startYear, 0, wholeDays + dayAdjust);
+ final int millisecondsInDay = (int) ((excelDate - Math.floor(excelDate)) * DAY_MILLISECONDS + HALF_MILLISEC);
+ calendar.set(Calendar.MILLISECOND, millisecondsInDay);
+ return calendar;
+ } else {
return null;
}
- cal.setTime(javaDate);
- cal.setTimeZone(TimeZone.getTimeZone("UTC"));
- cal.set(Calendar.HOUR, 0);
- cal.set(Calendar.MINUTE, 0);
- cal.set(Calendar.SECOND, 0);
- cal.set(Calendar.MILLISECOND, 0);
- return cal;
+
}
/**
* Given an Excel date with either 1900 or 1904 date windowing, converts it
* to a java.util.Date.
*
- * @param date
+ * @param excelDate
* The Excel date.
* @param use1904windowing
* true if date uses 1904 windowing, or false if using 1900 date
@@ -85,12 +97,12 @@
*
* @see java.util.TimeZone
*/
- public static Date getJavaDateOnly(final double date, final boolean use1904windowing) {
- final Calendar javaCalendar = getJavaCalendar(date, use1904windowing);
+ public static Date getJavaDateOnly(final double excelDate, final boolean use1904windowing) {
+ final Calendar javaCalendar = getJavaCalendar(excelDate, use1904windowing);
if (javaCalendar == null) {
return null;
}
- return javaCalendar.getTime();
+ return Utils.blastTime(javaCalendar).getTime();
}
/**
@@ -106,7 +118,7 @@
* represents a time between 02:00 and 03:00 then it is converted to past
* 03:00 summer time
*
- * @param date
+ * @param excelDate
* The Excel date.
* @param use1904windowing
* true if date uses 1904 windowing, or false if using 1900 date
@@ -115,40 +127,19 @@
* Excel date
* @see java.util.TimeZone
*/
- public static Date getJavaDate(final double date, final boolean use1904windowing) {
- if (isValidExcelDate(date)) {
- int startYear = EXCEL_BASE_YEAR;
- int dayAdjust = -1; // Excel thinks 2/29/1900 is a valid date, which
- // it isn't
- final int wholeDays = (int) Math.floor(date);
- if (use1904windowing) {
- startYear = EXCEL_WINDOWING_1904;
- dayAdjust = 1; // 1904 date windowing uses 1/2/1904 as the
- // first day
- } else if (wholeDays < EXCEL_FUDGE_19000229) {
- // Date is prior to 3/1/1900, so adjust because Excel thinks
- // 2/29/1900 exists
- // If Excel date == 2/29/1900, will become 3/1/1900 in Java
- // representation
- dayAdjust = 0;
- }
- final GregorianCalendar calendar = new GregorianCalendar(startYear, 0, wholeDays + dayAdjust);
- final int millisecondsInDay = (int) ((date - Math.floor(date)) * DAY_MILLISECONDS + HALF_MILLISEC);
- calendar.set(Calendar.MILLISECOND, millisecondsInDay);
- return calendar.getTime();
- } else {
- return null;
- }
+ public static Date getJavaDate(final double excelDate, final boolean use1904windowing) {
+ Calendar cal = getJavaCalendar(excelDate, use1904windowing);
+ return (cal == null ? null : cal.getTime());
}
/**
* Given a double, checks if it is a valid Excel date.
*
* @return true if valid
- * @param value
+ * @param excelDate
* the double value
*/
- public static boolean isValidExcelDate(final double value) {
- return (value > -Double.MIN_VALUE);
+ public static boolean isValidExcelDate(final double excelDate) {
+ return (excelDate > -Double.MIN_VALUE);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Google A. <goo...@go...> - 2006-09-14 07:22:58
|
<html><head></head><body><div style="font-family: sans-serif"> <font size=+1>Google Alert for: <b>objectlabkit</b></font> <p><p><a style="color: blue" href="http://www.nabble.com/-m1.1-rc1--javadoc-does-not-generate-anything...-t2220969.html"> Nabble - [m1.1-rc1] javadoc does not generate anything...</a><br> <font size=-1>[C:\project\<b>objectlabkit</b>\datecalc-common/target/javadoc] > > [echo] sourceModifications <br> not used. > [echo] internal_javadoc_needed is false <b>...</b><br> </font><p><a style="color: blue" href="http://www.mail-archive.com/us...@ma.../msg50959.html"> [m1.1-rc1] javadoc does not generate anything...</a><br> <font size=-1>maven.javadoc.customtags = [] maven.javadoc.destdir =<br> [C:\project\<b>objectlabkit</b>\datecalc-common/target/docs/apidocs] maven.javadoc.footer <b>...</b><br> </font><br><p><hr noshade size=1><font size=-1> This once a day Google Alert is brought to you by Google. </font><p><font size=-1> <nobr> <a href="http://www.google.com/alerts/remove?s=EAAAAMv_nsSnDYW8fCLLhAROcgU&hl=en">Remove</a> this alert. </nobr> <br><a href="http://www.google.com/alerts?hl=en">Create</a> another alert. <br><a href="http://www.google.com/alerts/manage?hl=en">Manage</a> your alerts. </font></p></div></body></html> |
|
From: <be...@us...> - 2006-09-13 16:18:03
|
Revision: 174
http://svn.sourceforge.net/objectlabkit/?rev=174&view=rev
Author: benoitx
Date: 2006-09-13 09:17:59 -0700 (Wed, 13 Sep 2006)
Log Message:
-----------
fix url for svn access.
Modified Paths:
--------------
trunk/common-build/project.xml
Modified: trunk/common-build/project.xml
===================================================================
--- trunk/common-build/project.xml 2006-09-13 15:08:18 UTC (rev 173)
+++ trunk/common-build/project.xml 2006-09-13 16:17:59 UTC (rev 174)
@@ -42,9 +42,9 @@
/var/www/solutions/website/objectlab.co.uk/
</siteDirectory>
<repository>
- <url>https://svn.sourceforge.net/svnroot/objectlabkit</url>
+ <url>https://svn.sourceforge.net/viewvc/objectlabkit/</url>
<connection>
- scm:svn:https://svn.sourceforge.net/svnroot/objectlabkit/trunk
+ https://svn.sourceforge.net/svnroot/objectlabkit/trunk
</connection>
<developerConnection>
scm:svn:https://svn.sourceforge.net/svnroot/objectlabkit/trunk
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2006-09-13 15:08:43
|
Revision: 173
http://svn.sourceforge.net/objectlabkit/?rev=173&view=rev
Author: benoitx
Date: 2006-09-13 08:08:18 -0700 (Wed, 13 Sep 2006)
Log Message:
-----------
Use FQN for all @link stuff in javadoc (so that Eclipse does not try to import those classes unduly).
Modified Paths:
--------------
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarBackwardHandler.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/CalendarForwardHandler.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/CalendarModifiedFollowingHandler.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedPreceedingHandler.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/DateBackwardHandler.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateForwardHandler.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateIMMDateCalculator.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedFollowingHandler.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedPreceedingHandler.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DatePeriodCountCalculator.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/LocalDatePeriodCountCalculator.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayBackwardHandler.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayIMMDateCalculator.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPreceedingHandler.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayPeriodCountCalculator.java
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarBackwardHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarBackwardHandler.java 2006-09-13 13:40:15 UTC (rev 172)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarBackwardHandler.java 2006-09-13 15:08:18 UTC (rev 173)
@@ -23,8 +23,9 @@
import net.objectlab.kit.datecalc.common.HolidayHandlerType;
/**
- * A Jdk <code>Calendar</code> implementation of the {@link HolidayHandler},
- * for the <strong>Backward</strong> algorithm.
+ * A Jdk <code>Calendar</code> implementation of the
+ * {@link net.objectlab.kit.datecalc.common.HolidayHandler}, for the
+ * <strong>Backward</strong> algorithm.
*
* @author Marcin Jekot
* @author $LastChangedBy: marchy $
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 2006-09-13 13:40:15 UTC (rev 172)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java 2006-09-13 15:08:18 UTC (rev 173)
@@ -79,7 +79,7 @@
@Override
public DateCalculator<Calendar> moveByMonths(final int months) {
- Calendar date = getCurrentBusinessDate();
+ final Calendar date = getCurrentBusinessDate();
date.add(Calendar.MONTH,months);
setCurrentBusinessDate(date);
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarForwardHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarForwardHandler.java 2006-09-13 13:40:15 UTC (rev 172)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarForwardHandler.java 2006-09-13 15:08:18 UTC (rev 173)
@@ -24,8 +24,9 @@
import net.objectlab.kit.datecalc.common.HolidayHandlerType;
/**
- * A Jdk <code>Calendar</code> implementation of the {@link HolidayHandler},
- * for the <strong>Forward</strong> algorithm.
+ * A Jdk <code>Calendar</code> implementation of the
+ * {@link net.objectlab.kit.datecalc.common.HolidayHandler}, for the
+ * <strong>Forward</strong> algorithm.
*
* @author Marcin Jekot
* @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 2006-09-13 13:40:15 UTC (rev 172)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarIMMDateCalculator.java 2006-09-13 15:08:18 UTC (rev 173)
@@ -22,11 +22,11 @@
import java.util.List;
import net.objectlab.kit.datecalc.common.AbstractIMMDateCalculator;
-import net.objectlab.kit.datecalc.common.IMMDateCalculator;
import net.objectlab.kit.datecalc.common.IMMPeriod;
/**
- * Jdk Calendar implementation of the {@link IMMDateCalculator}
+ * Jdk Calendar implementation of the
+ * {@link net.objectlab.kit.datecalc.common.IMMDateCalculator}
*
* @author Marcin Jekot
* @author $LastChangedBy: marchy $
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedFollowingHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedFollowingHandler.java 2006-09-13 13:40:15 UTC (rev 172)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedFollowingHandler.java 2006-09-13 15:08:18 UTC (rev 173)
@@ -23,8 +23,9 @@
import net.objectlab.kit.datecalc.common.HolidayHandlerType;
/**
- * A Jdk <code>Calendar</code> implementation of the {@link HolidayHandler},
- * for the <strong>Modified Following</strong> algorithm.
+ * A Jdk <code>Calendar</code> implementation of the
+ * {@link net.objectlab.kit.datecalc.common.HolidayHandler}, for the
+ * <strong>Modified Following</strong> algorithm.
*
* @author Marcin Jekot
* @author $LastChangedBy: marchy $
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedPreceedingHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedPreceedingHandler.java 2006-09-13 13:40:15 UTC (rev 172)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedPreceedingHandler.java 2006-09-13 15:08:18 UTC (rev 173)
@@ -22,8 +22,9 @@
import net.objectlab.kit.datecalc.common.HolidayHandlerType;
/**
- * A Jdk <code>Calendar</code> implementation of the {@link HolidayHandler},
- * for the <strong>Modified Preceeding</strong> algorithm.
+ * A Jdk <code>Calendar</code> implementation of the
+ * {@link net.objectlab.kit.datecalc.common.HolidayHandler}, for the
+ * <strong>Modified Preceeding</strong> algorithm.
*
* @author Marcin Jekot
* @author $LastChangedBy: marchy $
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 2006-09-13 13:40:15 UTC (rev 172)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java 2006-09-13 15:08:18 UTC (rev 173)
@@ -24,7 +24,7 @@
/**
* Jdk <code>Calendar</code> based implementation of the
- * {@link PeriodCountCalculator}
+ * {@link net.objectlab.kit.datecalc.common.PeriodCountCalculator}.
*
* @author Marcin Jekot
* @author $LastChangedBy$
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateBackwardHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateBackwardHandler.java 2006-09-13 13:40:15 UTC (rev 172)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateBackwardHandler.java 2006-09-13 15:08:18 UTC (rev 173)
@@ -23,8 +23,9 @@
import net.objectlab.kit.datecalc.common.HolidayHandlerType;
/**
- * A Jdk <code>Date</code> implementation of the {@link HolidayHandler}, for
- * the <strong>Backward</strong> algorithm.
+ * A Jdk <code>Date</code> implementation of the
+ * {@link net.objectlab.kit.datecalc.common.HolidayHandler}, for the
+ * <strong>Backward</strong> algorithm.
*
* @author Marcin Jekot
* @author $LastChangedBy: marchy $
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateForwardHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateForwardHandler.java 2006-09-13 13:40:15 UTC (rev 172)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateForwardHandler.java 2006-09-13 15:08:18 UTC (rev 173)
@@ -26,8 +26,9 @@
import net.objectlab.kit.datecalc.common.Utils;
/**
- * A Jdk <code>Date</code> implementation of the {@link HolidayHandler}, for
- * the <strong>Forward</strong> algorithm.
+ * A Jdk <code>Date</code> implementation of the
+ * {@link net.objectlab.kit.datecalc.common.HolidayHandler}, for the
+ * <strong>Forward</strong> algorithm.
*
* @author Marcin Jekot
* @author $LastChangedBy: benoitx $
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateIMMDateCalculator.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateIMMDateCalculator.java 2006-09-13 13:40:15 UTC (rev 172)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateIMMDateCalculator.java 2006-09-13 15:08:18 UTC (rev 173)
@@ -27,8 +27,9 @@
import net.objectlab.kit.datecalc.common.Utils;
/**
- * Jdk <code>Date</code> based implementation of the {@link IMMDateCalculator}.
- * It simply delegates to the Calendar implementation.
+ * Jdk <code>Date</code> based implementation of the
+ * {@link net.objectlab.kit.datecalc.common.IMMDateCalculator}. It simply
+ * delegates to the Calendar implementation.
*
* @author Marcin Jekot
* @author $LastChangedBy: marchy $
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedFollowingHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedFollowingHandler.java 2006-09-13 13:40:15 UTC (rev 172)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedFollowingHandler.java 2006-09-13 15:08:18 UTC (rev 173)
@@ -26,8 +26,9 @@
import net.objectlab.kit.datecalc.common.Utils;
/**
- * A Jdk <code>Date</code> implementation of the {@link HolidayHandler}, for
- * the <strong>Modified Following</strong> algorithm.
+ * A Jdk <code>Date</code> implementation of the
+ * {@link net.objectlab.kit.datecalc.common.HolidayHandler}, for the
+ * <strong>Modified Following</strong> algorithm.
*
* @author Marcin Jekot
* @author $LastChangedBy: marchy $
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedPreceedingHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedPreceedingHandler.java 2006-09-13 13:40:15 UTC (rev 172)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedPreceedingHandler.java 2006-09-13 15:08:18 UTC (rev 173)
@@ -23,8 +23,9 @@
import net.objectlab.kit.datecalc.common.HolidayHandlerType;
/**
- * A Jdk <code>Date</code> implementation of the {@link HolidayHandler}, for
- * the <strong>Modified Preceeding</strong> algorithm.
+ * A Jdk <code>Date</code> implementation of the
+ * {@link net.objectlab.kit.datecalc.common.HolidayHandler}, for the
+ * <strong>Modified Preceeding</strong> algorithm.
*
* @author Marcin Jekot
* @author $LastChangedBy: marchy $
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DatePeriodCountCalculator.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DatePeriodCountCalculator.java 2006-09-13 13:40:15 UTC (rev 172)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DatePeriodCountCalculator.java 2006-09-13 15:08:18 UTC (rev 173)
@@ -25,7 +25,7 @@
/**
* Jdk <code>Date</code> based implementation of the
- * {@link PeriodCountCalculator}
+ * {@link net.objectlab.kit.datecalc.common.PeriodCountCalculator}
*
* @author Marcin Jekot
* @author $LastChangedBy$
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 2006-09-13 13:40:15 UTC (rev 172)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateIMMDateCalculator.java 2006-09-13 15:08:18 UTC (rev 173)
@@ -28,7 +28,7 @@
/**
* Joda <code>LocalDate</code> based implementation of the
- * {@link IMMDateCalculator}
+ * {@link net.objectlab.kit.datecalc.common.IMMDateCalculator}.
*
* @author Benoit Xhenseval
* @author $LastChangedBy: marchy $
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 2006-09-13 13:40:15 UTC (rev 172)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculator.java 2006-09-13 15:08:18 UTC (rev 173)
@@ -26,7 +26,7 @@
/**
* Joda <code>LocalDatePeriod</code> based implementation of the
- * {@link PeriodCountCalculator}
+ * {@link net.objectlab.kit.datecalc.common.PeriodCountCalculator}.
*
* @author Benoit Xhenseval
* @author $LastChangedBy: marchy $
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayBackwardHandler.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayBackwardHandler.java 2006-09-13 13:40:15 UTC (rev 172)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayBackwardHandler.java 2006-09-13 15:08:18 UTC (rev 173)
@@ -41,6 +41,7 @@
* the calculator
* @return the date which may have moved.
*/
+ @Override
public YearMonthDay moveCurrentDate(final DateCalculator<YearMonthDay> calculator) {
return move(calculator, -1);
}
@@ -50,6 +51,7 @@
*
* @return algorithm name.
*/
+ @Override
public String getType() {
return HolidayHandlerType.BACKWARD;
}
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayIMMDateCalculator.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayIMMDateCalculator.java 2006-09-13 13:40:15 UTC (rev 172)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayIMMDateCalculator.java 2006-09-13 15:08:18 UTC (rev 173)
@@ -28,7 +28,7 @@
/**
* Joda <code>YearMonthDay</code> based implementation of the
- * {@link IMMDateCalculator}
+ * {@link net.objectlab.kit.datecalc.common.IMMDateCalculator}
*
* @author Benoit Xhenseval
* @author $LastChangedBy: marchy $
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPreceedingHandler.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPreceedingHandler.java 2006-09-13 13:40:15 UTC (rev 172)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPreceedingHandler.java 2006-09-13 15:08:18 UTC (rev 173)
@@ -42,6 +42,7 @@
* the calculator
* @return the date which may have moved.
*/
+ @Override
public YearMonthDay moveCurrentDate(final DateCalculator<YearMonthDay> calculator) {
return move(calculator, -1);
}
@@ -51,6 +52,7 @@
*
* @return algorithm name.
*/
+ @Override
public String getType() {
return HolidayHandlerType.MODIFIED_PRECEEDING;
}
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayPeriodCountCalculator.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayPeriodCountCalculator.java 2006-09-13 13:40:15 UTC (rev 172)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayPeriodCountCalculator.java 2006-09-13 15:08:18 UTC (rev 173)
@@ -24,8 +24,8 @@
/**
* Joda <code>YearMonthDay</code> based implementation of the
- * {@link PeriodCountCalculator}. It just delegates to a
- * <code>PeriodCountCalculator<LocalDate></code>
+ * {@link net.objectlab.kit.datecalc.common.PeriodCountCalculator}. It just
+ * delegates to a <code>PeriodCountCalculator<LocalDate></code>
*
* @author Benoit Xhenseval
* @author $LastChangedBy: marchy $
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Google A. <goo...@go...> - 2006-09-13 14:27:12
|
Google received a request to start sending Alerts for the search [ objectlabkit ] to kit...@ob.... Verify this Google Alert request: http://www.google.com/alerts/verify?s=EAAAAMv_nsSnDYW8fCLLhAROcgU Cancel this Google Alert request: http://www.google.com/alerts/remove?s=EAAAAMv_nsSnDYW8fCLLhAROcgU Thanks, The Google Alerts Team http://www.google.com/alerts |
|
From: <be...@us...> - 2006-09-13 13:40:20
|
Revision: 172
http://svn.sourceforge.net/objectlabkit/?rev=172&view=rev
Author: benoitx
Date: 2006-09-13 06:40:15 -0700 (Wed, 13 Sep 2006)
Log Message:
-----------
Removed unused imports. The weird thing is that Eclipse "Organise Imports" DOES add them back!!! Why?
Modified Paths:
--------------
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateIMMDateCalculator.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayIMMDateCalculator.java
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 2006-09-13 13:38:30 UTC (rev 171)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateIMMDateCalculator.java 2006-09-13 13:40:15 UTC (rev 172)
@@ -21,7 +21,6 @@
import java.util.List;
import net.objectlab.kit.datecalc.common.AbstractIMMDateCalculator;
-import net.objectlab.kit.datecalc.common.IMMDateCalculator;
import net.objectlab.kit.datecalc.common.IMMPeriod;
import org.joda.time.DateTimeConstants;
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayIMMDateCalculator.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayIMMDateCalculator.java 2006-09-13 13:38:30 UTC (rev 171)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayIMMDateCalculator.java 2006-09-13 13:40:15 UTC (rev 172)
@@ -21,7 +21,6 @@
import java.util.List;
import net.objectlab.kit.datecalc.common.AbstractIMMDateCalculator;
-import net.objectlab.kit.datecalc.common.IMMDateCalculator;
import net.objectlab.kit.datecalc.common.IMMPeriod;
import org.joda.time.LocalDate;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2006-09-13 13:39:22
|
Revision: 171
http://svn.sourceforge.net/objectlabkit/?rev=171&view=rev
Author: benoitx
Date: 2006-09-13 06:38:30 -0700 (Wed, 13 Sep 2006)
Log Message:
-----------
Removed unused imports. The weird thing is that Eclipse "Organise Imports" DOES add them back!!! Why?
Modified Paths:
--------------
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarBackwardHandler.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedPreceedingHandler.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateBackwardHandler.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateIMMDateCalculator.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedPreceedingHandler.java
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarBackwardHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarBackwardHandler.java 2006-09-12 21:29:07 UTC (rev 170)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarBackwardHandler.java 2006-09-13 13:38:30 UTC (rev 171)
@@ -20,7 +20,6 @@
import java.util.Calendar;
import net.objectlab.kit.datecalc.common.DateCalculator;
-import net.objectlab.kit.datecalc.common.HolidayHandler;
import net.objectlab.kit.datecalc.common.HolidayHandlerType;
/**
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedPreceedingHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedPreceedingHandler.java 2006-09-12 21:29:07 UTC (rev 170)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedPreceedingHandler.java 2006-09-13 13:38:30 UTC (rev 171)
@@ -19,7 +19,6 @@
import java.util.Calendar;
import net.objectlab.kit.datecalc.common.DateCalculator;
-import net.objectlab.kit.datecalc.common.HolidayHandler;
import net.objectlab.kit.datecalc.common.HolidayHandlerType;
/**
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateBackwardHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateBackwardHandler.java 2006-09-12 21:29:07 UTC (rev 170)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateBackwardHandler.java 2006-09-13 13:38:30 UTC (rev 171)
@@ -20,7 +20,6 @@
import java.util.Date;
import net.objectlab.kit.datecalc.common.DateCalculator;
-import net.objectlab.kit.datecalc.common.HolidayHandler;
import net.objectlab.kit.datecalc.common.HolidayHandlerType;
/**
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateIMMDateCalculator.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateIMMDateCalculator.java 2006-09-12 21:29:07 UTC (rev 170)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateIMMDateCalculator.java 2006-09-13 13:38:30 UTC (rev 171)
@@ -23,7 +23,6 @@
import java.util.List;
import net.objectlab.kit.datecalc.common.AbstractIMMDateCalculator;
-import net.objectlab.kit.datecalc.common.IMMDateCalculator;
import net.objectlab.kit.datecalc.common.IMMPeriod;
import net.objectlab.kit.datecalc.common.Utils;
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedPreceedingHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedPreceedingHandler.java 2006-09-12 21:29:07 UTC (rev 170)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedPreceedingHandler.java 2006-09-13 13:38:30 UTC (rev 171)
@@ -20,7 +20,6 @@
import java.util.Date;
import net.objectlab.kit.datecalc.common.DateCalculator;
-import net.objectlab.kit.datecalc.common.HolidayHandler;
import net.objectlab.kit.datecalc.common.HolidayHandlerType;
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2006-09-12 21:29:23
|
Revision: 170
http://svn.sourceforge.net/objectlabkit/?rev=170&view=rev
Author: benoitx
Date: 2006-09-12 14:29:07 -0700 (Tue, 12 Sep 2006)
Log Message:
-----------
new qalab.xml
Modified Paths:
--------------
trunk/datecalc-common/qalab.xml
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractPeriodCountCalculatorTest.java
Modified: trunk/datecalc-common/qalab.xml
===================================================================
--- trunk/datecalc-common/qalab.xml 2006-09-12 15:43:15 UTC (rev 169)
+++ trunk/datecalc-common/qalab.xml 2006-09-12 21:29:07 UTC (rev 170)
@@ -360,7 +360,7 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-09" statvalue="88" type="cobertura-line"/>
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
- <result date="2006-09-12" statvalue="87" type="cobertura-line"/>
+ <result date="2006-09-12" statvalue="88" type="cobertura-line"/>
<result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_common_IMMPeriod.java" path="net/objectlab/kit/datecalc/common/IMMPeriod.java">
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractPeriodCountCalculatorTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractPeriodCountCalculatorTest.java 2006-09-12 15:43:15 UTC (rev 169)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractPeriodCountCalculatorTest.java 2006-09-12 21:29:07 UTC (rev 170)
@@ -123,10 +123,6 @@
// end of set
};
- // private static final String[][] ACT_ACT = {
- // { "my testies", "2006-08-08", "2006-11-08", "ACT_ACT", "92", "0" },
- // };
-
private static final String[][] ACT_ACT = {
// name start end period dayDiff yearDiff
{ "0D", "2006-08-08", "2006-08-08", "ACT_ACT", "0", "0.00" },
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2006-09-12 15:43:21
|
Revision: 169
http://svn.sourceforge.net/objectlabkit/?rev=169&view=rev
Author: benoitx
Date: 2006-09-12 08:43:15 -0700 (Tue, 12 Sep 2006)
Log Message:
-----------
add some keywords and meta data for website.
Modified Paths:
--------------
trunk/src/site/algo.xml
trunk/src/site/index.xml
trunk/src/site/tenor.xml
Modified: trunk/src/site/algo.xml
===================================================================
--- trunk/src/site/algo.xml 2006-09-12 15:13:39 UTC (rev 168)
+++ trunk/src/site/algo.xml 2006-09-12 15:43:15 UTC (rev 169)
@@ -4,7 +4,19 @@
<title>ObjectLab Kit - Holiday Handler Algorithms</title>
</properties>
<head>
+ <meta name="description"
+ content="ObjectLab Kit offers free and open source Date calculators, released under the business-friendly Apache 2.0 license."
+ />
+ <meta name="keywords"
+ content="Date calculator, IMM Dates, Period Calculator, Financial Calendar, Business Calendar, java, open source" />
+ <meta name="Subject" content="Date Calculators" />
+ <meta name="Copyright" content="ObjectLab Financial Ltd" />
+ <meta name="Language" content="English" />
+ <meta name="Designer" content="ObjectLab Financial Ltd" />
+ <meta name="Distribution" content="Global" />
+ <meta name="robots" content="ALL"/>
+ <meta name="Revisit-After" content="20 Days" />
</head>
<body>
<!-- The body of the document contains a number of sections -->
Modified: trunk/src/site/index.xml
===================================================================
--- trunk/src/site/index.xml 2006-09-12 15:13:39 UTC (rev 168)
+++ trunk/src/site/index.xml 2006-09-12 15:43:15 UTC (rev 169)
@@ -4,7 +4,19 @@
<title>ObjectLab Kit - Introduction</title>
</properties>
<head>
+ <meta name="description"
+ content="ObjectLab Kit offers free and open source Date calculators, released under the business-friendly Apache 2.0 license."
+ />
+ <meta name="keywords"
+ content="Date calculator, IMM Dates, Period Calculator, Financial Calendar, Business Calendar, java, open source" />
+ <meta name="Subject" content="Date Calculators" />
+ <meta name="Copyright" content="ObjectLab Financial Ltd" />
+ <meta name="Language" content="English" />
+ <meta name="Designer" content="ObjectLab Financial Ltd" />
+ <meta name="Distribution" content="Global" />
+ <meta name="robots" content="ALL"/>
+ <meta name="Revisit-After" content="20 Days" />
</head>
<body>
<!-- The body of the document contains a number of sections -->
Modified: trunk/src/site/tenor.xml
===================================================================
--- trunk/src/site/tenor.xml 2006-09-12 15:13:39 UTC (rev 168)
+++ trunk/src/site/tenor.xml 2006-09-12 15:43:15 UTC (rev 169)
@@ -4,7 +4,19 @@
<title>ObjectLab Kit - Tenor Handling</title>
</properties>
<head>
+ <meta name="description"
+ content="ObjectLab Kit offers free and open source Date calculators, released under the business-friendly Apache 2.0 license."
+ />
+ <meta name="keywords"
+ content="Date calculator, IMM Dates, Period Calculator, Financial Calendar, Business Calendar, java, open source" />
+ <meta name="Subject" content="Date Calculators" />
+ <meta name="Copyright" content="ObjectLab Financial Ltd" />
+ <meta name="Language" content="English" />
+ <meta name="Designer" content="ObjectLab Financial Ltd" />
+ <meta name="Distribution" content="Global" />
+ <meta name="robots" content="ALL"/>
+ <meta name="Revisit-After" content="20 Days" />
</head>
<body>
<!-- The body of the document contains a number of sections -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2006-09-12 15:13:42
|
Revision: 168
http://svn.sourceforge.net/objectlabkit/?rev=168&view=rev
Author: benoitx
Date: 2006-09-12 08:13:39 -0700 (Tue, 12 Sep 2006)
Log Message:
-----------
yDoc back on.
Modified Paths:
--------------
trunk/common-build/project.xml
Modified: trunk/common-build/project.xml
===================================================================
--- trunk/common-build/project.xml 2006-09-12 15:11:43 UTC (rev 167)
+++ trunk/common-build/project.xml 2006-09-12 15:13:39 UTC (rev 168)
@@ -132,7 +132,7 @@
<report>maven-simian-plugin</report>
<report>maven-cobertura-plugin</report>
<report>maven-qalab-plugin</report>
-<!-- <report>maven-ydoc-plugin</report>-->
+ <report>maven-ydoc-plugin</report>
<report>maven-jdepend-plugin</report>
<report>maven-faq-plugin</report>
<report>maven-junit-report-plugin</report>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2006-09-12 15:11:55
|
Revision: 167
http://svn.sourceforge.net/objectlabkit/?rev=167&view=rev
Author: benoitx
Date: 2006-09-12 08:11:43 -0700 (Tue, 12 Sep 2006)
Log Message:
-----------
Tidy up and small steps towards release 1.
Modified Paths:
--------------
trunk/common-build/project.xml
trunk/datecalc-common/project.xml
trunk/datecalc-common/qalab.xml
trunk/datecalc-jdk/project.xml
trunk/datecalc-jdk/qalab.xml
trunk/datecalc-joda/project.xml
trunk/datecalc-joda/qalab.xml
trunk/maven.xml
trunk/project.xml
Modified: trunk/common-build/project.xml
===================================================================
--- trunk/common-build/project.xml 2006-09-12 13:28:20 UTC (rev 166)
+++ trunk/common-build/project.xml 2006-09-12 15:11:43 UTC (rev 167)
@@ -1,11 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
/*
* ========================================================================
- * ObjectLab Financial Ltd, proud sponsor of The Kit.
+ * $Id: JdkCalendarBaseDateCalculator.java 128 2006-09-08 13:14:46Z benoitx $
+ *
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
* ========================================================================
*/
-->
+
<project xmlns="http://maven.apache.org/POM/3.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/3.0.0 http://maven.apache.org/maven-v3_0_0.xsd">
@@ -68,6 +84,7 @@
<unsubscribe>
https://lists.sourceforge.net/lists/listinfo/objectlabkit-announce
</unsubscribe>
+ <post/>
<archive>
http://sourceforge.net/mailarchive/forum.php?forum=objectlabkit-announce
</archive>
@@ -81,6 +98,7 @@
<unsubscribe>
https://lists.sourceforge.net/lists/listinfo/objectlabkit-user
</unsubscribe>
+ <post>obj...@li...</post>
<archive>
http://sourceforge.net/mailarchive/forum.php?forum=objectlabkit-user
</archive>
@@ -93,6 +111,7 @@
<unsubscribe>
https://lists.sourceforge.net/lists/listinfo/objectlabkit-svn
</unsubscribe>
+ <post/>
<archive>
http://sourceforge.net/mailarchive/forum.php?forum=objectlabkit-svn
</archive>
@@ -113,7 +132,7 @@
<report>maven-simian-plugin</report>
<report>maven-cobertura-plugin</report>
<report>maven-qalab-plugin</report>
- <report>maven-ydoc-plugin</report>
+<!-- <report>maven-ydoc-plugin</report>-->
<report>maven-jdepend-plugin</report>
<report>maven-faq-plugin</report>
<report>maven-junit-report-plugin</report>
@@ -125,7 +144,7 @@
<version>
<id>1.0</id>
<name>1.0</name>
- <tag>KIT_1_0</tag>
+ <tag>v1.0</tag>
</version>
</versions>
</project>
Modified: trunk/datecalc-common/project.xml
===================================================================
--- trunk/datecalc-common/project.xml 2006-09-12 13:28:20 UTC (rev 166)
+++ trunk/datecalc-common/project.xml 2006-09-12 15:11:43 UTC (rev 167)
@@ -3,7 +3,21 @@
<!--
/*
* ========================================================================
- * ObjectLab Financial Ltd, proud sponsor of The Kit.
+ * $Id$
+ *
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
* ========================================================================
*/
-->
@@ -26,7 +40,7 @@
scm:svn:https://svn.sourceforge.net/svnroot/objectlabkit/trunk/datecalc-common
</developerConnection>
</repository>
- <dependencies></dependencies>
+ <dependencies />
<build>
<sourceDirectory>src/main/java</sourceDirectory>
Modified: trunk/datecalc-common/qalab.xml
===================================================================
--- trunk/datecalc-common/qalab.xml 2006-09-12 13:28:20 UTC (rev 166)
+++ trunk/datecalc-common/qalab.xml 2006-09-12 15:11:43 UTC (rev 167)
@@ -61,6 +61,8 @@
<summaryresult date="2006-09-07" filecount="17" statvalue="64" type="cobertura-branch"/>
<summaryresult date="2006-09-09" filecount="17" statvalue="63" type="cobertura-line"/>
<summaryresult date="2006-09-09" filecount="17" statvalue="64" type="cobertura-branch"/>
+ <summaryresult date="2006-09-12" filecount="17" statvalue="59" type="cobertura-line"/>
+ <summaryresult date="2006-09-12" filecount="17" statvalue="62" type="cobertura-branch"/>
</summary>
<file id="net_objectlab_kit_datecalc_common_package.html" path="net/objectlab/kit/datecalc/common/package.html">
<result date="2006-08-08" statvalue="1" type="checkstyle"/>
@@ -107,6 +109,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_common_WorkingWeek.java" path="net/objectlab/kit/datecalc/common/WorkingWeek.java">
<result date="2006-08-08" statvalue="3" type="checkstyle"/>
@@ -145,6 +149,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-09" statvalue="95" type="cobertura-line"/>
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-12" statvalue="95" type="cobertura-line"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_common_TenorCode.java" path="net/objectlab/kit/datecalc/common/TenorCode.java">
<result date="2006-08-08" statvalue="100" type="cobertura-line"/>
@@ -175,6 +181,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_common_HolidayHandlerType.java" path="net/objectlab/kit/datecalc/common/HolidayHandlerType.java">
<result date="2006-08-08" statvalue="100" type="cobertura-branch"/>
@@ -191,6 +199,7 @@
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_common_PeriodCountBasis.java" path="net/objectlab/kit/datecalc/common/PeriodCountBasis.java">
<result date="2006-08-08" statvalue="100" type="cobertura-branch"/>
@@ -205,6 +214,7 @@
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_common_StandardTenor.java" path="net/objectlab/kit/datecalc/common/StandardTenor.java">
<result date="2006-08-08" statvalue="100" type="cobertura-branch"/>
@@ -234,6 +244,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-09" statvalue="92" type="cobertura-line"/>
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-12" statvalue="90" type="cobertura-line"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_common_AbstractDateCalculator.java" path="net/objectlab/kit/datecalc/common/AbstractDateCalculator.java">
@@ -261,6 +273,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_common_HolidayHandler.java" path="net/objectlab/kit/datecalc/common/HolidayHandler.java">
<result date="2006-08-23" statvalue="100" type="cobertura-line"/>
@@ -281,6 +295,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_common_AbstractDateCalculatorFactory.java" path="net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactory.java">
@@ -329,6 +345,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_common_Utils.java" path="net/objectlab/kit/datecalc/common/Utils.java">
<result date="2006-09-04" statvalue="2" type="checkstyle"/>
@@ -342,6 +360,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-09" statvalue="88" type="cobertura-line"/>
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-12" statvalue="87" type="cobertura-line"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_common_IMMPeriod.java" path="net/objectlab/kit/datecalc/common/IMMPeriod.java">
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
@@ -349,6 +369,7 @@
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_common_ExcelDateUtil.java" path="net/objectlab/kit/datecalc/common/ExcelDateUtil.java">
<result date="2006-09-05" statvalue="84" type="cobertura-line"/>
@@ -359,6 +380,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-09" statvalue="93" type="cobertura-line"/>
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-12" statvalue="93" type="cobertura-line"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_common_IMMDateCalculator.java" path="net/objectlab/kit/datecalc/common/IMMDateCalculator.java">
<result date="2006-09-06" statvalue="100" type="cobertura-line"/>
@@ -367,16 +390,21 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_common_AbstractIMMDateCalculator.java" path="net/objectlab/kit/datecalc/common/AbstractIMMDateCalculator.java">
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_common_KitCalculatorsFactory.java" path="net/objectlab/kit/datecalc/common/KitCalculatorsFactory.java">
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
</qalab>
Modified: trunk/datecalc-jdk/project.xml
===================================================================
--- trunk/datecalc-jdk/project.xml 2006-09-12 13:28:20 UTC (rev 166)
+++ trunk/datecalc-jdk/project.xml 2006-09-12 15:11:43 UTC (rev 167)
@@ -3,7 +3,21 @@
<!--
/*
* ========================================================================
- * ObjectLab Financial Ltd, proud sponsor of The Kit.
+ * $Id$
+ *
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
* ========================================================================
*/
-->
@@ -15,8 +29,8 @@
<package>net.objectlab.kit.datecalc</package>
<shortDescription>DateCalc JDK library</shortDescription>
<description>
- This library provides pure JDK implementation of the Date
- Calculator.
+ This library provides pure JDK implementation of the Kit
+ Calculators.
</description>
<repository>
<connection>
@@ -46,25 +60,31 @@
<excludes>
<exclude>**/Abstract*.java</exclude>
</excludes>
+
+ <!-- The tests depends on the COMMON tests. -->
<resources>
- <resource>
- <directory>../datecalc-common/target/test-classes</directory>
- <filtering>false</filtering>
- <includes>
- <include>**/*.class</include>
- </includes>
- </resource>
+ <resource>
+ <directory>
+ ../datecalc-common/target/test-classes
+ </directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>**/*.class</include>
+ </includes>
+ </resource>
</resources>
</unitTest>
- <resources>
- <resource>
- <directory>../datecalc-common/target/</directory>
- <filtering>false</filtering>
- <includes>
- <include>*.jar</include>
- </includes>
- </resource>
- </resources>
+
+ <!-- This JAR should contain the common jar. -->
+ <resources>
+ <resource>
+ <directory>../datecalc-common/target/</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </resource>
+ </resources>
</build>
</project>
Modified: trunk/datecalc-jdk/qalab.xml
===================================================================
--- trunk/datecalc-jdk/qalab.xml 2006-09-12 13:28:20 UTC (rev 166)
+++ trunk/datecalc-jdk/qalab.xml 2006-09-12 15:11:43 UTC (rev 167)
@@ -62,6 +62,10 @@
<summaryresult date="2006-09-07" filecount="19" statvalue="92" type="cobertura-branch"/>
<summaryresult date="2006-09-09" filecount="17" statvalue="95" type="cobertura-line"/>
<summaryresult date="2006-09-09" filecount="17" statvalue="95" type="cobertura-branch"/>
+ <summaryresult date="2006-09-12" filecount="18" statvalue="6" type="checkstyle"/>
+ <summaryresult date="2006-09-12" filecount="6" statvalue="6" type="pmd"/>
+ <summaryresult date="2006-09-12" filecount="17" statvalue="99" type="cobertura-line"/>
+ <summaryresult date="2006-09-12" filecount="17" statvalue="100" type="cobertura-branch"/>
</summary>
<file id="net_objectlab_kit_datecalc_jdk_package.html" path="net/objectlab/kit/datecalc/jdk/package.html">
<result date="2006-08-08" statvalue="1" type="checkstyle"/>
@@ -272,6 +276,8 @@
<result date="2006-09-07" statvalue="84" type="cobertura-branch"/>
<result date="2006-09-09" statvalue="79" type="cobertura-line"/>
<result date="2006-09-09" statvalue="84" type="cobertura-branch"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_DatePeriodCountCalculator.java" path="net/objectlab/kit/datecalc/jdk/DatePeriodCountCalculator.java">
@@ -290,6 +296,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_jdk_ExcelDateUtil.java" path="net/objectlab/kit/datecalc/jdk/ExcelDateUtil.java">
<result date="2006-09-02" statvalue="4" type="checkstyle"/>
@@ -316,6 +324,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-09" statvalue="91" type="cobertura-line"/>
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-12" statvalue="91" type="cobertura-line"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_JdkCalendarBaseDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/JdkCalendarBaseDateCalculator.java">
@@ -451,6 +461,10 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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="1" type="checkstyle"/>
+ <result date="2006-09-12" statvalue="1" type="pmd"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarForwardHandler.java" path="net/objectlab/kit/datecalc/jdk/CalendarForwardHandler.java">
@@ -458,6 +472,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/jdk/CalendarModifiedFollowingHandler.java">
@@ -465,6 +481,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/jdk/CalendarModifiedPreceedingHandler.java">
@@ -472,18 +490,28 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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="1" type="checkstyle"/>
+ <result date="2006-09-12" statvalue="1" type="pmd"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_jdk_DateBackwardHandler.java" path="net/objectlab/kit/datecalc/jdk/DateBackwardHandler.java">
<result date="2006-09-07" statvalue="100" type="cobertura-line"/>
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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="1" type="checkstyle"/>
+ <result date="2006-09-12" statvalue="1" type="pmd"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_jdk_DateForwardHandler.java" path="net/objectlab/kit/datecalc/jdk/DateForwardHandler.java">
<result date="2006-09-07" statvalue="90" type="cobertura-line"/>
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_DateModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/jdk/DateModifiedFollowingHandler.java">
@@ -491,6 +519,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_DateModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/jdk/DateModifiedPreceedingHandler.java">
@@ -498,33 +528,53 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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="1" type="checkstyle"/>
+ <result date="2006-09-12" statvalue="1" type="pmd"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java">
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarIMMDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/CalendarIMMDateCalculator.java">
<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="1" type="checkstyle"/>
+ <result date="2006-09-12" statvalue="1" type="pmd"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarKitCalculatorsFactory.java" path="net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java">
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_jdk_DateDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/DateDateCalculator.java">
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_jdk_DateIMMDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/DateIMMDateCalculator.java">
<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="1" type="checkstyle"/>
+ <result date="2006-09-12" statvalue="1" type="pmd"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_DateKitCalculatorsFactory.java" path="net/objectlab/kit/datecalc/jdk/DateKitCalculatorsFactory.java">
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
</qalab>
Modified: trunk/datecalc-joda/project.xml
===================================================================
--- trunk/datecalc-joda/project.xml 2006-09-12 13:28:20 UTC (rev 166)
+++ trunk/datecalc-joda/project.xml 2006-09-12 15:11:43 UTC (rev 167)
@@ -1,70 +1,93 @@
<?xml version="1.0"?>
<!--
- /*
- * ========================================================================
- *
- * ========================================================================
- */
+ /*
+ * ========================================================================
+ * $Id$
+ *
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ * ========================================================================
+ */
-->
<project>
- <extend>../common-build/project.xml</extend>
- <name>DateCalc Joda</name>
- <artifactId>datecalc-joda</artifactId>
- <package>net.objectlab.kit.datecalc</package>
- <shortDescription>DateCalc JDK library</shortDescription>
- <description>This library provides a JODA-time implementation of the Date Calculator.</description>
- <repository>
- <connection>scm:svn:https://svn.sourceforge.net/svnroot/objectlabkit/trunk/datecalc-joda</connection>
- <developerConnection>scm:svn:https://svn.sourceforge.net/svnroot/objectlabkit/trunk/datecalc-joda</developerConnection>
- </repository>
- <dependencies>
- <dependency>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc-common</artifactId>
- <version>${pom.currentVersion}</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>1.3</version>
- <type>jar</type>
- </dependency>
- </dependencies>
+ <extend>../common-build/project.xml</extend>
+ <name>DateCalc Joda</name>
+ <artifactId>datecalc-joda</artifactId>
+ <package>net.objectlab.kit.datecalc</package>
+ <shortDescription>DateCalc JDK library</shortDescription>
+ <description>
+ This library provides a Joda-Time implementation of the Kit
+ Calculators.
+ </description>
+ <repository>
+ <connection>
+ scm:svn:https://svn.sourceforge.net/svnroot/objectlabkit/trunk/datecalc-joda
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.sourceforge.net/svnroot/objectlabkit/trunk/datecalc-joda
+ </developerConnection>
+ </repository>
+ <dependencies>
+ <dependency>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc-common</artifactId>
+ <version>${pom.currentVersion}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>1.3</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
- <build>
- <sourceDirectory>src/main/java</sourceDirectory>
- <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
- <!-- TODO: to be removed as it is not generic -->
- <nagEmailAddress>bx...@ob...</nagEmailAddress>
- <unitTest>
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
+ <unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/Abstract*.java</exclude>
+ </excludes>
+
+ <!-- The tests depends on the COMMON tests. -->
+ <resources>
+ <resource>
+ <directory>
+ ../datecalc-common/target/test-classes
+ </directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>**/*.class</include>
+ </includes>
+ </resource>
+ </resources>
+ </unitTest>
+ <!-- This JAR should contain the common jar. -->
+ <resources>
+ <resource>
+ <directory>../datecalc-common/target/</directory>
+ <filtering>false</filtering>
<includes>
- <include>**/*Test.java</include>
+ <include>*.jar</include>
</includes>
- <excludes>
- <exclude>**/Abstract*.java</exclude>
- </excludes>
-
- <resources>
- <resource>
- <directory>../datecalc-common/target/test-classes</directory>
- <filtering>false</filtering>
- <includes>
- <include>**/*.class</include>
- </includes>
- </resource>
- </resources>
- </unitTest>
- <resources>
- <resource>
- <directory>../datecalc-common/target/</directory>
- <filtering>false</filtering>
- <includes>
- <include>*.jar</include>
- </includes>
- </resource>
- </resources>
- </build>
+ </resource>
+ </resources>
+ </build>
</project>
Modified: trunk/datecalc-joda/qalab.xml
===================================================================
--- trunk/datecalc-joda/qalab.xml 2006-09-12 13:28:20 UTC (rev 166)
+++ trunk/datecalc-joda/qalab.xml 2006-09-12 15:11:43 UTC (rev 167)
@@ -65,6 +65,10 @@
<summaryresult date="2006-09-07" filecount="19" statvalue="93" type="cobertura-branch"/>
<summaryresult date="2006-09-09" filecount="19" statvalue="96" type="cobertura-line"/>
<summaryresult date="2006-09-09" filecount="19" statvalue="96" type="cobertura-branch"/>
+ <summaryresult date="2006-09-12" filecount="20" statvalue="2" type="checkstyle"/>
+ <summaryresult date="2006-09-12" filecount="2" statvalue="2" type="pmd"/>
+ <summaryresult date="2006-09-12" filecount="19" statvalue="98" type="cobertura-line"/>
+ <summaryresult date="2006-09-12" filecount="19" statvalue="100" type="cobertura-branch"/>
</summary>
<file id="net_objectlab_kit_datecalc_joda_package.html" path="net/objectlab/kit/datecalc/joda/package.html">
<result date="2006-08-08" statvalue="1" type="checkstyle"/>
@@ -181,6 +185,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_joda_BackwardHandler.java" path="net/objectlab/kit/datecalc/joda/BackwardHandler.java">
<result date="2006-08-08" statvalue="28" type="cobertura-line"/>
@@ -369,6 +375,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-09" statvalue="91" type="cobertura-line"/>
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-12" statvalue="91" type="cobertura-line"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateBackwardHandler.java" path="net/objectlab/kit/datecalc/joda/LocalDateBackwardHandler.java">
@@ -384,6 +392,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_joda_LocalDateCalculator.java" path="net/objectlab/kit/datecalc/joda/LocalDateCalculator.java">
<result date="2006-09-02" statvalue="100" type="cobertura-line"/>
@@ -399,6 +409,8 @@
<result date="2006-09-07" statvalue="71" type="cobertura-branch"/>
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateForwardHandler.java" path="net/objectlab/kit/datecalc/joda/LocalDateForwardHandler.java">
@@ -414,6 +426,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingHandler.java">
@@ -429,6 +443,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingHandler.java">
@@ -444,6 +460,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayBackwardHandler.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayBackwardHandler.java">
@@ -459,6 +477,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayDateCalculator.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java">
@@ -474,6 +494,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayForwardHandler.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayForwardHandler.java">
@@ -489,6 +511,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingHandler.java">
@@ -504,6 +528,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPreceedingHandler.java">
@@ -519,6 +545,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_joda_JodaExcelDateUtil.java" path="net/objectlab/kit/datecalc/joda/JodaExcelDateUtil.java">
<result date="2006-09-05" statvalue="85" type="cobertura-line"/>
@@ -529,6 +557,8 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-09" statvalue="92" type="cobertura-line"/>
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-12" statvalue="85" type="cobertura-line"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateIMMDateCalculator.java" path="net/objectlab/kit/datecalc/joda/LocalDateIMMDateCalculator.java">
@@ -538,6 +568,10 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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="1" type="checkstyle"/>
+ <result date="2006-09-12" statvalue="1" type="pmd"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayIMMDateCalculator.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayIMMDateCalculator.java">
@@ -547,25 +581,37 @@
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
<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="1" type="checkstyle"/>
+ <result date="2006-09-12" statvalue="1" type="pmd"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateKitCalculatorsFactory.java" path="net/objectlab/kit/datecalc/joda/LocalDateKitCalculatorsFactory.java">
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDatePeriodCountCalculator.java" path="net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculator.java">
<result date="2006-09-09" statvalue="81" type="cobertura-line"/>
<result date="2006-09-09" statvalue="84" type="cobertura-branch"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayKitCalculatorsFactory.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayKitCalculatorsFactory.java">
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayPeriodCountCalculator.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayPeriodCountCalculator.java">
<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"/>
+ <result date="2006-09-12" statvalue="100" type="cobertura-branch"/>
</file>
</qalab>
Modified: trunk/maven.xml
===================================================================
--- trunk/maven.xml 2006-09-12 13:28:20 UTC (rev 166)
+++ trunk/maven.xml 2006-09-12 15:11:43 UTC (rev 167)
@@ -1,58 +1,75 @@
<?xml version="1.0"?>
-<!--
-/*
- * ========================================================================
- *
- * Copyright 2005 ObjectLab Financial Ltd
- *
- * ========================================================================
- */
--->
+<!--
+ /*
+ * ========================================================================
+ * $Id: JdkCalendarBaseDateCalculator.java 128 2006-09-08 13:14:46Z benoitx $
+ *
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ * ========================================================================
+ */
+-->
+
+<project xmlns:j="jelly:core" xmlns:ant="jelly:ant"
+ xmlns:maven="jelly:maven" xmlns:x="jelly:xml">
-<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:maven="jelly:maven" xmlns:x="jelly:xml">
+ <goal name="kit:clean" prereqs="multiproject:clean,clean" />
+
+ <goal name="kit:build">
+ <j:set var="goal" value="kit:build" />
+ <j:set var="do.obfuscation" value="false" scope="parent" />
+ <attainGoal name="multiproject:goal" />
+ </goal>
- <goal name="kit:build">
- <j:set var="goal" value="kit:build" />
- <j:set var="do.obfuscation" value="false" scope="parent"/>
- <attainGoal name="multiproject:goal" />
- </goal>
-
- <goal name="kit:rebuild">
- <attainGoal name="clean" />
- <attainGoal name="multiproject:clean" />
- <j:set var="goal" value="kit:rebuild" />
- <j:set var="do.obfuscation" value="false" scope="parent"/>
- <attainGoal name="multiproject:goal" />
- </goal>
+ <goal name="kit:rebuild">
+ <attainGoal name="kit:clean" />
+ <j:set var="goal" value="kit:rebuild" />
+ <attainGoal name="multiproject:goal" />
+ </goal>
- <goal name="kit:releasebuild">
- <attainGoal name="clean" />
- <attainGoal name="multiproject:clean" />
- <j:set var="goal" value="artifact:create-upload-bundle" />
- <attainGoal name="multiproject:goal" />
- </goal>
+ <goal name="kit:releasebuild">
+ <attainGoal name="kit:clean" />
+ <j:set var="goal" value="artifact:create-upload-bundle" />
+ <attainGoal name="multiproject:goal" />
+ <attainGoal name="kit:site" />
+ </goal>
- <goal name="kit:site">
- <attainGoal name="dist:multiproject-bin" />
- <attainGoal name="dist:multiproject-src" />
- </goal>
+ <goal name="kit:site">
+ <attainGoal name="dist:build" />
+ <attainGoal name="dist:multiproject" />
+ </goal>
- <goal name="kit:clean" prereqs="multiproject:clean,clean" />
+<!--
+ <goal name="kit:generate" prereqs="multiproject:projects-init">
+ <ant:mkdir dir="${maven.build.dir}" />
+ <maven:get var="multiprojects" plugin="maven-multiproject-plugin"
+ property="multiprojects" />
+ <j:file name="${maven.build.dir}/projects.xml" prettyPrint="true"
+ xmlns="projects">
+ <projects>
+ <j:forEach var="project" items="${multiprojects}">
+ <x:element name="project">
+ <x:attribute name="name">${project.name}</x:attribute>
+ <x:attribute name="artifactId">
+ ${project.artifactId}
+ </x:attribute>
+ </x:element>
+ </j:forEach>
+ </projects>
+ </j:file>
+ </goal>
+ -->
- <goal name="kit:generate" prereqs="multiproject:projects-init">
- <ant:mkdir dir="${maven.build.dir}" />
- <maven:get var="multiprojects" plugin="maven-multiproject-plugin" property="multiprojects" />
- <j:file name="${maven.build.dir}/projects.xml" prettyPrint="true" xmlns="projects">
- <projects>
- <j:forEach var="project" items="${multiprojects}">
- <x:element name="project">
- <x:attribute name="name">${project.name}</x:attribute>
- <x:attribute name="artifactId">${project.artifactId}</x:attribute>
- </x:element>
- </j:forEach>
- </projects>
- </j:file>
- </goal>
-
</project>
Modified: trunk/project.xml
===================================================================
--- trunk/project.xml 2006-09-12 13:28:20 UTC (rev 166)
+++ trunk/project.xml 2006-09-12 15:11:43 UTC (rev 167)
@@ -1,29 +1,42 @@
<?xml version="1.0"?>
<!--
- /*
- * ========================================================================
- *
- * Copyright 2006 ObjectLab Financial Ltd
- *
- * ========================================================================
- */
+ /*
+ * ========================================================================
+ * $Id: JdkCalendarBaseDateCalculator.java 128 2006-09-08 13:14:46Z benoitx $
+ *
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ * ========================================================================
+ */
-->
<project>
- <extend>${basedir}/common-build/project.xml</extend>
- <artifactId>objectlabkit</artifactId>
- <name>ObjectLab Kit</name>
- <shortDescription>Useful Kit from your friendly ObjectLab people</shortDescription>
- <reports>
- <report>maven-faq-plugin</report>
- <report>maven-dashboard-plugin</report>
- <report>maven-license-plugin</report>
- <!-- <report>maven-statcvs-plugin</report> -->
- <report>maven-changes-plugin</report>
- <report>maven-changelog-plugin</report>
- <report>maven-developer-activity-plugin</report>
- <report>maven-file-activity-plugin</report>
- <report>maven-linkcheck-plugin</report>
- </reports>
+ <extend>${basedir}/common-build/project.xml</extend>
+ <artifactId>objectlabkit</artifactId>
+ <name>ObjectLab Kit</name>
+ <shortDescription>
+ Useful Kit from your friendly ObjectLab people: Date Calculators, IMM Dates, Period Count, Tenor moves, etc.
+ </shortDescription>
+ <reports>
+ <report>maven-faq-plugin</report>
+ <report>maven-dashboard-plugin</report>
+ <report>maven-license-plugin</report>
+ <report>maven-changes-plugin</report>
+ <report>maven-changelog-plugin</report>
+ <report>maven-developer-activity-plugin</report>
+ <report>maven-file-activity-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: <ma...@us...> - 2006-09-12 13:28:28
|
Revision: 166
http://svn.sourceforge.net/objectlabkit/?rev=166&view=rev
Author: marchy
Date: 2006-09-12 06:28:20 -0700 (Tue, 12 Sep 2006)
Log Message:
-----------
added pmd report to m2
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2006-09-12 13:09:53 UTC (rev 165)
+++ trunk/pom.xml 2006-09-12 13:28:20 UTC (rev 166)
@@ -9,6 +9,7 @@
<packaging>pom</packaging>
<name>ObjectLab Kit</name>
<version>1.0-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
re-invent the wheel?
@@ -51,6 +52,25 @@
<aggregate>true</aggregate>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <linkXref>true</linkXref>
+ <minimumTokens>100</minimumTokens>
+ <targetJdk>1.5</targetJdk>
+ </configuration>
+ </plugin>
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ -->
</plugins>
</reporting>
@@ -63,14 +83,42 @@
</dependency>
</dependencies>
- <distributionManagement>
- <site>
- <id>stage-site</id>
- <name>Local Stage Site</name>
- <url>file:///temp/objectlabkit</url>
- </site>
- </distributionManagement>
-
+ <profiles>
+ <profile>
+ <id>site-staging</id>
+ <activation>
+ <property>
+ <name>stage</name>
+ </property>
+ </activation>
+
+ <distributionManagement>
+ <site>
+ <id>stage-site</id>
+ <name>Local Stage Site</name>
+ <url>file:///temp/site</url>
+ </site>
+ </distributionManagement>
+ </profile>
+
+ <profile>
+ <id>site-deploy</id>
+ <activation>
+ <property>
+ <name>deploy</name>
+ </property>
+ </activation>
+
+ <distributionManagement>
+ <site>
+ <id>sourceforge-site</id>
+ <name>Sourceforge Site</name>
+ <url>scp:@TODO</url>
+ </site>
+ </distributionManagement>
+ </profile>
+ </profiles>
+
<!--
<dependencyManagement>
<dependencies>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2006-09-12 13:09:56
|
Revision: 165
http://svn.sourceforge.net/objectlabkit/?rev=165&view=rev
Author: benoitx
Date: 2006-09-12 06:09:53 -0700 (Tue, 12 Sep 2006)
Log Message:
-----------
Implemented the JDK moveByMonths (easier than thought) and now only 1 test fails for ACT_ACT. It does not seem to fail for JODA... could it be a TimeZone issue?
Modified Paths:
--------------
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java
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 2006-09-12 11:35:10 UTC (rev 164)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java 2006-09-12 13:09:53 UTC (rev 165)
@@ -79,16 +79,10 @@
@Override
public DateCalculator<Calendar> moveByMonths(final int months) {
- // LocalDate date = getCurrentBusinessDate();
- // int day = date.getDayOfMonth();
- // date = date.withDayOfMonth(1).plusMonths(months);
- //
- // int lastDayOfMonth = date.dayOfMonth().getMaximumValue();
- // if (day>lastDayOfMonth) {
- // day = lastDayOfMonth;
- // }
+ Calendar date = getCurrentBusinessDate();
+ date.add(Calendar.MONTH,months);
- // setCurrentBusinessDate(date.withDayOfMonth(day));
+ setCurrentBusinessDate(date);
if (getHolidayHandler() != null) {
setCurrentBusinessDate(getHolidayHandler().moveCurrentDate(this));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2006-09-12 11:35:16
|
Revision: 164
http://svn.sourceforge.net/objectlabkit/?rev=164&view=rev
Author: benoitx
Date: 2006-09-12 04:35:10 -0700 (Tue, 12 Sep 2006)
Log Message:
-----------
added the Visio diagram.
Added Paths:
-----------
trunk/src/site/tenor.vsd
Added: trunk/src/site/tenor.vsd
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/tenor.vsd
___________________________________________________________________
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...> - 2006-09-12 11:28:48
|
Revision: 163
http://svn.sourceforge.net/objectlabkit/?rev=163&view=rev
Author: benoitx
Date: 2006-09-12 04:28:37 -0700 (Tue, 12 Sep 2006)
Log Message:
-----------
Improved documentation for Tenor Handling!
Modified Paths:
--------------
trunk/src/site/tenor.xml
Added Paths:
-----------
trunk/src/site/1d.png
trunk/src/site/1m.png
trunk/src/site/1w.png
trunk/src/site/1y.png
trunk/src/site/2d.png
trunk/src/site/spot.png
Added: trunk/src/site/1d.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/1d.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/1m.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/1m.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/1w.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/1w.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/1y.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/1y.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/2d.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/2d.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/site/spot.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/site/spot.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/src/site/tenor.xml
===================================================================
--- trunk/src/site/tenor.xml 2006-09-12 10:32:07 UTC (rev 162)
+++ trunk/src/site/tenor.xml 2006-09-12 11:28:37 UTC (rev 163)
@@ -11,8 +11,40 @@
<section name="Tenor Handling">
<subsection name="Spot">
+ <p>Example that shows the calculation of a Spot date with 2 different spotLags. SpotLag is typically 2 days but this may
+ vary by market and/or currencies.</p>
+ <img src="spot.png"/>
</subsection>
+ <subsection name="1D - 1 Day">
+ <p>Example of a 1D calculation, first of all it calculates the Spot Day (spotLag=2) and then adds 1 day to it</p>
+ <img src="1d.png"/>
+ </subsection>
+
+ <subsection name="2D - 2 Day">
+ <p>Example of a 2D calculation, first of all it calculates the Spot Day (spotLag=2) and then adds 2 days to it and it must
+ roll forward as the calculated date falls on a weekend.</p>
+ <img src="2d.png"/>
+ </subsection>
+
+ <subsection name="1W - 1 Week">
+ <p>Example of a 1W calculation, first of all it calculates the Spot Day (spotLag=2) and then adds 1 week to it and it must
+ roll forward as the calculated date falls on a holiday.</p>
+ <img src="1w.png"/>
+ </subsection>
+
+ <subsection name="1M - 1 Month">
+ <p>Example of a 1M calculation, first of all it calculates the Spot Day (spotLag=2) and then adds 1 month to it.
+ Notice that it falls on the last day of the month too.</p>
+ <img src="1m.png"/>
+ </subsection>
+
+ <subsection name="1Y - 1 Year">
+ <p>Example of a 1Y calculation, first of all it calculates the Spot Day (spotLag=2) and then adds 1 year to it.
+ Notice that it falls on a weekend and hence is moved forward (if HandlerHolidayType is 'forward').</p>
+ <img src="1y.png"/>
+ </subsection>
+
</section>
</body>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2006-09-12 10:32:13
|
Revision: 162
http://svn.sourceforge.net/objectlabkit/?rev=162&view=rev
Author: benoitx
Date: 2006-09-12 03:32:07 -0700 (Tue, 12 Sep 2006)
Log Message:
-----------
Findbugs issue.
Modified Paths:
--------------
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.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 2006-09-12 07:21:31 UTC (rev 161)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java 2006-09-12 10:32:07 UTC (rev 162)
@@ -130,7 +130,7 @@
unit *= MONTHS_IN_YEAR;
}
- DateCalculator<E> calc = this;
+ DateCalculator<E> calc;
// move by tenor
switch (tenorCode) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-09-12 07:21:40
|
Revision: 161
http://svn.sourceforge.net/objectlabkit/?rev=161&view=rev
Author: marchy
Date: 2006-09-12 00:21:31 -0700 (Tue, 12 Sep 2006)
Log Message:
-----------
fiddling with the root pom for m2
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2006-09-11 14:57:27 UTC (rev 160)
+++ trunk/pom.xml 2006-09-12 07:21:31 UTC (rev 161)
@@ -11,7 +11,7 @@
<version>1.0-SNAPSHOT</version>
<description>
ObjectLab Kit provides a generic Business Calendar for calculating dates given set(s) of holidays. Why
- re-inventing the wheel???
+ re-invent the wheel?
</description>
<modules>
@@ -30,30 +30,30 @@
<target>1.5</target>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <testFailureIgnore>true</testFailureIgnore>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
<reporting>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<aggregate>true</aggregate>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
</plugins>
</reporting>
-
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -62,7 +62,15 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
+ <distributionManagement>
+ <site>
+ <id>stage-site</id>
+ <name>Local Stage Site</name>
+ <url>file:///temp/objectlabkit</url>
+ </site>
+ </distributionManagement>
+
<!--
<dependencyManagement>
<dependencies>
@@ -83,7 +91,6 @@
</dependency>
</dependencies>
</dependencyManagement>
-
-->
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2006-09-11 14:58:04
|
Revision: 160
http://svn.sourceforge.net/objectlabkit/?rev=160&view=rev
Author: benoitx
Date: 2006-09-11 07:57:27 -0700 (Mon, 11 Sep 2006)
Log Message:
-----------
More JavaDoc.
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/HolidayHandler.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/PeriodCountCalculator.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarBackwardHandler.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarForwardHandler.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedFollowingHandler.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedPreceedingHandler.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateBackwardHandler.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateForwardHandler.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedFollowingHandler.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedPreceedingHandler.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/HolidayHandlerDateWrapper.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/HolidayHandlerYearMonthDayWrapper.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardHandler.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateForwardHandler.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingHandler.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingHandler.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/YearMonthDayBackwardHandler.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardHandler.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingHandler.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPreceedingHandler.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 2006-09-11 12:32:00 UTC (rev 159)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java 2006-09-11 14:57:27 UTC (rev 160)
@@ -103,13 +103,13 @@
* handler and not count towards the number of days to move.
*
* @param businessDays
- * @param daysToSpot
+ * @param spotLag
* number of days to "spot" days, this can vary from one market
* to the other.
* @return the current businessCalendar (so one can do
* calendar.moveByTenor(StandardTenor.T_2M).getCurrentBusinessDate();)
*/
- public DateCalculator<E> moveByTenor(final Tenor tenor, final int daysToSpot) {
+ public DateCalculator<E> moveByTenor(final Tenor tenor, final int spotLag) {
if (tenor == null) {
throw new IllegalArgumentException("Tenor cannot be null");
}
@@ -117,7 +117,7 @@
TenorCode tenorCode = tenor.getCode();
if (tenorCode != TenorCode.OVERNIGHT) {
// get to the Spot date first:
- moveByDays(daysToSpot);
+ moveByDays(spotLag);
}
int unit = tenor.getUnits();
if (tenorCode == TenorCode.WEEK) {
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 2006-09-11 12:32:00 UTC (rev 159)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculator.java 2006-09-11 14:57:27 UTC (rev 160)
@@ -196,10 +196,10 @@
*
* @param tenor
* the Tenor to reach.
- * @param daysToSpot
+ * @param spotLag
* number of days to "spot" days, this can vary from one market
* to the other.
* @return the current DateCalculator
*/
- DateCalculator<E> moveByTenor(final Tenor tenor, final int daysToSpot);
+ DateCalculator<E> moveByTenor(final Tenor tenor, final int spotLag);
}
\ No newline at end of file
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/HolidayHandler.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/HolidayHandler.java 2006-09-11 12:32:00 UTC (rev 159)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/HolidayHandler.java 2006-09-11 14:57:27 UTC (rev 160)
@@ -31,7 +31,20 @@
*
*/
public interface HolidayHandler<E> {
- E moveCurrentDate(DateCalculator<E> date);
+ /**
+ * If the current date of the give calculator is a non-working day, it will
+ * be moved according to the algorithm implemented.
+ *
+ * @param calculator
+ * the calculator
+ * @return the date which may have moved.
+ */
+ E moveCurrentDate(DateCalculator<E> calculator);
+ /**
+ * Give the type name for this algorithm.
+ *
+ * @return algorithm name.
+ */
String getType();
}
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/KitCalculatorsFactory.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/KitCalculatorsFactory.java 2006-09-11 12:32:00 UTC (rev 159)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/KitCalculatorsFactory.java 2006-09-11 14:57:27 UTC (rev 160)
@@ -30,7 +30,7 @@
* @author Benoit Xhenseval
* @author $LastChangedBy: benoitx $
* @version $Revision: 125 $ $Date: 2006-09-07 19:24:20 +0200 (Thu, 07 Sep 2006) $
- *
+ *
* @param <E>
* a representation of a date, typically JDK: Date, Calendar;
* Joda:LocalDate, YearMonthDay
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/PeriodCountCalculator.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/PeriodCountCalculator.java 2006-09-11 12:32:00 UTC (rev 159)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/PeriodCountCalculator.java 2006-09-11 14:57:27 UTC (rev 160)
@@ -44,31 +44,46 @@
int MONTH_30_DAYS = 30;
/**
- * This calculates the number of days between 2 dates, it follows the given basis which means that
- * the result could vary between the same 2 dates if the basis is different.
- * @param start the start date
- * @param end the end date
- * @param basis the basis to use
+ * This calculates the number of days between 2 dates, it follows the given
+ * basis which means that the result could vary between the same 2 dates if
+ * the basis is different.
+ *
+ * @param start
+ * the start date
+ * @param end
+ * the end date
+ * @param basis
+ * the basis to use
* @return number of days between end and start.
*/
int dayDiff(final E start, final E end, PeriodCountBasis basis);
/**
- * This calculates the number of months (or fraction) between 2 dates, it follows the given basis which means that
- * the result could vary between the same 2 dates if the basis is different.
- * @param start the start date
- * @param end the end date
- * @param basis the basis to use
+ * This calculates the number of months (or fraction) between 2 dates, it
+ * follows the given basis which means that the result could vary between
+ * the same 2 dates if the basis is different.
+ *
+ * @param start
+ * the start date
+ * @param end
+ * the end date
+ * @param basis
+ * the basis to use
* @return number of months between end and start.
*/
double monthDiff(final E start, final E end, PeriodCountBasis basis);
/**
- * This calculates the number of years (or fraction) between 2 dates, it follows the given basis which means that
- * the result could vary between the same 2 dates if the basis is different.
- * @param start the start date
- * @param end the end date
- * @param basis the basis to use
+ * This calculates the number of years (or fraction) between 2 dates, it
+ * follows the given basis which means that the result could vary between
+ * the same 2 dates if the basis is different.
+ *
+ * @param start
+ * the start date
+ * @param end
+ * the end date
+ * @param basis
+ * the basis to use
* @return number of months between end and start.
*/
double yearDiff(final E start, final E end, PeriodCountBasis basis);
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 2006-09-11 12:32:00 UTC (rev 159)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java 2006-09-11 14:57:27 UTC (rev 160)
@@ -57,16 +57,16 @@
*
* @param startDate
* @param tenor
- * @param daysToSpot
+ * @param spotLag
* @param expectedDate
* @param holidayHandlerType
*/
- protected void checkMoveByTenor(final String startDate, final Tenor tenor, final int daysToSpot, final String expectedDate,
+ protected void checkMoveByTenor(final String startDate, final Tenor tenor, final int spotLag, final String expectedDate,
final String holidayHandlerType) {
final DateCalculator<E> cal = newDateCalculator("bla", holidayHandlerType);
cal.setNonWorkingDays(createUKHolidays());
cal.setStartDate(newDate(startDate));
- checkDate("Move start:" + startDate + " tenor:" + tenor + " daysToSpot:" + daysToSpot, cal.moveByTenor(tenor, daysToSpot),
+ checkDate("Move start:" + startDate + " tenor:" + tenor + " daysToSpot:" + spotLag, cal.moveByTenor(tenor, spotLag),
expectedDate);
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarBackwardHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarBackwardHandler.java 2006-09-11 12:32:00 UTC (rev 159)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarBackwardHandler.java 2006-09-11 14:57:27 UTC (rev 160)
@@ -33,14 +33,26 @@
*/
public class CalendarBackwardHandler extends CalendarForwardHandler {
+ /**
+ * If the current date of the give calculator is a non-working day, it will
+ * be moved according to the algorithm implemented.
+ *
+ * @param calculator
+ * the calculator
+ * @return the date which may have moved.
+ */
@Override
- public Calendar moveCurrentDate(final DateCalculator<Calendar> calendar) {
- return move(calendar, -1);
+ public Calendar moveCurrentDate(final DateCalculator<Calendar> calculator) {
+ return move(calculator, -1);
}
+ /**
+ * Give the type name for this algorithm.
+ *
+ * @return algorithm name.
+ */
@Override
public String getType() {
return HolidayHandlerType.BACKWARD;
}
-
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarForwardHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarForwardHandler.java 2006-09-11 12:32:00 UTC (rev 159)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarForwardHandler.java 2006-09-11 14:57:27 UTC (rev 160)
@@ -30,12 +30,19 @@
* @author Marcin Jekot
* @author $LastChangedBy$
* @version $Revision$ $Date$
- *
*/
public class CalendarForwardHandler implements HolidayHandler<Calendar> {
- public Calendar moveCurrentDate(final DateCalculator<Calendar> calendar) {
- return move(calendar, 1);
+ /**
+ * If the current date of the give calculator is a non-working day, it will
+ * be moved according to the algorithm implemented.
+ *
+ * @param calculator
+ * the calculator
+ * @return the date which may have moved.
+ */
+ public Calendar moveCurrentDate(final DateCalculator<Calendar> calculator) {
+ return move(calculator, 1);
}
protected Calendar move(final DateCalculator<Calendar> calculator, final int step) {
@@ -48,8 +55,12 @@
return cal;
}
+ /**
+ * Give the type name for this algorithm.
+ *
+ * @return algorithm name.
+ */
public String getType() {
return HolidayHandlerType.FORWARD;
}
-
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedFollowingHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedFollowingHandler.java 2006-09-11 12:32:00 UTC (rev 159)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedFollowingHandler.java 2006-09-11 14:57:27 UTC (rev 160)
@@ -33,17 +33,24 @@
*/
public class CalendarModifiedFollowingHandler implements HolidayHandler<Calendar> {
- public Calendar moveCurrentDate(final DateCalculator<Calendar> calendar) {
- return move(calendar, 1);
+ /**
+ * If the current date of the give calculator is a non-working day, it will
+ * be moved according to the algorithm implemented.
+ *
+ * @param calculator
+ * the calculator
+ * @return the date which may have moved.
+ */
+ public Calendar moveCurrentDate(final DateCalculator<Calendar> calculator) {
+ return move(calculator, 1);
}
- protected Calendar move(final DateCalculator<Calendar> calendar, int step) {
+ protected Calendar move(final DateCalculator<Calendar> calculator, int step) {
+ final Calendar cal = (Calendar) calculator.getCurrentBusinessDate().clone();
- final Calendar cal = (Calendar) calendar.getCurrentBusinessDate().clone();
-
final int month = cal.get(Calendar.MONTH);
- while (calendar.isNonWorkingDay(cal)) {
+ while (calculator.isNonWorkingDay(cal)) {
cal.add(Calendar.DAY_OF_MONTH, step);
if (month != cal.get(Calendar.MONTH)) {
// switch direction and go back
@@ -55,6 +62,11 @@
return cal;
}
+ /**
+ * Give the type name for this algorithm.
+ *
+ * @return algorithm name.
+ */
public String getType() {
return HolidayHandlerType.MODIFIED_FOLLLOWING;
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedPreceedingHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedPreceedingHandler.java 2006-09-11 12:32:00 UTC (rev 159)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedPreceedingHandler.java 2006-09-11 14:57:27 UTC (rev 160)
@@ -33,14 +33,26 @@
*/
public class CalendarModifiedPreceedingHandler extends CalendarModifiedFollowingHandler {
+ /**
+ * If the current date of the give calculator is a non-working day, it will
+ * be moved according to the algorithm implemented.
+ *
+ * @param calculator
+ * the calculator
+ * @return the date which may have moved.
+ */
@Override
- public Calendar moveCurrentDate(final DateCalculator<Calendar> calendar) {
- return move(calendar, -1);
+ public Calendar moveCurrentDate(final DateCalculator<Calendar> calculator) {
+ return move(calculator, -1);
}
+ /**
+ * Give the type name for this algorithm.
+ *
+ * @return algorithm name.
+ */
@Override
public String getType() {
return HolidayHandlerType.MODIFIED_PRECEEDING;
}
-
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateBackwardHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateBackwardHandler.java 2006-09-11 12:32:00 UTC (rev 159)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateBackwardHandler.java 2006-09-11 14:57:27 UTC (rev 160)
@@ -34,11 +34,24 @@
*/
public class DateBackwardHandler extends DateForwardHandler {
+ /**
+ * If the current date of the give calculator is a non-working day, it will
+ * be moved according to the algorithm implemented.
+ *
+ * @param calculator
+ * the calculator
+ * @return the date which may have moved.
+ */
@Override
- public Date moveCurrentDate(final DateCalculator<Date> calendar) {
- return move(calendar, -1);
+ public Date moveCurrentDate(final DateCalculator<Date> calculator) {
+ return move(calculator, -1);
}
+ /**
+ * Give the type name for this algorithm.
+ *
+ * @return algorithm name.
+ */
@Override
public String getType() {
return HolidayHandlerType.BACKWARD;
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateForwardHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateForwardHandler.java 2006-09-11 12:32:00 UTC (rev 159)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateForwardHandler.java 2006-09-11 14:57:27 UTC (rev 160)
@@ -36,8 +36,16 @@
*/
public class DateForwardHandler implements HolidayHandler<Date> {
- public Date moveCurrentDate(final DateCalculator<Date> calendar) {
- return move(calendar, 1);
+ /**
+ * If the current date of the give calculator is a non-working day, it will
+ * be moved according to the algorithm implemented.
+ *
+ * @param calculator
+ * the calculator
+ * @return the date which may have moved.
+ */
+ public Date moveCurrentDate(final DateCalculator<Date> calculator) {
+ return move(calculator, 1);
}
protected Date move(final DateCalculator<Date> calculator, final int step) {
@@ -50,6 +58,11 @@
return cal.getTime();
}
+ /**
+ * Give the type name for this algorithm.
+ *
+ * @return algorithm name.
+ */
public String getType() {
return HolidayHandlerType.FORWARD;
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedFollowingHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedFollowingHandler.java 2006-09-11 12:32:00 UTC (rev 159)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedFollowingHandler.java 2006-09-11 14:57:27 UTC (rev 160)
@@ -36,16 +36,24 @@
*/
public class DateModifiedFollowingHandler implements HolidayHandler<Date> {
- public Date moveCurrentDate(final DateCalculator<Date> calendar) {
- return move(calendar, 1);
+ /**
+ * If the current date of the give calculator is a non-working day, it will
+ * be moved according to the algorithm implemented.
+ *
+ * @param calculator
+ * the calculator
+ * @return the date which may have moved.
+ */
+ public Date moveCurrentDate(final DateCalculator<Date> calculator) {
+ return move(calculator, 1);
}
- protected Date move(final DateCalculator<Date> calendar, int step) {
- final Calendar cal = (Calendar) Utils.getCal(calendar.getCurrentBusinessDate()).clone();
+ protected Date move(final DateCalculator<Date> calculator, int step) {
+ final Calendar cal = (Calendar) Utils.getCal(calculator.getCurrentBusinessDate()).clone();
final int month = cal.get(Calendar.MONTH);
- while (calendar.isNonWorkingDay(cal.getTime())) {
+ while (calculator.isNonWorkingDay(cal.getTime())) {
cal.add(Calendar.DAY_OF_MONTH, step);
if (month != cal.get(Calendar.MONTH)) {
// switch direction and go back
@@ -57,6 +65,11 @@
return cal.getTime();
}
+ /**
+ * Give the type name for this algorithm.
+ *
+ * @return algorithm name.
+ */
public String getType() {
return HolidayHandlerType.MODIFIED_FOLLLOWING;
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedPreceedingHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedPreceedingHandler.java 2006-09-11 12:32:00 UTC (rev 159)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedPreceedingHandler.java 2006-09-11 14:57:27 UTC (rev 160)
@@ -34,14 +34,26 @@
*/
public class DateModifiedPreceedingHandler extends DateModifiedFollowingHandler {
+ /**
+ * If the current date of the give calculator is a non-working day, it will
+ * be moved according to the algorithm implemented.
+ *
+ * @param calculator
+ * the calculator
+ * @return the date which may have moved.
+ */
@Override
- public Date moveCurrentDate(final DateCalculator<Date> calendar) {
- return move(calendar, -1);
+ public Date moveCurrentDate(final DateCalculator<Date> calculator) {
+ return move(calculator, -1);
}
+ /**
+ * Give the type name for this algorithm.
+ *
+ * @return algorithm name.
+ */
@Override
public String getType() {
return HolidayHandlerType.MODIFIED_PRECEEDING;
}
-
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/HolidayHandlerDateWrapper.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/HolidayHandlerDateWrapper.java 2006-09-11 12:32:00 UTC (rev 159)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/HolidayHandlerDateWrapper.java 2006-09-11 14:57:27 UTC (rev 160)
@@ -44,8 +44,16 @@
calculator = dateCalculator;
}
- public Calendar moveCurrentDate(final DateCalculator<Calendar> calendar) {
- Calendar ret = calendar.getCurrentBusinessDate();
+ /**
+ * If the current date of the give calculator is a non-working day, it will
+ * be moved according to the algorithm implemented.
+ *
+ * @param calc
+ * the calculator
+ * @return the date which may have moved.
+ */
+ public Calendar moveCurrentDate(final DateCalculator<Calendar> calc) {
+ Calendar ret = calc.getCurrentBusinessDate();
if (delegate != null) {
final Date day = delegate.moveCurrentDate(calculator);
if (day != null) {
@@ -55,6 +63,11 @@
return ret;
}
+ /**
+ * Give the type name for this algorithm.
+ *
+ * @return algorithm name.
+ */
public String getType() {
return delegate.getType();
}
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/HolidayHandlerYearMonthDayWrapper.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/HolidayHandlerYearMonthDayWrapper.java 2006-09-11 12:32:00 UTC (rev 159)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/HolidayHandlerYearMonthDayWrapper.java 2006-09-11 14:57:27 UTC (rev 160)
@@ -38,6 +38,14 @@
private DateCalculator<YearMonthDay> calculator;
+ /**
+ * If the current date of the give calculator is a non-working day, it will
+ * be moved according to the algorithm implemented.
+ *
+ * @param calculator
+ * the calculator
+ * @return the date which may have moved.
+ */
public HolidayHandlerYearMonthDayWrapper(final HolidayHandler<YearMonthDay> delegate,
final DateCalculator<YearMonthDay> calculator) {
this.delegate = delegate;
@@ -58,8 +66,8 @@
*
* @see net.objectlab.kit.datecalc.common.HolidayHandler#moveCurrentDate(net.objectlab.kit.datecalc.common.DateCalculator)
*/
- public LocalDate moveCurrentDate(final DateCalculator<LocalDate> calendar) {
- LocalDate ret = calendar.getCurrentBusinessDate();
+ public LocalDate moveCurrentDate(final DateCalculator<LocalDate> calc) {
+ LocalDate ret = calc.getCurrentBusinessDate();
if (delegate != null) {
final YearMonthDay day = delegate.moveCurrentDate(calculator);
if (day != null) {
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardHandler.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardHandler.java 2006-09-11 12:32:00 UTC (rev 159)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardHandler.java 2006-09-11 14:57:27 UTC (rev 160)
@@ -33,14 +33,26 @@
*/
public class LocalDateBackwardHandler extends LocalDateForwardHandler {
+ /**
+ * If the current date of the give calculator is a non-working day, it will
+ * be moved according to the algorithm implemented.
+ *
+ * @param calculator
+ * the calculator
+ * @return the date which may have moved.
+ */
@Override
- public LocalDate moveCurrentDate(final DateCalculator<LocalDate> calendar) {
- return move(calendar, -1);
+ public LocalDate moveCurrentDate(final DateCalculator<LocalDate> calculator) {
+ return move(calculator, -1);
}
+ /**
+ * Give the type name for this algorithm.
+ *
+ * @return algorithm name.
+ */
@Override
public String getType() {
return HolidayHandlerType.BACKWARD;
}
-
}
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateForwardHandler.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateForwardHandler.java 2006-09-11 12:32:00 UTC (rev 159)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateForwardHandler.java 2006-09-11 14:57:27 UTC (rev 160)
@@ -34,18 +34,31 @@
*/
public class LocalDateForwardHandler implements HolidayHandler<LocalDate> {
- public LocalDate moveCurrentDate(final DateCalculator<LocalDate> calendar) {
- return move(calendar, 1);
+ /**
+ * If the current date of the give calculator is a non-working day, it will
+ * be moved according to the algorithm implemented.
+ *
+ * @param calculator
+ * the calculator
+ * @return the date which may have moved.
+ */
+ public LocalDate moveCurrentDate(final DateCalculator<LocalDate> calculator) {
+ return move(calculator, 1);
}
- protected LocalDate move(final DateCalculator<LocalDate> calendar, final int step) {
- LocalDate date = calendar.getCurrentBusinessDate();
- while (calendar.isNonWorkingDay(date)) {
+ protected LocalDate move(final DateCalculator<LocalDate> calculator, final int step) {
+ LocalDate date = calculator.getCurrentBusinessDate();
+ while (calculator.isNonWorkingDay(date)) {
date = date.plusDays(step);
}
return date;
}
+ /**
+ * Give the type name for this algorithm.
+ *
+ * @return algorithm name.
+ */
public String getType() {
return HolidayHandlerType.FORWARD;
}
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingHandler.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingHandler.java 2006-09-11 12:32:00 UTC (rev 159)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingHandler.java 2006-09-11 14:57:27 UTC (rev 160)
@@ -35,14 +35,22 @@
*/
public class LocalDateModifiedFollowingHandler implements HolidayHandler<LocalDate> {
- public LocalDate moveCurrentDate(final DateCalculator<LocalDate> calendar) {
- return move(calendar, 1);
+ /**
+ * If the current date of the give calculator is a non-working day, it will
+ * be moved according to the algorithm implemented.
+ *
+ * @param calculator
+ * the calculator
+ * @return the date which may have moved.
+ */
+ public LocalDate moveCurrentDate(final DateCalculator<LocalDate> calculator) {
+ return move(calculator, 1);
}
- protected LocalDate move(final DateCalculator<LocalDate> calendar, int step) {
- LocalDate date = calendar.getCurrentBusinessDate();
+ protected LocalDate move(final DateCalculator<LocalDate> calculator, int step) {
+ LocalDate date = calculator.getCurrentBusinessDate();
final int month = date.getMonthOfYear();
- while (calendar.isNonWorkingDay(date)) {
+ while (calculator.isNonWorkingDay(date)) {
date = date.plusDays(step);
if (date.getMonthOfYear() != month) {
// flick to backward
@@ -53,6 +61,11 @@
return date;
}
+ /**
+ * Give the type name for this algorithm.
+ *
+ * @return algorithm name.
+ */
public String getType() {
return HolidayHandlerType.MODIFIED_FOLLLOWING;
}
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingHandler.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingHandler.java 2006-09-11 12:32:00 UTC (rev 159)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingHandler.java 2006-09-11 14:57:27 UTC (rev 160)
@@ -34,13 +34,26 @@
*/
public class LocalDateModifiedPreceedingHandler extends LocalDateModifiedFollowingHandler {
+ /**
+ * Give the type name for this algorithm.
+ *
+ * @return algorithm name.
+ */
@Override
public String getType() {
return HolidayHandlerType.MODIFIED_PRECEEDING;
}
+ /**
+ * If the current date of the give calculator is a non-working day, it will
+ * be moved according to the algorithm implemented.
+ *
+ * @param calculator
+ * the calculator
+ * @return the date which may have moved.
+ */
@Override
- public LocalDate moveCurrentDate(final DateCalculator<LocalDate> calendar) {
- return move(calendar, -1);
+ public LocalDate moveCurrentDate(final DateCalculator<LocalDate> calculator) {
+ return move(calculator, -1);
}
}
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 2006-09-11 12:32:00 UTC (rev 159)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculator.java 2006-09-11 14:57:27 UTC (rev 160)
@@ -99,8 +99,8 @@
final int diff1 = new Period(start, endOfStartYear, PeriodType.days()).getDays();
final int diff2 = new Period(startOfEndYear, end, PeriodType.days()).getDays();
- diff = ((diff1 + 1.0)) / start.dayOfYear().getMaximumValue()
- + ((endYear - startYear - 1.0)) + ((double) (diff2)) / (double) end.dayOfYear().getMaximumValue();
+ diff = ((diff1 + 1.0)) / start.dayOfYear().getMaximumValue() + ((endYear - startYear - 1.0)) + ((double) (diff2))
+ / (double) end.dayOfYear().getMaximumValue();
}
} else if (basis == PeriodCountBasis.CONV_30_360 || basis == PeriodCountBasis.CONV_360E_ISDA
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayBackwardHandler.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayBackwardHandler.java 2006-09-11 12:32:00 UTC (rev 159)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayBackwardHandler.java 2006-09-11 14:57:27 UTC (rev 160)
@@ -18,7 +18,6 @@
package net.objectlab.kit.datecalc.joda;
import net.objectlab.kit.datecalc.common.DateCalculator;
-import net.objectlab.kit.datecalc.common.HolidayHandler;
import net.objectlab.kit.datecalc.common.HolidayHandlerType;
import org.joda.time.YearMonthDay;
@@ -32,18 +31,26 @@
* @version $Revision$ $Date$
*
*/
-public class YearMonthDayBackwardHandler implements HolidayHandler<YearMonthDay> {
+public class YearMonthDayBackwardHandler extends YearMonthDayForwardHandler {
- public YearMonthDay moveCurrentDate(final DateCalculator<YearMonthDay> calendar) {
- YearMonthDay date = calendar.getCurrentBusinessDate();
- while (calendar.isNonWorkingDay(date)) {
- date = date.minusDays(1);
- }
- return date;
+ /**
+ * If the current date of the give calculator is a non-working day, it will
+ * be moved according to the algorithm implemented.
+ *
+ * @param calculator
+ * the calculator
+ * @return the date which may have moved.
+ */
+ public YearMonthDay moveCurrentDate(final DateCalculator<YearMonthDay> calculator) {
+ return move(calculator, -1);
}
+ /**
+ * Give the type name for this algorithm.
+ *
+ * @return algorithm name.
+ */
public String getType() {
return HolidayHandlerType.BACKWARD;
}
-
}
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardHandler.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardHandler.java 2006-09-11 12:32:00 UTC (rev 159)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardHandler.java 2006-09-11 14:57:27 UTC (rev 160)
@@ -34,14 +34,31 @@
*/
public class YearMonthDayForwardHandler implements HolidayHandler<YearMonthDay> {
- public YearMonthDay moveCurrentDate(final DateCalculator<YearMonthDay> calendar) {
- YearMonthDay date = calendar.getCurrentBusinessDate();
- while (calendar.isNonWorkingDay(date)) {
- date = date.plusDays(1);
+ /**
+ * If the current date of the give calculator is a non-working day, it will
+ * be moved according to the algorithm implemented.
+ *
+ * @param calculator
+ * the calculator
+ * @return the date which may have moved.
+ */
+ public YearMonthDay moveCurrentDate(final DateCalculator<YearMonthDay> calculator) {
+ return move(calculator, 1);
+ }
+
+ protected YearMonthDay move(final DateCalculator<YearMonthDay> calculator, final int step) {
+ YearMonthDay date = calculator.getCurrentBusinessDate();
+ while (calculator.isNonWorkingDay(date)) {
+ date = date.plusDays(step);
}
return date;
}
+ /**
+ * Give the type name for this algorithm.
+ *
+ * @return algorithm name.
+ */
public String getType() {
return HolidayHandlerType.FORWARD;
}
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingHandler.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingHandler.java 2006-09-11 12:32:00 UTC (rev 159)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingHandler.java 2006-09-11 14:57:27 UTC (rev 160)
@@ -35,19 +35,35 @@
*/
public class YearMonthDayModifiedFollowingHandler implements HolidayHandler<YearMonthDay> {
+ /**
+ * Give the type name for this algorithm.
+ *
+ * @return algorithm name.
+ */
public String getType() {
return HolidayHandlerType.MODIFIED_FOLLLOWING;
}
- public YearMonthDay moveCurrentDate(final DateCalculator<YearMonthDay> calendar) {
- YearMonthDay date = calendar.getCurrentBusinessDate();
+ /**
+ * If the current date of the give calculator is a non-working day, it will
+ * be moved according to the algorithm implemented.
+ *
+ * @param calculator
+ * the calculator
+ * @return the date which may have moved.
+ */
+ public YearMonthDay moveCurrentDate(final DateCalculator<YearMonthDay> calculator) {
+ return move(calculator, 1);
+ }
+
+ protected YearMonthDay move(final DateCalculator<YearMonthDay> calculator, int step) {
+ YearMonthDay date = calculator.getCurrentBusinessDate();
final int month = date.getMonthOfYear();
- int step = 1;
- while (calendar.isNonWorkingDay(date)) {
+ while (calculator.isNonWorkingDay(date)) {
date = date.plusDays(step);
if (date.getMonthOfYear() != month) {
// flick to backward
- step = -1;
+ step *= -1;
date = date.plusDays(step);
}
}
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPreceedingHandler.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPreceedingHandler.java 2006-09-11 12:32:00 UTC (rev 159)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPreceedingHandler.java 2006-09-11 14:57:27 UTC (rev 160)
@@ -18,7 +18,6 @@
package net.objectlab.kit.datecalc.joda;
import net.objectlab.kit.datecalc.common.DateCalculator;
-import net.objectlab.kit.datecalc.common.HolidayHandler;
import net.objectlab.kit.datecalc.common.HolidayHandlerType;
import org.joda.time.YearMonthDay;
@@ -33,25 +32,26 @@
* @version $Revision$ $Date$
*
*/
-public class YearMonthDayModifiedPreceedingHandler implements HolidayHandler<YearMonthDay> {
+public class YearMonthDayModifiedPreceedingHandler extends YearMonthDayModifiedFollowingHandler {
- public YearMonthDay moveCurrentDate(final DateCalculator<YearMonthDay> calendar) {
- YearMonthDay date = calendar.getCurrentBusinessDate();
- final int month = date.getMonthOfYear();
- int step = -1;
- while (calendar.isNonWorkingDay(date)) {
- date = date.plusDays(step);
- if (date.getMonthOfYear() != month) {
- // flick to backward
- step = 1;
- date = date.plusDays(step);
- }
- }
- return date;
+ /**
+ * If the current date of the give calculator is a non-working day, it will
+ * be moved according to the algorithm implemented.
+ *
+ * @param calculator
+ * the calculator
+ * @return the date which may have moved.
+ */
+ public YearMonthDay moveCurrentDate(final DateCalculator<YearMonthDay> calculator) {
+ return move(calculator, -1);
}
+ /**
+ * Give the type name for this algorithm.
+ *
+ * @return algorithm name.
+ */
public String getType() {
return HolidayHandlerType.MODIFIED_PRECEEDING;
}
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
