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

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

Author: adinn
Date: 2008-09-17 12:17:46 -0400 (Wed, 17 Sep 2008)
New Revision: 22855

Modified:
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/Expression.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/type/TypeGroup.java
   labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/test/HandlerClass.java
Log:
fixed error in typing static fields, modified line number display and patched example rules to reference final static integer field constants by name rather than specify numeric values

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/Expression.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/Expression.java	2008-09-17 16:14:44 UTC (rev 22854)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/expression/Expression.java	2008-09-17 16:17:46 UTC (rev 22855)
@@ -51,7 +51,7 @@
 
     public String getPos()
     {
-        return " @ " + line + "." + charPos;
+        return " @ line " + line + "." + charPos;
     }
 
     public Type getType()

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/type/TypeGroup.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/type/TypeGroup.java	2008-09-17 16:14:44 UTC (rev 22854)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/orchestration/rule/type/TypeGroup.java	2008-09-17 16:17:46 UTC (rev 22855)
@@ -227,7 +227,7 @@
 
         for (int i = 0; i < length; i++) {
             fullName += sepr + path[i];
-            sepr = "";
+            sepr = ".";
             try {
                 Class clazz = loader.loadClass(fullName);
                 return ensureType(clazz);

Modified: labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/test/HandlerClass.java
===================================================================
--- labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/test/HandlerClass.java	2008-09-17 16:14:44 UTC (rev 22854)
+++ labs/jbosstm/workspace/adinn/orchestration/src/org/jboss/jbossts/test/HandlerClass.java	2008-09-17 16:17:46 UTC (rev 22855)
@@ -86,12 +86,10 @@
             targetLine = 76,
             event = "coordinator = $0,\n" +
                     "cid : CoordinatorId = coordinator.identifier(),\n" +
-                    "PREPARED : int = 5,\n" +
-                    "COMMITTING : int = 6,\n" +
                     "status : int = coordinator.status()",
-            condition = "(status == ActionStatus.PREPARED)\n" +
+            condition = "(status == com.arjuna.ats.arjuna.coordinator.ActionStatus.PREPARED)\n" +
                     "OR" +
-                    "(status == ActionStatus.COMMITTING)\n",
+                    "(status == com.arjuna.ats.arjuna.coordinator.ActionStatus.COMMITTING)\n",
             action = "debug(\"replaying commit for prepared transaction \" + cid)"
     ) public static void handleReplayPhase2()
     {
@@ -103,9 +101,8 @@
             targetLine = 76,
             event = "coordinator = $0,\n" +
                     "cid : CoordinatorId = coordinator.identifier(),\n" +
-                    "COMMITTED : int = 7,\n" +
                     "status : int = coordinator.status()",
-            condition = "status == ActionStatus.COMMITTED",
+            condition = "status == com.arjuna.ats.arjuna.coordinator.ActionStatus.COMMITTED",
             action = "debug(\"replaying commit for heuristic committed transaction \" + cid)"
     ) public static void handleHeuristicCommittedReplayPhase2()
     {