objectlabkit-svn

[Objectlabkit-svn] SF.net SVN: objectlabkit: [72] trunk/datecalc-joda/src

[<be...@us...>]

Revision: 72
          http://svn.sourceforge.net/objectlabkit/?rev=72&view=rev
Author:   benoitx
Date:     2006-09-01 07:34:19 -0700 (Fri, 01 Sep 2006)

Log Message:
-----------
Added test for Combination of Calendar with both LocalDate and YearMonthDay thanks to my extraordinarily simplified testing mechanism.

TODO: children of abstract test classes should use a delegate mechanism instead of CPC.

Modified Paths:
--------------
    trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/HolidayHandlerYearMonthDayWrapper.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/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/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

Added Paths:
-----------
    trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractDateCalculatorCombinationTest.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/YearMonthDayDateCalculatorCombinationTest.java

Removed Paths:
-------------
    trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateCalculatorCombinationTest.java

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-01 14:07:57 UTC (rev 71)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/HolidayHandlerYearMonthDayWrapper.java	2006-09-01 14:34:19 UTC (rev 72)
@@ -36,7 +36,8 @@
 
     private DateCalculator<YearMonthDay> calculator;
 
-    public HolidayHandlerYearMonthDayWrapper(final HolidayHandler<YearMonthDay> delegate, final DateCalculator<YearMonthDay> calculator) {
+    public HolidayHandlerYearMonthDayWrapper(final HolidayHandler<YearMonthDay> delegate,
+            final DateCalculator<YearMonthDay> calculator) {
         this.delegate = delegate;
         this.calculator = calculator;
     }

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-09-01 14:07:57 UTC (rev 71)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java	2006-09-01 14:34:19 UTC (rev 72)
@@ -68,7 +68,10 @@
      * is the date a non-working day according to the WorkingWeek?
      */
     public boolean isWeekend(final YearMonthDay date) {
-        return delegate.isWeekend(date.toLocalDate());
+        if (date != null) {
+            return delegate.isWeekend(date.toLocalDate());
+        }
+        return false;
     }
 
     public DateCalculator<YearMonthDay> moveByDays(final int days) {

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractBackwardDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractBackwardDateCalculatorTest.java	2006-09-01 14:07:57 UTC (rev 71)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractBackwardDateCalculatorTest.java	2006-09-01 14:34:19 UTC (rev 72)
@@ -200,14 +200,14 @@
         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"));
+        // 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(IllegalArgumentException e) {
+        } catch (final IllegalArgumentException e) {
             // ok
         }
         // checkDate("Add 1 week", cal.moveByDays(7), "2006-08-31");

Added: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractDateCalculatorCombinationTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractDateCalculatorCombinationTest.java	                        (rev 0)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractDateCalculatorCombinationTest.java	2006-09-01 14:34:19 UTC (rev 72)
@@ -0,0 +1,122 @@
+package net.objectlab.kit.datecalc.joda;
+
+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());
+    }
+}

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractDateTestCase.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractDateTestCase.java	2006-09-01 14:07:57 UTC (rev 71)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractDateTestCase.java	2006-09-01 14:34:19 UTC (rev 72)
@@ -16,4 +16,10 @@
     }
 
     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);
 }

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractModifiedPreceedingDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractModifiedPreceedingDateCalculatorTest.java	2006-09-01 14:07:57 UTC (rev 71)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractModifiedPreceedingDateCalculatorTest.java	2006-09-01 14:34:19 UTC (rev 72)
@@ -189,10 +189,9 @@
         checkDate("23/12 + 1", cal.moveByDays(1), "2006-12-22");
     }
 
-   
     /**
      * @todo How to handle moveByBusDays if it moves backwards...
-     *
+     * 
      */
     public void testMoveByBusinessDays() {
         final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_PRECEEDING);
@@ -202,19 +201,20 @@
         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"));
+        // 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(IllegalArgumentException e) {
+        } 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");
+        // 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");
 
     }
 

