August 2016 - Observe-commits - mailman.cloud.codelutin.com

branch feature/7739_syncrho_ref_en_serveur_distant updated (c6e9e01 -> 1338aeb)
by codelutin.com scm Aug. 18, 2016

Aug. 18, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7739_syncrho_ref_en_serveur_distant in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git omits c6e9e01 Corrige les problèmes de sérialisation/deserialisation liés à la synchro referentiel en serveur distant adds f368cde Rendre la synchro de données utilisable en mode serveur adds 6bcb0c2 Merge branch 'feature/4304_synchro_marees' into develop adds 4994349 utilisation version stable de ToPIA new 1338aeb Corrige les problèmes de sérialisation/deserialisation liés à la synchro referentiel en serveur distant This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (c6e9e01) \ N -- N -- N refs/heads/feature/7739_syncrho_ref_en_serveur_distant (1338aeb) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 1338aeb185110981e252dedbea5c3c6ff16b5dda Author: Samuel Maisonneuve <maisonneuve(a)codelutin.com> Date: Thu Aug 18 16:37:45 2016 +0200 Corrige les problèmes de sérialisation/deserialisation liés à la synchro referentiel en serveur distant Introduit un objet ReferentialMultimap visant a transporter les objets ReferentialDto à travers les processus de sérialisation/deserialisation tout en conservant l'information du type concret refs #7739 Summary of changes: .../synchronize/data/DataSynchroUIHandler.java | 12 +++--- .../data/DataSynchronizeServiceController.java | 12 +++--- .../synchro/data/DataSynchronizeService.java | 14 +++---- .../data/task/DataSynchronizeTaskSupport.java | 11 ------ .../synchro/data/DataSynchronizeServiceTopia.java | 44 ++++++++++------------ pom.xml | 2 +- 6 files changed, 39 insertions(+), 56 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7739_syncrho_ref_en_serveur_distant updated (a15ba5a -> c6e9e01)
by codelutin.com scm Aug. 18, 2016

Aug. 18, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7739_syncrho_ref_en_serveur_distant in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from a15ba5a Merge branch 'feature/7739_synchro_referential' into develop new c6e9e01 Corrige les problèmes de sérialisation/deserialisation liés à la synchro referentiel en serveur distant The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c6e9e0123336894574fde84fba14ed8d5d671277 Author: Samuel Maisonneuve <maisonneuve(a)codelutin.com> Date: Thu Aug 18 16:37:45 2016 +0200 Corrige les problèmes de sérialisation/deserialisation liés à la synchro referentiel en serveur distant Introduit un objet ReferentialMultimap visant a transporter les objets ReferentialDto à travers les processus de sérialisation/deserialisation tout en conservant l'information du type concret refs #7739 Summary of changes: .../web/ObserveWebApplicationListener.java | 2 + ...eferentialSynchronizeDiffServiceController.java | 5 +- ...lassInjector.java => ImmutableSetInjector.java} | 46 ++++--- observe-application-web/src/main/resources/mapping | 2 + .../diff/ReferentialSynchronizeDiff.java | 12 +- .../diff/ReferentialSynchronizeDiffService.java | 5 +- .../diff/ReferentialSynchronizeDiffState.java | 2 +- .../diff/ReferentialSynchronizeDiffsEngine.java | 7 +- .../services/dto/gson/ImmutableSetAdapter.java | 1 - .../services/dto/gson/ObserveDtoGsonSupplier.java | 3 + .../dto/gson/ReferentialMultimapAdapter.java | 83 +++++++++++++ .../dto/referential/ReferentialMultimap.java | 134 +++++++++++++++++++++ .../ReferentialSynchronizeDiffServiceTopia.java | 12 +- .../sql/InsertSqlStatementGenerator.java | 5 +- .../sql/UpdateSqlStatementGenerator.java | 3 +- 15 files changed, 290 insertions(+), 32 deletions(-) copy observe-application-web/src/main/java/fr/ird/observe/application/web/injector/{ObserveClassInjector.java => ImmutableSetInjector.java} (50%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReferentialMultimapAdapter.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (6bcb0c2 -> 4994349)
by codelutin.com scm Aug. 17, 2016

Aug. 17, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 6bcb0c2 Merge branch 'feature/4304_synchro_marees' into develop new 4994349 utilisation version stable de ToPIA The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 49943499d1f9dd98e45887b181dabfe82d6d975a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 17 15:30:17 2016 +0200 utilisation version stable de ToPIA Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (a15ba5a -> 6bcb0c2)
by codelutin.com scm Aug. 17, 2016

Aug. 17, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from a15ba5a Merge branch 'feature/7739_synchro_referential' into develop new f368cde Rendre la synchro de données utilisable en mode serveur new 6bcb0c2 Merge branch 'feature/4304_synchro_marees' into develop The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 6bcb0c2545650ba127851a0c0da6ab382e58b85a Merge: a15ba5a f368cde Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 17 15:06:46 2016 +0200 Merge branch 'feature/4304_synchro_marees' into develop commit f368cde85e5534eccd9dad896e4c100875fda39e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 17 15:06:41 2016 +0200 Rendre la synchro de données utilisable en mode serveur Summary of changes: .../synchronize/data/DataSynchroUIHandler.java | 12 +++--- .../data/DataSynchronizeServiceController.java | 12 +++--- .../synchro/data/DataSynchronizeService.java | 14 +++---- .../data/task/DataSynchronizeTaskSupport.java | 11 ------ .../synchro/data/DataSynchronizeServiceTopia.java | 44 ++++++++++------------ 5 files changed, 38 insertions(+), 55 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/7739_syncrho_ref_en_serveur_distant updated (7493101 -> a15ba5a)
by codelutin.com scm Aug. 17, 2016

