[jbpm-commits] JBoss JBPM SVN: r3386 - in jbpm3/trunk/modules/core/src: test/java/org/jbpm/command and 1 other directory.

do-not-reply at jboss.org do-not-reply at jboss.org
Mon Dec 15 05:16:27 EST 2008


Author: camunda
Date: 2008-12-15 05:16:26 -0500 (Mon, 15 Dec 2008)
New Revision: 3386

Modified:
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractGetObjectBaseCommand.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractProcessInstanceBaseCommand.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractTokenBaseCommand.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/BatchSignalCommand.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelProcessInstanceCommand.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelTokenCommand.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelWorkOnTaskCommand.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ChangeProcessInstanceVersionCommand.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/DeleteProcessDefinitionCommand.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/DeployProcessCommand.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessDefinitionCommand.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessDefinitionsCommand.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstanceCommand.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstancesCommand.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTaskInstanceCommand.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTaskListCommand.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/NewProcessInstanceCommand.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/SignalCommand.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/StartProcessInstanceCommand.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/StartWorkOnTaskCommand.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/TaskInstanceEndCommand.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/UnlockTokenCommand.java
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/VariablesCommand.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/command/ChangeProcessInstanceVersionCommandTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/command/ProcessInstanceCommandTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/command/TokenCommandTest.java
Log:
JBPM-1905
- Removed added return value for setter to ensure backward compatibility (JBPM-1919)
- Added methods for fluent programming
see also http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4196472

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractGetObjectBaseCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractGetObjectBaseCommand.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractGetObjectBaseCommand.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -205,4 +205,25 @@
   {
     this.jbpmContext = jbpmContext;
   }
+  
+  // methods for fluent programming
+  
+  public AbstractGetObjectBaseCommand variablesToInclude(String[] variablesToInclude)
+  {
+    setVariablesToInclude(variablesToInclude);
+    return this;
+  }
+
+  public AbstractGetObjectBaseCommand variablesToInclude(String variableToInclude)
+  {
+    setVariablesToInclude(variableToInclude);
+    return this;
+  }
+  
+  public AbstractGetObjectBaseCommand includeAllVariables(boolean includeAllVariables)
+  {
+    setIncludeAllVariables( includeAllVariables );
+    return this;
+  }
+
 }
\ No newline at end of file

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractProcessInstanceBaseCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractProcessInstanceBaseCommand.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractProcessInstanceBaseCommand.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -112,19 +112,17 @@
 
   public abstract ProcessInstance execute(ProcessInstance processInstance);
   
-  public AbstractProcessInstanceBaseCommand setProcessInstanceIds(long[] processInstanceIds)
+  public void setProcessInstanceIds(long[] processInstanceIds)
   {
     this.operateOnSingleObject = false;
     this.processInstanceIds = processInstanceIds;
-    return this;
   }
 
