r1131 - in trunk/simexplorer-is/simexplorer-is-swing/src: java/fr/cemagref/simexplorer/is/ui/swing resources/i18n - Simexplorer-si-commits

19 Feb 2008

Author: tchemit
Date: 2008-02-19 21:10:23 +0000 (Tue, 19 Feb 2008)
New Revision: 1131

Modified:
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/DetailTabRefreshHelper.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ListTabRefreshHelper.java
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/MainUIRefreshHelper.java
   trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties
   trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties
Log:
improve export refresh

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

--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/DetailTabRefreshHelper.java	2008-02-19 20:50:34 UTC (rev 1130)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/DetailTabRefreshHelper.java	2008-02-19 21:10:23 UTC (rev 1131)
@@ -18,16 +18,16 @@
 * ##% */
 package fr.cemagref.simexplorer.is.ui.swing;
 
-import fr.cemagref.simexplorer.is.entities.attachment.Attachment;
 import fr.cemagref.simexplorer.is.entities.EntityHelper;
+import fr.cemagref.simexplorer.is.entities.attachment.Attachment;
 import fr.cemagref.simexplorer.is.entities.data.LoggableElement;
 import fr.cemagref.simexplorer.is.entities.metadata.MetaData;
 import fr.cemagref.simexplorer.is.entities.metadata.Version;
 import fr.cemagref.simexplorer.is.ui.SimExplorer;
 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.DetailTableModel;
 import fr.cemagref.simexplorer.is.ui.swing.model.EntityTreeNode;
+import fr.cemagref.simexplorer.is.ui.swing.model.HistoryModel;
 import static org.codelutin.i18n.I18n._;
 
 import javax.swing.DefaultComboBoxModel;
@@ -62,7 +62,7 @@
         EntityTreeNode root = EntityTreeNodeHelper.build(model.getRootNode(), model.isRemote());
         EntityTreeNode current = model.getHistory().getCurrent();
         //FIXME : if object has different version, it says that this is same!!!
