mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
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
This commit is contained in:
@@ -71,14 +71,14 @@ public final class DialogManager
|
|||||||
"' does not implement the required IDialogBean interface");
|
"' does not implement the required IDialogBean interface");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// create the DialogState object
|
||||||
|
this.currentDialogState = new DialogState(config, dialog);
|
||||||
|
|
||||||
// initialise the managed bean
|
// initialise the managed bean
|
||||||
dialog.init(this.paramsToApply);
|
dialog.init(this.paramsToApply);
|
||||||
|
|
||||||
// reset the current parameters so subsequent dialogs don't get them
|
// reset the current parameters so subsequent dialogs don't get them
|
||||||
this.paramsToApply = null;
|
this.paramsToApply = null;
|
||||||
|
|
||||||
// create the DialogState object
|
|
||||||
this.currentDialogState = new DialogState(config, dialog);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -79,15 +79,15 @@ public final class WizardManager
|
|||||||
"' does not implement the required IWizardBean interface");
|
"' does not implement the required IWizardBean interface");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// create the WizardState object
|
||||||
|
this.currentWizardState = new WizardState(config, wizard);
|
||||||
|
|
||||||
// initialise the managed bean
|
// initialise the managed bean
|
||||||
wizard.init(this.paramsToApply);
|
wizard.init(this.paramsToApply);
|
||||||
|
|
||||||
// reset the current parameters so subsequent wizards don't get them
|
// reset the current parameters so subsequent wizards don't get them
|
||||||
this.paramsToApply = null;
|
this.paramsToApply = null;
|
||||||
|
|
||||||
// create the WizardState object
|
|
||||||
this.currentWizardState = new WizardState(config, wizard);
|
|
||||||
|
|
||||||
// setup the first step
|
// setup the first step
|
||||||
determineCurrentPage();
|
determineCurrentPage();
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user