Merged V2.0 to HEAD

5297: PostgreSQL upgrade support
   5347: (From 1.4) EHCache configuration fixes and sample
   5380, 5381: AWC-1143
   5398: AWC-966


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5479 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-04-11 19:05:40 +00:00
parent 0dccbdcd20
commit 0a79a3db57
3 changed files with 17 additions and 5 deletions

View File

@@ -113,15 +113,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();
} }

View File

@@ -649,6 +649,19 @@ public class UIActions extends SelfRenderingComponent
this.verticalSpacing = verticalSpacing; this.verticalSpacing = verticalSpacing;
} }
// ------------------------------------------------------------------------------
// Helper methods
/**
* Resets the component to force a re-initialisation.
*/
public void reset()
{
// clear any child components and reset the list of groups
this.getChildren().clear();
this.groups.clear();
}
/** /**
* @return a unique ID for a JSF component * @return a unique ID for a JSF component
*/ */
@@ -657,7 +670,6 @@ public class UIActions extends SelfRenderingComponent
return "_id_" + Short.toString(++id); return "_id_" + Short.toString(++id);
} }
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
// Private data // Private data

View File

@@ -152,7 +152,7 @@ public class UISidebar extends SelfRenderingComponent
// update the child UIActions component with the correct // update the child UIActions component with the correct
// action group id and clear it's current children // action group id and clear it's current children
UIActions actions = (UIActions)this.getChildren().get(1); UIActions actions = (UIActions)this.getChildren().get(1);
actions.getChildren().clear(); actions.reset();
setupActionGroupId(context, actions); setupActionGroupId(context, actions);
} }
} }