From f63248e7d59c800e90698afdb82ed13416aec1c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Thu, 16 Sep 2010 17:41:28 +0200
Subject: [PATCH] Don't modify the received list and rename method name

FEA: ItEr60S19TimeUnitDataType
---
 .../planner/entities/ResourceAllocation.java  | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

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 3f8e1634f..d60d79f41 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
@@ -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) {