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

Commits:

2 changed files:

Changes:

  • client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java
    ... ... @@ -674,6 +674,7 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig
    674 674 
         public void addRemoteDataSourceConfiguration(RemoteDataSourceConfiguration configuration) {
    675 675 
             List<RemoteDataSourceConfiguration> remoteDataSourceConfigurations = new ArrayList<>(Arrays.asList(getRemoteDataSourceConfigurations()));
    676 676 
             remoteDataSourceConfigurations.add(configuration);
    677 
    +        remoteDataSourceConfigurations.sort(Comparator.comparing(RemoteDataSourceConfiguration::getName));
    677 678 
             setRemoteDataSourceConfigurations(remoteDataSourceConfigurations.toArray(new RemoteDataSourceConfiguration[0]));
    678 679 
             saveForUser();
    679 680 
         }
    ... ... @@ -682,6 +683,7 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig
    682 683 
             List<RemoteDataSourceConfiguration> remoteDataSourceConfigurations = new ArrayList<>(Arrays.asList(getRemoteDataSourceConfigurations()));
    683 684 
             remoteDataSourceConfigurations.remove(configuration);
    684 685 
             remoteDataSourceConfigurations.add(configuration);
    686 
    +        remoteDataSourceConfigurations.sort(Comparator.comparing(RemoteDataSourceConfiguration::getName));
    685 687 
             setRemoteDataSourceConfigurations(remoteDataSourceConfigurations.toArray(new RemoteDataSourceConfiguration[0]));
    686 688 
             saveForUser();
    687 689 
         }
    ... ... @@ -727,6 +729,7 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig
    727 729 
         public void addServerDataSourceConfiguration(ServerDataSourceConfiguration configuration) {
    728 730 
             List<ServerDataSourceConfiguration> remoteDataSourceConfigurations = new ArrayList<>(Arrays.asList(getServerDataSourceConfigurations()));
    729 731 
             remoteDataSourceConfigurations.add(configuration);
    732 
    +        remoteDataSourceConfigurations.sort(Comparator.comparing(ServerDataSourceConfiguration::getName));
    730 733 
             setServerDataSourceConfigurations(remoteDataSourceConfigurations.toArray(new ServerDataSourceConfiguration[0]));
    731 734 
             saveForUser();
    732 735 
         }
    ... ... @@ -735,6 +738,7 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig
    735 738 
             List<ServerDataSourceConfiguration> remoteDataSourceConfigurations = new ArrayList<>(Arrays.asList(getServerDataSourceConfigurations()));
    736 739 
             remoteDataSourceConfigurations.remove(configuration);
    737 740 
             remoteDataSourceConfigurations.add(configuration);
    741 
    +        remoteDataSourceConfigurations.sort(Comparator.comparing(ServerDataSourceConfiguration::getName));
    738 742 
             setServerDataSourceConfigurations(remoteDataSourceConfigurations.toArray(new ServerDataSourceConfiguration[0]));
    739 743 
             saveForUser();
    740 744 
         }

  • 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
    51 51 
         protected void preparePopup(JPopupMenu menu) {
    52 52 
             int position = 0;
    53 53 
             menu.removeAll();
    54 
    -        for (ServerDataSourceConfiguration configuration : getClientConfig().getServerDataSourceConfigurations()) {
    54 
    +        for (ServerDataSourceConfiguration configuration : getClientConfig().getServerDataSourceConfigurationList()) {
    55 55 
                 addConfiguration(ui, configuration, position++);
    56 56 
             }
    57 57 
         }

    • —
    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.