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