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 cc1674d78f5099312e63a2bf9d0e3bd78b512fa7 Author: Tony CHEMIT <dev@tchemit.fr> Date: Fri Jan 6 14:02:16 2017 +0100 Ajout d'une information visuelle sur les écrans de gestion avancée du référentiel et des données (Fixes #8920) --- .../synchronize/data/DataSynchroUIHandler.java | 8 ++++---- .../ng/ReferentialSynchroUIHandler.java | 4 ++-- .../swing/ui/storage/StorageUIModel.java | 24 +++++++++++++++++----- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java index b9e41a4..431b4a0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java @@ -216,11 +216,11 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple ObserveSwingDataSource rightSource = configModel.getSafeCentralSource(true); stepModel.setRightSource(rightSource); - tabUI.getLeftTreePane().setBorder(new TitledBorder(configModel.getLocalSourceModel().getLabel())); +// tabUI.getLeftTreePane().setBorder(new TitledBorder(configModel.getLocalSourceModel().getLabel())); stepModel.populateLeftSelectionModel(); sendMessage(t("observe.actions.synchro.referential.message.data.leftData.loaded")); - TitledBorder leftBorder = new TitledBorder(configModel.getLocalSourceModel().getLabel()); + TitledBorder leftBorder = new TitledBorder(configModel.getLocalSourceModel().getLabelWithUrl()); boolean leftCanWriteData = configModel.getLocalSourceModel().getDataSourceInformation().canWriteData(); leftBorder.setTitleColor(leftCanWriteData ? Color.GREEN : Color.RED); tabUI.getLeftTreePane().setBorder(leftBorder); @@ -230,11 +230,11 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple } configUI.getLocalSourceConfig().setBorder(leftBorder); - tabUI.getRightTreePane().setBorder(new TitledBorder(configModel.getCentralSourceModel().getLabel())); +// tabUI.getRightTreePane().setBorder(new TitledBorder(configModel.getCentralSourceModel().getLabel())); stepModel.populateRightSelectionModel(); sendMessage(t("observe.actions.synchro.referential.message.data.rightData.loaded")); - TitledBorder rightBorder = new TitledBorder(configModel.getCentralSourceModel().getLabel()); + TitledBorder rightBorder = new TitledBorder(configModel.getCentralSourceModel().getLabelWithUrl()); boolean rightCanWriteData = configModel.getCentralSourceModel().getDataSourceInformation().canWriteData(); rightBorder.setTitleColor(rightCanWriteData ? Color.GREEN : Color.RED); tabUI.getRightTreePane().setBorder(rightBorder); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java index 3f7a5a8..4eeb876 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java @@ -122,13 +122,13 @@ public class ReferentialSynchroUIHandler extends AdminTabUIHandler<ReferentialSy initTree(ui.getLeftTree(), ui.getLeftTreePane(), stepModel.getLeftTreeModel(), - getModel().getConfigModel().getLocalSourceModel().getLabel(), + getModel().getConfigModel().getLocalSourceModel().getLabelWithUrl(), t("observe.actions.synchro.referential.message.referential.leftData.loaded")); initTree(ui.getRightTree(), ui.getRightTreePane(), stepModel.getRightTreeModel(), - getModel().getConfigModel().getCentralSourceModel().getLabel(), + getModel().getConfigModel().getCentralSourceModel().getLabelWithUrl(), t("observe.actions.synchro.referential.message.referential.rightData.loaded")); return WizardState.NEED_FIX; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java index fbc5fe3..d18dcd0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java @@ -55,14 +55,14 @@ import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.service.PingService; import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; import fr.ird.observe.services.service.sql.SqlScriptProducerService; -import org.nuiton.jaxx.runtime.JAXXContext; -import org.nuiton.jaxx.runtime.swing.wizard.WizardModel; -import org.nuiton.jaxx.runtime.swing.wizard.WizardUILancher; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.runtime.JAXXContext; +import org.nuiton.jaxx.runtime.swing.wizard.WizardModel; +import org.nuiton.jaxx.runtime.swing.wizard.WizardUILancher; import org.nuiton.version.Version; import java.beans.PropertyChangeListener; @@ -1091,7 +1091,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { public String getLabel() { String txt; - if (dbMode == DbMode.CREATE_LOCAL) { + if (DbMode.CREATE_LOCAL == dbMode) { txt = h2Config.getLabel(); } else { if (isRemote()) { @@ -1103,6 +1103,20 @@ public class StorageUIModel extends WizardModel<StorageStep> { return txt; } + public String getLabelWithUrl() { + String txt; + if (DbMode.USE_LOCAL == dbMode) { + txt = h2Config.getDatabaseFile().getAbsolutePath(); + } else { + if (isRemote()) { + txt = pgConfig.getJdbcUrl(); + } else { + txt = restConfig.getServerUrl().toString(); + } + } + return String.format("%s (%s)", getLabel(), txt); + } + public boolean isLocalStorageExist() { return localStorageExist; } @@ -1738,7 +1752,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { } catch (Throwable e) { if (e instanceof UndeclaredThrowableException) { - e = ((UndeclaredThrowableException)e).getUndeclaredThrowable(); + e = ((UndeclaredThrowableException) e).getUndeclaredThrowable(); } connexionStatusError = e.getMessage(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.