From 0be7843279830e6c837b6ff97e273e799df9082d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Thu, 16 Feb 2012 17:01:54 +0100
Subject: [PATCH] Bug #1282, #1376: Prevent exception when deleting a milestone
 inside a container.

The order in the deletion of the different objects related with the task was
wrong and it was causing an exception.

Moreover, the exception was breaking the flow of execution in our application
and preventing that the size of container was updated.

FEA: ItEr76S04BugFixing
---
 .../org/zkoss/ganttz/FunctionalityExposedForExtensions.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java b/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java
index 1b28ffae8..5320124d7 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java
@@ -306,11 +306,11 @@ public class FunctionalityExposedForExtensions<T> implements IContext<T> {
     public Position remove(T domainObject) {
         Task task = mapper.findAssociatedBean(domainObject);
         Position position = mapper.findPositionFor(task);
+        adapter.doRemovalOf(mapper.findAssociatedDomainObject(task));
+        mapper.remove(domainObject);
         diagramGraph.remove(task);
         task.removed();
         planner.removeTask(task);
-        adapter.doRemovalOf(mapper.findAssociatedDomainObject(task));
-        mapper.remove(domainObject);
         return position;
     }