r972 - in trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions: . util - Simexplorer-si-commits

14 Feb 2008

Author: tchemit
Date: 2008-02-14 15:44:29 +0000 (Thu, 14 Feb 2008)
New Revision: 972

Modified:
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportAction.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToLocalAction.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToRemoteAction.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HistoryNextAction.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HistoryPreviousAction.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/UnconnectAction.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java
Log:
propagation des modifications sur les actions (refresh, node,EntitiesAction,...)

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java
===================================================================

--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java	2008-02-14 15:41:19 UTC (rev 971)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangePageAction.java	2008-02-14 15:44:29 UTC (rev 972)
@@ -19,8 +19,8 @@
 package fr.cemagref.simexplorer.is.ui.swing.actions;
 
 import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager;
-import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper;
 import fr.cemagref.simexplorer.is.ui.swing.JListTab;
+import fr.cemagref.simexplorer.is.ui.swing.ListTabRefreshHelper;
 import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction;
 import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel;
 import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel;
@@ -92,7 +92,7 @@
         modelTab.setData(model.getList());
 
         // refresh ui
-        SimExplorerUIRefreshHelper.refreshListTabUI(container, model);
+        ListTabRefreshHelper.refreshListTabUI(container, model);
     }
 
     @Override

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java	2008-02-14 15:41:19 UTC (rev 971)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ChangeSizorAction.java	2008-02-14 15:44:29 UTC (rev 972)
@@ -23,7 +23,7 @@
 import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel;
 import fr.cemagref.simexplorer.is.ui.swing.model.PaginationModel;
 import fr.cemagref.simexplorer.is.ui.swing.JListTab;
-import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper;
+import fr.cemagref.simexplorer.is.ui.swing.ListTabRefreshHelper;
 
 import javax.swing.Action;
 import javax.swing.JComboBox;
@@ -89,7 +89,7 @@
         modelTab.setData(model.getList());
 
         // refresh ui
-        SimExplorerUIRefreshHelper.refreshListTabUI(container, model);
+        ListTabRefreshHelper.refreshListTabUI(container, model);
     }
 
     @Override

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java	2008-02-14 15:41:19 UTC (rev 971)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java	2008-02-14 15:44:29 UTC (rev 972)
@@ -24,7 +24,7 @@
 import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException;
 import fr.cemagref.simexplorer.is.ui.StorageServiceHelper;
 import fr.cemagref.simexplorer.is.ui.swing.LoginUI;
-import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper;
+import fr.cemagref.simexplorer.is.ui.swing.MainUIRefreshHelper;
 import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction;
 import static org.codelutin.i18n.I18n._;
 
@@ -82,7 +82,7 @@
 
     @Override
     protected void afterAction(ActionEvent e) throws Exception {
-        SimExplorerUIRefreshHelper.refreshConnnectState(getMainUI(), getContext().isConnected());
+        MainUIRefreshHelper.refreshConnnectState(getMainUI(), getContext().isConnected(), null);
     }
 
     @Override

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java	2008-02-14 15:41:19 UTC (rev 971)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java	2008-02-14 15:44:29 UTC (rev 972)
@@ -28,7 +28,6 @@
 import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper;
 import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode;
 
