[jbpm-commits] JBoss JBPM SVN: r5162 - in jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal: task and 1 other directory.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2009-06-30 05:01:06 -0400 (Tue, 30 Jun 2009)
New Revision: 5162

Modified:
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java
Log:
JBPM-2309 fine tuned task activityName initialization

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java	2009-06-30 03:34:44 UTC (rev 5161)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java	2009-06-30 09:01:06 UTC (rev 5162)
@@ -715,7 +715,6 @@
     task.setExecution(this);
     task.setProcessInstance(processInstance);
     task.setSignalling(true);
-    task.setActivityName(getActivityName());
     
     // initialize the name
     if (taskDefinition.getName()!=null) {

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java	2009-06-30 03:34:44 UTC (rev 5161)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java	2009-06-30 09:01:06 UTC (rev 5162)
@@ -372,15 +372,21 @@
     return taskDefinition;
   }
 
+  // customized getters and setters //////////////////////////////////////////
+  
+  public String getId() {
+    return Long.toString(dbid);
+  }
+
   public void setTaskDefinition(TaskDefinitionImpl taskDefinition) {
     this.taskDefinition = taskDefinition;
     this.taskDefinitionName = taskDefinition.getName();
   }
 
-  // customized getters and setters //////////////////////////////////////////
-  
-  public String getId() {
-    return Long.toString(dbid);
+  public void setExecution(ExecutionImpl execution) {
+    this.execution = execution;
+    this.executionId = execution.getId();
+    this.activityName = execution.getActivityName();
   }
 
   // getters and setters //////////////////////////////////////////////////////
@@ -489,11 +495,6 @@
     this.state = state;
   }
 
-  public void setExecution(ExecutionImpl execution) {
-    this.execution = execution;
-    this.executionId = execution.getId();
-  }
-  
   public String getExecutionId() {
     return executionId;
   }