[Observe-commits] 01/01: Centralisation des raccourics claviers (See #8429)

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit e8f3bbf5c461e2289c29c0979af263601ce9eefc Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 23 11:14:54 2016 +0100 Centralisation des raccourics claviers (See #8429) --- ...{MnemonicHelper.java => ObserveKeyStrokes.java} | 74 +++++++++++++--------- .../swing/ui/ObserveMainUIInitializer.java | 2 +- .../swing/ui/actions/AbstractUIAction.java | 8 +-- .../actions/content/AbstractContentUIAction.java | 5 +- .../content/AddActivityLonglineSetUIAction.java | 3 +- .../AddActivitySeineFloatingObjectUIAction.java | 3 +- .../content/AddActivitySeineSetUIAction.java | 3 +- .../content/BackToReferentialListUIAction.java | 3 +- .../ui/actions/content/CloseAndCreateUIAction.java | 3 +- .../ui/actions/content/CloseOpenUIAction.java | 3 +- .../content/CreateNewReferentialUIAction.java | 3 +- .../ui/actions/content/CreateOpenUIAction.java | 3 +- .../ui/actions/content/DeleteDataUIAction.java | 3 +- .../actions/content/DeleteReferenceUIAction.java | 3 +- .../actions/content/DeleteTableEntryUIAction.java | 3 +- .../content/EditReferentialFromListUIAction.java | 3 +- .../actions/content/EditReferentialUIAction.java | 3 +- .../swing/ui/actions/content/GoDownUIAction.java | 3 +- .../swing/ui/actions/content/GoUpUIAction.java | 3 +- .../ui/actions/content/NewTableEntryUIAction.java | 3 +- .../swing/ui/actions/content/ReOpenUIAction.java | 3 +- .../ui/actions/content/ResetEditUIAction.java | 3 +- .../actions/content/ResetTableEntryUIAction.java | 3 +- .../swing/ui/actions/content/SaveEditUIAction.java | 3 +- .../ui/actions/content/SaveTableEntryUIAction.java | 3 +- .../ui/actions/content/SelectNodeUIAction.java | 3 +- .../ui/actions/content/SelectOpenNodeUIAction.java | 3 +- .../ui/actions/global/AbstractGlobalUIAction.java | 3 +- .../actions/global/ChangeFocusGlobalUIAction.java | 3 +- .../actions/global/DeleteDataGlobalUIAction.java | 3 +- .../actions/global/NewNextDataGlobalUIAction.java | 3 +- .../global/OpenCloseDataGlobalUIAction.java | 3 +- .../ui/actions/global/ResetDataGlobalUIAction.java | 3 +- .../ui/actions/global/SaveDataGlobalUIAction.java | 3 +- .../SaveCurrentRemoteConfigurationUIAction.java | 3 +- .../SaveCurrentServerConfigurationUIAction.java | 3 +- .../application/swing/ui/admin/AdminUI.jaxx | 1 - .../application/swing/ui/admin/AdminUIHandler.java | 4 +- .../swing/ui/admin/config/ConfigUIHandler.java | 13 ++-- .../ui/admin/consolidate/ConsolidateUIHandler.java | 4 +- .../swing/ui/admin/export/ExportUIHandler.java | 6 +- .../swing/ui/admin/save/SaveLocalUIHandler.java | 6 +- .../synchronize/data/DataSynchroUIHandler.java | 6 +- .../referential/legacy/SynchronizeUIHandler.java | 6 +- .../ng/ReferentialSynchroUIHandler.java | 6 +- .../swing/ui/admin/validate/ValidateUIHandler.java | 6 +- .../swing/ui/content/ContentUIInitializer.java | 10 +-- .../ui/content/table/ContentTableUIHandler.java | 5 +- .../content/table/ContentTableUIInitializer.java | 6 +- .../swing/ui/storage/StorageUIHandler.java | 8 +-- .../swing/ui/storage/tabs/BackupUIHandler.java | 10 +-- .../storage/tabs/ConfigReferentielUIHandler.java | 10 +-- .../swing/ui/storage/tabs/ConfigUIHandler.java | 11 ++-- .../swing/ui/storage/tabs/SelectDataUIHandler.java | 4 +- .../navigation/NavigationTreeHeaderHandler.java | 57 ++++++++++++++--- .../nodes/NavigationTreeNodeSupport.java | 5 +- .../swing/ui/tree/selection/SelectionTree.java | 6 +- 57 files changed, 228 insertions(+), 147 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/MnemonicHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveKeyStrokes.java similarity index 57% rename from application-swing/src/main/java/fr/ird/observe/application/swing/ui/MnemonicHelper.java rename to application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveKeyStrokes.java index 3d9de8d..9d5ecbb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/MnemonicHelper.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveKeyStrokes.java @@ -1,27 +1,5 @@ package fr.ird.observe.application.swing.ui; -/*- - * #%L - * ObServe :: Application Swing - * %% - * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import jaxx.runtime.JAXXObject; @@ -42,12 +20,12 @@ import static javax.swing.Action.SHORT_DESCRIPTION; import static org.nuiton.i18n.I18n.t; /** - * Created on 27/11/16. + * Created on 23/12/16. * - * @author Tony Chemit - dev@tchemit.fr + * @author Tony Chemit - chemit@codelutin.com * @since 6.0 */ -public class MnemonicHelper { +public abstract class ObserveKeyStrokes { public static final KeyStroke KEY_STROKE_STORAGE_DO_CONFIGURE_REMOTE_SERVER = KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.CTRL_MASK); public static final KeyStroke KEY_STROKE_STORAGE_DO_BACKUP = KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_MASK); @@ -56,6 +34,44 @@ public class MnemonicHelper { public static final KeyStroke KEY_STROKE_STORAGE_DO_CHOOSE_FILE = KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_MASK); public static final KeyStroke KEY_STROKE_ESCAPE = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0); public static final KeyStroke KEY_STROKE_ENTER = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0); + public static final KeyStroke KEY_STROKE_SHOW_SEINE = KeyStroke.getKeyStroke("ctrl pressed F1"); + public static final KeyStroke KEY_STROKE_SHOW_LONGLINE = KeyStroke.getKeyStroke("ctrl pressed F2"); + public static final KeyStroke KEY_STROKE_SHOW_REFERENTIAL = KeyStroke.getKeyStroke("ctrl pressed F3"); + public static final KeyStroke KEY_STROKE_SHOW_EMPTY_PROGRAM = KeyStroke.getKeyStroke("ctrl pressed F4"); + public static final KeyStroke KEY_STROKE_CONFIGURE_LOCAL_SOURCE = KeyStroke.getKeyStroke("ctrl pressed L"); + public static final KeyStroke KEY_STROKE_CONFIGURE_REMOTE_SOURCE = KeyStroke.getKeyStroke("ctrl pressed R"); + public static final KeyStroke KEY_STROKE_SAVE_TABLE_ENTRY = KeyStroke.getKeyStroke("shift ctrl pressed S"); + public static final KeyStroke KEY_STROKE_PRESSED_ENTER = KeyStroke.getKeyStroke("pressed ENTER"); + public static final KeyStroke KEY_STROKE_RESET_DATA = KeyStroke.getKeyStroke("pressed F7"); + public static final KeyStroke KEY_STROKE_NEW_NEXT_DATA = KeyStroke.getKeyStroke("pressed F4"); + public static final KeyStroke KEY_STROKE_DELETE_DATA_GLOBAL = KeyStroke.getKeyStroke("pressed F6"); + public static final KeyStroke KEY_STROKE_OPEN_CLOSE_DATA = KeyStroke.getKeyStroke("pressed F3"); + public static final KeyStroke KEY_STROKE_SAVE_DATA = KeyStroke.getKeyStroke("pressed F5"); + public static final KeyStroke KEY_STROKE_CHANGE_FOCUS = KeyStroke.getKeyStroke("pressed F1"); + public static final KeyStroke KEY_STROKE_SAVE = KeyStroke.getKeyStroke("ctrl pressed S"); + public static final KeyStroke KEY_STROKE_SHIFT_ALT_ENTER = KeyStroke.getKeyStroke("alt shift pressed ENTER"); + public static final KeyStroke KEY_STROKE_OPEN = KeyStroke.getKeyStroke("ctrl pressed O"); + public static final KeyStroke KEY_STROKE_GO_DOWN = KeyStroke.getKeyStroke("alt pressed D"); + public static final KeyStroke KEY_STROKE_NEW_TABLE_ENTRY = KeyStroke.getKeyStroke("ctrl pressed N"); + public static final KeyStroke KEY_STROKE_ADD_DCP = KeyStroke.getKeyStroke("ctrl pressed P"); + public static final KeyStroke KEY_STROKE_CREATE = KeyStroke.getKeyStroke("ctrl pressed N"); + public static final KeyStroke KEY_STROKE_ADD_SET_LONGLINE = KeyStroke.getKeyStroke("ctrl pressed L"); + public static final KeyStroke KEY_STROKE_GO_UP = KeyStroke.getKeyStroke("alt pressed U"); + public static final KeyStroke KEY_STROKE_DELETE_REFERENCE = KeyStroke.getKeyStroke("ctrl pressed X"); + public static final KeyStroke KEY_STROKE_DELETE_DATA = KeyStroke.getKeyStroke("ctrl pressed X"); + public static final KeyStroke KEY_STROKE_EDIT_REFERENTIAL = KeyStroke.getKeyStroke("ctrl pressed M"); + public static final KeyStroke KEY_STROKE_DELETE_TABLE_ENTRY = KeyStroke.getKeyStroke("ctrl pressed X"); + public static final KeyStroke KEY_STROKE_RESET_EDIT = KeyStroke.getKeyStroke("ctrl pressed R"); + public static final KeyStroke KEY_STROKE_RESET_TABLE_ENTRY = KeyStroke.getKeyStroke("ctrl shift pressed R"); + public static final KeyStroke KEY_STROKE_ADD_SET_SEINE = KeyStroke.getKeyStroke("ctrl pressed L"); + public static final KeyStroke KEY_STROKE_ALT_ENTER = KeyStroke.getKeyStroke("alt pressed ENTER"); + public static final KeyStroke KEY_STROKE_BACK_TO_REFERENTIAL_LIST = KeyStroke.getKeyStroke("ctrl pressed B"); + public static final KeyStroke KEY_STROKE_CLOSE_OPEN = KeyStroke.getKeyStroke("ctrl pressed C"); + public static final KeyStroke KEY_STROKE_CLOSE_AND_CREATE = KeyStroke.getKeyStroke("ctrl pressed N"); + public static final KeyStroke KEY_STROKE_RESET = KeyStroke.getKeyStroke("ctrl pressed D"); + public static final KeyStroke KEY_STROKE_SHOW_DECORATOR_POPUP = KeyStroke.getKeyStroke("ctrl pressed F"); + public static final KeyStroke KEY_STROKE_GO_DOWN_TABLE_ENTRY = KeyStroke.getKeyStroke("shift pressed W"); + public static final KeyStroke KEY_STROKE_GO_UP_TABLE_ENTRY = KeyStroke.getKeyStroke("shift pressed Q"); private static String keyStrokeToStr(KeyStroke actionKey) { String result = ""; @@ -85,12 +101,10 @@ public class MnemonicHelper { return ObserveSwingApplicationContext.get().getConfig().isShowMnemonic(); } - public static void addKeyStore(AbstractUIAction action, String acceleratorKey, String label, String shortDescription) { + public static void addKeyStore(AbstractUIAction action, KeyStroke keyStroke, String label, String shortDescription) { String acceleratorStr = ""; - if (acceleratorKey != null) { - KeyStroke keyStroke = KeyStroke.getKeyStroke(acceleratorKey); - Objects.requireNonNull(keyStroke, "KeyStroke invalide: " + acceleratorKey); + if (keyStroke != null) { action.putValue(ACCELERATOR_KEY, keyStroke); acceleratorStr = isShowMnemonic() ? keyStrokeToStr(keyStroke) : ""; } @@ -99,7 +113,7 @@ public class MnemonicHelper { action.putValue(SHORT_DESCRIPTION, t(shortDescription) + acceleratorStr); } - public static String addKeyStroke3(String text, KeyStroke keyStroke) { + public static String suffixTextWithKeyStroke(String text, KeyStroke keyStroke) { boolean showMnemonic = isShowMnemonic(); if (showMnemonic) { text += keyStrokeToStr(keyStroke); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java index aab161c..9d41ef0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java @@ -388,7 +388,7 @@ public class ObserveMainUIInitializer { ui.getModel().reload(ui.getConfig()); - MnemonicHelper.addKeyStrokeFromMnemonic(ui); + ObserveKeyStrokes.addKeyStrokeFromMnemonic(ui); // bad binding, force value ui.getStopH2WebServer().setEnabled(false); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/AbstractUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/AbstractUIAction.java index da5f033..acbdbaa 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/AbstractUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/AbstractUIAction.java @@ -22,7 +22,7 @@ package fr.ird.observe.application.swing.ui.actions; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.application.swing.ui.MnemonicHelper; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.ContentUI; @@ -57,11 +57,11 @@ public abstract class AbstractUIAction extends AbstractAction { private final ObserveMainUI mainUI; - public AbstractUIAction(ObserveMainUI mainUI, String actionCommandKey, String label, String shortDescription, String actionIcon, String acceleratorKey) { + public AbstractUIAction(ObserveMainUI mainUI, String actionCommandKey, String label, String shortDescription, String actionIcon, KeyStroke acceleratorKey) { super(t(label), UIHelper.getUIManagerActionIcon(actionIcon)); putValue(ACTION_COMMAND_KEY, actionCommandKey); this.mainUI = mainUI; - MnemonicHelper.addKeyStore(this, acceleratorKey, label, shortDescription); + ObserveKeyStrokes.addKeyStore(this, acceleratorKey, label, shortDescription); } public KeyStroke getAcceleratorKey() { @@ -110,7 +110,7 @@ public abstract class AbstractUIAction extends AbstractAction { public void updateAction(JAXXObject ui, AbstractButton editor) { - MnemonicHelper.addKeyStroke2(editor, getAcceleratorKey()); + ObserveKeyStrokes.addKeyStroke2(editor, getAcceleratorKey()); String actionIcon = (String) editor.getClientProperty("actionIcon"); if (actionIcon != null) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AbstractContentUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AbstractContentUIAction.java index 7deff4e..f2feddf 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AbstractContentUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AbstractContentUIAction.java @@ -26,6 +26,7 @@ import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import fr.ird.observe.application.swing.ui.content.ContentUI; +import javax.swing.KeyStroke; import java.awt.event.ActionEvent; /** @@ -39,8 +40,8 @@ public abstract class AbstractContentUIAction extends AbstractUIAction { protected ActionEvent e; - public AbstractContentUIAction(ObserveMainUI mainUI, String actionCommandKey, String label, String shortDescription, String actionIcon, String acceleratorKey) { - super(mainUI, actionCommandKey, label, shortDescription, actionIcon, acceleratorKey); + public AbstractContentUIAction(ObserveMainUI mainUI, String actionCommandKey, String label, String shortDescription, String actionIcon, KeyStroke keyStroke) { + super(mainUI, actionCommandKey, label, shortDescription, actionIcon, keyStroke); } protected abstract void actionPerformed(ContentUI<?, ?> contentUI); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivityLonglineSetUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivityLonglineSetUIAction.java index cb9b125..7180752 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivityLonglineSetUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivityLonglineSetUIAction.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.actions.content; * #L% */ +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; @@ -42,7 +43,7 @@ public class AddActivityLonglineSetUIAction extends AbstractContentUIAction { public static final String ACTION_NAME = AddActivityLonglineSetUIAction.class.getSimpleName(); public AddActivityLonglineSetUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, t("observe.action.add.setLongline"), t("observe.action.add.setLongline.tip"), "add", "ctrl pressed L"); + super(mainUI, ACTION_NAME, t("observe.action.add.setLongline"), t("observe.action.add.setLongline.tip"), "add", ObserveKeyStrokes.KEY_STROKE_ADD_SET_LONGLINE); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java index a283e65..066de82 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.actions.content; * #L% */ +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; @@ -42,7 +43,7 @@ public class AddActivitySeineFloatingObjectUIAction extends AbstractContentUIAct public static final String ACTION_NAME = AddActivitySeineFloatingObjectUIAction.class.getSimpleName(); public AddActivitySeineFloatingObjectUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, t("observe.action.add.floatingObject"), t("observe.action.add.floatingObject.tip"), "add", "ctrl pressed P"); + super(mainUI, ACTION_NAME, t("observe.action.add.floatingObject"), t("observe.action.add.floatingObject.tip"), "add", ObserveKeyStrokes.KEY_STROKE_ADD_DCP); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineSetUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineSetUIAction.java index 5f3b69f..5c54910 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineSetUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineSetUIAction.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.actions.content; * #L% */ +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; @@ -42,7 +43,7 @@ public class AddActivitySeineSetUIAction extends AbstractContentUIAction { public static final String ACTION_NAME = AddActivitySeineSetUIAction.class.getSimpleName(); public AddActivitySeineSetUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, t("observe.action.add.set"), t("observe.action.add.set.tip"), "add", "ctrl pressed L"); + super(mainUI, ACTION_NAME, t("observe.action.add.set"), t("observe.action.add.set.tip"), "add", ObserveKeyStrokes.KEY_STROKE_ADD_SET_SEINE); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/BackToReferentialListUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/BackToReferentialListUIAction.java index ef10b4e..9eae361 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/BackToReferentialListUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/BackToReferentialListUIAction.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.actions.content; * #L% */ +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI; @@ -39,7 +40,7 @@ public class BackToReferentialListUIAction extends AbstractContentUIAction { public static final String ACTION_NAME = "BackToReferentialListUIAction"; public BackToReferentialListUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, t("observe.action.back.to.list"), t("observe.action.back.to.list.tip"), "go-back", "ctrl pressed B"); + super(mainUI, ACTION_NAME, t("observe.action.back.to.list"), t("observe.action.back.to.list.tip"), "go-back", ObserveKeyStrokes.KEY_STROKE_BACK_TO_REFERENTIAL_LIST); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseAndCreateUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseAndCreateUIAction.java index 15a4ff1..a77bfc9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseAndCreateUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseAndCreateUIAction.java @@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.actions.content; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.DataContext; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.impl.longline.ActivityLonglinesUI; @@ -55,7 +56,7 @@ public class CloseAndCreateUIAction extends AbstractContentUIAction { n("observe.content.action.closeAndCreate"), n("observe.content.action.closeAndCreate.tip"), "add", - "ctrl pressed N" + ObserveKeyStrokes.KEY_STROKE_CLOSE_AND_CREATE ); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseOpenUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseOpenUIAction.java index a173add..62cef6a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseOpenUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseOpenUIAction.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.actions.content; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.impl.longline.ActivityLonglinesUI; @@ -55,7 +56,7 @@ public class CloseOpenUIAction extends AbstractContentUIAction { n("observe.action.close.open"), n("observe.action.close.open.tip"), "close", - "ctrl pressed C" + ObserveKeyStrokes.KEY_STROKE_CLOSE_OPEN ); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CreateNewReferentialUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CreateNewReferentialUIAction.java index f7eec6f..5d6d67d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CreateNewReferentialUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CreateNewReferentialUIAction.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.actions.content; * #L% */ +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI; @@ -39,7 +40,7 @@ public class CreateNewReferentialUIAction extends AbstractContentUIAction { public static final String ACTION_NAME = "CreateNewReferentialUIAction"; public CreateNewReferentialUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, t("observe.action.create"), "", "add", "ctrl pressed N"); + super(mainUI, ACTION_NAME, t("observe.action.create"), "", "add", ObserveKeyStrokes.KEY_STROKE_CREATE); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CreateOpenUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CreateOpenUIAction.java index d2f62ce..5ae2bed 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CreateOpenUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CreateOpenUIAction.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.actions.content; * #L% */ +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.ContentListUI; @@ -37,7 +38,7 @@ public class CreateOpenUIAction extends AbstractContentUIAction { public static final String ACTION_NAME = "createOpen"; public CreateOpenUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, "<NONE>", "<NONE>", "add", "ctrl pressed N"); + super(mainUI, ACTION_NAME, "<NONE>", "<NONE>", "add", ObserveKeyStrokes.KEY_STROKE_CREATE); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteDataUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteDataUIAction.java index 0d1b2e8..4a2bdef 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteDataUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteDataUIAction.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.application.swing.ui.actions.content; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; @@ -47,7 +48,7 @@ public class DeleteDataUIAction extends AbstractContentUIAction { n("observe.action.delete"), n("observe.action.delete.tip"), "delete", - "ctrl pressed X" + ObserveKeyStrokes.KEY_STROKE_DELETE_DATA ); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteReferenceUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteReferenceUIAction.java index cc874b3..aface19 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteReferenceUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteReferenceUIAction.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.application.swing.ui.actions.content; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; @@ -45,7 +46,7 @@ public class DeleteReferenceUIAction extends AbstractContentUIAction { n("observe.action.delete"), n("observe.action.delete.tip"), "delete", - "ctrl pressed X" + ObserveKeyStrokes.KEY_STROKE_DELETE_REFERENCE ); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteTableEntryUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteTableEntryUIAction.java index 0de1a21..ea8b3d1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteTableEntryUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteTableEntryUIAction.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.actions.content; * #L% */ +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.table.ContentTableUI; @@ -37,7 +38,7 @@ public class DeleteTableEntryUIAction extends AbstractContentUIAction { public static final String ACTION_NAME = "deleteTableEntry"; public DeleteTableEntryUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, "", "", "delete", "ctrl pressed X"); + super(mainUI, ACTION_NAME, "", "", "delete", ObserveKeyStrokes.KEY_STROKE_DELETE_TABLE_ENTRY); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditReferentialFromListUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditReferentialFromListUIAction.java index 46a5e71..11c4182 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditReferentialFromListUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditReferentialFromListUIAction.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.actions.content; * #L% */ +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI; @@ -39,7 +40,7 @@ public class EditReferentialFromListUIAction extends AbstractContentUIAction { public static final String ACTION_NAME = EditReferentialFromListUIAction.class.getSimpleName(); public EditReferentialFromListUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, t("observe.action.detail"), "", "go-detail", "alt pressed ENTER"); + super(mainUI, ACTION_NAME, t("observe.action.detail"), "", "go-detail", ObserveKeyStrokes.KEY_STROKE_PRESSED_ENTER); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditReferentialUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditReferentialUIAction.java index a8328cf..2369905 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditReferentialUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditReferentialUIAction.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.actions.content; * #L% */ +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI; @@ -39,7 +40,7 @@ public class EditReferentialUIAction extends AbstractContentUIAction { public static final String ACTION_NAME = "EditReferentialUIAction"; public EditReferentialUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, t("observe.action.modify"), "", "go-detail", "ctrl pressed M"); + super(mainUI, ACTION_NAME, t("observe.action.modify"), "", "go-detail", ObserveKeyStrokes.KEY_STROKE_EDIT_REFERENTIAL); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoDownUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoDownUIAction.java index 0006608..b1d8393 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoDownUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoDownUIAction.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.application.swing.ui.actions.content; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; @@ -54,7 +55,7 @@ public class GoDownUIAction extends AbstractContentUIAction { n("observe.action.goDown"), n("observe.action.goDown.tip"), "go-down", - "alt pressed D"); + ObserveKeyStrokes.KEY_STROKE_GO_DOWN); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoUpUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoUpUIAction.java index a55c3c7..c559767 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoUpUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoUpUIAction.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.application.swing.ui.actions.content; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; @@ -55,7 +56,7 @@ public class GoUpUIAction extends AbstractContentUIAction { n("observe.action.goUp"), n("observe.action.goUp.tip"), "go-up", - "alt pressed U" + ObserveKeyStrokes.KEY_STROKE_GO_UP ); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/NewTableEntryUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/NewTableEntryUIAction.java index f058741..e106d8e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/NewTableEntryUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/NewTableEntryUIAction.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.actions.content; * #L% */ +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.table.ContentTableUI; @@ -38,7 +39,7 @@ public class NewTableEntryUIAction extends AbstractContentUIAction { public static final String ACTION_NAME = "newTableEntry"; public NewTableEntryUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, "", "", "add", "ctrl pressed N"); + super(mainUI, ACTION_NAME, "", "", "add", ObserveKeyStrokes.KEY_STROKE_NEW_TABLE_ENTRY); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ReOpenUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ReOpenUIAction.java index ef115f7..a97a8dd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ReOpenUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ReOpenUIAction.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.actions.content; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.ContentListUI; @@ -51,7 +52,7 @@ public class ReOpenUIAction extends AbstractContentUIAction { n("observe.content.action.reopen"), n("observe.content.action.reopen.tip"), "reopen", - "ctrl pressed O" + ObserveKeyStrokes.KEY_STROKE_OPEN ); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ResetEditUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ResetEditUIAction.java index d8f770c..4d917cb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ResetEditUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ResetEditUIAction.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.application.swing.ui.actions.content; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; @@ -47,7 +48,7 @@ public class ResetEditUIAction extends AbstractContentUIAction { n("observe.content.action.reset"), n("observe.content.action.reset.tip"), "revert", - "ctrl pressed R" + ObserveKeyStrokes.KEY_STROKE_RESET_EDIT ); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ResetTableEntryUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ResetTableEntryUIAction.java index 44de9ab..8022273 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ResetTableEntryUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ResetTableEntryUIAction.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.actions.content; * #L% */ +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.table.ContentTableUI; @@ -37,7 +38,7 @@ public class ResetTableEntryUIAction extends AbstractContentUIAction { public static final String ACTION_NAME = "resetTableEntry"; public ResetTableEntryUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, "", "", "revert", "ctrl shift pressed R"); + super(mainUI, ACTION_NAME, "", "", "revert", ObserveKeyStrokes.KEY_STROKE_RESET_TABLE_ENTRY); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveEditUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveEditUIAction.java index fb1ffff..f3bce76 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveEditUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveEditUIAction.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.application.swing.ui.actions.content; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; @@ -45,7 +46,7 @@ public class SaveEditUIAction extends AbstractContentUIAction { n("observe.action.save"), n("observe.action.save.tip"), ACTION_NAME, - "ctrl pressed S" + ObserveKeyStrokes.KEY_STROKE_SAVE ); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveTableEntryUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveTableEntryUIAction.java index 64e94eb..a86a127 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveTableEntryUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveTableEntryUIAction.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.actions.content; * #L% */ +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.table.ContentTableUI; @@ -37,7 +38,7 @@ public class SaveTableEntryUIAction extends AbstractContentUIAction { public static final String ACTION_NAME = "saveTableEntry"; public SaveTableEntryUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, "", "", "revert", "ctrl shift pressed S"); + super(mainUI, ACTION_NAME, "", "", "revert", ObserveKeyStrokes.KEY_STROKE_SAVE_TABLE_ENTRY); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SelectNodeUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SelectNodeUIAction.java index 3fd517a..649b1f5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SelectNodeUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SelectNodeUIAction.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.application.swing.ui.actions.content; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.ContentListUI; @@ -56,7 +57,7 @@ public class SelectNodeUIAction extends AbstractContentUIAction { n("observe.action.selectNode"), n("observe.action.selectNode.tip"), "go-jump", - "alt pressed ENTER"); + ObserveKeyStrokes.KEY_STROKE_ALT_ENTER); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SelectOpenNodeUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SelectOpenNodeUIAction.java index 4863a33..71276df 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SelectOpenNodeUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SelectOpenNodeUIAction.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.application.swing.ui.actions.content; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.ContentListUI; @@ -43,7 +44,7 @@ public class SelectOpenNodeUIAction extends AbstractContentUIAction { private static final long serialVersionUID = 1L; public SelectOpenNodeUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, "<NONE>", "<NONE>", "go-down", "alt shift pressed ENTER"); + super(mainUI, ACTION_NAME, "<NONE>", "<NONE>", "go-down", ObserveKeyStrokes.KEY_STROKE_SHIFT_ALT_ENTER); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/AbstractGlobalUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/AbstractGlobalUIAction.java index 0abc390..b70c60f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/AbstractGlobalUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/AbstractGlobalUIAction.java @@ -26,6 +26,7 @@ import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import javax.swing.JComponent; +import javax.swing.KeyStroke; import javax.swing.SwingUtilities; /** @@ -36,7 +37,7 @@ import javax.swing.SwingUtilities; */ public abstract class AbstractGlobalUIAction extends AbstractUIAction { - protected AbstractGlobalUIAction(ObserveMainUI mainUI, String actionId, String acceleratorKey) { + protected AbstractGlobalUIAction(ObserveMainUI mainUI, String actionId, KeyStroke acceleratorKey) { super(mainUI, actionId, "<NONE>", "<NONE>", "reset", acceleratorKey); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/ChangeFocusGlobalUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/ChangeFocusGlobalUIAction.java index b89e54d..8d621e7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/ChangeFocusGlobalUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/ChangeFocusGlobalUIAction.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.actions.global; * #L% */ +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import org.apache.commons.logging.Log; @@ -46,7 +47,7 @@ public class ChangeFocusGlobalUIAction extends AbstractGlobalUIAction { public static final String ACTION_NAME = "focusOnTreeGlobal"; public ChangeFocusGlobalUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, "pressed F1"); + super(mainUI, ACTION_NAME, ObserveKeyStrokes.KEY_STROKE_CHANGE_FOCUS); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/DeleteDataGlobalUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/DeleteDataGlobalUIAction.java index 2c2ad34..8a5cbd8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/DeleteDataGlobalUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/DeleteDataGlobalUIAction.java @@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.actions.global; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI; @@ -43,7 +44,7 @@ public class DeleteDataGlobalUIAction extends AbstractGlobalUIAction { public static final String ACTION_NAME = "deleteDataGlobal"; public DeleteDataGlobalUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, "pressed F6"); + super(mainUI, ACTION_NAME, ObserveKeyStrokes.KEY_STROKE_DELETE_DATA_GLOBAL); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/NewNextDataGlobalUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/NewNextDataGlobalUIAction.java index cc7b4ce..b3c15cd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/NewNextDataGlobalUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/NewNextDataGlobalUIAction.java @@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.actions.global; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.ContentListUI; @@ -43,7 +44,7 @@ public class NewNextDataGlobalUIAction extends AbstractGlobalUIAction { public static final String ACTION_NAME = "newNextGlobal"; public NewNextDataGlobalUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, "pressed F4"); + super(mainUI, ACTION_NAME, ObserveKeyStrokes.KEY_STROKE_NEW_NEXT_DATA); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/OpenCloseDataGlobalUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/OpenCloseDataGlobalUIAction.java index 8a17b83..ccdc9f1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/OpenCloseDataGlobalUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/OpenCloseDataGlobalUIAction.java @@ -24,6 +24,7 @@ package fr.ird.observe.application.swing.ui.actions.global; import fr.ird.observe.application.swing.ObserveOpenDataManager; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.actions.content.CloseOpenUIAction; import fr.ird.observe.application.swing.ui.actions.content.ReOpenUIAction; @@ -48,7 +49,7 @@ public class OpenCloseDataGlobalUIAction extends AbstractGlobalUIAction implemen private final CloseOpenUIAction closeAction; public OpenCloseDataGlobalUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, "pressed F3"); + super(mainUI, ACTION_NAME, ObserveKeyStrokes.KEY_STROKE_OPEN_CLOSE_DATA); openAction = new ReOpenUIAction(mainUI); closeAction = new CloseOpenUIAction(mainUI); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/ResetDataGlobalUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/ResetDataGlobalUIAction.java index cc567dd..e6eeb8d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/ResetDataGlobalUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/ResetDataGlobalUIAction.java @@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.actions.global; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; @@ -40,7 +41,7 @@ public class ResetDataGlobalUIAction extends AbstractGlobalUIAction { public static final String ACTION_NAME = "resetDataGlobal"; public ResetDataGlobalUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, "pressed F7"); + super(mainUI, ACTION_NAME, ObserveKeyStrokes.KEY_STROKE_RESET_DATA); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/SaveDataGlobalUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/SaveDataGlobalUIAction.java index f7ebd4f..d47b5cd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/SaveDataGlobalUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/SaveDataGlobalUIAction.java @@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.actions.global; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; @@ -40,7 +41,7 @@ public class SaveDataGlobalUIAction extends AbstractGlobalUIAction { public static final String ACTION_NAME = "saveDataGlobal"; public SaveDataGlobalUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, "pressed F5"); + super(mainUI, ACTION_NAME, ObserveKeyStrokes.KEY_STROKE_SAVE_DATA); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java index 52bf553..07cb8d1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.actions.storage; * #L% */ +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; @@ -57,7 +58,7 @@ public class SaveCurrentRemoteConfigurationUIAction extends AbstractUIAction { public static final String ACTION_NAME = SaveCurrentRemoteConfigurationUIAction.class.getName(); public SaveCurrentRemoteConfigurationUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, t("observe.storage.remoteConfiguration.presets.save"), t("observe.storage.remoteConfiguration.presets.save"), "save", "ctrl pressed S"); + super(mainUI, ACTION_NAME, t("observe.storage.remoteConfiguration.presets.save"), t("observe.storage.remoteConfiguration.presets.save"), "save", ObserveKeyStrokes.KEY_STROKE_SAVE); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java index 9f8bf9e..461ddb4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.actions.storage; * #L% */ +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; @@ -56,7 +57,7 @@ public class SaveCurrentServerConfigurationUIAction extends AbstractUIAction { public static final String ACTION_NAME = SaveCurrentServerConfigurationUIAction.class.getName(); public SaveCurrentServerConfigurationUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, t("observe.storage.serverConfiguration.presets.save"), t("observe.storage.serverConfiguration.presets.save"), "save", "ctrl pressed S"); + super(mainUI, ACTION_NAME, t("observe.storage.serverConfiguration.presets.save"), t("observe.storage.serverConfiguration.presets.save"), "save", ObserveKeyStrokes.KEY_STROKE_SAVE); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUI.jaxx index fd567b7..b19bef6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUI.jaxx @@ -23,7 +23,6 @@ <JPanel id='synchroPanel' implements='jaxx.runtime.swing.wizard.ext.WizardExtUI<AdminStep, AdminUIModel>'> <import> - fr.ird.observe.application.swing.ui.MnemonicHelper fr.ird.observe.application.swing.ui.UIHelper jaxx.runtime.JAXXContext diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java index b0eae91..f09ea52 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.admin; import fr.ird.observe.application.swing.I18nEnumHelper; import fr.ird.observe.application.swing.ObserveActionExecutor; import fr.ird.observe.application.swing.ObserveRunner; -import fr.ird.observe.application.swing.ui.MnemonicHelper; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.admin.config.ConfigUI; import fr.ird.observe.application.swing.ui.admin.config.SelectDataUI; @@ -71,7 +71,7 @@ public class AdminUIHandler implements UIHandler<AdminUI> { // installation du dispatcher de modifications du modele WizardExtUtil.installWizardUIListeners(ui); WizardExtUtil.addTraceLogListener(log, ui.getModel()); - MnemonicHelper.addKeyStrokeFromMnemonic(ui); + ObserveKeyStrokes.addKeyStrokeFromMnemonic(ui); } public AdminStep getSelectedStep() { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUIHandler.java index 29066ff..1f0729c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUIHandler.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.admin.config; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ObserveTextGenerator; -import fr.ird.observe.application.swing.ui.MnemonicHelper; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; @@ -39,7 +39,6 @@ import javax.swing.AbstractAction; import javax.swing.JCheckBox; import javax.swing.JComponent; import javax.swing.JLabel; -import javax.swing.KeyStroke; import java.awt.Window; import java.awt.event.ActionEvent; import java.util.Set; @@ -60,10 +59,8 @@ public class ConfigUIHandler extends AdminTabUIHandler<ConfigUI> implements UIHa @Override public void afterInit(ConfigUI ui) { - KeyStroke configureLocalSourceKeyStroke = KeyStroke.getKeyStroke("ctrl pressed L"); - ui.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(configureLocalSourceKeyStroke, "obtainLocalSource"); - KeyStroke configureRemoteSourceKeyStroke = KeyStroke.getKeyStroke("ctrl pressed R"); - ui.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(configureRemoteSourceKeyStroke, "obtainRemoteSource"); + ui.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_CONFIGURE_LOCAL_SOURCE, "obtainLocalSource"); + ui.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_CONFIGURE_REMOTE_SOURCE, "obtainRemoteSource"); ui.getActionMap().put("obtainLocalSource", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { @@ -77,8 +74,8 @@ public class ConfigUIHandler extends AdminTabUIHandler<ConfigUI> implements UIHa } }); - MnemonicHelper.addKeyStroke(ui.getConfigureLocalSource(), configureLocalSourceKeyStroke); - MnemonicHelper.addKeyStroke(ui.getConfigureCentralSource(), configureRemoteSourceKeyStroke); + ObserveKeyStrokes.addKeyStroke(ui.getConfigureLocalSource(), ObserveKeyStrokes.KEY_STROKE_CONFIGURE_LOCAL_SOURCE); + ObserveKeyStrokes.addKeyStroke(ui.getConfigureCentralSource(), ObserveKeyStrokes.KEY_STROKE_CONFIGURE_REMOTE_SOURCE); super.afterInit(ui); UIHelper.setLayerUI(ui.getOperations(), parentUI.getOperationBlockLayerUI()); UIHelper.setLayerUI(ui.getConfig(), parentUI.getConfigBlockLayerUI()); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java index 847cba1..4bdd1a5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.admin.consolidate; import com.google.common.collect.ImmutableSet; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import fr.ird.observe.application.swing.ui.MnemonicHelper; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; import fr.ird.observe.application.swing.ui.util.ProgressModel; import fr.ird.observe.services.dto.reference.DataReference; @@ -57,7 +57,7 @@ public class ConsolidateUIHandler extends AdminTabUIHandler<ConsolidateUI> imple public void afterInit(ConsolidateUI ui) { super.afterInit(ui); ui.getStartButton().setText(t("observe.actions.synchro.launch.operation", t(ui.getStep().getOperationLabel()))); - MnemonicHelper.addKeyStrokeFromMnemonic(ui.getStartButton()); + ObserveKeyStrokes.addKeyStrokeFromMnemonic(ui.getStartButton()); getStepModel().getProgressModel().installUI(ui.getProgressBar()); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java index 49fc83c..e24e5b3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java @@ -28,7 +28,7 @@ import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator; import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; -import fr.ird.observe.application.swing.ui.MnemonicHelper; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; @@ -95,8 +95,8 @@ public class ExportUIHandler extends AdminTabUIHandler<ExportUI> implements UIHa ui.getPrepareAction().setText(t("observe.actions.synchro.prepare.operation", t(ui.getStep().getOperationLabel()))); ui.getStartAction().setText(t("observe.actions.synchro.launch.operation", t(ui.getStep().getOperationLabel()))); - MnemonicHelper.addKeyStrokeFromMnemonic(ui.getPrepareAction()); - MnemonicHelper.addKeyStrokeFromMnemonic(ui.getStartAction()); + ObserveKeyStrokes.addKeyStrokeFromMnemonic(ui.getPrepareAction()); + ObserveKeyStrokes.addKeyStrokeFromMnemonic(ui.getStartAction()); ConfigUI configabUI = (ConfigUI) parentUI.getStepUI(AdminStep.CONFIG); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java index 5517b90..cbe5193 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java @@ -22,7 +22,7 @@ package fr.ird.observe.application.swing.ui.admin.save; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import fr.ird.observe.application.swing.ui.MnemonicHelper; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; @@ -61,8 +61,8 @@ public class SaveLocalUIHandler extends AdminTabUIHandler<SaveLocalUI> implement String message = t("observe.actions.synchro.launch.operation", t(ui.getStep().getOperationLabel())); ui.getStartAction().setText(message); - MnemonicHelper.addKeyStrokeFromMnemonic(ui.getContinueAction()); - MnemonicHelper.addKeyStrokeFromMnemonic(ui.getStartAction()); + ObserveKeyStrokes.addKeyStrokeFromMnemonic(ui.getContinueAction()); + ObserveKeyStrokes.addKeyStrokeFromMnemonic(ui.getStartAction()); } public void updateText() { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java index a0039a6..122660a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java @@ -25,7 +25,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.data; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; -import fr.ird.observe.application.swing.ui.MnemonicHelper; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; import fr.ird.observe.application.swing.ui.admin.config.ConfigModel; @@ -113,8 +113,8 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple }); - MnemonicHelper.addKeyStrokeFromMnemonic(ui.getStartAction()); - MnemonicHelper.addKeyStrokeFromMnemonic(ui.getApplyAction()); + ObserveKeyStrokes.addKeyStrokeFromMnemonic(ui.getStartAction()); + ObserveKeyStrokes.addKeyStrokeFromMnemonic(ui.getApplyAction()); stepModel.getProgressModel().installUI(ui.getProgressBar()); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java index c09c077..cc80083 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java @@ -25,7 +25,7 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; -import fr.ird.observe.application.swing.ui.MnemonicHelper; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; import fr.ird.observe.services.dto.reference.ReferentialReference; @@ -81,8 +81,8 @@ public class SynchronizeUIHandler extends AdminTabUIHandler<SynchronizeUI> imple super.afterInit(ui); ui.getStartAction().setText(t("observe.actions.synchro.referential.legacy.launch.operation", t(ui.getStep().getOperationLabel()))); - MnemonicHelper.addKeyStrokeFromMnemonic(ui.getStartAction()); - MnemonicHelper.addKeyStrokeFromMnemonic(ui.getApplyAction()); + ObserveKeyStrokes.addKeyStrokeFromMnemonic(ui.getStartAction()); + ObserveKeyStrokes.addKeyStrokeFromMnemonic(ui.getApplyAction()); DefaultListSelectionModel obsoleteReferenceSelectionModel = ui.getModel().getSynchronizeReferentielModel().getObsoleteReferencesSelectionModel(); obsoleteReferenceSelectionModel.addListSelectionListener(this::updateSelectedObsoleteEntity); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java index c716ec3..223786c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng; */ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import fr.ird.observe.application.swing.ui.MnemonicHelper; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; @@ -84,8 +84,8 @@ public class ReferentialSynchroUIHandler extends AdminTabUIHandler<ReferentialSy configUI.getExtraConfig().add(extraConfig); - MnemonicHelper.addKeyStrokeFromMnemonic(ui.getStartAction()); - MnemonicHelper.addKeyStrokeFromMnemonic(ui.getApplyAction()); + ObserveKeyStrokes.addKeyStrokeFromMnemonic(ui.getStartAction()); + ObserveKeyStrokes.addKeyStrokeFromMnemonic(ui.getApplyAction()); } public void doStartAction() { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java index 960977f..5b943b9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java @@ -28,7 +28,7 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; -import fr.ird.observe.application.swing.ui.MnemonicHelper; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; @@ -125,8 +125,8 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements ui.getStartButton().setText(t("observe.actions.synchro.launch.operation", t(ui.getStep().getOperationLabel()))); - MnemonicHelper.addKeyStrokeFromMnemonic(ui.getStartButton()); - MnemonicHelper.addKeyStrokeFromMnemonic(ui.getSaveReport()); + ObserveKeyStrokes.addKeyStrokeFromMnemonic(ui.getStartButton()); + ObserveKeyStrokes.addKeyStrokeFromMnemonic(ui.getSaveReport()); // initialisation de l'ui de configuration if (log.isInfoEnabled()) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java index db4148e..ef555ba 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java @@ -30,7 +30,7 @@ import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator; import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; -import fr.ird.observe.application.swing.ui.MnemonicHelper; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import fr.ird.observe.application.swing.ui.util.BooleanEditor; import fr.ird.observe.application.swing.ui.util.tripMap.ObserveMapPane; @@ -346,7 +346,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> action = (AbstractUIAction) actionMap.get(actionId); Objects.requireNonNull(action, "action [" + actionId + "] not found for ui " + ui.getClass().getName()); KeyStroke acceleratorKey = action.getAcceleratorKey(); - MnemonicHelper.addKeyStroke(editor, acceleratorKey); + ObserveKeyStrokes.addKeyStroke(editor, acceleratorKey); } } @@ -376,7 +376,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> } }; - editorComponent.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ctrl pressed D"), "resetAction"); + editorComponent.getInputMap(JComponent.WHEN_FOCUSED).put(ObserveKeyStrokes.KEY_STROKE_RESET, "resetAction"); editorComponent.getActionMap().put("resetAction", resetAction); Action showPopupAction = new AbstractAction() { @@ -390,7 +390,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> } } }; - editorComponent.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ENTER"), "showPopupAction"); + editorComponent.getInputMap(JComponent.WHEN_FOCUSED).put(ObserveKeyStrokes.KEY_STROKE_ENTER, "showPopupAction"); editorComponent.getActionMap().put("showPopupAction", showPopupAction); Action showDecoratorPopupAction = new AbstractAction() { @@ -399,7 +399,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> beanComboBox.getPopup().show(beanComboBox, 0, 0); } }; - editorComponent.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ctrl pressed F"), "showDecoratorPopupAction"); + editorComponent.getInputMap(JComponent.WHEN_FOCUSED).put(ObserveKeyStrokes.KEY_STROKE_SHOW_DECORATOR_POPUP, "showDecoratorPopupAction"); editorComponent.getActionMap().put("showDecoratorPopupAction", showDecoratorPopupAction); Class dtoClass = getDtoClass(beanComboBox); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java index 1afeeb9..463f72e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java @@ -25,7 +25,7 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.DataContext; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.db.constants.DataContextType; -import fr.ird.observe.application.swing.ui.MnemonicHelper; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; @@ -50,7 +50,6 @@ import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import javax.swing.JScrollPane; import javax.swing.JTable; -import javax.swing.KeyStroke; import javax.swing.ListSelectionModel; import javax.swing.SwingUtilities; import javax.swing.event.ListSelectionEvent; @@ -405,6 +404,6 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto, U button.putClientProperty("toolTipText", t(ui.getSaveEntryTip())); button.setIcon(UIHelper.getUIManagerActionIcon("save")); } - MnemonicHelper.addKeyStroke2(button, KeyStroke.getKeyStroke("shift ctrl pressed S")); + ObserveKeyStrokes.addKeyStroke2(button, ObserveKeyStrokes.KEY_STROKE_SAVE_TABLE_ENTRY); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIInitializer.java index 9f851c5..e984175 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIInitializer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIInitializer.java @@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.content.table; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.content.ContentUIInitializer; import fr.ird.observe.application.swing.ui.content.ObserveActionMap; import fr.ird.observe.application.swing.ui.util.BooleanEditor; @@ -40,7 +41,6 @@ import javax.swing.JCheckBox; import javax.swing.JComponent; import javax.swing.JTextArea; import javax.swing.JTextField; -import javax.swing.KeyStroke; import javax.swing.table.DefaultTableCellRenderer; import java.awt.BorderLayout; import java.awt.event.ActionEvent; @@ -151,7 +151,7 @@ public class ContentTableUIInitializer<E extends IdDto, D extends IdDto, UI exte InputMap inputMap = ui.getTable().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); ActionMap actionMap = ui.getTable().getActionMap(); - inputMap.put(KeyStroke.getKeyStroke("shift pressed W"), "selectDown"); + inputMap.put(ObserveKeyStrokes.KEY_STROKE_GO_DOWN_TABLE_ENTRY, "selectDown"); actionMap.put("selectDown", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { @@ -167,7 +167,7 @@ public class ContentTableUIInitializer<E extends IdDto, D extends IdDto, UI exte } } }); - inputMap.put(KeyStroke.getKeyStroke("shift pressed Q"), "selectUp"); + inputMap.put(ObserveKeyStrokes.KEY_STROKE_GO_UP_TABLE_ENTRY, "selectUp"); actionMap.put("selectUp", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java index 8762572..c436a5a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java @@ -34,7 +34,7 @@ import fr.ird.observe.application.swing.configuration.constants.DbMode; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.db.constants.ConnexionStatus; import fr.ird.observe.application.swing.decoration.DecoratorService; -import fr.ird.observe.application.swing.ui.MnemonicHelper; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.storage.tabs.RolesTableModel; @@ -602,16 +602,16 @@ public class StorageUIHandler implements UIHandler<StorageUI> { InputMap inputMap = ui.getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); ActionMap actionMap = ui.getRootPane().getActionMap(); - inputMap.put(MnemonicHelper.KEY_STROKE_ESCAPE, "cancel"); + inputMap.put(ObserveKeyStrokes.KEY_STROKE_ESCAPE, "cancel"); actionMap.put("cancel", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { ui.doActionPerformed__on__cancelAction(e); } }); - MnemonicHelper.addKeyStroke(ui.getCancelAction(), MnemonicHelper.KEY_STROKE_ESCAPE); + ObserveKeyStrokes.addKeyStroke(ui.getCancelAction(), ObserveKeyStrokes.KEY_STROKE_ESCAPE); - MnemonicHelper.addKeyStrokeFromMnemonic(ui); + ObserveKeyStrokes.addKeyStrokeFromMnemonic(ui); StorageUIModel model = ui.getModel(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/BackupUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/BackupUIHandler.java index bab5955..cd2c084 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/BackupUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/BackupUIHandler.java @@ -22,7 +22,7 @@ package fr.ird.observe.application.swing.ui.storage.tabs; * #L% */ -import fr.ird.observe.application.swing.ui.MnemonicHelper; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.storage.StorageStep; import jaxx.runtime.spi.UIHandler; @@ -58,8 +58,8 @@ public class BackupUIHandler extends StorageTabUIHandler<BackupUI> implements UI } } }); - ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(MnemonicHelper.KEY_STROKE_STORAGE_DO_BACKUP, ACTION_DO_BACKUP); - MnemonicHelper.addKeyStroke(ui.getDoBackup(), MnemonicHelper.KEY_STROKE_STORAGE_DO_BACKUP); + ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_STORAGE_DO_BACKUP, ACTION_DO_BACKUP); + ObserveKeyStrokes.addKeyStroke(ui.getDoBackup(), ObserveKeyStrokes.KEY_STROKE_STORAGE_DO_BACKUP); ui.getActionMap().put(ACTION_DO_CHOOSE_DIRECTORY, new AbstractAction() { @Override @@ -69,8 +69,8 @@ public class BackupUIHandler extends StorageTabUIHandler<BackupUI> implements UI } } }); - ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(MnemonicHelper.KEY_STROKE_STORAGE_DO_CHOOSE_DIRECTORY, ACTION_DO_CHOOSE_DIRECTORY); - MnemonicHelper.addKeyStroke(ui.getChooseFileAction(), MnemonicHelper.KEY_STROKE_STORAGE_DO_CHOOSE_DIRECTORY); + ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_STORAGE_DO_CHOOSE_DIRECTORY, ACTION_DO_CHOOSE_DIRECTORY); + ObserveKeyStrokes.addKeyStroke(ui.getChooseFileAction(), ObserveKeyStrokes.KEY_STROKE_STORAGE_DO_CHOOSE_DIRECTORY); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigReferentielUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigReferentielUIHandler.java index 104e78d..0e91b47 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigReferentielUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigReferentielUIHandler.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.storage.tabs; */ import fr.ird.observe.application.swing.configuration.constants.CreationMode; -import fr.ird.observe.application.swing.ui.MnemonicHelper; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.storage.StorageStep; import fr.ird.observe.application.swing.ui.storage.StorageUILauncher; @@ -80,8 +80,8 @@ public class ConfigReferentielUIHandler extends StorageTabUIHandler<ConfigRefere } } }); - ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(MnemonicHelper.KEY_STROKE_STORAGE_DO_CHOOSE_DIRECTORY, ACTION_DO_CONFIGURE_REMOTE_SOURCE); - MnemonicHelper.addKeyStroke(ui.getConfigureCentralSource(), MnemonicHelper.KEY_STROKE_STORAGE_DO_CHOOSE_DIRECTORY); + ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_STORAGE_DO_CHOOSE_DIRECTORY, ACTION_DO_CONFIGURE_REMOTE_SOURCE); + ObserveKeyStrokes.addKeyStroke(ui.getConfigureCentralSource(), ObserveKeyStrokes.KEY_STROKE_STORAGE_DO_CHOOSE_DIRECTORY); ui.getActionMap().put(ACTION_DO_CONFIGURE_REMOTE_SERVER, new AbstractAction() { @Override @@ -91,8 +91,8 @@ public class ConfigReferentielUIHandler extends StorageTabUIHandler<ConfigRefere } } }); - ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(MnemonicHelper.KEY_STROKE_STORAGE_DO_CONFIGURE_REMOTE_SERVER, ACTION_DO_CONFIGURE_REMOTE_SERVER); - MnemonicHelper.addKeyStroke(ui.getConfigureCentralSourceServer(), MnemonicHelper.KEY_STROKE_STORAGE_DO_CONFIGURE_REMOTE_SERVER); + ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_STORAGE_DO_CONFIGURE_REMOTE_SERVER, ACTION_DO_CONFIGURE_REMOTE_SERVER); + ObserveKeyStrokes.addKeyStroke(ui.getConfigureCentralSourceServer(), ObserveKeyStrokes.KEY_STROKE_STORAGE_DO_CONFIGURE_REMOTE_SERVER); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java index 3c96826..e5c0b38 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java @@ -26,7 +26,7 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ObserveTextGenerator; import fr.ird.observe.application.swing.configuration.constants.DbMode; import fr.ird.observe.application.swing.db.constants.ConnexionStatus; -import fr.ird.observe.application.swing.ui.MnemonicHelper; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import fr.ird.observe.application.swing.ui.actions.storage.UseRemoteConfigurationUIAction; @@ -74,7 +74,6 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI @Override public void afterInit(ConfigUI ui) { -// MnemonicHelper.addKeyStrokeFromMnemonic(ui); PropertyChangeListener listener = evt -> { StorageUIModel model = (StorageUIModel) evt.getSource(); String propertyName = evt.getPropertyName(); @@ -106,8 +105,8 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI } } }); - ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(MnemonicHelper.KEY_STROKE_STORAGE_DO_CHOOSE_FILE, ACTION_DO_CHOOSE_FILE); - MnemonicHelper.addKeyStroke(ui.getFileChooserAction(), MnemonicHelper.KEY_STROKE_STORAGE_DO_CHOOSE_FILE); + ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_STORAGE_DO_CHOOSE_FILE, ACTION_DO_CHOOSE_FILE); + ObserveKeyStrokes.addKeyStroke(ui.getFileChooserAction(), ObserveKeyStrokes.KEY_STROKE_STORAGE_DO_CHOOSE_FILE); actionMap.put(ACTION_DO_USE_SSL, new AbstractAction() { @Override @@ -117,8 +116,8 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI } } }); - ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(MnemonicHelper.KEY_STROKE_STORAGE_DO_USE_SSL, ACTION_DO_USE_SSL); - MnemonicHelper.addKeyStroke(ui.getRemoteUseSsl(), MnemonicHelper.KEY_STROKE_STORAGE_DO_USE_SSL); + ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_STORAGE_DO_USE_SSL, ACTION_DO_USE_SSL); + ObserveKeyStrokes.addKeyStroke(ui.getRemoteUseSsl(), ObserveKeyStrokes.KEY_STROKE_STORAGE_DO_USE_SSL); ObserveActionMap observeActionMap = ObserveSwingApplicationContext.get().getMainUI().getObserveActionMap(); init(observeActionMap, ui.getSaveRemoteConfiguration()); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUIHandler.java index 0ac7155..b128c4c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUIHandler.java @@ -22,7 +22,7 @@ package fr.ird.observe.application.swing.ui.storage.tabs; * #L% */ -import fr.ird.observe.application.swing.ui.MnemonicHelper; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import jaxx.runtime.spi.UIHandler; import static org.nuiton.i18n.I18n.t; @@ -39,7 +39,7 @@ public class SelectDataUIHandler extends StorageTabUIHandler<SelectDataUI> imple public void afterInit(SelectDataUI ui) { if (ui.getStep() != null) { String description = t(ui.getStep().getDescription()); - description = MnemonicHelper.addKeyStroke3(description, MnemonicHelper.KEY_STROKE_ENTER); + description = ObserveKeyStrokes.suffixTextWithKeyStroke(description, ObserveKeyStrokes.KEY_STROKE_ENTER); ui.setDescriptionText(description); } ui.getSelectTree().installUI(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeaderHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeaderHandler.java index 3e68582..75a86e0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeaderHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeaderHandler.java @@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.tree.navigation; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.services.dto.longline.TripLonglineDto; @@ -35,7 +36,12 @@ import org.jdesktop.swingx.decorator.ColorHighlighter; import org.jdesktop.swingx.search.Searchable; import org.jdesktop.swingx.search.TreeSearchable; +import javax.swing.AbstractAction; +import javax.swing.ActionMap; +import javax.swing.InputMap; +import javax.swing.JComponent; import java.awt.Color; +import java.awt.event.ActionEvent; /** * @author Samuel Maisonneuve- maisonneuve@codelutin.com @@ -56,23 +62,58 @@ public class NavigationTreeHeaderHandler implements UIHandler<NavigationTreeHead } @Override - public void beforeInit(NavigationTreeHeader navigationTreeHeader) { - this.ui = navigationTreeHeader; + public void beforeInit(NavigationTreeHeader ui) { + this.ui = ui; } @Override - public void afterInit(NavigationTreeHeader navigationTreeHeader) { + public void afterInit(NavigationTreeHeader ui) { - navigationTreeHeader.getShowSeine().setIcon(UIHelper.getUIManagerIcon("navigation." + TripSeineDto.class.getName() + "-16")); - navigationTreeHeader.getShowLongline().setIcon(UIHelper.getUIManagerIcon("navigation." + TripLonglineDto.class.getName() + "-16")); - navigationTreeHeader.getShowReferential().setIcon(UIHelper.getUIManagerIcon("navigation.referentiel-16")); - navigationTreeHeader.getShowEmptyProgram().setIcon(UIHelper.getUIManagerIcon("navigation." + ProgramDto.class.getName() + "-16")); + ui.getShowSeine().setIcon(UIHelper.getUIManagerIcon("navigation." + TripSeineDto.class.getName() + "-16")); + ui.getShowLongline().setIcon(UIHelper.getUIManagerIcon("navigation." + TripLonglineDto.class.getName() + "-16")); + ui.getShowReferential().setIcon(UIHelper.getUIManagerIcon("navigation.referentiel-16")); + ui.getShowEmptyProgram().setIcon(UIHelper.getUIManagerIcon("navigation." + ProgramDto.class.getName() + "-16")); - NavigationTree tree = navigationTreeHeader.getTree(); + NavigationTree tree = ui.getTree(); TreeSearchable searchable = new TreeSearchable(tree); tree.setSearchable(searchable); searchable.setMatchHighlighter(new ColorHighlighter(Color.YELLOW, Color.BLACK)); + ObserveKeyStrokes.addKeyStroke(ui.getShowSeine(), ObserveKeyStrokes.KEY_STROKE_SHOW_SEINE); + ObserveKeyStrokes.addKeyStroke(ui.getShowLongline(), ObserveKeyStrokes.KEY_STROKE_SHOW_LONGLINE); + ObserveKeyStrokes.addKeyStroke(ui.getShowReferential(), ObserveKeyStrokes.KEY_STROKE_SHOW_REFERENTIAL); + ObserveKeyStrokes.addKeyStroke(ui.getShowEmptyProgram(), ObserveKeyStrokes.KEY_STROKE_SHOW_EMPTY_PROGRAM); + + InputMap inputMap = ui.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); + ActionMap actionMap = ui.getActionMap(); + inputMap.put(ObserveKeyStrokes.KEY_STROKE_SHOW_SEINE, "showSeine"); + actionMap.put("showSeine", new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + ui.getShowSeine().doClick(); + } + }); + inputMap.put(ObserveKeyStrokes.KEY_STROKE_SHOW_LONGLINE, "showLongline"); + actionMap.put("showLongline", new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + ui.getShowLongline().doClick(); + } + }); + inputMap.put(ObserveKeyStrokes.KEY_STROKE_SHOW_REFERENTIAL, "showReferential"); + actionMap.put("showReferential", new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + ui.getShowReferential().doClick(); + } + }); + inputMap.put(ObserveKeyStrokes.KEY_STROKE_SHOW_EMPTY_PROGRAM, "showEmptyProgram"); + actionMap.put("showEmptyProgram", new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + ui.getShowEmptyProgram().doClick(); + } + }); } public void search(String term) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java index 2f80831..2180882 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.application.swing.ui.MnemonicHelper; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.actions.content.SelectNodeUIAction; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.tree.ObserveTreeNodeSupport; @@ -34,7 +34,6 @@ import org.apache.commons.logging.LogFactory; import javax.swing.AbstractAction; import javax.swing.JMenuItem; -import javax.swing.KeyStroke; import java.awt.Color; import java.awt.event.ActionEvent; import java.util.Enumeration; @@ -235,7 +234,7 @@ public abstract class NavigationTreeNodeSupport<O> extends ObserveTreeNodeSuppor }; mi.setAction(a); mi.setText(getText().trim()); - MnemonicHelper.addKeyStroke(mi, KeyStroke.getKeyStroke("pressed ENTER")); + ObserveKeyStrokes.addKeyStroke(mi, ObserveKeyStrokes.KEY_STROKE_PRESSED_ENTER); mi.setIcon(getIcon("-16")); mi.setForeground(getColor()); mi.setBackground(Color.WHITE); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/SelectionTree.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/SelectionTree.java index 73b57b4..5952bff 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/SelectionTree.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/SelectionTree.java @@ -22,7 +22,7 @@ package fr.ird.observe.application.swing.ui.tree.selection; * #L% */ -import fr.ird.observe.application.swing.ui.MnemonicHelper; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.tree.selection.nodes.SelectionTreeNodeSupport; import org.jdesktop.swingx.JXTree; @@ -54,7 +54,7 @@ public class SelectionTree extends JXTree { InputMap inputMap = getInputMap(WHEN_IN_FOCUSED_WINDOW); ActionMap actionMap = getActionMap(); - inputMap.put(MnemonicHelper.KEY_STROKE_ENTER, "select/unselect"); + inputMap.put(ObserveKeyStrokes.KEY_STROKE_ENTER, "select/unselect"); actionMap.put("select/unselect", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { @@ -74,7 +74,7 @@ public class SelectionTree extends JXTree { InputMap inputMap = getInputMap(WHEN_IN_FOCUSED_WINDOW); ActionMap actionMap = getActionMap(); - inputMap.put(MnemonicHelper.KEY_STROKE_ENTER, "select/unselect"); + inputMap.put(ObserveKeyStrokes.KEY_STROKE_ENTER, "select/unselect"); actionMap.put("select/unselect", new AbstractAction() { protected void forTree(SelectionTree tree) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.