-  public AbstractProcessInstanceBaseCommand setProcessInstanceId(long processInstanceId)
+  public void setProcessInstanceId(long processInstanceId)
   {
     this.operateOnSingleObject = true;
     this.processInstanceIds = new long[1];
-    this.processInstanceIds[0] = processInstanceId;    
-    return this;
+    this.processInstanceIds[0] = processInstanceId;  
   }
   
   /**
@@ -153,10 +151,9 @@
     return processName;
   }
 
-  public AbstractProcessInstanceBaseCommand setProcessName(String processName)
+  public void setProcessName(String processName)
   {
     this.processName = processName;
-    return this;
   }
   
   public int getProcessVersion()
@@ -164,10 +161,9 @@
     return processVersion;
   }
 
-  public AbstractProcessInstanceBaseCommand setProcessVersion(int processVersion)
+  public void setProcessVersion(int processVersion)
   {
     this.processVersion = processVersion;
-    return this;
   }
 
   public long[] getProcessInstanceIds()
@@ -180,10 +176,40 @@
     return onlyRunning;
   }
 
-  public AbstractProcessInstanceBaseCommand setOnlyRunning(boolean onlyRunning)
+  public void setOnlyRunning(boolean onlyRunning)
   {
     this.onlyRunning = onlyRunning;
+  }
+
+  // methods for fluent programming
+
+  public AbstractProcessInstanceBaseCommand processInstanceIds(long[] processInstanceIds)
+  {
+    setProcessInstanceIds( processInstanceIds );
     return this;
   }
 
+  public AbstractProcessInstanceBaseCommand processInstanceId(long processInstanceId)
+  {
+    setProcessInstanceId(processInstanceId);    
+    return this;
+  }
+
+  public AbstractProcessInstanceBaseCommand processName(String processName)
+  {
+    setProcessName( processName );
+    return this;
+  }
+  
+  public AbstractProcessInstanceBaseCommand processVersion(int processVersion)
+  {
+    setProcessVersion( processVersion );
+    return this;
+  }
+
+  public AbstractProcessInstanceBaseCommand onlyRunning(boolean onlyRunning)
+  {
+    setOnlyRunning(onlyRunning);
+    return this;
+  }
 }
\ No newline at end of file

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractTokenBaseCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractTokenBaseCommand.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractTokenBaseCommand.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -105,40 +105,19 @@
 
   public abstract Object execute(Token token);
 
-  public AbstractTokenBaseCommand setTokenIds(long[] tokenIds)
+  public void setTokenIds(long[] tokenIds)
   {
     this.operateOnSingleObject = false;
     this.tokenIds = tokenIds;
-    return this;
   }
 
-  public AbstractTokenBaseCommand setTokenId(long tokenId)
+  public void setTokenId(long tokenId)
   {
     this.operateOnSingleObject = true;
     this.tokenIds = new long[1];
     this.tokenIds[0] = tokenId;
-    return this;
   }
   
-  public String toString() {
-    if (processName!=null && stateName!=null) {
-      return this.getClass().getName() 
-        + " [tokenIds=" + Arrays.toString(tokenIds)       
-        + ";processName=" + processName
-        + ";processVersion=" + (processVersion>0 ? processVersion : "NA")
-        + ";stateName=" + stateName
-        + getAdditionalToStringInformation()
-        + "]";
-    }
-    else {
-      return this.getClass().getName() 
-      + " [tokenIds=" + Arrays.toString(tokenIds)       
-      + ";operateOnSingleObject=" + operateOnSingleObject
-      + getAdditionalToStringInformation()
-      + "]";      
-    }
-  }
-  
   public String getAdditionalToStringInformation() {
     return "";
   }
@@ -177,5 +156,55 @@
   {
     return tokenIds;
   }
+  
+  public String toString() {
+    if (processName!=null && stateName!=null) {
+      return this.getClass().getName() 
+        + " [tokenIds=" + Arrays.toString(tokenIds)       
+        + ";processName=" + processName
+        + ";processVersion=" + (processVersion>0 ? processVersion : "NA")
+        + ";stateName=" + stateName
+        + getAdditionalToStringInformation()
+        + "]";
+    }
+    else {
+      return this.getClass().getName() 
+      + " [tokenIds=" + Arrays.toString(tokenIds)       
+      + ";operateOnSingleObject=" + operateOnSingleObject
+      + getAdditionalToStringInformation()
+      + "]";      
+    }
+  }
+  
+  // methods for fluent programming
 
+  public AbstractTokenBaseCommand tokenIds(long[] tokenIds)
+  {
+    setTokenIds(tokenIds);
+    return this;
+  }
+
+  public AbstractTokenBaseCommand tokenId(long tokenId)
+  {
+    setTokenId(tokenId);
+    return this;
+  }
+  
+  public AbstractTokenBaseCommand processName(String processName)
+  {
+    setProcessName(processName);
+    return this;
+  }
+
+  public AbstractTokenBaseCommand processVersion(int processVersion)
+  {
+    setProcessVersion(processVersion);
+    return this;
+  }
+
+  public AbstractTokenBaseCommand stateName(String stateName)
+  {
+    setStateName(stateName);
+    return this;
+  }  
 }
\ No newline at end of file

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/BatchSignalCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/BatchSignalCommand.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/BatchSignalCommand.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -2,7 +2,6 @@
 
 import java.util.Date;
 
-import org.jbpm.JbpmContext;
 import org.jbpm.graph.exe.Token;
 
 /**
@@ -47,18 +46,16 @@
 		return transitionName;
 	}
 
-	public BatchSignalCommand setTransitionName(String transitionName) {
+	public void setTransitionName(String transitionName) {
 		this.transitionName = transitionName;
-		return this;
 	}
 
 	public Date getInStateAtLeastSince() {
 		return inStateAtLeastSince;
 	}
 
-	public BatchSignalCommand setInStateAtLeastSince(Date inStateAtLeastSince) {
+	public void setInStateAtLeastSince(Date inStateAtLeastSince) {
 		this.inStateAtLeastSince = inStateAtLeastSince;
-    return this;
 	}
 
   @Override
@@ -68,4 +65,15 @@
       + ";inStateAtLeastSince=" + inStateAtLeastSince;
   }
 	
+  // methods for fluent programming
+
+  public BatchSignalCommand transitionName(String transitionName) {
+    setTransitionName(transitionName);
+    return this;
+  }
+
+  public BatchSignalCommand inStateAtLeastSince(Date inStateAtLeastSince) {
+    setInStateAtLeastSince(inStateAtLeastSince);
+    return this;
+  }
 }

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelProcessInstanceCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelProcessInstanceCommand.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelProcessInstanceCommand.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -70,10 +70,9 @@
     return processInstanceId;
   }
 
-  public CancelProcessInstanceCommand setProcessInstanceId(long processInstanceId)
+  public void setProcessInstanceId(long processInstanceId)
   {
     this.processInstanceId = processInstanceId;
-    return this;
   }
 
   /**
@@ -92,4 +91,11 @@
     this.processInstanceId = processId;
   }
 
+  // methods for fluent programming
+
+  public CancelProcessInstanceCommand processInstanceId(long processInstanceId)
+  {
+    setProcessInstanceId(processInstanceId);
+    return this;
+  }
 }

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelTokenCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelTokenCommand.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelTokenCommand.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -37,10 +37,16 @@
     return tokenId;
   }
 
-  public CancelTokenCommand setTokenId(long tokenId)
+  public void setTokenId(long tokenId)
   {
     this.tokenId = tokenId;
+  }
+
+  // methods for fluent programming
+
+  public CancelTokenCommand tokenId(long tokenId)
+  {
+    setTokenId(tokenId);
     return this;
   }
-
 }
\ No newline at end of file

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelWorkOnTaskCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelWorkOnTaskCommand.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelWorkOnTaskCommand.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -40,10 +40,9 @@
     return taskInstanceId;
   }
 
-  public CancelWorkOnTaskCommand setTaskInstanceId(long taskInstanceId)
+  public void setTaskInstanceId(long taskInstanceId)
   {
     this.taskInstanceId = taskInstanceId;
-    return this;
   }
 
   @Override
@@ -51,5 +50,13 @@
   {
     return ";taskInstanceId=" + taskInstanceId;
   }
+  
+  // methods for fluent programming
 
+  public CancelWorkOnTaskCommand taskInstanceId(long taskInstanceId)
+  {
+    setTaskInstanceId(taskInstanceId);
+    return this;
+  }
+
 }

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ChangeProcessInstanceVersionCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ChangeProcessInstanceVersionCommand.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ChangeProcessInstanceVersionCommand.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -263,14 +263,13 @@
     return nodeNameMapping;
   }
  
-  public ChangeProcessInstanceVersionCommand setNodeNameMapping(Map<String, String> nameMapping)
+  public void setNodeNameMapping(Map<String, String> nameMapping)
   {
     if (nameMapping == null) {
       this.nodeNameMapping = new HashMap<String, String>();      
     } else {
       this.nodeNameMapping = nameMapping;
     }
-    return this;
   }
 
   public int getNewVersion()
@@ -278,10 +277,9 @@
     return newVersion;
   }
 
-  public ChangeProcessInstanceVersionCommand setNewVersion(int newVersion)
+  public void setNewVersion(int newVersion)
   {
     this.newVersion = newVersion;
-    return this;
   }
   
   public Map getTaskNameMapping()
@@ -289,14 +287,13 @@
     return taskNameMapping;
   }
 
-  public ChangeProcessInstanceVersionCommand setTaskNameMapping(Map<String, String> nameMapping)
+  public void setTaskNameMapping(Map<String, String> nameMapping)
   {
     if (nameMapping == null) {
       this.taskNameMapping = new HashMap<String, String>();      
     } else {
       this.taskNameMapping = nameMapping;
     }
-    return this;
   }
 
   /**
@@ -329,9 +326,27 @@
   /**
    * @deprecated use setNodeNameMapping instead
    */