-        if (current==null || !root.getUserObject().equals(current.getUserObject())) {
+        if (current == null || !root.getUserObject().equals(current.getUserObject())) {
             model.getHistory().add(root);
         }
         DetailTabRefreshHelper.updateDetailNavigationTree(ui, model.getHistory());
@@ -95,19 +95,19 @@
     public static void refreshDownloadElementAction(JDetailTab ui, DetailTabModel model, EntityTreeNode node) {
         MetaData detail = model.getDetail();
         boolean enabled = EntityHelper.Action.DOWNLOAD.accept(node);
-        MainUIRefreshHelper.UpdateButton(ui.getDownloadElement(), enabled, enabled?detail == null ? node.getUserObject() : detail.getName() + " [" + model.getSelectedVersion() + "]":null);
+        MainUIRefreshHelper.UpdateButton(ui.getDownloadElement(), enabled, enabled ? detail == null ? node.getUserObject() : detail.getName() + " [" + model.getSelectedVersion() + "]" : null);
     }
 
     protected static void refreshDeleteAction(JDetailTab ui, DetailTabModel model) {
         MetaData detail = model.getDetail();
         boolean enabled = EntityHelper.Action.DELETE.accept(detail);
-        MainUIRefreshHelper.UpdateButton(ui.getDeleteElement(), enabled, enabled?detail.getName() + " [" + model.getSelectedVersion() + "]":null);
+        MainUIRefreshHelper.UpdateButton(ui.getDeleteElement(), enabled, enabled ? detail.getName() + " [" + model.getSelectedVersion() + "]" : null);
     }
 
     public static void refreshDownloadAttachmentAction(JDetailTab ui, DetailTabModel model) {
         Attachment attachment = model.getSelectedAttachment();
         boolean enabled = model.getDetail() != null && attachment != null;
-        MainUIRefreshHelper.UpdateButton(ui.getDownloadAttachment(), enabled, enabled?attachment:null);
+        MainUIRefreshHelper.UpdateButton(ui.getDownloadAttachment(), enabled, enabled ? attachment : null);
     }
 
     public static void refreshDetailToTreeAction(JDetailTab ui, DetailTabModel model) {
@@ -123,26 +123,20 @@
         }
         boolean enabled = !(detail.getName().equals(data.getName()) && data.getVersion().equals(version));
 
-        MainUIRefreshHelper.UpdateButton(ui.getDetailToTree(), enabled, enabled?detail.getName() + " [" + version + "]":null);
+        MainUIRefreshHelper.UpdateButton(ui.getDetailToTree(), enabled, enabled ? detail.getName() + " [" + version + "]" : null);
     }
 
     public static void refreshSynchroniseAction(JDetailTab ui, DetailTabModel model) {
         MetaData detail = model.getDetail();
         boolean enabled = detail != null && SimExplorer.getContext().isConnected();
-        MainUIRefreshHelper.UpdateButton(ui.getShowTab_synchronize(), enabled, enabled?detail.getName() + " [" + model.getSelectedVersion() + "]":null);
+        MainUIRefreshHelper.UpdateButton(ui.getShowTab_synchronize(), enabled, enabled ? detail.getName() + " [" + model.getSelectedVersion() + "]" : null);
     }
 
     public static void refreshExportAction(JDetailTab ui, DetailTabModel model) {
-        MetaData detail = model.getDetail();
         LoggableElement sNode = model.getSelectedNode();
-        boolean enabled = SimExplorer.getContext().isConnected() && EntityHelper.Action.EXPORT.accept(sNode);
-
-        String text = null;
-        if (enabled) {
-            text = detail.getName() + " [" + model.getSelectedVersion() + "]";
-        }
-        MainUIRefreshHelper.refreshExportElement(ui.getExportElement(),enabled,model.isRemote(), text );
-
+        MainUIRefreshHelper.refreshExportElement(ui.getExportElement(),
+                model.isRemote(),
+                sNode);
     }
 
     public static void resetHistory(JDetailTab ui, DetailTabModel model, DefaultComboBoxModel historyModel) {
@@ -185,7 +179,7 @@
         // push it in tree model
         ((DefaultTreeModel) ui.getNavigationTree().getModel()).setRoot(model.getCurrent());
         // by default select the root node
-        if (ui.getNavigationTree().getModel().getRoot()!=null) {
+        if (ui.getNavigationTree().getModel().getRoot() != null) {
             ui.getNavigationTree().setSelectionRow(0);
         }
         boolean enabled;
@@ -198,7 +192,7 @@
     public static void updateDetailPanel(Integer index, final JDetailTab ui, DetailTabModel model, LoggableElement selectedNode) {
         MetaData detail = model.getDetail();
         ui.getDetailVersions().setVisible(true);
-        if (ui.getDetailVersions().getItemCount()>0) {
+        if (ui.getDetailVersions().getItemCount() > 0) {
             ui.getDetailVersions().setSelectedIndex(index);
         }
         ui.getDetailHeader().setText(selectedNode.getMetaData().getName());
@@ -212,7 +206,7 @@
         ui.getDetailDescription().setText(s);
         if (!s.equals(tooltip)) {
             ui.getDetailDescription().setToolTipText(tooltip);
-        }        
+        }
         ui.getDetailCreationDate().setText(DATE_FORMAT.format(detail.getCreationDate()));
         ui.getDetail().setVisible(true);
         JTable table = ui.getDetailTable();

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ListTabRefreshHelper.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ListTabRefreshHelper.java	2008-02-19 20:50:34 UTC (rev 1130)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/ListTabRefreshHelper.java	2008-02-19 21:10:23 UTC (rev 1131)
@@ -101,7 +101,7 @@
         boolean isConnected = SimExplorer.getContext().isConnected();
         boolean enabled = isConnected && EntityHelper.Action.EXPORT.accept(data);
 
-        MainUIRefreshHelper.refreshExportElement(ui.getExportElement(),enabled, model.isRemote(),text );
+        MainUIRefreshHelper.refreshExportElement(ui.getExportElement(),enabled, model.isRemote(),data.getName(),data.getVersion().toString());
 
         MainUIRefreshHelper.UpdateButton(ui.getShowTab_detail(), true, text);
         MainUIRefreshHelper.UpdateButton(ui.getShowTab_synchronize(), isConnected, text);

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/MainUIRefreshHelper.java
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/MainUIRefreshHelper.java	2008-02-19 20:50:34 UTC (rev 1130)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/MainUIRefreshHelper.java	2008-02-19 21:10:23 UTC (rev 1131)
@@ -45,33 +45,16 @@
 
     public static void refreshExportElement(AbstractButton button, boolean remote, LoggableElement sNode) {
         boolean enabled = EntityHelper.Action.EXPORT.accept(sNode);
-        String text = null;
-        if (enabled) {
-            text = sNode.getMetaData().getName() + " [" + sNode.getMetaData().getVersion() + "]";
-        }
-        button.setEnabled(enabled);
-        if (!enabled) {
-            button.setToolTipText(null);
-        } else {
-
-        }
-        ExportElementAction action = (ExportElementAction) button.getAction();
-        String t = _(action.getI18nToolTipText(remote), text);
-        button.setToolTipText(t);
+        refreshExportElement(button, enabled, remote, enabled ? sNode.getMetaData().getName() : null, enabled ? sNode.getMetaData().getVersion().toString() : null);
     }
 
-    public static void refreshExportElement(AbstractButton button, boolean enabled,boolean remote ,String text) {        
-        if (!enabled) {
-            text = null;
-        }
+    public static void refreshExportElement(AbstractButton button, boolean enabled, boolean remote, String name, String version) {
         button.setEnabled(enabled);
-        if (!enabled) {
-            button.setToolTipText(null);
-        } else {
-
+        String t = null;
+        if (enabled) {
+            ExportElementAction action = (ExportElementAction) button.getAction();
+            t = _(action.getI18nToolTipText(remote), name, version);
         }
-        ExportElementAction action = (ExportElementAction) button.getAction();
-        String t = _(action.getI18nToolTipText(remote), text);
         button.setToolTipText(t);
     }
 

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties	2008-02-19 20:50:34 UTC (rev 1130)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties	2008-02-19 21:10:23 UTC (rev 1131)
@@ -40,7 +40,6 @@
 simexplorer.action.expandAll.tooltip=Expand all nodes of ''{0}''
 simexplorer.action.exportElement=export
 simexplorer.action.exportElement.help=
-simexplorer.action.exportElement.tooltip=Export element ''{0}''
 simexplorer.action.exportElementToLocal=export to local
 simexplorer.action.exportElementToLocal.help=
 simexplorer.action.exportElementToLocal.tooltip=Export element ''{0}'' to locale database
@@ -71,12 +70,18 @@
 simexplorer.action.hideTab_remote=List (remote)
 simexplorer.action.hideTab_remote.help=
 simexplorer.action.hideTab_remote.tooltip=Hide the list of remote elements
+simexplorer.action.historyDelete=
+simexplorer.action.historyDelete.help=
+simexplorer.action.historyDelete.tooltip=
 simexplorer.action.historyNext=Next in history
 simexplorer.action.historyNext.help=
 simexplorer.action.historyNext.tooltip=Display next element ''{0}''
 simexplorer.action.historyPrevious=Previous in history
 simexplorer.action.historyPrevious.help=
 simexplorer.action.historyPrevious.tooltip=Display previous element ''{0}'' 
+simexplorer.action.historyUnconnect=
+simexplorer.action.historyUnconnect.help=
+simexplorer.action.historyUnconnect.tooltip=
 simexplorer.action.i18n.en=English
 simexplorer.action.i18n.en.help=
 simexplorer.action.i18n.en.tooltip=Change to english language
@@ -115,7 +120,6 @@
 simexplorer.action.site=Site
 simexplorer.action.site.help=
 simexplorer.action.site.tooltip=Go to SimExplorer SI site
-simexplorer.action.synchronize.tooltip=Launch synchronization of ''{0}''
 simexplorer.action.unconnect=Unconnect
 simexplorer.action.unconnect.help=
 simexplorer.action.unconnect.tooltip=Disconnect from remote server

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties
===================================================================
--- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties	2008-02-19 20:50:34 UTC (rev 1130)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties	2008-02-19 21:10:23 UTC (rev 1131)
@@ -40,7 +40,6 @@
 simexplorer.action.expandAll.tooltip=\u00E9taler tous les noeuds de ''{0}''
 simexplorer.action.exportElement=Exporter
 simexplorer.action.exportElement.help=
-#simexplorer.action.exportElement.tooltip=Exporter l''\u00E9l\u00E9ment ''{0}''
 simexplorer.action.exportElementToLocal=Exporter vers le serveur local
 simexplorer.action.exportElementToLocal.help=
 simexplorer.action.exportElementToLocal.tooltip=Exporter l''\u00E9l\u00E9ment ''{0}'' vers la base locale
@@ -71,12 +70,18 @@
 simexplorer.action.hideTab_remote=Liste distante
 simexplorer.action.hideTab_remote.help=
 simexplorer.action.hideTab_remote.tooltip=Cacher la liste des \u00E9l\u00E9ments du serveur distant
+simexplorer.action.historyDelete=Suprimer de l'historique
+simexplorer.action.historyDelete.help=
+simexplorer.action.historyDelete.tooltip=Supprimer un élément de l'historique
 simexplorer.action.historyNext=El\u00E9ment suivant
 simexplorer.action.historyNext.help=
 simexplorer.action.historyNext.tooltip=Afficher l''\u00E9l\u00E9ment suivant ''{0}''
 simexplorer.action.historyPrevious=El\u00E9ment pr\u00E9c\u00E9dent
 simexplorer.action.historyPrevious.help=
 simexplorer.action.historyPrevious.tooltip=Afficher l''\u00E9l\u00E9ment pr\u00E9c\u00E9dent ''{0}''
+simexplorer.action.historyUnconnect=Supprimer les éléments distants
+simexplorer.action.historyUnconnect.help=
+simexplorer.action.historyUnconnect.tooltip=Supprimer les éléments distants de l'historique
 simexplorer.action.i18n.en=Anglais
 simexplorer.action.i18n.en.help=
 simexplorer.action.i18n.en.tooltip=Traduire l'application en anglais
@@ -111,11 +116,10 @@
 simexplorer.action.showTab_remote.tooltip=Afficher la liste des \u00E9l\u00E9ments du serveur distant
 simexplorer.action.showTab_synchronize=Synchroniser
 simexplorer.action.showTab_synchronize.help=
-simexplorer.action.showTab_synchronize.tooltip=Afficher l''\u00E9cran de synchronisation de l''élément ''{0}''
+simexplorer.action.showTab_synchronize.tooltip=Afficher l''\u00E9cran de synchronisation de l''\u00E9l\u00E9ment ''{0}''
 simexplorer.action.site=Site
 simexplorer.action.site.help=
 simexplorer.action.site.tooltip=Acc\u00E9der dans votre navigateur au site de SimExplorer-SI
-simexplorer.action.synchronize.tooltip=Lancer la synchronisation de ''{0}''
 simexplorer.action.unconnect=D\u00E9connexion
 simexplorer.action.unconnect.help=
 simexplorer.action.unconnect.tooltip=Se d\u00E9connecter du serveur distant

    

r1131 - in trunk/simexplorer-is/simexplorer-is-swing/src: java/fr/cemagref/simexplorer/is/ui/swing resources/i18n

tchemit＠users.labs.libre-entreprise.org

tags

participants (1)