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 5ffa8ba22e2d3bc0a7f560ab955dea9bf487bbf1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 15 18:35:47 2016 +0100 fix cherry-pick --- .../ird/observe/application/swing/ui/admin/AdminUILauncher.java | 8 +++----- .../swing/ui/admin/synchronize/data/DataSynchroModel.java | 5 ++++- .../admin/synchronize/referential/ng/ReferentialSynchroModel.java | 5 +++++ .../nuiton/topia/service/sql/batch/actions/DropSchemaAction.java | 2 ++ 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUILauncher.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUILauncher.java index a8293b4..1d56234 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUILauncher.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUILauncher.java @@ -217,8 +217,6 @@ public class AdminUILauncher extends WizardUILancher<AdminStep, AdminUIModel, Ad log.info(this + ", was canceled ? " + wasCanceled); } - ObserveMainUI mainUI = null; - AdminUIModel model = ui.getModel(); ConfigModel.doCloseSource(model.getConfigModel().getCentralSource()); @@ -241,14 +239,14 @@ public class AdminUILauncher extends WizardUILancher<AdminStep, AdminUIModel, Ad return; } - ObserveMainUI mainUI = (ObserveMainUI) parent; + ObserveMainUI mainUI = ObserveSwingApplicationContext.get().getMainUI(); mainUI.getSynchroWizard().remove(ui); mainUI.removeContextValue(model.getClass()); System.runFinalization(); System.gc(); - ObserveSwingDataSource source = model.getPreviousSource(); + ObserveSwingDataSource source = model.getConfigModel().getPreviousSource(); if (source == null) { @@ -271,7 +269,7 @@ public class AdminUILauncher extends WizardUILancher<AdminStep, AdminUIModel, Ad // on a pas reussit a reouvrir la base precedente UIHelper.handlingError("Could not close", e); - mainUI.setMode(ObserveUIMode.NO_DB); + mainUI.getModel().setMode(ObserveUIMode.NO_DB); } } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroModel.java index 05bd5c2..fd607f2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroModel.java @@ -25,12 +25,15 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.data; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.ui.admin.AdminActionModel; import fr.ird.observe.application.swing.ui.admin.AdminStep; +import fr.ird.observe.application.swing.ui.admin.AdminUI; +import fr.ird.observe.application.swing.ui.admin.config.ConfigUI; import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DataSynchronizeTaskSupport; -import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel; +import fr.ird.observe.application.swing.ui.tree.selection.SelectionTreeModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import javax.swing.DefaultListModel; +import javax.swing.border.TitledBorder; /** * Created on 02/08/16. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java index d7bee06..102f62d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java @@ -39,6 +39,8 @@ import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffsEngine; import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeService; import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceEngine; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.beans.PropertyChangeListener; import java.util.ArrayList; @@ -54,6 +56,9 @@ import static org.nuiton.i18n.I18n.t; */ public class ReferentialSynchroModel extends AdminActionModel { + /** Logger */ + private static final Log log = LogFactory.getLog(ReferentialSynchroModel.class); + public static final String LEFT_SOURCE_PROPERTY_NAME = "leftSource"; public static final String RIGHT_SOURCE_PROPERTY_NAME = "rightSource"; public static final String TASKS_PROPERTY_NAME = "tasks"; diff --git a/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/DropSchemaAction.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/DropSchemaAction.java index 0ee1dbb..af817f4 100644 --- a/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/DropSchemaAction.java +++ b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/DropSchemaAction.java @@ -22,6 +22,8 @@ package org.nuiton.topia.service.sql.batch.actions; * #L% */ +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.hibernate.HibernateException; import org.hibernate.dialect.Dialect; import org.hibernate.tool.hbm2ddl.SchemaExport; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.