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