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 80fd120c68d25a6da3b252c44948cbe0e5b38049 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 23 09:47:49 2016 +0200 [UI] Assistant de connexion à un serveur (Fixes #8556) --- .../swing/configuration/ObserveSwingApplicationConfig.java | 5 +++++ .../ird/observe/application/swing/ui/storage/StorageUIHandler.java | 2 +- .../fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jcss | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java index a87d205..db421f1 100644 --- a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java +++ b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java @@ -186,6 +186,11 @@ public class ObserveSwingApplicationConfig extends GeneratedObserveSwingApplicat applicationConfig.parse(args); + //Fixes https://forge.codelutin.com/issues/8556 + if ("null".equals(getServerDatabaseName())) { + setServerDatabaseName(""); + saveForUser(); + } } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java index 9525a32..49ad3f3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java @@ -593,7 +593,7 @@ public class StorageUIHandler { config.setServerUrl(configurationRest.getServerUrl()); config.setServerLogin(configurationRest.getLogin()); config.setServerPassword(new String(configurationRest.getPassword())); - config.setServerDatabaseName(configurationRest.getOptionalDatabaseName().orElse(null)); + config.setServerDatabaseName(configurationRest.getOptionalDatabaseName().orElse("")); //TODO-TC20100311 : on devrait pas regarder si l'utilisateur veut sauver //TODO-TC20100311 : la configuration ? diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jcss index f5c1825..d08fa62 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jcss @@ -90,7 +90,7 @@ #serverDataBase { visible: {model.isEditServerConfig()}; - text:{model.getServerDatabase()}; + text:{SwingUtil.getStringValue(model.getServerDatabase())}; } #remoteUseSsl { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.