| ... |
... |
@@ -31,31 +31,20 @@ import fr.ird.observe.application.swing.ui.admin.AdminTabUI; |
|
31
|
31
|
import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler;
|
|
32
|
32
|
import fr.ird.observe.application.swing.ui.admin.AdminUI;
|
|
33
|
33
|
import fr.ird.observe.application.swing.ui.admin.config.ConfigUI;
|
|
34
|
|
-import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.CopyToLeftDataSynchronizeTask;
|
|
35
|
|
-import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.CopyToRightDataSynchronizeTask;
|
|
36
|
|
-import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DataSynchronizeTaskSupport;
|
|
37
|
|
-import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DeleteFromLeftDataSynchronizeTask;
|
|
38
|
|
-import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DeleteFromRightDataSynchronizeTask;
|
|
|
34
|
+import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.*;
|
|
39
|
35
|
import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel;
|
|
40
|
36
|
import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper;
|
|
41
|
|
-import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG;
|
|
42
|
37
|
import fr.ird.observe.services.dto.DataReference;
|
|
43
|
38
|
import fr.ird.observe.services.dto.referential.ProgramDto;
|
|
44
|
39
|
import fr.ird.observe.services.dto.referential.ReferentialReference;
|
|
45
|
|
-import fr.ird.observe.services.service.trip.DeleteTripRequest;
|
|
46
|
|
-import fr.ird.observe.services.service.trip.DeleteTripResult;
|
|
47
|
|
-import fr.ird.observe.services.service.trip.ExportTripRequest;
|
|
48
|
|
-import fr.ird.observe.services.service.trip.ExportTripResult;
|
|
49
|
|
-import fr.ird.observe.services.service.trip.ImportTripRequest;
|
|
50
|
|
-import fr.ird.observe.services.service.trip.ImportTripResult;
|
|
51
|
|
-import fr.ird.observe.services.service.trip.TripManagementService;
|
|
|
40
|
+import fr.ird.observe.services.service.trip.*;
|
|
52
|
41
|
import jaxx.runtime.swing.wizard.ext.WizardState;
|
|
53
|
42
|
import org.apache.commons.logging.Log;
|
|
54
|
43
|
import org.apache.commons.logging.LogFactory;
|
|
55
|
44
|
|
|
56
|
|
-import javax.swing.DefaultListModel;
|
|
|
45
|
+import javax.swing.*;
|
|
57
|
46
|
import javax.swing.border.TitledBorder;
|
|
58
|
|
-import java.awt.Color;
|
|
|
47
|
+import java.awt.*;
|
|
59
|
48
|
import java.util.List;
|
|
60
|
49
|
import java.util.Map;
|
|
61
|
50
|
|
| ... |
... |
@@ -268,10 +257,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler { |
|
268
|
257
|
private WizardState doExecuteAction0() {
|
|
269
|
258
|
|
|
270
|
259
|
ObserveSwingDataSource leftSource = getStepModel().getLeftSource();
|
|
271
|
|
- boolean leftSourceIsPG = leftSource.getConfiguration() instanceof ObserveDataSourceConfigurationTopiaPG;
|
|
272
|
|
-
|
|
273
|
260
|
ObserveSwingDataSource rightSource = getStepModel().getRightSource();
|
|
274
|
|
- boolean rightSourceIsPG = rightSource.getConfiguration() instanceof ObserveDataSourceConfigurationTopiaPG;
|
|
275
|
261
|
|
|
276
|
262
|
DefaultListModel<DataSynchronizeTaskSupport> tasks = getStepModel().getTasks();
|
|
277
|
263
|
int size = tasks.size();
|
| ... |
... |
@@ -328,7 +314,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler { |
|
328
|
314
|
|
|
329
|
315
|
sendMessage(t("observe.actions.synchro.data.prepare.copyToLeftTask", programStr, tripStr));
|
|
330
|
316
|
|
|
331
|
|
- ExportTripRequest exportTripRequest = new ExportTripRequest(rightSourceIsPG, programId, tripId);
|
|
|
317
|
+ ExportTripRequest exportTripRequest = new ExportTripRequest(!leftSource.isLocal(), programId, tripId);
|
|
332
|
318
|
ExportTripResult exportTripResult = rightTripManagementService.exportTrip(exportTripRequest);
|
|
333
|
319
|
logExportResult(n("observe.actions.synchro.data.result.export.right.trip"),
|
|
334
|
320
|
exportTripResult,
|
| ... |
... |
@@ -352,7 +338,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler { |
|
352
|
338
|
|
|
353
|
339
|
sendMessage(t("observe.actions.synchro.data.prepare.copyToRightTask", programStr, tripStr));
|
|
354
|
340
|
|
|
355
|
|
- ExportTripRequest exportTripRequest = new ExportTripRequest(leftSourceIsPG, programId, tripId);
|
|
|
341
|
+ ExportTripRequest exportTripRequest = new ExportTripRequest(!rightSource.isLocal(), programId, tripId);
|
|
356
|
342
|
ExportTripResult exportTripResult = leftTripManagementService.exportTrip(exportTripRequest);
|
|
357
|
343
|
logExportResult(n("observe.actions.synchro.data.result.export.left.trip"),
|
|
358
|
344
|
exportTripResult,
|