From 3cc1718288630863d1cd40b4b97e6e59de1b78c4 Mon Sep 17 00:00:00 2001 From: Diego Pino Garcia Date: Wed, 4 May 2011 12:24:05 +0200 Subject: [PATCH] [Bug #975] Renamed getStretches() to getAllStretches() FEA: ItEr74S04BugFixing --- .../web/planner/allocation/streches/GraphicForStreches.java | 2 +- .../planner/allocation/streches/IStretchesFunctionModel.java | 2 +- .../allocation/streches/StretchesFunctionController.java | 2 +- .../web/planner/allocation/streches/StretchesFunctionModel.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/GraphicForStreches.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/GraphicForStreches.java index f64bdb669..f6582d793 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/GraphicForStreches.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/GraphicForStreches.java @@ -161,7 +161,7 @@ public abstract class GraphicForStreches implements IGraphicGenerator { @Override public boolean areChartsEnabled(IStretchesFunctionModel model) { - return canComputeChartFrom(model.getStretches(), model + return canComputeChartFrom(model.getAllStretches(), model .getTaskStartDate()); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/IStretchesFunctionModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/IStretchesFunctionModel.java index afdfe9e0c..35c1f4464 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/IStretchesFunctionModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/IStretchesFunctionModel.java @@ -55,7 +55,7 @@ public interface IStretchesFunctionModel { * Intermediate conversation steps */ - List getStretches(); + List getAllStretches(); List getStretchesDefinedByUser(); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java index 5d8f975a6..d77c23dc6 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionController.java @@ -149,7 +149,7 @@ public class StretchesFunctionController extends GenericForwardComposer { } public List getStretches() { - return stretchesFunctionModel.getStretches(); + return stretchesFunctionModel.getAllStretches(); } public StretchesRenderer getStretchesRenderer() { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java index 11e136ba8..ed16e1115 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StretchesFunctionModel.java @@ -142,7 +142,7 @@ public class StretchesFunctionModel implements IStretchesFunctionModel { } @Override - public List getStretches() { + public List getAllStretches() { if (stretchesFunction == null) { return Collections.emptyList(); }