Aug. 17, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7739_syncrho_ref_en_serveur_distant in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 7493101 Appy git pur --prune adds df9fb92 Utilisation du nouveau moteur de calcul de différentiel pour la synchro référentiel simple adds ee75432 ajout méthode utile et utilisation adds 9707205 Quelques adaptations niveau ui pour utiliser les nouvelles api adds a15ba5a Merge branch 'feature/7739_synchro_referential' into develop No new revisions were added by this update. Summary of changes: .../fr/ird/observe/db/ObserveSwingDataSource.java | 6 - .../legacy/ObsoleteReferentialReference.java | 17 ++- .../referential/legacy/SynchronizeUIHandler.java | 28 ++-- ...eferentialSynchronizeDiffServiceController.java | 5 + ...ferentialSynchronizeLocalServiceController.java | 10 +- ...erentialSynchronizeRemoteServiceController.java | 52 -------- .../observe/services/ObserveServicesProvider.java | 3 - .../diff/ReferentialSynchronizeDiffService.java | 3 + .../diff/ReferentialSynchronizeDiffsEngine.java | 10 ++ .../referential/legacy/LocalReferentialStates.java | 95 ------------- .../referential/legacy/RemoteReferentialDiff.java | 106 --------------- ...ionalReferentialSynchronizeCallbackRequest.java | 6 +- ...onalReferentialSynchronizeCallbackRequests.java | 12 +- ...tionalReferentialSynchronizeCallbackResult.java | 10 +- ...ionalReferentialSynchronizeCallbackResults.java | 14 +- ...UnidirectionalReferentialSynchronizeEngine.java | 98 +++++++++----- ...ectionalReferentialSynchronizeLocalService.java | 19 +-- ...ctionalReferentialSynchronizeRemoteService.java | 58 -------- ...nidirectionalReferentialSynchronizeRequest.java | 19 +-- ...UnidirectionalReferentialSynchronizeResult.java | 34 ++--- .../ird/observe/services/binder/BinderEngine.java | 5 + .../services/service/DataSourceServiceTopia.java | 3 +- .../ReferentialSynchronizeDiffServiceTopia.java | 20 +++ ...nalReferentialSynchronizeLocalServiceTopia.java | 60 ++------- ...alReferentialSynchronizeRemoteServiceTopia.java | 147 --------------------- .../sql/InsertSqlStatementGenerator.java | 4 +- .../UnidirectionalSynchronizeReferentialTest.java | 89 +++++++------ 27 files changed, 254 insertions(+), 679 deletions(-) delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRemoteServiceController.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/LocalReferentialStates.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/RemoteReferentialDiff.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRemoteService.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRemoteServiceTopia.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (7493101 -> a15ba5a)
by codelutin.com scm Aug. 17, 2016

Aug. 17, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 7493101 Appy git pur --prune new df9fb92 Utilisation du nouveau moteur de calcul de différentiel pour la synchro référentiel simple new ee75432 ajout méthode utile et utilisation new 9707205 Quelques adaptations niveau ui pour utiliser les nouvelles api new a15ba5a Merge branch 'feature/7739_synchro_referential' into develop The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit a15ba5a63d84d14e97784638de0003882c1a408e Merge: 7493101 9707205 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 17 13:44:57 2016 +0200 Merge branch 'feature/7739_synchro_referential' into develop commit 970720538b0baced809fcc6d7ab575276230c0f8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 17 13:39:36 2016 +0200 Quelques adaptations niveau ui pour utiliser les nouvelles api commit ee7543240510bc2ed51d064527f565b6fee4d7cb Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 17 13:39:16 2016 +0200 ajout méthode utile et utilisation commit df9fb923a3729326854188ae64618c4c6db60d1a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Aug 17 13:38:56 2016 +0200 Utilisation du nouveau moteur de calcul de différentiel pour la synchro référentiel simple Summary of changes: .../fr/ird/observe/db/ObserveSwingDataSource.java | 6 - .../legacy/ObsoleteReferentialReference.java | 17 ++- .../referential/legacy/SynchronizeUIHandler.java | 28 ++-- ...eferentialSynchronizeDiffServiceController.java | 5 + ...ferentialSynchronizeLocalServiceController.java | 10 +- ...erentialSynchronizeRemoteServiceController.java | 52 -------- .../observe/services/ObserveServicesProvider.java | 3 - .../diff/ReferentialSynchronizeDiffService.java | 3 + .../diff/ReferentialSynchronizeDiffsEngine.java | 10 ++ .../referential/legacy/LocalReferentialStates.java | 95 ------------- .../referential/legacy/RemoteReferentialDiff.java | 106 --------------- ...ionalReferentialSynchronizeCallbackRequest.java | 6 +- ...onalReferentialSynchronizeCallbackRequests.java | 12 +- ...tionalReferentialSynchronizeCallbackResult.java | 10 +- ...ionalReferentialSynchronizeCallbackResults.java | 14 +- ...UnidirectionalReferentialSynchronizeEngine.java | 98 +++++++++----- ...ectionalReferentialSynchronizeLocalService.java | 19 +-- ...ctionalReferentialSynchronizeRemoteService.java | 58 -------- ...nidirectionalReferentialSynchronizeRequest.java | 19 +-- ...UnidirectionalReferentialSynchronizeResult.java | 34 ++--- .../ird/observe/services/binder/BinderEngine.java | 5 + .../services/service/DataSourceServiceTopia.java | 3 +- .../ReferentialSynchronizeDiffServiceTopia.java | 20 +++ ...nalReferentialSynchronizeLocalServiceTopia.java | 60 ++------- ...alReferentialSynchronizeRemoteServiceTopia.java | 147 --------------------- .../sql/InsertSqlStatementGenerator.java | 4 +- .../UnidirectionalSynchronizeReferentialTest.java | 89 +++++++------ 27 files changed, 254 insertions(+), 679 deletions(-) delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRemoteServiceController.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/LocalReferentialStates.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/RemoteReferentialDiff.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRemoteService.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRemoteServiceTopia.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch feature/7739_syncrho_ref_en_serveur_distant updated (04ea0f4 -> 7493101)
by codelutin.com scm Aug. 17, 2016

