diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java index 4282473cc..c6bdb4035 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java @@ -359,22 +359,7 @@ public class Task extends TaskElement implements ITaskLeafConstraint { } - public void mergeAllocation(Scenario scenario, - CalculatedValue calculatedValue, - AggregateOfResourceAllocations aggregate, - List> newAllocations, - List modifications, - Collection> toRemove) { - if (aggregate.isEmpty()) { - return; - } - final IntraDayDate start = aggregate.getStart(); - final IntraDayDate end = aggregate.getEnd(); - mergeAllocation(scenario, start, end, calculatedValue, newAllocations, - modifications, toRemove); - } - - private void mergeAllocation(Scenario scenario, final IntraDayDate start, + public void mergeAllocation(Scenario scenario, final IntraDayDate start, final IntraDayDate end, CalculatedValue calculatedValue, List> newAllocations, diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationResult.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationResult.java index 07d094fc7..c1fc8fee5 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationResult.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationResult.java @@ -130,7 +130,12 @@ public class AllocationResult { public void applyTo(Scenario scenario, Task task) { List modified = getModified(); - task.mergeAllocation(scenario, getCalculatedValue(), aggregate, + if (aggregate.isEmpty()) { + return; + } + final IntraDayDate start = task.getIntraDayStartDate(); + final IntraDayDate end = aggregate.getEnd(); + task.mergeAllocation(scenario, start, end, getCalculatedValue(), getNew(), modified, getNotModified(originals(modified))); }