-import javax.swing.tree.TreeNode;
 import java.awt.event.ActionEvent;
 
 /**
@@ -76,7 +75,7 @@
     protected void doAction(ActionEvent e) throws Exception {
         model.setRootNode(element);
         // create navigation tree
-        TreeNode root = LoggableElementTreeHelper.buildLoggableElementNode(model.getRootNode());
+        LoggableElementTreeNode root = LoggableElementTreeHelper.buildLoggableElementNode(model.getRootNode(), model.isRemote());
         model.getHistory().add(root);
         // push it in tree
         DetailTabRefreshHelper.updateDetailNavigationTree((JDetailTab) getUI(), model.getHistory());

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportAction.java	2008-02-14 15:41:19 UTC (rev 971)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportAction.java	2008-02-14 15:44:29 UTC (rev 972)
@@ -20,6 +20,7 @@
 
 import fr.cemagref.simexplorer.is.entities.data.LoggableElement;
 import fr.cemagref.simexplorer.is.entities.metadata.Version;
+import fr.cemagref.simexplorer.is.entities.EntitiesAction;
 import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction;
 import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper;
 import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode;
@@ -68,7 +69,7 @@
         tree = ui.getNavigationTree();
         node = LoggableElementTreeHelper.getSelectedNodeOrRootNode(tree);
         boolean result;
-        result = LoggableElementTreeHelper.canExport(node);
+        result = EntitiesAction.EXPORT.accept(node);
         if (result) {
             element = (LoggableElement) node.getUserObject();
             uuid = element.getMetaData().getUuid();

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToLocalAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToLocalAction.java	2008-02-14 15:41:19 UTC (rev 971)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToLocalAction.java	2008-02-14 15:44:29 UTC (rev 972)
@@ -18,13 +18,14 @@
 * ##% */
 package fr.cemagref.simexplorer.is.ui.swing.actions;
 
+import fr.cemagref.simexplorer.is.entities.EntitiesAction;
 import fr.cemagref.simexplorer.is.entities.data.LoggableElement;
 import fr.cemagref.simexplorer.is.entities.metadata.Version;
+import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException;
+import fr.cemagref.simexplorer.is.ui.swing.JDetailTab;
 import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction;
 import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper;
 import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode;
-import fr.cemagref.simexplorer.is.ui.swing.JDetailTab;
-import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException;
 
 import javax.swing.JTree;
 import java.awt.event.ActionEvent;
@@ -68,7 +69,7 @@
         tree = ui.getNavigationTree();
         node = LoggableElementTreeHelper.getSelectedNodeOrRootNode(tree);
         boolean result;
-        result = LoggableElementTreeHelper.canExport(node);
+        result = EntitiesAction.EXPORT.accept(node);
         if (result) {
             element = (LoggableElement) node.getUserObject();
             uuid = element.getMetaData().getUuid();
@@ -79,7 +80,7 @@
 
     @Override
     protected void doAction(ActionEvent e) throws Exception {
-        throw new SimExplorerRuntimeException(this+" is not implemented yet!");
+        throw new SimExplorerRuntimeException(this + " is not implemented yet!");
     }
 
     @Override

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToRemoteAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToRemoteAction.java	2008-02-14 15:41:19 UTC (rev 971)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportToRemoteAction.java	2008-02-14 15:44:29 UTC (rev 972)
@@ -20,6 +20,7 @@
 
 import fr.cemagref.simexplorer.is.entities.data.LoggableElement;
 import fr.cemagref.simexplorer.is.entities.metadata.Version;
+import fr.cemagref.simexplorer.is.entities.EntitiesAction;
 import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction;
 import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper;
 import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode;
@@ -68,7 +69,7 @@
         tree = ui.getNavigationTree();
         node = LoggableElementTreeHelper.getSelectedNodeOrRootNode(tree);
         boolean result;
-        result = LoggableElementTreeHelper.canExport(node);
+        result = EntitiesAction.EXPORT.accept(node);
         if (result) {
             element = (LoggableElement) node.getUserObject();
             uuid = element.getMetaData().getUuid();

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HistoryNextAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HistoryNextAction.java	2008-02-14 15:41:19 UTC (rev 971)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HistoryNextAction.java	2008-02-14 15:44:29 UTC (rev 972)
@@ -23,9 +23,8 @@
 import fr.cemagref.simexplorer.is.ui.swing.JDetailTab;
 import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction;
 import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel;
+import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode;
 
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.TreeNode;
 import java.awt.event.ActionEvent;
 
 /** @author chemit */
@@ -59,8 +58,9 @@
 
     @Override
     protected void doAction(ActionEvent e) throws Exception {
-        TreeNode node = model.getHistory().gotoNext();
-        model.setRootNode((LoggableElement) ((DefaultMutableTreeNode) node).getUserObject());
+        LoggableElementTreeNode node = model.getHistory().gotoNext();
+        model.setRemote(node.isRemote());
+        model.setRootNode((LoggableElement) node.getUserObject());
         DetailTabRefreshHelper.updateDetailNavigationTree((JDetailTab) getUI(), model.getHistory());
     }
 

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HistoryPreviousAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HistoryPreviousAction.java	2008-02-14 15:41:19 UTC (rev 971)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HistoryPreviousAction.java	2008-02-14 15:44:29 UTC (rev 972)
@@ -23,9 +23,8 @@
 import fr.cemagref.simexplorer.is.ui.swing.JDetailTab;
 import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction;
 import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel;
+import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode;
 
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.TreeNode;
 import java.awt.event.ActionEvent;
 
 /** @author chemit */
@@ -54,13 +53,14 @@
             return false;
         }
         model = (DetailTabModel) getModel();
-        return model.getHistory().hastPrevious();
+        return model.getHistory().hasPrevious();
     }
 
     @Override
     protected void doAction(ActionEvent e) throws Exception {
-        TreeNode node = model.getHistory().gotoPrevious();
-        model.setRootNode((LoggableElement) ((DefaultMutableTreeNode) node).getUserObject());
+        LoggableElementTreeNode node = model.getHistory().gotoPrevious();
+        model.setRemote(node.isRemote());
+        model.setRootNode((LoggableElement) node.getUserObject());
         DetailTabRefreshHelper.updateDetailNavigationTree((JDetailTab) getUI(), model.getHistory());
     }
 

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java	2008-02-14 15:41:19 UTC (rev 971)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ResetSearchAction.java	2008-02-14 15:44:29 UTC (rev 972)
@@ -22,7 +22,7 @@
 import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel;
 import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel;
 import fr.cemagref.simexplorer.is.ui.swing.JListTab;
