[jbpm-commits] JBoss JBPM SVN: r6146 - in jbpm4/trunk/modules: jpdl/src/main/java/org/jbpm/jpdl/internal/xml and 2 other directories.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2010-01-28 11:19:56 -0500 (Thu, 28 Jan 2010)
New Revision: 6146

Modified:
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/CustomBinding.java
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/el/Expression.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteEventListener.java
Log:
various fixes

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/CustomBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/CustomBinding.java	2010-01-28 13:51:51 UTC (rev 6145)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/CustomBinding.java	2010-01-28 16:19:56 UTC (rev 6146)
@@ -23,7 +23,6 @@
 
 import org.jbpm.jpdl.internal.xml.JpdlParser;
 import org.jbpm.pvm.internal.wire.binding.ObjectBinding;
-import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
 import org.jbpm.pvm.internal.wire.usercode.UserCodeActivityBehaviour;
 import org.jbpm.pvm.internal.wire.usercode.UserCodeReference;
 import org.jbpm.pvm.internal.xml.Parse;

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java	2010-01-28 13:51:51 UTC (rev 6145)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java	2010-01-28 16:19:56 UTC (rev 6146)
@@ -614,24 +614,6 @@
     }
   }
 
-  public VariableOutDefinitionSet parseVariableOutDefinitionSet(Element element, Parse parse) {
-    VariableOutDefinitionSet variableOutDefinitionSet = new VariableOutDefinitionSet();
-    
-    for (Element inElement: XmlUtil.elements(element, "out-variable")) {
-      VariableOutDefinitionImpl variableOutDefinition = variableOutDefinitionSet.createVariableOutDefinition();
-
-      String name = XmlUtil.attribute(inElement, "name", true, parse);
-      variableOutDefinition.setName(name);
-      
-      String expression = XmlUtil.attribute(inElement, "init");
-      if (expression!=null) {
-        variableOutDefinition.setExpression(expression);
-      }
-    }
-
-    return variableOutDefinitionSet;
-  }
-
   public void parseMailEvent(Element element, Parse parse,
       ObservableElementImpl observableElement, String eventName) {
     // obtain assign event

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/el/Expression.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/el/Expression.java	2010-01-28 13:51:51 UTC (rev 6145)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/el/Expression.java	2010-01-28 16:19:56 UTC (rev 6146)
@@ -32,7 +32,6 @@
 import org.jbpm.api.Execution;
 import org.jbpm.api.JbpmException;
 import org.jbpm.api.task.Task;
-import org.jbpm.pvm.internal.model.ExecutionImpl;
 import org.jbpm.pvm.internal.model.ScopeInstanceImpl;
 
 
@@ -93,15 +92,27 @@
   // runtime evaluation ///////////////////////////////////////////////////////
   
   public Object evaluate(Execution execution) {
-    ELContext elContext = getElContext((ExecutionImpl) execution);
-    return getResult(elContext);
+    return evaluate((ScopeInstanceImpl)execution);
   }
 
   public Object evaluate(Task task) {
-    ELContext elContext = getElContext((ExecutionImpl) task);
-    return getResult(elContext);
+    return evaluate((ScopeInstanceImpl)task);
   }
+  
+  protected Object evaluate(ScopeInstanceImpl scopeInstance) {
+    ELContext elContext = getElContext(scopeInstance);
 
+    Object result = null;
+    if (valueExpression!=null) {
+      result = valueExpression.getValue(elContext);
+      
+    } else if (methodExpression!=null) {
+      result = methodExpression.invoke((ELContext) elContext, null);
+    }
+
+    return result;
+  }
+
   public void setValue(Task task, Object value) {
     setValue((ScopeInstanceImpl)task, value);
   }
@@ -119,7 +130,7 @@
   }
 
   protected ELContext getElContext(ScopeInstanceImpl scopeInstance) {
-    ELContext elContext = (ELContext) scopeInstance.getElContext();
+    ELContext elContext = (ELContext) (scopeInstance!=null ? scopeInstance.getElContext() : null);
     if (elContext==null) {
       JbpmElFactory contextFactory = JbpmElFactory.getJbpmElFactory();
       elContext = contextFactory.createElContext(scopeInstance);
@@ -127,16 +138,4 @@
     }
     return elContext;
   }
-
-  protected Object getResult(ELContext elContext) {
-    Object result = null;
-    if (valueExpression!=null) {
-      result = valueExpression.getValue(elContext);
-      
-    } else if (methodExpression!=null) {
-      result = methodExpression.invoke((ELContext) elContext, null);
-    }
-
-    return result;
-  }
 }

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteEventListener.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteEventListener.java	2010-01-28 13:51:51 UTC (rev 6145)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/ExecuteEventListener.java	2010-01-28 16:19:56 UTC (rev 6146)
@@ -88,7 +88,7 @@
       eventListenerIndex++;
       execution.setEventListenerIndex(eventListenerIndex);
     }
-    
+
     // if there are more listeners in this event
     if ( (eventListenerReferences!=null)
          && (eventListenerIndex < eventListenerReferences.size())