From 3ca6fc59ced08b512da84d4dba59832dd38fb5aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Wed, 16 Sep 2009 23:34:03 +0200
Subject: [PATCH] ItEr25S07CUAsignacionGrupoRecursosAPlanificacionItEr24S08:
 Fixing bug at ResourceAllocationModel reattachments

---
 .../allocation/ResourceAllocationModel.java       | 15 +++++----------
 1 file changed, 5 insertions(+), 10 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 d4cb9be4e..7d0129022 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
@@ -19,7 +19,6 @@ import org.navalplanner.business.planner.entities.ResourcesPerDay;
 import org.navalplanner.business.planner.entities.SpecificResourceAllocation;
 import org.navalplanner.business.planner.entities.Task;
 import org.navalplanner.business.resources.daos.IResourceDAO;
-import org.navalplanner.business.resources.daos.IWorkerDAO;
 import org.navalplanner.business.resources.entities.Criterion;
 import org.navalplanner.business.resources.entities.CriterionSatisfaction;
 import org.navalplanner.business.resources.entities.CriterionType;
@@ -43,9 +42,6 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
     @Autowired
     private ITaskElementDAO taskElementDAO;
 
-    @Autowired
-    private IWorkerDAO workerDAO;
-
     @Autowired
     private IResourceDAO resourceDAO;
 
@@ -221,9 +217,8 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
 
     private void reattachSpecificResourceAllocation(
             SpecificResourceAllocation resourceAllocation) {
-        resourceAllocation.getResource().getDescription();
-        reattachCriterionSatisfactions(resourceAllocation.getResource()
-                .getCriterionSatisfactions());
+        Resource resource = resourceAllocation.getResource();
+        reattachResource(resource);
     }
 
     private void reattachHoursGroup(HoursGroup hoursGroup) {
@@ -245,9 +240,9 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
         criterionType.getName();
     }
 
-    private void reattachWorker(Worker worker) {
-        workerDAO.save(worker);
-        reattachCriterionSatisfactions(worker.getCriterionSatisfactions());
+    private void reattachResource(Resource resource) {
+        resourceDAO.save(resource);
+        reattachCriterionSatisfactions(resource.getCriterionSatisfactions());
     }
 
     private void reattachCriterionSatisfactions(