-import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper;
+import fr.cemagref.simexplorer.is.ui.swing.ListTabRefreshHelper;
 
 import javax.swing.JTable;
 import java.awt.event.ActionEvent;
@@ -59,7 +59,7 @@
         if (!model.hasQuery()) {
             // directly refresh search actions
             // but do not realize action
-            SimExplorerUIRefreshHelper.refreshSearchActions(ui,model);
+            ListTabRefreshHelper.refreshSearchActions(ui,model);
             return false;
         }
         // only reset search if something was previously search
@@ -87,7 +87,7 @@
         modelTab.setData(model.getList());
 
         // refresh ui
-        SimExplorerUIRefreshHelper.refreshListTabUI(container, model);
+        ListTabRefreshHelper.refreshListTabUI(container, model);
     }
 
     @Override

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java	2008-02-14 15:41:19 UTC (rev 971)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/SearchAction.java	2008-02-14 15:44:29 UTC (rev 972)
@@ -22,7 +22,7 @@
 import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel;
 import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel;
 import fr.cemagref.simexplorer.is.ui.swing.JListTab;
-import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper;
+import fr.cemagref.simexplorer.is.ui.swing.ListTabRefreshHelper;
 
 import javax.swing.JTextField;
 import javax.swing.JTable;
@@ -79,7 +79,7 @@
         modelTab.setData(model.getList());
 
         // refresh ui
-        SimExplorerUIRefreshHelper.refreshListTabUI(container, model);
+        ListTabRefreshHelper.refreshListTabUI(container, model);
     }
 
     @Override

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java	2008-02-14 15:41:19 UTC (rev 971)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java	2008-02-14 15:44:29 UTC (rev 972)
@@ -34,7 +34,6 @@
 import javax.swing.event.ListSelectionListener;
 import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