-  public ChangeProcessInstanceVersionCommand setNameMapping(Map nameMapping) {
-    return setNodeNameMapping(nameMapping);
+  public void setNameMapping(Map nameMapping) {
+    setNodeNameMapping(nameMapping);
   }
 
+  // methods for fluent programming
 
+  public ChangeProcessInstanceVersionCommand nodeNameMapping(Map<String, String> nameMapping)
+  {
+    setNodeNameMapping(nameMapping);
+    return this;
+  }
+
+  public ChangeProcessInstanceVersionCommand newVersion(int newVersion)
+  {
+    setNewVersion(newVersion);
+    return this;
+  }
+
+  public ChangeProcessInstanceVersionCommand taskNameMapping(Map<String, String> nameMapping)
+  {
+    setTaskNameMapping(nameMapping);
+    return this;
+  } 
 }

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/DeleteProcessDefinitionCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/DeleteProcessDefinitionCommand.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/DeleteProcessDefinitionCommand.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -35,6 +35,10 @@
 
   private long id;
 
+  public DeleteProcessDefinitionCommand()
+  {    
+  }
+
   public DeleteProcessDefinitionCommand(long id)
   {
     super();
@@ -52,5 +56,23 @@
   {
     return this.getClass().getSimpleName() + " [processDefinition.id=" + id + "]";
   }
+
+  public long getId()
+  {
+    return id;
+  }
+
+  public void setId(long id)
+  {
+    this.id = id;
+  }
   
+  // methods for fluent programming
+
+  public DeleteProcessDefinitionCommand id(long id)
+  {
+    setId(id);
+    return this;
+  }
+  
 }

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/DeployProcessCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/DeployProcessCommand.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/DeployProcessCommand.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -78,13 +78,12 @@
     return par;
   }
 
-  public DeployProcessCommand setPar(byte[] par)
+  public void setPar(byte[] par)
   {
     this.par = par;
 
     if (par == null || par.length == 0)
       throw new IllegalArgumentException("Cannot process null process archive");
-    return this;
   }
 
   public String getXml()
@@ -92,12 +91,26 @@
     return xml;
   }
 
-  public DeployProcessCommand setXml(String xml)
+  public void setXml(String xml)
   {
     this.xml = xml;
 
     if (xml == null || xml.length() == 0)
       throw new IllegalArgumentException("Cannot process null process definition");
-    return this;    
   }
+  
+  // methods for fluent programming
+
+  public DeployProcessCommand xml(String xml)
+  {
+    setXml(xml);
+    return this;
+  }
+  
+  public DeployProcessCommand par(byte[] par)
+  {
+    setPar(par);
+    return this;
+  }
+
 }

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessDefinitionCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessDefinitionCommand.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessDefinitionCommand.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -46,10 +46,9 @@
     return name;
   }
 
-  public GetProcessDefinitionCommand setName(String name)
+  public void setName(String name)
   {
     this.name = name;
-    return this;    
   }
 
   public int getVersion()
@@ -57,10 +56,9 @@
     return version;
   }
 
-  public GetProcessDefinitionCommand setVersion(int version)
+  public void setVersion(int version)
   {
     this.version = version;
-    return this;
   }
 
   @Override
@@ -70,4 +68,17 @@
       + ";version=" + version;
   }  
   
