Menu
▾
▴
objectlabkit-svn
|
From: <be...@us...> - 2006-08-23 21:54:45
|
Revision: 40 Author: benoitx Date: 2006-08-23 14:53:02 -0700 (Wed, 23 Aug 2006) ViewCVS: http://svn.sourceforge.net/objectlabkit/?rev=40&view=rev Log Message: ----------- Added Google Analytics on main web page and new qalab.xml stats Modified Paths: -------------- trunk/datecalc-common/qalab.xml trunk/datecalc-jdk/qalab.xml trunk/datecalc-joda/qalab.xml trunk/src/site/faq.fml trunk/src/site/index.xml Property Changed: ---------------- trunk/ trunk/datecalc-common/ trunk/datecalc-jdk/ trunk/datecalc-joda/ Property changes on: trunk ___________________________________________________________________ Name: svn:ignore - target + target *.log Property changes on: trunk/datecalc-common ___________________________________________________________________ Name: svn:ignore - target + target Modified: trunk/datecalc-common/qalab.xml =================================================================== --- trunk/datecalc-common/qalab.xml 2006-08-23 21:22:58 UTC (rev 39) +++ trunk/datecalc-common/qalab.xml 2006-08-23 21:53:02 UTC (rev 40) @@ -34,6 +34,9 @@ <summaryresult date="2006-08-20" filecount="7" statvalue="1" type="checkstyle"/> <summaryresult date="2006-08-20" filecount="6" statvalue="90" type="cobertura-line"/> <summaryresult date="2006-08-20" filecount="6" statvalue="100" type="cobertura-branch"/> + <summaryresult date="2006-08-23" filecount="9" statvalue="24" type="checkstyle"/> + <summaryresult date="2006-08-23" filecount="8" statvalue="75" type="cobertura-line"/> + <summaryresult date="2006-08-23" filecount="8" statvalue="91" 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"/> @@ -41,6 +44,7 @@ <result date="2006-08-10" statvalue="1" type="checkstyle"/> <result date="2006-08-19" statvalue="1" type="checkstyle"/> <result date="2006-08-20" statvalue="1" type="checkstyle"/> + <result date="2006-08-23" statvalue="1" type="checkstyle"/> </file> <file id="net_objectlab_kit_datecalc_common_Tenor.java" path="net/objectlab/kit/datecalc/common/Tenor.java"> <result date="2006-08-08" statvalue="1" type="checkstyle"/> @@ -56,6 +60,8 @@ <result date="2006-08-19" statvalue="100" type="cobertura-branch"/> <result date="2006-08-20" statvalue="100" type="cobertura-line"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-23" statvalue="100" type="cobertura-line"/> + <result date="2006-08-23" 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"/> @@ -72,6 +78,8 @@ <result date="2006-08-19" statvalue="100" type="cobertura-branch"/> <result date="2006-08-20" statvalue="100" type="cobertura-line"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-23" statvalue="100" type="cobertura-line"/> + <result date="2006-08-23" 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"/> @@ -84,6 +92,8 @@ <result date="2006-08-19" statvalue="100" type="cobertura-branch"/> <result date="2006-08-20" statvalue="100" type="cobertura-line"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-23" statvalue="100" type="cobertura-line"/> + <result date="2006-08-23" 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"/> @@ -91,11 +101,13 @@ <result date="2006-08-10" statvalue="100" type="cobertura-branch"/> <result date="2006-08-19" statvalue="100" type="cobertura-branch"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-23" 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"/> <result date="2006-08-10" statvalue="100" type="cobertura-branch"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-23" 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"/> @@ -107,5 +119,17 @@ <result date="2006-08-19" statvalue="100" type="cobertura-branch"/> <result date="2006-08-20" statvalue="92" type="cobertura-line"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-23" statvalue="92" type="cobertura-line"/> + <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> </file> + <file + id="net_objectlab_kit_datecalc_common_AbstractDateCalculator.java" path="net/objectlab/kit/datecalc/common/AbstractDateCalculator.java"> + <result date="2006-08-23" statvalue="4" type="checkstyle"/> + </file> + <file + id="net_objectlab_kit_datecalc_common_DateCalculatorGeneric.java" path="net/objectlab/kit/datecalc/common/DateCalculatorGeneric.java"> + <result date="2006-08-23" statvalue="19" type="checkstyle"/> + <result date="2006-08-23" statvalue="100" type="cobertura-line"/> + <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> + </file> </qalab> Property changes on: trunk/datecalc-jdk ___________________________________________________________________ Name: svn:ignore - target + target Modified: trunk/datecalc-jdk/qalab.xml =================================================================== --- trunk/datecalc-jdk/qalab.xml 2006-08-23 21:22:58 UTC (rev 39) +++ trunk/datecalc-jdk/qalab.xml 2006-08-23 21:53:02 UTC (rev 40) @@ -31,12 +31,18 @@ <summaryresult date="2006-08-20" filecount="1" statvalue="1" type="findbugs"/> <summaryresult date="2006-08-20" filecount="9" statvalue="77" type="cobertura-line"/> <summaryresult date="2006-08-20" filecount="9" statvalue="77" type="cobertura-branch"/> + <summaryresult date="2006-08-23" filecount="10" statvalue="8" type="checkstyle"/> + <summaryresult date="2006-08-23" filecount="1" statvalue="1" type="pmd"/> + <summaryresult date="2006-08-23" filecount="1" statvalue="1" type="findbugs"/> + <summaryresult date="2006-08-23" filecount="9" statvalue="82" type="cobertura-line"/> + <summaryresult date="2006-08-23" filecount="9" statvalue="80" 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"/> <result date="2006-08-09" statvalue="1" type="checkstyle"/> <result date="2006-08-10" statvalue="1" type="checkstyle"/> <result date="2006-08-20" statvalue="1" type="checkstyle"/> + <result date="2006-08-23" statvalue="1" type="checkstyle"/> </file> <file id="net_objectlab_kit_datecalc_jdk_BaseDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/BaseDateCalculator.java"> <result date="2006-08-08" statvalue="1" type="checkstyle"/> @@ -53,6 +59,11 @@ <result date="2006-08-20" statvalue="1" type="findbugs"/> <result date="2006-08-20" statvalue="74" type="cobertura-line"/> <result date="2006-08-20" statvalue="75" type="cobertura-branch"/> + <result date="2006-08-23" statvalue="5" type="checkstyle"/> + <result date="2006-08-23" statvalue="1" type="pmd"/> + <result date="2006-08-23" statvalue="1" type="findbugs"/> + <result date="2006-08-23" statvalue="79" type="cobertura-line"/> + <result date="2006-08-23" statvalue="77" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_jdk_DefaultDateCalculatorFactory.java" path="net/objectlab/kit/datecalc/jdk/DefaultDateCalculatorFactory.java"> @@ -62,6 +73,9 @@ <result date="2006-08-20" statvalue="1" type="checkstyle"/> <result date="2006-08-20" statvalue="100" type="cobertura-line"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-23" statvalue="1" type="checkstyle"/> + <result date="2006-08-23" statvalue="100" type="cobertura-line"/> + <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> </file> <file id="C:_project_objectlab-kit_datecalc-jdk_src_test_java_net_objectlab_kit_datecalc_jdk_DateCalculatorCombinationTest.java" path="C:/project/objectlab-kit/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/DateCalculatorCombinationTest.java"> @@ -78,6 +92,8 @@ <result date="2006-08-10" statvalue="100" type="cobertura-branch"/> <result date="2006-08-20" statvalue="100" type="cobertura-line"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-23" statvalue="100" type="cobertura-line"/> + <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_jdk_DateCalculatorFactory.java" path="net/objectlab/kit/datecalc/jdk/DateCalculatorFactory.java"> <result date="2006-08-08" statvalue="100" type="cobertura-line"/> @@ -88,6 +104,8 @@ <result date="2006-08-10" statvalue="100" type="cobertura-branch"/> <result date="2006-08-20" statvalue="100" type="cobertura-line"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-23" statvalue="100" type="cobertura-line"/> + <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_jdk_HolidayHandler.java" path="net/objectlab/kit/datecalc/jdk/HolidayHandler.java"> <result date="2006-08-08" statvalue="100" type="cobertura-line"/> @@ -98,6 +116,8 @@ <result date="2006-08-10" statvalue="100" type="cobertura-branch"/> <result date="2006-08-20" statvalue="100" type="cobertura-line"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-23" statvalue="100" type="cobertura-line"/> + <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_jdk_PeriodCountCalculator.java" path="net/objectlab/kit/datecalc/jdk/PeriodCountCalculator.java"> <result date="2006-08-08" statvalue="100" type="cobertura-line"/> @@ -108,6 +128,8 @@ <result date="2006-08-10" statvalue="100" type="cobertura-branch"/> <result date="2006-08-20" statvalue="100" type="cobertura-line"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-23" statvalue="100" type="cobertura-line"/> + <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_jdk_DefaultPeriodCountCalculator.java" path="net/objectlab/kit/datecalc/jdk/DefaultPeriodCountCalculator.java"> @@ -116,6 +138,8 @@ <result date="2006-08-10" statvalue="100" type="cobertura-branch"/> <result date="2006-08-20" statvalue="50" type="cobertura-line"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-23" statvalue="50" type="cobertura-line"/> + <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> </file> <file id="C:_project_objectlabkit_datecalc-jdk_src_test_java_net_objectlab_kit_datecalc_jdk_DateCalculatorCombinationTest.java" path="C:/project/objectlabkit/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/DateCalculatorCombinationTest.java"/> @@ -123,9 +147,14 @@ <result date="2006-08-20" statvalue="1" type="checkstyle"/> <result date="2006-08-20" statvalue="75" type="cobertura-line"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-23" statvalue="1" type="checkstyle"/> + <result date="2006-08-23" statvalue="75" type="cobertura-line"/> + <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_jdk_ForwardHandler.java" path="net/objectlab/kit/datecalc/jdk/ForwardHandler.java"> <result date="2006-08-20" statvalue="100" type="cobertura-line"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-23" statvalue="100" type="cobertura-line"/> + <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> </file> </qalab> Property changes on: trunk/datecalc-joda ___________________________________________________________________ Name: svn:ignore - target .fbwarnings + target Modified: trunk/datecalc-joda/qalab.xml =================================================================== --- trunk/datecalc-joda/qalab.xml 2006-08-23 21:22:58 UTC (rev 39) +++ trunk/datecalc-joda/qalab.xml 2006-08-23 21:53:02 UTC (rev 40) @@ -36,9 +36,13 @@ <summaryresult date="2006-08-19" filecount="3" statvalue="6" type="pmd"/> <summaryresult date="2006-08-19" filecount="12" statvalue="89" type="cobertura-line"/> <summaryresult date="2006-08-19" filecount="12" statvalue="92" type="cobertura-branch"/> - <summaryresult date="2006-08-20" filecount="13" statvalue="1" type="checkstyle"/> + <summaryresult date="2006-08-20" filecount="13" statvalue="2" type="checkstyle"/> + <summaryresult date="2006-08-20" filecount="1" statvalue="1" type="pmd"/> <summaryresult date="2006-08-20" filecount="12" statvalue="86" type="cobertura-line"/> <summaryresult date="2006-08-20" filecount="12" statvalue="88" type="cobertura-branch"/> + <summaryresult date="2006-08-23" filecount="13" statvalue="1" type="checkstyle"/> + <summaryresult date="2006-08-23" filecount="12" statvalue="93" type="cobertura-line"/> + <summaryresult date="2006-08-23" filecount="12" statvalue="95" 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"/> @@ -46,6 +50,7 @@ <result date="2006-08-10" statvalue="1" type="checkstyle"/> <result date="2006-08-19" statvalue="1" type="checkstyle"/> <result date="2006-08-20" statvalue="1" type="checkstyle"/> + <result date="2006-08-23" statvalue="1" type="checkstyle"/> </file> <file id="net_objectlab_kit_datecalc_joda_BaseDateCalculator.java" path="net/objectlab/kit/datecalc/joda/BaseDateCalculator.java"> <result date="2006-08-08" statvalue="9" type="checkstyle"/> @@ -62,8 +67,12 @@ <result date="2006-08-10" statvalue="100" type="cobertura-branch"/> <result date="2006-08-19" statvalue="98" type="cobertura-line"/> <result date="2006-08-19" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-20" statvalue="1" type="checkstyle"/> + <result date="2006-08-20" statvalue="1" type="pmd"/> <result date="2006-08-20" statvalue="97" type="cobertura-line"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-23" statvalue="97" type="cobertura-line"/> + <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_joda_DefaultDateCalculatorFactory.java" path="net/objectlab/kit/datecalc/joda/DefaultDateCalculatorFactory.java"> @@ -80,6 +89,8 @@ <result date="2006-08-19" statvalue="100" type="cobertura-branch"/> <result date="2006-08-20" statvalue="100" type="cobertura-line"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-23" statvalue="100" type="cobertura-line"/> + <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_joda_DefaultPeriodCountCalculator.java" path="net/objectlab/kit/datecalc/joda/DefaultPeriodCountCalculator.java"> @@ -99,6 +110,8 @@ <result date="2006-08-19" statvalue="90" type="cobertura-branch"/> <result date="2006-08-20" statvalue="81" type="cobertura-line"/> <result date="2006-08-20" statvalue="84" type="cobertura-branch"/> + <result date="2006-08-23" statvalue="81" type="cobertura-line"/> + <result date="2006-08-23" statvalue="84" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_joda_JodaWorkingWeek.java" path="net/objectlab/kit/datecalc/joda/JodaWorkingWeek.java"> <result date="2006-08-08" statvalue="1" type="checkstyle"/> @@ -114,6 +127,8 @@ <result date="2006-08-19" statvalue="100" type="cobertura-branch"/> <result date="2006-08-20" statvalue="100" type="cobertura-line"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-23" statvalue="100" type="cobertura-line"/> + <result date="2006-08-23" 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"/> @@ -123,6 +138,8 @@ <result date="2006-08-19" statvalue="100" type="cobertura-branch"/> <result date="2006-08-20" statvalue="100" type="cobertura-line"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-23" statvalue="100" type="cobertura-line"/> + <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_joda_DateCalculator.java" path="net/objectlab/kit/datecalc/joda/DateCalculator.java"> <result date="2006-08-08" statvalue="100" type="cobertura-line"/> @@ -135,6 +152,8 @@ <result date="2006-08-19" statvalue="100" type="cobertura-branch"/> <result date="2006-08-20" statvalue="100" type="cobertura-line"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-23" statvalue="100" type="cobertura-line"/> + <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_joda_DateCalculatorFactory.java" path="net/objectlab/kit/datecalc/joda/DateCalculatorFactory.java"> @@ -148,6 +167,8 @@ <result date="2006-08-19" statvalue="100" type="cobertura-branch"/> <result date="2006-08-20" statvalue="100" type="cobertura-line"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-23" statvalue="100" type="cobertura-line"/> + <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_joda_ForwardHandler.java" path="net/objectlab/kit/datecalc/joda/ForwardHandler.java"> <result date="2006-08-08" statvalue="100" type="cobertura-line"/> @@ -160,6 +181,8 @@ <result date="2006-08-19" statvalue="100" type="cobertura-branch"/> <result date="2006-08-20" statvalue="100" type="cobertura-line"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-23" statvalue="100" type="cobertura-line"/> + <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_joda_HolidayHandler.java" path="net/objectlab/kit/datecalc/joda/HolidayHandler.java"> <result date="2006-08-08" statvalue="100" type="cobertura-line"/> @@ -172,6 +195,8 @@ <result date="2006-08-19" statvalue="100" type="cobertura-branch"/> <result date="2006-08-20" statvalue="100" type="cobertura-line"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-23" statvalue="100" type="cobertura-line"/> + <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_joda_PeriodCountCalculator.java" path="net/objectlab/kit/datecalc/joda/PeriodCountCalculator.java"> @@ -185,6 +210,8 @@ <result date="2006-08-19" statvalue="100" type="cobertura-branch"/> <result date="2006-08-20" statvalue="100" type="cobertura-line"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-23" statvalue="100" type="cobertura-line"/> + <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_joda_ModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/joda/ModifiedFollowingHandler.java"> @@ -192,6 +219,8 @@ <result date="2006-08-10" statvalue="16" type="cobertura-line"/> <result date="2006-08-19" statvalue="16" type="cobertura-line"/> <result date="2006-08-20" statvalue="16" type="cobertura-line"/> + <result date="2006-08-23" statvalue="100" type="cobertura-line"/> + <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_joda_ModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/joda/ModifiedPreceedingHandler.java"> @@ -199,5 +228,7 @@ <result date="2006-08-10" statvalue="16" type="cobertura-line"/> <result date="2006-08-19" statvalue="16" type="cobertura-line"/> <result date="2006-08-20" statvalue="16" type="cobertura-line"/> + <result date="2006-08-23" statvalue="75" type="cobertura-line"/> + <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> </file> </qalab> Modified: trunk/src/site/faq.fml =================================================================== --- trunk/src/site/faq.fml 2006-08-23 21:22:58 UTC (rev 39) +++ trunk/src/site/faq.fml 2006-08-23 21:53:02 UTC (rev 40) @@ -41,4 +41,11 @@ </faq> </part> +<script src="http://www.google-analytics.com/urchin.js" type="text/javascript"> +</script> +<script type="text/javascript"> +_uacct = "UA-615747-1"; +urchinTracker(); +</script> + </faqs> \ No newline at end of file Modified: trunk/src/site/index.xml =================================================================== --- trunk/src/site/index.xml 2006-08-23 21:22:58 UTC (rev 39) +++ trunk/src/site/index.xml 2006-08-23 21:53:02 UTC (rev 40) @@ -81,5 +81,12 @@ </section> +<script src="http://www.google-analytics.com/urchin.js" type="text/javascript"> +</script> +<script type="text/javascript"> +_uacct = "UA-615747-1"; +urchinTracker(); +</script> + </body> </document> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <be...@us...> - 2006-09-01 14:08:37
|
Revision: 71
http://svn.sourceforge.net/objectlabkit/?rev=71&view=rev
Author: benoitx
Date: 2006-09-01 07:07:57 -0700 (Fri, 01 Sep 2006)
Log Message:
-----------
Introduced a whole series of tests for YearMonthDay based on a generic version of LocalDate tests.
Marcin, you should base your tests on these Abstract Test (move them to common). I also fixed some BUGS in the tests.
Modified Paths:
--------------
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.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/LocalDateCalculator.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateCalculatorCombinationTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateCalculatorFactoryTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/IMMDateTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/PeriodCountCalculatorTest.java
Added Paths:
-----------
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DefaultLocalDateCalculatorFactory.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DefaultLocalDatePeriodCountCalculator.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DefaultYearMonthDayCalculatorFactory.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DefaultYearMonthDayPeriodCountCalculator.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/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
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractBackwardDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractDateTestCase.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractForwardDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractModifiedFollowingDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractModifiedPreceedingDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateForwardDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayBackwardDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPrecedingDateCalculatorTest.java
Removed Paths:
-------------
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/BackwardHandler.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DefaultDateCalculatorFactory.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DefaultPeriodCountCalculator.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ForwardHandler.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ModifiedFollowingHandler.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ModifiedPreceedingHandler.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/BackwardDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/ForwardDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/ModifiedFollowingDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/ModifiedPreceedingDateCalculatorTest.java
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-01 12:02:20 UTC (rev 70)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java 2006-09-01 14:07:57 UTC (rev 71)
@@ -51,8 +51,7 @@
private HolidayHandler<E> holidayHandler;
- protected AbstractDateCalculator(final String name,
- final Set<E> nonWorkingDays, final HolidayHandler<E> holidayHandler) {
+ protected AbstractDateCalculator(final String name, final Set<E> nonWorkingDays, final HolidayHandler<E> holidayHandler) {
this.name = name;
this.nonWorkingDays = nonWorkingDays;
this.holidayHandler = holidayHandler;
@@ -152,6 +151,20 @@
}
public DateCalculator<E> moveByBusinessDays(final int businessDays) {
+ if (businessDays > 0
+ && holidayHandler != null
+ && (holidayHandler.getType().equals(HolidayHandlerType.BACKWARD) || holidayHandler.getType().equals(
+ HolidayHandlerType.MODIFIED_PRECEEDING))) {
+ throw new IllegalArgumentException("A " + HolidayHandlerType.MODIFIED_PRECEEDING + " or "
+ + HolidayHandlerType.BACKWARD + " does not allow positive steps for moveByBusinessDays");
+ } else if (businessDays < 0
+ && holidayHandler != null
+ && (holidayHandler.getType().equals(HolidayHandlerType.FORWARD) || holidayHandler.getType().equals(
+ HolidayHandlerType.MODIFIED_FOLLLOWING))) {
+ throw new IllegalArgumentException("A " + HolidayHandlerType.MODIFIED_FOLLLOWING + " or "
+ + HolidayHandlerType.FORWARD + " does not allow negative steps for moveByBusinessDays");
+ }
+
final int numberOfStepsLeft = Math.abs(businessDays);
final int step = (businessDays < 0 ? -1 : 1);
@@ -179,13 +192,9 @@
return this;
}
- if (holidayHandler == null
- && calendar.getHolidayHandlerType() != null
- || holidayHandler != null
- && !holidayHandler.getType().equals(
- calendar.getHolidayHandlerType())) {
- throw new IllegalArgumentException(
- "Combined Calendars cannot have different handler types");
+ if (holidayHandler == null && calendar.getHolidayHandlerType() != null || holidayHandler != null
+ && !holidayHandler.getType().equals(calendar.getHolidayHandlerType())) {
+ throw new IllegalArgumentException("Combined Calendars cannot have different handler types");
}
final Set<E> newSet = new HashSet<E>();
@@ -196,8 +205,8 @@
newSet.addAll(calendar.getNonWorkingDays());
}
- final DateCalculator<E> cal = createNewCalcultaor(getName() + "/"
- + calendar.getName(), getStartDate(), newSet, holidayHandler);
+ final DateCalculator<E> cal = createNewCalcultaor(getName() + "/" + calendar.getName(), getStartDate(), newSet,
+ holidayHandler);
return cal;
}
@@ -216,9 +225,8 @@
return getNextIMMDate(false, currentBusinessDate);
}
- protected abstract E getNextIMMDate(final boolean forward,
- final E theStartDate);
+ protected abstract E getNextIMMDate(final boolean forward, final E theStartDate);
- protected abstract DateCalculator<E> createNewCalcultaor(String calcName,
- E theStartDate, Set<E> holidays, HolidayHandler<E> handler);
+ protected abstract DateCalculator<E> createNewCalcultaor(String calcName, E theStartDate, Set<E> holidays,
+ HolidayHandler<E> handler);
}
Deleted: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/BackwardHandler.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/BackwardHandler.java 2006-09-01 12:02:20 UTC (rev 70)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/BackwardHandler.java 2006-09-01 14:07:57 UTC (rev 71)
@@ -1,44 +0,0 @@
-/*
- * 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.
- */
-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.LocalDate;
-
-/**
- * A backward handler will move the date backward if it falls on a non working
- * day.
- *
- * @author Benoit Xhenseval
- */
-public class BackwardHandler implements HolidayHandler<LocalDate> {
-
- public LocalDate moveCurrentDate(final DateCalculator<LocalDate> calendar) {
- LocalDate date = calendar.getCurrentBusinessDate();
- while (calendar.isNonWorkingDay(date)) {
- date = date.minusDays(1);
- }
- return date;
- }
-
- public String getType() {
- return HolidayHandlerType.BACKWARD;
- }
-
-}
Deleted: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DefaultDateCalculatorFactory.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DefaultDateCalculatorFactory.java 2006-09-01 12:02:20 UTC (rev 70)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DefaultDateCalculatorFactory.java 2006-09-01 14:07:57 UTC (rev 71)
@@ -1,71 +0,0 @@
-/*
- * 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.
- */
-package net.objectlab.kit.datecalc.joda;
-
-import net.objectlab.kit.datecalc.common.AbstractDateCalculatorFactory;
-import net.objectlab.kit.datecalc.common.DateCalculator;
-import net.objectlab.kit.datecalc.common.DateCalculatorFactory;
-import net.objectlab.kit.datecalc.common.HolidayHandlerType;
-import net.objectlab.kit.datecalc.common.PeriodCountCalculator;
-
-import org.joda.time.LocalDate;
-
-public class DefaultDateCalculatorFactory extends AbstractDateCalculatorFactory<LocalDate>
- implements DateCalculatorFactory<LocalDate> {
-
- private static final DateCalculatorFactory<LocalDate> DEFAULT = new DefaultDateCalculatorFactory();
-
- private static final PeriodCountCalculator<LocalDate> PCC = new DefaultPeriodCountCalculator();
-
- public static DateCalculatorFactory<LocalDate> getDefaultInstance() {
- return DEFAULT;
- }
-
- /**
- * Create a new DateCalculator for a given name and type of handling.
- *
- * @param name
- * calendar name (holidays set interested in). If there is set of
- * holidays with that name, it will return a DateCalculator with
- * an empty holiday set (will work on Weekend only).
- * @param type
- * typically one of the value of HolidayHandlerType
- * @return a new DateCalculator
- */
- public DateCalculator<LocalDate> getDateCalculator(final String name, final String holidayHandlerType) {
- final LocalDateCalculator cal = new LocalDateCalculator();
- cal.setName(name);
- if (holidays.containsKey(name)) {
- cal.setNonWorkingDays(holidays.get(name));
- }
-
- if (HolidayHandlerType.FORWARD.equals(holidayHandlerType)) {
- cal.setHolidayHandler(new ForwardHandler());
- } else if (HolidayHandlerType.BACKWARD.equals(holidayHandlerType)) {
- cal.setHolidayHandler(new BackwardHandler());
- } else if (HolidayHandlerType.MODIFIED_FOLLLOWING.equals(holidayHandlerType)) {
- cal.setHolidayHandler(new ModifiedFollowingHandler());
- } else if (HolidayHandlerType.MODIFIED_PRECEEDING.equals(holidayHandlerType)) {
- cal.setHolidayHandler(new ModifiedPreceedingHandler());
- }
- return cal;
- }
-
-
- public PeriodCountCalculator<LocalDate> getPeriodCountCalculator() {
- return PCC;
- }
-}
Added: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DefaultLocalDateCalculatorFactory.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DefaultLocalDateCalculatorFactory.java (rev 0)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DefaultLocalDateCalculatorFactory.java 2006-09-01 14:07:57 UTC (rev 71)
@@ -0,0 +1,69 @@
+/*
+ * 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.
+ */
+package net.objectlab.kit.datecalc.joda;
+
+import net.objectlab.kit.datecalc.common.AbstractDateCalculatorFactory;
+import net.objectlab.kit.datecalc.common.HolidayHandlerType;
+import net.objectlab.kit.datecalc.common.PeriodCountCalculator;
+
+import org.joda.time.LocalDate;
+
+public class DefaultLocalDateCalculatorFactory extends AbstractDateCalculatorFactory<LocalDate> {
+
+ private static final DefaultLocalDateCalculatorFactory DEFAULT = new DefaultLocalDateCalculatorFactory();
+
+ private static final PeriodCountCalculator<LocalDate> PCC = new DefaultLocalDatePeriodCountCalculator();
+
+ public static DefaultLocalDateCalculatorFactory getDefaultInstance() {
+ return DEFAULT;
+ }
+
+ /**
+ * Create a new DateCalculator for a given name and type of handling.
+ *
+ * @param name
+ * calendar name (holidays set interested in). If there is set of
+ * holidays with that name, it will return a DateCalculator with
+ * an empty holiday set (will work on Weekend only).
+ * @param type
+ * typically one of the value of HolidayHandlerType
+ * @return a new DateCalculator
+ */
+ @Override
+ public LocalDateCalculator getDateCalculator(final String name, final String holidayHandlerType) {
+ final LocalDateCalculator cal = new LocalDateCalculator();
+ cal.setName(name);
+ if (holidays.containsKey(name)) {
+ cal.setNonWorkingDays(holidays.get(name));
+ }
+
+ if (HolidayHandlerType.FORWARD.equals(holidayHandlerType)) {
+ cal.setHolidayHandler(new LocalDateForwardHandler());
+ } else if (HolidayHandlerType.BACKWARD.equals(holidayHandlerType)) {
+ cal.setHolidayHandler(new LocalDateBackwardHandler());
+ } else if (HolidayHandlerType.MODIFIED_FOLLLOWING.equals(holidayHandlerType)) {
+ cal.setHolidayHandler(new LocalDateModifiedFollowingHandler());
+ } else if (HolidayHandlerType.MODIFIED_PRECEEDING.equals(holidayHandlerType)) {
+ cal.setHolidayHandler(new LocalDateModifiedPreceedingHandler());
+ }
+ return cal;
+ }
+
+ @Override
+ public PeriodCountCalculator<LocalDate> getPeriodCountCalculator() {
+ return PCC;
+ }
+}
Added: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DefaultLocalDatePeriodCountCalculator.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DefaultLocalDatePeriodCountCalculator.java (rev 0)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DefaultLocalDatePeriodCountCalculator.java 2006-09-01 14:07:57 UTC (rev 71)
@@ -0,0 +1,101 @@
+package net.objectlab.kit.datecalc.joda;
+
+import net.objectlab.kit.datecalc.common.PeriodCountBasis;
+import net.objectlab.kit.datecalc.common.PeriodCountCalculator;
+
+import org.joda.time.LocalDate;
+import org.joda.time.Period;
+import org.joda.time.PeriodType;
+
+public class DefaultLocalDatePeriodCountCalculator implements PeriodCountCalculator<LocalDate> {
+ private static final int YEAR_360 = 360;
+
+ private static final int MONTHS_IN_YEAR = 12;
+
+ private static final double YEAR_365_0 = 365.0;
+
+ private static final double YEAR_360_0 = 360.0;
+
+ private static final int MONTH_31_DAYS = 31;
+
+ private static final int MONTH_30_DAYS = 30;
+
+ public int dayDiff(final LocalDate start, final LocalDate end, final PeriodCountBasis basis) {
+ int diff = 0;
+
+ if (basis == PeriodCountBasis.CONV_30_360) {
+ int dayStart = start.getDayOfMonth();
+ int dayEnd = end.getDayOfMonth();
+ if (dayEnd == MONTH_31_DAYS && dayStart >= MONTH_30_DAYS) {
+ dayEnd = MONTH_30_DAYS;
+ }
+ if (dayStart == MONTH_31_DAYS) {
+ dayStart = MONTH_30_DAYS;
+ }
+ diff = (end.getYear() - start.getYear()) * YEAR_360 + (end.getMonthOfYear() - start.getMonthOfYear()) * MONTH_30_DAYS
+ + dayEnd - dayStart;
+
+ } else if (basis == PeriodCountBasis.CONV_360E_ISDA) {
+ int dayStart = start.getDayOfMonth();
+ int dayEnd = end.getDayOfMonth();
+ final int monthStart = start.getMonthOfYear();
+ if ((monthStart == 2 && start.monthOfYear().getMaximumValue() == dayStart) || dayEnd == MONTH_31_DAYS) {
+ dayEnd = MONTH_30_DAYS;
+ }
+ if (dayStart == MONTH_31_DAYS) {
+ dayStart = MONTH_30_DAYS;
+ }
+
+ diff = (end.getYear() - start.getYear()) * YEAR_360 + (end.getMonthOfYear() - start.getMonthOfYear()) * MONTH_30_DAYS
+ + dayEnd - dayStart;
+
+ } else if (basis == PeriodCountBasis.CONV_360E_ISMA) {
+ int dayStart = start.getDayOfMonth();
+ int dayEnd = end.getDayOfMonth();
+ if (dayEnd == MONTH_31_DAYS) {
+ dayEnd = MONTH_30_DAYS;
+ }
+ if (dayStart == MONTH_31_DAYS) {
+ dayStart = MONTH_30_DAYS;
+ }
+ diff = (end.getYear() - start.getYear()) * YEAR_360 + (end.getMonthOfYear() - start.getMonthOfYear()) * MONTH_30_DAYS
+ + dayEnd - dayStart;
+ } else {
+
+ final Period p = new Period(start, end, PeriodType.days());
+ diff = p.getDays();
+ }
+ return diff;
+ }
+
+ public double monthDiff(final LocalDate start, final LocalDate end, final PeriodCountBasis basis) {
+ return yearDiff(start, end, basis) * MONTHS_IN_YEAR;
+ }
+
+ public double yearDiff(final LocalDate start, final LocalDate end, final PeriodCountBasis basis) {
+ double diff = 0.0;
+ if (basis == PeriodCountBasis.ACT_ACT) {
+ final int startYear = start.getYear();
+ final int endYear = end.getYear();
+ if (startYear != endYear) {
+ final LocalDate endOfStartYear = start.dayOfYear().withMaximumValue();
+ final LocalDate startOfEndYear = end.dayOfYear().setCopy(1);
+
+ 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) + (diff2)
+ / (double) end.dayOfYear().getMaximumValue();
+ }
+
+ } else if (basis == PeriodCountBasis.CONV_30_360 || basis == PeriodCountBasis.CONV_360E_ISDA
+ || basis == PeriodCountBasis.CONV_360E_ISMA || basis == PeriodCountBasis.ACT_360) {
+ diff = (dayDiff(start, end, basis)) / YEAR_360_0;
+
+ } else if (basis == PeriodCountBasis.ACT_365 || basis == PeriodCountBasis.END_365) {
+ diff = (dayDiff(start, end, basis)) / YEAR_365_0;
+ } else {
+ throw new UnsupportedOperationException("Sorry no ACT_UST yet");
+ }
+ return diff;
+ }
+}
Deleted: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DefaultPeriodCountCalculator.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DefaultPeriodCountCalculator.java 2006-09-01 12:02:20 UTC (rev 70)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DefaultPeriodCountCalculator.java 2006-09-01 14:07:57 UTC (rev 71)
@@ -1,101 +0,0 @@
-package net.objectlab.kit.datecalc.joda;
-
-import net.objectlab.kit.datecalc.common.PeriodCountBasis;
-import net.objectlab.kit.datecalc.common.PeriodCountCalculator;
-
-import org.joda.time.LocalDate;
-import org.joda.time.Period;
-import org.joda.time.PeriodType;
-
-public class DefaultPeriodCountCalculator implements PeriodCountCalculator<LocalDate> {
- private static final int YEAR_360 = 360;
-
- private static final int MONTHS_IN_YEAR = 12;
-
- private static final double YEAR_365_0 = 365.0;
-
- private static final double YEAR_360_0 = 360.0;
-
- private static final int MONTH_31_DAYS = 31;
-
- private static final int MONTH_30_DAYS = 30;
-
- public int dayDiff(final LocalDate start, final LocalDate end, final PeriodCountBasis basis) {
- int diff = 0;
-
- if (basis == PeriodCountBasis.CONV_30_360) {
- int dayStart = start.getDayOfMonth();
- int dayEnd = end.getDayOfMonth();
- if (dayEnd == MONTH_31_DAYS && dayStart >= MONTH_30_DAYS) {
- dayEnd = MONTH_30_DAYS;
- }
- if (dayStart == MONTH_31_DAYS) {
- dayStart = MONTH_30_DAYS;
- }
- diff = (end.getYear() - start.getYear()) * YEAR_360 + (end.getMonthOfYear() - start.getMonthOfYear()) * MONTH_30_DAYS
- + dayEnd - dayStart;
-
- } else if (basis == PeriodCountBasis.CONV_360E_ISDA) {
- int dayStart = start.getDayOfMonth();
- int dayEnd = end.getDayOfMonth();
- final int monthStart = start.getMonthOfYear();
- if ((monthStart == 2 && start.monthOfYear().getMaximumValue() == dayStart) || dayEnd == MONTH_31_DAYS) {
- dayEnd = MONTH_30_DAYS;
- }
- if (dayStart == MONTH_31_DAYS) {
- dayStart = MONTH_30_DAYS;
- }
-
- diff = (end.getYear() - start.getYear()) * YEAR_360 + (end.getMonthOfYear() - start.getMonthOfYear()) * MONTH_30_DAYS
- + dayEnd - dayStart;
-
- } else if (basis == PeriodCountBasis.CONV_360E_ISMA) {
- int dayStart = start.getDayOfMonth();
- int dayEnd = end.getDayOfMonth();
- if (dayEnd == MONTH_31_DAYS) {
- dayEnd = MONTH_30_DAYS;
- }
- if (dayStart == MONTH_31_DAYS) {
- dayStart = MONTH_30_DAYS;
- }
- diff = (end.getYear() - start.getYear()) * YEAR_360 + (end.getMonthOfYear() - start.getMonthOfYear()) * MONTH_30_DAYS
- + dayEnd - dayStart;
- } else {
-
- final Period p = new Period(start, end, PeriodType.days());
- diff = p.getDays();
- }
- return diff;
- }
-
- public double monthDiff(final LocalDate start, final LocalDate end, final PeriodCountBasis basis) {
- return yearDiff(start, end, basis) * MONTHS_IN_YEAR;
- }
-
- public double yearDiff(final LocalDate start, final LocalDate end, final PeriodCountBasis basis) {
- double diff = 0.0;
- if (basis == PeriodCountBasis.ACT_ACT) {
- final int startYear = start.getYear();
- final int endYear = end.getYear();
- if (startYear != endYear) {
- final LocalDate endOfStartYear = start.dayOfYear().withMaximumValue();
- final LocalDate startOfEndYear = end.dayOfYear().setCopy(1);
-
- 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) + (diff2)
- / (double) end.dayOfYear().getMaximumValue();
- }
-
- } else if (basis == PeriodCountBasis.CONV_30_360 || basis == PeriodCountBasis.CONV_360E_ISDA
- || basis == PeriodCountBasis.CONV_360E_ISMA || basis == PeriodCountBasis.ACT_360) {
- diff = (dayDiff(start, end, basis)) / YEAR_360_0;
-
- } else if (basis == PeriodCountBasis.ACT_365 || basis == PeriodCountBasis.END_365) {
- diff = (dayDiff(start, end, basis)) / YEAR_365_0;
- } else {
- throw new UnsupportedOperationException("Sorry no ACT_UST yet");
- }
- return diff;
- }
-}
Added: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DefaultYearMonthDayCalculatorFactory.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DefaultYearMonthDayCalculatorFactory.java (rev 0)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DefaultYearMonthDayCalculatorFactory.java 2006-09-01 14:07:57 UTC (rev 71)
@@ -0,0 +1,71 @@
+/*
+ * 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.
+ */
+package net.objectlab.kit.datecalc.joda;
+
+import net.objectlab.kit.datecalc.common.AbstractDateCalculatorFactory;
+import net.objectlab.kit.datecalc.common.DateCalculator;
+import net.objectlab.kit.datecalc.common.DateCalculatorFactory;
+import net.objectlab.kit.datecalc.common.HolidayHandlerType;
+import net.objectlab.kit.datecalc.common.PeriodCountCalculator;
+
+import org.joda.time.YearMonthDay;
+
+public class DefaultYearMonthDayCalculatorFactory extends AbstractDateCalculatorFactory<YearMonthDay> {
+
+ private static final DateCalculatorFactory<YearMonthDay> DEFAULT = new DefaultYearMonthDayCalculatorFactory();
+
+ private static final PeriodCountCalculator<YearMonthDay> PCC = new DefaultYearMonthDayPeriodCountCalculator();
+
+ public static DateCalculatorFactory<YearMonthDay> getDefaultInstance() {
+ return DEFAULT;
+ }
+
+ /**
+ * Create a new DateCalculator for a given name and type of handling.
+ *
+ * @param name
+ * calendar name (holidays set interested in). If there is set of
+ * holidays with that name, it will return a DateCalculator with
+ * an empty holiday set (will work on Weekend only).
+ * @param type
+ * typically one of the value of HolidayHandlerType
+ * @return a new DateCalculator
+ */
+ @Override
+ public DateCalculator<YearMonthDay> getDateCalculator(final String name, final String holidayHandlerType) {
+ final YearMonthDayDateCalculator cal = new YearMonthDayDateCalculator();
+ cal.setName(name);
+ if (holidays.containsKey(name)) {
+ cal.setNonWorkingDays(holidays.get(name));
+ }
+
+ if (HolidayHandlerTy...
[truncated message content] |
|
From: <be...@us...> - 2006-09-02 22:34:17
|
Revision: 81
http://svn.sourceforge.net/objectlabkit/?rev=81&view=rev
Author: benoitx
Date: 2006-09-02 15:33:20 -0700 (Sat, 02 Sep 2006)
Log Message:
-----------
new stats
Modified Paths:
--------------
trunk/datecalc-common/qalab.xml
trunk/datecalc-jdk/qalab.xml
trunk/datecalc-joda/qalab.xml
Modified: trunk/datecalc-common/qalab.xml
===================================================================
--- trunk/datecalc-common/qalab.xml 2006-09-02 14:19:20 UTC (rev 80)
+++ trunk/datecalc-common/qalab.xml 2006-09-02 22:33:20 UTC (rev 81)
@@ -40,6 +40,12 @@
<summaryresult date="2006-08-24" filecount="10" statvalue="1" type="checkstyle"/>
<summaryresult date="2006-08-24" filecount="9" statvalue="62" type="cobertura-line"/>
<summaryresult date="2006-08-24" filecount="9" statvalue="65" type="cobertura-branch"/>
+ <summaryresult date="2006-08-28" filecount="13" statvalue="3" type="checkstyle"/>
+ <summaryresult date="2006-08-28" filecount="12" statvalue="60" type="cobertura-line"/>
+ <summaryresult date="2006-08-28" filecount="12" statvalue="65" type="cobertura-branch"/>
+ <summaryresult date="2006-09-02" filecount="13" statvalue="9" type="checkstyle"/>
+ <summaryresult date="2006-09-02" filecount="12" statvalue="59" type="cobertura-line"/>
+ <summaryresult date="2006-09-02" filecount="12" statvalue="61" 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"/>
@@ -49,6 +55,8 @@
<result date="2006-08-20" statvalue="1" type="checkstyle"/>
<result date="2006-08-23" statvalue="1" type="checkstyle"/>
<result date="2006-08-24" statvalue="1" type="checkstyle"/>
+ <result date="2006-08-28" statvalue="1" type="checkstyle"/>
+ <result date="2006-09-02" statvalue="1" type="checkstyle"/>
</file>
<file id="net_objectlab_kit_datecalc_common_Tenor.java" path="net/objectlab/kit/datecalc/common/Tenor.java">
<result date="2006-08-08" statvalue="1" type="checkstyle"/>
@@ -68,6 +76,10 @@
<result date="2006-08-23" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-24" statvalue="100" type="cobertura-line"/>
<result date="2006-08-24" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-line"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-02" 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"/>
@@ -88,6 +100,10 @@
<result date="2006-08-23" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-24" statvalue="100" type="cobertura-line"/>
<result date="2006-08-24" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-line"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-02" 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"/>
@@ -104,6 +120,10 @@
<result date="2006-08-23" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-24" statvalue="100" type="cobertura-line"/>
<result date="2006-08-24" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-line"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-02" 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"/>
@@ -113,6 +133,8 @@
<result date="2006-08-20" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-23" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-24" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-02" 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"/>
@@ -120,6 +142,8 @@
<result date="2006-08-20" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-23" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-24" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-02" 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"/>
@@ -135,6 +159,10 @@
<result date="2006-08-23" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-24" statvalue="92" type="cobertura-line"/>
<result date="2006-08-24" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-08-28" statvalue="92" type="cobertura-line"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-02" statvalue="92" type="cobertura-line"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_common_AbstractDateCalculator.java" path="net/objectlab/kit/datecalc/common/AbstractDateCalculator.java">
@@ -148,11 +176,41 @@
<result date="2006-08-23" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-24" statvalue="100" type="cobertura-line"/>
<result date="2006-08-24" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-line"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-02" 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"/>
<result date="2006-08-23" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-24" statvalue="100" type="cobertura-line"/>
<result date="2006-08-24" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-line"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
</file>
+ <file
+ id="net_objectlab_kit_datecalc_common_AbstractDateCalculatorFactory.java" path="net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactory.java">
+ <result date="2006-08-28" statvalue="2" type="checkstyle"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-02" statvalue="2" type="checkstyle"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_common_DateCalculatorFactory.java" path="net/objectlab/kit/datecalc/common/DateCalculatorFactory.java">
+ <result date="2006-08-28" statvalue="100" type="cobertura-line"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_common_PeriodCountCalculator.java" path="net/objectlab/kit/datecalc/common/PeriodCountCalculator.java">
+ <result date="2006-08-28" statvalue="100" type="cobertura-line"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-02" statvalue="6" type="checkstyle"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ </file>
</qalab>
Modified: trunk/datecalc-jdk/qalab.xml
===================================================================
--- trunk/datecalc-jdk/qalab.xml 2006-09-02 14:19:20 UTC (rev 80)
+++ trunk/datecalc-jdk/qalab.xml 2006-09-02 22:33:20 UTC (rev 81)
@@ -39,6 +39,16 @@
<summaryresult date="2006-08-24" filecount="1" statvalue="1" type="pmd"/>
<summaryresult date="2006-08-24" filecount="7" statvalue="86" type="cobertura-line"/>
<summaryresult date="2006-08-24" filecount="7" statvalue="81" type="cobertura-branch"/>
+ <summaryresult date="2006-08-28" filecount="9" statvalue="5" type="checkstyle"/>
+ <summaryresult date="2006-08-28" filecount="1" statvalue="1" type="pmd"/>
+ <summaryresult date="2006-08-28" filecount="1" statvalue="1" type="findbugs"/>
+ <summaryresult date="2006-08-28" filecount="8" statvalue="71" type="cobertura-line"/>
+ <summaryresult date="2006-08-28" filecount="8" statvalue="71" type="cobertura-branch"/>
+ <summaryresult date="2006-09-02" filecount="11" statvalue="20" type="checkstyle"/>
+ <summaryresult date="2006-09-02" filecount="1" statvalue="1" type="pmd"/>
+ <summaryresult date="2006-09-02" filecount="1" statvalue="1" type="findbugs"/>
+ <summaryresult date="2006-09-02" filecount="10" statvalue="68" type="cobertura-line"/>
+ <summaryresult date="2006-09-02" filecount="10" statvalue="71" 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"/>
@@ -47,6 +57,8 @@
<result date="2006-08-20" statvalue="1" type="checkstyle"/>
<result date="2006-08-23" statvalue="1" type="checkstyle"/>
<result date="2006-08-24" statvalue="1" type="checkstyle"/>
+ <result date="2006-08-28" statvalue="1" type="checkstyle"/>
+ <result date="2006-09-02" statvalue="1" type="checkstyle"/>
</file>
<file id="net_objectlab_kit_datecalc_jdk_BaseDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/BaseDateCalculator.java">
<result date="2006-08-08" statvalue="1" type="checkstyle"/>
@@ -71,6 +83,14 @@
<result date="2006-08-24" statvalue="1" type="pmd"/>
<result date="2006-08-24" statvalue="84" type="cobertura-line"/>
<result date="2006-08-24" statvalue="76" type="cobertura-branch"/>
+ <result date="2006-08-28" statvalue="3" type="checkstyle"/>
+ <result date="2006-08-28" statvalue="1" type="pmd"/>
+ <result date="2006-08-28" statvalue="84" type="cobertura-line"/>
+ <result date="2006-08-28" statvalue="76" type="cobertura-branch"/>
+ <result date="2006-09-02" statvalue="4" type="checkstyle"/>
+ <result date="2006-09-02" statvalue="1" type="pmd"/>
+ <result date="2006-09-02" statvalue="84" type="cobertura-line"/>
+ <result date="2006-09-02" statvalue="75" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_DefaultDateCalculatorFactory.java" path="net/objectlab/kit/datecalc/jdk/DefaultDateCalculatorFactory.java">
@@ -86,6 +106,12 @@
<result date="2006-08-24" statvalue="1" type="checkstyle"/>
<result date="2006-08-24" statvalue="100" type="cobertura-line"/>
<result date="2006-08-24" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-08-28" statvalue="1" type="findbugs"/>
+ <result date="2006-08-28" statvalue="80" type="cobertura-line"/>
+ <result date="2006-08-28" statvalue="80" type="cobertura-branch"/>
+ <result date="2006-09-02" statvalue="1" type="findbugs"/>
+ <result date="2006-09-02" statvalue="95" type="cobertura-line"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="C:_project_objectlab-kit_datecalc-jdk_src_test_java_net_objectlab_kit_datecalc_jdk_DateCalculatorCombinationTest.java" path="C:/project/objectlab-kit/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/DateCalculatorCombinationTest.java">
@@ -152,6 +178,8 @@
<result date="2006-08-23" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-24" statvalue="50" type="cobertura-line"/>
<result date="2006-08-24" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-08-28" statvalue="50" type="cobertura-line"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="C:_project_objectlabkit_datecalc-jdk_src_test_java_net_objectlab_kit_datecalc_jdk_DateCalculatorCombinationTest.java" path="C:/project/objectlabkit/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/DateCalculatorCombinationTest.java"/>
@@ -165,6 +193,12 @@
<result date="2006-08-24" statvalue="1" type="checkstyle"/>
<result date="2006-08-24" statvalue="75" type="cobertura-line"/>
<result date="2006-08-24" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-08-28" statvalue="1" type="checkstyle"/>
+ <result date="2006-08-28" statvalue="75" type="cobertura-line"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-02" statvalue="1" type="checkstyle"/>
+ <result date="2006-09-02" statvalue="75" type="cobertura-line"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_jdk_ForwardHandler.java" path="net/objectlab/kit/datecalc/jdk/ForwardHandler.java">
<result date="2006-08-20" statvalue="100" type="cobertura-line"/>
@@ -173,5 +207,40 @@
<result date="2006-08-23" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-24" statvalue="100" type="cobertura-line"/>
<result date="2006-08-24" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-line"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
</file>
+ <file id="net_objectlab_kit_datecalc_jdk_BackwardHandler.java" path="net/objectlab/kit/datecalc/jdk/BackwardHandler.java">
+ <result date="2006-08-28" statvalue="66" type="cobertura-line"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-02" statvalue="66" type="cobertura-line"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_jdk_ModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/jdk/ModifiedPreceedingHandler.java">
+ <result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-02" statvalue="66" type="cobertura-line"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_jdk_CalendarPeriodCountCalculator.java" path="net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java">
+ <result date="2006-09-02" statvalue="9" type="checkstyle"/>
+ <result date="2006-09-02" statvalue="67" type="cobertura-line"/>
+ <result date="2006-09-02" statvalue="84" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_jdk_DatePeriodCountCalculator.java" path="net/objectlab/kit/datecalc/jdk/DatePeriodCountCalculator.java">
+ <result date="2006-09-02" statvalue="1" type="checkstyle"/>
+ <result date="2006-09-02" statvalue="80" type="cobertura-line"/>
+ <result date="2006-09-02" 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"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_jdk_ModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/jdk/ModifiedFollowingHandler.java">
+ <result date="2006-09-02" statvalue="18" type="cobertura-line"/>
+ </file>
</qalab>
Modified: trunk/datecalc-joda/qalab.xml
===================================================================
--- trunk/datecalc-joda/qalab.xml 2006-09-02 14:19:20 UTC (rev 80)
+++ trunk/datecalc-joda/qalab.xml 2006-09-02 22:33:20 UTC (rev 81)
@@ -45,6 +45,13 @@
<summaryresult date="2006-08-23" filecount="10" statvalue="95" type="cobertura-branch"/>
<summaryresult date="2006-08-24" filecount="10" statvalue="93" type="cobertura-line"/>
<summaryresult date="2006-08-24" filecount="10" statvalue="94" type="cobertura-branch"/>
+ <summaryresult date="2006-08-28" filecount="1" statvalue="1" type="findbugs"/>
+ <summaryresult date="2006-08-28" filecount="8" statvalue="93" type="cobertura-line"/>
+ <summaryresult date="2006-08-28" filecount="8" statvalue="94" type="cobertura-branch"/>
+ <summaryresult date="2006-09-02" filecount="18" statvalue="4" type="checkstyle"/>
+ <summaryresult date="2006-09-02" filecount="4" statvalue="40" type="simian"/>
+ <summaryresult date="2006-09-02" filecount="17" statvalue="86" type="cobertura-line"/>
+ <summaryresult date="2006-09-02" filecount="17" statvalue="88" 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"/>
@@ -77,6 +84,8 @@
<result date="2006-08-23" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-24" statvalue="100" type="cobertura-line"/>
<result date="2006-08-24" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-line"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_DefaultDateCalculatorFactory.java" path="net/objectlab/kit/datecalc/joda/DefaultDateCalculatorFactory.java">
@@ -97,6 +106,9 @@
<result date="2006-08-23" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-24" statvalue="100" type="cobertura-line"/>
<result date="2006-08-24" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-08-28" statvalue="1" type="findbugs"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-line"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_DefaultPeriodCountCalculator.java" path="net/objectlab/kit/datecalc/joda/DefaultPeriodCountCalculator.java">
@@ -120,6 +132,8 @@
<result date="2006-08-23" statvalue="84" type="cobertura-branch"/>
<result date="2006-08-24" statvalue="81" type="cobertura-line"/>
<result date="2006-08-24" statvalue="84" type="cobertura-branch"/>
+ <result date="2006-08-28" statvalue="81" type="cobertura-line"/>
+ <result date="2006-08-28" statvalue="84" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_joda_JodaWorkingWeek.java" path="net/objectlab/kit/datecalc/joda/JodaWorkingWeek.java">
<result date="2006-08-08" statvalue="1" type="checkstyle"/>
@@ -139,6 +153,10 @@
<result date="2006-08-23" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-24" statvalue="100" type="cobertura-line"/>
<result date="2006-08-24" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-line"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-02" 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"/>
@@ -152,6 +170,8 @@
<result date="2006-08-23" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-24" statvalue="100" type="cobertura-line"/>
<result date="2006-08-24" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-line"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_joda_DateCalculator.java" path="net/objectlab/kit/datecalc/joda/DateCalculator.java">
<result date="2006-08-08" statvalue="100" type="cobertura-line"/>
@@ -197,6 +217,8 @@
<result date="2006-08-23" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-24" statvalue="100" type="cobertura-line"/>
<result date="2006-08-24" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-line"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_joda_HolidayHandler.java" path="net/objectlab/kit/datecalc/joda/HolidayHandler.java">
<result date="2006-08-08" statvalue="100" type="cobertura-line"/>
@@ -237,6 +259,8 @@
<result date="2006-08-23" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-24" statvalue="100" type="cobertura-line"/>
<result date="2006-08-24" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-line"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_ModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/joda/ModifiedPreceedingHandler.java">
@@ -248,5 +272,84 @@
<result date="2006-08-23" statvalue="100" type="cobertura-branch"/>
<result date="2006-08-24" statvalue="75" type="cobertura-line"/>
<result date="2006-08-24" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-08-28" statvalue="75" type="cobertura-line"/>
+ <result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
</file>
+ <file id="net_objectlab_kit_datecalc_joda_ExcelDateUtil.java" path="net/objectlab/kit/datecalc/joda/ExcelDateUtil.java">
+ <result date="2006-09-02" statvalue="4" type="checkstyle"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_joda_DefaultLocalDateCalculatorFactory.java" path="net/objectlab/kit/datecalc/joda/DefaultLocalDateCalculatorFactory.java">
+ <result date="2006-09-02" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_joda_DefaultLocalDatePeriodCountCalculator.java" path="net/objectlab/kit/datecalc/joda/DefaultLocalDatePeriodCountCalculator.java">
+ <result date="2006-09-02" statvalue="81" type="cobertura-line"/>
+ <result date="2006-09-02" statvalue="84" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_joda_DefaultYearMonthDayCalculatorFactory.java" path="net/objectlab/kit/datecalc/joda/DefaultYearMonthDayCalculatorFactory.java">
+ <result date="2006-09-02" statvalue="94" type="cobertura-line"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_joda_DefaultYearMonthDayPeriodCountCalculator.java" path="net/objectlab/kit/datecalc/joda/DefaultYearMonthDayPeriodCountCalculator.java">
+ <result date="2006-09-02" statvalue="40" type="cobertura-line"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_joda_HolidayHandlerYearMonthDayWrapper.java" path="net/objectlab/kit/datecalc/joda/HolidayHandlerYearMonthDayWrapper.java">
+ <result date="2006-09-02" statvalue="83" type="cobertura-line"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_joda_LocalDateBackwardHandler.java" path="net/objectlab/kit/datecalc/joda/LocalDateBackwardHandler.java">
+ <result date="2006-09-02" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-02" 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"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_joda_LocalDateForwardHandler.java" path="net/objectlab/kit/datecalc/joda/LocalDateForwardHandler.java">
+ <result date="2006-09-02" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_joda_LocalDateModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingHandler.java">
+ <result date="2006-09-02" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_joda_LocalDateModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingHandler.java">
+ <result date="2006-09-02" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_joda_YearMonthDayBackwardHandler.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayBackwardHandler.java">
+ <result date="2006-09-02" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_joda_YearMonthDayDateCalculator.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java">
+ <result date="2006-09-02" statvalue="78" type="cobertura-line"/>
+ <result date="2006-09-02" statvalue="83" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_joda_YearMonthDayForwardHandler.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayForwardHandler.java">
+ <result date="2006-09-02" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_joda_YearMonthDayModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingHandler.java">
+ <result date="2006-09-02" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_joda_YearMonthDayModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPreceedingHandler.java">
+ <result date="2006-09-02" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-02" 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-03 11:41:18
|
Revision: 83
http://svn.sourceforge.net/objectlabkit/?rev=83&view=rev
Author: marchy
Date: 2006-09-03 04:39:24 -0700 (Sun, 03 Sep 2006)
Log Message:
-----------
Moved the generic test classes to common, and modified the JodaWorkingWeek (a lot of the stuff was common with WorkingWeek. In the process I broke all the tests, sorry. Will fix later today - it's an issue in WorkingWeek.
Modified Paths:
--------------
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/WorkingWeek.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeek.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateCalculator.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeekTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateDateCalculatorCombinationTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateForwardDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayBackwardDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculatorCombinationTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPrecedingDateCalculatorTest.java
Added Paths:
-----------
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractBackwardDateCalculatorTest.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorCombinationTest.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardDateCalculatorTest.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedFollowingDateCalculatorTest.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedPreceedingDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractDateCalculatorTest.java
Removed Paths:
-------------
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractBackwardDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractDateCalculatorCombinationTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractDateTestCase.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractForwardDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractModifiedFollowingDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractModifiedPreceedingDateCalculatorTest.java
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/WorkingWeek.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/WorkingWeek.java 2006-09-03 09:56:09 UTC (rev 82)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/WorkingWeek.java 2006-09-03 11:39:24 UTC (rev 83)
@@ -25,23 +25,23 @@
*/
public class WorkingWeek {
- private static final byte MONDAY = 1;
+ protected static final byte MONDAY = 1;
- private static final byte TUESDAY = 2;
+ protected static final byte TUESDAY = 2;
- private static final byte WEDNESDAY = 4;
+ protected static final byte WEDNESDAY = 4;
- private static final byte THURSDAY = 8;
+ protected static final byte THURSDAY = 8;
- private static final byte FRIDAY = 16;
+ protected static final byte FRIDAY = 16;
- private static final byte SATURDAY = 32;
+ protected static final byte SATURDAY = 32;
- private static final byte SUNDAY = 64;
+ protected static final byte SUNDAY = 64;
- private static final byte DEFAULT_WORKING_DAYS = (byte) (MONDAY + TUESDAY + WEDNESDAY + THURSDAY + FRIDAY);
+ protected static final byte DEFAULT_WORKING_DAYS = (byte) (MONDAY + TUESDAY + WEDNESDAY + THURSDAY + FRIDAY);
- private static final byte[] WORKING_WEEK_DAYS_OFFSET = new byte[] { SUNDAY, MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY,
+ protected static final byte[] WORKING_WEEK_DAYS_OFFSET = new byte[] { SUNDAY, MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY,
SATURDAY };
public static final WorkingWeek DEFAULT = new WorkingWeek();
@@ -61,8 +61,8 @@
* working days: 1 Monday, 2 Tuesday, 4 Wednesday, 8 Thursday, 16 Friday, 32
* Saturday, 64 Sunday So Monday-Friday= 1+2+4+8+16 = 31
*/
- private byte workingDays = DEFAULT_WORKING_DAYS;
-
+ protected byte workingDays = DEFAULT_WORKING_DAYS;
+
public boolean isWorkingDayFromCalendar(final int dayOfWeek) {
final int day = adjustDay(dayOfWeek);
return (WORKING_WEEK_DAYS_OFFSET[day] & workingDays) != 0;
@@ -74,7 +74,7 @@
return isWorkingDayFromCalendar(cal.get(Calendar.DAY_OF_WEEK));
}
- private int adjustDay(final int dayOfWeek) {
+ protected int adjustDay(final int dayOfWeek) {
return dayOfWeek - 1;
}
@@ -97,4 +97,8 @@
}
return ret;
}
+
+ public byte getWorkingDays() {
+ return workingDays;
+ }
}
Copied: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractBackwardDateCalculatorTest.java (from rev 81, trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractBackwardDateCalculatorTest.java)
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractBackwardDateCalculatorTest.java (rev 0)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractBackwardDateCalculatorTest.java 2006-09-03 11:39:24 UTC (rev 83)
@@ -0,0 +1,248 @@
+package net.objectlab.kit.datecalc.common;
+
+import java.util.Calendar;
+import java.util.Set;
+
+import junit.framework.Assert;
+import net.objectlab.kit.datecalc.common.DateCalculator;
+import net.objectlab.kit.datecalc.common.HolidayHandlerType;
+import net.objectlab.kit.datecalc.common.StandardTenor;
+import net.objectlab.kit.datecalc.common.Tenor;
+import net.objectlab.kit.datecalc.common.TenorCode;
+
+public abstract class AbstractBackwardDateCalculatorTest<E> extends AbstractDateTestCase<E> {
+
+ public void testSimpleForwardWithWeekend() {
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.BACKWARD);
+ Assert.assertEquals("Name", "bla", cal.getName());
+ Assert.assertEquals("Holidays size", 0, cal.getNonWorkingDays().size());
+
+ final E startDate = newDate("2006-08-01");
+ cal.setStartDate(startDate);
+ checkDate("Move by 0 days", cal.moveByDays(0), "2006-08-01");
+ checkDate("Move by 1 days", cal.moveByDays(1), "2006-08-02");
+ checkDate("Move by 1 more days", cal.moveByDays(1), "2006-08-03");
+ checkDate("Move by 1 more more days", cal.moveByDays(1), "2006-08-04");
+ checkDate("Move by 1 more more more days (across weekend)", cal.moveByDays(1), "2006-08-04");
+ }
+
+ public void testSimpleBackwardStartDateWithWeekend() {
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.BACKWARD);
+ Assert.assertEquals("Name", "bla", cal.getName());
+ Assert.assertEquals("Holidays size", 0, cal.getNonWorkingDays().size());
+
+ cal.setStartDate(newDate("2006-07-31")); // start date Monday
+ checkDate("start date Monday", cal, "2006-07-31");
+
+ cal.setStartDate(newDate("2006-08-01")); // start date Tuesday
+ checkDate("start date Tuesday", cal, "2006-08-01");
+
+ cal.setStartDate(newDate("2006-08-02")); // start date Wednesday
+ checkDate("start date Wednesday", cal, "2006-08-02");
+
+ cal.setStartDate(newDate("2006-08-03")); // start date Thursday
+ checkDate("start date Thursday", cal, "2006-08-03");
+
+ cal.setStartDate(newDate("2006-08-04")); // set on a Friday
+ checkDate("start date friday", cal, "2006-08-04");
+
+ cal.setStartDate(newDate("2006-08-05")); // set on a Saturday
+ checkDate("start date Saturday", cal, "2006-08-04");
+
+ cal.setStartDate(newDate("2006-08-06")); // set on a Sunday
+ checkDate("start date Sunday", cal, "2006-08-04");
+ }
+
+ public void testSimpleForwardStartDateNoWeekend() {
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.BACKWARD);
+ WorkingWeek ww = new WorkingWeek()
+ .withWorkingDayFromCalendar(true, Calendar.SATURDAY)
+ .withWorkingDayFromCalendar(true, Calendar.SUNDAY);
+ cal.setWorkingWeek(getWorkingWeek(ww));
+ Assert.assertEquals("Name", "bla", cal.getName());
+ Assert.assertEquals("Holidays size", 0, cal.getNonWorkingDays().size());
+
+ cal.setStartDate(newDate("2006-07-31")); // start date Monday
+ checkDate("start date Monday", cal, "2006-07-31");
+
+ cal.setStartDate(newDate("2006-08-01")); // start date Tuesday
+ checkDate("start date Tuesday", cal, "2006-08-01");
+
+ cal.setStartDate(newDate("2006-08-02")); // start date Wednesday
+ checkDate("start date Wednesday", cal, "2006-08-02");
+
+ cal.setStartDate(newDate("2006-08-03")); // start date Thursday
+ checkDate("start date Thursday", cal, "2006-08-03");
+
+ cal.setStartDate(newDate("2006-08-04")); // set on a Friday
+ checkDate("start date friday", cal, "2006-08-04");
+
+ cal.setStartDate(newDate("2006-08-05")); // set on a Saturday
+ checkDate("start date Saturday", cal, "2006-08-05");
+
+ cal.setStartDate(newDate("2006-08-06")); // set on a Sunday
+ checkDate("start date Sunday", cal, "2006-08-06");
+ }
+
+ public void testSimpleForwardStartDateWhackyWeek() {
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.BACKWARD);
+ Assert.assertEquals("Name", "bla", cal.getName());
+ Assert.assertEquals("Holidays size", 0, cal.getNonWorkingDays().size());
+
+ WorkingWeek ww = new WorkingWeek()
+ .withWorkingDayFromCalendar(false, Calendar.MONDAY)
+ .withWorkingDayFromCalendar(true, Calendar.TUESDAY)
+ .withWorkingDayFromCalendar(false, Calendar.WEDNESDAY)
+ .withWorkingDayFromCalendar(true, Calendar.THURSDAY)
+ .withWorkingDayFromCalendar(false, Calendar.FRIDAY)
+ .withWorkingDayFromCalendar(true, Calendar.SATURDAY)
+ .withWorkingDayFromCalendar(false, Calendar.SUNDAY);
+ cal.setWorkingWeek(getWorkingWeek(ww));
+
+ cal.setStartDate(newDate("2006-07-31")); // start date Monday
+ checkDate("start date Monday", cal, "2006-07-29");
+
+ cal.setStartDate(newDate("2006-08-01")); // start date Tuesday
+ checkDate("start date Tuesday", cal, "2006-08-01");
+
+ cal.setStartDate(newDate("2006-08-02")); // start date Wednesday
+ checkDate("start date Wednesday", cal, "2006-08-01");
+
+ cal.setStartDate(newDate("2006-08-03")); // start date Thursday
+ checkDate("start date Thursday", cal, "2006-08-03");
+
+ cal.setStartDate(newDate("2006-08-04")); // set on a Friday
+ checkDate("start date friday", cal, "2006-08-03");
+
+ cal.setStartDate(newDate("2006-08-05")); // set on a Saturday
+ checkDate("start date Saturday", cal, "2006-08-05");
+
+ cal.setStartDate(newDate("2006-08-06")); // set on a Sunday
+ checkDate("start date Sunday", cal, "2006-08-05");
+ }
+
+ public void testSimpleForwardStartDateIdealWeekend() {
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.BACKWARD);
+ Assert.assertEquals("Name", "bla", cal.getName());
+ Assert.assertEquals("Holidays size", 0, cal.getNonWorkingDays().size());
+
+ WorkingWeek ww = new WorkingWeek()
+ .withWorkingDayFromCalendar(false, Calendar.MONDAY)
+ .withWorkingDayFromCalendar(true, Calendar.TUESDAY)
+ .withWorkingDayFromCalendar(true, Calendar.WEDNESDAY)
+ .withWorkingDayFromCalendar(true, Calendar.THURSDAY)
+ .withWorkingDayFromCalendar(true, Calendar.FRIDAY)
+ .withWorkingDayFromCalendar(false, Calendar.SATURDAY)
+ .withWorkingDayFromCalendar(false, Calendar.SUNDAY);
+ cal.setWorkingWeek(getWorkingWeek(ww));
+
+ cal.setStartDate(newDate("2006-07-31")); // start date Monday
+ checkDate("start date Monday", cal, "2006-07-28");
+
+ cal.setStartDate(newDate("2006-08-01")); // start date Tuesday
+ checkDate("start date Tuesday", cal, "2006-08-01");
+
+ cal.setStartDate(newDate("2006-08-02")); // start date Wednesday
+ checkDate("start date Wednesday", cal, "2006-08-02");
+
+ cal.setStartDate(newDate("2006-08-03")); // start date Thursday
+ checkDate("start date Thursday", cal, "2006-08-03");
+
+ cal.setStartDate(newDate("2006-08-04")); // set on a Friday
+ checkDate("start date friday", cal, "2006-08-04");
+
+ cal.setStartDate(newDate("2006-08-05")); // set on a Saturday
+ checkDate("start date Saturday", cal, "2006-08-04");
+
+ cal.setStartDate(newDate("2006-08-06")); // set on a Sunday
+ checkDate("start date Sunday", cal, "2006-08-04");
+ }
+
+ public void testSimpleForwardWithHolidays() {
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.BACKWARD);
+ final Set<E> holidays = newHolidaysSet();
+ Assert.assertEquals("Name", "bla", cal.getName());
+ cal.setNonWorkingDays(holidays);
+ Assert.assertEquals("Holidays", holidays, cal.getNonWorkingDays());
+ Assert.assertEquals("Holidays size", 3, cal.getNonWorkingDays().size());
+
+ Assert.assertTrue("contains", holidays.contains(newDate("2006-08-28")));
+ Assert.assertTrue("contains", cal.getNonWorkingDays().contains(newDate("2006-08-28")));
+
+ cal.setStartDate(newDate("2006-08-28"));
+ checkDate("Move given Bank Holiday", cal, "2006-08-25");
+
+ cal.setStartDate(newDate("2006-12-24"));
+ checkDate("Xmas Eve", cal, "2006-12-22");
+
+ cal.setStartDate(newDate("2006-12-21"));
+ checkDate("21/12 + 1", cal.moveByDays(1), "2006-12-22");
+
+ cal.setStartDate(newDate("2006-12-21"));
+ checkDate("21/12 + 1", cal.moveByDays(2), "2006-12-22");
+
+ cal.setStartDate(newDate("2006-12-22"));
+ checkDate("22/12 + 1", cal.moveByDays(1), "2006-12-22");
+
+ cal.setStartDate(newDate("2006-12-23"));
+ checkDate("23/12 + 1", cal.moveByDays(1), "2006-12-22");
+ }
+
+ /**
+ * @todo not sure what to expect from this... with backward mechanism...
+ */
+ public void testMoveByBusinessDays() {
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.BACKWARD);
+ final Set<E> holidays = newHolidaysSet();
+ Assert.assertEquals("Name", "bla", cal.getName());
+ cal.setNonWorkingDays(holidays);
+ Assert.assertEquals("Holidays", holidays, cal.getNonWorkingDays());
+ Assert.assertEquals("Holidays size", 3, cal.getNonWorkingDays().size());
+
+ // cal.setStartDate(newDate("2006-08-24"));
+ // checkDate("Move 1 BD", cal.moveByBusinessDays(1), "2006-08-25");
+
+ cal.setStartDate(newDate("2006-08-24"));
+ try {
+ cal.moveByBusinessDays(7);
+ fail("Should have thrown exception");
+ } catch (final IllegalArgumentException e) {
+ // ok
+ }
+ // checkDate("Add 1 week", cal.moveByDays(7), "2006-08-31");
+ // cal.setStartDate(newDate("2006-08-24"));
+ // checkDate("Move by 1W with 1 bank holiday",
+ // cal.moveByBusinessDays(7), "2006-09-05");
+
+ }
+
+ public void testMoveByTenorDays() {
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.BACKWARD);
+
+ cal.setStartDate(newDate("2006-08-08"));
+ checkDate("Move 1D", cal.moveByTenor(StandardTenor.T_1D), "2006-08-09");
+
+ cal.setStartDate(newDate("2006-08-08"));
+ checkDate("Move 2D", cal.moveByTenor(new Tenor(2, TenorCode.DAY)), "2006-08-10");
+
+ cal.setStartDate(newDate("2006-08-08"));
+ checkDate("Move 10D", cal.moveByTenor(new Tenor(10, TenorCode.DAY)), "2006-08-18");
+
+ cal.setStartDate(newDate("2006-08-08"));
+ checkDate("Move 11D", cal.moveByTenor(new Tenor(11, TenorCode.DAY)), "2006-08-18");
+
+ }
+
+ public void testMoveByTenorWeek() {
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.BACKWARD);
+
+ cal.setStartDate(newDate("2006-08-08"));
+ checkDate("Move 1W", cal.moveByTenor(StandardTenor.T_1W), "2006-08-15");
+
+ cal.setStartDate(newDate("2006-08-08"));
+ checkDate("Move 2W", cal.moveByTenor(new Tenor(2, TenorCode.WEEK)), "2006-08-22");
+
+ cal.setStartDate(newDate("2006-08-08"));
+ checkDate("Move 4W", cal.moveByTenor(new Tenor(4, TenorCode.WEEK)), "2006-09-05");
+ }
+}
Copied: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorCombinationTest.java (from rev 81, trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractDateCalculatorCombinationTest.java)
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorCombinationTest.java (rev 0)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorCombinationTest.java 2006-09-03 11:39:24 UTC (rev 83)
@@ -0,0 +1,122 @@
+package net.objectlab.kit.datecalc.common;
+
+import junit.framework.Assert;
+import net.objectlab.kit.datecalc.common.DateCalculator;
+import net.objectlab.kit.datecalc.common.HolidayHandlerType;
+
+public abstract class AbstractDateCalculatorCombinationTest<E> extends AbstractDateTestCase<E> {
+
+ public void testInvalidCombinationDiffHandler() {
+ final DateCalculator<E> cal1 = newDateCalculator("bla", HolidayHandlerType.BACKWARD);
+ final DateCalculator<E> cal2 = newDateCalculator("bla2", HolidayHandlerType.FORWARD);
+
+ try {
+ cal1.combine(cal2);
+ Assert.fail("should not have allowed 2 different handler types to be combined");
+ } catch (final IllegalArgumentException e) {
+ // ok
+ }
+ }
+
+ public void testInvalidCombinationNullNotNullHandler() {
+ final DateCalculator<E> cal1 = newDateCalculator("bla", null);
+ final DateCalculator<E> cal2 = newDateCalculator("bla2", HolidayHandlerType.FORWARD);
+
+ try {
+ cal1.combine(cal2);
+ Assert.fail("should not have allowed 2 different handler types to be combined");
+ } catch (final IllegalArgumentException e) {
+ // ok
+ }
+ }
+
+ public void testInvalidCombinationNotNullNullHandler() {
+ final DateCalculator<E> cal1 = newDateCalculator("bla", HolidayHandlerType.FORWARD);
+ final DateCalculator<E> cal2 = newDateCalculator("bla2", null);
+
+ try {
+ cal1.combine(cal2);
+ Assert.fail("should not have allowed 2 different handler types to be combined");
+ } catch (final IllegalArgumentException e) {
+ // ok
+ }
+ }
+
+ public void testValidCombinationOneEmptySet() {
+ registerHolidays("UK", createUKHolidays());
+ final DateCalculator<E> cal1 = newDateCalculator("bla", HolidayHandlerType.FORWARD);
+
+ final E localDate = newDate("2006-08-08");
+ cal1.setStartDate(localDate);
+ final DateCalculator<E> cal2 = newDateCalculator("UK", HolidayHandlerType.FORWARD);
+
+ final DateCalculator<E> combo = cal1.combine(cal2);
+ Assert.assertEquals("Combo name", "bla/UK", combo.getName());
+ Assert.assertEquals("Combo type", HolidayHandlerType.FORWARD, combo.getHolidayHandlerType());
+ Assert.assertEquals("start", localDate, combo.getStartDate());
+ Assert.assertEquals("currentDate", localDate, combo.getCurrentBusinessDate());
+ Assert.assertEquals("Holidays", 4, combo.getNonWorkingDays().size());
+ }
+
+ public void testValidCombination() {
+ registerHolidays("UK", createUKHolidays());
+ registerHolidays("UK", createUKHolidays());
+ final DateCalculator<E> cal1 = newDateCalculator("UK", HolidayHandlerType.FORWARD);
+ final E localDate = newDate("2006-08-08");
+ cal1.setStartDate(localDate);
+ final DateCalculator<E> cal2 = newDateCalculator("UK", HolidayHandlerType.FORWARD);
+
+ final DateCalculator<E> combo = cal1.combine(cal2);
+ Assert.assertEquals("Combo name", "UK/UK", combo.getName());
+ Assert.assertEquals("Combo type", HolidayHandlerType.FORWARD, combo.getHolidayHandlerType());
+ Assert.assertEquals("start", localDate, combo.getStartDate());
+ Assert.assertEquals("currentDate", localDate, combo.getCurrentBusinessDate());
+ Assert.assertEquals("Holidays", 4, combo.getNonWorkingDays().size());
+ }
+
+ public void testValidCombination2Sets() {
+ registerHolidays("UK", createUKHolidays());
+ registerHolidays("US", createUSHolidays());
+ final DateCalculator<E> cal1 = newDateCalculator("US", HolidayHandlerType.FORWARD);
+ final E localDate = newDate("2006-08-08");
+ cal1.setStartDate(localDate);
+ final DateCalculator<E> cal2 = newDateCalculator("UK", HolidayHandlerType.FORWARD);
+
+ final DateCalculator<E> combo = cal1.combine(cal2);
+ Assert.assertEquals("Combo name", "US/UK", combo.getName());
+ Assert.assertEquals("Combo type", HolidayHandlerType.FORWARD, combo.getHolidayHandlerType());
+ Assert.assertEquals("start", localDate, combo.getStartDate());
+ Assert.assertEquals("currentDate", localDate, combo.getCurrentBusinessDate());
+ Assert.assertEquals("Holidays", 6, combo.getNonWorkingDays().size());
+ }
+
+ public void testNullCombination() {
+ registerHolidays("US", createUSHolidays());
+ final DateCalculator<E> cal1 = newDateCalculator("US", HolidayHandlerType.FORWARD);
+ final E localDate = newDate("2006-08-08");
+ cal1.setStartDate(localDate);
+
+ final DateCalculator<E> combo = cal1.combine(null);
+ Assert.assertSame("same", combo, cal1);
+ Assert.assertEquals("Combo name", "US", combo.getName());
+ Assert.assertEquals("Combo type", HolidayHandlerType.FORWARD, combo.getHolidayHandlerType());
+ Assert.assertEquals("start", localDate, combo.getStartDate());
+ Assert.assertEquals("currentDate", localDate, combo.getCurrentBusinessDate());
+ Assert.assertEquals("Holidays", 3, combo.getNonWorkingDays().size());
+ }
+
+ public void testSameCombination() {
+ registerHolidays("US", createUSHolidays());
+ final DateCalculator<E> cal1 = newDateCalculator("US", HolidayHandlerType.FORWARD);
+ final E localDate = newDate("2006-08-08");
+ cal1.setStartDate(localDate);
+
+ final DateCalculator<E> combo = cal1.combine(cal1);
+ Assert.assertSame("same", combo, cal1);
+ Assert.assertEquals("Combo name", "US", combo.getName());
+ Assert.assertEquals("Combo type", HolidayHandlerType.FORWARD, combo.getHolidayHandlerType());
+ Assert.assertEquals("start", localDate, combo.getStartDate());
+ Assert.assertEquals("currentDate", localDate, combo.getCurrentBusinessDate());
+ Assert.assertEquals("Holidays", 3, combo.getNonWorkingDays().size());
+ }
+}
Copied: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java (from rev 81, trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractDateTestCase.java)
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java (rev 0)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java 2006-09-03 11:39:24 UTC (rev 83)
@@ -0,0 +1,27 @@
+package net.objectlab.kit.datecalc.common;
+
+import java.util.Set;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+import net.objectlab.kit.datecalc.common.DateCalculator;
+
+public abstract class AbstractDateTestCase<E> extends TestCase {
+ protected abstract E newDate(final String date);
+
+ protected abstract DateCalculator<E> newDateCalculator(String name, String type);
+
+ protected abstract WorkingWeek getWorkingWeek(WorkingWeek ww);
+
+ protected void checkDate(final String string, final DateCalculator<E> calendar, final String string2) {
+ Assert.assertEquals(string, newDate(string2), calendar.getCurrentBusinessDate());
+ }
+
+ protected abstract Set<E> newHolidaysSet();
+
+ protected abstract Set<E> createUKHolidays();
+
+ protected abstract Set<E> createUSHolidays();
+
+ protected abstract void registerHolidays(final String name, Set<E> holidays);
+}
Copied: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardDateCalculatorTest.java (from rev 81, trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractForwardDateCalculatorTest.java)
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardDateCalculatorTest.java (rev 0)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardDateCalculatorTest.java 2006-09-03 11:39:24 UTC (rev 83)
@@ -0,0 +1,233 @@
+package net.objectlab.kit.datecalc.common;
+
+import java.util.Calendar;
+import java.util.Set;
+
+import junit.framework.Assert;
+
+public abstract class AbstractForwardDateCalculatorTest<E> extends AbstractDateTestCase<E> {
+
+ public void testSimpleForwardWithWeekend() {
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.FORWARD);
+ Assert.assertEquals("Name", "bla", cal.getName());
+ Assert.assertEquals("Holidays size", 0, cal.getNonWorkingDays().size());
+
+ final E startDate = newDate("2006-08-01");
+ cal.setStartDate(startDate);
+ checkDate("Move by 0 days", cal.moveByDays(0), "2006-08-01");
+ checkDate("Move by 1 days", cal.moveByDays(1), "2006-08-02");
+ checkDate("Move by 1 more days", cal.moveByDays(1), "2006-08-03");
+ checkDate("Move by 1 more more days", cal.moveByDays(1), "2006-08-04");
+ checkDate("Move by 1 more more more days (across weekend)", cal.moveByDays(1), "2006-08-07");
+ }
+
+ public void testSimpleForwardStartDateWithWeekend() {
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.FORWARD);
+ Assert.assertEquals("Name", "bla", cal.getName());
+ Assert.assertEquals("Holidays size", 0, cal.getNonWorkingDays().size());
+
+ cal.setStartDate(newDate("2006-07-31")); // start date Monday
+ checkDate("start date Monday", cal, "2006-07-31");
+
+ cal.setStartDate(newDate("2006-08-01")); // start date Tuesday
+ checkDate("start date Tuesday", cal, "2006-08-01");
+
+ cal.setStartDate(newDate("2006-08-02")); // start date Wednesday
+ checkDate("start date Wednesday", cal, "2006-08-02");
+
+ cal.setStartDate(newDate("2006-08-03")); // start date Thursday
+ checkDate("start date Thursday", cal, "2006-08-03");
+
+ cal.setStartDate(newDate("2006-08-04")); // set on a Friday
+ checkDate("start date friday", cal, "2006-08-04");
+
+ cal.setStartDate(newDate("2006-08-05")); // set on a Saturday
+ checkDate("start date Saturday", cal, "2006-08-07");
+
+ cal.setStartDate(newDate("2006-08-06")); // set on a Sunday
+ checkDate("start date Sunday", cal, "2006-08-07");
+ }
+
+ public void testSimpleForwardStartDateNoWeekend() {
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.FORWARD);
+ WorkingWeek ww = new WorkingWeek()
+ .withWorkingDayFromCalendar(true, Calendar.SATURDAY)
+ .withWorkingDayFromCalendar(true, Calendar.SUNDAY);
+ cal.setWorkingWeek(getWorkingWeek(ww));
+ Assert.assertEquals("Name", "bla", cal.getName());
+ Assert.assertEquals("Holidays size", 0, cal.getNonWorkingDays().size());
+
+ cal.setStartDate(newDate("2006-07-31")); // start date Monday
+ checkDate("start date Monday", cal, "2006-07-31");
+
+ cal.setStartDate(newDate("2006-08-01")); // start date Tuesday
+ checkDate("start date Tuesday", cal, "2006-08-01");
+
+ cal.setStartDate(newDate("2006-08-02")); // start date Wednesday
+ checkDate("start date Wednesday", cal, "2006-08-02");
+
+ cal.setStartDate(newDate("2006-08-03")); // start date Thursday
+ ...
[truncated message content] |
|
From: <be...@us...> - 2006-09-04 11:10:39
|
Revision: 93
http://svn.sourceforge.net/objectlabkit/?rev=93&view=rev
Author: benoitx
Date: 2006-09-04 04:10:28 -0700 (Mon, 04 Sep 2006)
Log Message:
-----------
Added dependencies for Abstract tests from Common... a bit dirty but it works...
Marcin, try to test your code by building using Maven 1.1
Modified Paths:
--------------
trunk/datecalc-jdk/project.xml
trunk/datecalc-joda/project.xml
trunk/maven.xml
Added Paths:
-----------
trunk/datecalc-common/LICENSE.txt
trunk/datecalc-jdk/LICENSE.txt
trunk/datecalc-joda/LICENSE.txt
Added: trunk/datecalc-common/LICENSE.txt
===================================================================
--- trunk/datecalc-common/LICENSE.txt (rev 0)
+++ trunk/datecalc-common/LICENSE.txt 2006-09-04 11:10:28 UTC (rev 93)
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
Added: trunk/datecalc-jdk/LICENSE.txt
===================================================================
--- trunk/datecalc-jdk/LICENSE.txt (rev 0)
+++ trunk/datecalc-jdk/LICENSE.txt 2006-09-04 11:10:28 UTC (rev 93)
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
Modified: trunk/datecalc-jdk/project.xml
===================================================================
--- trunk/datecalc-jdk/project.xml 2006-09-04 10:25:50 UTC (rev 92)
+++ trunk/datecalc-jdk/project.xml 2006-09-04 11:10:28 UTC (rev 93)
@@ -60,6 +60,15 @@
<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>
</build>
Added: trunk/datecalc-joda/LICENSE.txt
===================================================================
--- trunk/datecalc-joda/LICENSE.txt (rev 0)
+++ trunk/datecalc-joda/LICENSE.txt 2006-09-04 11:10:28 UTC (rev 93)
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works th...
[truncated message content] |
|
From: <be...@us...> - 2006-09-04 23:04:48
|
Revision: 103
http://svn.sourceforge.net/objectlabkit/?rev=103&view=rev
Author: benoitx
Date: 2006-09-04 16:04:19 -0700 (Mon, 04 Sep 2006)
Log Message:
-----------
re-enable the yDoc plugin.
Modified Paths:
--------------
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/src/site/index.xml
Modified: trunk/datecalc-common/project.xml
===================================================================
--- trunk/datecalc-common/project.xml 2006-09-04 21:09:33 UTC (rev 102)
+++ trunk/datecalc-common/project.xml 2006-09-04 23:04:19 UTC (rev 103)
@@ -35,7 +35,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>
Modified: trunk/datecalc-common/qalab.xml
===================================================================
--- trunk/datecalc-common/qalab.xml 2006-09-04 21:09:33 UTC (rev 102)
+++ trunk/datecalc-common/qalab.xml 2006-09-04 23:04:19 UTC (rev 103)
@@ -46,10 +46,10 @@
<summaryresult date="2006-09-02" filecount="13" statvalue="9" type="checkstyle"/>
<summaryresult date="2006-09-02" filecount="12" statvalue="59" type="cobertura-line"/>
<summaryresult date="2006-09-02" filecount="12" statvalue="61" type="cobertura-branch"/>
- <summaryresult date="2006-09-04" filecount="14" statvalue="12" type="checkstyle"/>
+ <summaryresult date="2006-09-04" filecount="15" statvalue="12" type="checkstyle"/>
<summaryresult date="2006-09-04" filecount="1" statvalue="1" type="findbugs"/>
- <summaryresult date="2006-09-04" filecount="13" statvalue="62" type="cobertura-line"/>
- <summaryresult date="2006-09-04" filecount="13" statvalue="64" type="cobertura-branch"/>
+ <summaryresult date="2006-09-04" filecount="14" statvalue="61" type="cobertura-line"/>
+ <summaryresult date="2006-09-04" filecount="14" statvalue="64" 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"/>
@@ -243,7 +243,10 @@
</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"/>
- <result date="2006-09-04" statvalue="88" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="90" type="cobertura-line"/>
<result date="2006-09-04" 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"/>
+ </file>
</qalab>
Modified: trunk/datecalc-jdk/project.xml
===================================================================
--- trunk/datecalc-jdk/project.xml 2006-09-04 21:09:33 UTC (rev 102)
+++ trunk/datecalc-jdk/project.xml 2006-09-04 23:04:19 UTC (rev 103)
@@ -42,7 +42,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>
Modified: trunk/datecalc-jdk/qalab.xml
===================================================================
--- trunk/datecalc-jdk/qalab.xml 2006-09-04 21:09:33 UTC (rev 102)
+++ trunk/datecalc-jdk/qalab.xml 2006-09-04 23:04:19 UTC (rev 103)
@@ -49,6 +49,9 @@
<summaryresult date="2006-09-02" filecount="1" statvalue="1" type="findbugs"/>
<summaryresult date="2006-09-02" filecount="10" statvalue="68" type="cobertura-line"/>
<summaryresult date="2006-09-02" filecount="10" statvalue="71" type="cobertura-branch"/>
+ <summaryresult date="2006-09-04" filecount="17" statvalue="18" type="checkstyle"/>
+ <summaryresult date="2006-09-04" filecount="16" statvalue="77" type="cobertura-line"/>
+ <summaryresult date="2006-09-04" filecount="16" statvalue="79" 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"/>
@@ -59,6 +62,7 @@
<result date="2006-08-24" statvalue="1" type="checkstyle"/>
<result date="2006-08-28" statvalue="1" type="checkstyle"/>
<result date="2006-09-02" statvalue="1" type="checkstyle"/>
+ <result date="2006-09-04" statvalue="1" type="checkstyle"/>
</file>
<file id="net_objectlab_kit_datecalc_jdk_BaseDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/BaseDateCalculator.java">
<result date="2006-08-08" statvalue="1" type="checkstyle"/>
@@ -211,36 +215,91 @@
<result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-02" statvalue="100" type="cobertura-line"/>
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_jdk_BackwardHandler.java" path="net/objectlab/kit/datecalc/jdk/BackwardHandler.java">
<result date="2006-08-28" statvalue="66" type="cobertura-line"/>
<result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-02" statvalue="66" type="cobertura-line"/>
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_ModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/jdk/ModifiedPreceedingHandler.java">
<result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-02" statvalue="66" type="cobertura-line"/>
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarPeriodCountCalculator.java" path="net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java">
<result date="2006-09-02" statvalue="9" type="checkstyle"/>
<result date="2006-09-02" statvalue="67" type="cobertura-line"/>
<result date="2006-09-02" statvalue="84" type="cobertura-branch"/>
+ <result date="2006-09-04" statvalue="79" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="84" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_DatePeriodCountCalculator.java" path="net/objectlab/kit/datecalc/jdk/DatePeriodCountCalculator.java">
<result date="2006-09-02" statvalue="1" type="checkstyle"/>
<result date="2006-09-02" statvalue="80" type="cobertura-line"/>
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-04" statvalue="1" type="checkstyle"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-04" 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"/>
+ <result date="2006-09-04" statvalue="4" type="checkstyle"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_ModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/jdk/ModifiedFollowingHandler.java">
<result date="2006-09-02" statvalue="18" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
</file>
+ <file
+ id="net_objectlab_kit_datecalc_jdk_HolidayHandlerDateWrapper.java" path="net/objectlab/kit/datecalc/jdk/HolidayHandlerDateWrapper.java">
+ <result date="2006-09-04" statvalue="2" type="checkstyle"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_jdk_JdkCalendarBaseDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/JdkCalendarBaseDateCalculator.java">
+ <result date="2006-09-04" statvalue="8" type="checkstyle"/>
+ <result date="2006-09-04" statvalue="86" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="85" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_jdk_JdkDateCalculatorFactory.java" path="net/objectlab/kit/datecalc/jdk/JdkDateCalculatorFactory.java">
+ <result date="2006-09-04" statvalue="2" type="checkstyle"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_jdk_DefaultJdkDateCalculatorFactory.java" path="net/objectlab/kit/datecalc/jdk/DefaultJdkDateCalculatorFactory.java">
+ <result date="2006-09-04" statvalue="95" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_jdk_JdkCalendarDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/JdkCalendarDateCalculator.java">
+ <result date="2006-09-04" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_jdk_JdkDateBaseDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/JdkDateBaseDateCalculator.java">
+ <result date="2006-09-04" statvalue="91" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file id="net_objectlab_kit_datecalc_jdk_JdkDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/JdkDateCalculator.java">
+ <result date="2006-09-04" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_jdk_JdkDatePeriodCountCalculator.java" path="net/objectlab/kit/datecalc/jdk/JdkDatePeriodCountCalculator.java">
+ <result date="2006-09-04" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ </file>
</qalab>
Modified: trunk/datecalc-joda/project.xml
===================================================================
--- trunk/datecalc-joda/project.xml 2006-09-04 21:09:33 UTC (rev 102)
+++ trunk/datecalc-joda/project.xml 2006-09-04 23:04:19 UTC (rev 103)
@@ -41,7 +41,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>
Modified: trunk/datecalc-joda/qalab.xml
===================================================================
--- trunk/datecalc-joda/qalab.xml 2006-09-04 21:09:33 UTC (rev 102)
+++ trunk/datecalc-joda/qalab.xml 2006-09-04 23:04:19 UTC (rev 103)
@@ -52,6 +52,10 @@
<summaryresult date="2006-09-02" filecount="4" statvalue="40" type="simian"/>
<summaryresult date="2006-09-02" filecount="17" statvalue="86" type="cobertura-line"/>
<summaryresult date="2006-09-02" filecount="17" statvalue="88" type="cobertura-branch"/>
+ <summaryresult date="2006-09-04" filecount="18" statvalue="10" type="checkstyle"/>
+ <summaryresult date="2006-09-04" filecount="4" statvalue="40" type="simian"/>
+ <summaryresult date="2006-09-04" filecount="17" statvalue="84" type="cobertura-line"/>
+ <summaryresult date="2006-09-04" filecount="17" statvalue="87" 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"/>
@@ -157,6 +161,9 @@
<result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-02" statvalue="100" type="cobertura-line"/>
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-04" statvalue="2" type="checkstyle"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-04" 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"/>
@@ -277,79 +284,111 @@
</file>
<file id="net_objectlab_kit_datecalc_joda_ExcelDateUtil.java" path="net/objectlab/kit/datecalc/joda/ExcelDateUtil.java">
<result date="2006-09-02" statvalue="4" type="checkstyle"/>
+ <result date="2006-09-04" statvalue="4" type="checkstyle"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_DefaultLocalDateCalculatorFactory.java" path="net/objectlab/kit/datecalc/joda/DefaultLocalDateCalculatorFactory.java">
<result date="2006-09-02" statvalue="100" type="cobertura-line"/>
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_DefaultLocalDatePeriodCountCalculator.java" path="net/objectlab/kit/datecalc/joda/DefaultLocalDatePeriodCountCalculator.java">
<result date="2006-09-02" statvalue="81" type="cobertura-line"/>
<result date="2006-09-02" statvalue="84" type="cobertura-branch"/>
+ <result date="2006-09-04" statvalue="81" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="84" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_DefaultYearMonthDayCalculatorFactory.java" path="net/objectlab/kit/datecalc/joda/DefaultYearMonthDayCalculatorFactory.java">
<result date="2006-09-02" statvalue="94" type="cobertura-line"/>
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-04" statvalue="94" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_DefaultYearMonthDayPeriodCountCalculator.java" path="net/objectlab/kit/datecalc/joda/DefaultYearMonthDayPeriodCountCalculator.java">
<result date="2006-09-02" statvalue="40" type="cobertura-line"/>
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-04" statvalue="40" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_HolidayHandlerYearMonthDayWrapper.java" path="net/objectlab/kit/datecalc/joda/HolidayHandlerYearMonthDayWrapper.java">
<result date="2006-09-02" statvalue="83" type="cobertura-line"/>
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-04" statvalue="83" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateBackwardHandler.java" path="net/objectlab/kit/datecalc/joda/LocalDateBackwardHandler.java">
<result date="2006-09-02" statvalue="100" type="cobertura-line"/>
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-04" 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"/>
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-04" statvalue="4" type="checkstyle"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateForwardHandler.java" path="net/objectlab/kit/datecalc/joda/LocalDateForwardHandler.java">
<result date="2006-09-02" statvalue="100" type="cobertura-line"/>
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingHandler.java">
<result date="2006-09-02" statvalue="100" type="cobertura-line"/>
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingHandler.java">
<result date="2006-09-02" statvalue="100" type="cobertura-line"/>
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayBackwardHandler.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayBackwardHandler.java">
<result date="2006-09-02" statvalue="100" type="cobertura-line"/>
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayDateCalculator.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java">
<result date="2006-09-02" statvalue="78" type="cobertura-line"/>
<result date="2006-09-02" statvalue="83" type="cobertura-branch"/>
+ <result date="2006-09-04" statvalue="64" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="71" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayForwardHandler.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayForwardHandler.java">
<result date="2006-09-02" statvalue="100" type="cobertura-line"/>
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingHandler.java">
<result date="2006-09-02" statvalue="100" type="cobertura-line"/>
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPreceedingHandler.java">
<result date="2006-09-02" statvalue="100" type="cobertura-line"/>
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
</file>
</qalab>
Modified: trunk/src/site/index.xml
===================================================================
--- trunk/src/site/index.xml 2006-09-04 21:09:33 UTC (rev 102)
+++ trunk/src/site/index.xml 2006-09-04 23:04:19 UTC (rev 103)
@@ -16,7 +16,7 @@
the business-friendly Apache 2.0 license.</p>
<subsection name="So, what do we provide?">
- <p>The initial release provides 2 modules for Date calculations, both depend on the classes in common:</p>
+ <p>The initial release provides 2 modules for <strong>Date calculations</strong>, both depend on the classes in common:</p>
<ul><li>one for the <a href="./multiproject/datecalc-jdk/index.html">datecalc-jdk.jar JDK</a> with no dependencies</li>
<li>and one is based on the powerful <a href="./multiproject/datecalc-joda/index.html">datecalc-joda.jar Joda-time</a> library (we recommend it!)</li>
</ul>
@@ -27,8 +27,8 @@
</subsection>
<subsection name ="Date Calculations? What is that?">
- <p>Apart from the very basic "add days" features, most business have to deal with Holidays and what to do when a
- calculated day falls on a holiday. This library does <strong>not</strong> attempt to create or guess the holidays, we
+ <p>Apart from the very basic "add days" features, most business have to <strong>deal with Holidays</strong> and what to do when a
+ <strong>calculated day falls on a holiday</strong>. This library does <strong>not</strong> attempt to create or guess the holidays, we
all know that some bank holidays can be decided at a moment's notice in some markets. All financial institutions or
big business will have their own official list of 'holidays' anyway.</p>
<p>Furthermore, "weekends" also need to be handled and some market have a different week to the conventional Monday ->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2006-09-04 23:56:49
|
Revision: 104
http://svn.sourceforge.net/objectlabkit/?rev=104&view=rev
Author: benoitx
Date: 2006-09-04 16:56:32 -0700 (Mon, 04 Sep 2006)
Log Message:
-----------
Time to hit the sack... I have released a new website with a better front page with examples (what do you think?).
Modified Paths:
--------------
trunk/datecalc-common/qalab.xml
trunk/datecalc-jdk/qalab.xml
trunk/datecalc-joda/qalab.xml
trunk/src/site/index.xml
Modified: trunk/datecalc-common/qalab.xml
===================================================================
--- trunk/datecalc-common/qalab.xml 2006-09-04 23:04:19 UTC (rev 103)
+++ trunk/datecalc-common/qalab.xml 2006-09-04 23:56:32 UTC (rev 104)
@@ -50,6 +50,10 @@
<summaryresult date="2006-09-04" filecount="1" statvalue="1" type="findbugs"/>
<summaryresult date="2006-09-04" filecount="14" statvalue="61" type="cobertura-line"/>
<summaryresult date="2006-09-04" filecount="14" statvalue="64" type="cobertura-branch"/>
+ <summaryresult date="2006-09-05" filecount="15" statvalue="12" type="checkstyle"/>
+ <summaryresult date="2006-09-05" filecount="1" statvalue="1" type="findbugs"/>
+ <summaryresult date="2006-09-05" filecount="14" statvalue="61" type="cobertura-line"/>
+ <summaryresult date="2006-09-05" filecount="14" statvalue="64" 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"/>
@@ -62,6 +66,7 @@
<result date="2006-08-28" statvalue="1" type="checkstyle"/>
<result date="2006-09-02" statvalue="1" type="checkstyle"/>
<result date="2006-09-04" statvalue="1" type="checkstyle"/>
+ <result date="2006-09-05" statvalue="1" type="checkstyle"/>
</file>
<file id="net_objectlab_kit_datecalc_common_Tenor.java" path="net/objectlab/kit/datecalc/common/Tenor.java">
<result date="2006-08-08" statvalue="1" type="checkstyle"/>
@@ -87,6 +92,8 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" 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"/>
@@ -115,6 +122,10 @@
<result date="2006-09-04" statvalue="1" type="findbugs"/>
<result date="2006-09-04" statvalue="95" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="1" type="checkstyle"/>
+ <result date="2006-09-05" statvalue="1" type="findbugs"/>
+ <result date="2006-09-05" statvalue="95" type="cobertura-line"/>
+ <result date="2006-09-05" 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"/>
@@ -137,6 +148,8 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" 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"/>
@@ -149,6 +162,7 @@
<result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" 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"/>
@@ -159,6 +173,7 @@
<result date="2006-08-28" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" 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"/>
@@ -180,6 +195,8 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="92" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="92" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_common_AbstractDateCalculator.java" path="net/objectlab/kit/datecalc/common/AbstractDateCalculator.java">
@@ -199,6 +216,8 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" 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"/>
@@ -211,6 +230,8 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_common_AbstractDateCalculatorFactory.java" path="net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactory.java">
@@ -220,6 +241,8 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="2" type="checkstyle"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="2" type="checkstyle"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_common_DateCalculatorFactory.java" path="net/objectlab/kit/datecalc/common/DateCalculatorFactory.java">
@@ -229,6 +252,8 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_common_PeriodCountCalculator.java" path="net/objectlab/kit/datecalc/common/PeriodCountCalculator.java">
@@ -240,13 +265,20 @@
<result date="2006-09-04" statvalue="6" type="checkstyle"/>
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="6" type="checkstyle"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" 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"/>
<result date="2006-09-04" statvalue="90" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="2" type="checkstyle"/>
+ <result date="2006-09-05" statvalue="90" type="cobertura-line"/>
+ <result date="2006-09-05" 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"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
</qalab>
Modified: trunk/datecalc-jdk/qalab.xml
===================================================================
--- trunk/datecalc-jdk/qalab.xml 2006-09-04 23:04:19 UTC (rev 103)
+++ trunk/datecalc-jdk/qalab.xml 2006-09-04 23:56:32 UTC (rev 104)
@@ -52,6 +52,9 @@
<summaryresult date="2006-09-04" filecount="17" statvalue="18" type="checkstyle"/>
<summaryresult date="2006-09-04" filecount="16" statvalue="77" type="cobertura-line"/>
<summaryresult date="2006-09-04" filecount="16" statvalue="79" type="cobertura-branch"/>
+ <summaryresult date="2006-09-05" filecount="17" statvalue="18" type="checkstyle"/>
+ <summaryresult date="2006-09-05" filecount="16" statvalue="77" type="cobertura-line"/>
+ <summaryresult date="2006-09-05" filecount="16" statvalue="79" 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"/>
@@ -63,6 +66,7 @@
<result date="2006-08-28" statvalue="1" type="checkstyle"/>
<result date="2006-09-02" statvalue="1" type="checkstyle"/>
<result date="2006-09-04" statvalue="1" type="checkstyle"/>
+ <result date="2006-09-05" statvalue="1" type="checkstyle"/>
</file>
<file id="net_objectlab_kit_datecalc_jdk_BaseDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/BaseDateCalculator.java">
<result date="2006-08-08" statvalue="1" type="checkstyle"/>
@@ -217,6 +221,8 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_jdk_BackwardHandler.java" path="net/objectlab/kit/datecalc/jdk/BackwardHandler.java">
<result date="2006-08-28" statvalue="66" type="cobertura-line"/>
@@ -225,6 +231,8 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_ModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/jdk/ModifiedPreceedingHandler.java">
@@ -233,6 +241,8 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarPeriodCountCalculator.java" path="net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java">
@@ -241,6 +251,8 @@
<result date="2006-09-02" statvalue="84" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="79" type="cobertura-line"/>
<result date="2006-09-04" statvalue="84" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="79" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="84" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_DatePeriodCountCalculator.java" path="net/objectlab/kit/datecalc/jdk/DatePeriodCountCalculator.java">
@@ -250,56 +262,80 @@
<result date="2006-09-04" statvalue="1" type="checkstyle"/>
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="1" type="checkstyle"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" 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"/>
<result date="2006-09-04" statvalue="4" type="checkstyle"/>
+ <result date="2006-09-05" statvalue="4" type="checkstyle"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_ModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/jdk/ModifiedFollowingHandler.java">
<result date="2006-09-02" statvalue="18" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_HolidayHandlerDateWrapper.java" path="net/objectlab/kit/datecalc/jdk/HolidayHandlerDateWrapper.java">
<result date="2006-09-04" statvalue="2" type="checkstyle"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="2" type="checkstyle"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_JdkCalendarBaseDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/JdkCalendarBaseDateCalculator.java">
<result date="2006-09-04" statvalue="8" type="checkstyle"/>
<result date="2006-09-04" statvalue="86" type="cobertura-line"/>
<result date="2006-09-04" statvalue="85" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="8" type="checkstyle"/>
+ <result date="2006-09-05" statvalue="86" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="85" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_JdkDateCalculatorFactory.java" path="net/objectlab/kit/datecalc/jdk/JdkDateCalculatorFactory.java">
<result date="2006-09-04" statvalue="2" type="checkstyle"/>
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="2" type="checkstyle"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_DefaultJdkDateCalculatorFactory.java" path="net/objectlab/kit/datecalc/jdk/DefaultJdkDateCalculatorFactory.java">
<result date="2006-09-04" statvalue="95" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="95" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_JdkCalendarDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/JdkCalendarDateCalculator.java">
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_JdkDateBaseDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/JdkDateBaseDateCalculator.java">
<result date="2006-09-04" statvalue="91" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="91" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_jdk_JdkDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/JdkDateCalculator.java">
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_JdkDatePeriodCountCalculator.java" path="net/objectlab/kit/datecalc/jdk/JdkDatePeriodCountCalculator.java">
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
</qalab>
Modified: trunk/datecalc-joda/qalab.xml
===================================================================
--- trunk/datecalc-joda/qalab.xml 2006-09-04 23:04:19 UTC (rev 103)
+++ trunk/datecalc-joda/qalab.xml 2006-09-04 23:56:32 UTC (rev 104)
@@ -56,6 +56,10 @@
<summaryresult date="2006-09-04" filecount="4" statvalue="40" type="simian"/>
<summaryresult date="2006-09-04" filecount="17" statvalue="84" type="cobertura-line"/>
<summaryresult date="2006-09-04" filecount="17" statvalue="87" type="cobertura-branch"/>
+ <summaryresult date="2006-09-05" filecount="18" statvalue="10" type="checkstyle"/>
+ <summaryresult date="2006-09-05" filecount="4" statvalue="40" type="simian"/>
+ <summaryresult date="2006-09-05" filecount="17" statvalue="84" type="cobertura-line"/>
+ <summaryresult date="2006-09-05" filecount="17" statvalue="87" 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"/>
@@ -164,6 +168,9 @@
<result date="2006-09-04" statvalue="2" type="checkstyle"/>
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="2" type="checkstyle"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" 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"/>
@@ -285,6 +292,7 @@
<file id="net_objectlab_kit_datecalc_joda_ExcelDateUtil.java" path="net/objectlab/kit/datecalc/joda/ExcelDateUtil.java">
<result date="2006-09-02" statvalue="4" type="checkstyle"/>
<result date="2006-09-04" statvalue="4" type="checkstyle"/>
+ <result date="2006-09-05" statvalue="4" type="checkstyle"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_DefaultLocalDateCalculatorFactory.java" path="net/objectlab/kit/datecalc/joda/DefaultLocalDateCalculatorFactory.java">
@@ -292,6 +300,8 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_DefaultLocalDatePeriodCountCalculator.java" path="net/objectlab/kit/datecalc/joda/DefaultLocalDatePeriodCountCalculator.java">
@@ -299,6 +309,8 @@
<result date="2006-09-02" statvalue="84" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="81" type="cobertura-line"/>
<result date="2006-09-04" statvalue="84" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="81" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="84" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_DefaultYearMonthDayCalculatorFactory.java" path="net/objectlab/kit/datecalc/joda/DefaultYearMonthDayCalculatorFactory.java">
@@ -306,6 +318,8 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="94" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="94" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_DefaultYearMonthDayPeriodCountCalculator.java" path="net/objectlab/kit/datecalc/joda/DefaultYearMonthDayPeriodCountCalculator.java">
@@ -313,6 +327,8 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="40" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="40" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_HolidayHandlerYearMonthDayWrapper.java" path="net/objectlab/kit/datecalc/joda/HolidayHandlerYearMonthDayWrapper.java">
@@ -320,6 +336,8 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="83" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="83" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateBackwardHandler.java" path="net/objectlab/kit/datecalc/joda/LocalDateBackwardHandler.java">
@@ -327,6 +345,8 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" 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"/>
@@ -334,6 +354,9 @@
<result date="2006-09-04" statvalue="4" type="checkstyle"/>
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="4" type="checkstyle"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateForwardHandler.java" path="net/objectlab/kit/datecalc/joda/LocalDateForwardHandler.java">
@@ -341,6 +364,8 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingHandler.java">
@@ -348,6 +373,8 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingHandler.java">
@@ -355,6 +382,8 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayBackwardHandler.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayBackwardHandler.java">
@@ -362,6 +391,8 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayDateCalculator.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java">
@@ -369,6 +400,8 @@
<result date="2006-09-02" statvalue="83" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="64" type="cobertura-line"/>
<result date="2006-09-04" statvalue="71" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="64" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="71" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayForwardHandler.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayForwardHandler.java">
@@ -376,6 +409,8 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingHandler.java">
@@ -383,6 +418,8 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPreceedingHandler.java">
@@ -390,5 +427,7 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
</qalab>
Modified: trunk/src/site/index.xml
===================================================================
--- trunk/src/site/index.xml 2006-09-04 23:04:19 UTC (rev 103)
+++ trunk/src/site/index.xml 2006-09-04 23:56:32 UTC (rev 104)
@@ -33,7 +33,7 @@
big business will have their own official list of 'holidays' anyway.</p>
<p>Furthermore, "weekends" also need to be handled and some market have a different week to the conventional Monday ->
Friday, our library provides you with full flexibility to design a Working Week.</p>
- <p>As such a Non-working Day can be a holiday or a 'weekend'.</p>...
[truncated message content] |
|
From: <be...@us...> - 2006-09-05 17:59:44
|
Revision: 113
http://svn.sourceforge.net/objectlabkit/?rev=113&view=rev
Author: benoitx
Date: 2006-09-05 10:59:19 -0700 (Tue, 05 Sep 2006)
Log Message:
-----------
Work around a bug in JDK 6 compiler (target must be 5 and not 1.5 as per doc).
Modified Paths:
--------------
trunk/common-build/project.properties
trunk/common-build/project.xml
trunk/datecalc-common/qalab.xml
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactory.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/ExcelDateUtil.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/PeriodCountCalculator.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/Utils.java
trunk/datecalc-jdk/qalab.xml
trunk/datecalc-joda/qalab.xml
trunk/maven.xml
Modified: trunk/common-build/project.properties
===================================================================
--- trunk/common-build/project.properties 2006-09-05 15:52:39 UTC (rev 112)
+++ trunk/common-build/project.properties 2006-09-05 17:59:19 UTC (rev 113)
@@ -20,18 +20,19 @@
maven.junit.format = plain
# Target 1.5 JVMs
-maven.compile.target = 1.5
+maven.compile.target=5
# Source code is 1.5
-maven.compile.source = 1.5
+maven.compile.source=1.5
+maven.compile.verbose=true
-maven.aspectj.source=1.5
+maven.multiproject.ignoreFailures=true
-maven.aspectj.reweavable=true
-
# Deprecation compilation
maven.compile.deprecation=on
maven.javadoc.debug=true
-internal_javadoc_needed=true
+#pom.package=net.objectlab.kit.*
+#maven.javadoc.extrasourcepath=../datecalc-jdk/src/main/java/**.java
+#internal_javadoc_needed=true
# -------------------------------------------------------------------
# T E S T P R O P E R T I E S
Modified: trunk/common-build/project.xml
===================================================================
--- trunk/common-build/project.xml 2006-09-05 15:52:39 UTC (rev 112)
+++ trunk/common-build/project.xml 2006-09-05 17:59:19 UTC (rev 113)
@@ -107,11 +107,11 @@
<reports>
<report>maven-checkstyle-plugin</report>
- <!--<report>maven-findbugs-plugin</report>-->
+ <report>maven-findbugs-plugin</report>
<report>maven-pmd-plugin</report>
<report>maven-simian-plugin</report>
- <!--<report>maven-cobertura-plugin</report>-->
- <!--<report>maven-qalab-plugin</report>-->
+ <report>maven-cobertura-plugin</report>
+ <report>maven-qalab-plugin</report>
<report>maven-javadoc-plugin</report>
<report>maven-jdepend-plugin</report>
<report>maven-faq-plugin</report>
Modified: trunk/datecalc-common/qalab.xml
===================================================================
--- trunk/datecalc-common/qalab.xml 2006-09-05 15:52:39 UTC (rev 112)
+++ trunk/datecalc-common/qalab.xml 2006-09-05 17:59:19 UTC (rev 113)
@@ -50,10 +50,10 @@
<summaryresult date="2006-09-04" filecount="1" statvalue="1" type="findbugs"/>
<summaryresult date="2006-09-04" filecount="14" statvalue="61" type="cobertura-line"/>
<summaryresult date="2006-09-04" filecount="14" statvalue="64" type="cobertura-branch"/>
- <summaryresult date="2006-09-05" filecount="15" statvalue="12" type="checkstyle"/>
+ <summaryresult date="2006-09-05" filecount="16" statvalue="9" type="checkstyle"/>
<summaryresult date="2006-09-05" filecount="1" statvalue="1" type="findbugs"/>
- <summaryresult date="2006-09-05" filecount="14" statvalue="61" type="cobertura-line"/>
- <summaryresult date="2006-09-05" filecount="14" statvalue="64" type="cobertura-branch"/>
+ <summaryresult date="2006-09-05" filecount="15" statvalue="64" type="cobertura-line"/>
+ <summaryresult date="2006-09-05" filecount="15" statvalue="69" 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"/>
@@ -241,7 +241,7 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="2" type="checkstyle"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
- <result date="2006-09-05" statvalue="2" type="checkstyle"/>
+ <result date="2006-09-05" statvalue="1" type="checkstyle"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file
@@ -273,12 +273,15 @@
<result date="2006-09-04" statvalue="2" type="checkstyle"/>
<result date="2006-09-04" statvalue="90" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
- <result date="2006-09-05" statvalue="2" type="checkstyle"/>
- <result date="2006-09-05" statvalue="90" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="84" type="cobertura-line"/>
<result date="2006-09-05" 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"/>
<result date="2006-09-05" 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="87" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ </file>
</qalab>
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactory.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactory.java 2006-09-05 15:52:39 UTC (rev 112)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactory.java 2006-09-05 17:59:19 UTC (rev 113)
@@ -48,8 +48,8 @@
* @param holidays
* the set of holidays (non-working days).
*/
- public void registerHolidays(final String name, final Set<E> holidays) {
- this.holidays.put(name, holidays);
+ public void registerHolidays(final String name, final Set<E> holidaysSet) {
+ this.holidays.put(name, holidaysSet);
}
}
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-05 15:52:39 UTC (rev 112)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/ExcelDateUtil.java 2006-09-05 17:59:19 UTC (rev 113)
@@ -30,7 +30,7 @@
* @version $Revision: 99 $ $Date: 2006-09-04 21:30:25 +0100 (Mon, 04 Sep 2006) $
*
*/
-public class ExcelDateUtil {
+public final class ExcelDateUtil {
private static final double HALF_MILLISEC = 0.5;
private static final int EXCEL_FUDGE_19000229 = 61;
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-05 15:52:39 UTC (rev 112)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/PeriodCountCalculator.java 2006-09-05 17:59:19 UTC (rev 113)
@@ -28,17 +28,17 @@
*/
public interface PeriodCountCalculator<E> {
- static final int YEAR_360 = 360;
+ final int YEAR_360 = 360;
- static final int MONTHS_IN_YEAR = 12;
+ final int MONTHS_IN_YEAR = 12;
- static final double YEAR_365_0 = 365.0;
+ final double YEAR_365_0 = 365.0;
- static final double YEAR_360_0 = 360.0;
+ final double YEAR_360_0 = 360.0;
- static final int MONTH_31_DAYS = 31;
+ final int MONTH_31_DAYS = 31;
- static final int MONTH_30_DAYS = 30;
+ final int MONTH_30_DAYS = 30;
int dayDiff(final E start, final E end, PeriodCountBasis basis);
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-05 15:52:39 UTC (rev 112)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/Utils.java 2006-09-05 17:59:19 UTC (rev 113)
@@ -33,11 +33,13 @@
* @version $Revision$ $Date$
*
*/
-public class Utils {
+public final class Utils {
private static final String DATE_PATTERN = "yyyy-MM-dd";
private static final SimpleDateFormat SDF = new SimpleDateFormat(DATE_PATTERN);
+
+ private Utils() {}
public static Calendar getCal(final Date date) {
final Calendar cal = Calendar.getInstance();
@@ -50,7 +52,13 @@
return cal;
}
- public static Date createDate(final String str) throws IllegalArgumentException {
+ /**
+ *
+ * @param str string
+ * @return
+ * @throws IllegalArgumentException if the string cannot be parsed.
+ */
+ public static Date createDate(final String str) {
try {
final Date date = SDF.parse(str);
final Calendar cal = getCal(date);
@@ -60,7 +68,13 @@
}
}
- public static Calendar createCalendar(final String str) throws IllegalArgumentException {
+ /**
+ *
+ * @param str string
+ * @return
+ * @throws IllegalArgumentException if the string cannot be parsed.
+ */
+ public static Calendar createCalendar(final String str) {
try {
final Date date = SDF.parse(str);
final Calendar cal = getCal(date);
Modified: trunk/datecalc-jdk/qalab.xml
===================================================================
--- trunk/datecalc-jdk/qalab.xml 2006-09-05 15:52:39 UTC (rev 112)
+++ trunk/datecalc-jdk/qalab.xml 2006-09-05 17:59:19 UTC (rev 113)
@@ -52,9 +52,9 @@
<summaryresult date="2006-09-04" filecount="17" statvalue="18" type="checkstyle"/>
<summaryresult date="2006-09-04" filecount="16" statvalue="77" type="cobertura-line"/>
<summaryresult date="2006-09-04" filecount="16" statvalue="79" type="cobertura-branch"/>
- <summaryresult date="2006-09-05" filecount="17" statvalue="18" type="checkstyle"/>
- <summaryresult date="2006-09-05" filecount="16" statvalue="77" type="cobertura-line"/>
- <summaryresult date="2006-09-05" filecount="16" statvalue="79" type="cobertura-branch"/>
+ <summaryresult date="2006-09-05" filecount="16" statvalue="14" type="checkstyle"/>
+ <summaryresult date="2006-09-05" filecount="24" statvalue="63" type="cobertura-line"/>
+ <summaryresult date="2006-09-05" filecount="24" statvalue="88" 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"/>
@@ -251,7 +251,7 @@
<result date="2006-09-02" statvalue="84" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="79" type="cobertura-line"/>
<result date="2006-09-04" statvalue="84" type="cobertura-branch"/>
- <result date="2006-09-05" statvalue="79" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="78" type="cobertura-line"/>
<result date="2006-09-05" statvalue="84" type="cobertura-branch"/>
</file>
<file
@@ -269,7 +269,6 @@
<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"/>
<result date="2006-09-04" statvalue="4" type="checkstyle"/>
- <result date="2006-09-05" statvalue="4" type="checkstyle"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_ModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/jdk/ModifiedFollowingHandler.java">
@@ -292,8 +291,8 @@
<result date="2006-09-04" statvalue="86" type="cobertura-line"/>
<result date="2006-09-04" statvalue="85" type="cobertura-branch"/>
<result date="2006-09-05" statvalue="8" type="checkstyle"/>
- <result date="2006-09-05" statvalue="86" type="cobertura-line"/>
- <result date="2006-09-05" statvalue="85" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="87" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="86" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_JdkDateCalculatorFactory.java" path="net/objectlab/kit/datecalc/jdk/JdkDateCalculatorFactory.java">
@@ -322,7 +321,7 @@
id="net_objectlab_kit_datecalc_jdk_JdkDateBaseDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/JdkDateBaseDateCalculator.java">
<result date="2006-09-04" statvalue="91" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
- <result date="2006-09-05" statvalue="91" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="92" type="cobertura-line"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_jdk_JdkDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/JdkDateCalculator.java">
@@ -338,4 +337,39 @@
<result date="2006-09-05" statvalue="100" type="cobertura-line"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
+ <file
+ id="net_objectlab_kit_datecalc_jdk_AbstractDateCalculatorTest.java" path="net/objectlab/kit/datecalc/jdk/AbstractDateCalculatorTest.java">
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_jdk_DateCalculatorFactoryTest.java" path="net/objectlab/kit/datecalc/jdk/DateCalculatorFactoryTest.java">
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_jdk_DatePeriodCountCalculatorTest.java" path="net/objectlab/kit/datecalc/jdk/DatePeriodCountCalculatorTest.java">
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file id="net_objectlab_kit_datecalc_jdk_IMMDateTest.java" path="net/objectlab/kit/datecalc/jdk/IMMDateTest.java">
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_jdk_JdkDateBackwardDateCalculatorTest.java" path="net/objectlab/kit/datecalc/jdk/JdkDateBackwardDateCalculatorTest.java">
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_jdk_JdkDateDateCalculatorCombinationTest.java" path="net/objectlab/kit/datecalc/jdk/JdkDateDateCalculatorCombinationTest.java">
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_jdk_JdkDateForwardDateCalculatorTest.java" path="net/objectlab/kit/datecalc/jdk/JdkDateForwardDateCalculatorTest.java">
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_jdk_JdkDateModifiedFollowingDateCalculatorTest.java" path="net/objectlab/kit/datecalc/jdk/JdkDateModifiedFollowingDateCalculatorTest.java">
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_jdk_JdkDateModifiedPreceedingDateCalculatorTest.java" path="net/objectlab/kit/datecalc/jdk/JdkDateModifiedPreceedingDateCalculatorTest.java">
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ </file>
</qalab>
Modified: trunk/datecalc-joda/qalab.xml
===================================================================
--- trunk/datecalc-joda/qalab.xml 2006-09-05 15:52:39 UTC (rev 112)
+++ trunk/datecalc-joda/qalab.xml 2006-09-05 17:59:19 UTC (rev 113)
@@ -56,10 +56,10 @@
<summaryresult date="2006-09-04" filecount="4" statvalue="40" type="simian"/>
<summaryresult date="2006-09-04" filecount="17" statvalue="84" type="cobertura-line"/>
<summaryresult date="2006-09-04" filecount="17" statvalue="87" type="cobertura-branch"/>
- <summaryresult date="2006-09-05" filecount="18" statvalue="10" type="checkstyle"/>
+ <summaryresult date="2006-09-05" filecount="18" statvalue="2" type="checkstyle"/>
<summaryresult date="2006-09-05" filecount="4" statvalue="40" type="simian"/>
- <summaryresult date="2006-09-05" filecount="17" statvalue="84" type="cobertura-line"/>
- <summaryresult date="2006-09-05" filecount="17" statvalue="87" type="cobertura-branch"/>
+ <summaryresult date="2006-09-05" filecount="17" statvalue="90" type="cobertura-line"/>
+ <summaryresult date="2006-09-05" filecount="17" statvalue="93" 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"/>
@@ -168,7 +168,6 @@
<result date="2006-09-04" statvalue="2" type="checkstyle"/>
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
- <result date="2006-09-05" statvalue="2" type="checkstyle"/>
<result date="2006-09-05" statvalue="100" type="cobertura-line"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
@@ -292,7 +291,6 @@
<file id="net_objectlab_kit_datecalc_joda_ExcelDateUtil.java" path="net/objectlab/kit/datecalc/joda/ExcelDateUtil.java">
<result date="2006-09-02" statvalue="4" type="checkstyle"/>
<result date="2006-09-04" statvalue="4" type="checkstyle"/>
- <result date="2006-09-05" statvalue="4" type="checkstyle"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_DefaultLocalDateCalculatorFactory.java" path="net/objectlab/kit/datecalc/joda/DefaultLocalDateCalculatorFactory.java">
@@ -354,7 +352,7 @@
<result date="2006-09-04" statvalue="4" type="checkstyle"/>
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
- <result date="2006-09-05" statvalue="4" type="checkstyle"/>
+ <result date="2006-09-05" statvalue="2" type="checkstyle"/>
<result date="2006-09-05" statvalue="100" type="cobertura-line"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
@@ -400,7 +398,7 @@
<result date="2006-09-02" statvalue="83" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="64" type="cobertura-line"/>
<result date="2006-09-04" statvalue="71" type="cobertura-branch"/>
- <result date="2006-09-05" statvalue="64" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="66" type="cobertura-line"/>
<result date="2006-09-05" statvalue="71" type="cobertura-branch"/>
</file>
<file
@@ -430,4 +428,8 @@
<result date="2006-09-05" statvalue="100" type="cobertura-line"/>
<result date="2006-09-05" 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"/>
+ <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ </file>
</qalab>
Modified: trunk/maven.xml
===================================================================
--- trunk/maven.xml 2006-09-05 15:52:39 UTC (rev 112)
+++ trunk/maven.xml 2006-09-05 17:59:19 UTC (rev 113)
@@ -33,6 +33,11 @@
<attainGoal name="multiproject:goal" />
</goal>
+ <goal name="kit:site">
+ <attainGoal name="dist:multiproject-bin" />
+ <attainGoal name="dist:multiproject-src" />
+ </goal>
+
<goal name="kit:clean" prereqs="multiproject:clean,clean" />
<goal name="kit:generate" prereqs="multiproject:projects-init">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2006-09-05 20:23:27
|
Revision: 114
http://svn.sourceforge.net/objectlabkit/?rev=114&view=rev
Author: benoitx
Date: 2006-09-05 13:23:07 -0700 (Tue, 05 Sep 2006)
Log Message:
-----------
Fix build as the package changed! Marcin, you must update.
Modified Paths:
--------------
trunk/common-build/project.properties
trunk/datecalc-common/qalab.xml
trunk/datecalc-jdk/project.xml
trunk/datecalc-joda/project.xml
Modified: trunk/common-build/project.properties
===================================================================
--- trunk/common-build/project.properties 2006-09-05 17:59:19 UTC (rev 113)
+++ trunk/common-build/project.properties 2006-09-05 20:23:07 UTC (rev 114)
@@ -23,7 +23,7 @@
maven.compile.target=5
# Source code is 1.5
maven.compile.source=1.5
-maven.compile.verbose=true
+#maven.compile.verbose=true
maven.multiproject.ignoreFailures=true
Modified: trunk/datecalc-common/qalab.xml
===================================================================
--- trunk/datecalc-common/qalab.xml 2006-09-05 17:59:19 UTC (rev 113)
+++ trunk/datecalc-common/qalab.xml 2006-09-05 20:23:07 UTC (rev 114)
@@ -52,8 +52,8 @@
<summaryresult date="2006-09-04" filecount="14" statvalue="64" type="cobertura-branch"/>
<summaryresult date="2006-09-05" filecount="16" statvalue="9" type="checkstyle"/>
<summaryresult date="2006-09-05" filecount="1" statvalue="1" type="findbugs"/>
- <summaryresult date="2006-09-05" filecount="15" statvalue="64" type="cobertura-line"/>
- <summaryresult date="2006-09-05" filecount="15" statvalue="69" type="cobertura-branch"/>
+ <summaryresult date="2006-09-05" filecount="15" statvalue="63" type="cobertura-line"/>
+ <summaryresult date="2006-09-05" filecount="15" statvalue="67" 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"/>
@@ -273,7 +273,7 @@
<result date="2006-09-04" statvalue="2" type="checkstyle"/>
<result date="2006-09-04" statvalue="90" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
- <result date="2006-09-05" statvalue="84" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="85" type="cobertura-line"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_common_IMMPeriod.java" path="net/objectlab/kit/datecalc/common/IMMPeriod.java">
@@ -281,7 +281,7 @@
<result date="2006-09-05" 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="87" type="cobertura-line"/>
- <result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-05" statvalue="84" type="cobertura-line"/>
+ <result date="2006-09-05" statvalue="83" type="cobertura-branch"/>
</file>
</qalab>
Modified: trunk/datecalc-jdk/project.xml
===================================================================
--- trunk/datecalc-jdk/project.xml 2006-09-05 17:59:19 UTC (rev 113)
+++ trunk/datecalc-jdk/project.xml 2006-09-05 20:23:07 UTC (rev 114)
@@ -28,7 +28,7 @@
</repository>
<dependencies>
<dependency>
- <groupId>net.objectlab.kit</groupId>
+ <groupId>net.objectlab.kit.datecalc</groupId>
<artifactId>datecalc-common</artifactId>
<version>${pom.currentVersion}</version>
<type>jar</type>
Modified: trunk/datecalc-joda/project.xml
===================================================================
--- trunk/datecalc-joda/project.xml 2006-09-05 17:59:19 UTC (rev 113)
+++ trunk/datecalc-joda/project.xml 2006-09-05 20:23:07 UTC (rev 114)
@@ -21,7 +21,7 @@
</repository>
<dependencies>
<dependency>
- <groupId>net.objectlab.kit</groupId>
+ <groupId>net.objectlab.kit.datecalc</groupId>
<artifactId>datecalc-common</artifactId>
<version>${pom.currentVersion}</version>
<type>jar</type>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2006-09-06 23:01:17
|
Revision: 123
http://svn.sourceforge.net/objectlabkit/?rev=123&view=rev
Author: benoitx
Date: 2006-09-06 16:00:22 -0700 (Wed, 06 Sep 2006)
Log Message:
-----------
Better doc (slightly)
Modified Paths:
--------------
trunk/common-build/project.xml
trunk/datecalc-common/qalab.xml
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/IMMDateCalculator.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/IMMPeriod.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/PeriodCountCalculator.java
trunk/datecalc-jdk/qalab.xml
trunk/datecalc-joda/qalab.xml
trunk/src/site/index.xml
Modified: trunk/common-build/project.xml
===================================================================
--- trunk/common-build/project.xml 2006-09-06 15:04:38 UTC (rev 122)
+++ trunk/common-build/project.xml 2006-09-06 23:00:22 UTC (rev 123)
@@ -112,7 +112,7 @@
<report>maven-simian-plugin</report>
<report>maven-cobertura-plugin</report>
<report>maven-qalab-plugin</report>
- <report>maven-javadoc-plugin</report>
+ <report>maven-ydoc-plugin</report>
<report>maven-jdepend-plugin</report>
<report>maven-faq-plugin</report>
<report>maven-junit-report-plugin</report>
Modified: trunk/datecalc-common/qalab.xml
===================================================================
--- trunk/datecalc-common/qalab.xml 2006-09-06 15:04:38 UTC (rev 122)
+++ trunk/datecalc-common/qalab.xml 2006-09-06 23:00:22 UTC (rev 123)
@@ -54,6 +54,9 @@
<summaryresult date="2006-09-05" filecount="1" statvalue="1" type="findbugs"/>
<summaryresult date="2006-09-05" filecount="15" statvalue="63" type="cobertura-line"/>
<summaryresult date="2006-09-05" filecount="15" statvalue="67" type="cobertura-branch"/>
+ <summaryresult date="2006-09-06" filecount="18" statvalue="1" type="checkstyle"/>
+ <summaryresult date="2006-09-06" filecount="17" statvalue="66" type="cobertura-line"/>
+ <summaryresult date="2006-09-06" filecount="17" statvalue="68" 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"/>
@@ -94,6 +97,8 @@
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-05" statvalue="100" type="cobertura-line"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-06" 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"/>
@@ -126,6 +131,8 @@
<result date="2006-09-05" statvalue="1" type="findbugs"/>
<result date="2006-09-05" statvalue="95" type="cobertura-line"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="95" type="cobertura-line"/>
+ <result date="2006-09-06" 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"/>
@@ -150,6 +157,8 @@
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-05" statvalue="100" type="cobertura-line"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-06" 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"/>
@@ -163,6 +172,7 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</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"/>
@@ -174,6 +184,7 @@
<result date="2006-09-02" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</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"/>
@@ -197,6 +208,8 @@
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-05" statvalue="92" type="cobertura-line"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="92" type="cobertura-line"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_common_AbstractDateCalculator.java" path="net/objectlab/kit/datecalc/common/AbstractDateCalculator.java">
@@ -218,6 +231,8 @@
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-05" statvalue="100" type="cobertura-line"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-06" 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"/>
@@ -232,6 +247,8 @@
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-05" statvalue="100" type="cobertura-line"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_common_AbstractDateCalculatorFactory.java" path="net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactory.java">
@@ -243,6 +260,8 @@
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-05" statvalue="1" type="checkstyle"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="1" type="checkstyle"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_common_DateCalculatorFactory.java" path="net/objectlab/kit/datecalc/common/DateCalculatorFactory.java">
@@ -254,6 +273,8 @@
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-05" statvalue="100" type="cobertura-line"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_common_PeriodCountCalculator.java" path="net/objectlab/kit/datecalc/common/PeriodCountCalculator.java">
@@ -268,6 +289,8 @@
<result date="2006-09-05" statvalue="6" type="checkstyle"/>
<result date="2006-09-05" statvalue="100" type="cobertura-line"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-06" 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"/>
@@ -275,13 +298,26 @@
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-05" statvalue="85" type="cobertura-line"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="94" type="cobertura-line"/>
+ <result date="2006-09-06" 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"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-06" 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"/>
<result date="2006-09-05" statvalue="83" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="93" type="cobertura-line"/>
+ <result date="2006-09-06" 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"/>
+ <result date="2006-09-06" 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"/>
+ </file>
</qalab>
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/IMMDateCalculator.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/IMMDateCalculator.java 2006-09-06 15:04:38 UTC (rev 122)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/IMMDateCalculator.java 2006-09-06 23:00:22 UTC (rev 123)
@@ -20,7 +20,7 @@
import java.util.List;
/**
- * The IMMDates are defined
+ * The IMMDates are defined as the 3rd Wednesday of March, June, September and December.
*
* @author Benoit Xhenseval
* @author $LastChangedBy: benoitx $
@@ -37,8 +37,8 @@
boolean isIMMDate(final E date);
/**
- * Starting from the current business date, it will return the next IMM
- * Date, even if the current business date is an IMM date (same as calling
+ * Given a start date, it will return the next IMM
+ * Date, even if the start date is an IMM date (same as calling
* getNextIMMDate(IMMPeriod.QUARTERLY)).
*
* @param startDate
@@ -47,8 +47,8 @@
E getNextIMMDate(final E startDate);
/**
- * Starting from the current business date, it will return the next IMM Date
- * based on the IMMPeriod, even if the current business date is an IMM date.
+ * Given a start date, it will return the next IMM Date
+ * based on the IMMPeriod, even if the start date is an IMM date.
*
* @param startDate
* @param period
@@ -59,8 +59,8 @@
E getNextIMMDate(final E startDate, final IMMPeriod period);
/**
- * Starting from the current business date, it will return the previous IMM
- * Date, even if the current business date is an IMM date.
+ * Given a start date, it will return the previous IMM
+ * Date, even if the start date is an IMM date.
*
* @param startDate
* @return the previous IMMDate based on current date.
@@ -68,8 +68,8 @@
E getPreviousIMMDate(final E startDate);
/**
- * Starting from the current business date, it will return the previous IMM
- * Date based on the IMMPeriod, even if the current business date is an IMM
+ * Given a start date, it will return the previous IMM
+ * Date based on the IMMPeriod, even if the start date is an IMM
* date.
*
* @param period
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/IMMPeriod.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/IMMPeriod.java 2006-09-06 15:04:38 UTC (rev 122)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/IMMPeriod.java 2006-09-06 23:00:22 UTC (rev 123)
@@ -18,8 +18,8 @@
package net.objectlab.kit.datecalc.common;
/**
- * Some instruments require a period Bi Annually which then can be Mar-Sep or
- * Jun-Dec.
+ * Some instruments require a period different from the usual Quarterly but still following IMM, e.g. Bi Annually which then can be Mar-Sep or
+ * Jun-Dec, or Annually.
*
* @author Benoit Xhenseval
* @author $LastChangedBy$
@@ -32,6 +32,6 @@
BI_ANNUALY_JUN_DEC,
/** Conventional period: Quarterly: eg March, June, September, December */
QUARTERLY,
- /** Annually, jump from 1y to the next */
+ /** Annually, jump from 1 year to the next */
ANNUALLY
}
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-06 15:04:38 UTC (rev 122)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/PeriodCountCalculator.java 2006-09-06 23:00:22 UTC (rev 123)
@@ -18,13 +18,14 @@
package net.objectlab.kit.datecalc.common;
/**
- * TODO add javadoc
+ * Interface that defines a financial market way of calculating difference in days, month (or part of) and year (or part of).
+ * TODO Improve javadoc.
*
* @author Benoit Xhenseval
* @author $LastChangedBy$
* @version $Revision$ $Date$
*
- * @param <E>
+ * @param <E> a representation of "Date", typically Date, Calendar, LocalDate, YearMonthDay.
*/
public interface PeriodCountCalculator<E> {
Modified: trunk/datecalc-jdk/qalab.xml
===================================================================
--- trunk/datecalc-jdk/qalab.xml 2006-09-06 15:04:38 UTC (rev 122)
+++ trunk/datecalc-jdk/qalab.xml 2006-09-06 23:00:22 UTC (rev 123)
@@ -55,6 +55,9 @@
<summaryresult date="2006-09-05" filecount="16" statvalue="14" type="checkstyle"/>
<summaryresult date="2006-09-05" filecount="15" statvalue="83" type="cobertura-line"/>
<summaryresult date="2006-09-05" filecount="15" statvalue="87" type="cobertura-branch"/>
+ <summaryresult date="2006-09-06" filecount="2" statvalue="32" type="simian"/>
+ <summaryresult date="2006-09-06" filecount="21" statvalue="84" type="cobertura-line"/>
+ <summaryresult date="2006-09-06" filecount="21" statvalue="89" 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"/>
@@ -223,6 +226,8 @@
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-05" statvalue="100" type="cobertura-line"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_jdk_BackwardHandler.java" path="net/objectlab/kit/datecalc/jdk/BackwardHandler.java">
<result date="2006-08-28" statvalue="66" type="cobertura-line"/>
@@ -233,6 +238,8 @@
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-05" statvalue="100" type="cobertura-line"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_ModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/jdk/ModifiedPreceedingHandler.java">
@@ -243,6 +250,8 @@
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-05" statvalue="100" type="cobertura-line"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarPeriodCountCalculator.java" path="net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java">
@@ -253,6 +262,8 @@
<result date="2006-09-04" statvalue="84" type="cobertura-branch"/>
<result date="2006-09-05" statvalue="79" type="cobertura-line"/>
<result date="2006-09-05" statvalue="84" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="79" type="cobertura-line"/>
+ <result date="2006-09-06" statvalue="84" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_DatePeriodCountCalculator.java" path="net/objectlab/kit/datecalc/jdk/DatePeriodCountCalculator.java">
@@ -265,6 +276,8 @@
<result date="2006-09-05" statvalue="1" type="checkstyle"/>
<result date="2006-09-05" statvalue="100" type="cobertura-line"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-06" 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"/>
@@ -277,6 +290,8 @@
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-05" statvalue="100" type="cobertura-line"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_HolidayHandlerDateWrapper.java" path="net/objectlab/kit/datecalc/jdk/HolidayHandlerDateWrapper.java">
@@ -284,6 +299,7 @@
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-05" statvalue="2" type="checkstyle"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_JdkCalendarBaseDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/JdkCalendarBaseDateCalculator.java">
@@ -293,6 +309,8 @@
<result date="2006-09-05" statvalue="8" type="checkstyle"/>
<result date="2006-09-05" statvalue="87" type="cobertura-line"/>
<result date="2006-09-05" statvalue="86" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="69" type="cobertura-line"/>
+ <result date="2006-09-06" statvalue="66" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_JdkDateCalculatorFactory.java" path="net/objectlab/kit/datecalc/jdk/JdkDateCalculatorFactory.java">
@@ -302,6 +320,8 @@
<result date="2006-09-05" statvalue="2" type="checkstyle"/>
<result date="2006-09-05" statvalue="100" type="cobertura-line"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_DefaultJdkDateCalculatorFactory.java" path="net/objectlab/kit/datecalc/jdk/DefaultJdkDateCalculatorFactory.java">
@@ -309,6 +329,8 @@
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-05" statvalue="95" type="cobertura-line"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="95" type="cobertura-line"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_JdkCalendarDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/JdkCalendarDateCalculator.java">
@@ -316,6 +338,8 @@
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-05" statvalue="100" type="cobertura-line"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_JdkDateBaseDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/JdkDateBaseDateCalculator.java">
@@ -323,12 +347,16 @@
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-05" statvalue="91" type="cobertura-line"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="90" type="cobertura-line"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</file>
<file id="net_objectlab_kit_datecalc_jdk_JdkDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/JdkDateCalculator.java">
<result date="2006-09-04" statvalue="100" type="cobertura-line"/>
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-05" statvalue="100" type="cobertura-line"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_JdkDatePeriodCountCalculator.java" path="net/objectlab/kit/datecalc/jdk/JdkDatePeriodCountCalculator.java">
@@ -336,6 +364,8 @@
<result date="2006-09-04" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-05" statvalue="100" type="cobertura-line"/>
<result date="2006-09-05" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_AbstractDateCalculatorTest.java" path="net/objectlab/kit/datecalc/jdk/AbstractDateCalculatorTest.java"/>
@@ -354,4 +384,33 @@
id="net_objectlab_kit_datecalc_jdk_JdkDateModifiedFollowingDateCalculatorTest.java" path="net/objectlab/kit/datecalc/jdk/JdkDateModifiedFollowingDateCalculatorTest.java"/>
<file
id="net_objectlab_kit_datecalc_jdk_JdkDateModifiedPreceedingDateCalculatorTest.java" path="net/objectlab/kit/datecalc/jdk/JdkDateModifiedPreceedingDateCalculatorTest.java"/>
+ <file
+ id="net_objectlab_kit_datecalc_jdk_DefaultJdkCalendarCalculatorFactory.java" path="net/objectlab/kit/datecalc/jdk/DefaultJdkCalendarCalculatorFactory.java">
+ <result date="2006-09-06" statvalue="87" type="cobertura-line"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file id="net_objectlab_kit_datecalc_jdk_JdkCalendarCalculator.java" path="net/objectlab/kit/datecalc/jdk/JdkCalendarCalculator.java">
+ <result date="2006-09-06" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_jdk_JdkCalendarCalculatorFactory.java" path="net/objectlab/kit/datecalc/jdk/JdkCalendarCalculatorFactory.java">
+ <result date="2006-09-06" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_jdk_JdkCalendarIMMDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/JdkCalendarIMMDateCalculator.java">
+ <result date="2006-09-06" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_jdk_JdkCalendarPeriodCountCalculator.java" path="net/objectlab/kit/datecalc/jdk/JdkCalendarPeriodCountCalculator.java">
+ <result date="2006-09-06" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="net_objectlab_kit_datecalc_jdk_JdkDateIMMDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/JdkDateIMMDateCalculator.java">
+ <result date="2006-09-06" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
+ </file>
</qalab>
Modified: trunk/datecalc-joda/qalab.xml
===================================================================
--- trunk/datecalc-joda/qalab.xml 2006-09-06 15:04:38 UTC (rev 122)
+++ trunk/datecalc-joda/qalab.xml 2006-09-06 23:00:22 UTC (rev 123)
@@ -59,7 +59,6 @@
<summaryresult date="2006-09-05" filecount="4" statvalue="40" type="simian"/>
<summaryresult date="2006-09-05" filecount="17" statvalue="91" type="cobertura-line"/>
<summaryresult date="2006-09-05" filecount="17" statvalue="93" type="cobertura-branch"/>
- <summaryresult date="2006-09-06" filecount="4" statvalue="40" type="simian"/>
<summaryresult date="2006-09-06" filecount="19" statvalue="95" type="cobertura-line"/>
<summaryresult date="2006-09-06" filecount="19" statvalue="96" type="cobertura-branch"/>
</summary>
Modified: trunk/src/site/index.xml
===================================================================
--- trunk/src/site/index.xml 2006-09-06 15:04:38 UTC (rev 122)
+++ trunk/src/site/index.xml 2006-09-06 23:00:22 UTC (rev 123)
@@ -56,18 +56,37 @@
<ul>
<li><a href="./multiproject/datecalc-common/apidocs/net/objectlab/kit/datecalc/common/DateCalculator.html">DateCalculator</a> for all Date calculations.</li>
<li><a href="./multiproject/datecalc-common/apidocs/net/objectlab/kit/datecalc/common/PeriodCountCalculator.html">PeriodCountCalculator</a> for all day, month and year diff calculations.</li>
+ <li><a href="./multiproject/datecalc-common/apidocs/net/objectlab/kit/datecalc/common/IMMDateCalculator.html">IMMDateCalculator</a> for all IMM calculations (International Money Market).</li>
</ul>
<h4>JDK</h4>
<p>2 implementations for Pure JDK have been released</p>
<ol>
- <li><strong>Calendar:</strong><pre>DateCalculator<Calendar> calc = DefaultJdkCalendarCalculatorFactory.getDefaultInstance().getDateCalculator("UK", HolidayHandlerType.FORWARD);</pre></li>
- <li><strong>Date:</strong><pre>DateCalculator<Date> calc = DefaultJdkDateCalculatorFactory.getDefaultInstance().getDateCalculator("UK", HolidayHandlerType.FORWARD);</pre></li>
+ <li><strong>Calendar:</strong>
+ <pre>
+ DateCalculator<Calendar> calc = DefaultJdkCalendarCalculatorFactory.getDefaultInstance().getDateCalculator("UK", HolidayHandlerType.FORWARD);
+ PeriodCountCalculator<Calendar> calc = DefaultJdkCalendarCalculatorFactory.getDefaultInstance().getPeriodCountCalculator();
+ IMMDateCalculator<Calendar> calc = DefaultJdkCalendarCalculatorFactory.getDefaultInstance().getIMMDateCalculator();
+ </pre>
+ </li>
+ <li><strong>Date:</strong><pre>
+ DateCalculator<Date> calc = DefaultJdkDateCalculatorFactory.getDefaultInstance().getDateCalculator("UK", HolidayHandlerType.FORWARD);
+ PeriodCountCalculator<Date> calc = DefaultJdkDateCalculatorFactory.getDefaultInstance().getPeriodCountCalculator();
+ IMMDateCalculator<Date> calc = DefaultJdkDateCalculatorFactory.getDefaultInstance().getIMMDateCalculator();
+ </pre></li>
</ol>
<h4>JODA</h4>
<p>2 implementations for Joda have been released</p>
<ol>
- <li><strong>LocalDate</strong> (preferred):<pre>DateCalculator<LocalDate> calc = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("UK", HolidayHandlerType.FORWARD);</pre></li>
- <li><strong>YearMonthDay:</strong><pre>DateCalculator<YearMonthDay> calc = DefaultYearMonthDayCalculatorFactory.getDefaultInstance().getDateCalculator("UK", HolidayHandlerType.FORWARD);</pre></li>
+ <li><strong>LocalDate</strong> (preferred):<pre>
+ DateCalculator<LocalDate> calc = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("UK", HolidayHandlerType.FORWARD);
+ PeriodCountCalculator<LocalDate> calc = DefaultLocalDateCalculatorFactory.getDefaultInstance().getPeriodCountCalculator();
+ IMMDateCalculator<LocalDate> calc...
[truncated message content] |
|
From: <be...@us...> - 2006-09-07 17:34:48
|
Revision: 126
http://svn.sourceforge.net/objectlabkit/?rev=126&view=rev
Author: benoitx
Date: 2006-09-07 10:34:27 -0700 (Thu, 07 Sep 2006)
Log Message:
-----------
Found a "nice" way to include the common classes as a JAR in the JDK and JODA jars.
Modified Paths:
--------------
trunk/datecalc-jdk/maven.xml
trunk/datecalc-jdk/project.xml
trunk/datecalc-joda/maven.xml
trunk/datecalc-joda/project.xml
Added Paths:
-----------
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkCalendarCalculatorFactoryTest.java
Modified: trunk/datecalc-jdk/maven.xml
===================================================================
--- trunk/datecalc-jdk/maven.xml 2006-09-07 17:24:20 UTC (rev 125)
+++ trunk/datecalc-jdk/maven.xml 2006-09-07 17:34:27 UTC (rev 126)
@@ -15,6 +15,7 @@
<goal name="kit:rebuild" prereqs="clean,kit:build" />
<goal name="kit:build" prereqs="jar:jar">
+ <!--
<echo>ADD Common to full JAR</echo>
<ant:jar basedir="target/classes"
jarfile="${maven.build.dir}/${pom.artifactId}-full-${pom.currentVersion}.jar"
@@ -22,6 +23,6 @@
<fileset dir="${basedir}/../datecalc-common/target/classes"
excludes="**/Test.class" includes="**/*.class" />
</ant:jar>
-
+ -->
</goal>
</project>
Modified: trunk/datecalc-jdk/project.xml
===================================================================
--- trunk/datecalc-jdk/project.xml 2006-09-07 17:24:20 UTC (rev 125)
+++ trunk/datecalc-jdk/project.xml 2006-09-07 17:34:27 UTC (rev 126)
@@ -56,6 +56,15 @@
</resource>
</resources>
</unitTest>
+ <resources>
+ <resource>
+ <directory>../datecalc-common/target/</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </resource>
+ </resources>
</build>
</project>
Added: trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkCalendarCalculatorFactoryTest.java
===================================================================
--- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkCalendarCalculatorFactoryTest.java (rev 0)
+++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkCalendarCalculatorFactoryTest.java 2006-09-07 17:34:27 UTC (rev 126)
@@ -0,0 +1,20 @@
+package net.objectlab.kit.datecalc.jdk;
+
+import java.util.Calendar;
+
+import net.objectlab.kit.datecalc.common.AbstractDateCalculatorFactoryTest;
+import net.objectlab.kit.datecalc.common.DateCalculatorFactory;
+import net.objectlab.kit.datecalc.common.Utils;
+
+public class JdkCalendarCalculatorFactoryTest extends AbstractDateCalculatorFactoryTest<Calendar> {
+
+ @Override
+ protected Calendar newDate(final String date) {
+ return Utils.createCalendar(date);
+ }
+
+ @Override
+ protected DateCalculatorFactory<Calendar> getDateCalculatorFactory() {
+ return DefaultJdkCalendarCalculatorFactory.getDefaultInstance();
+ }
+}
Modified: trunk/datecalc-joda/maven.xml
===================================================================
--- trunk/datecalc-joda/maven.xml 2006-09-07 17:24:20 UTC (rev 125)
+++ trunk/datecalc-joda/maven.xml 2006-09-07 17:34:27 UTC (rev 126)
@@ -15,6 +15,7 @@
<goal name="kit:rebuild" prereqs="clean,kit:build" />
<goal name="kit:build" prereqs="jar:jar">
+<!--
<echo>ADD Common classes to full JAR</echo>
<ant:jar basedir="target/classes"
@@ -23,6 +24,6 @@
<fileset dir="${basedir}/../datecalc-common/target/classes"
excludes="**/Test.class" includes="**/*.class" />
</ant:jar>
-
+-->
</goal>
</project>
Modified: trunk/datecalc-joda/project.xml
===================================================================
--- trunk/datecalc-joda/project.xml 2006-09-07 17:24:20 UTC (rev 125)
+++ trunk/datecalc-joda/project.xml 2006-09-07 17:34:27 UTC (rev 126)
@@ -57,5 +57,14 @@
</resource>
</resources>
</unitTest>
+ <resources>
+ <resource>
+ <directory>../datecalc-common/target/</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </resource>
+ </resources>
</build>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2006-09-08 13:15:03
|
Revision: 128
http://svn.sourceforge.net/objectlabkit/?rev=128&view=rev
Author: benoitx
Date: 2006-09-08 06:14:46 -0700 (Fri, 08 Sep 2006)
Log Message:
-----------
Slightly modify the moveByTenor interface and provide more tests for it. (I need to add more for Fwd,modifiedPreceeding and Backward) as well as SPOT tests.
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/test/java/net/objectlab/kit/datecalc/common/AbstractBackwardDateCalculatorTest.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardDateCalculatorTest.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedFollowingDateCalculatorTest.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedPreceedingDateCalculatorTest.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/JdkCalendarBaseDateCalculator.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-08 11:22:24 UTC (rev 127)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java 2006-09-08 13:14:46 UTC (rev 128)
@@ -100,14 +100,19 @@
* handler and not count towards the number of days to move.
*
* @param businessDays
+ * @param daysToSpot 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) {
+ public DateCalculator<E> moveByTenor(final Tenor tenor, final int daysToSpot) {
if (tenor == null) {
throw new IllegalArgumentException("Tenor cannot be null");
}
+
+ // get to the Spot date first:
+ moveByDays(daysToSpot);
+ // move by tenor
switch (tenor.getCode()) {
case DAY:
return moveByDays(tenor.getUnits());
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-08 11:22:24 UTC (rev 127)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculator.java 2006-09-08 13:14:46 UTC (rev 128)
@@ -145,7 +145,7 @@
*
* @param days
* number of days (can be <0 or >0)
- * @return the businessCalendar (so one can do
+ * @return the DateCalculator (so one can do
* calendar.moveByDays(-2).getCurrentBusinessDate();)
*/
DateCalculator<E> moveByDays(final int days);
@@ -159,7 +159,7 @@
*
* @param businessDays
* (can be <0 or >0)
- * @return the current businessCalendar (so one can do
+ * @return the current DateCalculator (so one can do
* calendar.moveByBusinessDays(2).getCurrentBusinessDate();)
* @exception IllegalArgumentException
* if the HolidayHandlerType is (MODIFIED_PRECEEDING or
@@ -183,13 +183,14 @@
DateCalculator<E> combine(DateCalculator<E> calculator);
/**
- * move the current date by a given tenor, this means that if a date is
- * either a 'weekend' or holiday, it will be skipped acording to the holiday
- * handler and not count towards the number of days to move.
+ * Move the current date by a given tenor, please note that all tenors are relative to
+ * the SPOT day which is a number of days from the current date. This method therefore,
+ * calculates the SPOT day first, moves it if it falls on a holiday and then goes to the
+ * calculated day according to the Tenor.
*
- * @param businessDays
- * @return the current businessCalendar (so one can do
- * calendar.moveByTenor(StandardTenor.T_2M).getCurrentBusinessDate();)
+ * @param tenor the Tenor to reach.
+ * @param daysToSpot 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);
+ DateCalculator<E> moveByTenor(final Tenor tenor, final int daysToSpot);
}
\ No newline at end of file
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractBackwardDateCalculatorTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractBackwardDateCalculatorTest.java 2006-09-08 11:22:24 UTC (rev 127)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractBackwardDateCalculatorTest.java 2006-09-08 13:14:46 UTC (rev 128)
@@ -203,32 +203,17 @@
}
public void testMoveByTenorDays() {
- final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.BACKWARD);
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 1D", cal.moveByTenor(StandardTenor.T_1D), "2006-08-09");
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 2D", cal.moveByTenor(new Tenor(2, TenorCode.DAY)), "2006-08-10");
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 10D", cal.moveByTenor(new Tenor(10, TenorCode.DAY)), "2006-08-18");
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 11D", cal.moveByTenor(new Tenor(11, TenorCode.DAY)), "2006-08-18");
-
+ checkMoveByTenor("2006-08-08", StandardTenor.T_1D, 0, "2006-08-09", HolidayHandlerType.BACKWARD);
+ checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.DAY), 0, "2006-08-10", HolidayHandlerType.BACKWARD);
+ checkMoveByTenor("2006-08-08", new Tenor(10, TenorCode.DAY), 0, "2006-08-18", HolidayHandlerType.BACKWARD);
+ checkMoveByTenor("2006-08-08", new Tenor(11, TenorCode.DAY), 0, "2006-08-18", HolidayHandlerType.BACKWARD);
+ checkMoveByTenor("2006-08-08", new Tenor(12, TenorCode.DAY), 0, "2006-08-18", HolidayHandlerType.BACKWARD);
+ checkMoveByTenor("2006-08-08", new Tenor(13, TenorCode.DAY), 0, "2006-08-21", HolidayHandlerType.BACKWARD);
}
public void testMoveByTenorWeek() {
- final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.BACKWARD);
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 1W", cal.moveByTenor(StandardTenor.T_1W), "2006-08-15");
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 2W", cal.moveByTenor(new Tenor(2, TenorCode.WEEK)), "2006-08-22");
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 4W", cal.moveByTenor(new Tenor(4, TenorCode.WEEK)), "2006-09-05");
+ checkMoveByTenor("2006-08-08", StandardTenor.T_1W, 0, "2006-08-15", HolidayHandlerType.BACKWARD);
+ checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.WEEK), 0, "2006-08-22", HolidayHandlerType.BACKWARD);
+ checkMoveByTenor("2006-08-08", new Tenor(4, TenorCode.WEEK), 0, "2006-09-05", HolidayHandlerType.BACKWARD);
}
}
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-08 11:22:24 UTC (rev 127)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java 2006-09-08 13:14:46 UTC (rev 128)
@@ -51,4 +51,13 @@
protected DateCalculator<E> newDateCalculator(final String name, final String type) {
return getDateCalculatorFactory().getDateCalculator(name, type);
}
+
+ protected void checkMoveByTenor(final String startDate, final Tenor tenor, final int daysToSpot, final String expectedDate,
+ final String holidayHandlerType) {
+ final DateCalculator<E> cal = newDateCalculator("bla", holidayHandlerType);
+ cal.setStartDate(newDate(startDate));
+ checkDate("Move start:" + startDate + " tenor:" + tenor + " daysToSpot:" + daysToSpot,
+ cal.moveByTenor(tenor, daysToSpot), expectedDate);
+ }
+
}
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardDateCalculatorTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardDateCalculatorTest.java 2006-09-08 11:22:24 UTC (rev 127)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardDateCalculatorTest.java 2006-09-08 13:14:46 UTC (rev 128)
@@ -193,32 +193,17 @@
}
public void testMoveByTenorDays() {
- final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.FORWARD);
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 1D", cal.moveByTenor(StandardTenor.T_1D), "2006-08-09");
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 2D", cal.moveByTenor(new Tenor(2, TenorCode.DAY)), "2006-08-10");
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 10D", cal.moveByTenor(new Tenor(10, TenorCode.DAY)), "2006-08-18");
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 11D", cal.moveByTenor(new Tenor(11, TenorCode.DAY)), "2006-08-21");
-
+ checkMoveByTenor("2006-08-08", StandardTenor.T_1D, 0, "2006-08-09", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.DAY), 0, "2006-08-10", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2006-08-08", new Tenor(10, TenorCode.DAY), 0, "2006-08-18", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2006-08-08", new Tenor(11, TenorCode.DAY), 0, "2006-08-21", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2006-08-08", new Tenor(12, TenorCode.DAY), 0, "2006-08-21", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2006-08-08", new Tenor(13, TenorCode.DAY), 0, "2006-08-21", HolidayHandlerType.FORWARD);
}
public void testMoveByTenorWeek() {
- final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.FORWARD);
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 1W", cal.moveByTenor(StandardTenor.T_1W), "2006-08-15");
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 2W", cal.moveByTenor(new Tenor(2, TenorCode.WEEK)), "2006-08-22");
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 4W", cal.moveByTenor(new Tenor(4, TenorCode.WEEK)), "2006-09-05");
+ checkMoveByTenor("2006-08-08", StandardTenor.T_1W, 0, "2006-08-15", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.WEEK), 0, "2006-08-22", HolidayHandlerType.FORWARD);
+ checkMoveByTenor("2006-08-08", new Tenor(4, TenorCode.WEEK), 0, "2006-09-05", HolidayHandlerType.FORWARD);
}
}
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedFollowingDateCalculatorTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedFollowingDateCalculatorTest.java 2006-09-08 11:22:24 UTC (rev 127)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedFollowingDateCalculatorTest.java 2006-09-08 13:14:46 UTC (rev 128)
@@ -194,33 +194,48 @@
}
public void testMoveByTenorDays() {
- final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-08", StandardTenor.T_1D, 0, "2006-08-09", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.DAY), 0, "2006-08-10", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(10, TenorCode.DAY), 0, "2006-08-18", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(11, TenorCode.DAY), 0, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(12, TenorCode.DAY), 0, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(13, TenorCode.DAY), 0, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ }
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 1D", cal.moveByTenor(StandardTenor.T_1D), "2006-08-09");
+ public void testMoveByTenorDaysOneDayToSpot() {
+ checkMoveByTenor("2006-08-08", StandardTenor.T_1D, 1, "2006-08-10", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.DAY), 1, "2006-08-11", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-07", new Tenor(10, TenorCode.DAY), 1, "2006-08-18", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-07", new Tenor(11, TenorCode.DAY), 1, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-07", new Tenor(12, TenorCode.DAY), 1, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-07", new Tenor(13, TenorCode.DAY), 1, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ }
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 2D", cal.moveByTenor(new Tenor(2, TenorCode.DAY)), "2006-08-10");
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 10D", cal.moveByTenor(new Tenor(10, TenorCode.DAY)), "2006-08-18");
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 11D", cal.moveByTenor(new Tenor(11, TenorCode.DAY)), "2006-08-21");
-
+ public void testMoveByTenorDaysTwoDaysToSpot() {
+ checkMoveByTenor("2006-08-08", StandardTenor.T_1D, 2, "2006-08-11", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.DAY), 2, "2006-08-14", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-07", new Tenor(10, TenorCode.DAY), 2, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-07", new Tenor(11, TenorCode.DAY), 2, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-07", new Tenor(12, TenorCode.DAY), 2, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-07", new Tenor(13, TenorCode.DAY), 2, "2006-08-22", HolidayHandlerType.MODIFIED_FOLLLOWING);
}
public void testMoveByTenorWeek() {
- final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-08", StandardTenor.T_1W, 0, "2006-08-15", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.WEEK), 0, "2006-08-22", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(4, TenorCode.WEEK), 0, "2006-09-05", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ }
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 1W", cal.moveByTenor(StandardTenor.T_1W), "2006-08-15");
+ public void testMoveByTenorWeekOneDayToSpot() {
+ checkMoveByTenor("2006-08-08", StandardTenor.T_1W, 1, "2006-08-16", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.WEEK), 1, "2006-08-23", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(4, TenorCode.WEEK), 1, "2006-09-06", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ }
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 2W", cal.moveByTenor(new Tenor(2, TenorCode.WEEK)), "2006-08-22");
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 4W", cal.moveByTenor(new Tenor(4, TenorCode.WEEK)), "2006-09-05");
+ public void testMoveByTenorWeekTwoDaysToSpot() {
+ checkMoveByTenor("2006-08-08", StandardTenor.T_1W, 2, "2006-08-17", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.WEEK), 2, "2006-08-24", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(4, TenorCode.WEEK), 2, "2006-09-07", HolidayHandlerType.MODIFIED_FOLLLOWING);
}
public void testAddAcrossMonth() {
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedPreceedingDateCalculatorTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedPreceedingDateCalculatorTest.java 2006-09-08 11:22:24 UTC (rev 127)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedPreceedingDateCalculatorTest.java 2006-09-08 13:14:46 UTC (rev 128)
@@ -206,39 +206,18 @@
}
public void testMoveByTenorDays() {
- final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_PRECEEDING);
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 1D", cal.moveByTenor(StandardTenor.T_1D), "2006-08-09");
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 2D", cal.moveByTenor(new Tenor(2, TenorCode.DAY)), "2006-08-10");
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 10D", cal.moveByTenor(new Tenor(10, TenorCode.DAY)), "2006-08-18");
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 11D", cal.moveByTenor(new Tenor(11, TenorCode.DAY)), "2006-08-18");
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 12D", cal.moveByTenor(new Tenor(12, TenorCode.DAY)), "2006-08-18");
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 13D", cal.moveByTenor(new Tenor(13, TenorCode.DAY)), "2006-08-21");
-
+ checkMoveByTenor("2006-08-08", StandardTenor.T_1D, 0, "2006-08-09", HolidayHandlerType.MODIFIED_PRECEEDING);
+ checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.DAY), 0, "2006-08-10", HolidayHandlerType.MODIFIED_PRECEEDING);
+ checkMoveByTenor("2006-08-08", new Tenor(10, TenorCode.DAY), 0, "2006-08-18", HolidayHandlerType.MODIFIED_PRECEEDING);
+ checkMoveByTenor("2006-08-08", new Tenor(11, TenorCode.DAY), 0, "2006-08-18", HolidayHandlerType.MODIFIED_PRECEEDING);
+ checkMoveByTenor("2006-08-08", new Tenor(12, TenorCode.DAY), 0, "2006-08-18", HolidayHandlerType.MODIFIED_PRECEEDING);
+ checkMoveByTenor("2006-08-08", new Tenor(13, TenorCode.DAY), 0, "2006-08-21", HolidayHandlerType.MODIFIED_PRECEEDING);
}
public void testMoveByTenorWeek() {
- final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_PRECEEDING);
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 1W", cal.moveByTenor(StandardTenor.T_1W), "2006-08-15");
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 2W", cal.moveByTenor(new Tenor(2, TenorCode.WEEK)), "2006-08-22");
-
- cal.setStartDate(newDate("2006-08-08"));
- checkDate("Move 4W", cal.moveByTenor(new Tenor(4, TenorCode.WEEK)), "2006-09-05");
+ checkMoveByTenor("2006-08-08", StandardTenor.T_1W, 0, "2006-08-15", HolidayHandlerType.MODIFIED_PRECEEDING);
+ checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.WEEK), 0, "2006-08-22", HolidayHandlerType.MODIFIED_PRECEEDING);
+ checkMoveByTenor("2006-08-08", new Tenor(4, TenorCode.WEEK), 0, "2006-09-05", HolidayHandlerType.MODIFIED_PRECEEDING);
}
public void testAddAcrossMonth() {
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/JdkCalendarBaseDateCalculator.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/JdkCalendarBaseDateCalculator.java 2006-09-08 11:22:24 UTC (rev 127)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/JdkCalendarBaseDateCalculator.java 2006-09-08 13:14:46 UTC (rev 128)
@@ -24,7 +24,6 @@
import net.objectlab.kit.datecalc.common.AbstractDateCalculator;
import net.objectlab.kit.datecalc.common.DateCalculator;
import net.objectlab.kit.datecalc.common.HolidayHandler;
-import net.objectlab.kit.datecalc.common.Tenor;
import net.objectlab.kit.datecalc.common.Utils;
import net.objectlab.kit.datecalc.common.WorkingWeek;
@@ -94,23 +93,18 @@
final HolidayHandler<Calendar> handler) {
return new JdkCalendarBaseDateCalculator(name, startDate, holidays, handler);
}
-
+/*
+ * @Override public JdkCalendarBaseDateCalculator combine(final DateCalculator<Calendar>
+ * calendar) { return (JdkCalendarBaseDateCalculator) super.combine(calendar); }
+ *
+ * @Override public JdkCalendarBaseDateCalculator moveByTenor(final Tenor tenor) {
+ * return (JdkCalendarBaseDateCalculator) super.moveByTenor(tenor); }
+ *
+ * @Override public JdkCalendarBaseDateCalculator moveByBusinessDays(final int
+ * businessDays) { return (JdkCalendarBaseDateCalculator)
+ * super.moveByBusinessDays(businessDays); }
+ */
@Override
- public JdkCalendarBaseDateCalculator combine(final DateCalculator<Calendar> calendar) {
- return (JdkCalendarBaseDateCalculator) super.combine(calendar);
- }
-
- @Override
- public JdkCalendarBaseDateCalculator moveByTenor(final Tenor tenor) {
- return (JdkCalendarBaseDateCalculator) super.moveByTenor(tenor);
- }
-
- @Override
- public JdkCalendarBaseDateCalculator moveByBusinessDays(final int businessDays) {
- return (JdkCalendarBaseDateCalculator) super.moveByBusinessDays(businessDays);
- }
-
- @Override
protected Calendar getToday() {
return Utils.blastTime(Calendar.getInstance());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-09-08 15:18:32
|
Revision: 132
http://svn.sourceforge.net/objectlabkit/?rev=132&view=rev
Author: marchy
Date: 2006-09-08 08:16:33 -0700 (Fri, 08 Sep 2006)
Log Message:
-----------
refactored the factory names to include the new KitCalculatorsFactory convention. I'm still not sure about the "Kit" in the name, I think we should just drop the kit.
also, dropped the Default, Base, and Jdk out of any implementation classes.
Modified Paths:
--------------
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/DateCalculatorFactoryTest.java
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkCalendarBackwardDateCalculatorTest.java
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkCalendarCalculatorFactoryTest.java
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkCalendarDateCalculatorCombinationTest.java
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkCalendarForwardDateCalculatorTest.java
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkCalendarIMMDateTest.java
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkCalendarModifiedFollowingDateCalculatorTest.java
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkCalendarModifiedPreceedingDateCalculatorTest.java
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkCalendarPeriodCountCalculatorTest.java
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDateBackwardDateCalculatorTest.java
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDateDateCalculatorCombinationTest.java
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDateForwardDateCalculatorTest.java
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDateIMMDateTest.java
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDateModifiedFollowingDateCalculatorTest.java
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDateModifiedPreceedingDateCalculatorTest.java
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDatePeriodCountCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateCalculatorFactoryTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateDateCalculatorCombinationTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateForwardDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateIMMDateTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayBackwardDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayCalculatorFactoryTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculatorCombinationTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayIMMDateTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPrecedingDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayPeriodCountCalculatorTest.java
Added Paths:
-----------
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractKitCalculatorsFactory.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/KitCalculatorsFactory.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/CalendarIMMDateCalculator.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateDateCalculator.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/DateKitCalculatorsFactory.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateKitCalculatorsFactory.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculator.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayKitCalculatorsFactory.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayPeriodCountCalculator.java
Removed Paths:
-------------
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactory.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculatorFactory.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DefaultJdkCalendarCalculatorFactory.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DefaultJdkDateCalculatorFactory.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/JdkCalendarBaseDateCalculator.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/JdkCalendarIMMDateCalculator.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/JdkDateBaseDateCalculator.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/JdkDateIMMDateCalculator.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DefaultLocalDateCalculatorFactory.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DefaultLocalDatePeriodCountCalculator.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DefaultYearMonthDayCalculatorFactory.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DefaultYearMonthDayPeriodCountCalculator.java
Deleted: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactory.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactory.java 2006-09-08 14:59:22 UTC (rev 131)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactory.java 2006-09-08 15:16:33 UTC (rev 132)
@@ -1,56 +0,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.
- */
-package net.objectlab.kit.datecalc.common;
-
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-/**
- * TODO javadoc
- *
- * @author marchi
- * @author $LastChangedBy$
- * @version $Revision$ $Date$
- *
- */
-public abstract class AbstractDateCalculatorFactory<E> implements DateCalculatorFactory<E> {
-
- private final ConcurrentMap<String, Set<E>> holidays = new ConcurrentHashMap<String, Set<E>>();
-
- /**
- * Use this method to register a set of holidays for a given calendar, it
- * will replace any existing set. It won't update any existing
- * DateCalculator as these should not be amended whilst in existence (we
- * could otherwise get inconsistent results).
- *
- * @param name
- * the calendar name to register these holidays under.
- * @param holidays
- * the set of holidays (non-working days).
- */
- public void registerHolidays(final String name, final Set<E> holidaysSet) {
- this.holidays.put(name, holidaysSet);
- }
-
- protected void setHolidays(final String name, final DateCalculator<E> dc) {
- if (holidays.containsKey(name)) {
- dc.setNonWorkingDays(holidays.get(name));
- }
- }
-}
Added: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractKitCalculatorsFactory.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractKitCalculatorsFactory.java (rev 0)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractKitCalculatorsFactory.java 2006-09-08 15:16:33 UTC (rev 132)
@@ -0,0 +1,56 @@
+/*
+ * $Id: AbstractDateCalculatorFactory.java 125 2006-09-07 17:24:20Z 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.
+ */
+package net.objectlab.kit.datecalc.common;
+
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * TODO javadoc
+ *
+ * @author marchi
+ * @author $LastChangedBy: benoitx $
+ * @version $Revision: 125 $ $Date: 2006-09-07 19:24:20 +0200 (Thu, 07 Sep 2006) $
+ *
+ */
+public abstract class AbstractKitCalculatorsFactory<E> implements KitCalculatorsFactory<E> {
+
+ private final ConcurrentMap<String, Set<E>> holidays = new ConcurrentHashMap<String, Set<E>>();
+
+ /**
+ * Use this method to register a set of holidays for a given calendar, it
+ * will replace any existing set. It won't update any existing
+ * DateCalculator as these should not be amended whilst in existence (we
+ * could otherwise get inconsistent results).
+ *
+ * @param name
+ * the calendar name to register these holidays under.
+ * @param holidays
+ * the set of holidays (non-working days).
+ */
+ public void registerHolidays(final String name, final Set<E> holidaysSet) {
+ this.holidays.put(name, holidaysSet);
+ }
+
+ protected void setHolidays(final String name, final DateCalculator<E> dc) {
+ if (holidays.containsKey(name)) {
+ dc.setNonWorkingDays(holidays.get(name));
+ }
+ }
+}
Deleted: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculatorFactory.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculatorFactory.java 2006-09-08 14:59:22 UTC (rev 131)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculatorFactory.java 2006-09-08 15:16:33 UTC (rev 132)
@@ -1,78 +0,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.
- */
-package net.objectlab.kit.datecalc.common;
-
-import java.util.Set;
-
-/**
- * Factory will create new instances of calculators, these are lightweight, each
- * thread should use the factory as a given calculator should NOT be shared
- * across thread (unless you know what you're doing) as the startDate, current
- * date and working week would be shared. Once created, the set of holidays will
- * NOT change even if a new set is registered; one needs to get a new
- * DateCalculator to get the new set.
- *
- * @param E
- * a representation of a date, typically JDK: Date, Calendar;
- * Joda:LocalDate, YearMonthDay
- *
- * @author Benoit Xhenseval
- * @author $LastChangedBy$
- * @version $Revision$ $Date$
- */
-public interface DateCalculatorFactory<E> {
-
- /**
- * Create a new DateCalculator for a given name and type of handling.
- *
- * @param name
- * calendar name (holidays set interested in). If there is set of
- * holidays with that name, it will return a DateCalculator with
- * an empty holiday set (will work on Weekend only).
- * @param type
- * typically one of the value of HolidayHandlerType or null.
- * @return a new DateCalculator
- * @exception IllegalArgumentException
- * if the type is not null or a valid value.
- */
- DateCalculator<E> getDateCalculator(final String name, final String holidayHandlerType);
-
- /**
- * Use this method to register a set of holidays for a given calendar.
- *
- * @param name
- * the calendar name to register these holidays under.
- * @param holidays
- * the set of holidays (non-working days).
- */
- void registerHolidays(final String name, Set<E> holidays);
-
- /**
- * Create a new PeriodCountCalculator.
- *
- * @return a PeriodCountCalculator
- */
- PeriodCountCalculator<E> getPeriodCountCalculator();
-
- /**
- * Create a new IMMDateCalculator.
- *
- * @return an IMMDateCalculator
- */
- IMMDateCalculator<E> getIMMDateCalculator();
-}
Added: 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 (rev 0)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/KitCalculatorsFactory.java 2006-09-08 15:16:33 UTC (rev 132)
@@ -0,0 +1,78 @@
+/*
+ * $Id: DateCalculatorFactory.java 125 2006-09-07 17:24:20Z 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.
+ */
+package net.objectlab.kit.datecalc.common;
+
+import java.util.Set;
+
+/**
+ * Factory will create new instances of calculators, these are lightweight, each
+ * thread should use the factory as a given calculator should NOT be shared
+ * across thread (unless you know what you're doing) as the startDate, current
+ * date and working week would be shared. Once created, the set of holidays will
+ * NOT change even if a new set is registered; one needs to get a new
+ * DateCalculator to get the new set.
+ *
+ * @param E
+ * a representation of a date, typically JDK: Date, Calendar;
+ * Joda:LocalDate, YearMonthDay
+ *
+ * @author Benoit Xhenseval
+ * @author $LastChangedBy: benoitx $
+ * @version $Revision: 125 $ $Date: 2006-09-07 19:24:20 +0200 (Thu, 07 Sep 2006) $
+ */
+public interface KitCalculatorsFactory<E> {
+
+ /**
+ * Create a new DateCalculator for a given name and type of handling.
+ *
+ * @param name
+ * calendar name (holidays set interested in). If there is set of
+ * holidays with that name, it will return a DateCalculator with
+ * an empty holiday set (will work on Weekend only).
+ * @param type
+ * typically one of the value of HolidayHandlerType or null.
+ * @return a new DateCalculator
+ * @exception IllegalArgumentException
+ * if the type is not null or a valid value.
+ */
+ DateCalculator<E> getDateCalculator(final String name, final String holidayHandlerType);
+
+ /**
+ * Use this method to register a set of holidays for a given calendar.
+ *
+ * @param name
+ * the calendar name to register these holidays under.
+ * @param holidays
+ * the set of holidays (non-working days).
+ */
+ void registerHolidays(final String name, Set<E> holidays);
+
+ /**
+ * Create a new PeriodCountCalculator.
+ *
+ * @return a PeriodCountCalculator
+ */
+ PeriodCountCalculator<E> getPeriodCountCalculator();
+
+ /**
+ * Create a new IMMDateCalculator.
+ *
+ * @return an IMMDateCalculator
+ */
+ IMMDateCalculator<E> getIMMDateCalculator();
+}
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-08 14:59:22 UTC (rev 131)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java 2006-09-08 15:16:33 UTC (rev 132)
@@ -9,7 +9,7 @@
public abstract class AbstractDateTestCase<E> extends TestCase {
protected abstract E newDate(final String date);
- protected abstract DateCalculatorFactory<E> getDateCalculatorFactory();
+ protected abstract KitCalculatorsFactory<E> getDateCalculatorFactory();
protected void checkDate(final String string, final DateCalculator<E> calendar, final String string2) {
Assert.assertEquals(string, newDate(string2), calendar.getCurrentBusinessDate());
Added: 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 (rev 0)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java 2006-09-08 15:16:33 UTC (rev 132)
@@ -0,0 +1,111 @@
+/*
+ * $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.
+ */
+package net.objectlab.kit.datecalc.jdk;
+
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Set;
+
+import net.objectlab.kit.datecalc.common.AbstractDateCalculator;
+import net.objectlab.kit.datecalc.common.DateCalculator;
+import net.objectlab.kit.datecalc.common.HolidayHandler;
+import net.objectlab.kit.datecalc.common.Utils;
+import net.objectlab.kit.datecalc.common.WorkingWeek;
+
+/**
+ * This class is used via the DateCalculator interface, it enables the handling
+ * of different HolidayHandler, if no HolidayHandler is defined, the calendar
+ * will NOT move a date, even if it falls on a holiday or weekend.
+ *
+ * @author Marcin Jekot
+ * @author $LastModifiedBy$
+ * @version $Revision: 128 $ $Date: 2006-09-08 15:14:46 +0200 (Fri, 08 Sep 2006) $
+ */
+public class CalendarDateCalculator extends AbstractDateCalculator<Calendar> {
+
+ private WorkingWeek workingWeek = WorkingWeek.DEFAULT;
+
+ @SuppressWarnings("unchecked")
+ public CalendarDateCalculator() {
+ this(null, null, Collections.EMPTY_SET, null);
+ }
+
+ public CalendarDateCalculator(final String name, final Calendar startDate, final Set<Calendar> nonWorkingDays,
+ final HolidayHandler<Calendar> holidayHandler) {
+ super(name, nonWorkingDays, holidayHandler);
+ Calendar date = startDate;
+ if (date == null) {
+ date = getToday();
+ }
+ setStartDate(date);
+ }
+
+ public void setWorkingWeek(final WorkingWeek week) {
+ workingWeek = week;
+ }
+
+ /**
+ * is the date a non-working day according to the WorkingWeek?
+ */
+ public boolean isWeekend(final Calendar date) {
+ assert workingWeek != null;
+ return !workingWeek.isWorkingDay(date);
+ }
+
+ public CalendarDateCalculator moveByDays(final int days) {
+ if (getCurrentBusinessDate() == null) {
+ initialise();
+ }
+ getCurrentBusinessDate().add(Calendar.DAY_OF_MONTH, days);
+
+ if (getHolidayHandler() != null) {
+ setCurrentBusinessDate(getHolidayHandler().moveCurrentDate(this));
+ }
+
+ return this;
+ }
+
+ private void initialise() {
+ if (getStartDate() == null) {
+ setStartDate(Calendar.getInstance());
+ } else if (getCurrentBusinessDate() == null) {
+ setCurrentBusinessDate(Calendar.getInstance());
+ }
+ }
+
+ @Override
+ protected DateCalculator<Calendar> createNewCalculator(final String name, final Calendar startDate, final Set<Calendar> holidays,
+ final HolidayHandler<Calendar> handler) {
+ return new CalendarDateCalculator(name, startDate, holidays, handler);
+ }
+/*
+ * @Override public JdkCalendarBaseDateCalculator combine(final DateCalculator<Calendar>
+ * calendar) { return (JdkCalendarBaseDateCalculator) super.combine(calendar); }
+ *
+ * @Override public JdkCalendarBaseDateCalculator moveByTenor(final Tenor tenor) {
+ * return (JdkCalendarBaseDateCalculator) super.moveByTenor(tenor); }
+ *
+ * @Override public JdkCalendarBaseDateCalculator moveByBusinessDays(final int
+ * businessDays) { return (JdkCalendarBaseDateCalculator)
+ * super.moveByBusinessDays(businessDays); }
+ */
+ @Override
+ protected Calendar getToday() {
+ return Utils.blastTime(Calendar.getInstance());
+ }
+}
Added: 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 (rev 0)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarIMMDateCalculator.java 2006-09-08 15:16:33 UTC (rev 132)
@@ -0,0 +1,124 @@
+package net.objectlab.kit.datecalc.jdk;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
+import net.objectlab.kit.datecalc.common.AbstractIMMDateCalculator;
+import net.objectlab.kit.datecalc.common.IMMPeriod;
+
+public class CalendarIMMDateCalculator extends AbstractIMMDateCalculator<Calendar> {
+ private static final int NUMBER_DAYS_IN_WEEK = 7;
+
+ /**
+ * Returns a list of IMM dates between 2 dates, it will exclude the start
+ * date if it is an IMM date but would include the end date if it is an IMM.
+ *
+ * @param start
+ * start of the interval, excluded
+ * @param end
+ * end of the interval, may be included.
+ * @param period
+ * specify when the "next" IMM is, if quarterly then it is the
+ * conventional algorithm.
+ * @return list of IMM dates
+ */
+ public List<Calendar> getIMMDates(final Calendar start, final Calendar end, final IMMPeriod period) {
+
+ final List<Calendar> dates = new ArrayList<Calendar>();
+ Calendar cal = (Calendar) start.clone();
+ while (true) {
+ cal = getNextIMMDate(true, cal, period);
+ if (!cal.after(end)) {
+ dates.add(cal);
+ } else {
+ break;
+ }
+ }
+
+ return dates;
+ }
+
+ @Override
+ protected Calendar getNextIMMDate(final boolean requestNextIMM, final Calendar startDate, final IMMPeriod period) {
+
+ Calendar cal = (Calendar) startDate.clone();
+
+ if (isIMMMonth(cal)) {
+ moveToIMMDay(cal);
+ // TODO simplify this if condition
+ // if (forward ^ cal.getTime().before(startDate) ||
+ // cal.getTime().equals(startDate)) {
+ if ((requestNextIMM && cal.after(startDate)) || (!requestNextIMM && cal.before(startDate))) {
+ return cal;
+ }
+ }
+
+ final int delta = (requestNextIMM ? 1 : -1);
+ do {
+ cal.add(Calendar.MONTH, delta);
+ } while (!isIMMMonth(cal));
+
+ moveToIMMDay(cal);
+
+ final int month = cal.get(Calendar.MONTH);
+ if ((period == IMMPeriod.BI_ANNUALY_JUN_DEC && (Calendar.MARCH == month || Calendar.SEPTEMBER == month))
+ || (period == IMMPeriod.BI_ANNUALY_MAR_SEP && (Calendar.JUNE == month || Calendar.DECEMBER == month))) {
+ // need to move to the next one.
+ cal = getNextIMMDate(requestNextIMM, cal, period);
+ } else if (period == IMMPeriod.ANNUALLY) {
+ // second jump
+ cal = getNextIMMDate(requestNextIMM, cal, IMMPeriod.QUARTERLY);
+ // third jump
+ cal = getNextIMMDate(requestNextIMM, cal, IMMPeriod.QUARTERLY);
+ // fourth jump
+ cal = getNextIMMDate(requestNextIMM, cal, IMMPeriod.QUARTERLY);
+ // fifth jump
+ cal = getNextIMMDate(requestNextIMM, cal, IMMPeriod.QUARTERLY);
+ }
+
+ return cal;
+ }
+
+ private boolean isIMMMonth(final Calendar cal) {
+ final int month = cal.get(Calendar.MONTH);
+
+ switch (month) {
+ case Calendar.MARCH:
+ case Calendar.JUNE:
+ case Calendar.SEPTEMBER:
+ case Calendar.DECEMBER:
+ return true;
+ default:
+ return false;
+ }
+ }
+
+ /**
+ * Assumes that the month is correct, get the day for the 3rd wednesday.
+ *
+ * @param first
+ * @return
+ */
+ private void moveToIMMDay(final Calendar cal) {
+ cal.set(Calendar.DAY_OF_MONTH, 1);
+
+ // go to 1st wed
+ final int dayOfWeek = cal.get(Calendar.DAY_OF_WEEK);
+ if (dayOfWeek < Calendar.WEDNESDAY) {
+ cal.add(Calendar.DAY_OF_MONTH, Calendar.WEDNESDAY - dayOfWeek);
+ } else if (dayOfWeek > Calendar.WEDNESDAY) {
+ cal.add(Calendar.DAY_OF_MONTH, (Calendar.WEDNESDAY + NUMBER_DAYS_IN_WEEK) - dayOfWeek);
+ }
+
+ // go to 3rd wednesday - i.e. move 2 weeks forward
+ cal.add(Calendar.DAY_OF_MONTH, NUMBER_DAYS_IN_WEEK * 2);
+ }
+
+ public boolean isIMMDate(final Calendar date) {
+ // TODO a slightly crude implementation - revisit
+ final Calendar cal = (Calendar) date.clone();
+ moveToIMMDay(cal);
+ return cal.equals(date);
+ }
+}
Added: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java (rev 0)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java 2006-09-08 15:16:33 UTC (rev 132)
@@ -0,0 +1,89 @@
+/*
+ * $Id: DefaultJdkDateCalculatorFactory.java 96 2006-09-04 15:01:20Z 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.
+ */
+package net.objectlab.kit.datecalc.jdk;
+
+import java.util.Calendar;
+
+import net.objectlab.kit.datecalc.common.AbstractKitCalculatorsFactory;
+import net.objectlab.kit.datecalc.common.DateCalculator;
+import net.objectlab.kit.datecalc.common.HolidayHandlerType;
+import net.objectlab.kit.datecalc.common.IMMDateCalculator;
+import net.objectlab.kit.datecalc.common.PeriodCountCalculator;
+
+/**
+ * TODO add javadoc
+ *
+ * @author Benoit Xhenseval
+ * @author $LastChangedBy: benoitx $
+ * @version $Revision: 96 $ $Date: 2006-09-04 16:01:20 +0100 (Mon, 04 Sep 2006) $
+ *
+ */
+public...
[truncated message content] |
|
From: <be...@us...> - 2006-09-09 16:31:35
|
Revision: 135
http://svn.sourceforge.net/objectlabkit/?rev=135&view=rev
Author: benoitx
Date: 2006-09-09 09:31:12 -0700 (Sat, 09 Sep 2006)
Log Message:
-----------
Added a couple of links (QALab and ObjectLab)
Modified Paths:
--------------
trunk/datecalc-jdk/qalab.xml
trunk/datecalc-joda/qalab.xml
trunk/src/site/navigation.xml
Modified: trunk/datecalc-jdk/qalab.xml
===================================================================
--- trunk/datecalc-jdk/qalab.xml 2006-09-09 15:01:14 UTC (rev 134)
+++ trunk/datecalc-jdk/qalab.xml 2006-09-09 16:31:12 UTC (rev 135)
@@ -60,8 +60,8 @@
<summaryresult date="2006-09-06" filecount="21" statvalue="89" type="cobertura-branch"/>
<summaryresult date="2006-09-07" filecount="19" statvalue="93" type="cobertura-line"/>
<summaryresult date="2006-09-07" filecount="19" statvalue="92" type="cobertura-branch"/>
- <summaryresult date="2006-09-09" filecount="17" statvalue="93" type="cobertura-line"/>
- <summaryresult date="2006-09-09" filecount="17" 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"/>
</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"/>
@@ -482,7 +482,7 @@
<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="90" type="cobertura-line"/>
+ <result date="2006-09-09" statvalue="100" type="cobertura-line"/>
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
</file>
<file
@@ -501,8 +501,8 @@
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java">
- <result date="2006-09-09" statvalue="77" type="cobertura-line"/>
- <result date="2006-09-09" 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"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarIMMDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/CalendarIMMDateCalculator.java">
Modified: trunk/datecalc-joda/qalab.xml
===================================================================
--- trunk/datecalc-joda/qalab.xml 2006-09-09 15:01:14 UTC (rev 134)
+++ trunk/datecalc-joda/qalab.xml 2006-09-09 16:31:12 UTC (rev 135)
@@ -63,8 +63,8 @@
<summaryresult date="2006-09-06" filecount="19" statvalue="96" type="cobertura-branch"/>
<summaryresult date="2006-09-07" filecount="19" statvalue="94" type="cobertura-line"/>
<summaryresult date="2006-09-07" filecount="19" statvalue="93" type="cobertura-branch"/>
- <summaryresult date="2006-09-09" filecount="19" statvalue="94" type="cobertura-line"/>
- <summaryresult date="2006-09-09" 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"/>
</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"/>
@@ -397,8 +397,8 @@
<result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-07" statvalue="76" type="cobertura-line"/>
<result date="2006-09-07" statvalue="71" type="cobertura-branch"/>
- <result date="2006-09-09" statvalue="76" type="cobertura-line"/>
- <result date="2006-09-09" 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"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateForwardHandler.java" path="net/objectlab/kit/datecalc/joda/LocalDateForwardHandler.java">
@@ -527,7 +527,7 @@
<result date="2006-09-06" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-07" statvalue="85" type="cobertura-line"/>
<result date="2006-09-07" statvalue="100" type="cobertura-branch"/>
- <result date="2006-09-09" statvalue="85" type="cobertura-line"/>
+ <result date="2006-09-09" statvalue="92" type="cobertura-line"/>
<result date="2006-09-09" statvalue="100" type="cobertura-branch"/>
</file>
<file
Modified: trunk/src/site/navigation.xml
===================================================================
--- trunk/src/site/navigation.xml 2006-09-09 15:01:14 UTC (rev 134)
+++ trunk/src/site/navigation.xml 2006-09-09 16:31:12 UTC (rev 135)
@@ -31,7 +31,10 @@
</menu>
-->
<search/>
-
+ <menu name="Links">
+ <item name="QALab" href="http://qalab.sourceforge.net/" />
+ <item name="ObjectLab" href="http://www.objectlab.co.uk" />
+ </menu>
<footer>
<script src="http://www.google-analytics.com/urchin.js"
type="text/javascript">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-09-10 12:30:26
|
Revision: 138
http://svn.sourceforge.net/objectlabkit/?rev=138&view=rev
Author: marchy
Date: 2006-09-10 05:29:15 -0700 (Sun, 10 Sep 2006)
Log Message:
-----------
eclipse project properties for separate modules projects
Modified Paths:
--------------
trunk/datecalc-common/.classpath
trunk/datecalc-common/.settings/org.eclipse.jdt.ui.prefs
trunk/datecalc-jdk/.classpath
trunk/datecalc-jdk/.settings/org.eclipse.jdt.ui.prefs
trunk/datecalc-joda/.classpath
trunk/datecalc-joda/.settings/org.eclipse.jdt.ui.prefs
Added Paths:
-----------
trunk/datecalc-common/.settings/org.eclipse.jdt.core.prefs
trunk/datecalc-jdk/.settings/org.eclipse.jdt.core.prefs
trunk/datecalc-joda/.settings/org.eclipse.jdt.core.prefs
Modified: trunk/datecalc-common/.classpath
===================================================================
--- trunk/datecalc-common/.classpath 2006-09-10 12:04:30 UTC (rev 137)
+++ trunk/datecalc-common/.classpath 2006-09-10 12:29:15 UTC (rev 138)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry output="target/classes" kind="src" path="src/main/java"/>
<classpathentry output="target/test-classes" kind="src" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
Added: trunk/datecalc-common/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/datecalc-common/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/datecalc-common/.settings/org.eclipse.jdt.core.prefs 2006-09-10 12:29:15 UTC (rev 138)
@@ -0,0 +1,248 @@
+#Sun Sep 10 14:26:09 CAT 2006
+eclipse.preferences.version=1
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
+org.eclipse.jdt.core.formatter.comment.format_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=8
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=131
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true
Modified: trunk/datecalc-common/.settings/org.eclipse.jdt.ui.prefs
===================================================================
--- trunk/datecalc-common/.settings/org.eclipse.jdt.ui.prefs 2006-09-10 12:04:30 UTC (rev 137)
+++ trunk/datecalc-common/.settings/org.eclipse.jdt.ui.prefs 2006-09-10 12:29:15 UTC (rev 138)
@@ -1,3 +1,5 @@
-#Sat Aug 26 11:32:21 CAT 2006
+#Sun Sep 10 14:26:09 CAT 2006
eclipse.preferences.version=1
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return Returns the ${bare_field_name}.\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} The ${bare_field_name} to set.\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * $$Id$$\r\n * \r\n * Copyright 2006 the original author or authors.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the "License"); you may not\r\n * use this file except in compliance with the License. You may obtain a copy of\r\n * the License at\r\n *\r\n * http\://www.apache.org/licenses/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT\r\n * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\r\n * License for the specific language governing permissions and limitations under\r\n * the License.\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n *\r\n * @author ${user}\r\n * @author $$LastChangedBy$$\r\n * @version $$Revision$$ $$Date$$\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+formatter_profile=_objectlabkit
+formatter_settings_version=10
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return Returns the ${bare_field_name}.\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} The ${bare_field_name} to set.\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n * $$Id$$\r\n * \r\n * Copyright 2006 the original author or authors.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the "License"); you may not\r\n * use this file except in compliance with the License. You may obtain a copy of\r\n * the License at\r\n *\r\n * http\://www.apache.org/licenses/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT\r\n * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\r\n * License for the specific language governing permissions and limitations under\r\n * the License.\r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @TODO javadoc\r\n *\r\n * @author ${user}\r\n * @author $$LastChangedBy$$\r\n * @version $$Revision$$ $$Date$$\r\n *\r\n * ${tags}\r\n */</temp...
[truncated message content] |
|
From: <ma...@us...> - 2006-09-10 20:38:45
|
Revision: 155
http://svn.sourceforge.net/objectlabkit/?rev=155&view=rev
Author: marchy
Date: 2006-09-10 13:38:22 -0700 (Sun, 10 Sep 2006)
Log Message:
-----------
some more fiddling with m2 pom's
Modified Paths:
--------------
trunk/datecalc-common/pom.xml
trunk/datecalc-jdk/pom.xml
trunk/datecalc-joda/pom.xml
trunk/pom.xml
Modified: trunk/datecalc-common/pom.xml
===================================================================
--- trunk/datecalc-common/pom.xml 2006-09-10 16:44:22 UTC (rev 154)
+++ trunk/datecalc-common/pom.xml 2006-09-10 20:38:22 UTC (rev 155)
@@ -1,36 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /*
- * ========================================================================
- * ObjectLab Financial Ltd, proud sponsor of The Kit.
- * ========================================================================
- */
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>datecalc-common</artifactId>
- <packaging>jar</packaging>
- <name>DateCalc commons</name>
- <description>Common Date Calculator methods</description>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /*
+ * ========================================================================
+ * ObjectLab Financial Ltd, proud sponsor of The Kit.
+ * ========================================================================
+ */
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>datecalc-common</artifactId>
+ <packaging>jar</packaging>
+ <name>DateCalc commons</name>
+ <description>Common Date Calculator methods</description>
+
</project>
\ No newline at end of file
Modified: trunk/datecalc-jdk/pom.xml
===================================================================
--- trunk/datecalc-jdk/pom.xml 2006-09-10 16:44:22 UTC (rev 154)
+++ trunk/datecalc-jdk/pom.xml 2006-09-10 20:38:22 UTC (rev 155)
@@ -1,43 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /*
- * ========================================================================
- * ObjectLab Financial Ltd, proud sponsor of The Kit.
- * ========================================================================
- */
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>datecalc-jdk</artifactId>
- <packaging>jar</packaging>
- <name>Date Calculator for JDK</name>
- <description>Date Calculator methods for JDK</description>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
-
- <dependencies>
- <dependency>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc-common</artifactId>
- <version>${pom.version}</version>
- </dependency>
- </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /*
+ * ========================================================================
+ * ObjectLab Financial Ltd, proud sponsor of The Kit.
+ * ========================================================================
+ */
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>datecalc-jdk</artifactId>
+ <packaging>jar</packaging>
+ <name>Date Calculator for JDK</name>
+ <description>Date Calculator methods for JDK</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ </dependencies>
+
</project>
\ No newline at end of file
Modified: trunk/datecalc-joda/pom.xml
===================================================================
--- trunk/datecalc-joda/pom.xml 2006-09-10 16:44:22 UTC (rev 154)
+++ trunk/datecalc-joda/pom.xml 2006-09-10 20:38:22 UTC (rev 155)
@@ -1,43 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>datecalc-joda</artifactId>
- <packaging>jar</packaging>
- <name>Date Calculator for Joda</name>
- <description>
- Date Calculator methods for Joda
- </description>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
-
- <dependencies>
- <dependency>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc-common</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>1.3</version>
- </dependency>
- </dependencies>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>datecalc-joda</artifactId>
+ <packaging>jar</packaging>
+ <name>Date Calculator for Joda</name>
+ <description>
+ Date Calculator methods for Joda
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>1.3</version>
+ </dependency>
+ </dependencies>
+
</project>
\ No newline at end of file
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2006-09-10 16:44:22 UTC (rev 154)
+++ trunk/pom.xml 2006-09-10 20:38:22 UTC (rev 155)
@@ -1,65 +1,89 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc</artifactId>
- <packaging>pom</packaging>
- <name>ObjectLab Kit</name>
- <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???
- </description>
-
- <modules>
- <module>datecalc-common</module>
- <module>datecalc-jdk</module>
- <module>datecalc-joda</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc-common</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc-jdk</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>net.objectlab.kit.datecalc</groupId>
- <artifactId>datecalc-joda</artifactId>
- <version>${pom.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc</artifactId>
+ <packaging>pom</packaging>
+ <name>ObjectLab Kit</name>
+ <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???
+ </description>
+
+ <modules>
+ <module>datecalc-common</module>
+ <module>datecalc-jdk</module>
+ <module>datecalc-joda</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </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>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <!--
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc-jdk</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.objectlab.kit.datecalc</groupId>
+ <artifactId>datecalc-joda</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ -->
+
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-09-11 12:32:09
|
Revision: 159
http://svn.sourceforge.net/objectlabkit/?rev=159&view=rev
Author: marchy
Date: 2006-09-11 05:32:00 -0700 (Mon, 11 Sep 2006)
Log Message:
-----------
plain eclipse project (in the root)
Modified Paths:
--------------
trunk/.project
Removed Paths:
-------------
trunk/.classpath
Deleted: trunk/.classpath
===================================================================
--- trunk/.classpath 2006-09-11 11:56:13 UTC (rev 158)
+++ trunk/.classpath 2006-09-11 12:32:00 UTC (rev 159)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry path="datecalc-common/src/main/java" output="datecalc-common/target/classes" kind="src"/>
- <classpathentry path="datecalc-common/src/test/java" output="datecalc-common/target/test-classes" kind="src"/>
- <classpathentry path="datecalc-jdk/src/main/java" output="datecalc-jdk/target/classes" kind="src"/>
- <classpathentry path="datecalc-jdk/src/test/java" output="datecalc-jdk/target/test-classes" kind="src"/>
- <classpathentry path="datecalc-joda/src/main/java" output="datecalc-joda/target/classes" kind="src"/>
- <classpathentry path="datecalc-joda/src/test/java" output="datecalc-joda/target/test-classes" kind="src"/>
- <classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" kind="con"/>
- <classpathentry path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" kind="var"/>
- <classpathentry path="M2_REPO/joda-time/joda-time/1.3/joda-time-1.3.jar" kind="var"/>
- <classpathentry path="" kind="output"/>
-</classpath>
Modified: trunk/.project
===================================================================
--- trunk/.project 2006-09-11 11:56:13 UTC (rev 158)
+++ trunk/.project 2006-09-11 12:32:00 UTC (rev 159)
@@ -5,13 +5,7 @@
<projects>
</projects>
<buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
</buildSpec>
<natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
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(calcu...
[truncated message content] |
|
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.ne...
[truncated message content] |
|
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: <be...@us...> - 2006-09-18 20:27:37
|
Revision: 185
http://svn.sourceforge.net/objectlabkit/?rev=185&view=rev
Author: benoitx
Date: 2006-09-18 13:27:22 -0700 (Mon, 18 Sep 2006)
Log Message:
-----------
new build
Modified Paths:
--------------
trunk/datecalc-common/qalab.xml
trunk/datecalc-jdk/qalab.xml
trunk/datecalc-joda/qalab.xml
Modified: trunk/datecalc-common/qalab.xml
===================================================================
--- trunk/datecalc-common/qalab.xml 2006-09-17 09:42:49 UTC (rev 184)
+++ trunk/datecalc-common/qalab.xml 2006-09-18 20:27:22 UTC (rev 185)
@@ -65,6 +65,8 @@
<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"/>
+ <summaryresult date="2006-09-18" filecount="17" statvalue="57" type="cobertura-line"/>
+ <summaryresult date="2006-09-18" 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"/>
@@ -115,6 +117,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" 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"/>
@@ -157,6 +161,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="95" type="cobertura-line"/>
+ <result date="2006-09-18" 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"/>
@@ -191,6 +197,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" 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"/>
@@ -209,6 +217,7 @@
<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"/>
+ <result date="2006-09-18" 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"/>
@@ -225,6 +234,7 @@
<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"/>
+ <result date="2006-09-18" 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"/>
@@ -258,6 +268,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="90" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_common_AbstractDateCalculator.java" path="net/objectlab/kit/datecalc/common/AbstractDateCalculator.java">
@@ -289,6 +301,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" 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"/>
@@ -313,6 +327,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_common_AbstractDateCalculatorFactory.java" path="net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactory.java">
@@ -365,6 +381,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" 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"/>
@@ -382,6 +400,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="88" type="cobertura-line"/>
+ <result date="2006-09-18" 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"/>
@@ -391,6 +411,7 @@
<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"/>
+ <result date="2006-09-18" 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"/>
@@ -405,6 +426,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="82" type="cobertura-line"/>
+ <result date="2006-09-18" 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"/>
@@ -417,6 +440,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_common_AbstractIMMDateCalculator.java" path="net/objectlab/kit/datecalc/common/AbstractIMMDateCalculator.java">
@@ -425,6 +450,7 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_common_KitCalculatorsFactory.java" path="net/objectlab/kit/datecalc/common/KitCalculatorsFactory.java">
@@ -434,5 +460,7 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
</qalab>
Modified: trunk/datecalc-jdk/qalab.xml
===================================================================
--- trunk/datecalc-jdk/qalab.xml 2006-09-17 09:42:49 UTC (rev 184)
+++ trunk/datecalc-jdk/qalab.xml 2006-09-18 20:27:22 UTC (rev 185)
@@ -68,6 +68,8 @@
<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"/>
+ <summaryresult date="2006-09-18" filecount="17" statvalue="99" type="cobertura-line"/>
+ <summaryresult date="2006-09-18" 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"/>
@@ -282,6 +284,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_DatePeriodCountCalculator.java" path="net/objectlab/kit/datecalc/jdk/DatePeriodCountCalculator.java">
@@ -304,6 +308,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" 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"/>
@@ -334,6 +340,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="91" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_JdkCalendarBaseDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/JdkCalendarBaseDateCalculator.java">
@@ -475,6 +483,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarForwardHandler.java" path="net/objectlab/kit/datecalc/jdk/CalendarForwardHandler.java">
@@ -486,6 +496,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/jdk/CalendarModifiedFollowingHandler.java">
@@ -497,6 +509,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/jdk/CalendarModifiedPreceedingHandler.java">
@@ -510,6 +524,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" 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"/>
@@ -522,6 +538,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" 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"/>
@@ -532,6 +550,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_DateModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/jdk/DateModifiedFollowingHandler.java">
@@ -543,6 +563,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_DateModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/jdk/DateModifiedPreceedingHandler.java">
@@ -556,6 +578,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java">
@@ -565,6 +589,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarIMMDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/CalendarIMMDateCalculator.java">
@@ -576,6 +602,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarKitCalculatorsFactory.java" path="net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java">
@@ -585,6 +613,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" 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"/>
@@ -593,6 +623,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" 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"/>
@@ -603,6 +635,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_DateKitCalculatorsFactory.java" path="net/objectlab/kit/datecalc/jdk/DateKitCalculatorsFactory.java">
@@ -612,5 +646,7 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
</qalab>
Modified: trunk/datecalc-joda/qalab.xml
===================================================================
--- trunk/datecalc-joda/qalab.xml 2006-09-17 09:42:49 UTC (rev 184)
+++ trunk/datecalc-joda/qalab.xml 2006-09-18 20:27:22 UTC (rev 185)
@@ -71,6 +71,8 @@
<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"/>
+ <summaryresult date="2006-09-18" filecount="19" statvalue="98" type="cobertura-line"/>
+ <summaryresult date="2006-09-18" 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"/>
@@ -191,6 +193,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" 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"/>
@@ -383,6 +387,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="91" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateBackwardHandler.java" path="net/objectlab/kit/datecalc/joda/LocalDateBackwardHandler.java">
@@ -402,6 +408,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" 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"/>
@@ -421,6 +429,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateForwardHandler.java" path="net/objectlab/kit/datecalc/joda/LocalDateForwardHandler.java">
@@ -440,6 +450,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingHandler.java">
@@ -459,6 +471,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingHandler.java">
@@ -478,6 +492,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayBackwardHandler.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayBackwardHandler.java">
@@ -497,6 +513,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayDateCalculator.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java">
@@ -516,6 +534,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayForwardHandler.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayForwardHandler.java">
@@ -535,6 +555,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingHandler.java">
@@ -554,6 +576,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPreceedingHandler.java">
@@ -573,6 +597,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" 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"/>
@@ -587,6 +613,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="85" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_LocalDateIMMDateCalculator.java" path="net/objectlab/kit/datecalc/joda/LocalDateIMMDateCalculator.java">
@@ -602,6 +630,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_joda_YearMonthDayIMMDateCalculator.java" path="net/objectlab/kit/datecalc/joda/YearMonthDayIMMDateCalculator.java">
@@ -617,6 +647,8 @@
<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"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-line"/>
+ <result date="2006-09-18" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_...
[truncated message content] |
|
From: <be...@us...> - 2006-10-11 23:37:58
|
Revision: 206
http://svn.sourceforge.net/objectlabkit/?rev=206&view=rev
Author: benoitx
Date: 2006-10-11 16:37:44 -0700 (Wed, 11 Oct 2006)
Log Message:
-----------
Recent build, added link to Issue tracker.
Modified Paths:
--------------
trunk/common-build/project.xml
trunk/datecalc-common/qalab.xml
trunk/datecalc-jdk/qalab.xml
trunk/datecalc-joda/qalab.xml
trunk/src/site/press/press-release-1.0.1.txt
Modified: trunk/common-build/project.xml
===================================================================
--- trunk/common-build/project.xml 2006-10-11 23:13:23 UTC (rev 205)
+++ trunk/common-build/project.xml 2006-10-11 23:37:44 UTC (rev 206)
@@ -37,6 +37,9 @@
</organization>
<inceptionYear>2006</inceptionYear>
<url>http://objectlabkit.sourceforge.net</url>
+ <issueTrackingUrl>
+ http://www.sourceforge.net/tracker/?group_id=175139
+ </issueTrackingUrl>
<siteAddress>objectlabkit.sourceforge.net</siteAddress>
<siteDirectory>
/var/www/solutions/website/objectlab.co.uk/
Modified: trunk/datecalc-common/qalab.xml
===================================================================
--- trunk/datecalc-common/qalab.xml 2006-10-11 23:13:23 UTC (rev 205)
+++ trunk/datecalc-common/qalab.xml 2006-10-11 23:37:44 UTC (rev 206)
@@ -75,6 +75,10 @@
<summaryresult date="2006-09-22" filecount="17" statvalue="60" type="cobertura-branch"/>
<summaryresult date="2006-10-10" filecount="17" statvalue="58" type="cobertura-line"/>
<summaryresult date="2006-10-10" filecount="17" statvalue="60" type="cobertura-branch"/>
+ <summaryresult date="2006-10-11" filecount="17" statvalue="58" type="cobertura-line"/>
+ <summaryresult date="2006-10-11" filecount="17" statvalue="60" type="cobertura-branch"/>
+ <summaryresult date="2006-10-12" filecount="17" statvalue="58" type="cobertura-line"/>
+ <summaryresult date="2006-10-12" 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"/>
@@ -135,6 +139,10 @@
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
<result date="2006-10-10" statvalue="100" type="cobertura-line"/>
<result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-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"/>
@@ -187,6 +195,10 @@
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
<result date="2006-10-10" statvalue="94" type="cobertura-line"/>
<result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="94" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="94" type="cobertura-line"/>
+ <result date="2006-10-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"/>
@@ -231,6 +243,10 @@
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
<result date="2006-10-10" statvalue="100" type="cobertura-line"/>
<result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-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"/>
@@ -254,6 +270,8 @@
<result date="2006-09-21" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
<result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-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"/>
@@ -275,6 +293,8 @@
<result date="2006-09-21" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
<result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-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"/>
@@ -318,6 +338,10 @@
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
<result date="2006-10-10" statvalue="93" type="cobertura-line"/>
<result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="93" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="93" type="cobertura-line"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_common_AbstractDateCalculator.java" path="net/objectlab/kit/datecalc/common/AbstractDateCalculator.java">
@@ -359,6 +383,10 @@
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
<result date="2006-10-10" statvalue="100" type="cobertura-line"/>
<result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-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"/>
@@ -393,6 +421,10 @@
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
<result date="2006-10-10" statvalue="100" type="cobertura-line"/>
<result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_common_AbstractDateCalculatorFactory.java" path="net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactory.java">
@@ -455,6 +487,10 @@
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
<result date="2006-10-10" statvalue="100" type="cobertura-line"/>
<result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-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"/>
@@ -482,6 +518,10 @@
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
<result date="2006-10-10" statvalue="93" type="cobertura-line"/>
<result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="93" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="93" type="cobertura-line"/>
+ <result date="2006-10-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"/>
@@ -496,6 +536,8 @@
<result date="2006-09-21" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
<result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-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"/>
@@ -520,6 +562,10 @@
<result date="2006-09-22" statvalue="83" type="cobertura-branch"/>
<result date="2006-10-10" statvalue="80" type="cobertura-line"/>
<result date="2006-10-10" statvalue="83" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="80" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="83" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="80" type="cobertura-line"/>
+ <result date="2006-10-12" 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"/>
@@ -542,6 +588,10 @@
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
<result date="2006-10-10" statvalue="100" type="cobertura-line"/>
<result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_common_AbstractIMMDateCalculator.java" path="net/objectlab/kit/datecalc/common/AbstractIMMDateCalculator.java">
@@ -555,6 +605,8 @@
<result date="2006-09-21" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
<result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_common_KitCalculatorsFactory.java" path="net/objectlab/kit/datecalc/common/KitCalculatorsFactory.java">
@@ -574,5 +626,9 @@
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
<result date="2006-10-10" statvalue="100" type="cobertura-line"/>
<result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-branch"/>
</file>
</qalab>
Modified: trunk/datecalc-jdk/qalab.xml
===================================================================
--- trunk/datecalc-jdk/qalab.xml 2006-10-11 23:13:23 UTC (rev 205)
+++ trunk/datecalc-jdk/qalab.xml 2006-10-11 23:37:44 UTC (rev 206)
@@ -76,6 +76,12 @@
<summaryresult date="2006-09-21" filecount="17" statvalue="100" type="cobertura-branch"/>
<summaryresult date="2006-09-22" filecount="17" statvalue="99" type="cobertura-line"/>
<summaryresult date="2006-09-22" filecount="17" statvalue="100" type="cobertura-branch"/>
+ <summaryresult date="2006-10-10" filecount="17" statvalue="99" type="cobertura-line"/>
+ <summaryresult date="2006-10-10" filecount="17" statvalue="100" type="cobertura-branch"/>
+ <summaryresult date="2006-10-11" filecount="17" statvalue="99" type="cobertura-line"/>
+ <summaryresult date="2006-10-11" filecount="17" statvalue="100" type="cobertura-branch"/>
+ <summaryresult date="2006-10-12" filecount="17" statvalue="99" type="cobertura-line"/>
+ <summaryresult date="2006-10-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"/>
@@ -298,6 +304,12 @@
<result date="2006-09-21" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-22" statvalue="100" type="cobertura-line"/>
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_DatePeriodCountCalculator.java" path="net/objectlab/kit/datecalc/jdk/DatePeriodCountCalculator.java">
@@ -328,6 +340,12 @@
<result date="2006-09-21" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-22" statvalue="100" type="cobertura-line"/>
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-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"/>
@@ -366,6 +384,12 @@
<result date="2006-09-21" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-22" statvalue="91" type="cobertura-line"/>
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-10" statvalue="91" type="cobertura-line"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="90" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="90" type="cobertura-line"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_JdkCalendarBaseDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/JdkCalendarBaseDateCalculator.java">
@@ -515,6 +539,12 @@
<result date="2006-09-21" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-22" statvalue="100" type="cobertura-line"/>
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarForwardHandler.java" path="net/objectlab/kit/datecalc/jdk/CalendarForwardHandler.java">
@@ -534,6 +564,12 @@
<result date="2006-09-21" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-22" statvalue="100" type="cobertura-line"/>
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/jdk/CalendarModifiedFollowingHandler.java">
@@ -553,6 +589,12 @@
<result date="2006-09-21" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-22" statvalue="100" type="cobertura-line"/>
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/jdk/CalendarModifiedPreceedingHandler.java">
@@ -574,6 +616,12 @@
<result date="2006-09-21" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-22" statvalue="100" type="cobertura-line"/>
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-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"/>
@@ -594,6 +642,12 @@
<result date="2006-09-21" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-22" statvalue="100" type="cobertura-line"/>
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-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"/>
@@ -612,6 +666,12 @@
<result date="2006-09-21" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-22" statvalue="100" type="cobertura-line"/>
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_DateModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/jdk/DateModifiedFollowingHandler.java">
@@ -631,6 +691,12 @@
<result date="2006-09-21" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-22" statvalue="100" type="cobertura-line"/>
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_DateModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/jdk/DateModifiedPreceedingHandler.java">
@@ -652,6 +718,12 @@
<result date="2006-09-21" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-22" statvalue="100" type="cobertura-line"/>
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java">
@@ -669,6 +741,12 @@
<result date="2006-09-21" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-22" statvalue="100" type="cobertura-line"/>
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarIMMDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/CalendarIMMDateCalculator.java">
@@ -688,6 +766,12 @@
<result date="2006-09-21" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-22" statvalue="100" type="cobertura-line"/>
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_CalendarKitCalculatorsFactory.java" path="net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java">
@@ -705,6 +789,12 @@
<result date="2006-09-21" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-22" statvalue="100" type="cobertura-line"/>
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-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"/>
@@ -721,6 +811,12 @@
<result date="2006-09-21" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-22" statvalue="100" type="cobertura-line"/>
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-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"/>
@@ -739,6 +835,12 @@
<result date="2006-09-21" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-22" statvalue="100" type="cobertura-line"/>
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="net_objectlab_kit_datecalc_jdk_DateKitCalculatorsFactory.java" path="net/objectlab/kit/datecalc/jdk/DateKitCalculatorsFactory.java">
@@ -756,5 +858,11 @@
<result date="2006-09-21" statvalue="100" type="cobertura-branch"/>
<result date="2006-09-22" statvalue="100" type="cobertura-line"/>
<result date="2006-09-22" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-10" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-11" statvalue="100" type="cobertura-branch"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-line"/>
+ <result date="2006-10-12" statvalue="100" type="cobertura-branch"/>
</file>
</qalab>
Modified: trunk/datecalc-joda/qalab.xml
===================================================================
--- trunk/datecalc-joda/qalab.xml 2006-10-11 23:13:23 UTC (rev 205)
+++ trunk/datecalc-joda/qalab.xml 2006-10-11 23:37:44 UTC (rev 206)
@@ -79,6 +79,10 @@
<summaryresult date="2006-09-21" filecount="19" statvalue="100" type="cobertura-branch"/>
<summaryresult date="2006-09-22" filecount="19" statvalue="98" type="cobertura-line"/>
<summaryresult date="2006-09-22" filecount="19" statvalue="100" type="cobertura-branch"/>
+ <summaryresult date="2006-10-10" filecount="19" statvalue="98" type="cobertura-line"/>
+ <summaryresult date="2006-10-10" filecount="19" statvalue="100" type="cobertura-branch"/>
+ <summaryresult date="2006-10-12" filecount="19" statvalue="98" type="cobertura-line"/>
+ <summaryresult date="2006-10-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"/>
@@ -207,6 +211,10 @@
<result da...
[truncated message content] |
|
From: <be...@us...> - 2006-10-15 11:11:48
|
Revision: 216
http://svn.sourceforge.net/objectlabkit/?rev=216&view=rev
Author: benoitx
Date: 2006-10-15 04:11:32 -0700 (Sun, 15 Oct 2006)
Log Message:
-----------
Use Verdana as the default font.
Modified Paths:
--------------
trunk/datecalc-common/src/site/style/maven-struts-menu.css
trunk/datecalc-jdk/src/site/style/maven-struts-menu.css
trunk/datecalc-joda/src/site/style/maven-struts-menu.css
trunk/src/site/style/maven-struts-menu.css
Modified: trunk/datecalc-common/src/site/style/maven-struts-menu.css
===================================================================
--- trunk/datecalc-common/src/site/style/maven-struts-menu.css 2006-10-14 23:54:02 UTC (rev 215)
+++ trunk/datecalc-common/src/site/style/maven-struts-menu.css 2006-10-15 11:11:32 UTC (rev 216)
@@ -1,7 +1,7 @@
body, select, input, li {
background: #ffffff;
color: #000080;
- font-family: Arial, Helvetica, sans-serif;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 12px;
}
Modified: trunk/datecalc-jdk/src/site/style/maven-struts-menu.css
===================================================================
--- trunk/datecalc-jdk/src/site/style/maven-struts-menu.css 2006-10-14 23:54:02 UTC (rev 215)
+++ trunk/datecalc-jdk/src/site/style/maven-struts-menu.css 2006-10-15 11:11:32 UTC (rev 216)
@@ -1,7 +1,7 @@
body, select, input, li {
background: #ffffff;
color: #000080;
- font-family: Arial, Helvetica, sans-serif;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 12px;
}
Modified: trunk/datecalc-joda/src/site/style/maven-struts-menu.css
===================================================================
--- trunk/datecalc-joda/src/site/style/maven-struts-menu.css 2006-10-14 23:54:02 UTC (rev 215)
+++ trunk/datecalc-joda/src/site/style/maven-struts-menu.css 2006-10-15 11:11:32 UTC (rev 216)
@@ -1,7 +1,7 @@
body, select, input, li {
background: #ffffff;
color: #000080;
- font-family: Arial, Helvetica, sans-serif;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 12px;
}
Modified: trunk/src/site/style/maven-struts-menu.css
===================================================================
--- trunk/src/site/style/maven-struts-menu.css 2006-10-14 23:54:02 UTC (rev 215)
+++ trunk/src/site/style/maven-struts-menu.css 2006-10-15 11:11:32 UTC (rev 216)
@@ -1,7 +1,7 @@
body, select, input, li {
background: #ffffff;
color: #000080;
- font-family: Arial, Helvetica, sans-serif;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 12px;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2006-11-23 12:31:22
|
Revision: 222
http://svn.sourceforge.net/objectlabkit/?rev=222&view=rev
Author: benoitx
Date: 2006-11-23 04:31:20 -0800 (Thu, 23 Nov 2006)
Log Message:
-----------
[Bug 1601542]Thanks to Anthony Whitford for spotting the spelling mistake in our enum.
Modified Paths:
--------------
trunk/common-build/project.properties
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/HolidayHandlerType.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactoryTest.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedFollowingDateCalculatorTest.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedFollowingHandler.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateKitCalculatorsFactory.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedFollowingHandler.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateKitCalculatorsFactory.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingHandler.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayKitCalculatorsFactory.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingHandler.java
trunk/src/site/changes.xml
Modified: trunk/common-build/project.properties
===================================================================
--- trunk/common-build/project.properties 2006-11-21 10:25:32 UTC (rev 221)
+++ trunk/common-build/project.properties 2006-11-23 12:31:20 UTC (rev 222)
@@ -104,3 +104,4 @@
maven.multiproject.navigation=independent
maven.repo.remote=http://repo1.maven.org/maven,http://people.apache.org/repo/m1-snapshot-repository/
+maven.changes.issue.template=http://sourceforge.net/support/tracker.php?aid=%ISSUE%
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-11-21 10:25:32 UTC (rev 221)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java 2006-11-23 12:31:20 UTC (rev 222)
@@ -224,8 +224,8 @@
} else if (businessDays < 0
&& holidayHandler != null
&& (holidayHandler.getType().equals(HolidayHandlerType.FORWARD) || holidayHandler.getType().equals(
- HolidayHandlerType.MODIFIED_FOLLLOWING))) {
- throw new IllegalArgumentException("A " + HolidayHandlerType.MODIFIED_FOLLLOWING + " or " + HolidayHandlerType.FORWARD
+ HolidayHandlerType.MODIFIED_FOLLOWING))) {
+ throw new IllegalArgumentException("A " + HolidayHandlerType.MODIFIED_FOLLOWING + " or " + HolidayHandlerType.FORWARD
+ " does not allow negative steps for moveByBusinessDays");
}
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/HolidayHandlerType.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/HolidayHandlerType.java 2006-11-21 10:25:32 UTC (rev 221)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/HolidayHandlerType.java 2006-11-23 12:31:20 UTC (rev 222)
@@ -67,7 +67,7 @@
* non working day BUT, if the new date falls into another month, it will
* revert to moving backward until it finds a working day.
*/
- public static final String MODIFIED_FOLLLOWING = "modifiedFollowing";
+ public static final String MODIFIED_FOLLOWING = "modifiedFollowing";
/**
* A modified preceeding handler will move the date backward if it falls on
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactoryTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactoryTest.java 2006-11-21 10:25:32 UTC (rev 221)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactoryTest.java 2006-11-23 12:31:20 UTC (rev 222)
@@ -85,8 +85,8 @@
cal1 = getDateCalculatorFactory().getDateCalculator("bla", HolidayHandlerType.FORWARD);
Assert.assertEquals("Type", HolidayHandlerType.FORWARD, cal1.getHolidayHandlerType());
- cal1 = getDateCalculatorFactory().getDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLLOWING);
- Assert.assertEquals("Type", HolidayHandlerType.MODIFIED_FOLLLOWING, cal1.getHolidayHandlerType());
+ cal1 = getDateCalculatorFactory().getDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLOWING);
+ Assert.assertEquals("Type", HolidayHandlerType.MODIFIED_FOLLOWING, cal1.getHolidayHandlerType());
cal1 = getDateCalculatorFactory().getDateCalculator("bla", HolidayHandlerType.MODIFIED_PRECEEDING);
Assert.assertEquals("Type", HolidayHandlerType.MODIFIED_PRECEEDING, cal1.getHolidayHandlerType());
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedFollowingDateCalculatorTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedFollowingDateCalculatorTest.java 2006-11-21 10:25:32 UTC (rev 221)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedFollowingDateCalculatorTest.java 2006-11-23 12:31:20 UTC (rev 222)
@@ -40,7 +40,7 @@
public abstract class AbstractModifiedFollowingDateCalculatorTest<E> extends AbstractDateTestCase<E> {
public void testSimpleForwardWithWeekend() {
- final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLOWING);
Assert.assertEquals("Name", "bla", cal.getName());
Assert.assertEquals("Holidays size", 0, cal.getNonWorkingDays().size());
@@ -54,7 +54,7 @@
}
public void testSimpleForwardStartDateWithWeekend() {
- final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLOWING);
Assert.assertEquals("Name", "bla", cal.getName());
Assert.assertEquals("Holidays size", 0, cal.getNonWorkingDays().size());
@@ -81,7 +81,7 @@
}
public void testSimpleForwardStartDateNoWeekend() {
- final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLOWING);
final WorkingWeek ww = new WorkingWeek().withWorkingDayFromCalendar(true, Calendar.SATURDAY).withWorkingDayFromCalendar(
true, Calendar.SUNDAY);
cal.setWorkingWeek(getWorkingWeek(ww));
@@ -112,7 +112,7 @@
}
public void testSimpleForwardStartDateWhackyWeek() {
- final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLOWING);
Assert.assertEquals("Name", "bla", cal.getName());
Assert.assertEquals("Holidays size", 0, cal.getNonWorkingDays().size());
@@ -145,7 +145,7 @@
}
public void testSimpleForwardStartDateIdealWeekend() {
- final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLOWING);
Assert.assertEquals("Name", "bla", cal.getName());
Assert.assertEquals("Holidays size", 0, cal.getNonWorkingDays().size());
@@ -186,7 +186,7 @@
// -----------------------------------------------------------------------
public void testSimpleForwardWithHolidays() {
- final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLOWING);
final Set<E> holidays = newHolidaysSet();
Assert.assertEquals("Name", "bla", cal.getName());
cal.setNonWorkingDays(holidays);
@@ -216,7 +216,7 @@
}
public void testMoveByBusinessDays() {
- final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLOWING);
final Set<E> holidays = newHolidaysSet();
Assert.assertEquals("Name", "bla", cal.getName());
cal.setNonWorkingDays(holidays);
@@ -234,7 +234,7 @@
}
public void testAddAcrossMonth() {
- final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLOWING);
cal.setStartDate(newDate("2006-07-28"));
cal.moveByDays(1);
@@ -255,142 +255,142 @@
}
public void testMoveByTenorDays() {
- checkMoveByTenor("2006-08-08", StandardTenor.T_1D, 0, "2006-08-09", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.DAY), 0, "2006-08-10", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-08", new Tenor(10, TenorCode.DAY), 0, "2006-08-18", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-08", new Tenor(11, TenorCode.DAY), 0, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-08", new Tenor(12, TenorCode.DAY), 0, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-08", new Tenor(13, TenorCode.DAY), 0, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-09-26", new Tenor(4, TenorCode.DAY), 0, "2006-09-29", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-08", StandardTenor.T_1D, 0, "2006-08-09", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.DAY), 0, "2006-08-10", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(10, TenorCode.DAY), 0, "2006-08-18", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(11, TenorCode.DAY), 0, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(12, TenorCode.DAY), 0, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(13, TenorCode.DAY), 0, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-09-26", new Tenor(4, TenorCode.DAY), 0, "2006-09-29", HolidayHandlerType.MODIFIED_FOLLOWING);
}
public void testMoveByTenorDaysOneDayToSpot() {
- checkMoveByTenor("2006-08-08", StandardTenor.T_1D, 1, "2006-08-10", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.DAY), 1, "2006-08-11", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-07", new Tenor(10, TenorCode.DAY), 1, "2006-08-18", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-07", new Tenor(11, TenorCode.DAY), 1, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-07", new Tenor(12, TenorCode.DAY), 1, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-07", new Tenor(13, TenorCode.DAY), 1, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-08", StandardTenor.T_1D, 1, "2006-08-10", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.DAY), 1, "2006-08-11", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-07", new Tenor(10, TenorCode.DAY), 1, "2006-08-18", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-07", new Tenor(11, TenorCode.DAY), 1, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-07", new Tenor(12, TenorCode.DAY), 1, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-07", new Tenor(13, TenorCode.DAY), 1, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLOWING);
}
public void testMoveByTenorDaysTwoDaysToSpot() {
- checkMoveByTenor("2006-08-08", StandardTenor.T_1D, 2, "2006-08-11", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.DAY), 2, "2006-08-14", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-07", new Tenor(10, TenorCode.DAY), 2, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-07", new Tenor(11, TenorCode.DAY), 2, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-07", new Tenor(12, TenorCode.DAY), 2, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-07", new Tenor(13, TenorCode.DAY), 2, "2006-08-22", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-08", StandardTenor.T_1D, 2, "2006-08-11", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.DAY), 2, "2006-08-14", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-07", new Tenor(10, TenorCode.DAY), 2, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-07", new Tenor(11, TenorCode.DAY), 2, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-07", new Tenor(12, TenorCode.DAY), 2, "2006-08-21", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-07", new Tenor(13, TenorCode.DAY), 2, "2006-08-22", HolidayHandlerType.MODIFIED_FOLLOWING);
}
public void testMoveByTenorWeek() {
- checkMoveByTenor("2006-08-08", StandardTenor.T_1W, 0, "2006-08-15", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.WEEK), 0, "2006-08-22", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-08", new Tenor(4, TenorCode.WEEK), 0, "2006-09-05", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-08", StandardTenor.T_1W, 0, "2006-08-15", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.WEEK), 0, "2006-08-22", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(4, TenorCode.WEEK), 0, "2006-09-05", HolidayHandlerType.MODIFIED_FOLLOWING);
}
public void testMoveByTenorWeekOneDayToSpot() {
- checkMoveByTenor("2006-08-08", StandardTenor.T_1W, 1, "2006-08-16", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.WEEK), 1, "2006-08-23", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-08", new Tenor(4, TenorCode.WEEK), 1, "2006-09-06", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-08", StandardTenor.T_1W, 1, "2006-08-16", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.WEEK), 1, "2006-08-23", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(4, TenorCode.WEEK), 1, "2006-09-06", HolidayHandlerType.MODIFIED_FOLLOWING);
}
public void testMoveByTenorWeekTwoDaysToSpot() {
- checkMoveByTenor("2006-08-08", StandardTenor.T_1W, 2, "2006-08-17", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.WEEK), 2, "2006-08-24", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-08", new Tenor(4, TenorCode.WEEK), 2, "2006-09-07", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-08", StandardTenor.T_1W, 2, "2006-08-17", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.WEEK), 2, "2006-08-24", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(4, TenorCode.WEEK), 2, "2006-09-07", HolidayHandlerType.MODIFIED_FOLLOWING);
}
public void testMoveByTenorMonth() {
- checkMoveByTenor("2006-08-31", StandardTenor.T_1M, 0, "2006-09-29", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-31", StandardTenor.T_2M, 0, "2006-10-31", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-01-31", StandardTenor.T_1M, 0, "2006-02-28", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2008-01-31", StandardTenor.T_1M, 0, "2008-02-29", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-31", StandardTenor.T_1M, 0, "2006-09-29", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-31", StandardTenor.T_2M, 0, "2006-10-31", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-01-31", StandardTenor.T_1M, 0, "2006-02-28", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2008-01-31", StandardTenor.T_1M, 0, "2008-02-29", HolidayHandlerType.MODIFIED_FOLLOWING);
- checkMoveByTenor("2006-08-08", StandardTenor.T_1M, 0, "2006-09-08", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-09", StandardTenor.T_1M, 0, "2006-09-11", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.MONTH), 0, "2006-10-09", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-08", new Tenor(5, TenorCode.MONTH), 0, "2007-01-08", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-08", StandardTenor.T_1M, 0, "2006-09-08", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-09", StandardTenor.T_1M, 0, "2006-09-11", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.MONTH), 0, "2006-10-09", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(5, TenorCode.MONTH), 0, "2007-01-08", HolidayHandlerType.MODIFIED_FOLLOWING);
}
public void testMoveByTenorMonthOneDayToSpot() {
- checkMoveByTenor("2006-08-31", StandardTenor.T_1M, 1, "2006-10-02", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-31", StandardTenor.T_2M, 1, "2006-11-01", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-01-31", StandardTenor.T_1M, 1, "2006-03-01", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2008-01-31", StandardTenor.T_1M, 1, "2008-03-03", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-31", StandardTenor.T_1M, 1, "2006-10-02", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-31", StandardTenor.T_2M, 1, "2006-11-01", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-01-31", StandardTenor.T_1M, 1, "2006-03-01", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2008-01-31", StandardTenor.T_1M, 1, "2008-03-03", HolidayHandlerType.MODIFIED_FOLLOWING);
- checkMoveByTenor("2006-08-08", StandardTenor.T_1M, 1, "2006-09-11", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-09", StandardTenor.T_1M, 1, "2006-09-11", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.MONTH), 1, "2006-10-09", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-08", new Tenor(5, TenorCode.MONTH), 1, "2007-01-09", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-08", StandardTenor.T_1M, 1, "2006-09-11", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-09", StandardTenor.T_1M, 1, "2006-09-11", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.MONTH), 1, "2006-10-09", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(5, TenorCode.MONTH), 1, "2007-01-09", HolidayHandlerType.MODIFIED_FOLLOWING);
}
public void testMoveByTenorMonthTwoDaysToSpot() {
- checkMoveByTenor("2006-08-31", StandardTenor.T_1M, 2, "2006-10-04", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-31", StandardTenor.T_2M, 2, "2006-11-06", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-01-31", StandardTenor.T_1M, 2, "2006-03-02", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2008-01-31", StandardTenor.T_1M, 2, "2008-03-04", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-31", StandardTenor.T_1M, 2, "2006-10-04", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-31", StandardTenor.T_2M, 2, "2006-11-06", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-01-31", StandardTenor.T_1M, 2, "2006-03-02", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2008-01-31", StandardTenor.T_1M, 2, "2008-03-04", HolidayHandlerType.MODIFIED_FOLLOWING);
- checkMoveByTenor("2006-08-08", StandardTenor.T_1M, 2, "2006-09-11", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-09", StandardTenor.T_1M, 2, "2006-09-11", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.MONTH), 2, "2006-10-10", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-08", new Tenor(5, TenorCode.MONTH), 2, "2007-01-10", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-08", StandardTenor.T_1M, 2, "2006-09-11", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-09", StandardTenor.T_1M, 2, "2006-09-11", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(2, TenorCode.MONTH), 2, "2006-10-10", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-08", new Tenor(5, TenorCode.MONTH), 2, "2007-01-10", HolidayHandlerType.MODIFIED_FOLLOWING);
}
public void testMoveByTenorYear() {
- checkMoveByTenor("2006-08-31", StandardTenor.T_1Y, 0, "2007-08-31", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-31", StandardTenor.T_2Y, 0, "2008-08-29", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2008-02-29", StandardTenor.T_1Y, 0, "2009-02-27", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2008-02-29", StandardTenor.T_4Y, 0, "2012-02-29", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-31", StandardTenor.T_1Y, 0, "2007-08-31", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-31", StandardTenor.T_2Y, 0, "2008-08-29", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2008-02-29", StandardTenor.T_1Y, 0, "2009-02-27", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2008-02-29", StandardTenor.T_4Y, 0, "2012-02-29", HolidayHandlerType.MODIFIED_FOLLOWING);
}
public void testMoveByTenorYearOneDayToSpot() {
- checkMoveByTenor("2006-08-31", StandardTenor.T_1Y, 1, "2007-09-03", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-31", StandardTenor.T_2Y, 1, "2008-09-01", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2008-02-29", StandardTenor.T_1Y, 1, "2009-03-03", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2008-02-29", StandardTenor.T_4Y, 1, "2012-03-05", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-31", StandardTenor.T_1Y, 1, "2007-09-03", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-31", StandardTenor.T_2Y, 1, "2008-09-01", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2008-02-29", StandardTenor.T_1Y, 1, "2009-03-03", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2008-02-29", StandardTenor.T_4Y, 1, "2012-03-05", HolidayHandlerType.MODIFIED_FOLLOWING);
}
public void testMoveByTenorYearTwoDaysToSpot() {
- checkMoveByTenor("2006-08-31", StandardTenor.T_1Y, 2, "2007-09-04", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-31", StandardTenor.T_2Y, 2, "2008-09-04", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2008-02-29", StandardTenor.T_1Y, 2, "2009-03-03", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2008-02-29", StandardTenor.T_4Y, 2, "2012-03-05", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-31", StandardTenor.T_1Y, 2, "2007-09-04", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-31", StandardTenor.T_2Y, 2, "2008-09-04", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2008-02-29", StandardTenor.T_1Y, 2, "2009-03-03", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2008-02-29", StandardTenor.T_4Y, 2, "2012-03-05", HolidayHandlerType.MODIFIED_FOLLOWING);
}
public void testMoveByTenorSpot() {
- checkMoveByTenor("2006-08-31", StandardTenor.SPOT, 0, "2006-08-31", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-28", StandardTenor.SPOT, 0, "2006-08-29", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-31", StandardTenor.SPOT, 0, "2006-08-31", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-28", StandardTenor.SPOT, 0, "2006-08-29", HolidayHandlerType.MODIFIED_FOLLOWING);
}
public void testMoveByTenorSpotOneDayToSpot() {
- checkMoveByTenor("2006-08-31", StandardTenor.SPOT, 1, "2006-09-01", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-28", StandardTenor.SPOT, 1, "2006-08-30", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-31", StandardTenor.SPOT, 1, "2006-09-01", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-28", StandardTenor.SPOT, 1, "2006-08-30", HolidayHandlerType.MODIFIED_FOLLOWING);
}
public void testMoveByTenorSpotTwoDaysToSpot() {
- checkMoveByTenor("2006-08-31", StandardTenor.SPOT, 2, "2006-09-04", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-28", StandardTenor.SPOT, 2, "2006-08-31", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-31", StandardTenor.SPOT, 2, "2006-09-04", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-28", StandardTenor.SPOT, 2, "2006-08-31", HolidayHandlerType.MODIFIED_FOLLOWING);
}
public void testMoveByTenorOvernight() {
- checkMoveByTenor("2006-08-24", StandardTenor.OVERNIGHT, 0, "2006-08-25", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-25", StandardTenor.OVERNIGHT, 0, "2006-08-29", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-31", StandardTenor.OVERNIGHT, 0, "2006-09-01", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-28", StandardTenor.OVERNIGHT, 0, "2006-08-30", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-24", StandardTenor.OVERNIGHT, 0, "2006-08-25", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-25", StandardTenor.OVERNIGHT, 0, "2006-08-29", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-31", StandardTenor.OVERNIGHT, 0, "2006-09-01", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-28", StandardTenor.OVERNIGHT, 0, "2006-08-30", HolidayHandlerType.MODIFIED_FOLLOWING);
}
public void testMoveByTenorOvernightOneDayToSpot() {
- checkMoveByTenor("2006-08-24", StandardTenor.OVERNIGHT, 1, "2006-08-25", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-25", StandardTenor.OVERNIGHT, 1, "2006-08-29", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-31", StandardTenor.OVERNIGHT, 1, "2006-09-01", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-28", StandardTenor.OVERNIGHT, 1, "2006-08-30", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-24", StandardTenor.OVERNIGHT, 1, "2006-08-25", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-25", StandardTenor.OVERNIGHT, 1, "2006-08-29", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-31", StandardTenor.OVERNIGHT, 1, "2006-09-01", HolidayHandlerType.MODIFIED_FOLLOWING);
+ checkMoveByTenor("2006-08-28", StandardTenor.OVERNIGHT, 1, "2006-08-30", HolidayHandlerType.MODIFIED_FOLLOWING);
}
public void testMoveByTenorOvernightTwoDaysToSpot() {
- checkMoveByTenor("2006-08-24", StandardTenor.OVERNIGHT, 2, "2006-08-25", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-25", StandardTenor.OVERNIGHT, 2, "2006-08-29", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-31", StandardTenor.OVERNIGHT, 2, "2006-09-01", HolidayHandlerType.MODIFIED_FOLLLOWING);
- checkMoveByTenor("2006-08-28", StandardTenor.OVERNIGHT, 2, "2006-08-30", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ checkMoveByTenor("2006-08-24", StandardTenor.OVERNIGHT, 2, "2006-08-25", Hol...
[truncated message content] |
|
From: <be...@us...> - 2007-01-04 15:33:24
|
Revision: 234
http://svn.sourceforge.net/objectlabkit/?rev=234&view=rev
Author: benoitx
Date: 2007-01-04 07:33:23 -0800 (Thu, 04 Jan 2007)
Log Message:
-----------
Ensure look consistency and update doco with view of the new HolidayCalendar.
Modified Paths:
--------------
trunk/common-build/project.properties
trunk/datecalc-common/src/site/style/maven-objectlabkit.css
trunk/datecalc-jdk/project.properties
trunk/datecalc-jdk/src/site/style/maven-objectlabkit.css
trunk/datecalc-joda/src/site/style/maven-objectlabkit.css
trunk/src/site/changes.xml
trunk/src/site/index.xml
trunk/src/site/navigation.xml
trunk/src/site/style/maven-objectlabkit.css
Added Paths:
-----------
trunk/datecalc-common/project.properties
trunk/datecalc-joda/project.properties
Modified: trunk/common-build/project.properties
===================================================================
--- trunk/common-build/project.properties 2007-01-04 14:34:42 UTC (rev 233)
+++ trunk/common-build/project.properties 2007-01-04 15:33:23 UTC (rev 234)
@@ -42,6 +42,8 @@
# enabling RUNNING with assertions!
maven.junit.jvmargs=-ea
maven.test.failure.ignore=true
+maven.test.error.ignore=true
+maven.test.skip=false
# As we're using SVN we need to have this property set to tell the changelog plugin to use SVN
# and not CVS (which is its default)
Added: trunk/datecalc-common/project.properties
===================================================================
--- trunk/datecalc-common/project.properties (rev 0)
+++ trunk/datecalc-common/project.properties 2007-01-04 15:33:23 UTC (rev 234)
@@ -0,0 +1,2 @@
+qalab.merge.projectName=objectlabkit
+qalab.merge.moduleName=common
Modified: trunk/datecalc-common/src/site/style/maven-objectlabkit.css
===================================================================
--- trunk/datecalc-common/src/site/style/maven-objectlabkit.css 2007-01-04 14:34:42 UTC (rev 233)
+++ trunk/datecalc-common/src/site/style/maven-objectlabkit.css 2007-01-04 15:33:23 UTC (rev 234)
@@ -78,11 +78,11 @@
font-size: 12px;
padding-top: 2px;
}
-
+/*
div#navcolumn li {
background: #eeeeee !important;
}
-
+*/
div#navcolumn div a {
color: #002070;
font-size: 11px;
Modified: trunk/datecalc-jdk/project.properties
===================================================================
--- trunk/datecalc-jdk/project.properties 2007-01-04 14:34:42 UTC (rev 233)
+++ trunk/datecalc-jdk/project.properties 2007-01-04 15:33:23 UTC (rev 234)
@@ -1,3 +1,2 @@
-maven.test.failure.ignore=true
-maven.test.error.ignore=true
-maven.test.skip=false
+qalab.merge.projectName=objectlabkit
+qalab.merge.moduleName=jdk
Modified: trunk/datecalc-jdk/src/site/style/maven-objectlabkit.css
===================================================================
--- trunk/datecalc-jdk/src/site/style/maven-objectlabkit.css 2007-01-04 14:34:42 UTC (rev 233)
+++ trunk/datecalc-jdk/src/site/style/maven-objectlabkit.css 2007-01-04 15:33:23 UTC (rev 234)
@@ -78,11 +78,11 @@
font-size: 12px;
padding-top: 2px;
}
-
+/*
div#navcolumn li {
background: #eeeeee !important;
}
-
+*/
div#navcolumn div a {
color: #002070;
font-size: 11px;
Added: trunk/datecalc-joda/project.properties
===================================================================
--- trunk/datecalc-joda/project.properties (rev 0)
+++ trunk/datecalc-joda/project.properties 2007-01-04 15:33:23 UTC (rev 234)
@@ -0,0 +1,2 @@
+qalab.merge.projectName=objectlabkit
+qalab.merge.moduleName=joda
Modified: trunk/datecalc-joda/src/site/style/maven-objectlabkit.css
===================================================================
--- trunk/datecalc-joda/src/site/style/maven-objectlabkit.css 2007-01-04 14:34:42 UTC (rev 233)
+++ trunk/datecalc-joda/src/site/style/maven-objectlabkit.css 2007-01-04 15:33:23 UTC (rev 234)
@@ -78,11 +78,11 @@
font-size: 12px;
padding-top: 2px;
}
-
+/*
div#navcolumn li {
background: #eeeeee !important;
}
-
+*/
div#navcolumn div a {
color: #002070;
font-size: 11px;
Modified: trunk/src/site/changes.xml
===================================================================
--- trunk/src/site/changes.xml 2007-01-04 14:34:42 UTC (rev 233)
+++ trunk/src/site/changes.xml 2007-01-04 15:33:23 UTC (rev 234)
@@ -9,6 +9,9 @@
</properties>
<body>
<release version="1.1.0" date="in SVN" description="Maintenance">
+ <action dev="benoitx" type="add" issue="1575498" due-to="Paul Hill">Valid Range via HolidayCalendar. HolidayCalendar should replace the simple Set<E> of dates
+ for holidays. A HolidayCalendar MAY contain an eraly and late boundary, if the calculation break a boundary, an exception is thrown, if there are no
+ boundaries no exception would be thrown. This would ensure that calculations are not going outside the valid set of holidays.</action>
<action dev="benoitx" type="fix" due-to="David Owen">The calculation of Spot date should take into account holidays BETWEEN now and spot (aka moveByBusinessDay).</action>
<action dev="benoitx" type="add" issue="1601540" due-to="Anthony Whitford">Added a standard Tenor 2D.</action>
<action dev="benoitx" type="fix" issue="1601542" due-to="Anthony Whitford">Spelling mistake in the code,
Modified: trunk/src/site/index.xml
===================================================================
--- trunk/src/site/index.xml 2007-01-04 14:34:42 UTC (rev 233)
+++ trunk/src/site/index.xml 2007-01-04 15:33:23 UTC (rev 234)
@@ -20,12 +20,18 @@
</head>
<body>
<!-- The body of the document contains a number of sections -->
+ <section name="Quick News">
+ <p>2007-01-xx: version 1.1.0 is out and contains a couple of changes, a new HolidayHandler and the ability to define a valid range for the holiday (and
+ if the calculation is beyond that range, an exception is thrown). This is done via HolidayCalendar which should replace the simple Set<E> for holidays.
+ More info on the changes <a href="changes-report.html">here</a>.</p>
+ </section>
+
<section name="ObjectLab Kit Introduction">
<p>ObjectLab Kit came out of our frustration to have to re-do the same kind of code over and over each time we
joined a new company and Bank. Most banks will require basic Date calculation, we did spot another open source
project for this but their licence forbids most financial institution from using it. This one is released under
- the business-friendly Apache 2.0 license. <a href="http://digg.com/submit?phase=2&url=objectlabkit.sourceforge.net&title=ObjectLab%20Kit%3A%20Open%20Source%20Date%20Calculators%20for%20Business%20and%20Finance&bodytext=ObjectLab%20released%20version%201%2E0%2E1%20of%20ObjectLab%20Kit%20for%20Java%201%2E5,%20available%20for%20download%20via%20SourceForge%20or%20the%20Maven%20Central%20Repository%2E%20The%20Kit%20provides%20a%20Date%20Calculator%20that%20handle%20holidays,%20a%20IMM%20Date%20and%20Period%20Count%20Calculator%20and%20comes%20in%20two%20versions%3A%20one%20based%20on%20pure%20JDK%20(1%2E5)%20and%20one%20based%20on%20the%20Joda-time%20library%20(1%2E3%2B,%20JDK%201%2E5)%2E&topic=programming">
+ the business-friendly Apache 2.0 license. <a href="http://digg.com/submit?phase=2&url=objectlabkit.sourceforge.net&title=ObjectLab%20Kit%3A%20Open%20Source%20Date%20Calculators%20for%20Business%20and%20Finance&bodytext=ObjectLab%20released%20version%201%2E1%2E0%20of%20ObjectLab%20Kit%20for%20Java%201%2E5,%20available%20for%20download%20via%20SourceForge%20or%20the%20Maven%20Central%20Repository%2E%20The%20Kit%20provides%20a%20Date%20Calculator%20that%20handle%20holidays,%20a%20IMM%20Date%20and%20Period%20Count%20Calculator%20and%20comes%20in%20two%20versions%3A%20one%20based%20on%20pure%20JDK%20(1%2E5)%20and%20one%20based%20on%20the%20Joda-time%20library%20(1%2E3%2B,%20JDK%201%2E5)%2E&topic=programming">
<img src="http://digg.com/img/badges/91x17-digg-button.png" width="91" height="17" alt="Digg!" style="vertical-align:middle" /></a></p>
@@ -54,7 +60,7 @@
<subsection name ="Ok, what algorithm for handling a holiday do you support?">
- <p>At the moment, we support the following 5 algorithms:</p>
+ <p>At the moment, we support the following 6 algorithms:</p>
<ol>
<li><strong>Do Nothing</strong>, i.e. leave the date as-is, even if it is a non-working day.</li>
<li><strong>Forward</strong>, if the date is a non-working day, move forward to the next working day.</li>
@@ -63,6 +69,7 @@
UNLESS it crosses over a new month, in which case we revert to find the last working day of the current month.</li>
<li><strong>Modified Preceeding</strong>, if the date is a non-working day, move backward to the previous working day,
UNLESS it crosses over a new month, in which case we revert to find the next working day of the current month.</li>
+ <li><strong>ForwardUnlessNegative</strong> (new with v1.1.0), acts like a Forward algo unless the increment is negative, in which case it behaves like Backward.</li>
</ol>
<p>See this page for some <a href="algo.html">examples</a>.</p>
</subsection>
@@ -124,12 +131,12 @@
<section name="How do I use it?">
<p>There are several steps</p>
<ul>
- <li>Register holidays in the factory by calling registerHolidays(final String name, Set<Date> holidays)</li>
+ <li>Register holidays in the factory by calling registerHolidays(final String name, HolidayCalendar<Date> holidays)</li>
<li>Use the factory to get a DateCalculator with a given Handler (forward/backward etc), it is a disposable object that should <strong>not</strong> be shared accross threads, each thread
should get its own!</li>
<li>when you get a DateCalculator, you can set the startDate, this sets the currentDate too. The startDate does not move. The current date is
the result of your calculations. If the startDate is a non-working day, it may be moved automatically according to the HolidayHandler.</li>
- <li>when you call moveByDays(..), moveByBusinessDays(..) the currentDate is moved in the Calculator.</li>
+ <li>when you call moveByDays(..), moveByBusinessDays(..), moveByTenor the currentDate is moved in the Calculator.</li>
</ul>
<subsection name="Using Joda-time LocalDate">
@@ -138,9 +145,13 @@
// create or get the Holidays
final Set<LocalDate> holidays = new HashSet<LocalDate>();
holidays.add(new LocalDate("2006-08-28"));
+//... keep adding all holidays for 2006
+
+// create the HolidayCalendar ASSUMING that the set covers 2006!
+final HolidayCalendar<LocalDate> calendar = new DefaultHolidayCalendar<LocalDate>(holidays, new LocalDate("2006-01-01"), new LocalDate("2006-12-31"));
-// register the holidays (any calculator with name "UK" asked from now on will receive a reference to this set
-LocalDateKitCalculatorsFactory.getDefaultInstance().registerHolidays("UK", holidays);
+// register the holiday calendar (any calculator with name "UK" asked from now on will receive an IMMUTABLE reference to this calendar)
+LocalDateKitCalculatorsFactory.getDefaultInstance().registerHolidays("UK", calendar);
// ask for a LocalDate calculator for "UK" (even if a new set of holidays is registered, this one calculator is not affected
DateCalculator<LocalDate> cal = LocalDateKitCalculatorsFactory.getDefaultInstance().getDateCalculator("UK", HolidayHandlerType.FORWARD);
@@ -152,6 +163,9 @@
LocalDate current = cal.getCurrentBusinessDate(); // 29 Aug 06
LocalDate newCurrent = cal.moveByDays(4).getCurrentBusinessDate(); // 4 Sept 06 due to weekend!
+
+// Example with Tenor, 1W with a 2 day spot lag
+LocalDate date1WeekFromSpot = cal.moveByTenor(StandardTenor.T_1W, 2).getCurrentBusinessDate();
</pre></div>
</subsection>
@@ -166,11 +180,15 @@
calendar.set(Calendar.DAY_OF_MONTH,28);
calendar.set(Calendar.MONTH,Calendar.AUGUST);
calendar.set(Calendar.YEAR,2006);
-holidays.add(calendar);
-
-// register the holidays (any calculator with name "UK" asked from now on will receive a reference to this set
-CalendarKitCalculatorsFactory.getDefaultInstance().registerHolidays("UK", holidays);
+holidays.add(calendar);
+//... keep adding all holidays for 2006
+// create the HolidayCalendar ASSUMING that the set covers 2006!
+final HolidayCalendar<Calendar> calendar = new DefaultHolidayCalendar<Calendar>(holidays, new Calendar("2006-01-01"), new Calendar("2006-12-31"));
+
+// register the holidays (any calculator with name "UK" asked from now on will receive an IMMUTABLE reference to this calendar
+CalendarKitCalculatorsFactory.getDefaultInstance().registerHolidays("UK", calendar);
+
// ask for a LocalDate calculator for "UK" (even if a new set of holidays is registered, this one calculator is not affected
DateCalculator<Calendar> cal = LocalDateKitCalculatorsFactory.getDefaultInstance().getDateCalculator("UK", HolidayHandlerType.FORWARD);
Calendar initial = Calendar.getInstance();
@@ -186,6 +204,9 @@
Calendar current = cal.getCurrentBusinessDate(); // 29 Aug 06
Calendar newCurrent = cal.moveByDays(4).getCurrentBusinessDate(); // 4 Sept 06 due to weekend!
+
+// Example with Tenor, 1W with a 2 day spot lag
+Calendar date1WeekFromSpot = cal.moveByTenor(StandardTenor.T_1W, 2).getCurrentBusinessDate();
</pre></div>
</subsection>
Modified: trunk/src/site/navigation.xml
===================================================================
--- trunk/src/site/navigation.xml 2007-01-04 14:34:42 UTC (rev 233)
+++ trunk/src/site/navigation.xml 2007-01-04 15:33:23 UTC (rev 234)
@@ -29,7 +29,9 @@
<footer>
<a href="http://sourceforge.net">
<img src="http://sourceforge.net/sflogo.php?group_id=97367&type=2" width="125" height="37" border="0" alt="SourceForge.net Logo" />
- </a>
+ </a>
+ <a href="http://digg.com/submit?phase=2&url=objectlabkit.sourceforge.net&title=ObjectLab%20Kit%3A%20Open%20Source%20Date%20Calculators%20for%20Business%20and%20Finance&bodytext=ObjectLab%20released%20version%201%2E1%2E0%20of%20ObjectLab%20Kit%20for%20Java%201%2E5,%20available%20for%20download%20via%20SourceForge%20or%20the%20Maven%20Central%20Repository%2E%20The%20Kit%20provides%20a%20Date%20Calculator%20that%20handle%20holidays,%20a%20IMM%20Date%20and%20Period%20Count%20Calculator%20and%20comes%20in%20two%20versions%3A%20one%20based%20on%20pure%20JDK%20(1%2E5)%20and%20one%20based%20on%20the%20Joda-time%20library%20(1%2E3%2B,%20JDK%201%2E5)%2E&topic=programming">
+ <img src="http://digg.com/img/badges/91x17-digg-button.png" width="91" height="17" alt="Digg!" style="vertical-align:middle" /></a>
<script src="http://www.google-analytics.com/urchin.js"
type="text/javascript">
</script>
Modified: trunk/src/site/style/maven-objectlabkit.css
===================================================================
--- trunk/src/site/style/maven-objectlabkit.css 2007-01-04 14:34:42 UTC (rev 233)
+++ trunk/src/site/style/maven-objectlabkit.css 2007-01-04 15:33:23 UTC (rev 234)
@@ -78,11 +78,11 @@
font-size: 12px;
padding-top: 2px;
}
-
+/*
div#navcolumn li {
background: #eeeeee !important;
}
-
+*/
div#navcolumn div a {
color: #002070;
font-size: 11px;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
![http://digg.com/img/badges/91x17-digg-button.png"](http://digg.com/img/badges/91x17-digg-button.png"){kind=link}
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X