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

Don't modify the received list and rename method name

Browse source 
FEA: ItEr60S19TimeUnitDataType
This commit is contained in:
Óscar González Fernández 2010-09-16 17:41:28 +02:00
parent aa8cb7e84c
commit f63248e7d5
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,6 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@ -706,30 +705,29 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
protected abstract void copyAssignments(Scenario from, Scenario to);
protected void resetAssignmentsTo(List<T> assignments) {
removingAssignments(removeConsolidated(getAssignments()));
removingAssignments(withoutConsolidated(getAssignments()));
addingAssignments(assignments);
updateOriginalTotalAssigment();
}
protected void resetAssigmentsForInterval(LocalDate startInclusive,
LocalDate endExclusive, List<T> assignmentsCreated) {
removingAssignments(removeConsolidated(getAssignments(startInclusive,
removingAssignments(withoutConsolidated(getAssignments(startInclusive,
endExclusive)));
addingAssignments(assignmentsCreated);
updateOriginalTotalAssigment();
updateResourcesPerDay();
}
private List<? extends DayAssignment> removeConsolidated(
List<? extends DayAssignment> assignments) {
for (Iterator<? extends DayAssignment> iterator = assignments
.iterator(); iterator.hasNext();) {
DayAssignment dayAssignment = (DayAssignment) iterator.next();
if (dayAssignment.isConsolidated()) {
iterator.remove();
private static <T extends DayAssignment> List<T> withoutConsolidated(
List<? extends T> assignments) {
List<T> result = new ArrayList<T>();
for (T each : assignments) {
if (!each.isConsolidated()) {
result.add(each);
}
}
return assignments;
return result;
}
protected final void addingAssignments(Collection<? extends T> assignments) {