- Added dynamic title and description support to dialog and wizard framework

- Rationalised debugging through workfllow pages

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

source/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java

@@ -59,11 +59,11 @@ public class ManageTaskDialog extends BaseDialogBean
    protected List<String> packageItemsToRemove;
    protected String[] itemsToAdd;
    protected boolean isItemBeingAdded = false;
-
+   
+   protected final Log logger = LogFactory.getLog(getClass());
+   
    protected static final String ID_PREFIX = "transition_";
    protected static final String CLIENT_ID_PREFIX = AlfrescoNavigationHandler.DIALOG_PREFIX + ID_PREFIX;
-   
-   private static final Log logger = LogFactory.getLog(ManageTaskDialog.class);
 
    // ------------------------------------------------------------------------------
    // Dialog implementation
@@ -117,8 +117,11 @@ public class ManageTaskDialog extends BaseDialogBean
          }
          
          if (logger.isDebugEnabled())
-            logger.debug("Found workflow package for task '" + 
-                  this.task.id + "': " + this.workflowPackage );
+         {
+            logger.debug("Task: " + this.task);
+            logger.debug("Trasient node: " + this.taskNode);
+            logger.debug("Workflow package: " + this.workflowPackage );
+         }
       }
    }
 
@@ -143,6 +146,9 @@ public class ManageTaskDialog extends BaseDialogBean
       // prepare the edited parameters for saving
       Map<QName, Serializable> params = WorkflowBean.prepareTaskParams(this.taskNode);
       
+      if (logger.isDebugEnabled())
+         logger.debug("Saving task with parameters: " + params);
+      
       // remove any items the user selected to remove 
       if (this.workflowPackage != null && this.packageItemsToRemove != null && 
           this.packageItemsToRemove.size() > 0)
@@ -210,7 +216,21 @@ public class ManageTaskDialog extends BaseDialogBean
    {
       return false;
    }
-
+   
+   @Override
+   public String getTitle()
+   {
+      String titleStart = Application.getMessage(FacesContext.getCurrentInstance(), "manage_task_title");
+         
+      return titleStart + ": " + this.task.title;
+   }
+   
+   @Override
+   public String getDescription()
+   {
+      return this.task.description;
+   }
+      
    // ------------------------------------------------------------------------------
    // Event handlers
 
@@ -220,7 +240,7 @@ public class ManageTaskDialog extends BaseDialogBean
       String outcome = getDefaultFinishOutcome();
       
       if (logger.isDebugEnabled())
-         logger.debug("Transitioning task: " + this.taskNode.getId());
+         logger.debug("Transitioning task: " + this.task.id);
       
       // to find out which transition button was pressed we need
       // to look for the button's id in the request parameters,
@@ -252,6 +272,9 @@ public class ManageTaskDialog extends BaseDialogBean
             // prepare the edited parameters for saving
             Map<QName, Serializable> params = WorkflowBean.prepareTaskParams(this.taskNode);
       
+            if (logger.isDebugEnabled())
+               logger.debug("Transitioning task with parameters: " + params);
+            
             // update the task with the updated parameters
             this.workflowService.updateTask(this.task.id, params, null, null);
          

source/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java

@@ -129,6 +129,9 @@ public class StartWorkflowWizard extends BaseWizardBean
       // prepare the parameters from the current state of the property sheet
       Map<QName, Serializable> params = WorkflowBean.prepareTaskParams(this.startTaskNode);
       
+      if (logger.isDebugEnabled())
+         logger.debug("Starting workflow with parameters: " + params);
+      
       // create a workflow package for the attached items and add them
       if (this.packageItemsToAdd.size() > 0)
       {

source/java/org/alfresco/web/bean/workflow/ViewCompletedTaskDialog.java

@@ -37,4 +37,12 @@ public class ViewCompletedTaskDialog extends ManageTaskDialog
    {
       return null;
    }
+   
+   @Override
+   public String getTitle()
+   {
+      String titleStart = Application.getMessage(FacesContext.getCurrentInstance(), "view_completed_task_title");
+         
+      return titleStart + ": " + this.task.title;
+   }
 }

source/java/org/alfresco/web/bean/workflow/WorkflowBean.java

@@ -199,9 +199,6 @@ public class WorkflowBean
          params.put(assocQName, (Serializable)targets);
       }
       
-      if (logger.isDebugEnabled())
-         logger.debug("Prepared parameters: " + params);
-      
       return params;
    }