Deleted: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateCalculatorCombinationTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateCalculatorCombinationTest.java	2006-09-01 14:07:57 UTC (rev 71)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateCalculatorCombinationTest.java	2006-09-01 14:34:19 UTC (rev 72)
@@ -1,137 +0,0 @@
-package net.objectlab.kit.datecalc.joda;
-
-import junit.framework.Assert;
-import net.objectlab.kit.datecalc.common.DateCalculator;
-import net.objectlab.kit.datecalc.common.HolidayHandlerType;
-
-import org.joda.time.LocalDate;
-
-public class DateCalculatorCombinationTest extends AbstractDateCalculatorTest {
-
-    public void testInvalidCombinationDiffHandler() {
-        final DateCalculator<LocalDate> cal1 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla",
-                HolidayHandlerType.BACKWARD);
-        final DateCalculator<LocalDate> cal2 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("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<LocalDate> cal1 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla",
-                null);
-        final DateCalculator<LocalDate> cal2 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("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<LocalDate> cal1 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla",
-                HolidayHandlerType.FORWARD);
-        final DateCalculator<LocalDate> cal2 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("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() {
-        DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays("UK", createUKHolidays());
-        final DateCalculator<LocalDate> cal1 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla",
-                HolidayHandlerType.FORWARD);
-        final LocalDate localDate = new LocalDate("2006-08-08");
-        cal1.setStartDate(localDate);
-        final DateCalculator<LocalDate> cal2 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("UK",
-                HolidayHandlerType.FORWARD);
-
-        final DateCalculator<LocalDate> 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() {
-        DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays("UK", createUKHolidays());
-        DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays("UK", createUKHolidays());
-        final DateCalculator<LocalDate> cal1 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("UK",
-                HolidayHandlerType.FORWARD);
-        final LocalDate localDate = new LocalDate("2006-08-08");
-        cal1.setStartDate(localDate);
-        final DateCalculator<LocalDate> cal2 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("UK",
-                HolidayHandlerType.FORWARD);
-
-        final DateCalculator<LocalDate> 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() {
-        DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays("UK", createUKHolidays());
-        DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays("US", createUSHolidays());
-        final DateCalculator<LocalDate> cal1 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("US",
-                HolidayHandlerType.FORWARD);
-        final LocalDate localDate = new LocalDate("2006-08-08");
-        cal1.setStartDate(localDate);
-        final DateCalculator<LocalDate> cal2 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("UK",
-                HolidayHandlerType.FORWARD);
-
-        final DateCalculator<LocalDate> 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() {
-        DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays("US", createUSHolidays());
-        final DateCalculator<LocalDate> cal1 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("US",
-                HolidayHandlerType.FORWARD);
-        final LocalDate localDate = new LocalDate("2006-08-08");
-        cal1.setStartDate(localDate);
-
-        final DateCalculator<LocalDate> 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() {
-        DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays("US", createUSHolidays());
-        final DateCalculator<LocalDate> cal1 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("US",
-                HolidayHandlerType.FORWARD);
-        final LocalDate localDate = new LocalDate("2006-08-08");
-        cal1.setStartDate(localDate);
-
-        final DateCalculator<LocalDate> 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());
-    }
-}

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardDateCalculatorTest.java	2006-09-01 14:07:57 UTC (rev 71)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardDateCalculatorTest.java	2006-09-01 14:34:19 UTC (rev 72)
@@ -51,4 +51,29 @@
         holidays.add(newDate("2006-12-26"));
         return holidays;
     }
+
+    @Override
+    protected Set<LocalDate> createUKHolidays() {
+        final Set<LocalDate> uk = new HashSet<LocalDate>();
+        uk.add(new LocalDate("2006-01-01"));
+        uk.add(new LocalDate("2006-08-28"));
+        uk.add(new LocalDate("2006-12-25"));
+        uk.add(new LocalDate("2006-12-26"));
+        return uk;
+    }
+
+    @Override
+    protected Set<LocalDate> createUSHolidays() {
+        final Set<LocalDate> us = new HashSet<LocalDate>();
+        us.add(new LocalDate("2006-07-04"));
+        us.add(new LocalDate("2006-11-28"));
+        us.add(new LocalDate("2006-12-25"));
+        return us;
+    }
+
+    @Override
+    protected void registerHolidays(final String name, final Set<LocalDate> holidays) {
+        DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays(name, holidays);
+    }
+
 }