+  // methods for fluent programming
+
+  public GetProcessDefinitionCommand version(int version)
+  {
+    setVersion(version);
+    return this;
+  }
+  
+  public GetProcessDefinitionCommand name(String name)
+  {
+    setName(name);
+    return this;    
+  }
 }

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessDefinitionsCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessDefinitionsCommand.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessDefinitionsCommand.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -50,10 +50,9 @@
     return onlyLatest;
   }
 
-  public GetProcessDefinitionsCommand setOnlyLatest(boolean onlyLatest)
+  public void setOnlyLatest(boolean onlyLatest)
   {
     this.onlyLatest = onlyLatest;
-    return this;
   }
   
   @Override
@@ -62,4 +61,11 @@
     return "onlyLatest=" + onlyLatest;
   }
 
+  // methods for fluent programming
+
+  public GetProcessDefinitionsCommand onlyLatest(boolean onlyLatest)
+  {
+    setOnlyLatest(onlyLatest);
+    return this;
+  }
 }

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstanceCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstanceCommand.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstanceCommand.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -59,10 +59,9 @@
     return processInstanceId;
   }
 
-  public GetProcessInstanceCommand setProcessInstanceId(long processInstanceId)
+  public void setProcessInstanceId(long processInstanceId)
   {
     this.processInstanceId = processInstanceId;
-    return this;
   }
 
   public long getTaskInstanceId()
@@ -70,10 +69,9 @@
     return taskInstanceId;
   }
 
-  public GetProcessInstanceCommand setTaskInstanceId(long taskInstanceId)
+  public void setTaskInstanceId(long taskInstanceId)
   {
     this.taskInstanceId = taskInstanceId;
-    return this;
   }
 
   public long getTokenId()
@@ -81,10 +79,9 @@
     return tokenId;
   }
 
-  public GetProcessInstanceCommand setTokenId(long tokenId)
+  public void setTokenId(long tokenId)
   {
     this.tokenId = tokenId;
-    return this;
   }
 
   @Override
@@ -95,4 +92,23 @@
       + ";taskInstanceId=" + taskInstanceId;
   }
 
+  // methods for fluent programming
+
+  public GetProcessInstanceCommand processInstanceId(long processInstanceId)
+  {
+    setProcessInstanceId(processInstanceId);
+    return this;
+  }
+
+  public GetProcessInstanceCommand taskInstanceId(long taskInstanceId)
+  {
+    setTaskInstanceId(taskInstanceId);
+    return this;
+  }
+
+  public GetProcessInstanceCommand tokenId(long tokenId)
+  {
+    setTokenId(tokenId);
+    return this;
+  }
 }

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstancesCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstancesCommand.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstancesCommand.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -157,10 +157,9 @@
     return fromStartDate;
   }
 
-  public GetProcessInstancesCommand setFromStartDate(Date fromStartDate)
+  public void setFromStartDate(Date fromStartDate)
   {
     this.fromStartDate = fromStartDate;
-    return this;
   }
 
   public boolean isOnlyRunning()
@@ -168,10 +167,9 @@
     return onlyRunning;
   }
 
