From 7b36ddd9cc37672b1c80f8ca96b7c0380ee7d372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 3 Aug 2010 17:45:01 +0200 Subject: [PATCH] ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #569] Fix bug. Not translating the zoom parameter when used as parameter. --- .../ganttz/FunctionalityExposedForExtensions.java | 4 ++-- .../org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java b/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java index 0a76bf289..31fe29cf9 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java @@ -39,13 +39,13 @@ import org.zkoss.ganttz.adapters.PlannerConfiguration; import org.zkoss.ganttz.data.Dependency; import org.zkoss.ganttz.data.DependencyType; import org.zkoss.ganttz.data.GanttDiagramGraph; +import org.zkoss.ganttz.data.GanttDiagramGraph.GanttZKDiagramGraph; import org.zkoss.ganttz.data.ITaskFundamentalProperties; import org.zkoss.ganttz.data.Milestone; import org.zkoss.ganttz.data.Position; import org.zkoss.ganttz.data.Task; import org.zkoss.ganttz.data.TaskContainer; import org.zkoss.ganttz.data.TaskLeaf; -import org.zkoss.ganttz.data.GanttDiagramGraph.GanttZKDiagramGraph; import org.zkoss.ganttz.data.criticalpath.CriticalPathCalculator; import org.zkoss.ganttz.extensions.IContext; import org.zkoss.ganttz.timetracker.TimeTracker; @@ -426,7 +426,7 @@ public class FunctionalityExposedForExtensions implements IContext { if (resources.isChecked() == true) { parameters.put("resources", "all"); } - parameters.put("zoom", planner.getZoomLevel().toString()); + parameters.put("zoom", planner.getZoomLevel().getInternalName()); return parameters; } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java index b0b3364dd..a86a51fa2 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java @@ -114,10 +114,14 @@ public enum ZoomLevel { return string; } - private String name; + private String internalName; + + public String getInternalName() { + return internalName; + } private ZoomLevel(String name) { - this.name = name; + this.internalName = name; } /** @@ -149,14 +153,14 @@ public enum ZoomLevel { @Override public String toString() { - return I18nHelper._(name); + return I18nHelper._(internalName); } public static ZoomLevel getFromString(String zoomLevelParameter) { ZoomLevel requiredZoomLevel = ZoomLevel.DETAIL_ONE; if (zoomLevelParameter != null) { for (ZoomLevel z : ZoomLevel.values()) { - if (zoomLevelParameter.equals(z.name)) { + if (zoomLevelParameter.equals(z.internalName)) { requiredZoomLevel = z; } }