Author: tchemit Date: 2008-02-11 21:13:38 +0000 (Mon, 11 Feb 2008) New Revision: 847 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java Log: normalisation nom de l'action de synchronisation Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-11 21:07:17 UTC (rev 846) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-11 21:13:38 UTC (rev 847) @@ -113,10 +113,7 @@ } ui.getTablePopupMenu().setEnabled(true); MetaData data = model.get(index); - // récupération de l'uuid à traiter - String uuid = data.getUuid(); - // récupération de la version à traiter - Version version = data.getVersion(); + String text = data.getName() + " [" + data.getVersion() + "]"; String tooltip = _("simexplorer.action.downloadLoggableElement.tooltip", text); @@ -243,14 +240,14 @@ protected static void refreshDownloadElementAction(JDetailTab ui, DetailTabModel model, LoggableElementTreeNode node) { MetaData detail = model.getDetail(); boolean enabled = detail != null || LoggableElementTreeHelper.canDownload(node); - String tooltip = !enabled ? null : _("simexplorer.action.downloadLoggableElement.tooltip", detail == null ? node.getUserObject() : detail.getName() + " - " + model.getSelectedVersion()); + String tooltip = !enabled ? null : _("simexplorer.action.downloadLoggableElement.tooltip", detail == null ? node.getUserObject() : detail.getName() + " [" + model.getSelectedVersion()+"]"); updateButton(ui.getDownloadElement(), enabled, tooltip); } protected static void refreshDeleteElementAction(JDetailTab ui, DetailTabModel model) { MetaData detail = model.getDetail(); boolean enabled = detail != null; - String tooltip = !enabled ? null : _("simexplorer.action.deleteLoggableElement.tooltip", detail.getName() + " - " + model.getSelectedVersion()); + String tooltip = !enabled ? null : _("simexplorer.action.deleteLoggableElement.tooltip", detail.getName() + " [" + model.getSelectedVersion()+"]"); updateButton(ui.getDeleteElement(), enabled, tooltip); } @@ -265,7 +262,7 @@ public static void refreshSynchroniseElementAction(JDetailTab ui, DetailTabModel model) { MetaData detail = model.getDetail(); boolean enabled = detail != null; - String tooltip = !enabled ? null : _("simexplorer.action.synchronize.tooltip", detail.getName() + " - " + model.getSelectedVersion()); + String tooltip = !enabled ? null : _("simexplorer.action.synchronize.tooltip", detail.getName() + " [" + model.getSelectedVersion()+"]"); updateButton(ui.getSynchronizeElement(), enabled, tooltip); } @@ -273,7 +270,7 @@ MetaData detail = model.getDetail(); LoggableElement sNode = model.getSelectedNode(); boolean enabled = sNode != null && sNode instanceof ExplorationApplication; - String tooltip = !enabled ? null : _("simexplorer.action.export.tooltip", detail.getName() + " - " + model.getSelectedVersion()); + String tooltip = !enabled ? null : _("simexplorer.action.export.tooltip", detail.getName() + " [" + model.getSelectedVersion()+"]"); updateButton(ui.getExportElement(), enabled, tooltip); } 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-11 21:07:17 UTC (rev 846) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-02-11 21:13:38 UTC (rev 847) @@ -81,7 +81,7 @@ } protected void initFirstUsage(final JListTab ui, final ListTabModel model) { - ui.getLaunchSynchronize().setHideActionText(false); + ui.getSynchronizeElement().setHideActionText(false); ui.getExportElement().setHideActionText(false); ui.getDownloadElement().setHideActionText(false); ui.getDeleteElement().setHideActionText(false);