-  public GetProcessInstancesCommand setOnlyRunning(boolean onlyRunning)
+  public void setOnlyRunning(boolean onlyRunning)
   {
     this.onlyRunning = onlyRunning;
-    return this;
   }
 
   /**
@@ -195,10 +193,9 @@
     return processDefinitionName;
   }
 
-  public GetProcessInstancesCommand setProcessDefinitionName(String processName)
+  public void setProcessDefinitionName(String processName)
   {
     this.processDefinitionName = processName;
-    return this;
   }
 
   public String getStateName()
@@ -206,10 +203,9 @@
     return stateName;
   }
 
-  public GetProcessInstancesCommand setStateName(String stateName)
+  public void setStateName(String stateName)
   {
     this.stateName = stateName;
-    return this;
   }
 
   public Date getUntilStartDate()
@@ -217,10 +213,9 @@
     return untilStartDate;
   }
 
-  public GetProcessInstancesCommand setUntilStartDate(Date untilStartDate)
+  public void setUntilStartDate(Date untilStartDate)
   {
     this.untilStartDate = untilStartDate;
-    return this;
   }
 
   public String getVersion()
@@ -228,10 +223,9 @@
     return version;
   }
 
-  public GetProcessInstancesCommand setVersion(String version)
+  public void setVersion(String version)
   {
     this.version = version;
-    return this;
   }
 
   public long getProcessInstanceId()
@@ -239,10 +233,9 @@
     return processInstanceId;
   }
 
-  public GetProcessInstancesCommand setProcessInstanceId(long processId)
+  public void setProcessInstanceId(long processId)
   {
     this.processInstanceId = processId;
-    return this;
   }
 
   /**
@@ -273,4 +266,47 @@
       + ";onlyRunning=" + onlyRunning;
   }
   
+  // methods for fluent programming
+
+  public GetProcessInstancesCommand fromStartDate(Date fromStartDate)
+  {
+    setFromStartDate(fromStartDate);
+    return this;
+  }
+
+  public GetProcessInstancesCommand onlyRunning(boolean onlyRunning)
+  {
+    setOnlyRunning(onlyRunning);
+    return this;
+  }
+
+  public GetProcessInstancesCommand processDefinitionName(String processName)
+  {
+    setProcessDefinitionName(processName);
+    return this;
+  }
+
+  public GetProcessInstancesCommand stateName(String stateName)
+  {
+    setStateName(stateName);
+    return this;
+  }
+
+  public GetProcessInstancesCommand untilStartDate(Date untilStartDate)
+  {
+    setUntilStartDate(untilStartDate);
+    return this;
+  }
+
+  public GetProcessInstancesCommand version(String version)
+  {
+    setVersion(version);
+    return this;
+  }
+
+  public GetProcessInstancesCommand processInstanceId(long processId)
+  {
+    setProcessInstanceId(processId);
+    return this;
+  }
 }

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTaskInstanceCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTaskInstanceCommand.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTaskInstanceCommand.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -100,10 +100,9 @@
     return taskInstanceId;
   }
 
-  public GetTaskInstanceCommand setTaskInstanceId(long taskInstanceId)
+  public void setTaskInstanceId(long taskInstanceId)
   {
     this.taskInstanceId = taskInstanceId;
-    return this;
   }
 
   public long getTokenId()
@@ -111,10 +110,9 @@
     return tokenId;
   }
 
-  public GetTaskInstanceCommand setTokenId(long tokenId)
+  public void setTokenId(long tokenId)
   {
     this.tokenId = tokenId;
-    return this;    
   }
 
   public long getProcessInstanceId()
@@ -122,10 +120,9 @@
     return processInstanceId;
   }
 
-  public GetTaskInstanceCommand setProcessInstanceId(long processInstanceId)
+  public void setProcessInstanceId(long processInstanceId)
   {
     this.processInstanceId = processInstanceId;
-    return this;
   }
 
   @Override
@@ -135,4 +132,24 @@
       + ";tokenId=" + tokenId
       + ";taskInstanceId=" + taskInstanceId;
   }
+  
+  // methods for fluent programming
+
+  public GetTaskInstanceCommand taskInstanceId(long taskInstanceId)
+  {
+    setTaskInstanceId(taskInstanceId);
+    return this;
+  }
+
+  public GetTaskInstanceCommand tokenId(long tokenId)
+  {
+    setTokenId(tokenId);
+    return this;    
+  }
+
+  public GetTaskInstanceCommand processInstanceId(long processInstanceId)
+  {
+    setProcessInstanceId(processInstanceId);
+    return this;
+  }
 }

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTaskListCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTaskListCommand.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTaskListCommand.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -84,16 +84,14 @@
     return actor;
   }
 
-  public GetTaskListCommand setActor(String actor)
+  public void setActor(String actor)
   {
     this.actor = new String[] { actor };
-    return this;
   }
 
-  public GetTaskListCommand setActor(String[] actor)
+  public void setActor(String[] actor)
   {
     this.actor = actor;
-    return this;
   }
   
   @Override
@@ -102,4 +100,18 @@
     return "actors=" + Arrays.toString( actor );
   }
 
+  // methods for fluent programming
+
+  public GetTaskListCommand actor(String actor)
+  {
+    this.actor = new String[] { actor };
+    return this;
+  }
+
+  public GetTaskListCommand actor(String[] actor)
+  {
+    this.actor = actor;
+    return this;
+  }
+
 }

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/NewProcessInstanceCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/NewProcessInstanceCommand.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/NewProcessInstanceCommand.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -121,10 +121,9 @@
     return actorId;
   }
 
-  public NewProcessInstanceCommand setActorId(String actorId)
+  public void setActorId(String actorId)
   {
     this.actorId = actorId;
-    return this;
   }
 
   public long getProcessDefinitionId()
@@ -132,10 +131,9 @@
     return processDefinitionId;
   }
 
-  public NewProcessInstanceCommand setProcessDefinitionId(long processId)
+  public void setProcessDefinitionId(long processId)
   {
     this.processDefinitionId = processId;
-    return this;
   }
 
   /**
@@ -154,37 +152,49 @@
     this.processDefinitionId = processId;
   }
 
+  /**
+   * @deprecated use getProcessDefinitionName instead
+   */
   public String getProcessName()
   {
     return processDefinitionName;
   }
 
-  public NewProcessInstanceCommand setProcessName(String processName)
+  /**
+   * @deprecated use setProcessDefinitionName instead
+   */
+  public void setProcessName(String processName)
   {
     this.processDefinitionName = processName;
-    return this;
   }
-
+ 
   public boolean isCreateStartTask()
   {
     return createStartTask;
   }
 
-  public NewProcessInstanceCommand setCreateStartTask(boolean createStartTask)
+  public void setCreateStartTask(boolean createStartTask)
   {
     this.createStartTask = createStartTask;
-    return this;
   }
 
   public Map getVariables()
   {
     return variables;
   }
+  public String getProcessDefinitionName()
+  {
+    return processDefinitionName;
+  }
 
-  public NewProcessInstanceCommand setVariables(Map variables)
+  public void setProcessDefinitionName(String processDefinitionName)
   {
+    this.processDefinitionName = processDefinitionName;
+  }
+  
+  public void setVariables(Map variables)
+  {
     this.variables = variables;
-    return this;
   }
 
   public String getKey()
@@ -192,10 +202,9 @@
     return key;
   }
 
-  public NewProcessInstanceCommand setKey(String key)
+  public void setKey(String key)
   {
     this.key = key;
-    return this;
   }
   
   @Override
@@ -207,5 +216,44 @@
       + ";businessKey=" + key
       // TODO: not sure how this is 
       + ";variables=" + variables;