-import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
@@ -88,7 +87,7 @@
     protected void initUI(JDetailTab ui, DetailTabModel model) {
         DetailTabRefreshHelper.refreshTreeDetailActions(ui, null);
         // create navigation tree
-        TreeNode root = LoggableElementTreeHelper.buildLoggableElementNode(model.getRootNode());
+        LoggableElementTreeNode root = LoggableElementTreeHelper.buildLoggableElementNode(model.getRootNode(), model.isRemote());
         model.getHistory().add(root);
         DetailTabRefreshHelper.updateDetailNavigationTree(ui, model.getHistory());
     }

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java	2008-02-14 15:41:19 UTC (rev 971)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java	2008-02-14 15:44:29 UTC (rev 972)
@@ -23,7 +23,7 @@
 import fr.cemagref.simexplorer.is.ui.StorageServiceHelper;
 import fr.cemagref.simexplorer.is.ui.swing.JSynchronizeTab;
 import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab;
-import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper;
+import fr.cemagref.simexplorer.is.ui.swing.SynchronizeTabRefreshHelper;
 import fr.cemagref.simexplorer.is.ui.swing.actions.util.ShowTabAbstractAction;
 import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel;
 import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode;
@@ -136,12 +136,12 @@
     }
 
     protected void initUI(JSynchronizeTab ui, SynchronizeTabModel model) {
-        SimExplorerUIRefreshHelper.refreshTreeLocalActions(ui, null);
-        SimExplorerUIRefreshHelper.refreshTreeRemoteActions(ui, null);
-        SimExplorerUIRefreshHelper.refreshExportElementToLocalAction(ui, model);
-        SimExplorerUIRefreshHelper.refreshExportElementToRemoteAction(ui, model);
+        SynchronizeTabRefreshHelper.refreshTreeLocalActions(ui, null);
+        SynchronizeTabRefreshHelper.refreshTreeRemoteActions(ui, null);
+        SynchronizeTabRefreshHelper.refreshExportElementToLocalAction(ui, model);
+        SynchronizeTabRefreshHelper.refreshExportElementToRemoteAction(ui, model);
 
-        SimExplorerUIRefreshHelper.updateSynchronizeNavigationTrees(ui, model);
+        SynchronizeTabRefreshHelper.updateSynchronizeNavigationTrees(ui, model);
     }
 
     @Override
@@ -173,7 +173,7 @@
             }
             // on rafraichit toujours ici les actions de l'arbre qui sont
             // indépendantes du model et dépendent juste dunoeud sélectionné
-            SimExplorerUIRefreshHelper.refreshTreeLocalActions(getTabUI(), node);
+            SynchronizeTabRefreshHelper.refreshTreeLocalActions(getTabUI(), node);
 
             Object o = node == null ? null : node.getUserObject();
 
@@ -193,7 +193,7 @@
          */
         public void propertyChange(PropertyChangeEvent evt) {
             log.debug(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue());
-            SimExplorerUIRefreshHelper.refreshExportElementToRemoteAction(getTabUI(), getTabModel());
+            SynchronizeTabRefreshHelper.refreshExportElementToRemoteAction(getTabUI(), getTabModel());
         }
     }
 
@@ -218,7 +218,7 @@
             }
             // on rafraichit toujours ici les actions de l'arbre qui sont
             // indépendantes du model et dépendent juste dunoeud sélectionné
-            SimExplorerUIRefreshHelper.refreshTreeRemoteActions(getTabUI(), node);
+            SynchronizeTabRefreshHelper.refreshTreeRemoteActions(getTabUI(), node);
 
             Object o = node == null ? null : node.getUserObject();
 
@@ -238,7 +238,7 @@
          */
         public void propertyChange(PropertyChangeEvent evt) {
             log.debug(evt.getPropertyName() + " old:" + evt.getOldValue() + ", new:" + evt.getNewValue());
-            SimExplorerUIRefreshHelper.refreshExportElementToLocalAction(getTabUI(), getTabModel());
+            SynchronizeTabRefreshHelper.refreshExportElementToLocalAction(getTabUI(), getTabModel());
         }
     }
 

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/UnconnectAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/UnconnectAction.java	2008-02-14 15:41:19 UTC (rev 971)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/UnconnectAction.java	2008-02-14 15:44:29 UTC (rev 972)
@@ -18,10 +18,16 @@
 * ##% */
 package fr.cemagref.simexplorer.is.ui.swing.actions;
 
