diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java index d008ef650..8fc27dff8 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java @@ -226,14 +226,9 @@ public class GenericResourceAllocation extends } @Override - public void mergeAssignmentsAndResourcesPerDay(ResourceAllocation modifications) { - if (modifications == this) { - return; - } + public void mergeAssignments(ResourceAllocation modifications) { Validate.isTrue(modifications instanceof GenericResourceAllocation); mergeAssignments((GenericResourceAllocation) modifications); - setResourcesPerDay(modifications.getResourcesPerDay()); - setAssignmentFunction(modifications.getAssignmentFunction()); } private void mergeAssignments(GenericResourceAllocation modifications) { 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 ef201396c..0a4e071e0 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 @@ -578,7 +578,17 @@ public abstract class ResourceAllocation extends return sum; } - public abstract void mergeAssignmentsAndResourcesPerDay(ResourceAllocation modifications); + public void mergeAssignmentsAndResourcesPerDay( + ResourceAllocation modifications) { + if (modifications == this) { + return; + } + mergeAssignments(modifications); + setResourcesPerDay(modifications.getResourcesPerDay()); + setAssignmentFunction(modifications.getAssignmentFunction()); + } + + protected abstract void mergeAssignments(ResourceAllocation modifications); void detachAssignments() { for (DayAssignment dayAssignment : getAssignments()) { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java index 21084552c..478af77da 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java @@ -162,14 +162,9 @@ public class SpecificResourceAllocation extends } @Override - public void mergeAssignmentsAndResourcesPerDay(ResourceAllocation modifications) { - if (modifications == this) { - return; - } + public void mergeAssignments(ResourceAllocation modifications) { Validate.isTrue(modifications instanceof SpecificResourceAllocation); mergeAssignments((SpecificResourceAllocation) modifications); - setResourcesPerDay(modifications.getResourcesPerDay()); - setAssignmentFunction(modifications.getAssignmentFunction()); } private void mergeAssignments(SpecificResourceAllocation modifications) {