From 19960c90d47b264fb5eb0bb19ea9a1e9639ad1f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Wed, 14 Oct 2009 23:59:15 +0200
Subject: [PATCH] ItEr30S17ValidacionEProbasFuncionais: Removing unnecessary
 reference to PlanningState. Bug #22.

---
 .../web/planner/CompanyPlanningModel.java     | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPlanningModel.java
index a7cc2ac8b..4dbe14a4f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPlanningModel.java
@@ -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) {