From 6baf5d0459c4ab61b23a5cbbb461d75aad07b0f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Thu, 9 Aug 2012 13:06:02 +0200
Subject: [PATCH] Small code refactor.

---
 .../web/orders/OrderCRUDController.java       | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
index 11c50b996..cd4518eb2 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
@@ -136,8 +136,7 @@ public class OrderCRUDController extends GenericForwardComposer {
         showOrderElementFilter();
         showCreateButtons(false);
         orderModel.prepareCreationFrom(template, getDesktop());
-        prepareEditWindow();
-        showEditWindow(_("Create project from Template"));
+        prepareEditWindow(_("Create project from Template"));
     }
 
     @Resource
@@ -939,15 +938,7 @@ public class OrderCRUDController extends GenericForwardComposer {
         }
 
         orderModel.initEdit(order, getDesktop());
-        if (editWindow != null) {
-            resetTabControllers();
-            setupOrderElementTreeController();
-            selectDefaultTab();
-            return;
-        }
-
-        prepareEditWindow();
-        showEditWindow(_("Edit project"));
+        prepareEditWindow(_("Edit project"));
     }
 
     private Desktop getDesktop() {
@@ -965,11 +956,16 @@ public class OrderCRUDController extends GenericForwardComposer {
         orderAuthorizationController = null;
     }
 
-    private void prepareEditWindow() {
+    private void prepareEditWindow(String title) {
+        resetTabControllers();
         addEditWindowIfNecessary();
         updateDisabilitiesOnInterface();
         setupOrderElementTreeController();
         selectDefaultTab();
+
+        if (editWindow == null) {
+            showEditWindow(title);
+        }
     }
 
     private void showEditWindow(String title) {
@@ -1069,8 +1065,7 @@ public class OrderCRUDController extends GenericForwardComposer {
     public void editNewCreatedOrder(Window detailsWindow) {
         showOrderElementFilter();
         hideCreateButtons();
-        prepareEditWindow();
-        showEditWindow(_("Create project"));
+        prepareEditWindow(_("Create project"));
         detailsWindow.setVisible(false);
         setupOrderAuthorizationController();
         detailsWindow.getAttributes();