Aug. 17, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7739_syncrho_ref_en_serveur_distant in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 04ea0f4 Merge branch 'feature/7588_nom_programme_absent_barre_de_titre' into 'develop' adds 9a4f6bf -mAdd new icons adds a8cb47d Review package for all synchros + continue referential synchro dev adds a16a05b Reorganize i18n in swing module adds 6149dee Remove unused class adds 6889515 Renommage tasks adds 8b32632 Invert! adds ba6a9e2 Amélioration api node adds e0e5402 amélioration renderer adds f4cf9c0 Do not use the sunchronize mode to build referential diffs adds c1d88ba Simplify noe api adds 96e26b3 La partie graphique est ok adds 372f8d2 change log level adds d3e1ce2 alignement du service pour les taches sql à generer adds aa9a8e2 Pouvoir récupérer une liste d'entities à partir de leur ids + pouvoir executer plusieurs scripts dans une même transaction adds 628cccd Utilisation d'un paquetage commun pour la génération des requetes sql dans les deux synchro référentiel adds 614afe8 pass on topai to fix a bug adds 8a8733c Ajout du moteur de synchro bi-di adds d4df0a0 Intégration dans les ui de la synchro bidi + un peu de nettoyage par ci par là adds 7fb6df8 Ajout d'un FIXME à corriger plus tard... adds ee9ee02 Bien enlever la référence à remplacer de la liste des choix possibles adds abc8562 ajout méthode utile adds ce1a11c Ajout méthode pour récupérer l'enveloppe des référentiels adds 3851e9a On conserve les ids existant uniquement de chaque côté pour réaliser des insert en cascade si nécessaire adds b592cc9 clean code adds 33d1b63 Fixes #4309 \o/ Merge branch 'feature/4309_synchro_referential' into develop adds c7fa9b5 fix build adds 0df3a9d Fix activities move (from one road to another) action adds abf437d Fix comment bad reference adds 51c5a02 Fix loop and rename cleanAndPopulateMethod to clearAndPopulate adds c1c9a90 Fix routes move action adds 7e5d226 Update NodeChangeActionListener to take into account the fact that closing an entity will close its children adds 477f8f0 Fix activity lonline trip move action adds 95b29bc Fix trip/route/activity transfer via context menu : move the entity from a node to another closing it (except if it's a trip) at the same time adds c12c107 Fix move multiple entities from a parent node to another : an open entity has to be closed adds 4154470 Fix specific trip move from a program to another (need to close previous program and open the targeted one) adds 6190c6a Refactor ChangeTripProgramActionListener a bit adds eb7dc36 Enable entity move from a parent to another whatever the state of taht entity (open/closed) adds b8ba109 Fix go to open activity buttons label and visibility adds b2a1f4c Fix path expansion when moving an entity from a parent to another adds 9e9a45b Fix merge adds b3a9590 Merge branch 'feature/7591_Correction_migration_entites_d_un_parent_a_un_autre' into develop adds aaff8fd fix i18n adds 26a5ee2 Check if the datasource is opened and try to open it if not adds 4a9fc8d fix merge adds 73833f1 Merge branch 'feature/8383_importer_une_sauvegarde_apres_fermeture_connexion' into develop adds 7493101 Appy git pur --prune No new revisions were added by this update. Summary of changes: .../decoration/decorators/ObserveDecorator.java | 8 +- .../src/main/filters/observe-ui.properties | 15 + .../fr/ird/observe/ObserveOpenDataManager.java | 18 + .../fr/ird/observe/db/ObserveSwingDataSource.java | 18 +- .../observe/entities/tripMap/TripMapPointType.java | 30 +- .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 1 + .../main/java/fr/ird/observe/ui/ObserveMainUI.jcss | 24 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 20 + .../ui/actions/shared/CloseAndCreateUIAction.java | 4 +- .../shared/MoveActivityLonglinesUIAction.java | 57 +- .../actions/shared/MoveActivitySeinesUIAction.java | 56 +- .../ui/actions/shared/MoveRoutesUIAction.java | 66 +- .../ui/actions/shared/MoveTripsUIAction.java | 4 +- .../observe/ui/actions/shared/ReOpenUIAction.java | 4 +- .../ui/actions/shared/ResetEditUIAction.java | 4 +- .../java/fr/ird/observe/ui/admin/AdminStep.java | 121 +- .../java/fr/ird/observe/ui/admin/AdminTabUI.jaxx | 6 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 42 +- .../main/java/fr/ird/observe/ui/admin/AdminUI.jcss | 2 +- .../fr/ird/observe/ui/admin/AdminUIHandler.java | 37 + .../fr/ird/observe/ui/admin/AdminUILauncher.java | 1 - .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 340 ++- .../fr/ird/observe/ui/admin/config/ConfigUI.jaxx | 12 + .../fr/ird/observe/ui/admin/config/ConfigUI.jcss | 37 +- .../observe/ui/admin/config/ConfigUIHandler.java | 22 +- .../ui/admin/consolidate/ConsolidateUIHandler.java | 12 +- .../observe/ui/admin/export/ExportUIHandler.java | 40 +- .../observe/ui/admin/report/ReportConfigUI.jcss | 6 +- .../fr/ird/observe/ui/admin/report/ReportUI.jcss | 14 +- .../observe/ui/admin/report/ReportUIHandler.java | 15 +- .../ird/observe/ui/admin/resume/ShowResumeUI.jaxx | 3 +- .../ui/admin/resume/ShowResumeUIHandler.java | 3 + .../observe/ui/admin/save/SaveLocalUIHandler.java | 20 +- .../data}/DataSynchroModel.java | 3 +- .../data}/DataSynchroUI.jaxx | 0 .../data}/DataSynchroUI.jcss | 22 +- .../data}/DataSynchroUIHandler.java | 73 +- .../data}/DataSynchronizeTaskListCellRenderer.java | 4 +- .../data/task}/CopyToLeftDataSynchronizeTask.java | 4 +- .../data/task}/CopyToRightDataSynchronizeTask.java | 4 +- .../data/task}/DataSynchronizeTaskSupport.java | 2 +- .../task}/DeleteFromLeftDataSynchronizeTask.java | 4 +- .../task}/DeleteFromRightDataSynchronizeTask.java | 4 +- .../legacy}/ObsoleteReferentialReference.java | 2 +- ...soleteReferentialReferenceListCellRenderer.java | 2 +- .../{ => referential/legacy}/SynchronizeModel.java | 37 +- .../{ => referential/legacy}/SynchronizeUI.jaxx | 4 +- .../{ => referential/legacy}/SynchronizeUI.jcss | 2 +- .../legacy}/SynchronizeUIHandler.java | 34 +- .../referential/ng/ReferentialReplaceUI.jaxx | 29 + .../referential/ng/ReferentialReplaceUI.jcss | 9 + .../ng/ReferentialReplaceUIHandler.java | 40 + .../referential/ng/ReferentialSynchroConfigUI.jaxx | 80 + .../referential/ng/ReferentialSynchroConfigUI.jcss | 54 + .../referential/ng/ReferentialSynchroModel.java | 319 +++ .../referential/ng/ReferentialSynchroUI.jaxx} | 75 +- .../referential/ng/ReferentialSynchroUI.jcss | 135 + .../ng/ReferentialSynchroUIHandler.java | 157 ++ .../ng/ReferentialSynchronizeResources.java | 161 ++ ...eferentialSynchronizeTaskListCellRenderer.java} | 10 +- .../ng/ReferentialSynchronizeTaskListModel.java | 52 + .../referential/ng/action/ApplyAction.java | 86 + .../ng/action/RegisterAddTaskAction.java | 42 + .../ng/action/RegisterCopyTaskAction.java | 41 + .../ng/action/RegisterDeleteTaskAction.java | 34 + .../ng/action/RegisterDesactivateTaskAction.java | 34 + .../ng/action/RegisterRevertTaskAction.java | 27 + .../ng/action/RegisterSkipTaskAction.java | 27 + .../ng/action/RegisterTasksActionSupport.java | 190 ++ .../ng/action/RegisterUpdateTaskAction.java | 43 + .../ng/task/AddReferentialSynchronizeTask.java | 19 + .../ng/task/DeleteReferentialSynchronizeTask.java | 19 + .../DesactivateReferentialSynchronizeTask.java | 40 + .../ng/task/ReferentialSynchronizeTaskSupport.java | 79 + ...ferentialSynchronizeTaskWithReplaceSupport.java | 39 + .../ng/task/RevertReferentialSynchronizeTask.java | 19 + .../ng/task/SkipReferentialSynchronizeTask.java | 24 + .../ng/task/UpdateReferentialSynchronizeTask.java | 19 + .../ReferentialSynchronizeTreeCellRenderer.java | 122 + .../ng/tree/ReferentialSynchronizeTreeModel.java | 393 +++ .../ReferentialSynchronizeTreeModelsBuilder.java | 171 ++ .../node/AddedReferenceReferentialSynchroNode.java | 20 + .../ReferenceReferentialSynchroNodeSupport.java | 61 + .../tree/node/ReferentialSynchroNodeSupport.java | 38 + .../ng/tree/node/RootReferentialSynchroNode.java | 55 + .../ng/tree/node/TypeReferentialSynchroNode.java | 42 + .../UpdatedReferenceReferentialSynchroNode.java | 19 + .../ui/admin/validate/ValidateConfigUI.jaxx | 5 - .../ui/admin/validate/ValidateConfigUI.jcss | 16 +- .../ird/observe/ui/admin/validate/ValidateUI.jcss | 6 +- .../ui/admin/validate/ValidateUIHandler.java | 42 +- .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 5 +- .../ui/content/impl/longline/BranchlineUI.jaxx | 2 +- .../ui/content/impl/longline/BranchlineUI.jcss | 80 +- .../content/impl/longline/BranchlineUIHandler.java | 4 +- .../impl/longline/LonglineDetailCompositionUI.jaxx | 2 +- .../impl/longline/LonglineDetailCompositionUI.jcss | 62 +- .../LonglineDetailCompositionUIHandler.java | 18 +- .../LonglineDetailCompositionUIInitializer.java | 52 +- .../LonglineDetailCompositionValidatorService.java | 2 +- .../impl/longline/LonglineGlobalCompositionUI.jaxx | 2 +- .../impl/longline/LonglineGlobalCompositionUI.jcss | 16 +- .../LonglineGlobalCompositionUIHandler.java | 4 +- .../ui/content/impl/longline/SetLonglineUI.jaxx | 2 +- .../ui/content/impl/longline/SetLonglineUI.jcss | 130 +- .../impl/longline/SetLonglineUIHandler.java | 6 +- .../impl/seine/ActivitySeineObservedSystemUI.jaxx | 2 +- .../impl/seine/ActivitySeineObservedSystemUI.jcss | 4 +- .../ActivitySeineObservedSystemUIHandler.java | 4 +- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 2 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 2 +- .../ui/content/impl/seine/FloatingObjectUI.jaxx | 2 +- .../ui/content/impl/seine/FloatingObjectUI.jcss | 2 +- .../impl/seine/FloatingObjectUIHandler.java | 6 +- .../observe/ui/content/impl/seine/SetSeineUI.jaxx | 2 +- .../observe/ui/content/impl/seine/SetSeineUI.jcss | 74 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 8 +- .../ird/observe/ui/content/list/ContentListUI.jcss | 2 +- .../ui/content/list/ContentListUIHandler.java | 15 + .../list/impl/longline/ActivityLonglinesUI.jaxx | 2 +- .../list/impl/longline/ActivityLonglinesUI.jcss | 20 +- .../impl/longline/ActivityLonglinesUIHandler.java | 10 +- .../content/list/impl/longline/CommonListUI.jcss | 18 +- .../list/impl/longline/TripLonglinesUI.jcss | 16 +- .../list/impl/longline/TripLonglinesUIHandler.java | 6 +- .../content/list/impl/seine/ActivitySeinesUI.jaxx | 2 +- .../content/list/impl/seine/ActivitySeinesUI.jcss | 20 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 10 +- .../ui/content/list/impl/seine/CommonListUI.jcss | 26 +- .../ui/content/list/impl/seine/RoutesUI.jaxx | 2 +- .../ui/content/list/impl/seine/RoutesUI.jcss | 16 +- .../content/list/impl/seine/RoutesUIHandler.java | 10 +- .../ui/content/list/impl/seine/TripSeinesUI.jcss | 16 +- .../list/impl/seine/TripSeinesUIHandler.java | 6 +- .../open/impl/longline/ActivityLonglineUI.jaxx | 2 +- .../open/impl/longline/ActivityLonglineUI.jcss | 14 +- .../impl/longline/ActivityLonglineUIHandler.java | 8 +- .../content/open/impl/longline/TripLonglineUI.jaxx | 2 +- .../content/open/impl/longline/TripLonglineUI.jcss | 32 +- .../open/impl/longline/TripLonglineUIHandler.java | 6 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 2 +- .../content/open/impl/seine/ActivitySeineUI.jcss | 14 +- .../open/impl/seine/ActivitySeineUIHandler.java | 10 +- .../ui/content/open/impl/seine/RouteUI.jaxx | 2 +- .../ui/content/open/impl/seine/RouteUI.jcss | 6 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 8 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 2 +- .../ui/content/open/impl/seine/TripSeineUI.jcss | 20 +- .../open/impl/seine/TripSeineUIHandler.java | 6 +- .../observe/ui/content/ref/ContentReferenceUI.jaxx | 1 + .../observe/ui/content/ref/ContentReferenceUI.jcss | 1 + .../ui/content/ref/ContentReferenceUIHandler.java | 25 +- .../ird/observe/ui/content/ref/impl/CountryUI.jaxx | 14 +- .../ird/observe/ui/content/ref/impl/FpaZoneUI.jaxx | 14 +- .../content/ref/impl/GearCaracteristicTypeUI.jaxx | 14 +- .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 14 +- .../ui/content/ref/impl/GearCaracteristicUI.jcss | 4 +- .../fr/ird/observe/ui/content/ref/impl/GearUI.jaxx | 14 +- .../fr/ird/observe/ui/content/ref/impl/GearUI.jcss | 10 +- .../ird/observe/ui/content/ref/impl/HarbourUI.jaxx | 14 +- .../ird/observe/ui/content/ref/impl/HarbourUI.jcss | 6 +- .../content/ref/impl/LengthWeightParameterUI.jaxx | 14 +- .../content/ref/impl/LengthWeightParameterUI.jcss | 10 +- .../ird/observe/ui/content/ref/impl/OceanUI.jaxx | 14 +- .../observe/ui/content/ref/impl/OrganismUI.jaxx | 14 +- .../ird/observe/ui/content/ref/impl/PersonUI.jaxx | 14 +- .../ird/observe/ui/content/ref/impl/PersonUI.jcss | 2 +- .../ird/observe/ui/content/ref/impl/ProgramUI.jaxx | 14 +- .../ird/observe/ui/content/ref/impl/ProgramUI.jcss | 4 +- .../fr/ird/observe/ui/content/ref/impl/SexUI.jaxx | 14 +- .../ui/content/ref/impl/SpeciesGroupUI.jaxx | 14 +- .../observe/ui/content/ref/impl/SpeciesListUI.jaxx | 14 +- .../observe/ui/content/ref/impl/SpeciesListUI.jcss | 8 +- .../ird/observe/ui/content/ref/impl/SpeciesUI.jaxx | 14 +- .../ird/observe/ui/content/ref/impl/SpeciesUI.jcss | 8 +- .../ui/content/ref/impl/VesselSizeCategoryUI.jaxx | 14 +- .../observe/ui/content/ref/impl/VesselTypeUI.jaxx | 14 +- .../ird/observe/ui/content/ref/impl/VesselUI.jaxx | 14 +- .../ird/observe/ui/content/ref/impl/VesselUI.jcss | 4 +- .../ref/impl/longline/BaitHaulingStatusUI.jaxx | 14 +- .../ref/impl/longline/BaitSettingStatusUI.jaxx | 14 +- .../ui/content/ref/impl/longline/BaitTypeUI.jaxx | 14 +- .../ref/impl/longline/CatchFateLonglineUI.jaxx | 14 +- .../content/ref/impl/longline/EncounterTypeUI.jaxx | 14 +- .../ui/content/ref/impl/longline/HealthnessUI.jaxx | 14 +- .../content/ref/impl/longline/HookPositionUI.jaxx | 14 +- .../ui/content/ref/impl/longline/HookSizeUI.jaxx | 14 +- .../ui/content/ref/impl/longline/HookTypeUI.jaxx | 14 +- .../impl/longline/ItemHorizontalPositionUI.jaxx | 14 +- .../ref/impl/longline/ItemVerticalPositionUI.jaxx | 14 +- .../ref/impl/longline/LightsticksColorUI.jaxx | 14 +- .../ref/impl/longline/LightsticksTypeUI.jaxx | 14 +- .../ui/content/ref/impl/longline/LineTypeUI.jaxx | 14 +- .../ref/impl/longline/MaturityStatusUI.jaxx | 14 +- .../ref/impl/longline/MitigationTypeUI.jaxx | 14 +- .../content/ref/impl/longline/SensorBrandUI.jaxx | 14 +- .../ref/impl/longline/SensorDataFormatUI.jaxx | 14 +- .../ui/content/ref/impl/longline/SensorTypeUI.jaxx | 14 +- .../content/ref/impl/longline/SettingShapeUI.jaxx | 14 +- .../ref/impl/longline/SizeMeasureTypeUI.jaxx | 14 +- .../ref/impl/longline/StomacFullnessUI.jaxx | 14 +- .../ui/content/ref/impl/longline/TripTypeUI.jaxx | 14 +- .../impl/longline/VesselActivityLonglineUI.jaxx | 14 +- .../ref/impl/longline/WeightMeasureTypeUI.jaxx | 14 +- .../ui/content/ref/impl/seine/DetectionModeUI.jaxx | 14 +- .../ui/content/ref/impl/seine/ObjectFateUI.jaxx | 14 +- .../content/ref/impl/seine/ObjectOperationUI.jaxx | 14 +- .../ui/content/ref/impl/seine/ObjectTypeUI.jaxx | 14 +- .../content/ref/impl/seine/ObservedSystemUI.jaxx | 14 +- .../content/ref/impl/seine/ReasonForDiscardUI.jaxx | 14 +- .../ref/impl/seine/ReasonForNoFishingUI.jaxx | 14 +- .../content/ref/impl/seine/ReasonForNullSetUI.jaxx | 14 +- .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx | 14 +- .../ui/content/ref/impl/seine/SpeciesStatusUI.jaxx | 14 +- .../ref/impl/seine/SurroundingActivityUI.jaxx | 14 +- .../impl/seine/TransmittingBuoyOperationUI.jaxx | 14 +- .../ref/impl/seine/TransmittingBuoyTypeUI.jaxx | 14 +- .../ref/impl/seine/VesselActivitySeineUI.jaxx | 14 +- .../content/ref/impl/seine/WeightCategoryUI.jaxx | 14 +- .../observe/ui/content/ref/impl/seine/WindUI.jaxx | 14 +- .../observe/ui/content/table/ContentTableUI.jaxx | 10 +- .../ui/content/table/ContentTableUIHandler.java | 4 +- .../table/impl/longline/BaitsCompositionUI.jaxx | 6 +- .../table/impl/longline/BaitsCompositionUI.jcss | 24 +- .../impl/longline/BaitsCompositionUIHandler.java | 20 +- .../impl/longline/BranchlinesCompositionUI.jaxx | 6 +- .../impl/longline/BranchlinesCompositionUI.jcss | 20 +- .../longline/BranchlinesCompositionUIHandler.java | 16 +- .../table/impl/longline/CatchLonglineUI.jaxx | 10 +- .../table/impl/longline/CatchLonglineUI.jcss | 144 +- .../impl/longline/CatchLonglineUIHandler.java | 66 +- .../content/table/impl/longline/EncounterUI.jaxx | 6 +- .../content/table/impl/longline/EncounterUI.jcss | 8 +- .../table/impl/longline/EncounterUIHandler.java | 16 +- .../impl/longline/FloatlinesCompositionUI.jaxx | 6 +- .../impl/longline/FloatlinesCompositionUI.jcss | 16 +- .../longline/FloatlinesCompositionUIHandler.java | 12 +- .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 6 +- .../impl/longline/GearUseFeaturesLonglineUI.jcss | 20 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 30 +- .../table/impl/longline/HooksCompositionUI.jaxx | 6 +- .../table/impl/longline/HooksCompositionUI.jcss | 20 +- .../impl/longline/HooksCompositionUIHandler.java | 16 +- .../content/table/impl/longline/SensorUsedUI.jaxx | 6 +- .../content/table/impl/longline/SensorUsedUI.jcss | 38 +- .../table/impl/longline/SensorUsedUIHandler.java | 32 +- .../ui/content/table/impl/longline/TdrUI.jaxx | 6 +- .../ui/content/table/impl/longline/TdrUI.jcss | 128 +- .../content/table/impl/longline/TdrUIHandler.java | 24 +- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 6 +- .../table/impl/seine/GearUseFeaturesSeineUI.jcss | 20 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 30 +- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 4 +- .../content/table/impl/seine/NonTargetCatchUI.jcss | 2 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 34 +- .../table/impl/seine/NonTargetSampleUI.jaxx | 4 +- .../table/impl/seine/NonTargetSampleUI.jcss | 2 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 26 +- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 4 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 12 +- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 4 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 8 +- .../content/table/impl/seine/SchoolEstimateUI.jaxx | 4 +- .../content/table/impl/seine/SchoolEstimateUI.jcss | 2 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 12 +- .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 4 +- .../ui/content/table/impl/seine/TargetCatchUI.jcss | 12 +- .../table/impl/seine/TargetCatchUIHandler.java | 22 +- .../table/impl/seine/TargetDiscardCatchUI.jaxx | 4 +- .../table/impl/seine/TargetDiscardCatchUI.jcss | 12 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 26 +- .../table/impl/seine/TargetSampleCaptureUI.jaxx | 4 +- .../table/impl/seine/TargetSampleRejeteUI.jaxx | 4 +- .../table/impl/seine/TargetSampleUIHandler.java | 28 +- .../java/fr/ird/observe/ui/storage/StorageUI.jcss | 8 +- .../ird/observe/ui/storage/StorageUIHandler.java | 59 +- .../fr/ird/observe/ui/storage/StorageUIModel.java | 25 +- .../ird/observe/ui/storage/tabs/ConfigDataUI.jcss | 20 +- .../ui/storage/tabs/ConfigReferentielUI.jcss | 14 +- .../ui/storage/tabs/DataSelectionModel.java | 5 +- .../ui/storage/tabs/StorageTabUIHandler.java | 6 +- .../ui/tree/DataSelectionTreeCellRenderer.java | 19 +- .../tree/ObserveNavigationTreeShowPopupAction.java | 53 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 30 + .../actions/ChangeActivityRouteActionListener.java | 35 +- .../actions/ChangeActivityTripActionListener.java | 34 +- .../actions/ChangeRouteTripActionListener.java | 35 +- .../actions/ChangeTripProgramActionListener.java | 30 +- .../ui/tree/actions/NodeChangeActionListener.java | 15 +- .../fr/ird/observe/ui/usage/UsagesUIHandler.java | 4 +- .../observe/ui/util/tripMap/ObserveMapPane.java | 10 +- .../ui/util/tripMap/TripMapContentBuilder.java | 8 +- .../fr/ird/observe/ui/util/tripMap/TripMapUI.jcss | 10 +- .../observe/ui/util/tripMap/TripMapUIHandler.java | 8 +- .../observe/validation/ValidationModelMode.java | 12 +- .../observe-application-swing_en_GB.properties | 2771 ++++++++++---------- .../observe-application-swing_es_ES.properties | 2771 ++++++++++---------- .../observe-application-swing_fr_FR.properties | 2770 +++++++++---------- .../src/main/resources/icons/action-copyToBoth.png | Bin 0 -> 685 bytes ...onnected.png => action-desactivateFromLeft.png} | Bin ...nnected.png => action-desactivateFromRight.png} | Bin ...g => action-desactivateWithReplaceFromLeft.png} | Bin ... => action-desactivateWithReplaceFromRight.png} | Bin ...remote-import.png => action-revertFromLeft.png} | Bin ...emote-import.png => action-revertFromRight.png} | Bin .../main/resources/icons/action-skipFromLeft.png | Bin 0 -> 655 bytes .../main/resources/icons/action-skipFromRight.png | Bin 0 -> 655 bytes .../src/main/resources/icons/action-synchroAdd.png | Bin 0 -> 658 bytes ...action-db-none.png => action-synchroDelete.png} | Bin ...-remote-import.png => action-synchroRevert.png} | Bin .../main/resources/icons/action-synchroUpdate.png | Bin 0 -> 767 bytes .../controller/v1/DataSourceServiceController.java | 6 + .../data}/DataSynchronizeServiceController.java | 6 +- ...eferentialSynchronizeDiffServiceController.java | 34 + ...ferentialSynchronizeLocalServiceController.java | 8 +- ...erentialSynchronizeRemoteServiceController.java | 8 +- .../ReferentialSynchronizeServiceController.java | 28 + .../main/java/fr/ird/type/CoordinateHelper.java | 55 - .../observe/ObserveTopiaPersistenceContext.java | 5 + .../java/fr/ird/observe/RunScriptTopiaSqlWork.java | 79 +- .../fr/ird/observe/RunScriptsTopiaSqlWork.java | 44 +- .../observe/services/ObserveServicesProvider.java | 12 +- .../services/service/DataSourceService.java | 3 + .../datasynchro/DataSynchronizeCopyTask.java | 27 - .../datasynchro/DataSynchronizeDeleteTask.java | 27 - .../datasynchro/DataSyncrhonizeTaskSupport.java | 26 - .../data}/DataSynchronizeRequest.java | 4 +- .../data}/DataSynchronizeService.java | 2 +- .../synchro/data/task/DataSynchronizeCopyTask.java | 14 + .../data/task/DataSynchronizeDeleteTask.java | 14 + .../data/task/DataSynchronizeTaskSupport.java | 44 + .../referential/ReferentialSynchronizeMode.java | 69 + .../diff/ReferentialDataSourceState.java | 65 + .../diff/ReferentialDataSourceStates.java | 47 + .../diff/ReferentialSynchronizeDiff.java | 99 + .../diff/ReferentialSynchronizeDiffService.java | 30 + .../diff/ReferentialSynchronizeDiffState.java | 67 + .../diff/ReferentialSynchronizeDiffStateType.java | 15 + .../diff/ReferentialSynchronizeDiffs.java | 104 + .../diff/ReferentialSynchronizeDiffsEngine.java | 110 + .../legacy}/LocalReferentialStates.java | 2 +- .../legacy}/RemoteReferentialDiff.java | 2 +- ...ionalReferentialSynchronizeCallbackRequest.java | 2 +- ...onalReferentialSynchronizeCallbackRequests.java | 2 +- ...tionalReferentialSynchronizeCallbackResult.java | 2 +- ...ionalReferentialSynchronizeCallbackResults.java | 2 +- ...nidirectionalReferentialSynchronizeContext.java | 2 +- ...UnidirectionalReferentialSynchronizeEngine.java | 2 +- ...ectionalReferentialSynchronizeLocalService.java | 2 +- ...ctionalReferentialSynchronizeRemoteService.java | 2 +- ...nidirectionalReferentialSynchronizeRequest.java | 2 +- ...UnidirectionalReferentialSynchronizeResult.java | 2 +- .../ng/ReferentialSynchronizeRequest.java | 115 + .../ng/ReferentialSynchronizeService.java | 29 + .../ng/ReferentialSynchronizeServiceEngine.java | 36 + ...entialSynchronizeServiceProduceSqlsRequest.java | 96 + ...rentialSynchronizeServiceProduceSqlsResult.java | 26 + .../ng/ReferentialSynchronizeSqlsRequest.java | 101 + .../ng/task/ReferentialSynchronizeTask.java | 37 + .../ng/task/ReferentialSynchronizeTaskType.java | 26 + .../i18n/observe-services-api_en_GB.properties | 6 + .../i18n/observe-services-api_es_ES.properties | 6 + .../i18n/observe-services-api_fr_FR.properties | 6 + .../ird/observe/services/ObserveServiceTopia.java | 16 + .../services/service/DataSourceServiceTopia.java | 119 +- .../data}/DataSynchronizeServiceTopia.java | 39 +- .../ReferentialSynchronizeDiffServiceTopia.java | 136 + ...nalReferentialSynchronizeLocalServiceTopia.java | 41 +- ...alReferentialSynchronizeRemoteServiceTopia.java | 2 +- .../ng/ReferentialSynchronizeServiceTopia.java | 64 + .../ReferentialSynchronizeSqlsRequestBuilder.java | 295 +++ .../referential/sql/ApplySqlRequestWork.java | 44 + .../sql}/DeleteSqlStatementGenerator.java | 5 +- .../sql/DesactivateSqlStatementGenerator.java} | 29 +- .../sql}/InsertSqlStatementGenerator.java | 52 +- .../InsertSqlWithCascadeStatementGenerator.java | 105 + .../sql}/ReplaceSqlStatementGenerator.java | 5 +- .../sql}/UpdateSqlStatementGenerator.java | 47 +- .../UpdateSqlWithCascadeStatementGenerator.java | 103 + .../UnidirectionalSynchronizeReferentialTest.java | 6 + pom.xml | 2 +- 381 files changed, 11706 insertions(+), 6619 deletions(-) rename observe-application-swing/src/main/java/fr/ird/observe/ui/admin/{datasynchro => synchronize/data}/DataSynchroModel.java (96%) copy observe-application-swing/src/main/java/fr/ird/observe/ui/admin/{datasynchro => synchronize/data}/DataSynchroUI.jaxx (100%) rename observe-application-swing/src/main/java/fr/ird/observe/ui/admin/{datasynchro => synchronize/data}/DataSynchroUI.jcss (82%) rename observe-application-swing/src/main/java/fr/ird/observe/ui/admin/{datasynchro => synchronize/data}/DataSynchroUIHandler.java (82%) copy observe-application-swing/src/main/java/fr/ird/observe/ui/admin/{datasynchro => synchronize/data}/DataSynchronizeTaskListCellRenderer.java (84%) rename observe-application-swing/src/main/java/fr/ird/observe/ui/admin/{datasynchro => synchronize/data/task}/CopyToLeftDataSynchronizeTask.java (84%) rename observe-application-swing/src/main/java/fr/ird/observe/ui/admin/{datasynchro => synchronize/data/task}/CopyToRightDataSynchronizeTask.java (84%) rename observe-application-swing/src/main/java/fr/ird/observe/ui/admin/{datasynchro => synchronize/data/task}/DataSynchronizeTaskSupport.java (96%) rename observe-application-swing/src/main/java/fr/ird/observe/ui/admin/{datasynchro => synchronize/data/task}/DeleteFromLeftDataSynchronizeTask.java (80%) rename observe-application-swing/src/main/java/fr/ird/observe/ui/admin/{datasynchro => synchronize/data/task}/DeleteFromRightDataSynchronizeTask.java (80%) rename observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/{ => referential/legacy}/ObsoleteReferentialReference.java (97%) rename observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/{ => referential/legacy}/ObsoleteReferentialReferenceListCellRenderer.java (97%) rename observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/{ => referential/legacy}/SynchronizeModel.java (89%) rename observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/{ => referential/legacy}/SynchronizeUI.jaxx (94%) rename observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/{ => referential/legacy}/SynchronizeUI.jcss (93%) rename observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/{ => referential/legacy}/SynchronizeUIHandler.java (86%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialReplaceUI.jaxx create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialReplaceUI.jcss create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialReplaceUIHandler.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jcss create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java rename observe-application-swing/src/main/java/fr/ird/observe/ui/admin/{datasynchro/DataSynchroUI.jaxx => synchronize/referential/ng/ReferentialSynchroUI.jaxx} (51%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jcss create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchronizeResources.java rename observe-application-swing/src/main/java/fr/ird/observe/ui/admin/{datasynchro/DataSynchronizeTaskListCellRenderer.java => synchronize/referential/ng/ReferentialSynchronizeTaskListCellRenderer.java} (50%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchronizeTaskListModel.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/action/ApplyAction.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/action/RegisterAddTaskAction.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/action/RegisterCopyTaskAction.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/action/RegisterDeleteTaskAction.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/action/RegisterDesactivateTaskAction.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/action/RegisterRevertTaskAction.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/action/RegisterSkipTaskAction.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/action/RegisterUpdateTaskAction.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/AddReferentialSynchronizeTask.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/DeleteReferentialSynchronizeTask.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/DesactivateReferentialSynchronizeTask.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskSupport.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskWithReplaceSupport.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/RevertReferentialSynchronizeTask.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/SkipReferentialSynchronizeTask.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/task/UpdateReferentialSynchronizeTask.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModel.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/AddedReferenceReferentialSynchroNode.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/ReferenceReferentialSynchroNodeSupport.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/ReferentialSynchroNodeSupport.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/RootReferentialSynchroNode.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/TypeReferentialSynchroNode.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/UpdatedReferenceReferentialSynchroNode.java create mode 100644 observe-application-swing/src/main/resources/icons/action-copyToBoth.png copy observe-application-swing/src/main/resources/icons/{action-unconnected.png => action-desactivateFromLeft.png} (100%) copy observe-application-swing/src/main/resources/icons/{action-unconnected.png => action-desactivateFromRight.png} (100%) copy observe-application-swing/src/main/resources/icons/{action-unconnected.png => action-desactivateWithReplaceFromLeft.png} (100%) copy observe-application-swing/src/main/resources/icons/{action-unconnected.png => action-desactivateWithReplaceFromRight.png} (100%) copy observe-application-swing/src/main/resources/icons/{action-remote-import.png => action-revertFromLeft.png} (100%) copy observe-application-swing/src/main/resources/icons/{action-remote-import.png => action-revertFromRight.png} (100%) create mode 100644 observe-application-swing/src/main/resources/icons/action-skipFromLeft.png create mode 100644 observe-application-swing/src/main/resources/icons/action-skipFromRight.png create mode 100644 observe-application-swing/src/main/resources/icons/action-synchroAdd.png copy observe-application-swing/src/main/resources/icons/{action-db-none.png => action-synchroDelete.png} (100%) copy observe-application-swing/src/main/resources/icons/{action-remote-import.png => action-synchroRevert.png} (100%) create mode 100644 observe-application-swing/src/main/resources/icons/action-synchroUpdate.png rename observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/{datasynchro => synchro/data}/DataSynchronizeServiceController.java (78%) create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceController.java rename observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeLocalServiceController.java (87%) rename observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeRemoteServiceController.java (85%) create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/ng/ReferentialSynchronizeServiceController.java delete mode 100644 observe-entities-migration/src/main/java/fr/ird/type/CoordinateHelper.java copy observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/UnidirectionalReferentialSynchronizeCallbackResult.java => observe-entities/src/main/java/fr/ird/observe/RunScriptsTopiaSqlWork.java (50%) delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeCopyTask.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSynchronizeDeleteTask.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/datasynchro/DataSyncrhonizeTaskSupport.java rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/{datasynchro => synchro/data}/DataSynchronizeRequest.java (92%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/{datasynchro => synchro/data}/DataSynchronizeService.java (96%) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/data/task/DataSynchronizeCopyTask.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/data/task/DataSynchronizeDeleteTask.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/data/task/DataSynchronizeTaskSupport.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ReferentialSynchronizeMode.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialDataSourceState.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialDataSourceStates.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiff.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffState.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffStateType.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffs.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/LocalReferentialStates.java (97%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/RemoteReferentialDiff.java (97%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeCallbackRequest.java (96%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeCallbackRequests.java (97%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeCallbackResult.java (95%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeCallbackResults.java (96%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeContext.java (96%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeEngine.java (99%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeLocalService.java (98%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeRemoteService.java (96%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeRequest.java (98%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeResult.java (98%) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeRequest.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceEngine.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceProduceSqlsRequest.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceProduceSqlsResult.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequest.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/task/ReferentialSynchronizeTask.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/task/ReferentialSynchronizeTaskType.java rename observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/{datasynchro => synchro/data}/DataSynchronizeServiceTopia.java (66%) create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java rename observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeLocalServiceTopia.java (89%) rename observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/legacy}/UnidirectionalReferentialSynchronizeRemoteServiceTopia.java (98%) create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/ApplySqlRequestWork.java copy observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/sql}/DeleteSqlStatementGenerator.java (90%) rename observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/{DeleteSqlStatementGenerator.java => referential/sql/DesactivateSqlStatementGenerator.java} (57%) rename observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/sql}/InsertSqlStatementGenerator.java (85%) create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java rename observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/sql}/ReplaceSqlStatementGenerator.java (96%) rename observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/{ => referential/sql}/UpdateSqlStatementGenerator.java (88%) create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7592_menu_contextuel_reouvrir_tjs_actif deleted (was cf623ca)
by codelutin.com scm Aug. 16, 2016

