Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d54e10cd by Tony Chemit at 2021-04-27T14:15:13+02:00 Classement des connexion - Closes #1844 - - - - - 2 changed files: - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/datasource/api/src/main/java/fr/ird/observe/client/datasource/api/config/actions/ServerConfigToggleConfigurations.java Changes: ===================================== client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -674,6 +674,7 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig public void addRemoteDataSourceConfiguration(RemoteDataSourceConfiguration configuration) { List<RemoteDataSourceConfiguration> remoteDataSourceConfigurations = new ArrayList<>(Arrays.asList(getRemoteDataSourceConfigurations())); remoteDataSourceConfigurations.add(configuration); + remoteDataSourceConfigurations.sort(Comparator.comparing(RemoteDataSourceConfiguration::getName)); setRemoteDataSourceConfigurations(remoteDataSourceConfigurations.toArray(new RemoteDataSourceConfiguration[0])); saveForUser(); } @@ -682,6 +683,7 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig List<RemoteDataSourceConfiguration> remoteDataSourceConfigurations = new ArrayList<>(Arrays.asList(getRemoteDataSourceConfigurations())); remoteDataSourceConfigurations.remove(configuration); remoteDataSourceConfigurations.add(configuration); + remoteDataSourceConfigurations.sort(Comparator.comparing(RemoteDataSourceConfiguration::getName)); setRemoteDataSourceConfigurations(remoteDataSourceConfigurations.toArray(new RemoteDataSourceConfiguration[0])); saveForUser(); } @@ -727,6 +729,7 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig public void addServerDataSourceConfiguration(ServerDataSourceConfiguration configuration) { List<ServerDataSourceConfiguration> remoteDataSourceConfigurations = new ArrayList<>(Arrays.asList(getServerDataSourceConfigurations())); remoteDataSourceConfigurations.add(configuration); + remoteDataSourceConfigurations.sort(Comparator.comparing(ServerDataSourceConfiguration::getName)); setServerDataSourceConfigurations(remoteDataSourceConfigurations.toArray(new ServerDataSourceConfiguration[0])); saveForUser(); } @@ -735,6 +738,7 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig List<ServerDataSourceConfiguration> remoteDataSourceConfigurations = new ArrayList<>(Arrays.asList(getServerDataSourceConfigurations())); remoteDataSourceConfigurations.remove(configuration); remoteDataSourceConfigurations.add(configuration); + remoteDataSourceConfigurations.sort(Comparator.comparing(ServerDataSourceConfiguration::getName)); setServerDataSourceConfigurations(remoteDataSourceConfigurations.toArray(new ServerDataSourceConfiguration[0])); saveForUser(); } ===================================== client/datasource/api/src/main/java/fr/ird/observe/client/datasource/api/config/actions/ServerConfigToggleConfigurations.java ===================================== @@ -51,7 +51,7 @@ public class ServerConfigToggleConfigurations extends ToggleConfigurationsSuppor protected void preparePopup(JPopupMenu menu) { int position = 0; menu.removeAll(); - for (ServerDataSourceConfiguration configuration : getClientConfig().getServerDataSourceConfigurations()) { + for (ServerDataSourceConfiguration configuration : getClientConfig().getServerDataSourceConfigurationList()) { addConfiguration(ui, configuration, position++); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d54e10cdc68b7cfbbe83f7d1de... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d54e10cdc68b7cfbbe83f7d1de... You're receiving this email because of your account on gitlab.com.