From 2c34b39ef673597e14f21d444d1f1ab4a05548fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Tue, 2 Mar 2010 20:13:41 +0100
Subject: [PATCH] ItEr49S04ValidacionEProbasFuncionaisItEr48S04: When going
 from an AdvancedAllocation form checking the restrictions with the initial
 values.

---
 .../taskedition/EditTaskController.java       | 51 +++++++++++--------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java
index 3f88318f8..606da356c 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/EditTaskController.java
@@ -279,9 +279,37 @@ public class EditTaskController extends GenericForwardComposer {
             IAdvanceAllocationResultReceiver {
 
         private final AllocationResult allocation;
+        private final IRestrictionSource restrictionSource;
 
         private AdvanceAllocationResultReceiver(AllocationResult allocation) {
             this.allocation = allocation;
+            final int totalHours = allocation.getAggregate().getTotalHours();
+            final LocalDate start = allocation.getStart();
+            final LocalDate end = start.plusDays(allocation.getDaysDuration());
+            final CalculatedValue calculatedValue = allocation
+                    .getCalculatedValue();
+            restrictionSource = new IRestrictionSource() {
+
+                @Override
+                public int getTotalHours() {
+                    return totalHours;
+                }
+
+                @Override
+                public LocalDate getStart() {
+                    return start;
+                }
+
+                @Override
+                public LocalDate getEnd() {
+                    return end;
+                }
+
+                @Override
+                public CalculatedValue getCalculatedValue() {
+                    return calculatedValue;
+                }
+            };
         }
 
         @Override
@@ -296,28 +324,7 @@ public class EditTaskController extends GenericForwardComposer {
 
         @Override
         public Restriction createRestriction() {
-            return Restriction.build(new IRestrictionSource() {
-
-                @Override
-                public int getTotalHours() {
-                    return allocation.getAggregate().getTotalHours();
-                }
-
-                @Override
-                public LocalDate getStart() {
-                    return allocation.getStart();
-                }
-
-                @Override
-                public LocalDate getEnd() {
-                    return getStart().plusDays(allocation.getDaysDuration());
-                }
-
-                @Override
-                public CalculatedValue getCalculatedValue() {
-                    return allocation.getCalculatedValue();
-                }
-            });
+            return Restriction.build(restrictionSource);
         }
     }