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 26780910819a640c64ed4317f7452cb6cd545b75 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 10 14:39:40 2016 +0200 Block actions if not on correct tab --- .../swing/ui/storage/tabs/StorageTabUIHandler.java | 39 ++++++++++++---------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java index b834dbd..afd1794 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java @@ -141,7 +141,9 @@ public class StorageTabUIHandler { ui.getActionMap().put("doChooseFile", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { - ui.getFileChooserAction().doClick(); + if (StorageStep.CONFIG == ui.getModel().getStep()) { + ui.getFileChooserAction().doClick(); + } } }); KeyStroke keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_MASK); @@ -150,7 +152,9 @@ public class StorageTabUIHandler { ui.getActionMap().put("doUseSsl", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { - ui.getRemoteUseSsl().doClick(); + if (StorageStep.CONFIG == ui.getModel().getStep()) { + ui.getRemoteUseSsl().doClick(); + } } }); ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_U, InputEvent.CTRL_MASK), "doUseSsl"); @@ -158,7 +162,9 @@ public class StorageTabUIHandler { ui.getActionMap().put("doKeepConfiguration", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { - ui.getStoreRemoteConfig().doClick(); + if (StorageStep.CONFIG == ui.getModel().getStep()) { + ui.getStoreRemoteConfig().doClick(); + } } }); ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK), "doKeepConfiguration"); @@ -182,14 +188,18 @@ public class StorageTabUIHandler { ui.getActionMap().put("doConfigureRemoteSource", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { - ui.getConfigureCentralSource().doClick(); + if (StorageStep.CONFIG_REFERENTIEL == ui.getModel().getStep()) { + ui.getConfigureCentralSource().doClick(); + } } }); ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_MASK), "doConfigureRemoteSource"); ui.getActionMap().put("doConfigureRemoteServer", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { - ui.getConfigureCentralSourceServer().doClick(); + if (StorageStep.CONFIG_REFERENTIEL == ui.getModel().getStep()) { + ui.getConfigureCentralSourceServer().doClick(); + } } }); ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_MASK), "doConfigureRemoteServer"); @@ -282,14 +292,18 @@ public class StorageTabUIHandler { ui.getActionMap().put("doBackup", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { - ui.getDoBackup().doClick(); + if (StorageStep.BACKUP == ui.getModel().getStep()) { + ui.getDoBackup().doClick(); + } } }); ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_MASK), "doBackup"); ui.getActionMap().put("doChooseDirectory", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { - ui.getChooseFileAction().doClick(); + if (StorageStep.BACKUP == ui.getModel().getStep()) { + ui.getChooseFileAction().doClick(); + } } }); ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_MASK), "doChooseDirectory"); @@ -412,17 +426,6 @@ public class StorageTabUIHandler { ui.getModel().validate(); } -// public void chooseSslCertificatFile(ConfigUI ui) { -// File f = UIHelper.chooseFile( -// ui, -// t("observe.title.choose.ssl.cert"), -// t("observe.action.choose.ssl.cert"), -// ui.getModel().getSslCertificatFile(), -// "^.+\\.jks$", -// t("observe.action.choose.ssl.cert.description")); -// ui.getModel().setSslCertificatFile(f); -// } - public void initTree(SelectDataUI ui, ObserveSwingDataSource source) { StorageUIModel model = ui.getModel(); if (model.isUseSelectData()) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.