From 1978d7a52bd86d943735589b501b80ca29430b32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Thu, 30 Jul 2009 11:43:43 +0200 Subject: [PATCH] ItEr18S09CUCreacionProxectoPlanificacionItEr17S10. Avoiding errors at save after saving. >From 5394a742bbcf6676d6c751c73bafe69545fc54a8 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 28 Jul 2009 20:17:49 +0200 Subject: [PATCH] ItEr18S09CUCreacionProxectoPlanificacionItEr17S10: Avoiding error when saving after doing some merges. --- .../org/navalplanner/web/planner/PlanningState.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/PlanningState.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/PlanningState.java index 45ea5eff4..92b24b0b0 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/PlanningState.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/PlanningState.java @@ -47,11 +47,21 @@ public class PlanningState { public void removed(TaskElement taskElement) { taskElement.detach(); + if (!isTopLevel(taskElement)) { + return; + } toSave.remove(taskElement); toRemove.add(taskElement); } + private boolean isTopLevel(TaskElement taskElement) { + return taskElement.getParent() == null; + } + public void added(TaskElement taskElement) { + if (!isTopLevel(taskElement)) { + return; + } toRemove.remove(taskElement); toSave.add(taskElement); }