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 extends allocateLimitingDayAssignments(Collections.emptyList()); } - public void allocateLimitingDayAssignments(List assignments) { + @SuppressWarnings("unchecked") + public void allocateLimitingDayAssignments(List assignments) { assert isLimiting(); - resetAssignmentsTo(assignments); + resetAssignmentsTo((List) 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 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);