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

Added method addDependenciesFor()

Browse source 
FEA: ItEr66OTS08CorreccionsRecursosLimitantesItEr65OTS04
This commit is contained in:
Diego Pino Garcia 2010-12-25 17:49:35 +01:00
parent 3919489159
commit bdee58be1a
3 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingDependencyList.java
View file

@ -56,13 +56,22 @@ public class LimitingDependencyList extends XulElement implements AfterCompose {
this.panel = panel;
}
public void addDependenciesFor(LimitingResourceQueueElement queueElement) {
for (LimitingResourceQueueDependency origin: queueElement.getDependenciesAsOrigin()) {
addDependency(origin);
}
for (LimitingResourceQueueDependency destiny: queueElement.getDependenciesAsDestiny()) {
addDependency(destiny);
}
}
/**
* Inserts a new dependency and creates a dependency component between task
* components only if both are shown in the planner
*
* @param dependency
*/
public void addDependency(LimitingResourceQueueDependency dependency) {
private void addDependency(LimitingResourceQueueDependency dependency) {
if (!dependencies.keySet().contains(dependency)) {
LimitingDependencyComponent dependencyComponent = createDependencyComponent(dependency);
if (dependencyComponent != null) {

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

@ -158,6 +158,7 @@ public class LimitingResourcesPanel extends HtmlMacroComponent {
public void appendQueueElementToQueue(LimitingResourceQueueElement element) {
queueListComponent.appendQueueElement(element);
dependencyList.addDependenciesFor(element);
}
public void removeQueueElementFromQueue(LimitingResourceQueueElement element) {
@ -345,19 +346,11 @@ public class LimitingResourcesPanel extends HtmlMacroComponent {
.getLimitingResourceElementToQueueTaskMap().keySet();
for (LimitingResourceQueueElement each : queueElements) {
for (LimitingResourceQueueDependency dependency : each
.getDependenciesAsOrigin()) {
addDependencyComponent(dependency);
}
dependencyList.addDependenciesFor(each);
}
return dependencyList;
}
public void addDependencyComponent(
LimitingResourceQueueDependency dependency) {
dependencyList.addDependency(dependency);
}
public Map<LimitingResourceQueueElement, QueueTask> getQueueTaskMap() {
return queueListComponent.getLimitingResourceElementToQueueTaskMap();
}
@ -410,6 +403,10 @@ public class LimitingResourcesPanel extends HtmlMacroComponent {
dependencyList.removeDependenciesFor(element);
}
public void addDependenciesFor(LimitingResourceQueueElement element) {
dependencyList.addDependenciesFor(element);
}
public void refreshQueue(LimitingResourceQueue queue) {
dependencyList.removeDependenciesFor(queue);
queueListComponent.refreshQueue(queue);

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

@ -29,7 +29,6 @@ import java.util.List;
import java.util.Set;
import java.util.SortedSet;
import org.joda.time.DateTime;
import org.joda.time.Duration;
import org.joda.time.LocalDate;
import org.navalplanner.business.common.exceptions.ValidationException;
@ -40,7 +39,6 @@ import org.navalplanner.business.planner.entities.ResourceAllocation;
import org.navalplanner.business.planner.entities.SpecificResourceAllocation;
import org.navalplanner.business.planner.entities.Task;
import org.navalplanner.business.planner.limiting.entities.DateAndHour;
import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueDependency;
import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement;
import org.navalplanner.business.resources.entities.Criterion;
import org.navalplanner.business.resources.entities.LimitingResourceQueue;
@ -448,15 +446,7 @@ public class QueueComponent extends XulElement implements
}
private void addDependenciesInPanel(LimitingResourceQueueElement element) {
final LimitingResourcesPanel panel = getLimitingResourcesPanel();
for (LimitingResourceQueueDependency each : element
.getDependenciesAsDestiny()) {
panel.addDependencyComponent(each);
}
for (LimitingResourceQueueDependency each : element
.getDependenciesAsOrigin()) {
panel.addDependencyComponent(each);
}
getLimitingResourcesPanel().addDependenciesFor(element);
}
public String getResourceName() {