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

ItEr30S17ValidacionEProbasFuncionais: Removing unnecessary reference to PlanningState. Bug #22.

Browse source
This commit is contained in:
Óscar González Fernández 2009-10-14 23:59:15 +02:00
parent b045ba381a
commit 19960c90d4
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPlanningModel.java
View file

@ -22,13 +22,12 @@ package org.navalplanner.web.planner;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
@ -84,8 +83,6 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
@Autowired
private IOrderDAO orderDAO;
private PlanningState planningState;
@Autowired
private IResourceDAO resourceDAO;
@ -175,18 +172,17 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
private PlannerConfiguration<TaskElement> createConfiguration() {
ITaskElementAdapter taskElementAdapter = getTaskElementAdapter();
planningState = new PlanningState(retainOnlyTopLevel(), resourceDAO
.list(Resource.class));
forceLoadOfDependenciesCollections(planningState.getInitial());
forceLoadOfWorkingHours(planningState.getInitial());
forceLoadOfLabels(planningState.getInitial());
List<TaskElement> toShow = retainOnlyTopLevel();
forceLoadOfDependenciesCollections(toShow);
forceLoadOfWorkingHours(toShow);
forceLoadOfLabels(toShow);
return new PlannerConfiguration<TaskElement>(taskElementAdapter,
new TaskElementNavigator(), planningState.getInitial());
new TaskElementNavigator(), toShow);
}
private Collection<? extends TaskElement> retainOnlyTopLevel() {
private List<TaskElement> retainOnlyTopLevel() {
List<Order> list = orderDAO.list(Order.class);
Set<TaskElement> result = new HashSet<TaskElement>();
List<TaskElement> result = new ArrayList<TaskElement>();
for (Order order : list) {
TaskGroup associatedTaskElement = order.getAssociatedTaskElement();
if (associatedTaskElement != null) {