Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 96249ca4 by Tony CHEMIT at 2017-09-06T09:52:32+02:00 Correction des raccourcis claviers ajoutés en double sur la liste des connexions enregistrées - - - - - 3 changed files: - client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java - client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUIHandler.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java @@ -54,7 +54,7 @@ public class UseRemoteConfigurationUIAction extends UIActionSupport { private StorageUI parentContainer; public UseRemoteConfigurationUIAction(ObserveMainUI mainUI, ConfigUI configUI, String actionName, RemoteDataSourceConfiguration configuration, KeyStroke acceleratorKey) { - super(mainUI, actionName, configuration.getName(), null, "db-remote", acceleratorKey); + super(mainUI, actionName, configuration.getName(), null, "db-remote", acceleratorKey, false); this.configUI = configUI; this.configuration = configuration; } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java @@ -53,7 +53,7 @@ public class UseServerConfigurationUIAction extends UIActionSupport { private StorageUI parentContainer; public UseServerConfigurationUIAction(ObserveMainUI mainUI, ConfigUI configUI, String actionName, ServerDataSourceConfiguration configuration, KeyStroke acceleratorKey) { - super(mainUI, actionName, configuration.getName(), null, "db-remote", acceleratorKey); + super(mainUI, actionName, configuration.getName(), null, "db-remote", acceleratorKey, false); this.configUI = configUI; this.configuration = configuration; } ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUIHandler.java @@ -136,19 +136,19 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI int index = 1; ObserveMainUI mainUI = ObserveSwingApplicationContext.get().getMainUI(); for (RemoteDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getConfig().getRemoteDataSourceConfigurationList()) { - addRemoteConfiguration(mainUI,configuration, index++); + addRemoteConfiguration(mainUI, configuration, index++); } index = 1; for (ServerDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getConfig().getServerDataSourceConfigurationList()) { - addServerConfiguration(mainUI,configuration, index++); + addServerConfiguration(mainUI, configuration, index++); } } public void addRemoteConfiguration(ObserveMainUI mainUI, RemoteDataSourceConfiguration configuration, int position) { JMenuItem item = new JMenuItem(configuration.getName()); item.putClientProperty("configuration", configuration); - UIActionSupport action = new UseRemoteConfigurationUIAction(mainUI,ui, UseRemoteConfigurationUIAction.ACTION_NAME + position, configuration, KeyStroke.getKeyStroke("F" + position)); + UseRemoteConfigurationUIAction action = new UseRemoteConfigurationUIAction(mainUI, ui, UseRemoteConfigurationUIAction.ACTION_NAME + position, configuration, KeyStroke.getKeyStroke("F" + position)); action.initForMainUi(item, ui.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT), observeActionMap); ui.getRemoteMenu().add(item); @@ -157,7 +157,7 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI public void addServerConfiguration(ObserveMainUI mainUI, ServerDataSourceConfiguration configuration, int position) { JMenuItem item = new JMenuItem(configuration.getName()); item.putClientProperty("configuration", configuration); - UIActionSupport action = new UseServerConfigurationUIAction(mainUI,ui, UseServerConfigurationUIAction.ACTION_NAME + position, configuration, KeyStroke.getKeyStroke("F" + position)); + UseServerConfigurationUIAction action = new UseServerConfigurationUIAction(mainUI, ui, UseServerConfigurationUIAction.ACTION_NAME + position, configuration, KeyStroke.getKeyStroke("F" + position)); action.initForMainUi(item, ui.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT), observeActionMap); ui.getServerMenu().add(item); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/96249ca42a05dd2464451377fba0... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/96249ca42a05dd2464451377fba0... You're receiving this email because of your account on gitlab.com.