[jboss-svn-commits] JBL Code SVN: r29916 - in labs/jbosstm/trunk/ArjunaCore/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser: frames and 1 other directories.

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

Author: mark.little at jboss.com
Date: 2009-11-03 12:38:40 -0500 (Tue, 03 Nov 2009)
New Revision: 29916

Modified:
   labs/jbosstm/trunk/ArjunaCore/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/entityviewer/viewers/resource/ResourceActionHandle.java
   labs/jbosstm/trunk/ArjunaCore/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/frames/BrowserFrame.java
   labs/jbosstm/trunk/ArjunaCore/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/ArjunaTransactionWrapper.java
Log:
https://jira.jboss.org/jira/browse/JBTM-615

Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/entityviewer/viewers/resource/ResourceActionHandle.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/entityviewer/viewers/resource/ResourceActionHandle.java	2009-11-03 17:35:20 UTC (rev 29915)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/entityviewer/viewers/resource/ResourceActionHandle.java	2009-11-03 17:38:40 UTC (rev 29916)
@@ -16,12 +16,11 @@
  * MA  02110-1301, USA.
  * 
  * (C) 2005-2006,
- * @author JBoss Inc.
+ * @author JBoss Inc.s
  */
 package com.arjuna.ats.tools.objectstorebrowser.entityviewer.viewers.resource;
 
 import com.arjuna.ats.arjuna.coordinator.BasicAction;
-import com.arjuna.ats.arjuna.coordinator.RecoveryAbstractRecord;
 import com.arjuna.ats.arjuna.coordinator.AbstractRecord;
 
 public class ResourceActionHandle extends AbstractResourceActionHandle
@@ -31,9 +30,9 @@
         super(action, res);
     }
 
-    public RecoveryAbstractRecord getAbstractRecord()
+    public AbstractRecord getAbstractRecord()
     {
-        return (RecoveryAbstractRecord) super.getAbstractRecord();
+        return super.getAbstractRecord();
     }
 
 }

Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/frames/BrowserFrame.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/frames/BrowserFrame.java	2009-11-03 17:35:20 UTC (rev 29915)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/frames/BrowserFrame.java	2009-11-03 17:38:40 UTC (rev 29916)
@@ -46,8 +46,10 @@
 import com.arjuna.ats.arjuna.exceptions.ObjectStoreException;
 import com.arjuna.ats.arjuna.state.InputObjectState;
 import com.arjuna.ats.arjuna.common.Uid;
-import com.arjuna.ats.arjuna.gandiva.ClassName;
+import com.arjuna.ats.arjuna.common.arjPropertyManager;
+import com.arjuna.ats.arjuna.coordinator.TxControl;
 import com.arjuna.ats.internal.arjuna.common.UidHelper;
+import com.arjuna.ats.internal.arjuna.common.UidHelper;
 
 import javax.swing.*;
 import javax.swing.event.*;
@@ -117,7 +119,9 @@
         {
             String rootStr = (String)provider.getRoots().firstElement();
 
-            _objectStore = new ObjectStore(new ClassName(rootStr));
+            arjPropertyManager.getObjectStoreEnvironmentBean().setLocalOSRoot(rootStr);
+            
+            _objectStore = TxControl.getStore();
 
             _treeModel = new DefaultTreeModel(createTree());
             _tree = new JTree(_treeModel);
@@ -341,7 +345,8 @@
 
             _stateViewer.clear();
             _stateViewer.setVisible(false);
-            _objectStore = new ObjectStore(new com.arjuna.ats.arjuna.gandiva.ClassName(objectStoreRoot));
+            arjPropertyManager.getObjectStoreEnvironmentBean().setLocalOSRoot(objectStoreRoot);
+            _objectStore = TxControl.getStore();
             _treeModel.setRoot(createTree());
 
             Thread.currentThread().setContextClassLoader(loader);

Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/ArjunaTransactionWrapper.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/ArjunaTransactionWrapper.java	2009-11-03 17:35:20 UTC (rev 29915)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/bin/com/arjuna/ats/tools/objectstorebrowser/stateviewers/viewers/ArjunaTransactionWrapper.java	2009-11-03 17:38:40 UTC (rev 29916)
@@ -25,7 +25,6 @@
 import com.arjuna.ats.arjuna.common.Uid;
 import com.arjuna.ats.arjuna.ObjectType;
 import com.arjuna.ats.arjuna.exceptions.ObjectStoreException;
-import com.arjuna.ats.arjuna.gandiva.ObjectName;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -34,9 +33,9 @@
 {
     private String type;
 
-    public ArjunaTransactionWrapper(Uid objUid, ObjectName objectName, String type)
+    public ArjunaTransactionWrapper(Uid objUid, String type)
     {
-        super(objUid, ObjectType.ANDPERSISTENT, objectName);
+        super(objUid, ObjectType.ANDPERSISTENT);
         this.type = type;
     }