Menu
▾
▴
[Objectlabkit-svn] SF.net SVN: objectlabkit: [96] trunk
|
From: <be...@us...> - 2006-09-04 15:02:13
|
Revision: 96
http://svn.sourceforge.net/objectlabkit/?rev=96&view=rev
Author: benoitx
Date: 2006-09-04 08:01:20 -0700 (Mon, 04 Sep 2006)
Log Message:
-----------
Organised imports, Format and CleanUp.
Modified 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-common/src/main/java/net/objectlab/kit/datecalc/common/WorkingWeek.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/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-common/src/test/java/net/objectlab/kit/datecalc/common/UtilsTest.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/BackwardHandler.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/CalendarPeriodCountCalculator.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DatePeriodCountCalculator.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/ExcelDateUtil.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/ForwardHandler.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/HolidayHandlerDateWrapper.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/JdkDateBaseDateCalculator.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/JdkDatePeriodCountCalculator.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/ModifiedFollowingHandler.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/ModifiedPreceedingHandler.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/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/JdkDateModifiedFollowingDateCalculatorTest.java
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDateModifiedPreceedingDateCalculatorTest.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ExcelDateUtil.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
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-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactory.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -23,20 +23,20 @@
/**
* TODO javadoc
- *
+ *
* @author marchi
* @author $LastChangedBy$
* @version $Revision$ $Date$
- *
+ *
*/
public abstract class AbstractDateCalculatorFactory<E> implements DateCalculatorFactory<E> {
protected final ConcurrentMap<String, Set<E>> holidays = new ConcurrentHashMap<String, Set<E>>();
-
+
public abstract DateCalculator<E> getDateCalculator(String name, String holidayHandlerType);
-
+
public abstract PeriodCountCalculator<E> getPeriodCountCalculator();
-
+
/**
* 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
Modified: 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-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculatorFactory.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -44,8 +44,7 @@
* typically one of the value of HolidayHandlerType
* @return a new DateCalculator
*/
- DateCalculator<E> getDateCalculator(final String name,
- final String holidayHandlerType);
+ DateCalculator<E> getDateCalculator(final String name, final String holidayHandlerType);
/**
* Use this method to register a set of holidays for a given calendar.
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-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/WorkingWeek.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -62,7 +62,7 @@
* Saturday, 64 Sunday So Monday-Friday= 1+2+4+8+16 = 31
*/
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;
@@ -71,7 +71,7 @@
public boolean isWorkingDay(final Date date) {
return isWorkingDay(Utils.getCal(date));
}
-
+
public boolean isWorkingDay(final Calendar cal) {
return isWorkingDayFromCalendar(cal.get(Calendar.DAY_OF_WEEK));
}
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-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractBackwardDateCalculatorTest.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -4,11 +4,6 @@
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> {
@@ -55,9 +50,8 @@
public void testSimpleForwardStartDateNoWeekend() {
final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.BACKWARD);
- WorkingWeek ww = new WorkingWeek()
- .withWorkingDayFromCalendar(true, Calendar.SATURDAY)
- .withWorkingDayFromCalendar(true, Calendar.SUNDAY);
+ final 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());
@@ -89,14 +83,10 @@
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);
+ final 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
@@ -126,14 +116,10 @@
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);
+ final 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
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorCombinationTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorCombinationTest.java 2006-09-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorCombinationTest.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -1,8 +1,6 @@
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> {
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-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -10,7 +10,7 @@
protected abstract E newDate(final String date);
protected abstract DateCalculatorFactory<E> getDateCalculatorFactory();
-
+
protected void checkDate(final String string, final DateCalculator<E> calendar, final String string2) {
Assert.assertEquals(string, newDate(string2), calendar.getCurrentBusinessDate());
}
@@ -44,11 +44,11 @@
getDateCalculatorFactory().registerHolidays(name, holidays);
}
- protected WorkingWeek getWorkingWeek(WorkingWeek ww) {
+ protected WorkingWeek getWorkingWeek(final WorkingWeek ww) {
return ww;
}
- protected DateCalculator<E> newDateCalculator(String name, String type) {
+ protected DateCalculator<E> newDateCalculator(final String name, final String type) {
return getDateCalculatorFactory().getDateCalculator(name, type);
}
}
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-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractForwardDateCalculatorTest.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -50,9 +50,8 @@
public void testSimpleForwardStartDateNoWeekend() {
final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.FORWARD);
- WorkingWeek ww = new WorkingWeek()
- .withWorkingDayFromCalendar(true, Calendar.SATURDAY)
- .withWorkingDayFromCalendar(true, Calendar.SUNDAY);
+ final 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());
@@ -84,14 +83,10 @@
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);
+ final 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
@@ -121,14 +116,10 @@
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);
+ final 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
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-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedFollowingDateCalculatorTest.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -50,11 +50,10 @@
public void testSimpleForwardStartDateNoWeekend() {
final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLLOWING);
- WorkingWeek ww = new WorkingWeek()
- .withWorkingDayFromCalendar(true, Calendar.SATURDAY)
- .withWorkingDayFromCalendar(true, Calendar.SUNDAY);
+ final 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());
@@ -85,14 +84,10 @@
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);
+ final 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
@@ -122,14 +117,10 @@
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);
+ final 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
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-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractModifiedPreceedingDateCalculatorTest.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -50,11 +50,10 @@
public void testSimpleForwardStartDateNoWeekend() {
final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_PRECEEDING);
-
- WorkingWeek ww = new WorkingWeek()
- .withWorkingDayFromCalendar(true, Calendar.SATURDAY)
- .withWorkingDayFromCalendar(true, Calendar.SUNDAY);
-
+
+ final 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());
@@ -86,14 +85,10 @@
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);
+ final 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
@@ -123,14 +118,10 @@
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);
+ final 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
@@ -270,5 +261,5 @@
checkDate("do NOT move to next month", cal, "2006-08-02");
}
-
+
}
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/UtilsTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/UtilsTest.java 2006-09-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/UtilsTest.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -22,6 +22,7 @@
Set<Date> dateSet;
+ @Override
protected void setUp() throws Exception {
sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -34,8 +35,8 @@
dateSet.add(getCal(2083, 12, 1).getTime());
}
- private Calendar getCal(int year, int month, int day) {
- Calendar cal = Calendar.getInstance();
+ private Calendar getCal(final int year, final int month, final int day) {
+ final Calendar cal = Calendar.getInstance();
cal.clear();
cal.setTimeZone(TimeZone.getTimeZone("UTC"));
cal.set(year, month - 1, day, 0, 0, 0);
@@ -44,11 +45,11 @@
public void testGetCal() throws Exception {
- Date d = sdf.parse("2004-02-03");
+ final Date d = sdf.parse("2004-02-03");
assertEquals(Utils.getCal(d).getTime(), getCal(2004, 2, 3).getTime());
- Date d1 = getCal(2080, 5, 31).getTime();
- Date d2 = getCal(2080, 5, 31).getTime();
+ final Date d1 = getCal(2080, 5, 31).getTime();
+ final Date d2 = getCal(2080, 5, 31).getTime();
assertEquals(Utils.getCal(d1).getTime(), d2);
}
@@ -71,10 +72,10 @@
public void testToDateList() {
- List<Date> expected = new ArrayList<Date>(dateSet);
+ final List<Date> expected = new ArrayList<Date>(dateSet);
Collections.sort(expected);
- List<Date> actual = Utils.toDateList(new ArrayList<Calendar>(calendarSet));
+ final List<Date> actual = Utils.toDateList(new ArrayList<Calendar>(calendarSet));
Collections.sort(actual);
assertEquals(expected, actual);
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/BackwardHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/BackwardHandler.java 2006-09-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/BackwardHandler.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -24,18 +24,20 @@
/**
* TODO javadoc
- *
+ *
* @author Marcin Jekot
* @author $LastChangedBy$
* @version $Revision$ $Date$
- *
+ *
*/
public class BackwardHandler extends ForwardHandler {
- public Calendar moveCurrentDate(DateCalculator<Calendar> calendar) {
+ @Override
+ public Calendar moveCurrentDate(final DateCalculator<Calendar> calendar) {
return move(calendar, -1);
}
+ @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-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarForwardHandler.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -25,7 +25,7 @@
/**
* TODO javadoc
- *
+ *
* @author Marcin Jekot
* @author $LastChangedBy: marchy $
* @version $Revision: 69 $ $Date: 2006-08-27 11:47:25 +0200 (Sun, 27 Aug 2006) $
@@ -37,16 +37,16 @@
return move(calendar, 1);
}
- protected Calendar move(final DateCalculator<Calendar> calculator, int step) {
- final Calendar cal = (Calendar)calculator.getCurrentBusinessDate().clone();
+ protected Calendar move(final DateCalculator<Calendar> calculator, final int step) {
+ final Calendar cal = (Calendar) calculator.getCurrentBusinessDate().clone();
while (calculator.isNonWorkingDay(cal)) {
cal.add(Calendar.DAY_OF_MONTH, step);
}
- return cal;
+ return cal;
}
-
+
public String getType() {
return HolidayHandlerType.FORWARD;
}
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-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -18,7 +18,6 @@
package net.objectlab.kit.datecalc.jdk;
import java.util.Calendar;
-import java.util.TimeZone;
import net.objectlab.kit.datecalc.common.PeriodCountBasis;
import net.objectlab.kit.datecalc.common.PeriodCountCalculator;
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-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DatePeriodCountCalculator.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -24,18 +24,18 @@
/**
* TODO javadoc
- *
+ *
* @author Marcin Jekot
* @author $LastChangedBy$
* @version $Revision$ $Date$
- *
+ *
*/
public class DatePeriodCountCalculator implements JdkDatePeriodCountCalculator {
- private final CalendarPeriodCountCalculator PCC = new CalendarPeriodCountCalculator();
-
+ private final CalendarPeriodCountCalculator PCC = new CalendarPeriodCountCalculator();
+
public int dayDiff(final Date start, final Date end, final PeriodCountBasis basis) {
-
+
return PCC.dayDiff(Utils.getCal(start), Utils.getCal(end), basis);
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DefaultJdkDateCalculatorFactory.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DefaultJdkDateCalculatorFactory.java 2006-09-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DefaultJdkDateCalculatorFactory.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -23,16 +23,15 @@
import net.objectlab.kit.datecalc.common.HolidayHandlerType;
/**
- * TODO add javadoc
- *
+ * TODO add javadoc
+ *
* @author Benoit Xhenseval
* @author $LastChangedBy$
* @version $Revision$ $Date$
- *
+ *
*/
-public class DefaultJdkDateCalculatorFactory extends AbstractDateCalculatorFactory<Date>
- implements JdkDateCalculatorFactory {
-
+public class DefaultJdkDateCalculatorFactory extends AbstractDateCalculatorFactory<Date> implements JdkDateCalculatorFactory {
+
private static final JdkDateCalculatorFactory DEFAULT = new DefaultJdkDateCalculatorFactory();
private static final JdkDatePeriodCountCalculator PCC = new DatePeriodCountCalculator();
@@ -41,9 +40,13 @@
return DEFAULT;
}
- /* (non-Javadoc)
- * @see net.objectlab.kit.datecalc.jdk.JdkDateCalculatorFactory#getDateCalculator(java.lang.String, java.lang.String)
+ /*
+ * (non-Javadoc)
+ *
+ * @see net.objectlab.kit.datecalc.jdk.JdkDateCalculatorFactory#getDateCalculator(java.lang.String,
+ * java.lang.String)
*/
+ @Override
public JdkDateCalculator getDateCalculator(final String name, final String holidayHandlerType) {
final JdkDateBaseDateCalculator cal = new JdkDateBaseDateCalculator();
cal.setName(name);
@@ -68,9 +71,12 @@
return cal;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see net.objectlab.kit.datecalc.jdk.JdkDateCalculatorFactory#getPeriodCountCalculator()
*/
+ @Override
public JdkDatePeriodCountCalculator getPeriodCountCalculator() {
return PCC;
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/ExcelDateUtil.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/ExcelDateUtil.java 2006-09-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/ExcelDateUtil.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -17,19 +17,22 @@
*/
package net.objectlab.kit.datecalc.jdk;
+import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
/**
* Convert Excel Date to Java Date.
+ *
* @author Benoit Xhenseval
* @author $LastChangedBy$
* @version $Revision$ $Date$
- *
+ *
*/
public final class ExcelDateUtil {
- private ExcelDateUtil() {}
-
+ private ExcelDateUtil() {
+ }
+
private static final long DAY_MILLISECONDS = 24 * 60 * 60 * 1000;
/**
@@ -54,12 +57,12 @@
* Excel date
* @see java.util.TimeZone
*/
- public static Date getJavaDate(double date, boolean use1904windowing) {
+ public static Date getJavaDate(final double date, final boolean use1904windowing) {
if (isValidExcelDate(date)) {
int startYear = 1900;
int dayAdjust = -1; // Excel thinks 2/29/1900 is a valid date, which
// it isn't
- int wholeDays = (int) Math.floor(date);
+ final int wholeDays = (int) Math.floor(date);
if (use1904windowing) {
startYear = 1904;
dayAdjust = 1; // 1904 date windowing uses 1/2/1904 as the
@@ -71,9 +74,9 @@
// representation
dayAdjust = 0;
}
- GregorianCalendar calendar = new GregorianCalendar(startYear, 0, wholeDays + dayAdjust);
- int millisecondsInDay = (int) ((date - Math.floor(date)) * (double) DAY_MILLISECONDS + 0.5);
- calendar.set(GregorianCalendar.MILLISECOND, millisecondsInDay);
+ final GregorianCalendar calendar = new GregorianCalendar(startYear, 0, wholeDays + dayAdjust);
+ final int millisecondsInDay = (int) ((date - Math.floor(date)) * DAY_MILLISECONDS + 0.5);
+ calendar.set(Calendar.MILLISECOND, millisecondsInDay);
return calendar.getTime();
} else {
return null;
@@ -87,7 +90,7 @@
* @param value
* the double value
*/
- public static boolean isValidExcelDate(double value) {
+ public static boolean isValidExcelDate(final double value) {
return (value > -Double.MIN_VALUE);
}
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/ForwardHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/ForwardHandler.java 2006-09-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/ForwardHandler.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -35,8 +35,9 @@
return move(calendar, 1);
}
- protected Calendar move(final DateCalculator<Calendar> calculator, int step) {
-// final Calendar cal = (Calendar) calculator.getCurrentBusinessDate().clone();
+ protected Calendar move(final DateCalculator<Calendar> calculator, final int step) {
+ // final Calendar cal = (Calendar)
+ // calculator.getCurrentBusinessDate().clone();
final Calendar cal = calculator.getCurrentBusinessDate();
while (calculator.isNonWorkingDay(cal)) {
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-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/HolidayHandlerDateWrapper.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -24,29 +24,31 @@
import net.objectlab.kit.datecalc.common.HolidayHandler;
/**
- * A Wrapper to handle any HolidayHandler<Date> types via a HolidayHandler<Calendar> delegate
- *
+ * A Wrapper to handle any HolidayHandler<Date> types via a HolidayHandler<Calendar>
+ * delegate
+ *
* @author Marcin Jekot
* @author $LastChangedBy$
* @version $Revision$ $Date$
- *
+ *
*/
public class HolidayHandlerDateWrapper implements HolidayHandler<Date> {
HolidayHandler<Calendar> delegate;
+
DateCalculator<Calendar> calculator;
-
- public HolidayHandlerDateWrapper(HolidayHandler<Calendar> holidayHandler, DateCalculator<Calendar> dateCalulator) {
+
+ public HolidayHandlerDateWrapper(final HolidayHandler<Calendar> holidayHandler, final DateCalculator<Calendar> dateCalulator) {
delegate = holidayHandler;
calculator = dateCalulator;
}
-
- public Date moveCurrentDate(DateCalculator<Date> calendar) {
+
+ public Date moveCurrentDate(final DateCalculator<Date> calendar) {
return delegate.moveCurrentDate(calculator).getTime();
}
public String getType() {
return delegate.getType();
}
-
+
}
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-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/JdkCalendarBaseDateCalculator.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -117,12 +117,13 @@
@Override
protected Calendar getNextIMMDate(final boolean forward, final Calendar startDate) {
- Calendar cal = (Calendar) startDate.clone();
+ final 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 (forward ^ cal.getTime().before(startDate) ||
+// cal.getTime().equals(startDate)) {
if ((forward && cal.after(startDate)) || (!forward && cal.before(startDate))) {
return cal;
}
@@ -175,17 +176,17 @@
}
@Override
- public JdkCalendarBaseDateCalculator combine(DateCalculator<Calendar> calendar) {
+ public JdkCalendarBaseDateCalculator combine(final DateCalculator<Calendar> calendar) {
return (JdkCalendarBaseDateCalculator) super.combine(calendar);
}
@Override
- public JdkCalendarBaseDateCalculator moveByTenor(Tenor tenor) {
+ public JdkCalendarBaseDateCalculator moveByTenor(final Tenor tenor) {
return (JdkCalendarBaseDateCalculator) super.moveByTenor(tenor);
}
@Override
- public JdkCalendarBaseDateCalculator moveByBusinessDays(int businessDays) {
+ public JdkCalendarBaseDateCalculator moveByBusinessDays(final int businessDays) {
return (JdkCalendarBaseDateCalculator) super.moveByBusinessDays(businessDays);
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/JdkDateBaseDateCalculator.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/JdkDateBaseDateCalculator.java 2006-09-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/JdkDateBaseDateCalculator.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -41,15 +41,15 @@
public class JdkDateBaseDateCalculator implements JdkDateCalculator {
private JdkCalendarBaseDateCalculator delegate;
-
+
public JdkDateBaseDateCalculator() {
delegate = new JdkCalendarBaseDateCalculator();
}
public JdkDateBaseDateCalculator(final String name, final Date startDate, final Set<Date> nonWorkingDays,
final HolidayHandler<Calendar> holidayHandler) {
- final Set<Calendar> nonWorkingCalendars = Utils.toCalendarSet(nonWorkingDays);
-
+ final Set<Calendar> nonWorkingCalendars = Utils.toCalendarSet(nonWorkingDays);
+
delegate = new JdkCalendarBaseDateCalculator(name, Utils.getCal(startDate), nonWorkingCalendars, holidayHandler);
delegate.setStartDate(Utils.getCal(startDate));
}
@@ -58,7 +58,7 @@
return delegate.getCurrentBusinessDate().getTime();
}
- public List<Date> getIMMDates(Date start, Date end) {
+ public List<Date> getIMMDates(final Date start, final Date end) {
return Utils.toDateList(delegate.getIMMDates(Utils.getCal(start), Utils.getCal(end)));
}
@@ -74,42 +74,42 @@
return delegate.getStartDate().getTime();
}
- public boolean isNonWorkingDay(Date date) {
+ public boolean isNonWorkingDay(final Date date) {
return delegate.isNonWorkingDay(Utils.getCal(date));
}
- public boolean isWeekend(Date date) {
+ public boolean isWeekend(final Date date) {
return delegate.isWeekend(Utils.getCal(date));
}
- public JdkDateBaseDateCalculator moveByBusinessDays(int businessDays) {
+ public JdkDateBaseDateCalculator moveByBusinessDays(final int businessDays) {
delegate = delegate.moveByBusinessDays(businessDays);
return this;
}
- public JdkDateBaseDateCalculator moveByDays(int days) {
+ public JdkDateBaseDateCalculator moveByDays(final int days) {
delegate = delegate.moveByDays(days);
return this;
}
- public JdkDateBaseDateCalculator moveByTenor(Tenor tenor) {
+ public JdkDateBaseDateCalculator moveByTenor(final Tenor tenor) {
delegate = delegate.moveByTenor(tenor);
return this;
}
- public Date setCurrentBusinessDate(Date date) {
+ public Date setCurrentBusinessDate(final Date date) {
return delegate.setCurrentBusinessDate(Utils.getCal(date)).getTime();
}
- public void setStartDate(Date startDate) {
+ public void setStartDate(final Date startDate) {
delegate.setStartDate(Utils.getCal(startDate));
}
public String getName() {
return delegate.getName();
}
-
- public void setName(String name) {
+
+ public void setName(final String name) {
delegate.setName(name);
}
@@ -117,7 +117,7 @@
return delegate.isCurrentDateNonWorking();
}
- public void setNonWorkingDays(Set<Date> holidays) {
+ public void setNonWorkingDays(final Set<Date> holidays) {
delegate.setNonWorkingDays(Utils.toCalendarSet(holidays));
}
@@ -125,24 +125,25 @@
return Utils.toDateSet(delegate.getNonWorkingDays());
}
- public void setWorkingWeek(WorkingWeek week) {
+ public void setWorkingWeek(final WorkingWeek week) {
delegate.setWorkingWeek(week);
}
public String getHolidayHandlerType() {
return delegate.getHolidayHandlerType();
}
-
- public void setHolidayHandler(HolidayHandler<Calendar> holidayHandler) {
+
+ public void setHolidayHandler(final HolidayHandler<Calendar> holidayHandler) {
delegate.setHolidayHandler(holidayHandler);
}
- public JdkDateBaseDateCalculator combine(DateCalculator<Date> calculator) {
+ public JdkDateBaseDateCalculator combine(final DateCalculator<Date> calculator) {
if (calculator == null || calculator == this) {
return this;
}
- if (delegate.getHolidayHandlerType() == null && calculator.getHolidayHandlerType() != null || delegate.getHolidayHandlerType() != null
+ if (delegate.getHolidayHandlerType() == null && calculator.getHolidayHandlerType() != null
+ || delegate.getHolidayHandlerType() != null
&& !delegate.getHolidayHandlerType().equals(calculator.getHolidayHandlerType())) {
throw new IllegalArgumentException("Combined Calendars cannot have different handler types");
}
@@ -150,6 +151,7 @@
final Set<Date> newSet = new HashSet<Date>();
newSet.addAll(Utils.toDateSet(delegate.getNonWorkingDays()));
newSet.addAll(calculator.getNonWorkingDays());
- return new JdkDateBaseDateCalculator(delegate.getName() + "/" + calculator.getName(), getStartDate(), newSet, delegate.getHolidayHandler());
+ return new JdkDateBaseDateCalculator(delegate.getName() + "/" + calculator.getName(), getStartDate(), newSet, delegate
+ .getHolidayHandler());
}
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/JdkDatePeriodCountCalculator.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/JdkDatePeriodCountCalculator.java 2006-09-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/JdkDatePeriodCountCalculator.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -4,6 +4,6 @@
import net.objectlab.kit.datecalc.common.PeriodCountCalculator;
-public interface JdkDatePeriodCountCalculator extends PeriodCountCalculator<Date>{
+public interface JdkDatePeriodCountCalculator extends PeriodCountCalculator<Date> {
}
\ No newline at end of file
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/ModifiedFollowingHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/ModifiedFollowingHandler.java 2006-09-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/ModifiedFollowingHandler.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -24,24 +24,24 @@
/**
* TODO javadoc
- *
+ *
* @author Marcin Jekot
* @author $LastChangedBy$
* @version $Revision$ $Date$
- *
+ *
*/
public class ModifiedFollowingHandler implements HolidayHandler<Calendar> {
- public Calendar moveCurrentDate(DateCalculator<Calendar> calendar) {
+ public Calendar moveCurrentDate(final DateCalculator<Calendar> calendar) {
return move(calendar, 1);
}
- protected Calendar move(DateCalculator<Calendar> calendar, int step) {
+ protected Calendar move(final DateCalculator<Calendar> calendar, int step) {
- final Calendar cal = (Calendar)calendar.getCurrentBusinessDate().clone();
+ final Calendar cal = (Calendar) calendar.getCurrentBusinessDate().clone();
- int month = cal.get(Calendar.MONTH);
-
+ final int month = cal.get(Calendar.MONTH);
+
while (calendar.isNonWorkingDay(cal)) {
cal.add(Calendar.DAY_OF_MONTH, step);
if (month != cal.get(Calendar.MONTH)) {
@@ -53,7 +53,7 @@
return cal;
}
-
+
public String getType() {
return HolidayHandlerType.MODIFIED_FOLLLOWING;
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/ModifiedPreceedingHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/ModifiedPreceedingHandler.java 2006-09-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/ModifiedPreceedingHandler.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -23,18 +23,20 @@
/**
* TODO javadoc
- *
+ *
* @author Marcin Jekot
* @author $LastChangedBy$
* @version $Revision$ $Date$
- *
+ *
*/
public class ModifiedPreceedingHandler extends ModifiedFollowingHandler {
- public Calendar moveCurrentDate(DateCalculator<Calendar> calendar) {
+ @Override
+ public Calendar moveCurrentDate(final DateCalculator<Calendar> calendar) {
return move(calendar, -1);
}
+ @Override
public String getType() {
return HolidayHandlerType.MODIFIED_PRECEEDING;
}
Modified: trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/DateCalculatorFactoryTest.java
===================================================================
--- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/DateCalculatorFactoryTest.java 2006-09-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/DateCalculatorFactoryTest.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -48,10 +48,12 @@
cal1 = DefaultJdkDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla", HolidayHandlerType.FORWARD);
Assert.assertEquals("Type", HolidayHandlerType.FORWARD, cal1.getHolidayHandlerType());
- cal1 = DefaultJdkDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLLOWING);
+ cal1 = DefaultJdkDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla",
+ HolidayHandlerType.MODIFIED_FOLLLOWING);
Assert.assertEquals("Type", HolidayHandlerType.MODIFIED_FOLLLOWING, cal1.getHolidayHandlerType());
- cal1 = DefaultJdkDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla", HolidayHandlerType.MODIFIED_PRECEEDING);
+ cal1 = DefaultJdkDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla",
+ HolidayHandlerType.MODIFIED_PRECEEDING);
Assert.assertEquals("Type", HolidayHandlerType.MODIFIED_PRECEEDING, cal1.getHolidayHandlerType());
}
Modified: trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDateBackwardDateCalculatorTest.java
===================================================================
--- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDateBackwardDateCalculatorTest.java 2006-09-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDateBackwardDateCalculatorTest.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -7,7 +7,7 @@
public class JdkDateBackwardDateCalculatorTest extends AbstractBackwardDateCalculatorTest {
@Override
- protected Object newDate(String date) {
+ protected Object newDate(final String date) {
return Utils.createDate(date);
}
Modified: trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDateDateCalculatorCombinationTest.java
===================================================================
--- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDateDateCalculatorCombinationTest.java 2006-09-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDateDateCalculatorCombinationTest.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -7,7 +7,7 @@
public class JdkDateDateCalculatorCombinationTest extends AbstractDateCalculatorCombinationTest {
@Override
- protected Object newDate(String date) {
+ protected Object newDate(final String date) {
return Utils.createDate(date);
}
Modified: trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDateForwardDateCalculatorTest.java
===================================================================
--- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDateForwardDateCalculatorTest.java 2006-09-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDateForwardDateCalculatorTest.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -7,7 +7,7 @@
public class JdkDateForwardDateCalculatorTest extends AbstractForwardDateCalculatorTest {
@Override
- protected Object newDate(String date) {
+ protected Object newDate(final String date) {
return Utils.createDate(date);
}
Modified: trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDateModifiedFollowingDateCalculatorTest.java
===================================================================
--- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDateModifiedFollowingDateCalculatorTest.java 2006-09-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDateModifiedFollowingDateCalculatorTest.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -7,7 +7,7 @@
public class JdkDateModifiedFollowingDateCalculatorTest extends AbstractModifiedFollowingDateCalculatorTest {
@Override
- protected Object newDate(String date) {
+ protected Object newDate(final String date) {
return Utils.createDate(date);
}
Modified: trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDateModifiedPreceedingDateCalculatorTest.java
===================================================================
--- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDateModifiedPreceedingDateCalculatorTest.java 2006-09-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkDateModifiedPreceedingDateCalculatorTest.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -7,7 +7,7 @@
public class JdkDateModifiedPreceedingDateCalculatorTest extends AbstractModifiedPreceedingDateCalculatorTest {
@Override
- protected Object newDate(String date) {
+ protected Object newDate(final String date) {
return Utils.createDate(date);
}
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ExcelDateUtil.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ExcelDateUtil.java 2006-09-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ExcelDateUtil.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -17,6 +17,7 @@
*/
package net.objectlab.kit.datecalc.joda;
+import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
@@ -60,12 +61,12 @@
* Excel date
* @see java.util.TimeZone
*/
- public static Date getJavaDate(double date, boolean use1904windowing) {
+ public static Date getJavaDate(final double date, final boolean use1904windowing) {
if (isValidExcelDate(date)) {
int startYear = 1900;
int dayAdjust = -1; // Excel thinks 2/29/1900 is a valid date, which
// it isn't
- int wholeDays = (int) Math.floor(date);
+ final int wholeDays = (int) Math.floor(date);
if (use1904windowing) {
startYear = 1904;
dayAdjust = 1; // 1904 date windowing uses 1/2/1904 as the
@@ -77,24 +78,24 @@
// representation
dayAdjust = 0;
}
- GregorianCalendar calendar = new GregorianCalendar(startYear, 0, wholeDays + dayAdjust);
- int millisecondsInDay = (int) ((date - Math.floor(date)) * (double) DAY_MILLISECONDS + 0.5);
- calendar.set(GregorianCalendar.MILLISECOND, millisecondsInDay);
+ final GregorianCalendar calendar = new GregorianCalendar(startYear, 0, wholeDays + dayAdjust);
+ final int millisecondsInDay = (int) ((date - Math.floor(date)) * DAY_MILLISECONDS + 0.5);
+ calendar.set(Calendar.MILLISECOND, millisecondsInDay);
return calendar.getTime();
} else {
return null;
}
}
- public static LocalDate getLocalDate(double date, boolean use1904windowing) {
+ public static LocalDate getLocalDate(final double date, final boolean use1904windowing) {
return new LocalDate(getJavaDate(date, use1904windowing));
}
- public static YearMonthDay getYearMonthDay(double date, boolean use1904windowing) {
+ public static YearMonthDay getYearMonthDay(final double date, final boolean use1904windowing) {
return new YearMonthDay(getJavaDate(date, use1904windowing));
}
- public static DateTime getDateTime(double date, boolean use1904windowing) {
+ public static DateTime getDateTime(final double date, final boolean use1904windowing) {
return new DateTime(getJavaDate(date, use1904windowing));
}
@@ -105,7 +106,7 @@
* @param value
* the double value
*/
- public static boolean isValidExcelDate(double value) {
+ public static boolean isValidExcelDate(final double value) {
return (value > -Double.MIN_VALUE);
}
}
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeek.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeek.java 2006-09-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeek.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -29,7 +29,7 @@
public static final JodaWorkingWeek DEFAULT = new JodaWorkingWeek();
public JodaWorkingWeek() {
- this((byte) DEFAULT_WORKING_DAYS);
+ this(DEFAULT_WORKING_DAYS);
}
private JodaWorkingWeek(final byte workingDays) {
@@ -39,12 +39,12 @@
public JodaWorkingWeek(final WorkingWeek ww) {
this.workingDays = ww.getWorkingDays();
}
-
+
public boolean isWorkingDay(final LocalDate date) {
- int dayOfWeek = jodaToCalendarDayConstant(date.getDayOfWeek());
+ final int dayOfWeek = jodaToCalendarDayConstant(date.getDayOfWeek());
return isWorkingDayFromCalendar(dayOfWeek);
}
-
+
/**
* Return a new JodaWorkingWeek if the status for the given day has changed.
*
@@ -61,7 +61,7 @@
public boolean isWorkingDayFromDateTimeConstant(final int dayOfWeek) {
return isWorkingDayFromCalendar(jodaToCalendarDayConstant(dayOfWeek));
}
-
+
public int jodaToCalendarDayConstant(int dayOfWeek) {
dayOfWeek++;
return (dayOfWeek <= 7 ? dayOfWeek : dayOfWeek % 7);
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-04 14:57:12 UTC (rev 95)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateCalculator.java 2006-09-04 15:01:20 UTC (rev 96)
@@ -50,7 +50,7 @@
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;
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java 2006...
[truncated message content] |
