branch feature/7708 updated (c07b160 -> 1e84e3f)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7708 in repository observe. See http://git.codelutin.com/observe.git from c07b160 afficher les erreurs de connexion au source de données (refs 7708) new 1e84e3f ajouter le sablier pendant le test de la connexion (refs 7708) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 1e84e3f21e3f87525e1db2778d2dccd86091925f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Nov 12 14:51:51 2015 +0100 ajouter le sablier pendant le test de la connexion (refs 7708) Summary of changes: .../fr/ird/observe/ui/storage/StorageUIModel.java | 131 +++++++++++---------- 1 file changed, 69 insertions(+), 62 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7708 in repository observe. See http://git.codelutin.com/observe.git commit 1e84e3f21e3f87525e1db2778d2dccd86091925f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Nov 12 14:51:51 2015 +0100 ajouter le sablier pendant le test de la connexion (refs 7708) --- .../fr/ird/observe/ui/storage/StorageUIModel.java | 131 +++++++++++---------- 1 file changed, 69 insertions(+), 62 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java index 7f3a8cb..39206aa 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java @@ -1674,118 +1674,125 @@ public class StorageUIModel extends WizardModel<StorageStep> { boolean result = false; boolean error = false; connexionStatusError = ""; + setBusy(true); - if (isEditRemoteConfig()) { - config = pgConfig; - } else if (isEditServerConfig()) { - try { - URL url = new URL(serverUrl); + try { + + if (isEditRemoteConfig()) { + config = pgConfig; + } else if (isEditServerConfig()) { + try { + URL url = new URL(serverUrl); + + restConfig.setServerUrl(url); - restConfig.setServerUrl(url); + config = restConfig; - config = restConfig; + } catch (MalformedURLException e) { - } catch (MalformedURLException e) { + connexionStatusError = t("observe.storage.error.badUrl", serverUrl); - connexionStatusError = t("observe.storage.error.badUrl", serverUrl); + setConnexionStatus(ConnexionStatus.FAILED); - setConnexionStatus(ConnexionStatus.FAILED); + } } - } + if (config != null) { - if (config != null) { + ObserveSwingDataSource dataSource = ObserveSwingApplicationContext.get().newDataSource(config); - ObserveSwingDataSource dataSource = ObserveSwingApplicationContext.get().newDataSource(config); + try { - try { + if (DbMode.USE_SERVER.equals(getDbMode()) + || DbMode.CREATE_LOCAL.equals(getDbMode()) && CreationMode.IMPORT_SERVER_STORAGE.equals(creationMode)) { - if (DbMode.USE_SERVER.equals(getDbMode()) - || DbMode.CREATE_LOCAL.equals(getDbMode()) && CreationMode.IMPORT_SERVER_STORAGE.equals(creationMode)) { + PingService pingService = dataSource.newService(PingService.class); - PingService pingService = dataSource.newService(PingService.class); + Version modelServerVersion = pingService.ping(); - Version modelServerVersion = pingService.ping(); + if (!getModelVersion().equals(modelServerVersion)) { - if (!getModelVersion().equals(modelServerVersion)) { + connexionStatusError = t("observe.storage.error.serverVersionMismatch", modelServerVersion, getModelVersion()); - connexionStatusError = t("observe.storage.error.serverVersionMismatch", modelServerVersion, getModelVersion()); + setConnexionStatus(ConnexionStatus.FAILED); - setConnexionStatus(ConnexionStatus.FAILED); + error = true; + } - error = true; } - } - - if (!error) { + if (!error) { - dataSourceInformation = dataSource.checkCanConnect(); + dataSourceInformation = dataSource.checkCanConnect(); - Version versionDataSource = dataSourceInformation.getVersion(); + Version versionDataSource = dataSourceInformation.getVersion(); - // en mise a jour de la base on ne test pas la version - if (getModelVersion().equals(versionDataSource) || isCanMigrate()) { + // en mise a jour de la base on ne test pas la version + if (getModelVersion().equals(versionDataSource) || isCanMigrate()) { - setConnexionStatus(ConnexionStatus.SUCCESS); + setConnexionStatus(ConnexionStatus.SUCCESS); - result = true; + result = true; - } else { + } else { - connexionStatusError = t("observe.storage.error.dbVersionMismatch", versionDataSource, getModelVersion()); + connexionStatusError = t("observe.storage.error.dbVersionMismatch", versionDataSource, getModelVersion()); - setConnexionStatus(ConnexionStatus.FAILED); + setConnexionStatus(ConnexionStatus.FAILED); + } } - } - } catch (UnknownObserveWebUserException e) { + } catch (UnknownObserveWebUserException e) { - connexionStatusError = t("observe.storage.error.rest.user.unknown", e.getUserLogin()); - setConnexionStatus(ConnexionStatus.FAILED); + connexionStatusError = t("observe.storage.error.rest.user.unknown", e.getUserLogin()); + setConnexionStatus(ConnexionStatus.FAILED); - } catch (BadObserveWebUserPasswordException e) { + } catch (BadObserveWebUserPasswordException e) { - connexionStatusError = t("observe.storage.error.rest.password.bad", e.getUserLogin()); - setConnexionStatus(ConnexionStatus.FAILED); + connexionStatusError = t("observe.storage.error.rest.password.bad", e.getUserLogin()); + setConnexionStatus(ConnexionStatus.FAILED); - } catch (UnknownObserveWebUserForDatabaseException e) { + } catch (UnknownObserveWebUserForDatabaseException e) { - connexionStatusError = t("observe.storage.error.rest.database.unknownForUser", e.getDatabaseName(), e.getRole()); - setConnexionStatus(ConnexionStatus.FAILED); + connexionStatusError = t("observe.storage.error.rest.database.unknownForUser", e.getDatabaseName(), e.getRole()); + setConnexionStatus(ConnexionStatus.FAILED); - } catch (UserLoginNotFoundException e) { + } catch (UserLoginNotFoundException e) { - connexionStatusError = t("observe.storage.error.rest.user.required"); - setConnexionStatus(ConnexionStatus.FAILED); + connexionStatusError = t("observe.storage.error.rest.user.required"); + setConnexionStatus(ConnexionStatus.FAILED); - } catch (UserPasswordNotFoundException e) { + } catch (UserPasswordNotFoundException e) { - connexionStatusError = t("observe.storage.error.rest.pasword.required"); - setConnexionStatus(ConnexionStatus.FAILED); + connexionStatusError = t("observe.storage.error.rest.pasword.required"); + setConnexionStatus(ConnexionStatus.FAILED); - } catch (ObserveWebSecurityExceptionSupport e) { + } catch (ObserveWebSecurityExceptionSupport e) { - connexionStatusError = e.getClass().getSimpleName(); - setConnexionStatus(ConnexionStatus.FAILED); + connexionStatusError = e.getClass().getSimpleName(); + setConnexionStatus(ConnexionStatus.FAILED); - } catch (Exception e) { + } catch (Exception e) { - connexionStatusError = e.getMessage(); + connexionStatusError = e.getMessage(); - if (log.isErrorEnabled()) { - log.error("Error in test remote", e); - } + if (log.isErrorEnabled()) { + log.error("Error in test remote", e); + } - setConnexionStatus(ConnexionStatus.FAILED); + setConnexionStatus(ConnexionStatus.FAILED); - } finally { - if (dataSource.isOpen()) { - dataSource.close(); + } finally { + if (dataSource.isOpen()) { + dataSource.close(); + } } } + + } finally { + setBusy(false); } return result; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm