RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr34S13CUAsignacionRecursosEspecificosAPlanificacionItEr33S15: Refactored method "mergeAssignmentsAndResourcesPerDay" to share common code on base class.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2009-11-16 11:44:33 +01:00 • committed by Javier Moran Rua
parent b7be239dff
commit 300eb5f7ff
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java
View file

@ -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) {

12
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
View file

@ -578,7 +578,17 @@ public abstract class ResourceAllocation<T extends DayAssignment> 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()) {

7
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java
View file

@ -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) {