From ffa7f5ae3a8169dd29a20c622bf9ca95dc306ee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 18 Aug 2009 12:26:56 +0200 Subject: [PATCH] ItEr22S12CUVistaRecursosTempoPorProxectoItEr21S07: Renaming TimeTracker to reflect that it's a component. --- .../java/org/zkoss/ganttz/DependencyList.java | 6 +++--- .../main/java/org/zkoss/ganttz/GanttPanel.java | 16 ++++++++-------- .../org/zkoss/ganttz/ResourcesLoadPanel.java | 6 +++--- .../src/main/java/org/zkoss/ganttz/TaskList.java | 8 ++++---- ...imeTracker.java => TimeTrackerComponent.java} | 4 ++-- .../main/resources/metainfo/zk/lang-addon.xml | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) rename ganttzk/src/main/java/org/zkoss/ganttz/{TimeTracker.java => TimeTrackerComponent.java} (97%) diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java b/ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java index d30547519..e4f4d0e95 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java @@ -138,7 +138,7 @@ public class DependencyList extends XulElement implements AfterCompose { } } }; - getTimeTracker().addZoomListener(listener); + getTimeTrackerComponent().addZoomListener(listener); } addContextMenu(); } @@ -179,8 +179,8 @@ public class DependencyList extends XulElement implements AfterCompose { return contextMenu; } - private TimeTracker getTimeTracker() { - return getGanttPanel().getTimeTracker(); + private TimeTrackerComponent getTimeTrackerComponent() { + return getGanttPanel().getTimeTrackerComponent(); } public void redrawDependenciesConnectedTo(TaskComponent taskComponent) { diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/GanttPanel.java b/ganttzk/src/main/java/org/zkoss/ganttz/GanttPanel.java index 9f41cf1fa..22fe9e5a5 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/GanttPanel.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/GanttPanel.java @@ -13,7 +13,7 @@ public class GanttPanel extends XulElement implements AfterCompose { private TaskList tasksLists; - private TimeTracker timeTracker; + private TimeTrackerComponent timeTrackerComponent; private DependencyList dependencyList; @@ -24,8 +24,8 @@ public class GanttPanel extends XulElement implements AfterCompose { List> commandsOnTasksContextualized, CommandOnTaskContextualized editTaskCommand) { this.diagramGraph = context.getDiagramGraph(); - timeTracker = new TimeTracker(this); - appendChild(timeTracker); + timeTrackerComponent = new TimeTrackerComponent(this); + appendChild(timeTrackerComponent); tasksLists = TaskList.createFor(context, editTaskCommand, commandsOnTasksContextualized); dependencyList = new DependencyList(context); @@ -38,12 +38,12 @@ public class GanttPanel extends XulElement implements AfterCompose { tasksLists.afterCompose(); dependencyList.setDependencyComponents(tasksLists .asDependencyComponents(diagramGraph.getVisibleDependencies())); - timeTracker.afterCompose(); + timeTrackerComponent.afterCompose(); dependencyList.afterCompose(); } - public TimeTracker getTimeTracker() { - return timeTracker; + public TimeTrackerComponent getTimeTrackerComponent() { + return timeTrackerComponent; } public TaskList getTaskList() { @@ -63,7 +63,7 @@ public class GanttPanel extends XulElement implements AfterCompose { protected void process(AuRequest request) { String[] requestData = request.getData(); int offset = Integer.parseInt(requestData[0]); - getTimeTracker().onIncrease(offset); + getTimeTrackerComponent().onIncrease(offset); } }; @@ -73,7 +73,7 @@ public class GanttPanel extends XulElement implements AfterCompose { protected void process(AuRequest request) { String[] requestData = request.getData(); int offset = Integer.parseInt(requestData[0]); - getTimeTracker().onDecrease(offset); + getTimeTrackerComponent().onDecrease(offset); } }; diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/ResourcesLoadPanel.java b/ganttzk/src/main/java/org/zkoss/ganttz/ResourcesLoadPanel.java index a7d2af26f..74b08771f 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/ResourcesLoadPanel.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/ResourcesLoadPanel.java @@ -6,7 +6,7 @@ import org.zkoss.zul.impl.XulElement; public class ResourcesLoadPanel extends XulElement implements AfterCompose { - private TimeTracker timeTracker; + private TimeTrackerComponent timeTrackerComponent; public ResourcesLoadPanel() { ResourceLoadComponent rlc1 = new ResourceLoadComponent( @@ -35,8 +35,8 @@ public class ResourcesLoadPanel extends XulElement implements AfterCompose { //timeTracker.afterCompose(); } - public TimeTracker getTimeTracker() { - return timeTracker; + public TimeTrackerComponent getTimeTrackerComponent() { + return timeTrackerComponent; } public Planner getPlanner() { diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java index 53658e7bb..a25eb9337 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java @@ -195,12 +195,12 @@ public class TaskList extends XulElement implements AfterCompose { return getTasksNumber() * HEIGHT_PER_ROW + "px"; } - private TimeTracker getTimeTracker() { - return getGanttPanel().getTimeTracker(); + private TimeTrackerComponent getTimeTrackerComponent() { + return getGanttPanel().getTimeTrackerComponent(); } IDatesMapper getMapper() { - return getTimeTracker().getMapper(); + return getTimeTrackerComponent().getMapper(); } private List getTopLevelTaskComponents() { @@ -242,7 +242,7 @@ public class TaskList extends XulElement implements AfterCompose { adjustZoomColumnsHeight(); } }; - getTimeTracker().addZoomListener(zoomLevelChangedListener); + getTimeTrackerComponent().addZoomListener(zoomLevelChangedListener); } } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TimeTracker.java b/ganttzk/src/main/java/org/zkoss/ganttz/TimeTrackerComponent.java similarity index 97% rename from ganttzk/src/main/java/org/zkoss/ganttz/TimeTracker.java rename to ganttzk/src/main/java/org/zkoss/ganttz/TimeTrackerComponent.java index 76ce7f324..ba9d18b03 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/TimeTracker.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/TimeTrackerComponent.java @@ -18,7 +18,7 @@ import org.zkoss.zk.ui.HtmlMacroComponent; * @author Javier Moran Rua */ -public class TimeTracker extends HtmlMacroComponent { +public class TimeTrackerComponent extends HtmlMacroComponent { private static Interval getTestInterval() { return new Interval(TimeTrackerState.year(2009), TimeTrackerState @@ -41,7 +41,7 @@ public class TimeTracker extends HtmlMacroComponent { return ganttPanel; } - public TimeTracker(GanttPanel ganttPanel) { + public TimeTrackerComponent(GanttPanel ganttPanel) { this.ganttPanel = ganttPanel; this.detailLevel = ZoomLevel.DETAIL_ONE; } diff --git a/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml b/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml index 9c9f87581..591fc49fc 100755 --- a/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml +++ b/ganttzk/src/main/resources/metainfo/zk/lang-addon.xml @@ -109,7 +109,7 @@ timetracker - org.zkoss.ganttz.TimeTracker + org.zkoss.ganttz.TimeTrackerComponent ~./ganttz/zul/timetracker.zul detailLevel