Menu
▾
▴
[Objectlabkit-svn] SF.net SVN: objectlabkit: [113] trunk
|
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.
|
