From c089051fdd2b4f20a3823fe992672b219fc669f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Tue, 9 Feb 2010 12:56:41 +0100
Subject: [PATCH] ItEr47S04ValidacionEProbasFuncionaisItEr46S04: Simplifying
 call.

Providing the resource dao in the constructor
---
 .../web/planner/allocation/ResourceAllocationModel.java    | 4 ++--
 .../navalplanner/web/planner/order/OrderPlanningModel.java | 2 +-
 .../org/navalplanner/web/planner/order/PlanningState.java  | 7 +++++--
 .../navalplanner/web/planner/reassign/ReassignCommand.java | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

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 2802db944..5084fd970 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
@@ -218,7 +218,7 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
     }
 
     private void reassociateResourcesWithSession() {
-        planningState.reassociateResourcesWithSession(resourceDAO);
+        planningState.reassociateResourcesWithSession();
     }
 
     private void removeDeletedAllocations() {
@@ -238,7 +238,7 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
         this.task = task;
         this.currentStartDate = task.getStartDate();
         this.planningState = planningState;
-        planningState.reassociateResourcesWithSession(resourceDAO);
+        planningState.reassociateResourcesWithSession();
         taskElementDAO.reattach(this.task);
         reattachTaskSource();
         loadCriterionsOfGenericAllocations();
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
index c38e589a7..00ff12264 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
@@ -746,7 +746,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
         criterionDAO.list(Criterion.class);
         forceLoadOfChildren(Arrays.asList(taskElement));
         planningState = new PlanningState(taskElement, orderReloaded
-                .getAssociatedTasks(), allResources, criterionDAO);
+                .getAssociatedTasks(), allResources, criterionDAO, resourceDAO);
         forceLoadOfDependenciesCollections(planningState.getInitial());
         forceLoadOfWorkingHours(planningState.getInitial());
         forceLoadOfLabels(planningState.getInitial());
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/PlanningState.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/PlanningState.java
index e41f2782d..ca75c3d2f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/PlanningState.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/PlanningState.java
@@ -50,12 +50,15 @@ public class PlanningState {
 
     private final ICriterionDAO criterionDAO;
 
+    private final IResourceDAO resourceDAO;
+
     public PlanningState(TaskGroup rootTask,
             Collection<? extends TaskElement> initialState,
             Collection<? extends Resource> initialResources,
-            ICriterionDAO criterionDAO) {
+            ICriterionDAO criterionDAO, IResourceDAO resourceDAO) {
         this.rootTask = rootTask;
         this.criterionDAO = criterionDAO;
+        this.resourceDAO = resourceDAO;
         this.initial = new ArrayList<TaskElement>(initialState);
         this.toSave = new HashSet<TaskElement>(initialState);
         this.toRemove = new HashSet<TaskElement>();
@@ -70,7 +73,7 @@ public class PlanningState {
         return new ArrayList<TaskElement>(initial);
     }
 
-    public void reassociateResourcesWithSession(IResourceDAO resourceDAO) {
+    public void reassociateResourcesWithSession() {
         for (Resource resource : resources) {
             resourceDAO.reattach(resource);
         }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java
index b1a5de270..8d306fd9f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/reassign/ReassignCommand.java
@@ -123,7 +123,7 @@ public class ReassignCommand implements IReassignCommand {
     private void doReassignation(IContext<TaskElement> context,
             ReassignConfiguration configuration) {
         Validate.notNull(configuration);
-        planningState.reassociateResourcesWithSession(resourceDAO);
+        planningState.reassociateResourcesWithSession();
         List<Task> taskToReassign = configuration.filterForReassignment(context
                 .getTasksOrderedByStartDate());
         reassign(reattach(withEntities(context.getMapper(), taskToReassign)));