GitLab

at 2017-03-22T08:02:38+01:00

[jgitflow-maven-plugin]updating poms for 5.3.7-SNAPSHOT development
[jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts
[jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x'
[jgitflow-maven-plugin]Updating develop poms back to pre merge state
Correction de la génération des script d'import entre deux bases distantes (see #758)

[jgitflow-maven-plugin]updating poms for branch'release/5.3.7' with non-snapshot versions
[jgitflow-maven-plugin]merging 'release/5.3.7' into 'master-5.x'
   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.3.6</version>

+    <version>5.3.7</version>

   </parent>

 

   <artifactId>application-swing-configuration</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.3.6</version>

+    <version>5.3.7</version>

   </parent>

 

   <artifactId>application-swing-decoration</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.3.6</version>

+    <version>5.3.7</version>

   </parent>

 

   <artifactId>application-swing-validation</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.3.6</version>

+    <version>5.3.7</version>

   </parent>

 

   <artifactId>application-swing-validators</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.3.6</version>

+    <version>5.3.7</version>

   </parent>

 

   <artifactId>application-swing</artifactId>

 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;

 

     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();

 

                 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,

 

                 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,

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.3.6</version>

+    <version>5.3.7</version>

   </parent>

 

   <artifactId>application-web-configuration</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.3.6</version>

+    <version>5.3.7</version>

   </parent>

 

   <artifactId>application-web</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.3.6</version>

+    <version>5.3.7</version>

   </parent>

 

   <artifactId>entities-migration</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.3.6</version>

+    <version>5.3.7</version>

   </parent>

 

   <artifactId>entities</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.3.6</version>

+    <version>5.3.7</version>

   </parent>

 

   <artifactId>observe</artifactId>

 

   <groupId>fr.ird.observe</groupId>

   <artifactId>pom</artifactId>

-  <version>5.3.6</version>

+  <version>5.3.7</version>

   <packaging>pom</packaging>

 

   <name>ObServe</name>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.3.6</version>

+    <version>5.3.7</version>

   </parent>

 

   <artifactId>services-configuration-rest</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.3.6</version>

+    <version>5.3.7</version>

   </parent>

 

   <artifactId>services-configuration-topia</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.3.6</version>

+    <version>5.3.7</version>

   </parent>

 

   <artifactId>services-configuration</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.3.6</version>

+    <version>5.3.7</version>

   </parent>

 

   <artifactId>services-dto</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.3.6</version>

+    <version>5.3.7</version>

   </parent>

 

   <artifactId>services-rest</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.3.6</version>

+    <version>5.3.7</version>

   </parent>

 

   <artifactId>services-runner</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.3.6</version>

+    <version>5.3.7</version>

   </parent>

 

   <artifactId>services-topia-validation</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.3.6</version>

+    <version>5.3.7</version>

   </parent>

 

   <artifactId>services-topia-validators</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.3.6</version>

+    <version>5.3.7</version>

   </parent>

 

   <artifactId>services-topia</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.3.6</version>

+    <version>5.3.7</version>

   </parent>

 

   <artifactId>services</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.3.6</version>

+    <version>5.3.7</version>

   </parent>

 

   <artifactId>test</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.3.6</version>

+    <version>5.3.7</version>

   </parent>

 

   <artifactId>toolbox-maven-plugin</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.3.6</version>

+    <version>5.3.7</version>

   </parent>

 

   <artifactId>topia-extension</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.3.6</version>

+    <version>5.3.7</version>

   </parent>

 

   <artifactId>topia-templates-extension</artifactId>

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

Commits:

26 changed files:

Changes: