From 4d03e1d9e8bbfb9b8389c81a59f2e22b2471d5c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 27 Oct 2009 11:57:06 +0100 Subject: [PATCH] ItEr32S12CUAsignacionGrupoRecursosAPlanificacionItEr31S15: Creating package for load chart --- .../navalplanner/web/planner/CompanyPlanningModel.java | 5 ++++- .../org/navalplanner/web/planner/OrderPlanningModel.java | 2 ++ .../web/planner/{ => loadchart}/ILoadChartFiller.java | 2 +- .../web/planner/{ => loadchart}/LoadChart.java | 4 ++-- .../web/planner/{ => loadchart}/LoadChartFiller.java | 8 ++++++-- 5 files changed, 15 insertions(+), 6 deletions(-) rename navalplanner-webapp/src/main/java/org/navalplanner/web/planner/{ => loadchart}/ILoadChartFiller.java (96%) rename navalplanner-webapp/src/main/java/org/navalplanner/web/planner/{ => loadchart}/LoadChart.java (95%) rename navalplanner-webapp/src/main/java/org/navalplanner/web/planner/{ => loadchart}/LoadChartFiller.java (97%) 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 34945ca80..99942a821 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 @@ -45,6 +45,8 @@ import org.navalplanner.business.planner.entities.TaskGroup; import org.navalplanner.business.planner.entities.TaskMilestone; import org.navalplanner.business.resources.daos.IResourceDAO; import org.navalplanner.business.resources.entities.Resource; +import org.navalplanner.web.planner.loadchart.LoadChart; +import org.navalplanner.web.planner.loadchart.LoadChartFiller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; @@ -360,7 +362,8 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel { */ private SortedMap calculateHoursAdditionByDay( List dayAssignments) { - return new DefaultDayAssignmentCalculator().calculate(dayAssignments); + return new DefaultDayAssignmentCalculator() + .calculate(dayAssignments); } } 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 4cfe491d4..323840bd0 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 @@ -50,6 +50,8 @@ import org.navalplanner.web.planner.ITaskElementAdapter.IOnMoveListener; import org.navalplanner.web.planner.allocation.ResourceAllocationController; import org.navalplanner.web.planner.calendar.CalendarAllocationController; import org.navalplanner.web.planner.calendar.ICalendarAllocationCommand; +import org.navalplanner.web.planner.loadchart.LoadChart; +import org.navalplanner.web.planner.loadchart.LoadChartFiller; import org.navalplanner.web.planner.milestone.IAddMilestoneCommand; import org.navalplanner.web.planner.splitting.IMergeTaskCommand; import org.navalplanner.web.planner.splitting.ISplitTaskCommand; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ILoadChartFiller.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/ILoadChartFiller.java similarity index 96% rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ILoadChartFiller.java rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/ILoadChartFiller.java index c66363214..81f7ce38f 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ILoadChartFiller.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/ILoadChartFiller.java @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -package org.navalplanner.web.planner; +package org.navalplanner.web.planner.loadchart; import org.zkforge.timeplot.Timeplot; import org.zkoss.ganttz.timetracker.zoom.ZoomLevel; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/LoadChart.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/LoadChart.java similarity index 95% rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/LoadChart.java rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/LoadChart.java index f631b3b23..97a08b901 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/LoadChart.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/LoadChart.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.navalplanner.web.planner; +package org.navalplanner.web.planner.loadchart; import org.apache.commons.lang.Validate; import org.zkforge.timeplot.Timeplot; @@ -43,7 +43,7 @@ public class LoadChart { this.timeTracker = timeTracker; } - void fillChart() { + public void fillChart() { filler.fillChart(timeplot, timeTracker.getRealInterval(), timeTracker.getHorizontalSize()); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/LoadChartFiller.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/LoadChartFiller.java similarity index 97% rename from navalplanner-webapp/src/main/java/org/navalplanner/web/planner/LoadChartFiller.java rename to navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/LoadChartFiller.java index 6c169b802..940526225 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/LoadChartFiller.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/loadchart/LoadChartFiller.java @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -package org.navalplanner.web.planner; +package org.navalplanner.web.planner.loadchart; import java.io.IOException; import java.io.PrintWriter; @@ -51,7 +51,8 @@ import org.zkoss.zk.ui.Executions; public abstract class LoadChartFiller implements ILoadChartFiller { protected abstract class HoursByDayCalculator { - SortedMap calculate(Collection elements) { + public SortedMap calculate( + Collection elements) { SortedMap result = new TreeMap(); if (elements.isEmpty()) { return result; @@ -80,6 +81,9 @@ public abstract class LoadChartFiller implements ILoadChartFiller { protected class DefaultDayAssignmentCalculator extends HoursByDayCalculator { + public DefaultDayAssignmentCalculator() { + } + @Override protected LocalDate getDayFor(DayAssignment element) { return element.getDay();