Aug. 16, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7592_menu_contextuel_reouvrir_tjs_actif in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git was cf623ca Fix re-open option state for routes and activities nodes The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (73833f1 -> 7493101)
by codelutin.com scm Aug. 16, 2016

Aug. 16, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 73833f1 Merge branch 'feature/8383_importer_une_sauvegarde_apres_fermeture_connexion' into develop new 7493101 Appy git pur --prune The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 74931010920a46d9def703c842136d3171d508c2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 16 18:21:06 2016 +0200 Appy git pur --prune Summary of changes: .../ui/tree/ObserveNavigationTreeShowPopupAction.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (aaff8fd -> 73833f1)
by codelutin.com scm Aug. 16, 2016

Aug. 16, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from aaff8fd fix i18n adds 26a5ee2 Check if the datasource is opened and try to open it if not adds 4a9fc8d fix merge new 73833f1 Merge branch 'feature/8383_importer_une_sauvegarde_apres_fermeture_connexion' into develop The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 73833f1ef9f9569454eb733f7f612e64e85a2264 Merge: aaff8fd 4a9fc8d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 16 18:15:37 2016 +0200 Merge branch 'feature/8383_importer_une_sauvegarde_apres_fermeture_connexion' into develop Summary of changes: .../ird/observe/ui/storage/StorageUIHandler.java | 59 ++++++++++++---------- .../observe-application-swing_en_GB.properties | 1 + .../observe-application-swing_es_ES.properties | 1 + .../observe-application-swing_fr_FR.properties | 1 + 4 files changed, 35 insertions(+), 27 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1