branch develop updated (2012cc8 -> 1e10c04)
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 2012cc8 La connexion serveur HTTPS ne fonctionne pas (Fixes #8914) new cc1674d Ajout d'une information visuelle sur les écrans de gestion avancée du référentiel et des données (Fixes #8920) new 1e10c04 revue des raccourcis claviers pour le lancement des opérations The 2 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 1e10c0468955e67f72740506b4663b4fed70e19f Author: Tony CHEMIT <dev@tchemit.fr> Date: Fri Jan 6 14:02:34 2017 +0100 revue des raccourcis claviers pour le lancement des opérations 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) Summary of changes: .../menu/action/LaunchAdminActionSupport.java | 4 ++-- .../menu/action/LaunchConsolidateAction.java | 2 +- .../menu/action/LaunchDataSynchronizeAction.java | 2 +- .../menu/action/LaunchExportDataAction.java | 2 +- .../action/LaunchReferentialSynchronizeAction.java | 2 +- .../ui/actions/menu/action/LaunchReportAction.java | 2 +- .../menu/action/LaunchSynchronizeAction.java | 2 +- .../actions/menu/action/LaunchValidateAction.java | 2 +- .../synchronize/data/DataSynchroUIHandler.java | 8 ++++---- .../ng/ReferentialSynchroUIHandler.java | 4 ++-- .../swing/ui/storage/StorageUIModel.java | 24 +++++++++++++++++----- 11 files changed, 34 insertions(+), 20 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 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>.
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 1e10c0468955e67f72740506b4663b4fed70e19f Author: Tony CHEMIT <dev@tchemit.fr> Date: Fri Jan 6 14:02:34 2017 +0100 revue des raccourcis claviers pour le lancement des opérations --- .../swing/ui/actions/menu/action/LaunchAdminActionSupport.java | 4 ++-- .../swing/ui/actions/menu/action/LaunchConsolidateAction.java | 2 +- .../swing/ui/actions/menu/action/LaunchDataSynchronizeAction.java | 2 +- .../swing/ui/actions/menu/action/LaunchExportDataAction.java | 2 +- .../ui/actions/menu/action/LaunchReferentialSynchronizeAction.java | 2 +- .../application/swing/ui/actions/menu/action/LaunchReportAction.java | 2 +- .../swing/ui/actions/menu/action/LaunchSynchronizeAction.java | 2 +- .../swing/ui/actions/menu/action/LaunchValidateAction.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchAdminActionSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchAdminActionSupport.java index f6cb579..6c016db 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchAdminActionSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchAdminActionSupport.java @@ -50,11 +50,11 @@ public abstract class LaunchAdminActionSupport extends AbstractUIAction { private final AdminStep action; - public LaunchAdminActionSupport(ObserveMainUI ui, String actionName, AdminStep action) { + public LaunchAdminActionSupport(ObserveMainUI ui, String actionName, AdminStep action, char mnemonic) { super(ui, actionName, t(action.getOperationLabel()), t(action.getOperationDescription()), action.getIconName(), null); this.action = action; - putValue(MNEMONIC_KEY, (int) t(action.getOperationLabel()).charAt(0)); + putValue(MNEMONIC_KEY, (int) mnemonic); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchConsolidateAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchConsolidateAction.java index 6f46696..1343bb5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchConsolidateAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchConsolidateAction.java @@ -36,7 +36,7 @@ public class LaunchConsolidateAction extends LaunchAdminActionSupport { public static final String ACTION_NAME = LaunchConsolidateAction.class.getSimpleName(); public LaunchConsolidateAction(ObserveMainUI ui) { - super(ui, ACTION_NAME, AdminStep.CONSOLIDATE); + super(ui, ACTION_NAME, AdminStep.CONSOLIDATE, 'C'); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchDataSynchronizeAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchDataSynchronizeAction.java index 5519f28..004e9c8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchDataSynchronizeAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchDataSynchronizeAction.java @@ -36,7 +36,7 @@ public class LaunchDataSynchronizeAction extends LaunchAdminActionSupport { public static final String ACTION_NAME = LaunchDataSynchronizeAction.class.getSimpleName(); public LaunchDataSynchronizeAction(ObserveMainUI ui) { - super(ui, ACTION_NAME, AdminStep.DATA_SYNCHRONIZE); + super(ui, ACTION_NAME, AdminStep.DATA_SYNCHRONIZE, 'G'); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchExportDataAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchExportDataAction.java index 53f4c80..5984b19 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchExportDataAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchExportDataAction.java @@ -36,7 +36,7 @@ public class LaunchExportDataAction extends LaunchAdminActionSupport { public static final String ACTION_NAME = LaunchExportDataAction.class.getSimpleName(); public LaunchExportDataAction(ObserveMainUI ui) { - super(ui, ACTION_NAME, AdminStep.EXPORT_DATA); + super(ui, ACTION_NAME, AdminStep.EXPORT_DATA, 'E'); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReferentialSynchronizeAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReferentialSynchronizeAction.java index 41cc3ee..24c8370 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReferentialSynchronizeAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReferentialSynchronizeAction.java @@ -36,7 +36,7 @@ public class LaunchReferentialSynchronizeAction extends LaunchAdminActionSupport public static final String ACTION_NAME = LaunchReferentialSynchronizeAction.class.getSimpleName(); public LaunchReferentialSynchronizeAction(ObserveMainUI ui) { - super(ui, ACTION_NAME, AdminStep.REFERENTIAL_SYNCHRONIZE); + super(ui, ACTION_NAME, AdminStep.REFERENTIAL_SYNCHRONIZE,'R'); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReportAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReportAction.java index 6473987..28a3736 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReportAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReportAction.java @@ -36,7 +36,7 @@ public class LaunchReportAction extends LaunchAdminActionSupport { public static final String ACTION_NAME = LaunchReportAction.class.getSimpleName(); public LaunchReportAction(ObserveMainUI ui) { - super(ui, ACTION_NAME, AdminStep.REPORT); + super(ui, ACTION_NAME, AdminStep.REPORT, 'S'); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchSynchronizeAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchSynchronizeAction.java index b2e94d9..51f3042 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchSynchronizeAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchSynchronizeAction.java @@ -36,7 +36,7 @@ public class LaunchSynchronizeAction extends LaunchAdminActionSupport { public static final String ACTION_NAME = LaunchSynchronizeAction.class.getSimpleName(); public LaunchSynchronizeAction(ObserveMainUI ui) { - super(ui, ACTION_NAME, AdminStep.SYNCHRONIZE); + super(ui, ACTION_NAME, AdminStep.SYNCHRONIZE, 'M'); } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchValidateAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchValidateAction.java index d6a837e..f3606be 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchValidateAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchValidateAction.java @@ -36,7 +36,7 @@ public class LaunchValidateAction extends LaunchAdminActionSupport { public static final String ACTION_NAME = LaunchValidateAction.class.getSimpleName(); public LaunchValidateAction(ObserveMainUI ui) { - super(ui, ACTION_NAME, AdminStep.VALIDATE); + super(ui, ACTION_NAME, AdminStep.VALIDATE, 'V'); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm