From 3be35bc1a9df2e0d6884f39323ba3bc7f7afa709 Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Sat, 25 Dec 2010 17:54:27 +0100
Subject: [PATCH] Rename removeDependenciesComponent() to
 removeDependenciesFor() and swap order of parameters in
 removeQueueElementFrom()

FEA: ItEr66OTS08CorreccionsRecursosLimitantesItEr65OTS04
---
 .../web/limitingresources/LimitingResourcesController.java    | 2 +-
 .../web/limitingresources/LimitingResourcesPanel.java         | 4 ++--
 .../web/limitingresources/ManualAllocationController.java     | 2 +-
 .../web/limitingresources/QueueListComponent.java             | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java
index 49f5eae5b..aa2e42306 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java
@@ -478,7 +478,7 @@ public class LimitingResourcesController extends GenericForwardComposer {
                     // another
                     LimitingResourceQueue queue = each.getLimitingResourceQueue();
                     // Remove all dependency components associated to element
-                    limitingResourcesPanel.removeDependencyComponentsFor(each);
+                    limitingResourcesPanel.removeDependenciesFor(each);
                     // Dependencies will be created again on refreshing queue
                     limitingResourcesPanel.refreshQueue(queue);
                 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java
index bb2aaa83f..96e101afb 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java
@@ -382,7 +382,7 @@ public class LimitingResourcesPanel extends HtmlMacroComponent {
         limitingResourcesController.unschedule(task);
         removeQueueTask(task);
         dependencyList.removeDependenciesFor(queueElement);
-        queueListComponent.removeQueueElementFrom(queueElement, queue);
+        queueListComponent.removeQueueElementFrom(queue, queueElement);
     }
 
     private void removeQueueTask(QueueTask task) {
@@ -400,7 +400,7 @@ public class LimitingResourcesPanel extends HtmlMacroComponent {
                 .getLimitingResourceQueueElement());
     }
 
-    public void removeDependencyComponentsFor(LimitingResourceQueueElement element) {
+    public void removeDependenciesFor(LimitingResourceQueueElement element) {
         dependencyList.removeDependenciesFor(element);
     }
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java
index c1d1124fc..4caf4e979 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java
@@ -294,7 +294,7 @@ public class ManualAllocationController extends GenericForwardComposer {
 
     private void refreshQueues(Collection<LimitingResourceQueueElement> movedElements) {
         for (LimitingResourceQueueElement each : movedElements) {
-            limitingResourcesPanel.removeDependencyComponentsFor(each);
+            limitingResourcesPanel.removeDependenciesFor(each);
             limitingResourcesPanel.refreshQueue(each.getLimitingResourceQueue());
         }
     }
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 c8ac991e6..6fbc24ed2 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
@@ -98,10 +98,10 @@ public class QueueListComponent extends HtmlMacroComponent implements
     }
 
     public void removeQueueElement(LimitingResourceQueueElement element) {
-        removeQueueElementFrom(element, element.getLimitingResourceQueue());
+        removeQueueElementFrom(element.getLimitingResourceQueue(), element);
     }
 
-    public void removeQueueElementFrom(LimitingResourceQueueElement element, LimitingResourceQueue queue) {
+    public void removeQueueElementFrom(LimitingResourceQueue queue, LimitingResourceQueueElement element) {
         QueueComponent queueComponent = fromQueueToComponent.get(queue);
         queueComponent.removeQueueElement(element);
     }