+import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab;
+import fr.cemagref.simexplorer.is.ui.swing.MainUIRefreshHelper;
 import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction;
-import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper;
+import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel;
+import fr.cemagref.simexplorer.is.ui.swing.model.HistoryModel;
+import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode;
 
 import java.awt.event.ActionEvent;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * Action pour se deconnecter du serveur distant
@@ -40,6 +46,8 @@
 )
 public class UnconnectAction extends SimExplorerAbstractAction {
 
+    HistoryModel<LoggableElementTreeNode> history;
+
     private static final long serialVersionUID = 2248642521834932196L;
 
     public UnconnectAction(String name) {
@@ -56,10 +64,48 @@
         super.doAction(e);
         getContext().setToken(null);
         //TODO disconnect from server ?
+        // must clean the history of detail tab
+        DetailTabModel model = (DetailTabModel) SimExplorerTab.detail.getModel();
+
+        history = model.getHistory();
+        if (history.isEmpty()) {
+            // nothing to do
+            return;
+        }
+        LoggableElementTreeNode current = history.getCurrent();
+
+        List<LoggableElementTreeNode> datas = history.getData();
+        for (Iterator<LoggableElementTreeNode> it = datas.iterator(); it.hasNext();)
+        {
+            if (it.next().isRemote()) {
+                it.remove();
+            }
+        }
+        if (datas.isEmpty()) {
+            // pas de position
+            history.setCurrentIndex(null);
+        } else {
+            Integer pos;
+            if (!current.isRemote()) {
+                // on doit repositionner sur l'élément local courant
+                pos = datas.indexOf(current);
+            } else {
+                // on se met sur le dernier element
+                pos = datas.size() - 1;
+            }
+            // on repositionne sur le dernier element de l'historique
+            history.setCurrentIndex(pos);
+        }
     }
 
     @Override
     protected void afterAction(ActionEvent e) throws Exception {
-        SimExplorerUIRefreshHelper.refreshConnnectState(getMainUI(), false);
+        MainUIRefreshHelper.refreshConnnectState(getMainUI(), false, history);
     }
+
+    @Override
+    protected void clear() {
+        super.clear();
+        history = null;
+    }
 }
\ No newline at end of file

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java	2008-02-14 15:41:19 UTC (rev 971)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java	2008-02-14 15:44:29 UTC (rev 972)
@@ -25,8 +25,8 @@
 import fr.cemagref.simexplorer.is.ui.StorageServiceHelper;
 import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager;
 import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab;
-import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper;
 import fr.cemagref.simexplorer.is.ui.swing.JListTab;
+import fr.cemagref.simexplorer.is.ui.swing.ListTabRefreshHelper;
 import fr.cemagref.simexplorer.is.ui.swing.actions.ShowSynchronizeTabAction;
 import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel;
 import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel;
@@ -89,7 +89,7 @@
             public void valueChanged(ListSelectionEvent e) {
                 int index = ui.getTable().getSelectedRow();
                 model.setSelectedIndex(index);
-                SimExplorerUIRefreshHelper.refreshListTablePopupMenu(ui,model);
+                ListTabRefreshHelper.refreshListTablePopupMenu(ui,model);
             }
         });
         // add a show detail action when double click on a row of the table
@@ -158,7 +158,7 @@
         ui.getSearchText().addKeyListener(new KeyAdapter() {
             @Override
             public void keyReleased(KeyEvent e) {
-                SimExplorerUIRefreshHelper.refreshSearchActions(ui, model);
+                ListTabRefreshHelper.refreshSearchActions(ui, model);
             }
         });
         //TODO Est-ce vraiment le bon endroit pour faire ça ?
@@ -168,6 +168,6 @@
     }
 
     protected void initUI(JListTab ui, ListTabModel model) {
-        SimExplorerUIRefreshHelper.refreshListTabUI(ui, model);
+        ListTabRefreshHelper.refreshListTabUI(ui, model);
     }
 }

    

r972 - in trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions: . util

tchemit＠users.labs.libre-entreprise.org

tags

participants (1)