This is an automated email from the git hooks/post-receive script. New commit to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit c8d1bc1c97b95f59ca407d9bfec600a7ccd582d4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 14 11:34:06 2016 +0100 Mauvais chargement de l'action de synchro référentiel dans certains cas (fixes #8874) --- .../swing/ui/admin/config/ConfigUIHandler.java | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUIHandler.java index 3226ee2..d907a07 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUIHandler.java @@ -23,16 +23,15 @@ package fr.ird.observe.application.swing.ui.admin.config; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ObserveTextGenerator; -import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminTabUI; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; import fr.ird.observe.application.swing.ui.admin.AdminUI; import fr.ird.observe.application.swing.ui.storage.StorageStep; -import fr.ird.observe.application.swing.ui.storage.StorageUIHandler; import fr.ird.observe.application.swing.ui.storage.StorageUILauncher; import fr.ird.observe.application.swing.ui.storage.StorageUIModel; +import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -105,9 +104,7 @@ public class ConfigUIHandler extends AdminTabUIHandler { } } - public String updateStorageLabel(StorageUIModel service, - boolean serviceValid, - JLabel label) { + public String updateStorageLabel(StorageUIModel service, boolean serviceValid, JLabel label) { String text; if (serviceValid) { @@ -125,16 +122,11 @@ public class ConfigUIHandler extends AdminTabUIHandler { return AdminStep.valueOf(checkBox.getName()); } - public boolean isOperationSelected(Set<AdminStep> operations, - JCheckBox checkBox) { + public boolean isOperationSelected(Set<AdminStep> operations, JCheckBox checkBox) { AdminStep scope = getOperation(checkBox); return operations.contains(scope); } - public StorageUIHandler getStorageHandler() { - return ui.getContextValue(StorageUIHandler.class); - } - public void obtainIncomingConnexion() { StorageUIModel sourceModel = ui.getLocalSourceModel(); StorageUILauncher.obtainConnexion(ui, ui.getParentContainer(Window.class), sourceModel); @@ -162,7 +154,7 @@ public class ConfigUIHandler extends AdminTabUIHandler { if (valid) { ObserveDataSourceInformation dataSourceInformation = sourceModel.getDataSourceInformation(); - if (dataSourceInformation != null) { + if (dataSourceInformation != null && dataSourceInformation.getVersion() != null) { ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); ObserveTextGenerator textGenerator = applicationContext.getTextGenerator(); @@ -178,9 +170,4 @@ public class ConfigUIHandler extends AdminTabUIHandler { return text; } - protected boolean canShowLocalStorage(Set<AdminStep> operations, - boolean needLocalStorage) { - return !operations.isEmpty() && needLocalStorage; - } - } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.