svn commit: r12758 - /trunk/core/src/java/org/jahia/workflow/nstep/NStepWorkflow.java

[xlawrence]

Author: xlawrence
Date: Tue Jan 10 17:05:07 2006
New Revision: 12758

URL: https://jahia.mine.nu/websvn/listing.php?sc=1&rev=12758&repname=jahia
Log:
a bit of cleanup

Modified:
    trunk/core/src/java/org/jahia/workflow/nstep/NStepWorkflow.java

Modified: trunk/core/src/java/org/jahia/workflow/nstep/NStepWorkflow.java
URL: 
https://jahia.mine.nu/websvn/diff.php?path=/trunk/core/src/java/org/jahia/workflow/nstep/NStepWorkflow.java&rev=12758&repname=jahia
==============================================================================
--- trunk/core/src/java/org/jahia/workflow/nstep/NStepWorkflow.java (original)
+++ trunk/core/src/java/org/jahia/workflow/nstep/NStepWorkflow.java Tue Jan 10 
17:05:07 2006
@@ -37,8 +37,8 @@
 import java.util.*;
 
 /**
- * NstepWorkflow is a workflow which allowed you to define multiple sequential 
process in resource files.
- * Then this processes can be applied to your pages in jahia to change the 
base two step workflow.
+ * NstepWorkflow is a workflow which allows you to define multiple sequential 
processes in resource files.
+ * These processes can then be applied to your Jahia pages as an alternative 
to the base 2-step workflow.
  * <p/>
  * Date: 9 déc. 2004
  * Time: 14:53:40
@@ -47,10 +47,12 @@
  * @version $Id$
  *          <p/>
  *          Revision log :
- *          $Log$
+ *          $Log: NStepWorkflow.java,v $
  *          Revision 1.18  2005/12/12 15:25:36  cmailleux
  *          Avoid sending same mail multiple time to same user
+
  *          
+
  *          Send email only if user have an email (do not check the validity 
of the email)
  *
  *          Revision 1.17  2005/12/12 15:25:18  cmailleux
@@ -626,7 +628,7 @@
         for (int i = 0; i < workflowNamesArray.length; i++) {
             String workflowName = workflowNamesArray[i].trim();
             workflowNames.add(workflowName);
-            org.jahia.workflow.nstep.model.Workflow workflow = null;
+            org.jahia.workflow.nstep.model.Workflow workflow;
             try {
                 workflow = workflowManager.getWorkflowByName(workflowName);
             } catch (ObjectRetrievalFailureException e) {
@@ -691,7 +693,7 @@
         String unTrimmedActionName = untrimActionName(actionName);
         final WorkflowService workflowService = 
ServicesRegistry.getInstance().getWorkflowService();
         org.jahia.workflow.nstep.model.WorkflowStep nextStep = null;
-        WorkflowStep curStep = null;
+        WorkflowStep curStep;
         curStep = workflow.getStep();
         if (!finished) {
             nextStep = (WorkflowStep) workflow.getWorkflow().getSteps().get(
@@ -699,7 +701,7 @@
         }
         final ContentObject contentObjectInstance = 
ContentObject.getContentObjectInstance(
                 ObjectKey.getInstance(objectKey));
-        String mailBody = "";
+        String mailBody;
 // Is workflow over ?
         final String displayName = 
contentObjectInstance.getDisplayName(jParams);
         String from = (String) 
jParams.getAttribute("org.jahia.engines.workflow.notify.from");
@@ -748,7 +750,7 @@
                     sendMails(group, mailService, from, cc, bcc, subject, 
mailBody, alreadySendMail);
                 }
             } else {
-                mailBody = mailBody = getKey("process." + processName + 
".mail.body.step.advance", workflow, jParams, displayName,
+                mailBody = getKey("process." + processName + 
".mail.body.step.advance", workflow, jParams, displayName,
                                              comment, username, curStep, 
nextStep, contentObjectInstance);
                 group = workflowService.getRoleGroup(jParams.getContentPage(), 
trimActionName(nextStep.getName()),
                                                      true);