branch feature/7676 updated (42cfc22 -> 972247f)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7676 in repository observe. See http://git.codelutin.com/observe.git from 42cfc22 deplacement du pakages GPS pour eviter un conflit avec les mêmes classes pour les DTO (refs #7676) new 972247f ajout d'une traduction (refs #7676) 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 972247fda3363574549b63aa4cc1c2ed5863ce65 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Nov 4 11:48:19 2015 +0100 ajout d'une traduction (refs #7676) Summary of changes: .../src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java | 9 +++++++++ .../resources/i18n/observe-application-swing_fr_FR.properties | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) -- 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/7676 in repository observe. See http://git.codelutin.com/observe.git commit 972247fda3363574549b63aa4cc1c2ed5863ce65 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Nov 4 11:48:19 2015 +0100 ajout d'une traduction (refs #7676) --- .../src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java | 9 +++++++++ .../resources/i18n/observe-application-swing_fr_FR.properties | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) 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 6e89831..961c0ec 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 @@ -1351,6 +1351,14 @@ public class StorageUIModel extends WizardModel<StorageStep> { return url; } + protected String getServerUrl() { + return serverUrl; + } + + protected void setServerUrl(String serverUrl) { + this.serverUrl = serverUrl; + } + public boolean isUseSsl() { return pgConfig.isUseSsl(); } @@ -1624,6 +1632,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { dst.fromStorageConfig(h2Config); dst.fromStorageConfig(pgConfig); dst.fromStorageConfig(restConfig); + dst.setServerUrl(getServerUrl()); dst.setDbMode(getDbMode()); dst.setSelectDataModel(getSelectDataModel()); dst.setSecurityModel(getSecurityModel()); diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 5932c0f..ff24e33 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -1884,7 +1884,7 @@ observe.storage.security.administrateur=Propriétaire de la base observe.storage.selected.dbMode=Type de source de données sélectionné observe.storage.selectedCreationMode=Mode de création sélectionné observe.storage.server.dataBase=Base de données -observe.storage.server.db= +observe.storage.server.db=(serveur distant) observe.storage.showMigrationProgression=Afficher la progression lors des mises à jour observe.storage.showMigrationSql=Afficher les requêtes sql lors des mises à jour observe.storage.step.backup=Sauvegarde -- 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