From 7fbfd62f2513a564ebf4ef24451d093612d5ac38 Mon Sep 17 00:00:00 2001 From: Diego Pino Garcia Date: Wed, 2 Jun 2010 19:38:30 +0200 Subject: [PATCH] ItEr59S08CUAsignacionRecursosLimitantesItEr58S10: Fix bug remove dependecies on inserting a new queue element directly into queue --- .../web/limitingresources/QueueComponent.java | 15 +++++++++++++++ .../web/limitingresources/QueueListComponent.java | 15 --------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java index 3d240c916..e8759dfba 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java @@ -32,6 +32,7 @@ import java.util.SortedSet; import org.navalplanner.business.common.exceptions.ValidationException; import org.navalplanner.business.orders.entities.OrderElement; import org.navalplanner.business.planner.entities.GenericResourceAllocation; +import org.navalplanner.business.planner.entities.LimitingResourceQueueDependency; import org.navalplanner.business.planner.entities.LimitingResourceQueueElement; import org.navalplanner.business.planner.entities.ResourceAllocation; import org.navalplanner.business.planner.entities.SpecificResourceAllocation; @@ -253,6 +254,7 @@ public class QueueComponent extends XulElement implements QueueTask queueTask = createQueueTask(element); appendQueueTask(queueTask); appendMenu(queueTask); + addDependenciesInPanel(element); } private QueueTask createQueueTask(LimitingResourceQueueElement element) { @@ -260,6 +262,19 @@ public class QueueComponent extends XulElement implements return createDivForElement(timeTracker.getMapper(), element); } + private void addDependenciesInPanel(LimitingResourceQueueElement element) { + LimitingResourcesPanel panel = LimitingResourcesPanel + .getLimitingResourcesPanel(this); + for (LimitingResourceQueueDependency each : element + .getDependenciesAsDestiny()) { + panel.addDependencyComponent(each); + } + for (LimitingResourceQueueDependency each : element + .getDependenciesAsOrigin()) { + panel.addDependencyComponent(each); + } + } + public String getResourceName() { return limitingResourceQueue.getResource().getName(); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueListComponent.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueListComponent.java index c17f8071a..2b0dd7e7b 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueListComponent.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueListComponent.java @@ -25,7 +25,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.navalplanner.business.planner.entities.LimitingResourceQueueDependency; import org.navalplanner.business.planner.entities.LimitingResourceQueueElement; import org.navalplanner.business.resources.entities.LimitingResourceQueue; import org.zkoss.ganttz.timetracker.TimeTracker; @@ -92,7 +91,6 @@ public class QueueListComponent extends HtmlMacroComponent implements QueueComponent queueComponent = fromQueueToComponent.get(element .getLimitingResourceQueue()); queueComponent.appendQueueElement(element); - addDependenciesInPanel(element); } public void refreshQueue(LimitingResourceQueue queue) { @@ -101,19 +99,6 @@ public class QueueListComponent extends HtmlMacroComponent implements queueComponent.invalidate(); } - private void addDependenciesInPanel(LimitingResourceQueueElement element) { - LimitingResourcesPanel panel = LimitingResourcesPanel - .getLimitingResourcesPanel(this); - for (LimitingResourceQueueDependency each : element - .getDependenciesAsDestiny()) { - panel.addDependencyComponent(each); - } - for (LimitingResourceQueueDependency each : element - .getDependenciesAsOrigin()) { - panel.addDependencyComponent(each); - } - } - private IZoomLevelChangedListener adjustTimeTrackerSizeListener() { return new IZoomLevelChangedListener() {