[Yanel-commits] rev 57336 - public/yanel/trunk/src/core/java/org/wyona/yanel/core/workflow

[michi at wyona.com]

Author: michi
Date: 2011-03-15 16:28:39 +0100 (Tue, 15 Mar 2011)
New Revision: 57336

Modified:
   public/yanel/trunk/src/core/java/org/wyona/yanel/core/workflow/WorkflowHelper.java
Log:
javadoc added and setWorkflowState independent of revision introduced

Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/core/workflow/WorkflowHelper.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/core/workflow/WorkflowHelper.java	2011-03-15 15:10:43 UTC (rev 57335)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/core/workflow/WorkflowHelper.java	2011-03-15 15:28:39 UTC (rev 57336)
@@ -50,8 +50,10 @@
     protected static final String WORKFLOW_STATE_PROPERTY = "workflow-state";
     protected static final String WORKFLOW_SCHEMA_PROPERTY_NAME = "workflow-schema";
 
-    public static void doTransition(Resource resource, String transitionID, String revision) 
-            throws WorkflowException {
+    /**
+     * Execute workflow transition for a specific revision of a particular resource
+     */
+    public static void doTransition(Resource resource, String transitionID, String revision) throws WorkflowException {
         boolean foundTransition = false;
         String currentState = null;
         WorkflowableV1 workflowable = (WorkflowableV1)resource;
@@ -399,10 +401,21 @@
      */
     public static void setWorkflowState(Node node, String state, String revision) throws WorkflowException {
         try {
-            Revision rev = node.getRevision(revision); 
+            setWorkflowState(node.getRevision(revision), state);
+        } catch (Exception e) {
+            log.error(e, e);
+            throw new WorkflowException(e.getMessage(), e);
+        }
+    }
+
+    /**
+     * Set workflow state (and date)
+     */
+    public static void setWorkflowState(Node node, String state) throws WorkflowException {
+        try {
             log.debug("Set workflow state: " + state);
-            rev.setProperty(WORKFLOW_STATE_PROPERTY, state);
-            rev.setProperty(WORKFLOW_DATE_PROPERTY, new Date());
+            node.setProperty(WORKFLOW_STATE_PROPERTY, state);
+            node.setProperty(WORKFLOW_DATE_PROPERTY, new Date());
             // TODO: write workflow history
         } catch (Exception e) {
             log.error(e, e);