From 74b3ba3f551ad26e7ca06edb6954e40cdde8925e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Thu, 16 Jul 2009 10:41:03 +0200 Subject: [PATCH] ItEr17S10CUCreacionProxectoPlanificacionItEr16S12: Renaming DependencyRegistry to GanntDiagramGraph. --- .../java/org/zkoss/ganttz/GanttPanel.java | 12 ++++---- .../main/java/org/zkoss/ganttz/Planner.java | 30 +++++++++---------- ...cyRegistry.java => GanttDiagramGraph.java} | 2 +- .../web/planner/DataForPlanner.java | 6 ++-- 4 files changed, 25 insertions(+), 25 deletions(-) rename navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/{DependencyRegistry.java => GanttDiagramGraph.java} (99%) diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/GanttPanel.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/GanttPanel.java index a7c00d232..22cbc73a9 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/GanttPanel.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/GanttPanel.java @@ -1,6 +1,6 @@ package org.zkoss.ganttz; -import org.zkoss.ganttz.util.DependencyRegistry; +import org.zkoss.ganttz.util.GanttDiagramGraph; import org.zkoss.zk.au.AuRequest; import org.zkoss.zk.au.Command; import org.zkoss.zk.au.ComponentCommand; @@ -15,15 +15,15 @@ public class GanttPanel extends XulElement implements AfterCompose { private DependencyList dependencyList; - private final DependencyRegistry dependencyRegistry; + private final GanttDiagramGraph diagramGraph; - public GanttPanel(DependencyRegistry dependencyRegistry, + public GanttPanel(GanttDiagramGraph ganttDiagramGraph, TaskEditFormComposer taskEditFormComposer) { - this.dependencyRegistry = dependencyRegistry; + this.diagramGraph = ganttDiagramGraph; timeTracker = new TimeTracker(this); appendChild(timeTracker); tasksLists = TaskList.createFor(taskEditFormComposer, - dependencyRegistry.getTopLevelTasks()); + ganttDiagramGraph.getTopLevelTasks()); dependencyList = new DependencyList(); appendChild(tasksLists); appendChild(dependencyList); @@ -33,7 +33,7 @@ public class GanttPanel extends XulElement implements AfterCompose { public void afterCompose() { tasksLists.afterCompose(); dependencyList.setDependencies(tasksLists - .asDependencies(dependencyRegistry.getVisibleDependencies())); + .asDependencies(diagramGraph.getVisibleDependencies())); timeTracker.afterCompose(); dependencyList.afterCompose(); } diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/Planner.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/Planner.java index 64f70057d..392ff38c0 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/Planner.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/Planner.java @@ -13,7 +13,7 @@ import org.zkoss.ganttz.adapters.IDomainAndBeansMapper; import org.zkoss.ganttz.adapters.IStructureNavigator; import org.zkoss.ganttz.adapters.PlannerConfiguration; import org.zkoss.ganttz.util.DependencyBean; -import org.zkoss.ganttz.util.DependencyRegistry; +import org.zkoss.ganttz.util.GanttDiagramGraph; import org.zkoss.ganttz.util.ITaskFundamentalProperties; import org.zkoss.ganttz.util.TaskBean; import org.zkoss.ganttz.util.TaskContainerBean; @@ -27,7 +27,7 @@ public class Planner extends XulElement { private static final Log LOG = LogFactory.getLog(Planner.class); private DependencyAddedListener dependencyAddedListener; - private DependencyRegistry dependencyRegistry = new DependencyRegistry(); + private GanttDiagramGraph diagramGraph = new GanttDiagramGraph(); private DependencyRemovedListener dependencyRemovedListener; private TaskRemovedListener taskRemovedListener; private ListDetails listDetails; @@ -102,7 +102,7 @@ public class Planner extends XulElement { } public void registerListeners() { - if (dependencyRegistry == null) + if (diagramGraph == null) throw new IllegalStateException("dependencyRegistry must be set"); ganttPanel.afterCompose(); TaskList taskList = getTaskList(); @@ -119,7 +119,7 @@ public class Planner extends XulElement { @Override public void taskRemoved(Task taskRemoved) { - dependencyRegistry.remove(taskRemoved.getTaskBean()); + diagramGraph.remove(taskRemoved.getTaskBean()); listDetails.taskRemoved(taskRemoved.getTaskBean()); TaskList taskList = getTaskList(); setHeight(getHeight());// forcing smart update @@ -132,7 +132,7 @@ public class Planner extends XulElement { @Override public void dependenceRemoved(Dependency dependency) { - dependencyRegistry.remove(dependency); + diagramGraph.remove(dependency); } }; getDependencyList().addDependencyRemovedListener( @@ -141,11 +141,11 @@ public class Planner extends XulElement { public void addTask(TaskBean newTask) { getTaskList().addTask(newTask); - dependencyRegistry.addTopLevel(newTask); + diagramGraph.addTopLevel(newTask); } private void publishDependency(Dependency dependency) { - dependencyRegistry.add(dependency.getDependencyBean()); + diagramGraph.add(dependency.getDependencyBean()); } private static class OneToOneMapper implements IDomainAndBeansMapper { @@ -183,21 +183,21 @@ public class Planner extends XulElement { public void setConfiguration(PlannerConfiguration configuration) { if (configuration == null) return; - this.dependencyRegistry = new DependencyRegistry(); + this.diagramGraph = new GanttDiagramGraph(); OneToOneMapper mapper = new OneToOneMapper(); domainObjectsMapper = mapper; List> dependencies = new ArrayList>(); for (T domainObject : configuration.getData()) { - this.dependencyRegistry.addTopLevel(extractTaskBean(dependencies, + this.diagramGraph.addTopLevel(extractTaskBean(dependencies, mapper, domainObject, configuration.getNavigator(), configuration.getAdapter())); } List dependencyBeans = DomainDependency .toDependencyBeans(mapper, dependencies); for (DependencyBean dependencyBean : dependencyBeans) { - this.dependencyRegistry.add(dependencyBean); + this.diagramGraph.add(dependencyBean); } - this.dependencyRegistry.applyAllRestrictions(); + this.diagramGraph.applyAllRestrictions(); recreate(); } @@ -222,20 +222,20 @@ public class Planner extends XulElement { return result; } - public DependencyRegistry getDependencyRegistry() { - return dependencyRegistry; + public GanttDiagramGraph getGanttDiagramGraph() { + return diagramGraph; } private void recreate() { removePreviousDetails(); - this.listDetails = new ListDetails(this.dependencyRegistry + this.listDetails = new ListDetails(this.diagramGraph .getTopLevelTasks()); insertBefore(this.listDetails, (Component) (getChildren().isEmpty() ? null : getChildren() .get(0))); this.listDetails.afterCompose(); removePreviousGanntPanel(); - this.ganttPanel = new GanttPanel(this.dependencyRegistry, + this.ganttPanel = new GanttPanel(this.diagramGraph, taskEditFormComposer); appendChild(ganttPanel); registerListeners(); diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/DependencyRegistry.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/GanttDiagramGraph.java similarity index 99% rename from navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/DependencyRegistry.java rename to navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/GanttDiagramGraph.java index 5af3b44f7..d4f794326 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/DependencyRegistry.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/GanttDiagramGraph.java @@ -21,7 +21,7 @@ import org.zkoss.ganttz.Dependency; * Created at Apr 24, 2009 * @author Óscar González Fernández */ -public class DependencyRegistry { +public class GanttDiagramGraph { private final DirectedGraph graph = new SimpleDirectedGraph( DependencyBean.class); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java index d2acb274a..ea18d08bc 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java @@ -10,7 +10,7 @@ import org.zkoss.ganttz.adapters.DomainDependency; import org.zkoss.ganttz.adapters.IStructureNavigator; import org.zkoss.ganttz.adapters.PlannerConfiguration; import org.zkoss.ganttz.util.DefaultFundamentalProperties; -import org.zkoss.ganttz.util.DependencyRegistry; +import org.zkoss.ganttz.util.GanttDiagramGraph; import org.zkoss.ganttz.util.DependencyType; import org.zkoss.ganttz.util.ITaskFundamentalProperties; import org.zkoss.ganttz.util.TaskContainerBean; @@ -24,8 +24,8 @@ public class DataForPlanner { public DataForPlanner() { } - public DependencyRegistry getEmpty() { - return new DependencyRegistry(); + public GanttDiagramGraph getEmpty() { + return new GanttDiagramGraph(); } public PlannerConfiguration getLightLoad() {