From 4d49e4c662196a6e44ef348ee513c147904d7ed5 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: Passing context to DependencyComponent. --- .../java/org/zkoss/ganttz/DependencyComponent.java | 10 ++++------ .../ganttz/FunctionalityExposedForExtensions.java | 4 ++-- ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java | 3 ++- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/DependencyComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/DependencyComponent.java index d51a7b553..c22f0696f 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/DependencyComponent.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/DependencyComponent.java @@ -23,14 +23,12 @@ public class DependencyComponent extends XulElement implements AfterCompose { private DependencyType type; - public DependencyComponent() { + private FunctionalityExposedForExtensions context; + public DependencyComponent(FunctionalityExposedForExtensions context, + TaskComponent source, TaskComponent destination) { this.type = DependencyType.END_START; - - } - - public DependencyComponent(TaskComponent source, TaskComponent destination) { - this(); + this.context = context; if (source == null) throw new IllegalArgumentException("source cannot be null"); if (destination == null) diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java b/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java index b773b5582..20e55ae00 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java @@ -139,8 +139,8 @@ public class FunctionalityExposedForExtensions implements IContext { * @return */ private Task extractTask(Integer topInsertionPosition, - List> accumulatedDependencies, - T data, TaskContainer parent) { + List> accumulatedDependencies, T data, + TaskContainer parent) { ITaskFundamentalProperties adapted = adapter.adapt(data); accumulatedDependencies.addAll(adapter.getOutcomingDependencies(data)); accumulatedDependencies.addAll(adapter.getIncomingDependencies(data)); diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java index fe87d0f1f..746f2c0c1 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java @@ -73,7 +73,7 @@ public class TaskList extends XulElement implements AfterCompose { } List result = new ArrayList(); for (Dependency dependency : dependencies) { - result.add(new DependencyComponent(taskComponentByTask + result.add(new DependencyComponent(context, taskComponentByTask .get(dependency.getSource()), taskComponentByTask .get(dependency.getDestination()))); } @@ -291,6 +291,7 @@ public class TaskList extends XulElement implements AfterCompose { public void addDependency(TaskComponent source, TaskComponent destination) { DependencyComponent dependencyComponent = new DependencyComponent( + context, source, destination); context.addDependency(dependencyComponent); }