Author: tchemit Date: 2008-07-21 22:33:11 +0000 (Mon, 21 Jul 2008) New Revision: 1502 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/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/ShowDetailTabAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java Log: utilisation ActionProvider (jaxx-swing-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-07-21 22:28:22 UTC (rev 1501) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CloseTabAction.java 2008-07-21 22:33:11 UTC (rev 1502) @@ -32,7 +32,8 @@ longDescription = "simexplorer.action.closeTab.help", smallIcon = "closeTab.png", hideActionText = true, - enabled = true + enabled = true, + multiNames = {"closeTab","closeTab_local","closeTab_remote","closeTab_detail","closeTab_synchronize"} ) public class CloseTabAction extends SimExplorerAbstractTabAction { 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-07-21 22:28:22 UTC (rev 1501) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java 2008-07-21 22:33:11 UTC (rev 1502) @@ -35,7 +35,8 @@ longDescription = "simexplorer.action.collapseAll.help", smallIcon = "action/collapseAll.png", mnemonic = 'c', - hideActionText = true + hideActionText = true, + multiNames = {"collapseAllDetail","collapseAllLocal","collapseAllRemote"} ) public class CollapseAllAction extends SimExplorerAbstractTabAction { 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-07-21 22:28:22 UTC (rev 1501) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java 2008-07-21 22:33:11 UTC (rev 1502) @@ -36,7 +36,8 @@ longDescription = "simexplorer.action.expandAll.help", smallIcon = "action/expandAll.png", mnemonic = 'e', - hideActionText = true + hideActionText = true, + multiNames = {"expandAllDetail", "expandAllLocal", "expandAllRemote"} ) public class ExpandAllAction extends SimExplorerAbstractTabAction { @@ -52,7 +53,7 @@ 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-07-21 22:28:22 UTC (rev 1501) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java 2008-07-21 22:33:11 UTC (rev 1502) @@ -16,14 +16,6 @@ */ package fr.cemagref.simexplorer.is.ui.swing.actions; -import static org.codelutin.i18n.I18n.n_; - -import java.awt.event.ActionEvent; - -import javax.swing.Action; - -import org.codelutin.jaxx.util.UIHelper; -import org.codelutin.jaxx.tab.TabModel; import fr.cemagref.simexplorer.is.entities.EntityHelper; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.service.StorageService; @@ -35,7 +27,13 @@ import fr.cemagref.simexplorer.is.ui.swing.model.tab.SimExplorerAbstractTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.tab.SynchronizeTabModel; import fr.cemagref.simexplorer.is.ui.swing.ui.SimExplorerTab; +import static org.codelutin.i18n.I18n.n_; +import org.codelutin.jaxx.tab.TabModel; +import org.codelutin.jaxx.util.UIHelper; +import javax.swing.Action; +import java.awt.event.ActionEvent; + /** * Action pour exporter un élément * @@ -46,7 +44,8 @@ name = "simexplorer.action.exportElement", longDescription = "simexplorer.action.exportElement.help", mnemonic = 'x', - hideActionText = true + hideActionText = true, + multiNames = {"exportElement", "exportElementToLocal", "exportElementToRemote"} ) @org.codelutin.i18n.I18nable public class ExportElementAction extends SimExplorerAbstractTabAction { @@ -157,7 +156,7 @@ if (SimExplorerTab.synchronize.isTabVisible(getTabContainer())) { SynchronizeTabModel model = getSynchronizeModel(); - model.reloadSources(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/ShowDetailTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-07-21 22:28:22 UTC (rev 1501) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-07-21 22:33:11 UTC (rev 1502) @@ -54,7 +54,8 @@ longDescription = "simexplorer.action.showTab_detail.help", smallIcon = "action/show-tab-detail.png", mnemonic = 'd', - hideActionText = true + hideActionText = true, + multiNames = {"showTab_detail","showTabLocal_detail","showTabRemote_detail"} ) public class ShowDetailTabAction extends ShowTabAbstractAction<JDetailTab, DetailTabModel> implements SelectedAction { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java 2008-07-21 22:28:22 UTC (rev 1501) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java 2008-07-21 22:33:11 UTC (rev 1502) @@ -20,7 +20,7 @@ import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import static org.codelutin.i18n.I18n._; -import javax.swing.*; +import javax.swing.Action; import java.awt.event.ActionEvent; import java.util.Locale; import java.util.regex.Matcher; @@ -38,7 +38,8 @@ actionCommand = "changeLocale", shortDescription = "simexplorer.action.changeLocale.tooltip", longDescription = "simexplorer.action.changeLocale.help", - hideActionText = false + hideActionText = false, + multiNames = {"i18n_fr", "i18n_en"} ) @org.codelutin.i18n.I18nable public class ChangeLocaleAction extends SimExplorerAbstractAction {