- adding aspect to webapp nodes to differentiate them from ordinary folders in the avm_webapps directory

- refactoring of generate and regenerate calls to take a FormInstanceData object
- adding in support for overriding step title and description properties in wizards so as to be able to format them with parameters
- making the step descriptions in create form wizard reiterate the form name so as to give the user better context
- displaying avm task resources in the manage task screen.  still need to get actions working and clean this up a bit.
- making output path patterns sandbox relative
- refactored utility method for combining avm paths sensitive to webapp vs sandbox relative paths.
- adding a default description for generated renditions

todo:
- cleanup some usage of AVMNode from ManageTaskBean
- get actions to appear in manage task screen
- add a multi value property to the web project for all its webapps
- properly use overridden values for forms from the web project settings

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/bean/wizard/WizardManager.java

@@ -206,7 +206,6 @@ public final class WizardManager
    {
       // try and get the description directly from the dialog
       String desc = this.currentWizardState.getWizard().getContainerDescription();
-      
       if (desc == null)
       {
          // try and get the description via a message bundle key
@@ -324,18 +323,15 @@ public final class WizardManager
     */
    public String getStepTitle()
    {
-      String title = this.currentWizardState.getCurrentPageCfg().getTitleId();
-      
-      if (title != null)
+      String result = this.currentWizardState.getWizard().getStepTitle();
+      if (result == null)
       {
-         title = Application.getMessage(FacesContext.getCurrentInstance(), title);
+         result = this.currentWizardState.getCurrentPageCfg().getTitleId();
+         result = (result != null
+                   ? Application.getMessage(FacesContext.getCurrentInstance(), result)
+                   : this.currentWizardState.getCurrentPageCfg().getTitle());
       }
-      else
-      {
-         title = this.currentWizardState.getCurrentPageCfg().getTitle();
-      }
-      
-      return title;
+      return result;
    }
    
    /**
@@ -345,18 +341,15 @@ public final class WizardManager
     */
    public String getStepDescription()
    {
-      String desc = this.currentWizardState.getCurrentPageCfg().getDescriptionId();
-      
-      if (desc != null)
+      String result = this.currentWizardState.getWizard().getStepDescription();
+      if (result == null)
       {
-         desc = Application.getMessage(FacesContext.getCurrentInstance(), desc);
+         result = this.currentWizardState.getCurrentPageCfg().getDescriptionId();
+         result = (result != null
+                   ? Application.getMessage(FacesContext.getCurrentInstance(), result)
+                   : this.currentWizardState.getCurrentPageCfg().getDescription());
       }
-      else
-      {
-         desc = this.currentWizardState.getCurrentPageCfg().getDescription();
-      }
-      
-      return desc;
+      return result;
    }
    
    /**
@@ -397,14 +390,8 @@ public final class WizardManager
     */
    public boolean getNextButtonDisabled()
    {
-      if (this.currentWizardState.getCurrentStep() == this.currentWizardState.getSteps().size())
-      {
-         return true;
-      }
-      else
-      {
-         return this.currentWizardState.getWizard().getNextButtonDisabled();
-      }
+      return (this.currentWizardState.getCurrentStep() == this.currentWizardState.getSteps().size() ||
+              this.currentWizardState.getWizard().getNextButtonDisabled());
    }
    
    /**
@@ -424,14 +411,7 @@ public final class WizardManager
     */
    public boolean getBackButtonDisabled()
    {
-      if (this.currentWizardState.getCurrentStep() == 1)
-      {
-         return true;
-      }
-      else
-      {
-         return false;
-      }
+      return this.currentWizardState.getCurrentStep() == 1;
    }
    
    /**
@@ -461,14 +441,8 @@ public final class WizardManager
     */
    public boolean getFinishButtonDisabled()
    {
-      if (this.currentWizardState.getCurrentStep() == this.currentWizardState.getSteps().size())
-      {
-         return false;
-      }
-      else
-      {
-         return this.currentWizardState.getWizard().getFinishButtonDisabled();
-      }
+      return (this.currentWizardState.getCurrentStep() != this.currentWizardState.getSteps().size() &&
+              this.currentWizardState.getWizard().getFinishButtonDisabled());
    }
    
    /**