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 b113a46efd0d83a05b30e2d286dfd06a5916bf3b Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 2 22:22:46 2016 +0200 Fix save local database in export operation if referential was modified --- .../swing/ui/admin/save/SaveLocalUIHandler.java | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java index 0d41885..a33b432 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java @@ -22,16 +22,14 @@ package fr.ird.observe.application.swing.ui.admin.save; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import fr.ird.observe.services.service.AddSqlScriptProducerRequest; -import fr.ird.observe.services.service.AddSqlScriptProducerResult; -import fr.ird.observe.services.service.SqlScriptProducerService; -import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeContext; -import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeEngine; 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.AdminTabUIHandler; import fr.ird.observe.application.swing.ui.admin.AdminUI; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.legacy.SynchronizeModel; +import fr.ird.observe.services.service.AddSqlScriptProducerRequest; +import fr.ird.observe.services.service.SqlScriptProducerService; +import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeContext; import jaxx.runtime.swing.wizard.ext.WizardState; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; @@ -54,9 +52,6 @@ public class SaveLocalUIHandler extends AdminTabUIHandler { /** Logger */ private static final Log log = LogFactory.getLog(SaveLocalUIHandler.class); - private static final String UPDATE_VERSION_PATTERN = - "UPDATE %1$s SET topiaversion = %2$d WHERE topiaid='%3$s';\n"; - protected ObserveSwingDataSource source; public SaveLocalUIHandler(SaveLocalUI ui) { @@ -176,16 +171,13 @@ public class SaveLocalUIHandler extends AdminTabUIHandler { return WizardState.SUCCESSED; } - public void saveUnidirectionalSynchronizeReferential() { + private void saveUnidirectionalSynchronizeReferential() { SynchronizeModel stepModel = getModel().getSynchronizeReferentielModel(); - UnidirectionalReferentialSynchronizeEngine engine = stepModel.getEngine(); - UnidirectionalReferentialSynchronizeContext referentialSynchronizeContext = stepModel.getReferentialSynchronizeContext(); - engine.finish(referentialSynchronizeContext); - + source.newUnidirectionalReferentialSynchronizeLocalService().applySqlRequests(referentialSynchronizeContext.getSqlRequests()); sendMessage(t("observe.actions.synchro.referential.message.apply.done", new Date())); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.