-  }  
+  }
+  
+  // methods for fluent programming
+  
+  public NewProcessInstanceCommand actorId(String actorId)
+  {
+    setActorId(actorId);
+    return this;
+  }
+
+  public NewProcessInstanceCommand processDefinitionId(long processId)
+  {
+    setProcessDefinitionId(processId);
+    return this;
+  }
+
+  public NewProcessInstanceCommand processDefinitionName(String processName)
+  {
+    setProcessDefinitionName(processName);
+    return this;
+  }
+
+  public NewProcessInstanceCommand createStartTask(boolean createStartTask)
+  {
+    setCreateStartTask(createStartTask);
+    return this;
+  }
+
+  public NewProcessInstanceCommand variables(Map variables)
+  {
+    setVariables(variables);
+    return this;
+  }
+
+  public NewProcessInstanceCommand key(String key)
+  {
+    setKey(key);
+    return this;
+  }
+
 }

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/SignalCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/SignalCommand.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/SignalCommand.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -121,10 +121,9 @@
     return tokenId;
   }
 
-  public SignalCommand setTokenId(long tokenId)
+  public void setTokenId(long tokenId)
   {
     this.tokenId = tokenId;
-    return this;
   }
 
   public String getTransitionName()
@@ -132,10 +131,9 @@
     return transitionName;
   }
 
-  public SignalCommand setTransitionName(String transitionName)
+  public void setTransitionName(String transitionName)
   {
     this.transitionName = transitionName;
-    return this;
   }
 
   public Map getVariables()
@@ -143,10 +141,9 @@
     return variables;
   }
 
-  public SignalCommand setVariables(Map variables)
+  public void setVariables(Map variables)
   {
     this.variables = variables;
-    return this;
   }
 
   public String getExpectedStateName()
@@ -154,10 +151,9 @@
     return expectedStateName;
   }
 
-  public SignalCommand setExpectedStateName(String expectedStateName)
+  public void setExpectedStateName(String expectedStateName)
   {
     this.expectedStateName = expectedStateName;
-    return this;
   }
   
   @Override
@@ -170,4 +166,29 @@
       + ";variables=" + variables;
   }  
 
+  // methods for fluent programming
+
+  public SignalCommand tokenId(long tokenId)
+  {
+    setTokenId(tokenId);
+    return this;
+  }
+
+  public SignalCommand transitionName(String transitionName)
+  {
+    setTransitionName(transitionName);
+    return this;
+  }
+
+  public SignalCommand variables(Map variables)
+  {
+    setVariables(variables);
+    return this;
+  }
+
+  public SignalCommand expectedStateName(String expectedStateName)
+  {
+    setExpectedStateName(expectedStateName);
+    return this;
+  }
 }

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/StartProcessInstanceCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/StartProcessInstanceCommand.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/StartProcessInstanceCommand.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -40,10 +40,9 @@
     return startTransitionName;
   }
 
-  public StartProcessInstanceCommand setStartTransitionName(String startTransitionName)
+  public void setStartTransitionName(String startTransitionName)
   {
     this.startTransitionName = startTransitionName;
-    return this;
   }
 
   @Override
@@ -52,5 +51,13 @@
     return super.getAdditionalToStringInformation() 
       + ";startTransitionName=" + startTransitionName;
   }  
+  
+  // methods for fluent programming
 
+  public StartProcessInstanceCommand startTransitionName(String startTransitionName)
+  {
+    setStartTransitionName(startTransitionName);
+    return this;
+  }
+
 }

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/StartWorkOnTaskCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/StartWorkOnTaskCommand.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/StartWorkOnTaskCommand.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -54,10 +54,9 @@
     return overwriteSwimlane;
   }
 
-  public StartWorkOnTaskCommand setOverwriteSwimlane(boolean overwriteSwimlane)
+  public void setOverwriteSwimlane(boolean overwriteSwimlane)
   {
     this.overwriteSwimlane = overwriteSwimlane;
-    return this;
   }
 
   public long getTaskInstanceId()
@@ -65,16 +64,14 @@
     return taskInstanceId;
   }
 
-  public StartWorkOnTaskCommand setTaskInstanceId(long taskInstanceId)
+  public void setTaskInstanceId(long taskInstanceId)
   {
     this.taskInstanceId = taskInstanceId;
-    return this;
   }
 
-  public StartWorkOnTaskCommand setActorId(String actorId)
+  public void setActorId(String actorId)
   {
     this.actorId = actorId;
-    return this;
   }
 
   public String getActorId()
@@ -88,5 +85,25 @@
     return "tokenId=" + taskInstanceId
       + ";transitionName=" + actorId
       + ";processDefinitionName=" + overwriteSwimlane;
-  }    
+  }
+  
+  // methods for fluent programming
+
+  public StartWorkOnTaskCommand overwriteSwimlane(boolean overwriteSwimlane)
+  {
+    setOverwriteSwimlane(overwriteSwimlane);
+    return this;
+  }
+
+  public StartWorkOnTaskCommand taskInstanceId(long taskInstanceId)
+  {
+    setTaskInstanceId(taskInstanceId);
+    return this;
+  }
+
+  public StartWorkOnTaskCommand actorId(String actorId)
+  {
+    setActorId(actorId);
+    return this;
+  }
 }

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/TaskInstanceEndCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/TaskInstanceEndCommand.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/TaskInstanceEndCommand.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -95,10 +95,9 @@
     return taskInstanceId;
   }
 