Added: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateDateCalculatorCombinationTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateDateCalculatorCombinationTest.java	                        (rev 0)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateDateCalculatorCombinationTest.java	2006-09-01 14:34:19 UTC (rev 72)
@@ -0,0 +1,79 @@
+/*
+ * $Id: org.eclipse.jdt.ui.prefs 59 2006-08-26 09:06:39Z marchy $
+ * 
+ * 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 java.util.HashSet;
+import java.util.Set;
+
+import net.objectlab.kit.datecalc.common.DateCalculator;
+
+import org.joda.time.LocalDate;
+
+/**
+ * 
+ * @author xhensevb
+ * @author $LastChangedBy: marchy $
+ * @version $Revision: 59 $ $Date: 2006-08-26 11:06:39 +0200 (Sat, 26 Aug 2006) $
+ * 
+ */
+public class LocalDateDateCalculatorCombinationTest extends AbstractDateCalculatorCombinationTest<LocalDate> {
+
+    @Override
+    protected LocalDate newDate(final String date) {
+        return new LocalDate(date);
+    }
+
+    @Override
+    protected DateCalculator<LocalDate> newDateCalculator(final String name, final String type) {
+        return DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator(name, type);
+    }
+
+    @Override
+    protected Set<LocalDate> newHolidaysSet() {
+        final Set<LocalDate> holidays = new HashSet<LocalDate>();
+        holidays.add(newDate("2006-08-28"));
+        holidays.add(newDate("2006-12-25"));
+        holidays.add(newDate("2006-12-26"));
+        return holidays;
+    }
+
+    @Override
+    protected Set<LocalDate> createUKHolidays() {
+        final Set<LocalDate> uk = new HashSet<LocalDate>();
+        uk.add(new LocalDate("2006-01-01"));
+        uk.add(new LocalDate("2006-08-28"));
+        uk.add(new LocalDate("2006-12-25"));
+        uk.add(new LocalDate("2006-12-26"));
+        return uk;
+    }
+
+    @Override
+    protected Set<LocalDate> createUSHolidays() {
+        final Set<LocalDate> us = new HashSet<LocalDate>();
+        us.add(new LocalDate("2006-07-04"));
+        us.add(new LocalDate("2006-11-28"));
+        us.add(new LocalDate("2006-12-25"));
+        return us;
+    }
+
+    @Override
+    protected void registerHolidays(final String name, final Set<LocalDate> holidays) {
+        DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays(name, holidays);
+    }
+
+}

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateForwardDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateForwardDateCalculatorTest.java	2006-09-01 14:07:57 UTC (rev 71)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateForwardDateCalculatorTest.java	2006-09-01 14:34:19 UTC (rev 72)
@@ -51,4 +51,29 @@
         holidays.add(newDate("2006-12-26"));
         return holidays;
     }
+
+    @Override
+    protected Set<LocalDate> createUKHolidays() {
+        final Set<LocalDate> uk = new HashSet<LocalDate>();
+        uk.add(new LocalDate("2006-01-01"));
+        uk.add(new LocalDate("2006-08-28"));
+        uk.add(new LocalDate("2006-12-25"));
+        uk.add(new LocalDate("2006-12-26"));
+        return uk;
+    }
+
+    @Override
+    protected Set<LocalDate> createUSHolidays() {
+        final Set<LocalDate> us = new HashSet<LocalDate>();
+        us.add(new LocalDate("2006-07-04"));
+        us.add(new LocalDate("2006-11-28"));
+        us.add(new LocalDate("2006-12-25"));
+        return us;
+    }
+
+    @Override
+    protected void registerHolidays(final String name, final Set<LocalDate> holidays) {
+        DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays(name, holidays);
+    }
+
 }

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingDateCalculatorTest.java	2006-09-01 14:07:57 UTC (rev 71)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingDateCalculatorTest.java	2006-09-01 14:34:19 UTC (rev 72)
@@ -51,4 +51,29 @@
         holidays.add(newDate("2006-12-26"));
         return holidays;
     }
+
+    @Override
+    protected Set<LocalDate> createUKHolidays() {
+        final Set<LocalDate> uk = new HashSet<LocalDate>();
+        uk.add(new LocalDate("2006-01-01"));
+        uk.add(new LocalDate("2006-08-28"));
+        uk.add(new LocalDate("2006-12-25"));
+        uk.add(new LocalDate("2006-12-26"));
+        return uk;
+    }
+
+    @Override
+    protected Set<LocalDate> createUSHolidays() {
+        final Set<LocalDate> us = new HashSet<LocalDate>();
+        us.add(new LocalDate("2006-07-04"));
+        us.add(new LocalDate("2006-11-28"));
+        us.add(new LocalDate("2006-12-25"));
+        return us;
+    }
+
+    @Override
+    protected void registerHolidays(final String name, final Set<LocalDate> holidays) {
+        DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays(name, holidays);
+    }
+
 }

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecal...
 
