From 6dc4a263e5f890e2a83009ea6e2fcb135262b1a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Sat, 5 Dec 2009 19:20:25 +0100
Subject: [PATCH] TabSwitcher is build inside afterCompose

---
 .../web/planner/tabs/MultipleTabsPlannerController.java   | 8 +-------
 navalplanner-webapp/src/main/webapp/planner/index.zul     | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
index 613a3b56b..8bbd16ff7 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
@@ -103,13 +103,6 @@ public class MultipleTabsPlannerController implements Composer {
     @Autowired
     private IResourceDAO resourceDAO;
 
-    public TabsConfiguration getTabs() {
-        if (tabsConfiguration == null) {
-            tabsConfiguration = buildTabsConfiguration();
-        }
-        return tabsConfiguration;
-    }
-
     private TabsConfiguration buildTabsConfiguration() {
         planningTab = PlanningTabCreator.create(mode,
                 companyPlanningController, orderPlanningController, orderDAO,
@@ -199,6 +192,7 @@ public class MultipleTabsPlannerController implements Composer {
     public void doAfterCompose(org.zkoss.zk.ui.Component comp) throws Exception {
         tabsSwitcher = (TabSwitcher) comp;
         breadcrumbs = comp.getPage().getFellow("breadcrumbs");
+        tabsSwitcher.setConfiguration(buildTabsConfiguration());
     }
 
     private TabsRegistry getTabsRegistry() {
diff --git a/navalplanner-webapp/src/main/webapp/planner/index.zul b/navalplanner-webapp/src/main/webapp/planner/index.zul
index 59e68e96b..449d32d47 100644
--- a/navalplanner-webapp/src/main/webapp/planner/index.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/index.zul
@@ -37,6 +37,6 @@
     <div id="idContextMenuTaskAssignment">
         <div />
     </div>
-    <tabSwitcher self="@{define(content)}" configuration="@{multipleTabsPlanner.tabs}" apply="${multipleTabsPlanner}">
+    <tabSwitcher self="@{define(content)}" apply="${multipleTabsPlanner}">
     </tabSwitcher>
 </zk>
\ No newline at end of file