Menu
▾
▴
[Objectlabkit-svn] SF.net SVN: objectlabkit: [134] trunk
|
From: <be...@us...> - 2006-09-09 15:02:05
|
Revision: 134
http://svn.sourceforge.net/objectlabkit/?rev=134&view=rev
Author: benoitx
Date: 2006-09-09 08:01:14 -0700 (Sat, 09 Sep 2006)
Log Message:
-----------
Improve coverage by removing code never called (null detection done somewhere else).
Modified Paths:
--------------
trunk/common-build/project.xml
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateForwardHandler.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaExcelDateUtil.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateCalculator.java
trunk/project.properties
trunk/src/site/navigation.xml
Added Paths:
-----------
trunk/src/site/tenor.xml
Modified: trunk/common-build/project.xml
===================================================================
--- trunk/common-build/project.xml 2006-09-09 12:45:09 UTC (rev 133)
+++ trunk/common-build/project.xml 2006-09-09 15:01:14 UTC (rev 134)
@@ -26,6 +26,7 @@
/var/www/solutions/website/objectlab.co.uk/
</siteDirectory>
<repository>
+ <url>https://svn.sourceforge.net/svnroot/objectlabkit</url>
<connection>
scm:svn:https://svn.sourceforge.net/svnroot/objectlabkit/trunk
</connection>
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-09 12:45:09 UTC (rev 133)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java 2006-09-09 15:01:14 UTC (rev 134)
@@ -36,7 +36,7 @@
* @author $LastModifiedBy$
* @version $Revision: 128 $ $Date: 2006-09-08 15:14:46 +0200 (Fri, 08 Sep 2006) $
*/
-public class CalendarDateCalculator extends AbstractDateCalculator<Calendar> {
+public class CalendarDateCalculator extends AbstractDateCalculator<Calendar> {
private WorkingWeek workingWeek = WorkingWeek.DEFAULT;
@@ -68,42 +68,21 @@
}
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) {
+ 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());
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-09 12:45:09 UTC (rev 133)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateForwardHandler.java 2006-09-09 15:01:14 UTC (rev 134)
@@ -40,10 +40,6 @@
protected Date move(final DateCalculator<Date> calculator, final int step) {
final Calendar cal = Utils.getCal(calculator.getCurrentBusinessDate());
- if (cal == null) {
- return null;
- }
-
while (calculator.isNonWorkingDay(cal.getTime())) {
cal.add(Calendar.DAY_OF_MONTH, step);
}
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaExcelDateUtil.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaExcelDateUtil.java 2006-09-09 12:45:09 UTC (rev 133)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaExcelDateUtil.java 2006-09-09 15:01:14 UTC (rev 134)
@@ -35,8 +35,7 @@
*/
public final class JodaExcelDateUtil {
- private JodaExcelDateUtil() {
- }
+ private JodaExcelDateUtil() {}
public static LocalDate getLocalDate(final double date, final boolean use1904windowing) {
final Date javaDate = ExcelDateUtil.getJavaDate(date, use1904windowing);
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateCalculator.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateCalculator.java 2006-09-09 12:45:09 UTC (rev 133)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateCalculator.java 2006-09-09 15:01:14 UTC (rev 134)
@@ -47,7 +47,10 @@
setStartDate(startDate);
}
- // TODO throw an exception if the WorkinWeek type is wrong
+ /**
+ * @todo throw an exception if the WorkinWeek type is wrong
+ *
+ */
public void setWorkingWeek(final WorkingWeek week) {
if (week instanceof JodaWorkingWeek) {
workingWeek = (JodaWorkingWeek) week;
@@ -63,9 +66,6 @@
}
public DateCalculator<LocalDate> moveByDays(final int days) {
- if (getCurrentBusinessDate() == null) {
- initialise();
- }
setCurrentBusinessDate(getCurrentBusinessDate().plusDays(days));
if (getHolidayHandler() != null) {
@@ -75,14 +75,6 @@
return this;
}
- protected void initialise() {
- if (getStartDate() == null) {
- setStartDate(new LocalDate());
- } else if (getCurrentBusinessDate() == null) {
- setCurrentBusinessDate(new LocalDate());
- }
- }
-
@Override
protected DateCalculator<LocalDate> createNewCalculator(final String name, final LocalDate startDate,
final Set<LocalDate> holidays, final HolidayHandler<LocalDate> handler) {
Modified: trunk/project.properties
===================================================================
--- trunk/project.properties 2006-09-09 12:45:09 UTC (rev 133)
+++ trunk/project.properties 2006-09-09 15:01:14 UTC (rev 134)
@@ -27,7 +27,7 @@
# goal on each project when you run it through multiproject:site.
maven.multiproject.site.goals=site, dashboard:report-single
#
-maven.dashboard.aggregators = csfiles,cserrors,junittests,junitfailures,juniterrors,junitpassrate,pmdfiles,pmdviolations,fbfiles,fbviolations,simiantdl
+maven.dashboard.aggregators = cserrors,pmdviolations,fbviolations,simiantdl,junittests,junitfailures,juniterrors,junitpassrate,coberturalipc,coberturaloc
#maven.dashboard.aggregators = csfiles,cswarnings,cserrors,junittests,junitfailures,juniterrors,junitpassrate,pmdfiles,pmdviolations,simiantdl,jcoveragelipc,jcoverageloc
maven.pmd.check.tests=false
Modified: trunk/src/site/navigation.xml
===================================================================
--- trunk/src/site/navigation.xml 2006-09-09 12:45:09 UTC (rev 133)
+++ trunk/src/site/navigation.xml 2006-09-09 15:01:14 UTC (rev 134)
@@ -16,6 +16,7 @@
<item name="DateCalc JODA"
href="multiproject/datecalc-joda/index.html" />
<item name="Holiday Handling" href="algo.html" />
+ <item name="Tenor Handling" href="tenor.html" />
<item name="JavaDoc" class="newWindow" target="_new" href="apidocs/index.html" />
</menu>
<!--
Added: trunk/src/site/tenor.xml
===================================================================
--- trunk/src/site/tenor.xml (rev 0)
+++ trunk/src/site/tenor.xml 2006-09-09 15:01:14 UTC (rev 134)
@@ -0,0 +1,19 @@
+<document>
+ <properties>
+ <author email="Ki...@ob...">Benoit Xhenseval</author>
+ <title>ObjectLab Kit - Tenor Handling</title>
+ </properties>
+ <head>
+
+ </head>
+ <body>
+ <!-- The body of the document contains a number of sections -->
+ <section name="Tenor Handling">
+
+ <subsection name="Spot">
+ </subsection>
+
+ </section>
+
+ </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.
|
