branch develop updated (60bce99 -> 7bd7052)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 60bce99 réajout de l'opération de synchronisation de référentiel avant export new 3f80809 Permettre de choisir une base locale pour la base de gauche dans la synchro ref et données new 3d6cc52 fix possible memory leak new e49194e Amélioration des labels de sources à choisir new 7bd7052 renomage syncho simple + regroupement des actions de synchronisation The 4 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 7bd705256bd3b980cf056a0048eb4ad7665c60ad Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 22 10:30:32 2016 +0200 renomage syncho simple + regroupement des actions de synchronisation commit e49194e809c721cb074ea484ce9895e7af2c4e10 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 22 10:21:11 2016 +0200 Amélioration des labels de sources à choisir commit 3d6cc52b074d91fac2c4c68ebcd696837311cb4e Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 22 10:14:34 2016 +0200 fix possible memory leak commit 3f8080989c73a09331ebe9b6680c8b5b11f820cf Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 22 10:12:44 2016 +0200 Permettre de choisir une base locale pour la base de gauche dans la synchro ref et données Summary of changes: .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 5 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 55 +++++++++++++--------- .../observe-application-swing_fr_FR.properties | 6 +-- 3 files changed, 39 insertions(+), 27 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 3f8080989c73a09331ebe9b6680c8b5b11f820cf Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 22 10:12:44 2016 +0200 Permettre de choisir une base locale pour la base de gauche dans la synchro ref et données --- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 29 ++++++++++++++++------ 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java index 96a70f6..fdda863 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java @@ -677,7 +677,8 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { // par default, on tente d'utiliser la base distance centralSourceModel.init(ui, null); centralSourceModel.setCanCreateLocalService(false); - centralSourceModel.setCanUseLocalService(false); + boolean canUseLocalSource = getOperations().contains(AdminStep.DATA_SYNCHRONIZE) || getOperations().contains(AdminStep.REFERENTIAL_SYNCHRONIZE); + centralSourceModel.setCanUseLocalService(canUseLocalSource); centralSourceModel.setCanUseRemoteService(true); centralSourceModel.setCanUseServerService(true); centralSourceModel.start(DbMode.USE_REMOTE); @@ -1121,9 +1122,16 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { // les deux bases (source et referentiel) doivent etre different DbMode dbMode = localSourceModel.getDbMode(); if (dbMode == centralSourceModel.getDbMode()) { - if (dbMode == DbMode.USE_REMOTE) { - //FIXME - validate = !localSourceModel.getPgConfig().getJdbcUrl().equals(centralSourceModel.getPgConfig().getJdbcUrl()); + switch (dbMode) { + case USE_LOCAL: + validate = false; + break; + case USE_REMOTE: + validate = !localSourceModel.getPgConfig().getJdbcUrl().equals(centralSourceModel.getPgConfig().getJdbcUrl()); + break; + case USE_SERVER: + validate = !localSourceModel.getRestConfig().getServerUrl().equals(centralSourceModel.getRestConfig().getServerUrl()); + break; } } @@ -1154,9 +1162,16 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { // les deux bases (source et referentiel) doivent etre different DbMode dbMode = localSourceModel.getDbMode(); if (dbMode == centralSourceModel.getDbMode()) { - if (dbMode == DbMode.USE_REMOTE) { - //FIXME - validate = !localSourceModel.getPgConfig().getJdbcUrl().equals(centralSourceModel.getPgConfig().getJdbcUrl()); + switch (dbMode) { + case USE_LOCAL: + validate = false; + break; + case USE_REMOTE: + validate = !localSourceModel.getPgConfig().getJdbcUrl().equals(centralSourceModel.getPgConfig().getJdbcUrl()); + break; + case USE_SERVER: + validate = !localSourceModel.getRestConfig().getServerUrl().equals(centralSourceModel.getRestConfig().getServerUrl()); + break; } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 3d6cc52b074d91fac2c4c68ebcd696837311cb4e Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 22 10:14:34 2016 +0200 fix possible memory leak --- .../src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java index fdda863..62c33b0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java @@ -794,15 +794,8 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { localSourceModel.start(dbMode); if (log.isDebugEnabled()) { - localSourceModel.addPropertyChangeListener(evt -> { - String name = evt.getPropertyName(); - Object oldValue = evt.getOldValue(); - Object newValue = evt.getNewValue(); - if (log.isDebugEnabled()) { - log.debug(evt.getSource() + " - Property [" + name + "] has changed from " + oldValue + " to " + newValue); - } - - }); + localSourceModel.removePropertyChangeListener(LOG_PROPERTY_CHANGE_LISTENER); + localSourceModel.addPropertyChangeListener(LOG_PROPERTY_CHANGE_LISTENER); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 e49194e809c721cb074ea484ce9895e7af2c4e10 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 22 10:21:11 2016 +0200 Amélioration des labels de sources à choisir --- .../main/java/fr/ird/observe/ui/admin/AdminUIModel.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java index 62c33b0..09d428d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java @@ -171,7 +171,7 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { @Override public String getLabel() { String txt; - if (containsOperation(AdminStep.REFERENTIAL_SYNCHRONIZE)) { + if (containsOperation(AdminStep.REFERENTIAL_SYNCHRONIZE) || containsOperation(AdminStep.DATA_SYNCHRONIZE)) { txt = n("observe.storage.label.synchro.leftSource"); } else { txt = n("observe.storage.label.synchro.incoming"); @@ -204,16 +204,19 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { @Override public String getLabel() { String txt; - String params; - if (containsOperation(AdminStep.REFERENTIAL_SYNCHRONIZE)) { + if (containsOperation(AdminStep.REFERENTIAL_SYNCHRONIZE) || containsOperation(AdminStep.DATA_SYNCHRONIZE)) { txt = n("observe.storage.label.synchro.rightSource"); } else { txt = n("observe.storage.label.synchro.referentiel"); } - if (getDbMode() == DbMode.CREATE_LOCAL) { - params = getH2Config().getDirectory().getAbsolutePath(); + String params; + + if (getDbMode() == DbMode.USE_SERVER) { + params = t("observe.storage.server.db") + " " + getRemoteUrl(); + } else if (getDbMode() == DbMode.USE_REMOTE) { + params = t("observe.storage.remote.db") + " " + getRemoteUrl(); } else { - params = getRemoteUrl(); + params = t("observe.storage.locale.db") + " " + getH2Config().getDirectory().getAbsolutePath(); } txt = t(txt, params); return txt; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 7bd705256bd3b980cf056a0048eb4ad7665c60ad Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 22 10:30:32 2016 +0200 renomage syncho simple + regroupement des actions de synchronisation --- .../src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 5 +++-- .../main/resources/i18n/observe-application-swing_fr_FR.properties | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx index 0b1ef76..4aad01d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx @@ -169,12 +169,13 @@ void $afterCompleteSetup() { <JMenu id='menuActions'> <JMenuItem id='menuActionsSynchronize'/> + <JMenuItem id='menuActionsReferentialSynchro'/> + <JMenuItem id='menuActionsDataSynchro'/> + <JSeparator/> <JMenuItem id='menuActionsValidateData'/> <JMenuItem id='menuActionsExportData'/> <JMenuItem id='menuActionsReport'/> <JMenuItem id='menuActionsConsolidate'/> - <JMenuItem id='menuActionsDataSynchro'/> - <JMenuItem id='menuActionsReferentialSynchro'/> </JMenu> <JMenu id='menuNavigation'> 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 d16b15b..6d87c82 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 @@ -245,10 +245,10 @@ observe.actions.synchro.referential.action.skipFromRight.tip=Ne rien faire sur l observe.actions.synchro.referential.config.mode=Mode de synchronisation observe.actions.synchro.referential.description=Synchronisation avancée du référentiel observe.actions.synchro.referential.launch.operation=Calculer le différentiel des référentiels des sources de données -observe.actions.synchro.referential.legacy=Synchronisation du référentiel +observe.actions.synchro.referential.legacy=Synchronisation simplifiée du référentiel observe.actions.synchro.referential.legacy.description=Synchroniser le référentiel depuis la base centrale -observe.actions.synchro.referential.legacy.launch.operation= -observe.actions.synchro.referential.legacy.step=Synchronisation Référentiel +observe.actions.synchro.referential.legacy.launch.operation=Calculer le différentiel des référentiels des sources de données +observe.actions.synchro.referential.legacy.step=Synchronisation simplifiée du référentiel observe.actions.synchro.referential.legacy.step.description=Synchronizer le référentiel depuis la base centrale observe.actions.synchro.referential.legacy.tip=Opération de synchronisation du référentiel de la base locale observe.actions.synchro.referential.message.apply.done=Référentiel mise à jour le %1$td/%1$tm/%1$tY à %1$tH\:%1$tM\:%1$tS -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm