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

ItEr30S17ValidacionEProbasFuncionais: Exposing root task group in PlanningState. Bug #22

Browse source
This commit is contained in:
Óscar González Fernández 2009-10-15 00:04:05 +02:00
parent 19960c90d4
commit cb9be80c51
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java
View file

@ -229,7 +229,9 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
Order orderReloaded) {
ITaskElementAdapter taskElementAdapter = getTaskElementAdapter();
taskElementAdapter.setOrder(orderReloaded);
planningState = new PlanningState(orderReloaded.getAssociatedTasks(),
planningState = new PlanningState(orderReloaded
.getAssociatedTaskElement(),
orderReloaded.getAssociatedTasks(),
resourceDAO.list(Resource.class));
forceLoadOfDependenciesCollections(planningState.getInitial());

11
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/PlanningState.java
View file

@ -28,6 +28,7 @@ import java.util.List;
import java.util.Set;
import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.business.planner.entities.TaskGroup;
import org.navalplanner.business.planner.entities.TaskMilestone;
import org.navalplanner.business.resources.daos.IResourceDAO;
import org.navalplanner.business.resources.entities.Resource;
@ -41,8 +42,12 @@ public class PlanningState {
private Set<Resource> resources = new HashSet<Resource>();
public PlanningState(Collection<? extends TaskElement> initialState,
private final TaskGroup rootTask;
public PlanningState(TaskGroup rootTask,
Collection<? extends TaskElement> initialState,
Collection<? extends Resource> initialResources) {
this.rootTask = rootTask;
this.initial = new ArrayList<TaskElement>(initialState);
this.toSave = new HashSet<TaskElement>(initialState);
this.toRemove = new HashSet<TaskElement>();
@ -106,4 +111,8 @@ public class PlanningState {
toRemove.remove(taskElement);
toSave.add(taskElement);
}
public TaskGroup getRootTask() {
return rootTask;
}
}