RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr17S10CUCreacionProxectoPlanificacionItEr16S12: Renaming DependencyRegistry to GanntDiagramGraph.

Browse source
This commit is contained in:
Óscar González Fernández 2009-07-16 10:41:03 +02:00 • committed by Javier Moran Rua
parent c821902fa1
commit 74b3ba3f55
4 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/GanttPanel.java
View file

@ -1,6 +1,6 @@
package org.zkoss.ganttz; 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.AuRequest;
import org.zkoss.zk.au.Command; import org.zkoss.zk.au.Command;
import org.zkoss.zk.au.ComponentCommand; import org.zkoss.zk.au.ComponentCommand;
@ -15,15 +15,15 @@ public class GanttPanel extends XulElement implements AfterCompose {
private DependencyList dependencyList; private DependencyList dependencyList;
private final DependencyRegistry dependencyRegistry; private final GanttDiagramGraph diagramGraph;
public GanttPanel(DependencyRegistry dependencyRegistry, public GanttPanel(GanttDiagramGraph ganttDiagramGraph,
TaskEditFormComposer taskEditFormComposer) { TaskEditFormComposer taskEditFormComposer) {
this.dependencyRegistry = dependencyRegistry; this.diagramGraph = ganttDiagramGraph;
timeTracker = new TimeTracker(this); timeTracker = new TimeTracker(this);
appendChild(timeTracker); appendChild(timeTracker);
tasksLists = TaskList.createFor(taskEditFormComposer, tasksLists = TaskList.createFor(taskEditFormComposer,
dependencyRegistry.getTopLevelTasks()); ganttDiagramGraph.getTopLevelTasks());
dependencyList = new DependencyList(); dependencyList = new DependencyList();
appendChild(tasksLists); appendChild(tasksLists);
appendChild(dependencyList); appendChild(dependencyList);
@ -33,7 +33,7 @@ public class GanttPanel extends XulElement implements AfterCompose {
public void afterCompose() { public void afterCompose() {
tasksLists.afterCompose(); tasksLists.afterCompose();
dependencyList.setDependencies(tasksLists dependencyList.setDependencies(tasksLists
.asDependencies(dependencyRegistry.getVisibleDependencies())); .asDependencies(diagramGraph.getVisibleDependencies()));
timeTracker.afterCompose(); timeTracker.afterCompose();
dependencyList.afterCompose(); dependencyList.afterCompose();
} }

30
navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/Planner.java
View file

@ -13,7 +13,7 @@ import org.zkoss.ganttz.adapters.IDomainAndBeansMapper;
import org.zkoss.ganttz.adapters.IStructureNavigator; import org.zkoss.ganttz.adapters.IStructureNavigator;
import org.zkoss.ganttz.adapters.PlannerConfiguration; import org.zkoss.ganttz.adapters.PlannerConfiguration;
import org.zkoss.ganttz.util.DependencyBean; 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.ITaskFundamentalProperties;
import org.zkoss.ganttz.util.TaskBean; import org.zkoss.ganttz.util.TaskBean;
import org.zkoss.ganttz.util.TaskContainerBean; 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 static final Log LOG = LogFactory.getLog(Planner.class);
private DependencyAddedListener dependencyAddedListener; private DependencyAddedListener dependencyAddedListener;
private DependencyRegistry dependencyRegistry = new DependencyRegistry(); private GanttDiagramGraph diagramGraph = new GanttDiagramGraph();
private DependencyRemovedListener dependencyRemovedListener; private DependencyRemovedListener dependencyRemovedListener;
private TaskRemovedListener taskRemovedListener; private TaskRemovedListener taskRemovedListener;
private ListDetails listDetails; private ListDetails listDetails;
@ -102,7 +102,7 @@ public class Planner extends XulElement {
} }
public void registerListeners() { public void registerListeners() {
if (dependencyRegistry == null) if (diagramGraph == null)
throw new IllegalStateException("dependencyRegistry must be set"); throw new IllegalStateException("dependencyRegistry must be set");
ganttPanel.afterCompose(); ganttPanel.afterCompose();
TaskList taskList = getTaskList(); TaskList taskList = getTaskList();
@ -119,7 +119,7 @@ public class Planner extends XulElement {
@Override @Override
public void taskRemoved(Task taskRemoved) { public void taskRemoved(Task taskRemoved) {
dependencyRegistry.remove(taskRemoved.getTaskBean()); diagramGraph.remove(taskRemoved.getTaskBean());
listDetails.taskRemoved(taskRemoved.getTaskBean()); listDetails.taskRemoved(taskRemoved.getTaskBean());
TaskList taskList = getTaskList(); TaskList taskList = getTaskList();
setHeight(getHeight());// forcing smart update setHeight(getHeight());// forcing smart update
@ -132,7 +132,7 @@ public class Planner extends XulElement {
@Override @Override
public void dependenceRemoved(Dependency dependency) { public void dependenceRemoved(Dependency dependency) {
dependencyRegistry.remove(dependency); diagramGraph.remove(dependency);
} }
}; };
getDependencyList().addDependencyRemovedListener( getDependencyList().addDependencyRemovedListener(
@ -141,11 +141,11 @@ public class Planner extends XulElement {
public void addTask(TaskBean newTask) { public void addTask(TaskBean newTask) {
getTaskList().addTask(newTask); getTaskList().addTask(newTask);
dependencyRegistry.addTopLevel(newTask); diagramGraph.addTopLevel(newTask);
} }
private void publishDependency(Dependency dependency) { private void publishDependency(Dependency dependency) {
dependencyRegistry.add(dependency.getDependencyBean()); diagramGraph.add(dependency.getDependencyBean());
} }
private static class OneToOneMapper<T> implements IDomainAndBeansMapper<T> { private static class OneToOneMapper<T> implements IDomainAndBeansMapper<T> {
@ -183,21 +183,21 @@ public class Planner extends XulElement {
public <T> void setConfiguration(PlannerConfiguration<T> configuration) { public <T> void setConfiguration(PlannerConfiguration<T> configuration) {
if (configuration == null) if (configuration == null)
return; return;
this.dependencyRegistry = new DependencyRegistry(); this.diagramGraph = new GanttDiagramGraph();
OneToOneMapper<T> mapper = new OneToOneMapper<T>(); OneToOneMapper<T> mapper = new OneToOneMapper<T>();
domainObjectsMapper = mapper; domainObjectsMapper = mapper;
List<DomainDependency<T>> dependencies = new ArrayList<DomainDependency<T>>(); List<DomainDependency<T>> dependencies = new ArrayList<DomainDependency<T>>();
for (T domainObject : configuration.getData()) { for (T domainObject : configuration.getData()) {
this.dependencyRegistry.addTopLevel(extractTaskBean(dependencies, this.diagramGraph.addTopLevel(extractTaskBean(dependencies,
mapper, domainObject, configuration.getNavigator(), mapper, domainObject, configuration.getNavigator(),
configuration.getAdapter())); configuration.getAdapter()));
} }
List<DependencyBean> dependencyBeans = DomainDependency List<DependencyBean> dependencyBeans = DomainDependency
.toDependencyBeans(mapper, dependencies); .toDependencyBeans(mapper, dependencies);
for (DependencyBean dependencyBean : dependencyBeans) { for (DependencyBean dependencyBean : dependencyBeans) {
this.dependencyRegistry.add(dependencyBean); this.diagramGraph.add(dependencyBean);
} }
this.dependencyRegistry.applyAllRestrictions(); this.diagramGraph.applyAllRestrictions();
recreate(); recreate();
} }
@ -222,20 +222,20 @@ public class Planner extends XulElement {
return result; return result;
} }
public DependencyRegistry getDependencyRegistry() { public GanttDiagramGraph getGanttDiagramGraph() {
return dependencyRegistry; return diagramGraph;
} }
private void recreate() { private void recreate() {
removePreviousDetails(); removePreviousDetails();
this.listDetails = new ListDetails(this.dependencyRegistry this.listDetails = new ListDetails(this.diagramGraph
.getTopLevelTasks()); .getTopLevelTasks());
insertBefore(this.listDetails, insertBefore(this.listDetails,
(Component) (getChildren().isEmpty() ? null : getChildren() (Component) (getChildren().isEmpty() ? null : getChildren()
.get(0))); .get(0)));
this.listDetails.afterCompose(); this.listDetails.afterCompose();
removePreviousGanntPanel(); removePreviousGanntPanel();
this.ganttPanel = new GanttPanel(this.dependencyRegistry, this.ganttPanel = new GanttPanel(this.diagramGraph,
taskEditFormComposer); taskEditFormComposer);
appendChild(ganttPanel); appendChild(ganttPanel);
registerListeners(); registerListeners();

2
navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/DependencyRegistry.java → navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/util/GanttDiagramGraph.java
View file

@ -21,7 +21,7 @@ import org.zkoss.ganttz.Dependency;
* Created at Apr 24, 2009 * Created at Apr 24, 2009
* @author Óscar González Fernández <ogonzalez@igalia.com> * @author Óscar González Fernández <ogonzalez@igalia.com>
*/ */
public class DependencyRegistry { public class GanttDiagramGraph {
private final DirectedGraph<TaskBean, DependencyBean> graph = new SimpleDirectedGraph<TaskBean, DependencyBean>( private final DirectedGraph<TaskBean, DependencyBean> graph = new SimpleDirectedGraph<TaskBean, DependencyBean>(
DependencyBean.class); DependencyBean.class);

6
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java
View file

@ -10,7 +10,7 @@ import org.zkoss.ganttz.adapters.DomainDependency;
import org.zkoss.ganttz.adapters.IStructureNavigator; import org.zkoss.ganttz.adapters.IStructureNavigator;
import org.zkoss.ganttz.adapters.PlannerConfiguration; import org.zkoss.ganttz.adapters.PlannerConfiguration;
import org.zkoss.ganttz.util.DefaultFundamentalProperties; 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.DependencyType;
import org.zkoss.ganttz.util.ITaskFundamentalProperties; import org.zkoss.ganttz.util.ITaskFundamentalProperties;
import org.zkoss.ganttz.util.TaskContainerBean; import org.zkoss.ganttz.util.TaskContainerBean;
@ -24,8 +24,8 @@ public class DataForPlanner {
public DataForPlanner() { public DataForPlanner() {
} }
public DependencyRegistry getEmpty() { public GanttDiagramGraph getEmpty() {
return new DependencyRegistry(); return new GanttDiagramGraph();
} }
public PlannerConfiguration<ITaskFundamentalProperties> getLightLoad() { public PlannerConfiguration<ITaskFundamentalProperties> getLightLoad() {