From b365d3b46c21132ad10ab8ee7e76883802f938e9 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Wed, 14 Dec 2011 12:53:46 +0100
Subject: [PATCH] Remove duplicated method in TaskElement

FEA: ItEr75S04BugFixing
---
 .../orders/entities/OrderElement.java         |  3 +--
 .../orders/entities/OrderLineGroup.java       |  2 +-
 .../business/orders/entities/TaskSource.java  |  3 +--
 .../planner/entities/TaskElement.java         | 25 +------------------
 4 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java
index b19af9561..3976d913e 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderElement.java
@@ -398,8 +398,7 @@ public abstract class OrderElement extends IntegrationEntity implements
         } else {
             TaskSource taskSource = getTaskSource();
             if (taskSource != null) {
-                taskSource.getTask().detachFromDependencies();
-                taskSource.getTask().detachFromParent();
+                taskSource.getTask().detach();
                 getCurrentSchedulingData().taskSourceRemovalRequested();
             }
         }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java
index 5116d2da8..e7d283701 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/OrderLineGroup.java
@@ -109,7 +109,7 @@ public class OrderLineGroup extends OrderElement implements
             TaskGroup group = (TaskGroup) getThis().getTaskSource()
                     .getTask();
             group.remove(childTask);
-            childTask.detachFromDependencies();
+            childTask.detachDependencies();
         }
 
         @Override
diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/TaskSource.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/TaskSource.java
index d4b82f85f..99d813ea1 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/TaskSource.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/TaskSource.java
@@ -306,8 +306,7 @@ public class TaskSource extends BaseEntity {
 
         @Override
         public TaskElement apply(IOptionalPersistence optionalPersistence) {
-            taskSource.getTask().detachFromDependencies();
-            taskSource.getTask().detachFromParent();
+            taskSource.getTask().detach();
             optionalPersistence.remove(taskSource);
             return null;
         }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java
index 4f6e7d81d..f20c3a41f 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/TaskElement.java
@@ -29,7 +29,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.ConcurrentModificationException;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -477,7 +476,7 @@ public abstract class TaskElement extends BaseEntity {
         return result;
     }
 
-    private void detachDependencies() {
+    public void detachDependencies() {
         detachOutcomingDependencies();
         detachIncomingDependencies();
     }
@@ -651,28 +650,6 @@ public abstract class TaskElement extends BaseEntity {
         this.advancePercentage = advancePercentage;
     }
 
-    public void detachFromDependencies() {
-        for (Dependency each : copy(getDependenciesWithThisDestination())) {
-            detachDependency(each);
-        }
-        for (Dependency each : copy(getDependenciesWithThisOrigin())) {
-            detachDependency(each);
-        }
-    }
-
-    /**
-     * Copy the dependencies to a list in order to avoid
-     * {@link ConcurrentModificationException}
-     */
-    private List<Dependency> copy(Set<Dependency> dependencies) {
-        return new ArrayList<Dependency>(dependencies);
-    }
-
-    private void detachDependency(Dependency each) {
-        each.getOrigin().removeDependencyWithDestination(each.getDestination(),
-                each.getType());
-    }
-
     private Integer sumOfHoursAllocated = 0;
 
     public void setSumOfHoursAllocated(Integer sumOfHoursAllocated) {