Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1dd7775c by Tony CHEMIT at 2017-08-24T22:42:00+02:00 Impossible d'accéder au menu configuration lorsqu'une base est chargée (See #858) - - - - - 10 changed files: - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ChangeStorageAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/CloseStorageAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ReloadStorageAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ShowStorageInfoAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ChangeStorageAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/CloseStorageAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ReloadStorageAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ShowStorageInfoAction.java - pom.xml Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss @@ -280,6 +280,7 @@ JSplitPane { toolTipText: {model.getStorageStatusTip()}; text: {model.getStorageStatusText()}; icon: {model.getStorageStatusIcon()}; + mnemonic:B; } #storageStatusInfo { ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ChangeStorageAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ChangeStorageAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ChangeStorageAction.java @@ -31,7 +31,6 @@ import java.awt.event.ActionEvent; import java.util.EnumSet; import java.util.Set; import java.util.stream.Collectors; -import javax.swing.KeyStroke; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -62,7 +61,7 @@ public class ChangeStorageAction extends MenuActionSupport { this(ui, (Set<DbMode>)null, null); } - public ChangeStorageAction(ObserveMainUI ui, String actionName,KeyStroke keyStroke) { + public ChangeStorageAction(ObserveMainUI ui, String actionName,char keyStroke) { super(ui, actionName, t("observe.action.change.storage"), t("observe.action.change.storage.tip"), "db-change", keyStroke); this.dbModes = EnumSet.noneOf(DbMode.class); this.title = null; ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/CloseStorageAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/CloseStorageAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/CloseStorageAction.java @@ -53,7 +53,7 @@ public class CloseStorageAction extends MenuActionSupport { super(ui, ACTION_NAME, t("observe.action.close.storage"), t("observe.action.close.storage.tip"), "db-none", 'F'); } - public CloseStorageAction(ObserveMainUI ui, String actionName,KeyStroke keyStroke) { + public CloseStorageAction(ObserveMainUI ui, String actionName, char keyStroke) { super(ui, actionName, t("observe.action.close.storage"), t("observe.action.close.storage.tip"), "db-none", keyStroke); } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ReloadStorageAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ReloadStorageAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ReloadStorageAction.java @@ -58,7 +58,7 @@ public class ReloadStorageAction extends MenuActionSupport { super(ui, ACTION_NAME, t("observe.action.reload.storage"), t("observe.action.reload.storage.tip"), "db-reload", 'R'); } - public ReloadStorageAction(ObserveMainUI ui, String actionName, KeyStroke keyStroke) { + public ReloadStorageAction(ObserveMainUI ui, String actionName, char keyStroke) { super(ui, actionName, t("observe.action.reload.storage"), t("observe.action.reload.storage.tip"), "db-reload", keyStroke); } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ShowStorageInfoAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ShowStorageInfoAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ShowStorageInfoAction.java @@ -30,7 +30,6 @@ import fr.ird.observe.client.ui.actions.main.menu.MenuActionSupport; import java.awt.event.ActionEvent; import javax.swing.JLabel; import javax.swing.JOptionPane; -import javax.swing.KeyStroke; import static org.nuiton.i18n.I18n.t; @@ -51,7 +50,7 @@ public class ShowStorageInfoAction extends MenuActionSupport { super(ui, ACTION_NAME, t("observe.action.info.storage"), t("observe.action.info.storage.tip"), "information", 'O'); } - public ShowStorageInfoAction(ObserveMainUI ui, String actionName,KeyStroke keyStroke) { + public ShowStorageInfoAction(ObserveMainUI ui, String actionName, char keyStroke) { super(ui, actionName, t("observe.action.info.storage"), t("observe.action.info.storage.tip"), "information", keyStroke); } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ChangeStorageAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ChangeStorageAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ChangeStorageAction.java @@ -39,7 +39,7 @@ public class ChangeStorageAction extends fr.ird.observe.client.ui.actions.main.m public static final String ACTION_NAME = ChangeStorageAction.class.getName(); public ChangeStorageAction(ObserveMainUI ui) { - super(ui, ACTION_NAME,KeyStroke.getKeyStroke('C', InputEvent.ALT_MASK)); + super(ui, ACTION_NAME,'C'); } } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/CloseStorageAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/CloseStorageAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/CloseStorageAction.java @@ -39,7 +39,7 @@ public class CloseStorageAction extends fr.ird.observe.client.ui.actions.main.me public static final String ACTION_NAME = CloseStorageAction.class.getName(); public CloseStorageAction(ObserveMainUI ui) { - super(ui, ACTION_NAME,KeyStroke.getKeyStroke('F', InputEvent.ALT_MASK)); + super(ui, ACTION_NAME,'F'); } } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ReloadStorageAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ReloadStorageAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ReloadStorageAction.java @@ -39,7 +39,7 @@ public class ReloadStorageAction extends fr.ird.observe.client.ui.actions.main.m public static final String ACTION_NAME = ReloadStorageAction.class.getName(); public ReloadStorageAction(ObserveMainUI ui) { - super(ui, ACTION_NAME,KeyStroke.getKeyStroke('R', InputEvent.ALT_MASK)); + super(ui, ACTION_NAME,'R'); } } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ShowStorageInfoAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ShowStorageInfoAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ShowStorageInfoAction.java @@ -23,8 +23,6 @@ package fr.ird.observe.client.ui.actions.main.storage; */ import fr.ird.observe.client.ui.ObserveMainUI; -import java.awt.event.InputEvent; -import javax.swing.KeyStroke; /** * Created on 1/17/15. @@ -39,7 +37,7 @@ public class ShowStorageInfoAction extends fr.ird.observe.client.ui.actions.main public static final String ACTION_NAME = ShowStorageInfoAction.class.getName(); public ShowStorageInfoAction(ObserveMainUI ui) { - super(ui, ACTION_NAME, KeyStroke.getKeyStroke('O', InputEvent.ALT_MASK)); + super(ui, ACTION_NAME, 'O'); } } ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -168,7 +168,7 @@ <eugenePluginVersion>3.0-alpha-11</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <jaxxVersion>3.0-alpha-11-SNAPSHOT</jaxxVersion> + <jaxxVersion>3.0-alpha-11</jaxxVersion> <nuitonI18nVersion>4.0-alpha-4</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> <topiaVersion>3.2.1</topiaVersion> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1dd7775c4cacad9b342cdd6d475e... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1dd7775c4cacad9b342cdd6d475e... You're receiving this email because of your account on gitlab.com.