[jboss-svn-commits] JBL Code SVN: r23167 - in labs/jbosstm/workspace/adinn/orchestration: src/org/jboss/jbossts/orchestration/rule and 1 other directory.

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

Author: adinn
Date: 2008-09-29 05:13:38 -0400 (Mon, 29 Sep 2008)
New Revision: 23167

Modified:
   labs/jbosstm/workspace/adinn/orchestration/docs/ProgrammersGuide.odt
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/Event.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/Rule.java
Log:
proofed programmers guide and provided clearer names for some methods in the implementation

Modified: labs/jbosstm/workspace/adinn/orchestration/docs/ProgrammersGuide.odt
===================================================================
(Binary files differ)

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/Event.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/Event.java	2008-09-29 06:48:27 UTC (rev 23166)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/Event.java	2008-09-29 09:13:38 UTC (rev 23167)
@@ -13,7 +13,6 @@
 import org.jboss.jbossts.orchestration.rule.expression.Expression;
 import org.jboss.jbossts.orchestration.rule.expression.ExpressionHelper;
 import org.jboss.jbossts.orchestration.rule.type.Type;
-import org.jboss.jbossts.orchestration.rule.type.TypeGroup;
 import org.jboss.jbossts.orchestration.rule.exception.ParseException;
 import org.jboss.jbossts.orchestration.rule.exception.TypeException;
 import org.jboss.jbossts.orchestration.rule.exception.ExecuteException;
@@ -232,7 +231,7 @@
 
             if (binding.isVar()) {
                 Object value = binding.getValue().interpret(helper);
-                helper.bind(binding.getName(), value);
+                helper.bindVariable(binding.getName(), value);
             }
         }
 

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/Rule.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/Rule.java	2008-09-29 06:48:27 UTC (rev 23166)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/Rule.java	2008-09-29 09:13:38 UTC (rev 23167)
@@ -887,13 +887,13 @@
                 throws ExecuteException
         {
             // System.out.println(rule.getName() + " execute0");
-            executeEvent();
-            if (executeCondition()) {
-                executeAction();
+            bind();
+            if (test()) {
+                fire();
             }
         }
 
-        public void bind(String name, Object value)
+        public void bindVariable(String name, Object value)
         {
             bindingMap.put(name, value);
         }
@@ -903,24 +903,24 @@
             return bindingMap.get(name);
         }
 
-        private void executeEvent()
+        private void bind()
                 throws ExecuteException
         {
-            // System.out.println(rule.getName() + " executeEvent");
+            // System.out.println(rule.getName() + " bind");
             rule.getEvent().interpret(this);
         }
 
-        private boolean executeCondition()
+        private boolean test()
                 throws ExecuteException
         {
-            // System.out.println(rule.getName() + " executeCondition");
+            // System.out.println(rule.getName() + " test");
             return rule.getCondition().interpret(this);
         }
         
-        private void executeAction()
+        private void fire()
                 throws ExecuteException
         {
-            // System.out.println(rule.getName() + " executeAction");
+            // System.out.println(rule.getName() + " fire");
             rule.getAction().interpret(this);
         }