From 08fd4699f5a85f6bda7387e6bc0f338d9527cf7a Mon Sep 17 00:00:00 2001 From: David Caruana Date: Wed, 16 Aug 2006 18:07:27 +0000 Subject: [PATCH] Workflow: 1) Support for localisation of all Workflow definitions 2) Consolidate on id, title & description fields for all Workflow API objects 3) Add WorkflowTransition object to Workflow APIs 4) Fix up damage of above changes (web client etc) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3528 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../app/servlet/JBPMDeployProcessServlet.java | 2 +- .../bean/workflow/ManageWorkItemDialog.java | 18 ++++++------------ .../web/bean/workflow/StartWorkflowWizard.java | 2 +- .../web/bean/workflow/WorkflowBean.java | 4 ++-- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/source/java/org/alfresco/web/app/servlet/JBPMDeployProcessServlet.java b/source/java/org/alfresco/web/app/servlet/JBPMDeployProcessServlet.java index 2c78bae020..8b7af4e8eb 100644 --- a/source/java/org/alfresco/web/app/servlet/JBPMDeployProcessServlet.java +++ b/source/java/org/alfresco/web/app/servlet/JBPMDeployProcessServlet.java @@ -58,7 +58,7 @@ public class JBPMDeployProcessServlet extends HttpServlet response.setContentType("text/html"); InputStream deploymentArchive = getDeploymentArchive(request); WorkflowDefinition workflowDef = deployArchive(deploymentArchive); - response.getWriter().println("Deployed archive " + workflowDef.name + " successfully"); + response.getWriter().println("Deployed archive " + workflowDef.title + " successfully"); } catch(IOException e) { diff --git a/source/java/org/alfresco/web/bean/workflow/ManageWorkItemDialog.java b/source/java/org/alfresco/web/bean/workflow/ManageWorkItemDialog.java index 75241e0144..e1453564e0 100644 --- a/source/java/org/alfresco/web/bean/workflow/ManageWorkItemDialog.java +++ b/source/java/org/alfresco/web/bean/workflow/ManageWorkItemDialog.java @@ -11,6 +11,7 @@ import javax.transaction.UserTransaction; import org.alfresco.service.cmr.workflow.WorkflowService; import org.alfresco.service.cmr.workflow.WorkflowTask; import org.alfresco.service.cmr.workflow.WorkflowTaskDefinition; +import org.alfresco.service.cmr.workflow.WorkflowTransition; import org.alfresco.service.namespace.QName; import org.alfresco.web.app.Application; import org.alfresco.web.bean.dialog.BaseDialogBean; @@ -32,7 +33,7 @@ public class ManageWorkItemDialog extends BaseDialogBean protected WorkflowService workflowService; protected Node workItemNode; protected WorkflowTask workItem; - protected String[] transitions; + protected WorkflowTransition[] transitions; protected static final String ID_PREFIX = "transition_"; protected static final String CLIENT_ID_PREFIX = "dialog:" + ID_PREFIX; @@ -93,16 +94,9 @@ public class ManageWorkItemDialog extends BaseDialogBean { buttons = new ArrayList(this.transitions.length); - for (String trans : this.transitions) + for (WorkflowTransition trans : this.transitions) { - // TODO: Tidy this up when the service returns the list of labels - String label = trans; - if (label.length() == 0) - { - label = "Done"; - } - - buttons.add(new DialogButtonConfig(ID_PREFIX + trans, label, null, + buttons.add(new DialogButtonConfig(ID_PREFIX + trans, trans.title, null, "#{DialogManager.bean.transition}", "false", null)); } } @@ -138,13 +132,13 @@ public class ManageWorkItemDialog extends BaseDialogBean Map reqParams = context.getExternalContext().getRequestParameterMap(); String selectedTransition = null; - for (String trans : this.transitions) + for (WorkflowTransition trans : this.transitions) { Object result = reqParams.get(CLIENT_ID_PREFIX + trans); if (result != null) { // this was the button that was pressed - selectedTransition = trans; + selectedTransition = trans.id; break; } } diff --git a/source/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java b/source/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java index 9a1300c250..c24639c83c 100644 --- a/source/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java +++ b/source/java/org/alfresco/web/bean/workflow/StartWorkflowWizard.java @@ -207,7 +207,7 @@ public class StartWorkflowWizard extends BaseWizardBean List workflowDefs = this.workflowService.getDefinitions(); for (WorkflowDefinition workflowDef : workflowDefs) { - this.availableWorkflows.add(new SelectItem(workflowDef.id, workflowDef.name)); + this.availableWorkflows.add(new SelectItem(workflowDef.id, workflowDef.title)); this.workflows.put(workflowDef.id, workflowDef); } diff --git a/source/java/org/alfresco/web/bean/workflow/WorkflowBean.java b/source/java/org/alfresco/web/bean/workflow/WorkflowBean.java index 13f8f89573..94c2bde380 100644 --- a/source/java/org/alfresco/web/bean/workflow/WorkflowBean.java +++ b/source/java/org/alfresco/web/bean/workflow/WorkflowBean.java @@ -159,10 +159,10 @@ public class WorkflowBean // create the basic transient node TransientMapNode node = new TransientMapNode(taskDef.metadata.getName(), - task.name, task.properties); + task.title, task.properties); // add properties for the other useful metadata - node.getProperties().put(ContentModel.PROP_NAME.toString(), task.name); + node.getProperties().put(ContentModel.PROP_NAME.toString(), task.title); node.getProperties().put("type", taskDef.metadata.getTitle()); node.getProperties().put("id", task.id);