From e7dce15cb3236df68693a0b751692bf11af6f92e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Mon, 20 Jul 2009 19:14:29 +0200 Subject: [PATCH] ItEr18S08CUCreacionProxectoPlanificacionItEr17S10: Adding method in IAdapterToTaskFundamentalProperties to be called when removing dependency. --- .../src/main/java/org/zkoss/ganttz/Planner.java | 5 +++++ .../main/java/org/zkoss/ganttz/adapters/AutoAdapter.java | 6 ++++++ .../adapters/IAdapterToTaskFundamentalProperties.java | 2 ++ .../org/navalplanner/web/planner/TaskElementAdapter.java | 5 +++++ 4 files changed, 18 insertions(+) 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 530f3c35d..e80595206 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 @@ -139,6 +139,7 @@ public class Planner extends XulElement { @Override public void dependenceRemoved(DependencyComponent dependencyComponent) { diagramGraph.remove(dependencyComponent); + dependencyAdder.removeDependency(dependencyComponent.getDependency()); } }; getDependencyList().addDependencyRemovedListener( @@ -169,6 +170,10 @@ public class Planner extends XulElement { adapter.addDependency(toDomainDependency(bean)); } + public void removeDependency(Dependency bean){ + adapter.removeDependency(toDomainDependency(bean)); + } + private DomainDependency toDomainDependency(Dependency bean) { T source = mapper.findAssociatedDomainObject(bean.getSource()); T destination = mapper.findAssociatedDomainObject(bean diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/AutoAdapter.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/AutoAdapter.java index cb58c1d32..fbc8420fb 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/AutoAdapter.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/AutoAdapter.java @@ -34,4 +34,10 @@ public class AutoAdapter implements return true; } + @Override + public void removeDependency( + DomainDependency dependency) { + //do nothing + } + } diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/IAdapterToTaskFundamentalProperties.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/IAdapterToTaskFundamentalProperties.java index 731eba811..8fcbe9fce 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/IAdapterToTaskFundamentalProperties.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/adapters/IAdapterToTaskFundamentalProperties.java @@ -18,4 +18,6 @@ public interface IAdapterToTaskFundamentalProperties { public void addDependency(DomainDependency dependency); + public void removeDependency(DomainDependency dependency); + } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java index 09fba5e52..22d54c4e2 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java @@ -167,4 +167,9 @@ public class TaskElementAdapter implements ITaskElementAdapter { public boolean canAddDependency(DomainDependency dependency) { return true; } + + @Override + public void removeDependency(DomainDependency dependency) { + System.out.println("removing dependency: "+dependency); + } }