RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename removeDependenciesComponent() to removeDependenciesFor() and swap order of parameters in removeQueueElementFrom()

Browse source 
FEA: ItEr66OTS08CorreccionsRecursosLimitantesItEr65OTS04
This commit is contained in:
Diego Pino Garcia 2010-12-25 17:54:27 +01:00
parent 0fa470ba82
commit 3be35bc1a9
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java
View file

@ -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);
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java
View file

@ -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);
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java
View file

@ -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());
}
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueListComponent.java
View file

@ -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);
}