-  public TaskInstanceEndCommand setTaskInstanceId(long taskInstanceId)
+  public void setTaskInstanceId(long taskInstanceId)
   {
     this.taskInstanceId = taskInstanceId;
-    return this;
   }
 
   public String getTransitionName()
@@ -106,10 +105,9 @@
     return transitionName;
   }
 
-  public TaskInstanceEndCommand setTransitionName(String transitionName)
+  public void setTransitionName(String transitionName)
   {
     this.transitionName = transitionName;
-    return this;
   }
 
   public Map getVariables()
@@ -117,10 +115,9 @@
     return variables;
   }
 
-  public TaskInstanceEndCommand setVariables(Map variables)
+  public void setVariables(Map variables)
   {
     this.variables = variables;
-    return this;
   }
 
   @Override
@@ -131,4 +128,23 @@
       + ";variables=" + variables;
   }    
 
+  // methods for fluent programming
+
+  public TaskInstanceEndCommand taskInstanceId(long taskInstanceId)
+  {
+    setTaskInstanceId(taskInstanceId);
+    return this;
+  }
+
+  public TaskInstanceEndCommand transitionName(String transitionName)
+  {
+    setTransitionName(transitionName);
+    return this;
+  }
+
+  public TaskInstanceEndCommand variables(Map variables)
+  {
+    setVariables(variables);
+    return this;
+  }
 }

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/UnlockTokenCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/UnlockTokenCommand.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/UnlockTokenCommand.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -40,9 +40,15 @@
 		return lockOwner;
 	}
 
-	public UnlockTokenCommand setLockOwner(String lockOwner) {
+	public void setLockOwner(String lockOwner) {
 		this.lockOwner = lockOwner;
-    return this;
 	}
 
+  // methods for fluent programming
+
+  public UnlockTokenCommand lockOwner(String lockOwner) {
+    setLockOwner(lockOwner);
+    return this;
+  }
+
 }

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/VariablesCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/VariablesCommand.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/VariablesCommand.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -67,10 +67,9 @@
     return taskInstanceId;
   }
 
-  public VariablesCommand setTaskInstanceId(long taskInstanceId)
+  public void setTaskInstanceId(long taskInstanceId)
   {
     this.taskInstanceId = taskInstanceId;
-    return this;
   }
 
   public long getTokenId()
@@ -78,10 +77,9 @@
     return tokenId;
   }
 
-  public VariablesCommand setTokenId(long tokenId)
+  public void setTokenId(long tokenId)
   {
     this.tokenId = tokenId;
-    return this;
   }
 
   public Map getVariables()
@@ -89,10 +87,9 @@
     return variables;
   }
 
-  public VariablesCommand setVariables(Map variables)
+  public void setVariables(Map variables)
   {
     this.variables = variables;
-    return this;
   }
   
   @Override
@@ -103,4 +100,24 @@
       + ";variables=" + variables;
   }    
 
+  // methods for fluent programming
+  
+  public VariablesCommand taskInstanceId(long taskInstanceId)
+  {
+    setTaskInstanceId(taskInstanceId);
+    return this;
+  }
+
+  public VariablesCommand tokenId(long tokenId)
+  {
+    setTokenId(tokenId);
+    return this;
+  }
+
+  public VariablesCommand variables(Map variables)
+  {
+    setVariables(variables);
+    return this;
+  }
+  
 }

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/command/ChangeProcessInstanceVersionCommandTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/command/ChangeProcessInstanceVersionCommandTest.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/command/ChangeProcessInstanceVersionCommandTest.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -116,7 +116,7 @@
     // now change all process instances to most current version
     try
     {
-      new ChangeProcessInstanceVersionCommand().setProcessName("TestChangeVersion").execute(jbpmContext);
+      new ChangeProcessInstanceVersionCommand().processName("TestChangeVersion").execute(jbpmContext);
       fail("Exception expected, saying that state2 is missing in new version");
     }
     catch (JbpmException ex)
@@ -127,7 +127,7 @@
     HashMap nameMap = new HashMap();
     nameMap.put("state2", "state2b");
     // now supply a mapping for the missing node
-    new ChangeProcessInstanceVersionCommand().setNodeNameMapping(nameMap).setProcessName("TestChangeVersion").execute(jbpmContext);
+    new ChangeProcessInstanceVersionCommand().nodeNameMapping(nameMap).processName("TestChangeVersion").execute(jbpmContext);
 
     newTransaction();
     pi1 = graphSession.loadProcessInstance(pi1.getId());
@@ -215,7 +215,7 @@
     // now change all process instances to most current version
     try
     {
-      new ChangeProcessInstanceVersionCommand().setProcessInstanceId(pi1.getId()).execute(jbpmContext);
+      new ChangeProcessInstanceVersionCommand().processInstanceId(pi1.getId()).execute(jbpmContext);
       fail("Exception expected, saying that phase2 is missing in new version");
     }
     catch (JbpmException ex)
@@ -226,7 +226,7 @@
     HashMap nameMap = new HashMap();
     nameMap.put("path2", "path2b");
     // now supply a mapping for the missing node
-    new ChangeProcessInstanceVersionCommand().setNodeNameMapping(nameMap).setProcessInstanceId(pi1.getId()).execute(jbpmContext);
+    new ChangeProcessInstanceVersionCommand().nodeNameMapping(nameMap).processInstanceId(pi1.getId()).execute(jbpmContext);
 
     newTransaction();
 
