From f0433f5b05b192492ced8a054ebaf8a18b9906c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Sun, 20 Dec 2009 23:09:18 +0100
Subject: [PATCH] ItEr39S16CUConfiguracionMaquinasItEr35S09: Extracting and
 moving methods to DayAssignment

---
 .../business/planner/entities/DayAssignment.java      | 11 +++++++++++
 .../planner/entities/GenericResourceAllocation.java   |  7 ++-----
 .../business/planner/entities/ResourceAllocation.java |  6 +-----
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java
index 5059dc364..b5c1e2bd3 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java
@@ -26,8 +26,10 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.Map.Entry;
 
 import org.apache.commons.lang.Validate;
@@ -91,6 +93,15 @@ public abstract class DayAssignment extends BaseEntity {
         return result;
     }
 
+    public static Set<Resource> getAllResources(
+            Collection<? extends DayAssignment> assignments) {
+        Set<Resource> result = new HashSet<Resource>();
+        for (DayAssignment dayAssignment : assignments) {
+            result.add(dayAssignment.getResource());
+        }
+        return result;
+    }
+
     @Min(0)
     private int hours;
 
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 ea12dfe5e..ea17b6a7e 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
@@ -220,11 +220,8 @@ public class GenericResourceAllocation extends
 
     @Override
     public List<Resource> getAssociatedResources() {
-        Set<Resource> resources = new HashSet<Resource>();
-        for (DayAssignment dayAssignment : getAssignments()) {
-            resources.add(dayAssignment.getResource());
-        }
-        return new ArrayList<Resource>(resources);
+        return new ArrayList<Resource>(DayAssignment
+                .getAllResources(getAssignments()));
     }
 
     @Override
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 a7005cfa5..14922409d 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
@@ -532,11 +532,7 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
     }
 
     public int getAssignedHours() {
-        int total = 0;
-        for (DayAssignment dayAssignment : getAssignments()) {
-                total += dayAssignment.getHours();
-        }
-        return total;
+        return DayAssignment.sum(getAssignments());
     }
 
     /**