From dc32e27e259ff980b0dad167e33b6d473b8e87f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Mon, 21 Dec 2009 14:37:15 +0100
Subject: [PATCH] ItEr40S05ValidacionEProbasFuncionaisItEr39S05:
 datePosteriorOrEqualToStartDate constraint uses local dates for comparison.

---
 .../web/planner/allocation/AllocationRowsHandler.java      | 6 +++---
 .../navalplanner/web/planner/allocation/FormBinder.java    | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRowsHandler.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRowsHandler.java
index dd6fc39a4..6a19fd8aa 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRowsHandler.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRowsHandler.java
@@ -264,12 +264,12 @@ public class AllocationRowsHandler {
     }
 
     public Date getEnd() {
-        LocalDate start = new LocalDate(getStartDate());
+        LocalDate start = getStartDate();
         return toDate(start.plusDays(getDaysDuration()));
     }
 
-    public Date getStartDate() {
-        return task.getStartDate();
+    public LocalDate getStartDate() {
+        return new LocalDate(task.getStartDate());
     }
 
     private Date toDate(LocalDate date) {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java
index 43a374141..ea22ab037 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java
@@ -286,8 +286,8 @@ class FormBinder {
             public void validate(Component comp, Object value)
                     throws WrongValueException {
                 Date date = (Date) value;
-                Date startDate = allocationRowsHandler.getStartDate();
-                if (date.before(startDate)) {
+                LocalDate startDate = allocationRowsHandler.getStartDate();
+                if (new LocalDate(date).isBefore(startDate)) {
                     throw new WrongValueException(comp, _(
                             "{0} must not be before {1}", date, startDate));
                 }
@@ -463,8 +463,7 @@ class FormBinder {
     public void markEndDateMustBeAfterStartDate() {
         DateTimeFormatter formatter = ISODateTimeFormat.basicDate().withLocale(
                 Locales.getCurrent());
-        LocalDate start = new LocalDate(allocationRowsHandler
-                .getStartDate());
+        LocalDate start = allocationRowsHandler.getStartDate();
         throw new WrongValueException(endDate, _(
                 "end date: {0} must be after start date: {1}",
                 getAllocationEnd().toString(formatter), start