[truncated message content]

[Objectlabkit-svn] SF.net SVN: objectlabkit: [84] trunk/datecalc-joda/src

[<ma...@us...>]

Revision: 84
          http://svn.sourceforge.net/objectlabkit/?rev=84&view=rev
Author:   marchy
Date:     2006-09-03 09:54:15 -0700 (Sun, 03 Sep 2006)

Log Message:
-----------
Fixed problem with refactored JodaWorkingWeek.

Modified Paths:
--------------
    trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeek.java
    trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeekTest.java

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-03 11:39:24 UTC (rev 83)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeek.java	2006-09-03 16:54:15 UTC (rev 84)
@@ -41,7 +41,8 @@
     }
     
     public boolean isWorkingDay(final LocalDate date) {
-        return isWorkingDayFromCalendar(date.getDayOfWeek());
+        int dayOfWeek = jodaToCalendarDayConstant(date.getDayOfWeek());
+        return isWorkingDayFromCalendar(dayOfWeek);
     }
     
     /**
@@ -52,7 +53,8 @@
      * @param dayOfWeek
      *            e.g. DateTimeConstants.MONDAY, DateTimeConstants.TUESDAY, etc
      */
-    public JodaWorkingWeek withWorkingDayFromDateTimeConstant(final boolean working, final int dayOfWeek) {
+    public JodaWorkingWeek withWorkingDayFromDateTimeConstant(final boolean working, int dayOfWeek) {
+        dayOfWeek = jodaToCalendarDayConstant(dayOfWeek);
         return new JodaWorkingWeek(super.withWorkingDayFromCalendar(working, dayOfWeek));
     }
 

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeekTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeekTest.java	2006-09-03 11:39:24 UTC (rev 83)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeekTest.java	2006-09-03 16:54:15 UTC (rev 84)
@@ -96,6 +96,9 @@
         // do
         // it
         // twice
+        Assert.assertFalse("2/ DateTimeConstants.SATURDAY", ww.isWorkingDayFromDateTimeConstant(DateTimeConstants.SATURDAY));
+        Assert.assertTrue("2/ DateTimeConstants.SUNDAY", ww.isWorkingDayFromDateTimeConstant(DateTimeConstants.SUNDAY));
+
     }
     
     public void testJodaToCalendarDayConstant() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Objectlabkit-svn] SF.net SVN: objectlabkit: [146] trunk/datecalc-joda/src

[<ma...@us...>]

Revision: 146
          http://svn.sourceforge.net/objectlabkit/?rev=146&view=rev
Author:   marchy
Date:     2006-09-10 07:56:37 -0700 (Sun, 10 Sep 2006)

Log Message:
-----------
updated licence comment on .java files.

at the moment none of the test files have javadoc/licence, let me know if you want them to have, and i'll update

