[Simexplorer-si-commits] r1225 - in trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions: . history util

24 Feb 2008

Author: tchemit
Date: 2008-02-24 23:20:32 +0000 (Sun, 24 Feb 2008)
New Revision: 1225

Modified:
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CloseTabAction.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.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/history/HistoryAddAction.java
   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/SimExplorerAbstractAction.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ToggleTabAbstractAction.java
Log:
mise en place log d'action

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

--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CloseTabAction.java	2008-02-24 23:20:12 UTC (rev 1224)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CloseTabAction.java	2008-02-24 23:20:32 UTC (rev 1225)
@@ -49,6 +49,11 @@
     }
 
     @Override
+    protected void setStatus(String status) {
+        // no log
+    }
+    
+    @Override
     protected boolean beforeAction(ActionEvent e) throws Exception {
         return super.beforeAction(e) && getTabContainer().getTabCount() > 0 && getTab().isTabVisible(getTabContainer());
     }

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java	2008-02-24 23:20:12 UTC (rev 1224)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java	2008-02-24 23:20:32 UTC (rev 1225)
@@ -50,6 +50,11 @@
     }
 
     @Override
+    protected void setStatus(String status) {
+        // no log
+    }
+
+    @Override
     public String getI18nToolTipText() {
         return "simexplorer.action.collapseAll.tooltip";
     }

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java	2008-02-24 23:20:12 UTC (rev 1224)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DeleteElementAction.java	2008-02-24 23:20:32 UTC (rev 1225)
@@ -103,7 +103,7 @@
 
             SynchronizeTabModel model = getSynchronizeModel();
 
-            model.reloadSources(getContext(), uuid, !remote,remote,!remote,remote);
+            model.reloadSources(uuid, !remote,remote,!remote,remote);
         }
 
         // suppression de l'élément de l'historique (si present)

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java	2008-02-24 23:20:12 UTC (rev 1224)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java	2008-02-24 23:20:32 UTC (rev 1225)
@@ -51,6 +51,11 @@
     }
 
     @Override
+    protected void setStatus(String status) {
+        // no log
+    }
+    
+    @Override
     public String getI18nToolTipText() {
         return "simexplorer.action.expandAll.tooltip";
     }

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java	2008-02-24 23:20:12 UTC (rev 1224)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java	2008-02-24 23:20:32 UTC (rev 1225)
@@ -157,7 +157,7 @@
         if (SimExplorerTab.synchronize.isTabVisible(getTabContainer())) {
             SynchronizeTabModel model = getSynchronizeModel();
 
-            model.reloadSources(getContext(), uuid, false,false,remote,!remote);
+            model.reloadSources(uuid, false,false,remote,!remote);
         }
 
         // suppression de l'élément de l'historique (si present)

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-24 23:20:12 UTC (rev 1224)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java	2008-02-24 23:20:32 UTC (rev 1225)
@@ -19,6 +19,7 @@
 package fr.cemagref.simexplorer.is.ui.swing.actions;
 
 import fr.cemagref.simexplorer.is.entities.data.LoggableElement;
+import fr.cemagref.simexplorer.is.ui.swing.actions.util.SelectedAction;
 import fr.cemagref.simexplorer.is.ui.swing.actions.util.ShowTabAbstractAction;
 import fr.cemagref.simexplorer.is.ui.swing.model.DataEntityModel;
 import fr.cemagref.simexplorer.is.ui.swing.model.EntityTreeNode;
@@ -47,7 +48,7 @@
         mnemonic = 'S',
         hideActionText = true
 )
