From af96a69ca1b93b7ca6624dc50a47c620cc18f925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Tue, 31 Aug 2010 11:36:41 +0200
Subject: [PATCH] Remove useless methods, some of them to force loading some
 data.

FEA: ItEr60S17CambiosPantallaVistaEmpresa
---
 .../planner/company/CompanyPlanningModel.java | 57 +------------------
 .../company/ICompanyPlanningModel.java        |  2 -
 2 files changed, 1 insertion(+), 58 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
index a9d043244..f98a9a926 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
@@ -48,7 +48,6 @@ import org.navalplanner.business.common.daos.IConfigurationDAO;
 import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
 import org.navalplanner.business.orders.daos.IOrderDAO;
 import org.navalplanner.business.orders.entities.Order;
-import org.navalplanner.business.orders.entities.OrderElement;
 import org.navalplanner.business.orders.entities.OrderStatusEnum;
 import org.navalplanner.business.planner.daos.IDayAssignmentDAO;
 import org.navalplanner.business.planner.daos.ITaskElementDAO;
@@ -174,8 +173,6 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
 
     private Scenario currentScenario;
 
-    private List<Order> ordersToShow;
-
     private Date filterStartDate;
     private Date filterFinishDate;
     private static final EnumSet<OrderStatusEnum> STATUS_VISUALIZED = EnumSet
@@ -655,25 +652,14 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
         List<TaskElement> toShow;
         toShow = retainOnlyTopLevel(predicate);
 
-        forceLoadOfDataAssociatedTo(toShow);
-        forceLoadOfDependenciesCollections(toShow);
-        forceLoadOfWorkingHours(toShow);
-        forceLoadOfLabels(toShow);
         return new PlannerConfiguration<TaskElement>(taskElementAdapter,
                 new TaskElementNavigator(), toShow);
     }
 
-    private void forceLoadOfDataAssociatedTo(List<TaskElement> toShow) {
-        for (TaskElement each : toShow) {
-            OrderPlanningModel.forceLoadOfDataAssociatedTo(each);
-        }
-    }
-
-
     private List<TaskElement> retainOnlyTopLevel(IPredicate predicate) {
         List<TaskElement> result = new ArrayList<TaskElement>();
         User user;
-        ordersToShow = new ArrayList<Order>();
+        List<Order> ordersToShow = new ArrayList<Order>();
 
         try {
             user = userDAO.findByLoginName(SecurityUtils.getSessionUserLoginName());
@@ -724,50 +710,9 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
         return result;
     }
 
-    private void forceLoadOfWorkingHours(List<TaskElement> initial) {
-        for (TaskElement taskElement : initial) {
-            OrderElement orderElement = taskElement.getOrderElement();
-            if (orderElement != null) {
-                orderElement.getWorkHours();
-            }
-            if (!taskElement.isLeaf()) {
-                forceLoadOfWorkingHours(taskElement.getChildren());
-            }
-        }
-    }
-
-    private void forceLoadOfDependenciesCollections(
-            Collection<? extends TaskElement> elements) {
-        for (TaskElement task : elements) {
-            forceLoadOfDepedenciesCollections(task);
-            if (!task.isLeaf()) {
-                forceLoadOfDependenciesCollections(task.getChildren());
-            }
-        }
-    }
-
-    private void forceLoadOfDepedenciesCollections(TaskElement task) {
-        task.getDependenciesWithThisOrigin().size();
-        task.getDependenciesWithThisDestination().size();
-    }
-
-    private void forceLoadOfLabels(List<TaskElement> initial) {
-        for (TaskElement taskElement : initial) {
-            OrderElement orderElement = taskElement.getOrderElement();
-            if (orderElement != null) {
-                orderElement.getLabels().size();
-            }
-        }
-    }
-
     // spring method injection
     protected abstract ITaskElementAdapter getTaskElementAdapter();
 
-    @Override
-    public List<Order> getOrdersToShow() {
-        return ordersToShow;
-    }
-
     @Override
     public Date getFilterStartDate() {
         return filterStartDate;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/ICompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/ICompanyPlanningModel.java
index 1287c1296..6bcfe097e 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/ICompanyPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/ICompanyPlanningModel.java
@@ -52,8 +52,6 @@ public interface ICompanyPlanningModel {
 
     public void setTabsController(MultipleTabsPlannerController tabsController);
 
-    List<Order> getOrdersToShow();
-
     Date getFilterStartDate();
 
     Date getFilterFinishDate();