Modified Paths:
--------------
    trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeek.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/LocalDateCalculator.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/LocalDateIMMDateCalculator.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/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/YearMonthDayDateCalculator.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/YearMonthDayIMMDateCalculator.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/YearMonthDayModifiedPreceedingHandler.java
    trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayPeriodCountCalculator.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/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/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
    trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayPeriodCountCalculatorTest.java

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-10 14:51:14 UTC (rev 145)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeek.java	2006-09-10 14:56:37 UTC (rev 146)
@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ * 
  * Copyright 2006 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not

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-10 14:51:14 UTC (rev 145)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardHandler.java	2006-09-10 14:56:37 UTC (rev 146)
@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ * 
  * Copyright 2006 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not

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-10 14:51:14 UTC (rev 145)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateCalculator.java	2006-09-10 14:56:37 UTC (rev 146)
@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ * 
  * Copyright 2006 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not

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-10 14:51:14 UTC (rev 145)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateForwardHandler.java	2006-09-10 14:56:37 UTC (rev 146)
@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ * 
  * Copyright 2006 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not

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-10 14:51:14 UTC (rev 145)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateIMMDateCalculator.java	2006-09-10 14:56:37 UTC (rev 146)
@@ -1,3 +1,20 @@
+/*
+ * $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.joda;
 
 import java.util.ArrayList;

Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateKitCalculatorsFactory.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateKitCalculatorsFactory.java	2006-09-10 14:51:14 UTC (rev 145)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateKitCalculatorsFactory.java	2006-09-10 14:56:37 UTC (rev 146)
@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ * 
  * Copyright 2006 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not

Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingHandler.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingHandler.java	2006-09-10 14:51:14 UTC (rev 145)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingHandler.java	2006-09-10 14:56:37 UTC (rev 146)
@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ * 
  * Copyright 2006 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not

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-10 14:51:14 UTC (rev 145)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculator.java	2006-09-10 14:56:37 UTC (rev 146)
@@ -1,3 +1,20 @@
+/*
+ * $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.joda;
 
 import net.objectlab.kit.datecalc.common.PeriodCountBasis;

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-10 14:51:14 UTC (rev 145)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayBackwardHandler.java	2006-09-10 14:56:37 UTC (rev 146)
@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ * 
  * Copyright 2006 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not

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-09-10 14:51:14 UTC (rev 145)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java	2006-09-10 14:56:37 UTC (rev 146)
@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ * 
  * Copyright 2006 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not

Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardHandler.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardHandler.java	2006-09-10 14:51:14 UTC (rev 145)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardHandler.java	2006-09-10 14:56:37 UTC (rev 146)
@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ * 
  * Copyright 2006 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not

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-10 14:51:14 UTC (rev 145)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayIMMDateCalculator.java	2006-09-10 14:56:37 UTC (rev 146)
@@ -1,3 +1,20 @@
+/*
+ * $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.joda;
 
 import java.util.ArrayList;

Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayKitCalculatorsFactory.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayKitCalculatorsFactory.java	2006-09-10 14:51:14 UTC (rev 145)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayKitCalculatorsFactory.java	2006-09-10 14:56:37 UTC (rev 146)
@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ * 
  * Copyright 2006 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not

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-10 14:51:14 UTC (rev 145)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPreceedingHandler.java	2006-09-10 14:56:37 UTC (rev 146)
@@ -1,4 +1,6 @@
 /*
+ * $Id$
+ * 
  * Copyright 2006 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not

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-10 14:51:14 UTC (rev 145)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayPeriodCountCalculator.java	2006-09-10 14:56:37 UTC (rev 146)
@@ -1,3 +1,20 @@
+/*
+ * $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.joda;
 
 import net.objectlab.kit.datecalc.common.PeriodCountBasis;

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeekTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeekTest.java	2006-09-10 14:51:14 UTC (rev 145)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeekTest.java	2006-09-10 14:56:37 UTC (rev 146)
@@ -1,18 +1,3 @@
-/*
- * 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 java.util.Calendar;
@@ -23,9 +8,6 @@
 import org.joda.time.DateTimeConstants;
 import org.joda.time.LocalDate;
 
-/**
- * @author Benoit Xhenseval
- */
 public class JodaWorkingWeekTest extends TestCase {
 
     private JodaWorkingWeek ww;

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardDateCalculatorTest.java	2006-09-10 14:51:14 UTC (rev 145)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardDateCalculatorTest.java	2006-09-10 14:56:37 UTC (rev 146)
@@ -1,20 +1,3 @@
-/*
- * $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.joda;
 
 import net.objectlab.kit.datecalc.common.AbstractBackwardDateCalculatorTest;
@@ -23,13 +6,6 @@
 
 import org.joda.time.LocalDate;
 
-/**
- * 
- * @author xhensevb
- * @author $LastChangedBy$
- * @version $Revision$ $Date$
- * 
- */
 public class LocalDateBackwardDateCalculatorTest extends AbstractBackwardDateCalculatorTest<LocalDate> {
 
     @Override

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateDateCalculatorCombinationTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateDateCalculatorCombinationTest.java	2006-09-10 14:51:14 UTC (rev 145)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateDateCalculatorCombinationTest.java	2006-09-10 14:56:37 UTC (rev 146)
@@ -1,20 +1,3 @@
-/*
- * $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.joda;
 
 import net.objectlab.kit.datecalc.common.AbstractDateCalculatorCombinationTest;
@@ -23,13 +6,6 @@
 
 import org.joda.time.LocalDate;
 
-/**
- * 
- * @author xhensevb
- * @author $LastChangedBy$
- * @version $Revision$ $Date$
- * 
- */
 public class LocalDateDateCalculatorCombinationTest extends AbstractDateCalculatorCombinationTest<LocalDate> {
 
     @Override

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateForwardDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateForwardDateCalculatorTest.java	2006-09-10 14:51:14 UTC (rev 145)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateForwardDateCalculatorTest.java	2006-09-10 14:56:37 UTC (rev 146)
@@ -1,20 +1,3 @@
-/*
- * $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.joda;
 
 import net.objectlab.kit.datecalc.common.AbstractForwardDateCalculatorTest;
@@ -23,13 +6,6 @@
 
 import org.joda.time.LocalDate;
 
-/**
- * 
- * @author xhensevb
- * @author $LastChangedBy$
- * @version $Revision$ $Date$
- * 
- */
 public class LocalDateForwardDateCalculatorTest extends AbstractForwardDateCalculatorTest<LocalDate> {
 
     @Override

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingDateCalculatorTest.java	2006-09-10 14:51:14 UTC (rev 145)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingDateCalculatorTest.java	2006-09-10 14:56:37 UTC (rev 146)
@@ -1,20 +1,3 @@
-/*
- * $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.joda;
 
 import net.objectlab.kit.datecalc.common.AbstractModifiedFollowingDateCalculatorTest;
@@ -23,13 +6,6 @@
 
 import org.joda.time.LocalDate;
 
-/**
- * 
- * @author xhensevb
- * @author $LastChangedBy$
- * @version $Revision$ $Date$
- * 
- */
 public class LocalDateModifiedFollowingDateCalculatorTest extends AbstractModifiedFollowingDateCalculatorTest<LocalDate> {
 
     @Override

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingDateCalculatorTest.java	2006-09-10 14:51:14 UTC (rev 145)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingDateCalculatorTest.java	2006-09-10 14:56:37 UTC (rev 146)
@@ -1,20 +1,3 @@
-/*
- * $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.joda;
 
 import net.objectlab.kit.datecalc.common.AbstractModifiedPreceedingDateCalculatorTest;
@@ -23,13 +6,6 @@
 
 import org.joda.time.LocalDate;
 
-/**
- * 
- * @author xhensevb
- * @author $LastChangedBy$
- * @version $Revision$ $Date$
- * 
- */
 public class LocalDateModifiedPreceedingDateCalculatorTest extends AbstractModifiedPreceedingDateCalculatorTest<LocalDate> {
 
     @Override

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculatorTest.java	2006-09-10 14:51:14 UTC (rev 145)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculatorTest.java	2006-09-10 14:56:37 UTC (rev 146)
@@ -1,20 +1,3 @@
-/*
- * $Id$
- * Copyright 2006 the original author or authors.
- * 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.AbstractPeriodCountCalculatorTest;

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayBackwardDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayBackwardDateCalculatorTest.java	2006-09-10 14:51:14 UTC (rev 145)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayBackwardDateCalculatorTest.java	2006-09-10 14:56:37 UTC (rev 146)
@@ -1,20 +1,3 @@
-/*
- * $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.joda;
 
 import java.util.Set;
@@ -25,13 +8,6 @@
 
 import org.joda.time.YearMonthDay;
 
-/**
- * 
- * @author xhensevb
- * @author $LastChangedBy$
- * @version $Revision$ $Date$
- * 
- */
 public class YearMonthDayBackwardDateCalculatorTest extends AbstractBackwardDateCalculatorTest<YearMonthDay> {
 
     @Override

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculatorCombinationTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculatorCombinationTest.java	2006-09-10 14:51:14 UTC (rev 145)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculatorCombinationTest.java	2006-09-10 14:56:37 UTC (rev 146)
@@ -1,20 +1,3 @@
-/*
- * $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.joda;
 
 import java.util.Set;
@@ -25,13 +8,6 @@
 
 import org.joda.time.YearMonthDay;
 
-/**
- * 
- * @author xhensevb
- * @author $LastChangedBy$
- * @version $Revision$ $Date$
- * 
- */
 public class YearMonthDayDateCalculatorCombinationTest extends AbstractDateCalculatorCombinationTest<YearMonthDay> {
 
     @Override

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardDateCalculatorTest.java	2006-09-10 14:51:14 UTC (rev 145)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardDateCalculatorTest.java	2006-09-10 14:56:37 UTC (rev 146)
@@ -1,20 +1,3 @@
-/*
- * $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.joda;
 
 import java.util.Set;
@@ -25,13 +8,6 @@
 
 import org.joda.time.YearMonthDay;
 
-/**
- * 
- * @author xhensevb
- * @author $LastChangedBy$
- * @version $Revision$ $Date$
- * 
- */
 public class YearMonthDayForwardDateCalculatorTest extends AbstractForwardDateCalculatorTest<YearMonthDay> {
 
     @Override

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingDateCalculatorTest.java	2006-09-10 14:51:14 UTC (rev 145)
+++ trunk/da...
 
[truncated message content]

[Objectlabkit-svn] SF.net SVN: objectlabkit: [183] trunk/datecalc-joda/src

[<ma...@us...>]

Revision: 183
          http://svn.sourceforge.net/objectlabkit/?rev=183&view=rev
Author:   marchy
Date:     2006-09-16 09:49:25 -0700 (Sat, 16 Sep 2006)

Log Message:
-----------
Fixed the excel date problem in joda in other timezones

Modified Paths:
--------------
    trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaExcelDateUtil.java
    trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateTimeExcelDateUtilTest.java

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-15 06:53:50 UTC (rev 182)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaExcelDateUtil.java	2006-09-16 16:49:25 UTC (rev 183)
@@ -17,7 +17,7 @@
  */
 package net.objectlab.kit.datecalc.joda;
 
-import java.util.Date;
+import java.util.Calendar;
 
 import net.objectlab.kit.datecalc.common.ExcelDateUtil;
 
@@ -39,26 +39,39 @@
     }
 
     public static LocalDate getLocalDate(final double date, final boolean use1904windowing) {
-        final Date javaDate = ExcelDateUtil.getJavaDate(date, use1904windowing);
-        if (javaDate == null) {
+        final Calendar c = ExcelDateUtil.getJavaCalendar(date, use1904windowing);
+        
+        if (c == null) {
             return null;
         }
-        return new LocalDate(javaDate);
+        
+        return new LocalDate()
+                .withYear(c.get(Calendar.YEAR))
+                .withMonthOfYear(c.get(Calendar.MONTH) + 1)
+                .withDayOfMonth(c.get(Calendar.DAY_OF_MONTH));
     }
 
     public static YearMonthDay getYearMonthDay(final double date, final boolean use1904windowing) {
-        final Date javaDate = ExcelDateUtil.getJavaDate(date, use1904windowing);
-        if (javaDate == null) {
+        final Calendar c = ExcelDateUtil.getJavaCalendar(date, use1904windowing);
+        
+        if (c == null) {
             return null;
         }
-        return new YearMonthDay(javaDate);
+        
+        return new YearMonthDay(c.get(Calendar.YEAR), c.get(Calendar.MONTH) + 1, c.get(Calendar.DAY_OF_MONTH));
     }
 
     public static DateTime getDateTime(final double date, final boolean use1904windowing) {
-        final Date javaDate = ExcelDateUtil.getJavaDate(date, use1904windowing);
-        if (javaDate == null) {
+        final Calendar c = ExcelDateUtil.getJavaCalendar(date, use1904windowing);
+        
+        if (c == null) {
             return null;
         }
-        return new DateTime(javaDate);
+        
+        return new DateTime()
+                .withYear(c.get(Calendar.YEAR))
+                .withMonthOfYear(c.get(Calendar.MONTH) + 1)
+                .withDayOfMonth(c.get(Calendar.DAY_OF_MONTH))
+                .withMillisOfDay(0);
     }
 }

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateTimeExcelDateUtilTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateTimeExcelDateUtilTest.java	2006-09-15 06:53:50 UTC (rev 182)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateTimeExcelDateUtilTest.java	2006-09-16 16:49:25 UTC (rev 183)
@@ -1,7 +1,6 @@
 package net.objectlab.kit.datecalc.joda;
 
 import net.objectlab.kit.datecalc.common.AbstractExcelDateUtilTest;
-import net.objectlab.kit.datecalc.common.Utils;
 
 import org.joda.time.DateTime;
 
@@ -9,7 +8,7 @@
 
     @Override
     protected DateTime createDate(final String str) {
-        return new DateTime(Utils.createDate(str));
+        return new DateTime(str);
     }
 
     @Override


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.