-public class ShowSynchronizeTabAction extends ShowTabAbstractAction<JSynchronizeTab, SynchronizeTabModel> {
+public class ShowSynchronizeTabAction extends ShowTabAbstractAction<JSynchronizeTab, SynchronizeTabModel> implements SelectedAction {
 
     protected DataEntityModel selected;
 
@@ -68,11 +69,17 @@
     }
 
     @Override
+    protected void setStatus(String status) {
+        // no log
+    }
+    @Override
     protected boolean beforeAction(ActionEvent e) throws Exception {
         if (!super.beforeAction(e)) {
             return false;
         }
-        selected = findSelectedItem(e);
+        if (selected == null) {
+            selected = findSelectedItem(e);
+        }
         boolean selectedUuid = selected != null && selected.getUuid() != null;
         if (!selectedUuid) {
             return false;
@@ -112,20 +119,20 @@
         super.disposeUI();
         JSynchronizeTab ui = getTabUI();
         if (navigationActionsLocalListener != null) {
-            ui.getTree(false).removeTreeSelectionListener(navigationActionsLocalListener );
-            navigationActionsLocalListener=null;
+            ui.getTree(false).removeTreeSelectionListener(navigationActionsLocalListener);
+            navigationActionsLocalListener = null;
         }
-        if (navigationActionsRemoteListener!= null) {
+        if (navigationActionsRemoteListener != null) {
             ui.getTree(false).removeTreeSelectionListener(navigationActionsRemoteListener);
-            navigationActionsRemoteListener=null;
+            navigationActionsRemoteListener = null;
         }
-        if (navigationLocalListener!= null) {
+        if (navigationLocalListener != null) {
             ui.getTree(true).removeTreeSelectionListener(navigationLocalListener);
-            navigationLocalListener=null;
+            navigationLocalListener = null;
         }
         if (navigationActionsRemoteListener != null) {
-            ui.getTree(true).removeTreeSelectionListener(navigationActionsRemoteListener );
-            navigationActionsRemoteListener =null;
+            ui.getTree(true).removeTreeSelectionListener(navigationActionsRemoteListener);
+            navigationActionsRemoteListener = null;
         }
     }
 
@@ -136,6 +143,10 @@
         sources = null;
     }
 
+    public void setSelected(DataEntityModel selected) {
+        this.selected = selected;
+    }
+
     /**
      * Listen on selection of node in a tree, and refresh navigation actions.
      *

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryAddAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryAddAction.java	2008-02-24 23:20:12 UTC (rev 1224)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/history/HistoryAddAction.java	2008-02-24 23:20:32 UTC (rev 1225)
@@ -50,6 +50,11 @@
         super(name);
     }
 
+    @Override
+    protected void setStatus(String status) {
+        // no log
+    }
+
     protected boolean hasHistoryEntry(HistoryModel<EntityTreeNode> model) {
         // cette action doit toujours être configurée avant lancement
         if (selected==null) {

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-24 23:20:12 UTC (rev 1224)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java	2008-02-24 23:20:32 UTC (rev 1225)
@@ -61,6 +61,11 @@
     }
 
     @Override
+    protected void setStatus(String status) {
+        // no log
+    }
+    
+    @Override
     protected boolean beforeAction(ActionEvent e) throws Exception {
         super.beforeAction(e);
         JTabbedPane tabbedPane = getTabContainer();

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java	2008-02-24 23:20:12 UTC (rev 1224)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractAction.java	2008-02-24 23:20:32 UTC (rev 1225)
@@ -32,6 +32,7 @@
 import jaxx.runtime.JAXXObject;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import static org.codelutin.i18n.I18n._;
 
 import javax.swing.JComponent;
 import java.awt.event.ActionEvent;
@@ -64,8 +65,8 @@
                 log.debug(getActionName() + " (treate:" + accepted + ") : " + this);
             }
             if (accepted) {
-                setStatus(toString());
                 doAction(e);
+                setStatus(_("simexplorer.action.done",getName()));
                 updateUI();
             }
         } catch (Exception e1) {

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ToggleTabAbstractAction.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ToggleTabAbstractAction.java	2008-02-24 23:20:12 UTC (rev 1224)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ToggleTabAbstractAction.java	2008-02-24 23:20:32 UTC (rev 1225)
@@ -43,6 +43,11 @@
     }
 
     @Override
+    protected void setStatus(String status) {
+        // no log
+    }
+
+    @Override
     protected boolean beforeAction(ActionEvent e) throws Exception {
         super.beforeAction(e);
         // find real action to perform

    

[Simexplorer-si-commits] r1225 - in trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions: . history util

tchemit＠users.labs.libre-entreprise.org