[Git][ultreiaio/ird-observe][develop-5.x] Correction de la génération des script d'import entre deux bases distantes (see #758)

29 Mar 2017

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe


Commits:
a628cf8b by Tony CHEMIT at 2017-03-29T16:38:17+02:00
Correction de la génération des script d'import entre deux bases distantes (see #758)

- - - - -


1 changed file:

- application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java


Changes:

=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java
=====================================

--- 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
@@ -31,31 +31,20 @@ 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.admin.config.ConfigUI;
-import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.CopyToLeftDataSynchronizeTask;
-import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.CopyToRightDataSynchronizeTask;
-import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DataSynchronizeTaskSupport;
-import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DeleteFromLeftDataSynchronizeTask;
-import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DeleteFromRightDataSynchronizeTask;
+import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.*;
 import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel;
 import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper;
-import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG;
 import fr.ird.observe.services.dto.DataReference;
 import fr.ird.observe.services.dto.referential.ProgramDto;
 import fr.ird.observe.services.dto.referential.ReferentialReference;
-import fr.ird.observe.services.service.trip.DeleteTripRequest;
-import fr.ird.observe.services.service.trip.DeleteTripResult;
-import fr.ird.observe.services.service.trip.ExportTripRequest;
-import fr.ird.observe.services.service.trip.ExportTripResult;
-import fr.ird.observe.services.service.trip.ImportTripRequest;
-import fr.ird.observe.services.service.trip.ImportTripResult;
-import fr.ird.observe.services.service.trip.TripManagementService;
+import fr.ird.observe.services.service.trip.*;
 import jaxx.runtime.swing.wizard.ext.WizardState;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import javax.swing.DefaultListModel;
+import javax.swing.*;
 import javax.swing.border.TitledBorder;
-import java.awt.Color;
+import java.awt.*;
 import java.util.List;
 import java.util.Map;
 
@@ -268,10 +257,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler {
     private WizardState doExecuteAction0() {
 
         ObserveSwingDataSource leftSource = getStepModel().getLeftSource();
-        boolean leftSourceIsPG = leftSource.getConfiguration() instanceof ObserveDataSourceConfigurationTopiaPG;
-
         ObserveSwingDataSource rightSource = getStepModel().getRightSource();
-        boolean rightSourceIsPG = rightSource.getConfiguration() instanceof ObserveDataSourceConfigurationTopiaPG;
 
         DefaultListModel<DataSynchronizeTaskSupport> tasks = getStepModel().getTasks();
         int size = tasks.size();
@@ -328,7 +314,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler {
 
                 sendMessage(t("observe.actions.synchro.data.prepare.copyToLeftTask", programStr, tripStr));
 
-                ExportTripRequest exportTripRequest = new ExportTripRequest(rightSourceIsPG, programId, tripId);
+                ExportTripRequest exportTripRequest = new ExportTripRequest(!leftSource.isLocal(), programId, tripId);
                 ExportTripResult exportTripResult = rightTripManagementService.exportTrip(exportTripRequest);
                 logExportResult(n("observe.actions.synchro.data.result.export.right.trip"),
                                 exportTripResult,
@@ -352,7 +338,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler {
 
                 sendMessage(t("observe.actions.synchro.data.prepare.copyToRightTask", programStr, tripStr));
 
-                ExportTripRequest exportTripRequest = new ExportTripRequest(leftSourceIsPG, programId, tripId);
+                ExportTripRequest exportTripRequest = new ExportTripRequest(!rightSource.isLocal(), programId, tripId);
                 ExportTripResult exportTripResult = leftTripManagementService.exportTrip(exportTripRequest);
                 logExportResult(n("observe.actions.synchro.data.result.export.left.trip"),
                                 exportTripResult,



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a628cf8bf66c59df0a72fe948132...

    

Tony CHEMIT

tags

participants (1)