Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

3 changed files:

Changes:

  • client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java
    ... ... @@ -54,7 +54,7 @@ public class UseRemoteConfigurationUIAction extends UIActionSupport {
    54 54 
         private StorageUI parentContainer;
    55 55
    56 56 
         public UseRemoteConfigurationUIAction(ObserveMainUI mainUI, ConfigUI configUI, String actionName, RemoteDataSourceConfiguration configuration, KeyStroke acceleratorKey) {
    57 
    -        super(mainUI, actionName, configuration.getName(), null, "db-remote", acceleratorKey);
    57 
    +        super(mainUI, actionName, configuration.getName(), null, "db-remote", acceleratorKey, false);
    58 58 
             this.configUI = configUI;
    59 59 
             this.configuration = configuration;
    60 60 
         }

  • client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java
    ... ... @@ -53,7 +53,7 @@ public class UseServerConfigurationUIAction extends UIActionSupport {
    53 53 
         private StorageUI parentContainer;
    54 54
    55 55 
         public UseServerConfigurationUIAction(ObserveMainUI mainUI, ConfigUI configUI, String actionName, ServerDataSourceConfiguration configuration, KeyStroke acceleratorKey) {
    56 
    -        super(mainUI, actionName, configuration.getName(), null, "db-remote", acceleratorKey);
    56 
    +        super(mainUI, actionName, configuration.getName(), null, "db-remote", acceleratorKey, false);
    57 57 
             this.configUI = configUI;
    58 58 
             this.configuration = configuration;
    59 59 
         }

  • 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
    136 136 
             int index = 1;
    137 137 
             ObserveMainUI mainUI = ObserveSwingApplicationContext.get().getMainUI();
    138 138 
             for (RemoteDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getConfig().getRemoteDataSourceConfigurationList()) {
    139 
    -            addRemoteConfiguration(mainUI,configuration, index++);
    139 
    +            addRemoteConfiguration(mainUI, configuration, index++);
    140 140 
             }
    141 141
    142 142 
             index = 1;
    143 143 
             for (ServerDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getConfig().getServerDataSourceConfigurationList()) {
    144 
    -            addServerConfiguration(mainUI,configuration, index++);
    144 
    +            addServerConfiguration(mainUI, configuration, index++);
    145 145 
             }
    146 146 
         }
    147 147
    148 148 
         public void addRemoteConfiguration(ObserveMainUI mainUI, RemoteDataSourceConfiguration configuration, int position) {
    149 149 
             JMenuItem item = new JMenuItem(configuration.getName());
    150 150 
             item.putClientProperty("configuration", configuration);
    151 
    -        UIActionSupport action = new UseRemoteConfigurationUIAction(mainUI,ui, UseRemoteConfigurationUIAction.ACTION_NAME + position, configuration, KeyStroke.getKeyStroke("F" + position));
    151 
    +        UseRemoteConfigurationUIAction action = new UseRemoteConfigurationUIAction(mainUI, ui, UseRemoteConfigurationUIAction.ACTION_NAME + position, configuration, KeyStroke.getKeyStroke("F" + position));
    152 152 
             action.initForMainUi(item, ui.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT), observeActionMap);
    153 153
    154 154 
             ui.getRemoteMenu().add(item);
    ... ... @@ -157,7 +157,7 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI
    157 157 
         public void addServerConfiguration(ObserveMainUI mainUI, ServerDataSourceConfiguration configuration, int position) {
    158 158 
             JMenuItem item = new JMenuItem(configuration.getName());
    159 159 
             item.putClientProperty("configuration", configuration);
    160 
    -        UIActionSupport action = new UseServerConfigurationUIAction(mainUI,ui, UseServerConfigurationUIAction.ACTION_NAME + position, configuration, KeyStroke.getKeyStroke("F" + position));
    160 
    +        UseServerConfigurationUIAction action = new UseServerConfigurationUIAction(mainUI, ui, UseServerConfigurationUIAction.ACTION_NAME + position, configuration, KeyStroke.getKeyStroke("F" + position));
    161 161 
             action.initForMainUi(item, ui.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT), observeActionMap);
    162 162
    163 163 
             ui.getServerMenu().add(item);

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.