From 2ff7e7b5eeecae6b6f5809097c028dac73643d43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Tue, 18 Aug 2009 12:26:56 +0200
Subject: [PATCH] ItEr22S12CUVistaRecursosTempoPorProxectoItEr21S07: Now
 context is responsible of removing the graphical component.

---
 .../java/org/zkoss/ganttz/DependencyComponent.java    |  7 +++++++
 .../main/java/org/zkoss/ganttz/DependencyList.java    | 11 ++++++++++-
 .../ganttz/FunctionalityExposedForExtensions.java     |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/DependencyComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/DependencyComponent.java
index 22f28859c..f79afe6b9 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/DependencyComponent.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/DependencyComponent.java
@@ -112,4 +112,11 @@ public class DependencyComponent extends XulElement implements AfterCompose {
         this.type = type;
     }
 
+    public boolean hasSameSourceAndDestination(Dependency dependency) {
+        Task sourceTask = source.getTask();
+        Task destinationTask = destination.getTask();
+        return sourceTask.equals(dependency.getSource())
+                && destinationTask.equals(dependency.getDestination());
+    }
+
 }
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java b/ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java
index 90d2e5d11..91fd52d82 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java
@@ -7,6 +7,7 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.zkoss.ganttz.data.Dependency;
 import org.zkoss.ganttz.data.DependencyType;
 import org.zkoss.ganttz.data.Task;
 import org.zkoss.ganttz.util.MenuBuilder;
@@ -147,7 +148,6 @@ public class DependencyList extends XulElement implements AfterCompose {
                                         Event event) {
                                     context.removeDependency(choosen
                                             .getDependency());
-                                    removeChild(choosen);
                                 }
                             });
             contextMenuBuilder.item("Set End-Start",
@@ -227,4 +227,13 @@ public class DependencyList extends XulElement implements AfterCompose {
             }
         }
     }
+
+    public void remove(Dependency dependency) {
+        for (DependencyComponent dependencyComponent : DependencyList.this
+                .getDependencyComponents()) {
+            if (dependencyComponent.hasSameSourceAndDestination(dependency)) {
+                this.removeChild(dependencyComponent);
+            }
+        }
+    }
 }
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java b/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java
index 6f750e7ec..a56c3b9ad 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java
@@ -267,6 +267,7 @@ public class FunctionalityExposedForExtensions<T> implements IContext<T> {
     public void removeDependency(Dependency dependency) {
         adapter.removeDependency(toDomainDependency(dependency));
         diagramGraph.remove(dependency);
+        getDependencyList().remove(dependency);
     }
 
 }