From 8bc5b9f7e9a5afcdbdc57d928cb54e3b3cd97433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Thu, 18 Mar 2010 16:11:30 +0100
Subject: [PATCH] ItEr51S04ValidacionEProbasFuncionaisItEr50S04: Avoiding
 repeated load of data for OrderPlanningModel.

---
 .../web/planner/order/OrderPlanningController.java   | 12 ++++++------
 .../web/planner/tabs/PlanningTabCreator.java         |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java
index fae6959a9..8d7a63735 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java
@@ -130,9 +130,6 @@ public class OrderPlanningController implements Composer {
 
     @Override
     public void doAfterCompose(org.zkoss.zk.ui.Component comp) throws Exception {
-        if (order == null) {
-            throw new IllegalStateException("an order should have been set");
-        }
         this.planner = (Planner) comp;
         String zoomLevelParameter = null;
         if ((parameters != null) && (parameters.get("zoom") != null)
@@ -166,9 +163,12 @@ public class OrderPlanningController implements Composer {
     }
 
     private void updateConfiguration() {
-        model.setConfigurationToPlanner(planner, order, viewSwitcher,
-                editTaskController, calendarAllocationController, additional);
-        planner.updateSelectedZoomLevel();
+        if (order != null) {
+            model.setConfigurationToPlanner(planner, order, viewSwitcher,
+                    editTaskController, calendarAllocationController,
+                    additional);
+            planner.updateSelectedZoomLevel();
+        }
     }
 
     public EditTaskController getEditTaskController() {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java
index b1e75a1e3..cd09d2db1 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java
@@ -175,7 +175,6 @@ public class PlanningTabCreator {
             public org.zkoss.zk.ui.Component create(
                     org.zkoss.zk.ui.Component parent) {
                 Map<String, Object> arguments = new HashMap<String, Object>();
-                orderPlanningController.setOrder(mode.getOrder());
                 arguments.put("orderPlanningController",
                         orderPlanningController);
                 orderPlanningController.setURLParameters(parameters);