From 8cc92cee0ffb7928e36d57a53cd25ece89e08b56 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Thu, 12 Nov 2009 22:41:17 +0100
Subject: [PATCH]  ItEr34S16CUVistaRecursosTempoEmpresaItEr30S11: Moved method
 "groupDayAssignmentsByDayAndResource" to class LoadChartFiller.

---
 .../planner/company/CompanyPlanningModel.java | 27 ----------------
 .../planner/loadchart/ILoadChartFiller.java   | 10 ++++++
 .../planner/loadchart/LoadChartFiller.java    | 31 +++++++++++++++++++
 3 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
index 18972894e..ea3aaa276 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
@@ -415,33 +415,6 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
             return convertAsNeededByZoom(map);
         }
 
-        private SortedMap<LocalDate, Map<Resource, Integer>> groupDayAssignmentsByDayAndResource(
-                List<DayAssignment> dayAssignments) {
-            SortedMap<LocalDate, Map<Resource, Integer>> map = new TreeMap<LocalDate, Map<Resource, Integer>>();
-
-            for (DayAssignment dayAssignment : dayAssignments) {
-                LocalDate day = dayAssignment.getDay();
-                if (map.get(day) == null) {
-                    HashMap<Resource, Integer> resourcesMap = new HashMap<Resource, Integer>();
-                    resourcesMap.put(dayAssignment.getResource(), dayAssignment
-                            .getHours());
-                    map.put(day, resourcesMap);
-                } else {
-                    if (map.get(day).get(dayAssignment.getResource()) == null) {
-                        map.get(day).put(dayAssignment.getResource(),
-                                dayAssignment.getHours());
-                    } else {
-                        Integer hours = map.get(day).get(
-                                dayAssignment.getResource());
-                        hours += dayAssignment.getHours();
-                        map.get(day).put(dayAssignment.getResource(), hours);
-                    }
-                }
-            }
-
-            return map;
-        }
-
         private Plotinfo getCalendarMaximumAvailabilityPlotInfo(Date start,
                 Date finish) {
             SortedMap<LocalDate, Integer> mapDayAssignments = calculateHoursAdditionByDay(
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/ILoadChartFiller.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/ILoadChartFiller.java
index 9b1f19b56..05d5462c6 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/ILoadChartFiller.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/ILoadChartFiller.java
@@ -20,6 +20,13 @@
 
 package org.navalplanner.web.planner.loadchart;
 
+import java.util.List;
+import java.util.Map;
+import java.util.SortedMap;
+
+import org.joda.time.LocalDate;
+import org.navalplanner.business.planner.entities.DayAssignment;
+import org.navalplanner.business.resources.entities.Resource;
 import org.zkforge.timeplot.Timeplot;
 import org.zkforge.timeplot.geometry.TimeGeometry;
 import org.zkforge.timeplot.geometry.ValueGeometry;
@@ -41,4 +48,7 @@ public interface ILoadChartFiller {
 
     ValueGeometry getValueGeometry(Integer maximum);
 
+    SortedMap<LocalDate, Map<Resource, Integer>> groupDayAssignmentsByDayAndResource(
+            List<DayAssignment> dayAssignments);
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/LoadChartFiller.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/LoadChartFiller.java
index b2309947b..7114ce3b3 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/LoadChartFiller.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/LoadChartFiller.java
@@ -25,6 +25,9 @@ import java.io.PrintWriter;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.Map.Entry;
@@ -347,4 +350,32 @@ public abstract class LoadChartFiller implements ILoadChartFiller {
         return valueGeometry;
     }
 
+    @Override
+    public SortedMap<LocalDate, Map<Resource, Integer>> groupDayAssignmentsByDayAndResource(
+            List<DayAssignment> dayAssignments) {
+        SortedMap<LocalDate, Map<Resource, Integer>> map = new TreeMap<LocalDate, Map<Resource, Integer>>();
+
+        for (DayAssignment dayAssignment : dayAssignments) {
+            LocalDate day = dayAssignment.getDay();
+            if (map.get(day) == null) {
+                HashMap<Resource, Integer> resourcesMap = new HashMap<Resource, Integer>();
+                resourcesMap.put(dayAssignment.getResource(), dayAssignment
+                        .getHours());
+                map.put(day, resourcesMap);
+            } else {
+                if (map.get(day).get(dayAssignment.getResource()) == null) {
+                    map.get(day).put(dayAssignment.getResource(),
+                            dayAssignment.getHours());
+                } else {
+                    Integer hours = map.get(day).get(
+                            dayAssignment.getResource());
+                    hours += dayAssignment.getHours();
+                    map.get(day).put(dayAssignment.getResource(), hours);
+                }
+            }
+        }
+
+        return map;
+    }
+
 }