Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
1dd7775c
by Tony CHEMIT at 2017-08-24T22:42:00+02:00
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:
| ... | ... | @@ -280,6 +280,7 @@ JSplitPane { |
| 280 | 280 |
toolTipText: {model.getStorageStatusTip()};
|
| 281 | 281 |
text: {model.getStorageStatusText()};
|
| 282 | 282 |
icon: {model.getStorageStatusIcon()};
|
| 283 |
+ mnemonic:B;
|
|
| 283 | 284 |
}
|
| 284 | 285 |
|
| 285 | 286 |
#storageStatusInfo {
|
| ... | ... | @@ -31,7 +31,6 @@ import java.awt.event.ActionEvent; |
| 31 | 31 |
import java.util.EnumSet;
|
| 32 | 32 |
import java.util.Set;
|
| 33 | 33 |
import java.util.stream.Collectors;
|
| 34 |
-import javax.swing.KeyStroke;
|
|
| 35 | 34 |
import org.apache.commons.logging.Log;
|
| 36 | 35 |
import org.apache.commons.logging.LogFactory;
|
| 37 | 36 |
|
| ... | ... | @@ -62,7 +61,7 @@ public class ChangeStorageAction extends MenuActionSupport { |
| 62 | 61 |
this(ui, (Set<DbMode>)null, null);
|
| 63 | 62 |
}
|
| 64 | 63 |
|
| 65 |
- public ChangeStorageAction(ObserveMainUI ui, String actionName,KeyStroke keyStroke) {
|
|
| 64 |
+ public ChangeStorageAction(ObserveMainUI ui, String actionName,char keyStroke) {
|
|
| 66 | 65 |
super(ui, actionName, t("observe.action.change.storage"), t("observe.action.change.storage.tip"), "db-change", keyStroke);
|
| 67 | 66 |
this.dbModes = EnumSet.noneOf(DbMode.class);
|
| 68 | 67 |
this.title = null;
|
| ... | ... | @@ -53,7 +53,7 @@ public class CloseStorageAction extends MenuActionSupport { |
| 53 | 53 |
super(ui, ACTION_NAME, t("observe.action.close.storage"), t("observe.action.close.storage.tip"), "db-none", 'F');
|
| 54 | 54 |
}
|
| 55 | 55 |
|
| 56 |
- public CloseStorageAction(ObserveMainUI ui, String actionName,KeyStroke keyStroke) {
|
|
| 56 |
+ public CloseStorageAction(ObserveMainUI ui, String actionName, char keyStroke) {
|
|
| 57 | 57 |
super(ui, actionName, t("observe.action.close.storage"), t("observe.action.close.storage.tip"), "db-none", keyStroke);
|
| 58 | 58 |
}
|
| 59 | 59 |
|
| ... | ... | @@ -58,7 +58,7 @@ public class ReloadStorageAction extends MenuActionSupport { |
| 58 | 58 |
super(ui, ACTION_NAME, t("observe.action.reload.storage"), t("observe.action.reload.storage.tip"), "db-reload", 'R');
|
| 59 | 59 |
}
|
| 60 | 60 |
|
| 61 |
- public ReloadStorageAction(ObserveMainUI ui, String actionName, KeyStroke keyStroke) {
|
|
| 61 |
+ public ReloadStorageAction(ObserveMainUI ui, String actionName, char keyStroke) {
|
|
| 62 | 62 |
super(ui, actionName, t("observe.action.reload.storage"), t("observe.action.reload.storage.tip"), "db-reload", keyStroke);
|
| 63 | 63 |
}
|
| 64 | 64 |
|
| ... | ... | @@ -30,7 +30,6 @@ import fr.ird.observe.client.ui.actions.main.menu.MenuActionSupport; |
| 30 | 30 |
import java.awt.event.ActionEvent;
|
| 31 | 31 |
import javax.swing.JLabel;
|
| 32 | 32 |
import javax.swing.JOptionPane;
|
| 33 |
-import javax.swing.KeyStroke;
|
|
| 34 | 33 |
|
| 35 | 34 |
|
| 36 | 35 |
import static org.nuiton.i18n.I18n.t;
|
| ... | ... | @@ -51,7 +50,7 @@ public class ShowStorageInfoAction extends MenuActionSupport { |
| 51 | 50 |
super(ui, ACTION_NAME, t("observe.action.info.storage"), t("observe.action.info.storage.tip"), "information", 'O');
|
| 52 | 51 |
}
|
| 53 | 52 |
|
| 54 |
- public ShowStorageInfoAction(ObserveMainUI ui, String actionName,KeyStroke keyStroke) {
|
|
| 53 |
+ public ShowStorageInfoAction(ObserveMainUI ui, String actionName, char keyStroke) {
|
|
| 55 | 54 |
super(ui, actionName, t("observe.action.info.storage"), t("observe.action.info.storage.tip"), "information", keyStroke);
|
| 56 | 55 |
}
|
| 57 | 56 |
|
| ... | ... | @@ -39,7 +39,7 @@ public class ChangeStorageAction extends fr.ird.observe.client.ui.actions.main.m |
| 39 | 39 |
public static final String ACTION_NAME = ChangeStorageAction.class.getName();
|
| 40 | 40 |
|
| 41 | 41 |
public ChangeStorageAction(ObserveMainUI ui) {
|
| 42 |
- super(ui, ACTION_NAME,KeyStroke.getKeyStroke('C', InputEvent.ALT_MASK));
|
|
| 42 |
+ super(ui, ACTION_NAME,'C');
|
|
| 43 | 43 |
}
|
| 44 | 44 |
|
| 45 | 45 |
}
|
| ... | ... | @@ -39,7 +39,7 @@ public class CloseStorageAction extends fr.ird.observe.client.ui.actions.main.me |
| 39 | 39 |
public static final String ACTION_NAME = CloseStorageAction.class.getName();
|
| 40 | 40 |
|
| 41 | 41 |
public CloseStorageAction(ObserveMainUI ui) {
|
| 42 |
- super(ui, ACTION_NAME,KeyStroke.getKeyStroke('F', InputEvent.ALT_MASK));
|
|
| 42 |
+ super(ui, ACTION_NAME,'F');
|
|
| 43 | 43 |
}
|
| 44 | 44 |
|
| 45 | 45 |
}
|
| ... | ... | @@ -39,7 +39,7 @@ public class ReloadStorageAction extends fr.ird.observe.client.ui.actions.main.m |
| 39 | 39 |
public static final String ACTION_NAME = ReloadStorageAction.class.getName();
|
| 40 | 40 |
|
| 41 | 41 |
public ReloadStorageAction(ObserveMainUI ui) {
|
| 42 |
- super(ui, ACTION_NAME,KeyStroke.getKeyStroke('R', InputEvent.ALT_MASK));
|
|
| 42 |
+ super(ui, ACTION_NAME,'R');
|
|
| 43 | 43 |
}
|
| 44 | 44 |
|
| 45 | 45 |
}
|
| ... | ... | @@ -23,8 +23,6 @@ package fr.ird.observe.client.ui.actions.main.storage; |
| 23 | 23 |
*/
|
| 24 | 24 |
|
| 25 | 25 |
import fr.ird.observe.client.ui.ObserveMainUI;
|
| 26 |
-import java.awt.event.InputEvent;
|
|
| 27 |
-import javax.swing.KeyStroke;
|
|
| 28 | 26 |
|
| 29 | 27 |
/**
|
| 30 | 28 |
* Created on 1/17/15.
|
| ... | ... | @@ -39,7 +37,7 @@ public class ShowStorageInfoAction extends fr.ird.observe.client.ui.actions.main |
| 39 | 37 |
public static final String ACTION_NAME = ShowStorageInfoAction.class.getName();
|
| 40 | 38 |
|
| 41 | 39 |
public ShowStorageInfoAction(ObserveMainUI ui) {
|
| 42 |
- super(ui, ACTION_NAME, KeyStroke.getKeyStroke('O', InputEvent.ALT_MASK));
|
|
| 40 |
+ super(ui, ACTION_NAME, 'O');
|
|
| 43 | 41 |
}
|
| 44 | 42 |
|
| 45 | 43 |
}
|
| ... | ... | @@ -168,7 +168,7 @@ |
| 168 | 168 |
<eugenePluginVersion>3.0-alpha-11</eugenePluginVersion>
|
| 169 | 169 |
<processorPluginVersion>1.3</processorPluginVersion>
|
| 170 | 170 |
|
| 171 |
- <jaxxVersion>3.0-alpha-11-SNAPSHOT</jaxxVersion>
|
|
| 171 |
+ <jaxxVersion>3.0-alpha-11</jaxxVersion>
|
|
| 172 | 172 |
<nuitonI18nVersion>4.0-alpha-4</nuitonI18nVersion>
|
| 173 | 173 |
<nuitonConfigVersion>3.2</nuitonConfigVersion>
|
| 174 | 174 |
<topiaVersion>3.2.1</topiaVersion>
|