From 311be9b945c666a8f36a09acf4a352e687c229f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Thu, 17 Dec 2009 16:44:32 +0100
Subject: [PATCH] ItEr39S16CUConfiguracionMaquinasItEr35S09: Pushing up
 detaching common part

---
 .../business/planner/entities/DayAssignment.java           | 7 ++++++-
 .../business/planner/entities/GenericDayAssignment.java    | 5 +----
 .../business/planner/entities/SpecificDayAssignment.java   | 4 +---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java
index f547cd252..ad1e8e309 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/DayAssignment.java
@@ -141,6 +141,11 @@ public abstract class DayAssignment extends BaseEntity {
         getResource().addNewAssignments(Arrays.asList(this));
     }
 
-    abstract void detach();
+    final void detach() {
+        getResource().removeAssignments(Arrays.asList(this));
+        detachFromAllocation();
+    }
+
+    protected abstract void detachFromAllocation();
 
 }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssignment.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssignment.java
index 00eca8ec2..aba7044a8 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssignment.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssignment.java
@@ -20,7 +20,6 @@
 
 package org.navalplanner.business.planner.entities;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
@@ -81,10 +80,8 @@ public class GenericDayAssignment extends DayAssignment {
         this.genericResourceAllocation = genericResourceAllocation;
     }
 
-    @Override
-    void detach() {
+    protected void detachFromAllocation() {
         genericResourceAllocation = null;
-        getResource().removeAssignments(Arrays.asList(this));
     }
 
 }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificDayAssignment.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificDayAssignment.java
index 0d1160a8a..67e5cf864 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificDayAssignment.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificDayAssignment.java
@@ -20,7 +20,6 @@
 
 package org.navalplanner.business.planner.entities;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
@@ -83,8 +82,7 @@ public class SpecificDayAssignment extends DayAssignment {
     }
 
     @Override
-    void detach() {
+    protected void detachFromAllocation() {
         this.specificResourceAllocation = null;
-        getResource().removeAssignments(Arrays.asList(this));
     }
 }