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

ItEr59S08CUAsignacionRecursosLimitantesItEr58S10: Fix bug remove dependecies on inserting a new queue element directly into queue

Browse source
This commit is contained in:
Diego Pino Garcia 2010-06-02 19:38:30 +02:00 • committed by Javier Moran Rua
parent f98722cab8
commit 7fbfd62f25
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java
View file

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

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

@ -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() {