[jbpm-commits] JBoss JBPM SVN: r4558 - in jbpm4/trunk/modules: api/src/main/java/org/jbpm/model and 3 other directories.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2009-04-15 16:09:56 -0400 (Wed, 15 Apr 2009)
New Revision: 4558

Modified:
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/Execution.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenExecution.java
   jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/transition/TimerTransitionTest.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/ExecutionEagerLoadingTest.java
Log:
JBPM-2029 renamed Execution.findExecutionIn to findActiveExecutionIn

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/Execution.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/Execution.java	2009-04-15 20:01:24 UTC (rev 4557)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/Execution.java	2009-04-15 20:09:56 UTC (rev 4558)
@@ -195,5 +195,5 @@
   /** indicates if this execution has a child execution with the given executionName */
   boolean hasExecution(String executionName);
   
-  Execution findExecutionIn(String activityName);
+  Execution findActiveExecutionIn(String activityName);
 }

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenExecution.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenExecution.java	2009-04-15 20:01:24 UTC (rev 4557)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/model/OpenExecution.java	2009-04-15 20:09:56 UTC (rev 4558)
@@ -147,5 +147,5 @@
   /** the child execution for the given name or null in case such execution doesn't exist. */ 
   OpenExecution getExecution(String name);
   
-  OpenExecution findExecutionIn(String activityName);
+  OpenExecution findActiveExecutionIn(String activityName);
 }

Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/transition/TimerTransitionTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/transition/TimerTransitionTest.java	2009-04-15 20:01:24 UTC (rev 4557)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/timer/transition/TimerTransitionTest.java	2009-04-15 20:09:56 UTC (rev 4558)
@@ -31,7 +31,7 @@
     
     Execution processInstance = executionService.startProcessInstanceByKey("TimerTransition");
     
-    String executionId = processInstance.findExecutionIn("guardedWait").getId();
+    String executionId = processInstance.findActiveExecutionIn("guardedWait").getId();
 
     executionService.signalExecutionById(executionId, "go on");
     

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-04-15 20:01:24 UTC (rev 4557)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java	2009-04-15 20:09:56 UTC (rev 4558)
@@ -862,7 +862,7 @@
            );
   }
 
-  public ExecutionImpl findExecutionIn(String activityName) {
+  public ExecutionImpl findActiveExecutionIn(String activityName) {
     if ( activityName.equals(this.activityName)
          && state.equals(STATE_ACTIVE)) {
       return this;
@@ -870,7 +870,7 @@
 
     if (executions!=null) {
       for (ExecutionImpl childExecution: executions) {
-        ExecutionImpl found = childExecution.findExecutionIn(activityName);
+        ExecutionImpl found = childExecution.findActiveExecutionIn(activityName);
         if (found!=null) {
           return found;
         }

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/ExecutionEagerLoadingTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/ExecutionEagerLoadingTest.java	2009-04-15 20:01:24 UTC (rev 4557)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/execution/ExecutionEagerLoadingTest.java	2009-04-15 20:09:56 UTC (rev 4558)
@@ -61,10 +61,10 @@
    
     processInstance = executionService.findExecutionById(processInstance.getId());
     
-    assertNotNull(processInstance.findExecutionIn("s11"));
-    assertNotNull(processInstance.findExecutionIn("s12"));
-    assertNotNull(processInstance.findExecutionIn("s21"));
-    assertNotNull(processInstance.findExecutionIn("s22"));
+    assertNotNull(processInstance.findActiveExecutionIn("s11"));
+    assertNotNull(processInstance.findActiveExecutionIn("s12"));
+    assertNotNull(processInstance.findActiveExecutionIn("s21"));
+    assertNotNull(processInstance.findActiveExecutionIn("s22"));
 
     processInstance = executionService.findExecutionById(processInstance.getId());