[jboss-svn-commits] JBL Code SVN: r24281 - in labs/jbossrules/trunk: drools-core/src/main/resources/META-INF and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: KrisVerlaenen
Date: 2008-12-07 11:05:44 -0500 (Sun, 07 Dec 2008)
New Revision: 24281

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/SubProcessNodeInstance.java
   labs/jbossrules/trunk/drools-core/src/main/resources/META-INF/WorkDefinitions.conf
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/editor/editpart/work/EmailCustomEditor.java
Log:
 - small updates

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/SubProcessNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/SubProcessNodeInstance.java	2008-12-07 07:25:05 UTC (rev 24280)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/SubProcessNodeInstance.java	2008-12-07 16:05:44 UTC (rev 24281)
@@ -88,7 +88,9 @@
             ProcessInstance processInstance = (ProcessInstance)
                 ((ProcessInstance) getProcessInstance()).getWorkingMemory()
                     .getProcessInstance(processInstanceId);
-            processInstance.setState(ProcessInstance.STATE_ABORTED);
+            if (processInstance != null) {
+            	processInstance.setState(ProcessInstance.STATE_ABORTED);
+            }
         }
     }
     

Modified: labs/jbossrules/trunk/drools-core/src/main/resources/META-INF/WorkDefinitions.conf
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/resources/META-INF/WorkDefinitions.conf	2008-12-07 07:25:05 UTC (rev 24280)
+++ labs/jbossrules/trunk/drools-core/src/main/resources/META-INF/WorkDefinitions.conf	2008-12-07 16:05:44 UTC (rev 24281)
@@ -12,7 +12,7 @@
     	"From" : new StringDataType(),
     	"To" : new StringDataType(),
     	"Subject" : new StringDataType(),
-    	"Text" : new StringDataType()
+    	"Body" : new StringDataType()
     ],
     "displayName" : "Email",
     "icon" : "icons/import_statement.gif",

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/editor/editpart/work/EmailCustomEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/editor/editpart/work/EmailCustomEditor.java	2008-12-07 07:25:05 UTC (rev 24280)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/editor/editpart/work/EmailCustomEditor.java	2008-12-07 16:05:44 UTC (rev 24281)
@@ -58,7 +58,7 @@
         Work work = (Work) getValue();
         String from = (String) work.getParameter("From");
         String to = (String)work.getParameter("To");
-        String body = (String)work.getParameter("Text");
+        String body = (String)work.getParameter("Body");
         String subject = (String)work.getParameter("Subject");
         if (to != null) {
             for (String email: to.split(";")) {
@@ -232,7 +232,7 @@
         }
         work.setParameter("To", to);
         work.setParameter("Subject", subjectText.getText());
-        work.setParameter("Text", bodyText.getText());
+        work.setParameter("Body", bodyText.getText());
         work.setParameterDefinitions(((Work) value).getParameterDefinitions());
         return work;
     }