From b3e2a7e1543fcd8ee03edb9649866bd1c72915d0 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Mon, 23 Oct 2006 13:43:47 +0000 Subject: [PATCH] Merged V1.4 to HEAD svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4199 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4200 . git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4201 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/web/bean/dialog/DialogManager.java | 6 +++--- source/java/org/alfresco/web/bean/wizard/WizardManager.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/java/org/alfresco/web/bean/dialog/DialogManager.java b/source/java/org/alfresco/web/bean/dialog/DialogManager.java index f4238e9131..272266819e 100644 --- a/source/java/org/alfresco/web/bean/dialog/DialogManager.java +++ b/source/java/org/alfresco/web/bean/dialog/DialogManager.java @@ -71,14 +71,14 @@ public final class DialogManager "' does not implement the required IDialogBean interface"); } + // create the DialogState object + this.currentDialogState = new DialogState(config, dialog); + // initialise the managed bean dialog.init(this.paramsToApply); // reset the current parameters so subsequent dialogs don't get them this.paramsToApply = null; - - // create the DialogState object - this.currentDialogState = new DialogState(config, dialog); } /** diff --git a/source/java/org/alfresco/web/bean/wizard/WizardManager.java b/source/java/org/alfresco/web/bean/wizard/WizardManager.java index 6d705ab83f..d19e44db38 100644 --- a/source/java/org/alfresco/web/bean/wizard/WizardManager.java +++ b/source/java/org/alfresco/web/bean/wizard/WizardManager.java @@ -79,15 +79,15 @@ public final class WizardManager "' does not implement the required IWizardBean interface"); } + // create the WizardState object + this.currentWizardState = new WizardState(config, wizard); + // initialise the managed bean wizard.init(this.paramsToApply); // reset the current parameters so subsequent wizards don't get them this.paramsToApply = null; - // create the WizardState object - this.currentWizardState = new WizardState(config, wizard); - // setup the first step determineCurrentPage(); }