@@ -314,9 +314,9 @@
 
       // now supply a mapping for the missing node
       new ChangeProcessInstanceVersionCommand()
-        .setNodeNameMapping(nodeNameMap)
-        .setTaskNameMapping(taskNameMap)
-        .setProcessInstanceId(pi1.getId())
+        .nodeNameMapping(nodeNameMap)
+        .taskNameMapping(taskNameMap)
+        .processInstanceId(pi1.getId())
         .execute(jbpmContext);
 
       newTransaction();
@@ -421,7 +421,7 @@
 
     // process instance 1 can me updated, state names haven't changed in this path:
     new ChangeProcessInstanceVersionCommand()
-      .setProcessInstanceId(pi1.getId())
+      .processInstanceId(pi1.getId())
       .execute(jbpmContext);
 
     HashMap nameMap = new HashMap();
@@ -431,9 +431,9 @@
     try
     {
       new ChangeProcessInstanceVersionCommand()
-        .setNodeNameMapping(nameMap)
-        .setTaskNameMapping(nameMap)
-        .setProcessName("testTaskInstances")
+        .nodeNameMapping(nameMap)
+        .taskNameMapping(nameMap)
+        .processName("testTaskInstances")
         .execute(jbpmContext);
       // fail because task2 is not mapped
       fail("Exception expected, saying that theTask2b is missing in new version");
@@ -446,9 +446,9 @@
     // now supply a mapping for the missing task
     nameMap.put("theTask2", "theTask2b");
     new ChangeProcessInstanceVersionCommand()
-      .setNodeNameMapping(nameMap)
-      .setTaskNameMapping(nameMap)
-      .setProcessName("testTaskInstances")
+      .nodeNameMapping(nameMap)
+      .taskNameMapping(nameMap)
+      .processName("testTaskInstances")
       .execute(jbpmContext);
 
     newTransaction();
@@ -527,8 +527,8 @@
     HashMap nameMap = new HashMap();
     nameMap.put("timer1", "timer2");
     new ChangeProcessInstanceVersionCommand()
-      .setNodeNameMapping(nameMap)
-      .setProcessInstanceId(pi1.getId())
+      .nodeNameMapping(nameMap)
+      .processInstanceId(pi1.getId())
       .execute(jbpmContext);
 
     // load changed stuff
@@ -602,9 +602,9 @@
     nameMap.put("timer1", "timer2");
     nameMap.put("myTask", "myTask2");
     new ChangeProcessInstanceVersionCommand()
-      .setNodeNameMapping(nameMap)
-      .setTaskNameMapping(nameMap)
-      .setProcessInstanceId(pi1.getId())
+      .nodeNameMapping(nameMap)
+      .taskNameMapping(nameMap)
+      .processInstanceId(pi1.getId())
       .execute(jbpmContext);
 
     // load changed stuff

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/command/ProcessInstanceCommandTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/command/ProcessInstanceCommandTest.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/command/ProcessInstanceCommandTest.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -119,7 +119,7 @@
     }
 
     // execute SuspendProcessInstanceCommand
-    new SuspendProcessInstanceCommand().setProcessInstanceId(processInstance.getId()).execute(jbpmContext);
+    new SuspendProcessInstanceCommand().processInstanceId(processInstance.getId()).execute(jbpmContext);
     
     // and verify
     assertTrue(processInstance.isSuspended());
@@ -142,7 +142,7 @@
     }
     
     // execute ResumeProcessInstanceCommand
-    new ResumeProcessInstanceCommand().setProcessInstanceId(processInstance.getId()).execute(jbpmContext);
+    new ResumeProcessInstanceCommand().processInstanceId(processInstance.getId()).execute(jbpmContext);
 
     // and verify
     assertFalse(processInstance.isSuspended());

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/command/TokenCommandTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/command/TokenCommandTest.java	2008-12-15 09:51:19 UTC (rev 3385)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/command/TokenCommandTest.java	2008-12-15 10:16:26 UTC (rev 3386)
@@ -45,7 +45,7 @@
       }
   
       // unlocking without owner is a force unlock -> works
-      new UnlockTokenCommand().setTokenId(tokenId).execute(jbpmContext);
+      new UnlockTokenCommand().tokenId(tokenId).execute(jbpmContext);
 //      Token token = jbpmContext.loadTokenForUpdate(processInstance.getRootToken().getId());
 //      token.foreUnlock();
   
@@ -53,14 +53,14 @@
       processInstance = saveAndReload(processInstance);    
       processInstance.getRootToken().lock("TEST-OWNER");
       processInstance = saveAndReload(processInstance);    
-      new UnlockTokenCommand().setLockOwner("TEST-OWNER").setTokenId(tokenId).execute(jbpmContext);
+      new UnlockTokenCommand().lockOwner("TEST-OWNER").tokenId(tokenId).execute(jbpmContext);
   
       // unlocking with wrong owner fails
       processInstance = saveAndReload(processInstance);    
       processInstance.getRootToken().lock("TEST-OWNER");
       processInstance = saveAndReload(processInstance);    
       try {
-        new UnlockTokenCommand().setLockOwner("OTHER-OWNER").setTokenId(tokenId).execute(jbpmContext);
+        new UnlockTokenCommand().lockOwner("OTHER-OWNER").tokenId(tokenId).execute(jbpmContext);
         fail("'OTHER-OWNER' can't unlock token exception expected");
       }
       catch (JbpmException ex) {




More information about the jbpm-commits mailing list