Mail Archive Home | gotm-commits List | September 2005 Index
| <-- Date Index --> | <-- Thread Index --> |
Date: Tuesday, September 6, 2005 @ 15:40:11
Author: rouvoy
Path: /cvsroot/gotm/gotm-explorer
Modified: .classpath
src/java/org/objectweb/gotm/browser/coordination/CoordinationFeatureProcessAction.java
src/java/org/objectweb/gotm/browser/transaction/TransactionActivationFeatureBeginAction.java
src/java/org/objectweb/gotm/browser/transaction/TransactionInterruptionFeatureResumeAction.java
src/java/org/objectweb/gotm/browser/transaction/TransactionInterruptionFeatureSuspendAction.java
src/java/org/objectweb/gotm/browser/transaction/TransactionStatePanel.java
src/java/org/objectweb/gotm/browser/transaction/TransactionStatusFeatureIconProvider.java
src/java/org/objectweb/gotm/browser/xid/XidStatePanel.java
src/xml/GoTM.xml
* Integrating latest version of the Fractal Explorer tool.
--------------------------------------------------------------------------------------------------+
.classpath
| 6 +--
src/java/org/objectweb/gotm/browser/coordination/CoordinationFeatureProcessAction.java
| 16 +++++-----
src/java/org/objectweb/gotm/browser/transaction/TransactionActivationFeatureBeginAction.java
| 14 ++++----
src/java/org/objectweb/gotm/browser/transaction/TransactionInterruptionFeatureResumeAction.java
| 14 ++++----
src/java/org/objectweb/gotm/browser/transaction/TransactionInterruptionFeatureSuspendAction.java
| 14 ++++----
src/java/org/objectweb/gotm/browser/transaction/TransactionStatePanel.java
| 10 +++---
src/java/org/objectweb/gotm/browser/transaction/TransactionStatusFeatureIconProvider.java
| 12 +++----
src/java/org/objectweb/gotm/browser/xid/XidStatePanel.java
| 13 +++-----
src/xml/GoTM.xml
| 2 -
9 files changed, 49 insertions(+), 52 deletions(-)
Index: gotm-explorer/.classpath
diff -u gotm-explorer/.classpath:1.6 gotm-explorer/.classpath:1.7
--- gotm-explorer/.classpath:1.6 Mon Mar 14 13:42:03 2005
+++ gotm-explorer/.classpath Tue Sep 6 15:40:11 2005
@@ -8,10 +8,8 @@
<classpathentry kind="lib"
path="/fractal-import/lib/fractal-adl/fractal-adl.jar"/>
<classpathentry kind="lib"
path="/fractal-import/lib/julia/julia-mixins.jar"/>
<classpathentry kind="lib"
path="/fractal-import/lib/julia/julia-runtime.jar"/>
- <classpathentry kind="lib"
path="/fractal-import/lib/fractal-explorer/basic-plugin.jar"/>
<classpathentry kind="lib"
path="/fractal-import/lib/apollon/apollon-runtime.jar"/>
- <classpathentry kind="lib"
path="/fractal-import/lib/fractal-explorer/browser.jar"/>
- <classpathentry kind="lib"
path="/fractal-import/lib/fractal-explorer/fractal-browser.jar"/>
- <classpathentry kind="lib"
path="/fractal-import/lib/fractal-explorer/fractal-plugin.jar"/>
+ <classpathentry kind="lib"
path="/fractal-import/lib/fractal-explorer/fractal-explorer.jar"/>
+ <classpathentry kind="lib"
path="/fractal-import/lib/fractal-explorer/ow_util_explorer.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Index:
gotm-explorer/src/java/org/objectweb/gotm/browser/coordination/CoordinationFeatureProcessAction.java
diff -u
gotm-explorer/src/java/org/objectweb/gotm/browser/coordination/CoordinationFeatureProcessAction.java:1.3
gotm-explorer/src/java/org/objectweb/gotm/browser/coordination/CoordinationFeatureProcessAction.java:1.4
---
gotm-explorer/src/java/org/objectweb/gotm/browser/coordination/CoordinationFeatureProcessAction.java:1.3
Tue Aug 16 15:38:07 2005
+++
gotm-explorer/src/java/org/objectweb/gotm/browser/coordination/CoordinationFeatureProcessAction.java
Tue Sep 6 15:40:11 2005
@@ -23,7 +23,7 @@
Contributor(s): .
---------------------------------------------------------------------
-$Id: CoordinationFeatureProcessAction.java,v 1.3 2005/08/16 13:38:07 rouvoy
Exp $
+$Id: CoordinationFeatureProcessAction.java,v 1.4 2005/09/06 13:40:11 rouvoy
Exp $
====================================================================*/
package org.objectweb.gotm.browser.coordination;
@@ -34,19 +34,19 @@
import org.objectweb.fractal.api.Interface;
import org.objectweb.fractal.api.NoSuchInterfaceException;
import org.objectweb.fractal.api.control.LifeCycleController;
+import org.objectweb.fractal.explorer.FcExplorer;
+import org.objectweb.fractal.explorer.menu.DefaultFractalMenuItem;
import org.objectweb.transaction.api.coordination.CoordinationFeature;
import org.objectweb.transaction.api.transaction.TransactionStatusFeature;
import
org.objectweb.transaction.lib.transaction.TransactionStatusNoTransaction;
-import org.objectweb.util.browser.api.MenuItem;
-import org.objectweb.util.browser.api.MenuItemTreeView;
-import org.objectweb.util.browser.api.TreeView;
-import org.objectweb.util.browser.plugins.fractal.FcBrowser;
-import
org.objectweb.util.browser.plugins.fractal.menu.DefaultFractalMenuItem;
+import org.objectweb.util.explorer.api.MenuItem;
+import org.objectweb.util.explorer.api.MenuItemTreeView;
+import org.objectweb.util.explorer.api.TreeView;
/**
* Process Action implementation for the Coordination Feature.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class CoordinationFeatureProcessAction
extends DefaultFractalMenuItem
@@ -59,7 +59,7 @@
Component cpt = (Component) arg0.getParentObject();
try {
TransactionStatusFeature status = (TransactionStatusFeature)
cpt.getFcInterface(TransactionStatusFeature.TX_STATUS);
- if (FcBrowser.getLifeCycleState((Interface)status) ==
LifeCycleController.STOPPED)
+ if (FcExplorer.getLifeCycleState((Interface)status) ==
LifeCycleController.STOPPED)
return getStoppedStatus(arg0);
if (status.getStatus() == TransactionStatusNoTransaction.status)
return MenuItem.DISABLED_STATUS;
Index:
gotm-explorer/src/java/org/objectweb/gotm/browser/transaction/TransactionActivationFeatureBeginAction.java
diff -u
gotm-explorer/src/java/org/objectweb/gotm/browser/transaction/TransactionActivationFeatureBeginAction.java:1.3
gotm-explorer/src/java/org/objectweb/gotm/browser/transaction/TransactionActivationFeatureBeginAction.java:1.4
---
gotm-explorer/src/java/org/objectweb/gotm/browser/transaction/TransactionActivationFeatureBeginAction.java:1.3
Mon Jul 11 10:27:06 2005
+++
gotm-explorer/src/java/org/objectweb/gotm/browser/transaction/TransactionActivationFeatureBeginAction.java
Tue Sep 6 15:40:11 2005
@@ -23,7 +23,7 @@
Contributor(s): .
---------------------------------------------------------------------
-$Id: TransactionActivationFeatureBeginAction.java,v 1.3 2005/07/11 08:27:06
rouvoy Exp $
+$Id: TransactionActivationFeatureBeginAction.java,v 1.4 2005/09/06 13:40:11
rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.browser.transaction;
@@ -32,15 +32,15 @@
import org.objectweb.fractal.api.Interface;
import org.objectweb.fractal.api.NoSuchInterfaceException;
import org.objectweb.fractal.api.control.LifeCycleController;
+import org.objectweb.fractal.explorer.FcExplorer;
+import org.objectweb.fractal.explorer.menu.DefaultFractalMenuItem;
import org.objectweb.transaction.api.transaction.TransactionState;
import org.objectweb.transaction.api.transaction.TransactionStatusFeature;
import
org.objectweb.transaction.lib.transaction.TransactionStatusNoTransaction;
import
org.objectweb.transaction.lib.transaction.TransactionStatusTransactionActive;
-import org.objectweb.util.browser.api.MenuItem;
-import org.objectweb.util.browser.api.MenuItemTreeView;
-import org.objectweb.util.browser.api.TreeView;
-import org.objectweb.util.browser.plugins.fractal.FcBrowser;
-import
org.objectweb.util.browser.plugins.fractal.menu.DefaultFractalMenuItem;
+import org.objectweb.util.explorer.api.MenuItem;
+import org.objectweb.util.explorer.api.MenuItemTreeView;
+import org.objectweb.util.explorer.api.TreeView;
/**
*
@@ -57,7 +57,7 @@
Component cpt = (Component) arg0.getParentObject();
try {
TransactionStatusFeature status = (TransactionStatusFeature)
cpt.getFcInterface(TransactionStatusFeature.TX_STATUS);
- if (FcBrowser.getLifeCycleState((Interface)status) ==
LifeCycleController.STOPPED)
+ if (FcExplorer.getLifeCycleState((Interface)status) ==
LifeCycleController.STOPPED)
return getStoppedStatus(arg0);
if (status.getStatus() ==
TransactionStatusTransactionActive.status)
return MenuItem.DISABLED_STATUS;
Index:
gotm-explorer/src/java/org/objectweb/gotm/browser/transaction/TransactionInterruptionFeatureResumeAction.java
diff -u
gotm-explorer/src/java/org/objectweb/gotm/browser/transaction/TransactionInterruptionFeatureResumeAction.java:1.3
gotm-explorer/src/java/org/objectweb/gotm/browser/transaction/TransactionInterruptionFeatureResumeAction.java:1.4
---
gotm-explorer/src/java/org/objectweb/gotm/browser/transaction/TransactionInterruptionFeatureResumeAction.java:1.3
Mon Jul 11 10:27:06 2005
+++
gotm-explorer/src/java/org/objectweb/gotm/browser/transaction/TransactionInterruptionFeatureResumeAction.java
Tue Sep 6 15:40:11 2005
@@ -23,7 +23,7 @@
Contributor(s): .
---------------------------------------------------------------------
-$Id: TransactionInterruptionFeatureResumeAction.java,v 1.3 2005/07/11
08:27:06 rouvoy Exp $
+$Id: TransactionInterruptionFeatureResumeAction.java,v 1.4 2005/09/06
13:40:11 rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.browser.transaction;
@@ -32,14 +32,14 @@
import org.objectweb.fractal.api.Interface;
import org.objectweb.fractal.api.NoSuchInterfaceException;
import org.objectweb.fractal.api.control.LifeCycleController;
+import org.objectweb.fractal.explorer.FcExplorer;
+import org.objectweb.fractal.explorer.menu.DefaultFractalMenuItem;
import org.objectweb.transaction.api.transaction.TransactionState;
import org.objectweb.transaction.api.transaction.TransactionStatusFeature;
import
org.objectweb.transaction.lib.transaction.TransactionStatusTransactionActive;
-import org.objectweb.util.browser.api.MenuItem;
-import org.objectweb.util.browser.api.MenuItemTreeView;
-import org.objectweb.util.browser.api.TreeView;
-import org.objectweb.util.browser.plugins.fractal.FcBrowser;
-import
org.objectweb.util.browser.plugins.fractal.menu.DefaultFractalMenuItem;
+import org.objectweb.util.explorer.api.MenuItem;
+import org.objectweb.util.explorer.api.MenuItemTreeView;
+import org.objectweb.util.explorer.api.TreeView;
/**
*
@@ -56,7 +56,7 @@
Component cpt = (Component) arg0.getParentObject();
try {
TransactionStatusFeature status = (TransactionStatusFeature)
cpt.getFcInterface(TransactionStatusFeature.TX_STATUS);
- if (FcBrowser.getLifeCycleState((Interface)status) ==
LifeCycleController.STOPPED)
+ if (FcExplorer.getLifeCycleState((Interface)status) ==
LifeCycleController.STOPPED)
return getStoppedStatus(arg0);
if (status.getStatus() ==
TransactionStatusTransactionActive.status)
return MenuItem.DISABLED_STATUS;
Index:
gotm-explorer/src/java/org/objectweb/gotm/browser/transaction/TransactionInterruptionFeatureSuspendAction.java
diff -u
gotm-explorer/src/java/org/objectweb/gotm/browser/transaction/TransactionInterruptionFeatureSuspendAction.java:1.3
gotm-explorer/src/java/org/objectweb/gotm/browser/transaction/TransactionInterruptionFeatureSuspendAction.java:1.4
---
gotm-explorer/src/java/org/objectweb/gotm/browser/transaction/TransactionInterruptionFeatureSuspendAction.java:1.3
Mon Jul 11 10:27:06 2005
+++
gotm-explorer/src/java/org/objectweb/gotm/browser/transaction/TransactionInterruptionFeatureSuspendAction.java
Tue Sep 6 15:40:11 2005
@@ -23,7 +23,7 @@
Contributor(s): .
---------------------------------------------------------------------
-$Id: TransactionInterruptionFeatureSuspendAction.java,v 1.3 2005/07/11
08:27:06 rouvoy Exp $
+$Id: TransactionInterruptionFeatureSuspendAction.java,v 1.4 2005/09/06
13:40:11 rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.browser.transaction;
@@ -32,15 +32,15 @@
import org.objectweb.fractal.api.Interface;
import org.objectweb.fractal.api.NoSuchInterfaceException;
import org.objectweb.fractal.api.control.LifeCycleController;
+import org.objectweb.fractal.explorer.FcExplorer;
+import org.objectweb.fractal.explorer.menu.DefaultFractalMenuItem;
import org.objectweb.transaction.api.transaction.TransactionState;
import org.objectweb.transaction.api.transaction.TransactionStatusFeature;
import
org.objectweb.transaction.lib.transaction.TransactionStatusNoTransaction;
import
org.objectweb.transaction.lib.transaction.TransactionStatusTransactionActive;
-import org.objectweb.util.browser.api.MenuItem;
-import org.objectweb.util.browser.api.MenuItemTreeView;
-import org.objectweb.util.browser.api.TreeView;
-import org.objectweb.util.browser.plugins.fractal.FcBrowser;
-import
org.objectweb.util.browser.plugins.fractal.menu.DefaultFractalMenuItem;
+import org.objectweb.util.explorer.api.MenuItem;
+import org.objectweb.util.explorer.api.MenuItemTreeView;
+import org.objectweb.util.explorer.api.TreeView;
/**
*
@@ -58,7 +58,7 @@
Component cpt = (Component) arg0.getParentObject();
try {
TransactionStatusFeature status = (TransactionStatusFeature)
cpt.getFcInterface(TransactionStatusFeature.TX_STATUS);
- if (FcBrowser.getLifeCycleState((Interface)status) ==
LifeCycleController.STOPPED)
+ if (FcExplorer.getLifeCycleState((Interface)status) ==
LifeCycleController.STOPPED)
return getStoppedStatus(arg0);
if (status.getStatus() == TransactionStatusNoTransaction.status)
return MenuItem.DISABLED_STATUS;
Index:
gotm-explorer/src/java/org/objectweb/gotm/browser/transaction/TransactionStatePanel.java
diff -u
gotm-explorer/src/java/org/objectweb/gotm/browser/transaction/TransactionStatePanel.java:1.3
gotm-explorer/src/java/org/objectweb/gotm/browser/transaction/TransactionStatePanel.java:1.4
---
gotm-explorer/src/java/org/objectweb/gotm/browser/transaction/TransactionStatePanel.java:1.3
Mon Jan 10 17:16:52 2005
+++
gotm-explorer/src/java/org/objectweb/gotm/browser/transaction/TransactionStatePanel.java
Tue Sep 6 15:40:11 2005
@@ -23,7 +23,7 @@
Contributor(s): .
---------------------------------------------------------------------
- $Id: TransactionStatePanel.java,v 1.3 2005/01/10 16:16:52 rouvoy Exp $
+ $Id: TransactionStatePanel.java,v 1.4 2005/09/06 13:40:11 rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.browser.transaction;
@@ -34,15 +34,15 @@
import javax.swing.JPanel;
import javax.swing.border.TitledBorder;
+import org.objectweb.fractal.explorer.panel.DefaultFractalViewPanel;
import org.objectweb.transaction.api.transaction.TransactionState;
-import org.objectweb.util.browser.api.TreeView;
-import org.objectweb.util.browser.gui.lib.LabelBox;
-import
org.objectweb.util.browser.plugins.fractal.panel.DefaultFractalViewPanel;
+import org.objectweb.util.explorer.api.TreeView;
+import org.objectweb.util.explorer.swing.gui.lib.LabelBox;
/**
* Panel to display information provided by the TransactionState.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy </a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class TransactionStatePanel
extends DefaultFractalViewPanel
Index:
gotm-explorer/src/java/org/objectweb/gotm/browser/transaction/TransactionStatusFeatureIconProvider.java
diff -u
gotm-explorer/src/java/org/objectweb/gotm/browser/transaction/TransactionStatusFeatureIconProvider.java:1.2
gotm-explorer/src/java/org/objectweb/gotm/browser/transaction/TransactionStatusFeatureIconProvider.java:1.3
---
gotm-explorer/src/java/org/objectweb/gotm/browser/transaction/TransactionStatusFeatureIconProvider.java:1.2
Mon Jan 10 17:16:52 2005
+++
gotm-explorer/src/java/org/objectweb/gotm/browser/transaction/TransactionStatusFeatureIconProvider.java
Tue Sep 6 15:40:11 2005
@@ -23,7 +23,7 @@
Contributor(s): .
---------------------------------------------------------------------
-$Id: TransactionStatusFeatureIconProvider.java,v 1.2 2005/01/10 16:16:52
rouvoy Exp $
+$Id: TransactionStatusFeatureIconProvider.java,v 1.3 2005/09/06 13:40:11
rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.browser.transaction;
@@ -33,16 +33,16 @@
import org.objectweb.fractal.api.Interface;
import org.objectweb.fractal.api.control.LifeCycleController;
+import org.objectweb.fractal.explorer.FcExplorer;
+import org.objectweb.fractal.explorer.icon.DefaultFractalIconProvider;
import org.objectweb.transaction.api.transaction.TransactionStatusFeature;
import
org.objectweb.transaction.lib.transaction.TransactionStatusTransactionActive;
-import org.objectweb.util.browser.plugins.fractal.FcBrowser;
-import
org.objectweb.util.browser.plugins.fractal.icon.DefaultFractalIconProvider;
/**
* Implementation of an <code>IconProvider</code> for the
* <code>TransactionStatusFeature</code>.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class TransactionStatusFeatureIconProvider
extends DefaultFractalIconProvider
@@ -60,9 +60,9 @@
/* (non-Javadoc)
* @see
org.objectweb.util.browser.plugins.fractal.DefaultFractalIconProvider#newStartedIcon(java.lang.Object)
*/
- public Icon newStartedIcon(Object arg0) {
+ public Object newStartedIcon(Object arg0) {
TransactionStatusFeature status = (TransactionStatusFeature) arg0;
- if (FcBrowser.getLifeCycleState((Interface)status) ==
LifeCycleController.STOPPED)
+ if (FcExplorer.getLifeCycleState((Interface)status) ==
LifeCycleController.STOPPED)
return newStoppedIcon(arg0);
if (status.getStatus() == TransactionStatusTransactionActive.status)
return this.startIcon;
Index:
gotm-explorer/src/java/org/objectweb/gotm/browser/xid/XidStatePanel.java
diff -u
gotm-explorer/src/java/org/objectweb/gotm/browser/xid/XidStatePanel.java:1.2
gotm-explorer/src/java/org/objectweb/gotm/browser/xid/XidStatePanel.java:1.3
---
gotm-explorer/src/java/org/objectweb/gotm/browser/xid/XidStatePanel.java:1.2
Mon Jan 10 17:16:52 2005
+++ gotm-explorer/src/java/org/objectweb/gotm/browser/xid/XidStatePanel.java
Tue Sep 6 15:40:11 2005
@@ -23,7 +23,7 @@
Contributor(s): .
---------------------------------------------------------------------
-$Id: XidStatePanel.java,v 1.2 2005/01/10 16:16:52 rouvoy Exp $
+$Id: XidStatePanel.java,v 1.3 2005/09/06 13:40:11 rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.browser.xid;
@@ -34,15 +34,15 @@
import javax.swing.JPanel;
import javax.swing.border.TitledBorder;
+import org.objectweb.fractal.explorer.panel.DefaultFractalViewPanel;
import org.objectweb.transaction.api.xid.XidState;
-import org.objectweb.util.browser.api.TreeView;
-import org.objectweb.util.browser.gui.lib.LabelBox;
-import
org.objectweb.util.browser.plugins.fractal.panel.DefaultFractalViewPanel;
+import org.objectweb.util.explorer.api.TreeView;
+import org.objectweb.util.explorer.swing.gui.lib.LabelBox;
/**
* Implementation of a <code>ViewPanel</code> for the <code>XidState</code>.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class XidStatePanel
extends DefaultFractalViewPanel {
@@ -94,5 +94,4 @@
public void unselectedStarted(TreeView arg0) {
// Nothing to do.
}
-
-}
+}
\ No newline at end of file
Index: gotm-explorer/src/xml/GoTM.xml
diff -u gotm-explorer/src/xml/GoTM.xml:1.1 gotm-explorer/src/xml/GoTM.xml:1.2
--- gotm-explorer/src/xml/GoTM.xml:1.1 Tue Jun 28 10:07:19 2005
+++ gotm-explorer/src/xml/GoTM.xml Tue Sep 6 15:40:11 2005
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<browser>
- <include url="fractalProperties.xml"/>
<!--
+ <include url="fractalProperties.xml"/>
<node type-name="java.lang.Object">
<menu>
<item label="Type">
| <-- Date Index --> | <-- Thread Index --> |
Powered by MHonArc.
Copyright © 2006-2007, OW2 Consortium | contact | webmaster.