From f01159468624f322b09bb3ee07852b43e45e9ff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Wed, 2 Dec 2009 18:51:59 +0100
Subject: [PATCH] ItEr37S08CUCreacionUnidadesPlanificacionItEr36S11: When
 activating recommended allocation previous allocations are removed

---
 .../web/planner/allocation/AllocationRowsHandler.java | 11 ++++++++++-
 .../web/planner/allocation/FormBinder.java            |  3 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

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 53d0a122c..eadc6176f 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
@@ -96,7 +96,7 @@ public class AllocationRowsHandler {
     }
 
     public List<AllocationRow> getCurrentRows() {
-        return new ArrayList<AllocationRow>(currentRows);
+        return currentRows;
     }
 
     private boolean alreadyExistsAllocationFor(Resource resource) {
@@ -240,4 +240,13 @@ public class AllocationRowsHandler {
         return date.toDateTimeAtStartOfDay().toDate();
     }
 
+    public void removeAll() {
+        for (AllocationRow each : copyOfCurrentRowsToAvoidConcurrentModification()) {
+            remove(each);
+        }
+    }
+
+    private ArrayList<AllocationRow> copyOfCurrentRowsToAvoidConcurrentModification() {
+        return new ArrayList<AllocationRow>(currentRows);
+    }
 }
\ No newline at end of file
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 5476eb6b6..62d08de64 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
@@ -39,6 +39,7 @@ import org.navalplanner.business.resources.entities.Criterion;
 import org.navalplanner.business.resources.entities.Resource;
 import org.navalplanner.web.common.IMessagesForUser;
 import org.navalplanner.web.common.Level;
+import org.navalplanner.web.common.Util;
 import org.navalplanner.web.planner.allocation.IResourceAllocationModel.IResourceAllocationContext;
 import org.navalplanner.web.resourceload.ResourceLoadModel;
 import org.zkoss.util.Locales;
@@ -380,6 +381,8 @@ class FormBinder {
     }
 
     private void activatingRecommendedAllocation() {
+        allocationRowsHandler.removeAll();
+        Util.reloadBindings(allocationsList);
     }
 
     private void deactivatingRecommendedAllocation() {