From 27cfc6f786f97b929c860d4bfcb71f3e2b6ffe77 Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Tue, 18 May 2010 09:18:20 +0200
Subject: [PATCH]  ItEr58S10CUAsignacionRecursosLimitantesItEr57S11: Fix bug
 attach day assignments to resource allocation after allocating queue element
 into queue

---
 .../business/planner/entities/ResourceAllocation.java        | 5 +++--
 .../web/limitingresources/LimitingResourceQueueModel.java    | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
index 3d64e0982..24e25ba29 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
@@ -574,9 +574,10 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
         allocateLimitingDayAssignments(Collections.<T>emptyList());
     }
 
-    public void allocateLimitingDayAssignments(List<T> assignments) {
+    @SuppressWarnings("unchecked")
+    public void allocateLimitingDayAssignments(List<? extends DayAssignment> assignments) {
         assert isLimiting();
-        resetAssignmentsTo(assignments);
+        resetAssignmentsTo((List<T>) assignments);
     }
 
     protected abstract void addingAssignments(
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java
index 25d57a19f..da56d612d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java
@@ -395,13 +395,15 @@ public class LimitingResourceQueueModel implements ILimitingResourceQueueModel {
             startTime = earliestGap.getStartTime();
         }
 
-        // Generate day assignments and adjust start and end times for element
+        // Allocate day assignments and adjust start and end times for element
         List<DayAssignment> dayAssignments = LimitingResourceAllocator
                 .generateDayAssignments(queueElement.getResourceAllocation(),
                         queue.getResource(), startTime);
         DateAndHour[] startAndEndTime = LimitingResourceAllocator
                 .calculateStartAndEndTime(dayAssignments);
         updateStartAndEndTimes(queueElement, startAndEndTime);
+        queueElement.getResourceAllocation().allocateLimitingDayAssignments(
+                dayAssignments);
 
         // Add element to queue
         addLimitingResourceQueueElement(queue, queueElement);