| ... |
... |
@@ -251,10 +251,8 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple |
|
251
|
251
|
private WizardState doExecuteAction0() {
|
|
252
|
252
|
|
|
253
|
253
|
ObserveSwingDataSource leftSource = getStepModel().getLeftSource();
|
|
254
|
|
- boolean leftSourceIsPG = leftSource.getConfiguration() instanceof ObserveDataSourceConfigurationTopiaPG;
|
|
255
|
254
|
|
|
256
|
255
|
ObserveSwingDataSource rightSource = getStepModel().getRightSource();
|
|
257
|
|
- boolean rightSourceIsPG = rightSource.getConfiguration() instanceof ObserveDataSourceConfigurationTopiaPG;
|
|
258
|
256
|
|
|
259
|
257
|
DefaultListModel<DataSynchronizeTaskSupport> tasks = getStepModel().getTasks();
|
|
260
|
258
|
int size = tasks.size();
|
| ... |
... |
@@ -324,7 +322,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple |
|
324
|
322
|
|
|
325
|
323
|
sendMessage(t("observe.actions.synchro.data.prepare.copyToLeftTask", programStr, tripStr));
|
|
326
|
324
|
|
|
327
|
|
- ExportTripRequest exportTripRequest = new ExportTripRequest(rightSourceIsPG, programId, tripId);
|
|
|
325
|
+ ExportTripRequest exportTripRequest = new ExportTripRequest(!leftSource.isLocal(), programId, tripId);
|
|
328
|
326
|
ExportTripResult exportTripResult = rightTripManagementService.exportTrip(exportTripRequest);
|
|
329
|
327
|
logExportResult(n("observe.actions.synchro.data.result.export.right.trip"),
|
|
330
|
328
|
exportTripResult,
|
| ... |
... |
@@ -349,7 +347,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple |
|
349
|
347
|
|
|
350
|
348
|
sendMessage(t("observe.actions.synchro.data.prepare.copyToRightTask", programStr, tripStr));
|
|
351
|
349
|
|
|
352
|
|
- ExportTripRequest exportTripRequest = new ExportTripRequest(leftSourceIsPG, programId, tripId);
|
|
|
350
|
+ ExportTripRequest exportTripRequest = new ExportTripRequest(!rightSource.isLocal(), programId, tripId);
|
|
353
|
351
|
ExportTripResult exportTripResult = leftTripManagementService.exportTrip(exportTripRequest);
|
|
354
|
352
|
logExportResult(n("observe.actions.synchro.data.result.export.left.trip"),
|
|
355
|
353
|
exportTripResult,
|