[jbpm-commits] JBoss JBPM SVN: r5633 - in jbpm4/trunk/modules: distro/src/main/files and 2 other directories.

[do-not-reply at jboss.org]

Author: jbarrez
Date: 2009-09-14 09:04:36 -0400 (Mon, 14 Sep 2009)
New Revision: 5633

Modified:
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Execution.java
   jbpm4/trunk/modules/distro/src/main/files/readme.html
   jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java
Log:
Fix for JBPM-2494: renamed isProcessInstance() -> getIsProcessInstance()

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Execution.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Execution.java	2009-09-11 15:42:08 UTC (rev 5632)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/Execution.java	2009-09-14 13:04:36 UTC (rev 5633)
@@ -156,8 +156,13 @@
   /** the <a href="#state">state</a> of this execution.  */
   String getState();
 
-  /** is this a process instance */
-  boolean isProcessInstance();
+  /** 
+   * Returns whether this execution is a process instance.
+   * Note that we cannot use 'isProcessInstance', since this
+   * would clash with 'getProcessInstance()' when using expressions.
+   * (see JBPM-2494)
+   * */
+  boolean getIsProcessInstance();
 
   /** is this execution ended */
   boolean isEnded();

Modified: jbpm4/trunk/modules/distro/src/main/files/readme.html
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/readme.html	2009-09-11 15:42:08 UTC (rev 5632)
+++ jbpm4/trunk/modules/distro/src/main/files/readme.html	2009-09-14 13:04:36 UTC (rev 5633)
@@ -35,10 +35,24 @@
       </tr>
     </table>
     
+    
+<h1>Release Notes for jBPM 4.2</h1>
+
+<h2>API changes</h2> 
+
+<ul>
+  <li>
+    <b>Execution.isProcessInstance()</b> is renamed to <b>Execution.getIsProcessInstance</b> 
+    due to [ <a href="https://jira.jboss.org/jira/browse/JBPM-2494">JBPM-2494</a>].
+  </li>
+</ul>     
+
+    
 <h1>Release Notes for jBPM 4.1</h1>  
 
 <h2>DB Migration</h2>
 
+
 <p>Add column <code>CLASSNAME_</code> to the <code>JBPM4_VARIABLE</code> table.
 The type of the column is dependent on the database and can be found in this table:
 </p>

Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java	2009-09-11 15:42:08 UTC (rev 5632)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ProcessManagementImpl.java	2009-09-14 13:04:36 UTC (rev 5633)
@@ -113,7 +113,7 @@
         continue; // JBPM-2055: Execution is already ended. Should not show up in query
       }
 
-      if (processInstance.isProcessInstance()) { // parent execution
+      if (processInstance.getIsProcessInstance()) { // parent execution
         results.add(ModelAdaptor.adoptExecution((ExecutionImpl) processInstance));
       }
     }

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-09-11 15:42:08 UTC (rev 5632)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java	2009-09-14 13:04:36 UTC (rev 5633)
@@ -1147,7 +1147,7 @@
     return false;
   }
 
-  public boolean isProcessInstance() {
+  public boolean getIsProcessInstance() {
     return parent==null;
   }