From 36c198c841d658fb4bfaa661f2cdefa66f45ec61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Mon, 14 Sep 2009 20:33:47 +0200
Subject: [PATCH] ItEr26S07CUAsignacionGrupoRecursosAPlanificacionItEr25S07:
 Replacing setTasks method for init method

---
 .../allocation/IResourceAllocationModel.java  | 23 ++++---------
 .../ResourceAllocationController.java         |  4 +--
 .../allocation/ResourceAllocationModel.java   | 34 ++++++++-----------
 3 files changed, 23 insertions(+), 38 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IResourceAllocationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IResourceAllocationModel.java
index e3db3d6be..409594efa 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IResourceAllocationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IResourceAllocationModel.java
@@ -73,22 +73,6 @@ public interface IResourceAllocationModel {
     void removeSpecificResourceAllocation(
             SpecificResourceAllocation resourceAllocation);
 
-    /**
-     * Sets the current Gantt {@link org.zkoss.ganttz.data.Task ganttTask},
-     * where the user is allocating resources.
-     *
-     * @param ganttTask
-     */
-    void setGanttTask(org.zkoss.ganttz.data.Task ganttTask);
-
-    /**
-     * Sets the current {@link Task}, where the user is allocating resources.
-     *
-     * @param task
-     *            A {@link Task}
-     */
-    void setTask(Task task);
-
     /**
      * Cancel operation
      */
@@ -99,4 +83,11 @@ public interface IResourceAllocationModel {
      */
     void save();
 
+    /**
+     * Starts the use case
+     * @param task
+     * @param ganttTask
+     */
+    void initAllocationsFor(Task task, org.zkoss.ganttz.data.Task ganttTask);
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java
index c232443fe..2063fcab0 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java
@@ -71,9 +71,7 @@ public class ResourceAllocationController extends GenericForwardComposer {
      * @param ganttTask
      */
     public void showWindow(Task task, org.zkoss.ganttz.data.Task ganttTask) {
-        resourceAllocationModel.setTask(task);
-        resourceAllocationModel.setGanttTask(ganttTask);
-
+        resourceAllocationModel.initAllocationsFor(task, ganttTask);
         resourceAllocationModel
                 .addGenericResourceAllocationIfNoAllocationExists();
         Util.reloadBindings(window);
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java
index 105a8f56f..5eceec71b 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java
@@ -57,20 +57,6 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
         return task;
     }
 
-    @Override
-    @Transactional(readOnly = true)
-    public void setTask(Task task) {
-        if (!taskElementDAO.exists(task.getId())) {
-            this.task = task;
-            return;
-        }
-        this.task = findFromDB(task);
-        reattachResourceAllocations(this.task.getResourceAllocations());
-        hoursGroupDAO.save(this.task.getHoursGroup());
-        reattachHoursGroup(this.task.getHoursGroup());
-        reattachCriterions(this.task.getHoursGroup().getCriterions());
-    }
-
     private Task findFromDB(Task task) {
         try {
             return (Task) taskElementDAO.find(task.getId());
@@ -223,11 +209,6 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
         }
     }
 
-    @Override
-    public void setGanttTask(org.zkoss.ganttz.data.Task ganttTask) {
-        this.ganttTask = ganttTask;
-    }
-
     @Override
     public void cancel() {
         task.clearResourceAllocations();
@@ -239,4 +220,19 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
         taskElementDAO.save(task);
     }
 
+    @Override
+    public void initAllocationsFor(Task task,
+            org.zkoss.ganttz.data.Task ganttTask) {
+        this.ganttTask = ganttTask;
+        if (!taskElementDAO.exists(task.getId())) {
+            this.task = task;
+            return;
+        }
+        this.task = findFromDB(task);
+        reattachResourceAllocations(this.task.getResourceAllocations());
+        hoursGroupDAO.save(this.task.getHoursGroup());
+        reattachHoursGroup(this.task.getHoursGroup());
+        reattachCriterions(this.task.getHoursGroup().getCriterions());
+    }
+
 }