Morning merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2812 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-05-10 14:46:54 +00:00
parent 7f6fabb0b6
commit 41976834d5
31 changed files with 799 additions and 195 deletions

View File

@@ -131,9 +131,9 @@ public abstract class BaseActionWizard extends BaseWizardBean
// Wizard implementation
@Override
public void init()
public void init(Map<String, String> parameters)
{
super.init();
super.init(parameters);
this.action = null;
this.users = null;