[jboss-svn-commits] JBL Code SVN: r29923 - in labs/jbosstm/trunk/ArjunaJTS/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser: stateviewers/viewers/abstractrecord and 1 other directories.

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

Author: mark.little at jboss.com
Date: 2009-11-03 13:13:39 -0500 (Tue, 03 Nov 2009)
New Revision: 29923

Modified:
   labs/jbosstm/trunk/ArjunaJTS/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/entityviewer/viewers/resource/ResourceViewDialog.java
   labs/jbosstm/trunk/ArjunaJTS/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/abstractrecord/ResourceRecordViewer.java
   labs/jbosstm/trunk/ArjunaJTS/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/arjunatransaction/ArjunaTransactionWrapper.java
Log:
https://jira.jboss.org/jira/browse/JBTM-615

Modified: labs/jbosstm/trunk/ArjunaJTS/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/entityviewer/viewers/resource/ResourceViewDialog.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/entityviewer/viewers/resource/ResourceViewDialog.java	2009-11-03 18:11:38 UTC (rev 29922)
+++ labs/jbosstm/trunk/ArjunaJTS/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/entityviewer/viewers/resource/ResourceViewDialog.java	2009-11-03 18:13:39 UTC (rev 29923)
@@ -37,7 +37,6 @@
 import com.arjuna.ats.tools.objectstorebrowser.stateviewers.viewers.BasicActionInfo;
 import com.arjuna.ats.arjuna.coordinator.AbstractRecord;
 import com.arjuna.ats.arjuna.coordinator.BasicAction;
-import com.arjuna.ats.arjuna.coordinator.RecoveryAbstractRecord;
 
 import javax.swing.*;
 import javax.transaction.xa.XAResource;
@@ -140,11 +139,6 @@
 
                             ((XAResource)rc.value()).forget(rc.getXid());
                         }
-                        else if (ar instanceof RecoveryAbstractRecord)
-                        {
-                            ar = ((RecoveryAbstractRecord) ar).record();
-                            ar.forgetHeuristic();
-                        }
                         else if (ar instanceof ExtendedResourceRecord)
                         {
                             // call forget on the OTS Resource

Modified: labs/jbosstm/trunk/ArjunaJTS/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/abstractrecord/ResourceRecordViewer.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/abstractrecord/ResourceRecordViewer.java	2009-11-03 18:11:38 UTC (rev 29922)
+++ labs/jbosstm/trunk/ArjunaJTS/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/abstractrecord/ResourceRecordViewer.java	2009-11-03 18:13:39 UTC (rev 29923)
@@ -35,7 +35,6 @@
 import com.arjuna.ats.tools.objectstorebrowser.panels.ObjectStoreViewEntry;
 import com.arjuna.ats.arjuna.exceptions.ObjectStoreException;
 import com.arjuna.ats.arjuna.coordinator.AbstractRecord;
-import com.arjuna.ats.arjuna.coordinator.RecoveryAbstractRecord;
 import com.arjuna.ats.arjuna.coordinator.BasicAction;
 import com.arjuna.ats.arjuna.coordinator.TwoPhaseOutcome;
 import com.arjuna.ats.internal.jts.Implementations;
@@ -217,7 +216,7 @@
         }
     }
 
-    protected boolean doOp(RecoveryAbstractRecord record, RecoveryOp op)
+    protected boolean doOp(AbstractRecord record, RecoveryOp op)
     {
         try
         {
@@ -225,14 +224,14 @@
 
             switch (op) {
                 case FORGET_OP:
-                    if (!record.record().forgetHeuristic())
+                    if (!record.forgetHeuristic())
                     {
                         appendError("Could not forget this record");
                         return false;
                     }
                     return true;
                 case COMMIT_OP:
-                    err = record.record().topLevelOnePhaseCommit();
+                    err = record.topLevelOnePhaseCommit();
 
                     if (err == TwoPhaseOutcome.FINISH_OK)
                         return true;
@@ -240,7 +239,7 @@
                     appendError("Commit error: " + TwoPhaseOutcome.stringForm(err));
                     return false;
                 case ABORT_OP:
-                    err = record.record().topLevelAbort();
+                    err = record.topLevelAbort();
 
                     if (err == TwoPhaseOutcome.FINISH_OK)
                         return true;
@@ -264,8 +263,6 @@
             return doOp((ResourceRecord) getRecord(), op);
         else if (getRecord() instanceof XAResourceRecord)
             return doOp((XAResourceRecord) getRecord(), op);
-        else if (getRecord() instanceof RecoveryAbstractRecord)
-            return doOp((RecoveryAbstractRecord) getRecord(), op);
         else if (getRecord() instanceof ExtendedResourceRecord)
             return doOp((ExtendedResourceRecord) getRecord(), op);
         else

Modified: labs/jbosstm/trunk/ArjunaJTS/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/arjunatransaction/ArjunaTransactionWrapper.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/arjunatransaction/ArjunaTransactionWrapper.java	2009-11-03 18:11:38 UTC (rev 29922)
+++ labs/jbosstm/trunk/ArjunaJTS/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/arjunatransaction/ArjunaTransactionWrapper.java	2009-11-03 18:13:39 UTC (rev 29923)
@@ -24,14 +24,13 @@
 import com.arjuna.ats.arjuna.coordinator.RecordList;
 import com.arjuna.ats.arjuna.common.Uid;
 import com.arjuna.ats.arjuna.ObjectType;
-import com.arjuna.ats.arjuna.gandiva.ObjectName;
 import com.arjuna.ats.internal.jts.orbspecific.coordinator.ArjunaTransactionImple;
 
 public class ArjunaTransactionWrapper extends BasicAction
 {
-    public ArjunaTransactionWrapper(Uid objUid, ObjectName objectName)
+    public ArjunaTransactionWrapper(Uid objUid)
     {
-        super(objUid, ObjectType.ANDPERSISTENT, objectName);
+        super(objUid, ObjectType.ANDPERSISTENT);
     }
 
     /**