From 2b4be85656349fd9228fc2eeb63204abaaaa8d21 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Mon, 10 Dec 2012 09:08:00 +0100 Subject: [PATCH] Revert "Bug #1590: Fix problem calling several times the same method in OrderModel" This reverts commit 7ca0d43883d6ddc78f3346695867b2a94d5461d8. --- .../main/java/org/zkoss/ganttz/TabsRegistry.java | 15 +-------------- .../java/org/zkoss/ganttz/extensions/ITab.java | 2 -- .../org/zkoss/ganttz/extensions/TabProxy.java | 5 ----- .../web/planner/tabs/CreatedOnDemandTab.java | 15 --------------- .../tabs/MultipleTabsPlannerController.java | 2 +- .../web/planner/tabs/OrdersTabCreator.java | 7 ++----- .../libreplan/web/planner/tabs/TabOnModeType.java | 9 --------- 7 files changed, 4 insertions(+), 51 deletions(-) diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TabsRegistry.java b/ganttzk/src/main/java/org/zkoss/ganttz/TabsRegistry.java index 23db9e97b..e9b98b2ef 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/TabsRegistry.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/TabsRegistry.java @@ -65,23 +65,10 @@ public class TabsRegistry { show(tab, DO_NOTHING); } - public void showWithoutAfterCreate(ITab tab) { - show(tab, DO_NOTHING, false); - } - public void show(ITab tab, IBeforeShowAction beforeShowAction) { - show(tab, beforeShowAction, true); - } - - private void show(ITab tab, IBeforeShowAction beforeShowAction, - boolean afterCreate) { hideAllExcept(tab); beforeShowAction.doAction(); - if (afterCreate) { - tab.show(); - } else { - tab.showWithoutAfterCreate(); - } + tab.show(); parent.invalidate(); activateMenuIfRegistered(tab); } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/extensions/ITab.java b/ganttzk/src/main/java/org/zkoss/ganttz/extensions/ITab.java index d822d2fa5..7645a8047 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/extensions/ITab.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/extensions/ITab.java @@ -37,8 +37,6 @@ public interface ITab { void show(); - void showWithoutAfterCreate(); - void hide(); } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/extensions/TabProxy.java b/ganttzk/src/main/java/org/zkoss/ganttz/extensions/TabProxy.java index 096d92fa5..2fbd04ce7 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/extensions/TabProxy.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/extensions/TabProxy.java @@ -53,11 +53,6 @@ public class TabProxy implements ITab { proxiedTab.show(); } - @Override - public void showWithoutAfterCreate() { - proxiedTab.showWithoutAfterCreate(); - } - @Override public String getCssClass() { return proxiedTab.getCssClass(); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/CreatedOnDemandTab.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/CreatedOnDemandTab.java index b7ef835fd..ebba95f83 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/CreatedOnDemandTab.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/CreatedOnDemandTab.java @@ -72,21 +72,9 @@ public class CreatedOnDemandTab implements ITab { @Override public void show() { - show(true); - } - - @Override - public void showWithoutAfterCreate() { - show(false); - } - - private void show(boolean afterCreate) { beforeShowAction(); if (component == null) { component = componentCreator.create(parent); - if (afterCreate) { - afterCreateAction(component); - } } component.setParent(parent); afterShowAction(); @@ -102,9 +90,6 @@ public class CreatedOnDemandTab implements ITab { protected void beforeShowAction() { } - protected void afterCreateAction(Component component) { - } - protected void afterShowAction() { } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java index 824245410..9cc20d977 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java @@ -472,7 +472,7 @@ public class MultipleTabsPlannerController implements Composer, @Override public void goToOrdersList() { // ordersTab.show(); - getTabsRegistry().showWithoutAfterCreate(ordersTab); + getTabsRegistry().show(ordersTab); } public void goToCreateForm() { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java index 6b822bede..15ecc5a39 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/OrdersTabCreator.java @@ -68,6 +68,8 @@ public class OrdersTabCreator { args.put("orderController", setupOrderCrudController()); result = Executions.createComponents("/orders/_ordersTab.zul", parent, args); + Util.createBindingsFor(result); + Util.reloadBindings(result); return result; } @@ -108,11 +110,6 @@ public class OrdersTabCreator { } } - @Override - protected void afterCreateAction(org.zkoss.zk.ui.Component component) { - Util.createBindingsFor(component); - } - @Override protected void afterShowAction() { orderCRUDController.goToList(); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/TabOnModeType.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/TabOnModeType.java index f56f08168..6f92e1880 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/TabOnModeType.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/TabOnModeType.java @@ -140,13 +140,4 @@ public class TabOnModeType implements ITab { } } - @Override - public void showWithoutAfterCreate() { - beingShown = true; - ITab currentTab = getCurrentTab(); - if (currentTab != null) { - currentTab.showWithoutAfterCreate(); - } - } - }