From dd19e8a59b3892e3c696a2e142e64a600970fdeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Mon, 26 Oct 2009 19:56:56 +0100
Subject: [PATCH] ItEr32S09ValidacionEProbasFuncionaisItEr31S12: [Bug #66]
 Removing duplication

---
 .../web/planner/CompanyPlanningModel.java          | 14 ++------------
 .../navalplanner/web/planner/LoadChartFiller.java  | 14 +++++++++++---
 .../web/planner/OrderPlanningModel.java            |  6 +-----
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPlanningModel.java
index 13fb9fd75..c0d9b8cf7 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPlanningModel.java
@@ -346,12 +346,7 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
 
                 map.put(date, hours);
             }
-
-            if (zoomByDay()) {
-                return map;
-            } else {
-                return groupByWeek(map);
-            }
+            return convertAsNeededByZoom(map);
         }
 
         /**
@@ -378,12 +373,7 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
                     map.put(day, map.get(day) + hours);
                 }
             }
-
-            if (zoomByDay()) {
-                return map;
-            } else {
-                return groupByWeek(map);
-            }
+            return convertAsNeededByZoom(map);
         }
 
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/LoadChartFiller.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/LoadChartFiller.java
index 9df8142b8..c4ab8775e 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/LoadChartFiller.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/LoadChartFiller.java
@@ -83,7 +83,7 @@ public abstract class LoadChartFiller implements ILoadChartFiller {
         }
 
         private LocalDate nextDay(LocalDate date) {
-            if (zoomByDay()) {
+            if (isZoomByDay()) {
                 return date.plusDays(1);
             } else {
                 return date.plusWeeks(1);
@@ -101,7 +101,7 @@ public abstract class LoadChartFiller implements ILoadChartFiller {
         }
 
         private LocalDate convertAsNeededByZoom(LocalDate date) {
-            if (zoomByDay()) {
+            if (isZoomByDay()) {
                 return date;
             } else {
                 return getThursdayOfThisWeek(date);
@@ -192,7 +192,7 @@ public abstract class LoadChartFiller implements ILoadChartFiller {
         return date.dayOfWeek().withMinimumValue().plusDays(DAYS_TO_THURSDAY);
     }
 
-    protected boolean zoomByDay() {
+    private boolean isZoomByDay() {
         return zoomLevel.equals(ZoomLevel.DETAIL_FIVE);
     }
 
@@ -230,4 +230,12 @@ public abstract class LoadChartFiller implements ILoadChartFiller {
         return result;
     }
 
+    protected SortedMap<LocalDate, Integer> convertAsNeededByZoom(SortedMap<LocalDate, Integer> map) {
+        if (isZoomByDay()) {
+            return map;
+        } else {
+            return groupByWeek(map);
+        }
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java
index d9bcf3daa..f31950779 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java
@@ -518,11 +518,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
                 }
             }
 
-            if (zoomByDay()) {
-                return map;
-            } else {
-                return groupByWeek(map);
-            }
+            return convertAsNeededByZoom(map);
         }
 
         private SortedMap<LocalDate, Integer> calculateHoursAdditionByDay(