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

branch feature/refactor_reference updated (19a0f2e -> 163a4e6)
by codelutin.com scm 29 Nov '15

29 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/refactor_reference in repository observe. See http://git.codelutin.com/observe.git from 19a0f2e Revue de code sur la date de mise à jour des objets : toute donnée modifiée doit retourner une date de mise à jour à réimpacter dans les ui (première passe, mais ce n'est pas fini, il faut bien vérifier que dans l'application swing ça va être cohérent) new 163a4e6 Chargement des référentiels dans les modèles des écrans de l'application swing 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 163a4e66c1df259a577f296dd2728c7f97a12ae6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 29 19:58:22 2015 +0100 Chargement des référentiels dans les modèles des écrans de l'application swing Summary of changes: .../ird/observe/ui/content/ContentUIHandler.java | 18 ++--- .../fr/ird/observe/ui/content/ContentUIModel.java | 78 ++++++++++++---------- .../impl/longline/SetLonglineUIHandler.java | 2 + .../ActivitySeineObservedSystemUIHandler.java | 3 + ...ngObjectTransmittingBuoyOperationUIHandler.java | 1 + .../impl/seine/FloatingObjectUIHandler.java | 1 + .../ui/content/impl/seine/SetSeineUIHandler.java | 2 + .../impl/longline/ActivityLonglinesUIHandler.java | 1 + .../list/impl/longline/TripLonglinesUIHandler.java | 7 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 7 +- .../content/list/impl/seine/RoutesUIHandler.java | 7 +- .../list/impl/seine/TripSeinesUIHandler.java | 7 +- .../impl/longline/ActivityLonglineUIHandler.java | 3 + .../open/impl/longline/TripLonglineUIHandler.java | 3 + .../open/impl/seine/ActivitySeineUIHandler.java | 3 + .../ui/content/open/impl/seine/RouteUIHandler.java | 3 + .../open/impl/seine/TripSeineUIHandler.java | 3 + .../ui/content/ref/ContentReferenceUIHandler.java | 3 + .../ui/content/table/ContentTableUIHandler.java | 4 +- .../impl/longline/CatchLonglineUIHandler.java | 15 +++-- .../table/impl/longline/EncounterUIHandler.java | 2 + .../longline/GearUseFeaturesLonglineUIHandler.java | 1 + .../table/impl/longline/SensorUsedUIHandler.java | 1 + .../content/table/impl/longline/TdrUIHandler.java | 14 ++-- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 1 + .../table/impl/seine/NonTargetCatchUIHandler.java | 3 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 3 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 1 + .../impl/seine/ObjectSchoolEstimateUIHandler.java | 1 + .../table/impl/seine/SchoolEstimateUIHandler.java | 3 +- .../table/impl/seine/TargetCatchUIHandler.java | 5 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 11 ++- .../table/impl/seine/TargetSampleUIHandler.java | 1 + 33 files changed, 137 insertions(+), 81 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/refactor_reference updated (053452c -> 19a0f2e)
by codelutin.com scm 29 Nov '15

29 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/refactor_reference in repository observe. See http://git.codelutin.com/observe.git from 053452c Quelques corrections sur les Binders + début de mise en place dans l'application swin new 19a0f2e Revue de code sur la date de mise à jour des objets : toute donnée modifiée doit retourner une date de mise à jour à réimpacter dans les ui (première passe, mais ce n'est pas fini, il faut bien vérifier que dans l'application swing ça va être cohérent) 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 19a0f2e6e6a3103e2c8d2324080dcf628030edaf Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 29 19:14:52 2015 +0100 Revue de code sur la date de mise à jour des objets : toute donnée modifiée doit retourner une date de mise à jour à réimpacter dans les ui (première passe, mais ce n'est pas fini, il faut bien vérifier que dans l'application swing ça va être cohérent) Summary of changes: .../LonglineDetailCompositionUIHandler.java | 2 +- .../LonglineGlobalCompositionUIHandler.java | 3 +- .../impl/longline/SetLonglineUIHandler.java | 3 +- .../ActivitySeineObservedSystemUIHandler.java | 5 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 6 +- .../impl/seine/FloatingObjectUIHandler.java | 6 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 5 +- .../impl/longline/ActivityLonglineUIHandler.java | 3 +- .../open/impl/longline/TripLonglineUIHandler.java | 5 +- .../open/impl/seine/ActivitySeineUIHandler.java | 5 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 3 +- .../open/impl/seine/TripSeineUIHandler.java | 3 +- .../ui/content/ref/ContentReferenceUIHandler.java | 16 ++-- .../impl/longline/CatchLonglineUIHandler.java | 8 +- .../table/impl/longline/EncounterUIHandler.java | 6 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 4 +- .../table/impl/longline/SensorUsedUIHandler.java | 6 +- .../content/table/impl/longline/TdrUIHandler.java | 4 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 4 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 6 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 6 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 6 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 6 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 5 +- .../table/impl/seine/TargetCatchUIHandler.java | 6 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 6 +- .../table/impl/seine/TargetSampleUIHandler.java | 6 +- .../v1/ReferentialServiceController.java | 3 +- .../v1/longline/BranchlineServiceController.java | 9 +- .../v1/seine/FloatingObjectServiceController.java | 3 +- .../v1/seine/NonTargetSampleServiceController.java | 3 +- .../ObjectObservedSpeciesServiceController.java | 3 +- .../ObjectSchoolEstimateServiceController.java | 3 +- .../v1/seine/SchoolEstimateServiceController.java | 3 +- .../v1/seine/SetSeineServiceController.java | 3 +- ...TransmittingBuoyOperationServiceController.java | 3 +- .../observe/ObserveTopiaPersistenceContext.java | 15 ++++ .../services/service/ReferentialService.java | 3 +- .../service/longline/BranchlineService.java | 5 +- .../service/seine/FloatingObjectService.java | 3 +- .../service/seine/NonTargetSampleService.java | 3 +- .../seine/ObjectObservedSpeciesService.java | 3 +- .../service/seine/ObjectSchoolEstimateService.java | 3 +- .../service/seine/SchoolEstimateService.java | 3 +- .../services/service/seine/SetSeineService.java | 3 +- .../seine/TransmittingBuoyOperationService.java | 3 +- .../observe/services/dto/result/SaveResultDto.java | 15 ++++ .../ird/observe/services/ObserveServiceTopia.java | 99 +++++++++++++++------- .../services/service/ReferentialServiceTopia.java | 14 +-- .../ActivityLongLineEncouterServiceTopia.java | 10 ++- .../ActivityLongLineSensorUsedServiceTopia.java | 10 ++- .../longline/ActivityLonglineServiceTopia.java | 14 ++- .../service/longline/BranchlineServiceTopia.java | 34 +++++--- .../longline/SetLonglineCatchServiceTopia.java | 11 ++- .../SetLonglineDetailCompositionServiceTopia.java | 10 ++- .../SetLonglineGlobalCompositionServiceTopia.java | 10 ++- .../service/longline/SetLonglineServiceTopia.java | 12 ++- .../services/service/longline/TdrServiceTopia.java | 11 ++- .../longline/TripLonglineGearUseServiceTopia.java | 16 ++-- .../service/longline/TripLonglineServiceTopia.java | 12 +-- .../ActivitySeineObservedSystemServiceTopia.java | 11 ++- .../service/seine/ActivitySeineServiceTopia.java | 14 ++- .../service/seine/FloatingObjectServiceTopia.java | 16 ++-- .../service/seine/NonTargetCatchServiceTopia.java | 11 +-- .../service/seine/NonTargetSampleServiceTopia.java | 18 ++-- .../seine/ObjectObservedSpeciesServiceTopia.java | 15 ++-- .../seine/ObjectSchoolEstimateServiceTopia.java | 15 ++-- .../services/service/seine/RouteServiceTopia.java | 15 ++-- .../service/seine/SchoolEstimateServiceTopia.java | 16 ++-- .../service/seine/SetSeineServiceTopia.java | 17 ++-- .../service/seine/TargetCatchServiceTopia.java | 8 +- .../service/seine/TargetSampleServiceTopia.java | 18 ++-- .../TransmittingBuoyOperationServiceTopia.java | 14 +-- .../seine/TripSeineGearUseServiceTopia.java | 16 ++-- .../service/seine/TripSeineServiceTopia.java | 12 +-- 75 files changed, 448 insertions(+), 267 deletions(-) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/result/SaveResultDto.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/refactor_reference updated (0522ea7 -> 053452c)
by codelutin.com scm 29 Nov '15

29 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/refactor_reference in repository observe. See http://git.codelutin.com/observe.git from 0522ea7 Impact des modifications sur l'application swing + début de revue de code sur la partie gestion de l'arbre de navigation, reste encore pas mal de boulot new 053452c Quelques corrections sur les Binders + début de mise en place dans l'application swin 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 053452c44859a58aa305db2c8147abb5628dc5ac Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 29 17:29:40 2015 +0100 Quelques corrections sur les Binders + début de mise en place dans l'application swin Summary of changes: .../ird/observe/ui/content/ContentUIHandler.java | 6 +- .../observe/ui/content/ContentUIInitializer.java | 6 +- .../dto/reference/DataReferenceSetDefinitions.java | 5 +- .../ReferentialReferenceSetDefinitions.java | 3 - .../builder/AbstractToReferenceBuilder.java | 110 --------------------- .../reference/builder/DataToReferenceBuilder.java | 47 --------- .../builder/ReferentialToReferenceBuilder.java | 97 ------------------ .../xmi/observe-services-dto-longline.properties | 1 + .../main/xmi/observe-services-dto-longline.zargo | Bin 64456 -> 64908 bytes .../main/xmi/observe-services-dto-seine.properties | 1 + .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59797 -> 60150 bytes .../binder/data/ActivityLonglineBinder.java | 1 + .../services/binder/data/ActivitySeineBinder.java | 9 +- .../services/binder/referential/ProgramBinder.java | 8 +- .../service/seine/FloatingObjectServiceTopia.java | 30 +----- 15 files changed, 30 insertions(+), 294 deletions(-) delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/builder/AbstractToReferenceBuilder.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/builder/DataToReferenceBuilder.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/builder/ReferentialToReferenceBuilder.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/refactor_reference updated (8c38c6e -> 0522ea7)
by codelutin.com scm 29 Nov '15

29 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/refactor_reference in repository observe. See http://git.codelutin.com/observe.git from 8c38c6e Fix test new 5dfd897 Introduction de DataDto, suppression des ReferenceDto et autre, remplacés par ReferentialReference et DataReference new 48c6a83 Ajout d'un nouveau système de binder déterministe et qui est auto-suffisant new 6e57015 Utilisation d'Eugene en snapshot (pour avoir les generics sur les champs du modèle new c15975d Mise en place du ReferenceBinderEngine new 4ddbcd6 FloatingObject est aussi une entité qui a une date de dernière mise à jour + tous les DataDto ont une date de dernière mise à jour new e174add Suppression de l'enumeration ReferenceLocale (on ne garde que celle côté service API new 7ba116f Suppression des dto Reference, ReferenceSet et Form new b751af6 Application des modifications sur l'API et début de revue des implantations (on utilise désormais le BinderEngine pour gérer les recopies) + Revue aussi de la gestion des datas de dernière mise à jour (mais encore tout à fait fini) new 5d6efbd Impact des modifications de l'API sur le module rest + pour le moment j'ai commenté une partie des tests, on les réactivera lorsque tout ira mieux new ed4ede6 Impact des modifications sur l'application web new 0522ea7 Impact des modifications sur l'application swing + début de revue de code sur la partie gestion de l'arbre de navigation, reste encore pas mal de boulot The 11 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 0522ea7132aadfd267ee4f1bdb313f516ef9c059 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 29 15:19:58 2015 +0100 Impact des modifications sur l'application swing + début de revue de code sur la partie gestion de l'arbre de navigation, reste encore pas mal de boulot commit ed4ede628f932fc16b7bda7dc4a2ade175d2b308 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 29 15:19:07 2015 +0100 Impact des modifications sur l'application web commit 5d6efbd542724d8c1cca877f458a70173415693f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 29 15:18:04 2015 +0100 Impact des modifications de l'API sur le module rest + pour le moment j'ai commenté une partie des tests, on les réactivera lorsque tout ira mieux commit b751af63d8d91b0ce86dc8f689f708a6689fb0b0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 29 15:16:35 2015 +0100 Application des modifications sur l'API et début de revue des implantations (on utilise désormais le BinderEngine pour gérer les recopies) + Revue aussi de la gestion des datas de dernière mise à jour (mais encore tout à fait fini) commit 7ba116f7d7bee622ce70a1e9373a19e35ebecc07 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 29 15:15:12 2015 +0100 Suppression des dto Reference, ReferenceSet et Form commit e174addedf9da75c0553ddc5a57e517a575eb8eb Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 29 15:12:44 2015 +0100 Suppression de l'enumeration ReferenceLocale (on ne garde que celle côté service API commit 4ddbcd6721931c2e6fec65650d14d575bd488e3d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Nov 29 14:24:05 2015 +0100 FloatingObject est aussi une entité qui a une date de dernière mise à jour + tous les DataDto ont une date de dernière mise à jour commit c15975dcee91bc3d40ea4b7b321e79f308a267b9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 28 09:41:59 2015 +0100 Mise en place du ReferenceBinderEngine commit 6e57015c7044effebdf8334a6ad9541e76433f4c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 28 09:01:43 2015 +0100 Utilisation d'Eugene en snapshot (pour avoir les generics sur les champs du modèle commit 48c6a83cdd880f910889dab9729fc8f5a27eef55 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 26 10:58:09 2015 +0100 Ajout d'un nouveau système de binder déterministe et qui est auto-suffisant commit 5dfd8978370f311f4c9c21ced5a30ae9187d53c9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 26 10:57:37 2015 +0100 Introduction de DataDto, suppression des ReferenceDto et autre, remplacés par ReferentialReference et DataReference Summary of changes: .../observe/ObserveSwingApplicationContext.java | 40 +- .../fr/ird/observe/db/ObserveSwingDataSource.java | 99 +- .../java/fr/ird/observe/ui/DecoratorService.java | 388 ++-- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 10 +- .../ird/observe/ui/actions/ShowConfigAction.java | 42 +- .../shared/MoveActivityLonglinesUIAction.java | 15 +- .../actions/shared/MoveActivitySeinesUIAction.java | 11 +- .../ui/actions/shared/MoveRoutesUIAction.java | 17 +- .../actions/shared/MoveTripLonglinesUIAction.java | 4 +- .../ui/actions/shared/MoveTripSeinesUIAction.java | 4 +- .../ui/actions/shared/MoveTripsUIAction.java | 38 +- .../observe/ui/actions/shared/ReOpenUIAction.java | 5 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 33 +- .../ui/admin/consolidate/ConsolidateUIHandler.java | 14 +- .../ird/observe/ui/admin/export/ExportModel.java | 35 +- .../observe/ui/admin/export/ExportUIHandler.java | 18 +- .../fr/ird/observe/ui/admin/export/TripEntry.java | 13 +- .../ui/admin/export/TripToExportTableModel.java | 13 +- .../observe/ui/admin/report/ReportUIHandler.java | 32 +- .../validate/ValidateEntityListCellRenderer.java | 21 +- .../observe/ui/admin/validate/ValidateModel.java | 11 +- .../ui/admin/validate/ValidateUIHandler.java | 26 +- .../ird/observe/ui/content/ContentUIHandler.java | 525 ++++-- .../observe/ui/content/ContentUIInitializer.java | 401 ++-- .../fr/ird/observe/ui/content/ContentUIModel.java | 118 +- .../ui/content/impl/longline/BranchlineUI.jaxx | 16 +- .../LonglineDetailCompositionUIHandler.java | 13 +- .../impl/longline/LonglineGlobalCompositionUI.css | 2 +- .../impl/longline/LonglineGlobalCompositionUI.jaxx | 5 +- .../LonglineGlobalCompositionUIHandler.java | 24 +- .../ui/content/impl/longline/SetLonglineUI.jaxx | 10 +- .../impl/longline/SetLonglineUIHandler.java | 22 +- .../impl/seine/ActivitySeineObservedSystemUI.css | 2 +- .../impl/seine/ActivitySeineObservedSystemUI.jaxx | 6 +- .../ActivitySeineObservedSystemUIHandler.java | 8 +- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 15 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 24 +- .../ui/content/impl/seine/FloatingObjectUI.jaxx | 8 +- .../impl/seine/FloatingObjectUIHandler.java | 21 +- .../observe/ui/content/impl/seine/SetSeineUI.jaxx | 4 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 32 +- .../ird/observe/ui/content/list/ContentListUI.css | 2 +- .../ird/observe/ui/content/list/ContentListUI.jaxx | 15 +- .../ui/content/list/ContentListUIHandler.java | 23 +- .../ui/content/list/ContentListUIModel.java | 21 +- .../impl/longline/ActivityLonglinesUIHandler.java | 20 +- .../list/impl/longline/TripLonglinesUI.jaxx | 1 - .../list/impl/longline/TripLonglinesUIHandler.java | 18 +- .../list/impl/longline/TripLonglinesUIModel.java | 4 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 18 +- .../content/list/impl/seine/RoutesUIHandler.java | 18 +- .../ui/content/list/impl/seine/TripSeinesUI.jaxx | 1 - .../list/impl/seine/TripSeinesUIHandler.java | 18 +- .../content/list/impl/seine/TripSeinesUIModel.java | 9 + .../ui/content/open/ContentOpenableUIHandler.java | 2 +- .../open/impl/longline/ActivityLonglineUI.jaxx | 6 +- .../impl/longline/ActivityLonglineUIHandler.java | 12 +- .../impl/longline/ActivityLonglineUIModel.java | 4 +- .../content/open/impl/longline/TripLonglineUI.jaxx | 18 +- .../open/impl/longline/TripLonglineUIHandler.java | 114 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 18 +- .../open/impl/seine/ActivitySeineUIHandler.java | 21 +- .../open/impl/seine/ActivitySeineUIModel.java | 4 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 21 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 16 +- .../open/impl/seine/TripSeineUIHandler.java | 112 +- .../observe/ui/content/ref/ContentReferenceUI.css | 2 +- .../observe/ui/content/ref/ContentReferenceUI.jaxx | 6 +- .../ui/content/ref/ContentReferenceUIHandler.java | 151 +- .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 4 +- .../fr/ird/observe/ui/content/ref/impl/GearUI.css | 2 +- .../fr/ird/observe/ui/content/ref/impl/GearUI.jaxx | 6 +- .../observe/ui/content/ref/impl/GearUIHandler.java | 6 +- .../ird/observe/ui/content/ref/impl/HarbourUI.jaxx | 4 +- .../content/ref/impl/LengthWeightParameterUI.jaxx | 8 +- .../ref/impl/LengthWeightParameterUIHandler.java | 4 +- .../observe/ui/content/ref/impl/OrganismUI.jaxx | 4 +- .../ird/observe/ui/content/ref/impl/PersonUI.jaxx | 4 +- .../ird/observe/ui/content/ref/impl/ProgramUI.jaxx | 6 +- .../ui/content/ref/impl/ProgramUIHandler.java | 4 +- .../observe/ui/content/ref/impl/SpeciesListUI.css | 2 +- .../observe/ui/content/ref/impl/SpeciesListUI.jaxx | 8 +- .../ui/content/ref/impl/SpeciesListUIHandler.java | 4 +- .../ird/observe/ui/content/ref/impl/SpeciesUI.css | 2 +- .../ird/observe/ui/content/ref/impl/SpeciesUI.jaxx | 10 +- .../ui/content/ref/impl/SpeciesUIHandler.java | 4 +- .../ird/observe/ui/content/ref/impl/VesselUI.jaxx | 8 +- .../ui/content/ref/impl/VesselUIHandler.java | 4 +- .../content/ref/impl/seine/WeightCategoryUI.jaxx | 4 +- .../ui/content/table/ContentTableUIHandler.java | 18 +- .../table/impl/longline/BaitsCompositionUI.jaxx | 6 +- .../impl/longline/BranchlinesCompositionUI.jaxx | 6 +- .../table/impl/longline/CatchLonglineUI.css | 2 +- .../table/impl/longline/CatchLonglineUI.jaxx | 38 +- .../impl/longline/CatchLonglineUIHandler.java | 386 ++-- .../content/table/impl/longline/EncounterUI.jaxx | 6 +- .../table/impl/longline/EncounterUIHandler.java | 8 +- .../impl/longline/FloatlinesCompositionUI.jaxx | 4 +- .../GearUseFeaturesLonglineTableModel.java | 4 +- .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 4 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 241 ++- ...rUseFeaturesMeasurementLonglinesTableModel.java | 4 +- .../table/impl/longline/HooksCompositionUI.jaxx | 6 +- .../impl/longline/LonglinePositionHelper.java | 111 +- .../content/table/impl/longline/SensorUsedUI.jaxx | 8 +- .../table/impl/longline/SensorUsedUIHandler.java | 8 +- .../impl/longline/SizeMeasuresTableModel.java | 4 +- .../ui/content/table/impl/longline/TdrUI.css | 2 +- .../ui/content/table/impl/longline/TdrUI.jaxx | 21 +- .../content/table/impl/longline/TdrUIHandler.java | 16 +- .../impl/longline/WeightMeasuresTableModel.java | 4 +- .../seine/GearUseFeatureMeasurementCellEditor.java | 8 +- .../GearUseFeatureMeasurementCellRenderer.java | 8 +- ...GearUseFeaturesMeasurementSeinesTableModel.java | 4 +- .../impl/seine/GearUseFeaturesSeineTableModel.java | 4 +- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 5 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 243 ++- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 9 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 31 +- .../table/impl/seine/NonTargetCatchUIModel.java | 22 +- .../table/impl/seine/NonTargetSampleUI.jaxx | 9 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 16 +- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 7 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 8 +- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 5 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 8 +- .../content/table/impl/seine/SchoolEstimateUI.jaxx | 5 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 23 +- .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 7 +- .../table/impl/seine/TargetCatchUIHandler.java | 32 +- .../table/impl/seine/TargetDiscardCatchUI.jaxx | 9 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 104 +- .../content/table/impl/seine/TargetSampleUI.jaxx | 5 +- .../table/impl/seine/TargetSampleUIHandler.java | 12 +- .../ird/observe/ui/storage/ObstunaAdminAction.java | 4 +- .../ui/storage/StorageBackupUILauncher.java | 8 +- .../ird/observe/ui/storage/StorageUIHandler.java | 10 +- .../ui/storage/tabs/DataSelectionModel.java | 81 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 29 +- ...pport.java => AbstrctReferenceNodeSupport.java} | 63 +- .../ird/observe/ui/tree/ActivityLonglineNode.java | 10 +- .../fr/ird/observe/ui/tree/ActivitySeineNode.java | 15 +- ...eSupport.java => DataReferenceNodeSupport.java} | 79 +- .../ui/tree/DataSelectionTreeCellRenderer.java | 16 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 35 +- .../observe/ui/tree/FloatingObjectSeineNode.java | 13 +- .../fr/ird/observe/ui/tree/ObserveTreeBridge.java | 2 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 131 +- .../ird/observe/ui/tree/ProgramLonglineNode.java | 10 +- .../fr/ird/observe/ui/tree/ProgramSeineNode.java | 10 +- .../ui/tree/ReferentialReferenceNodeSupport.java | 84 + .../fr/ird/observe/ui/tree/RouteSeineNode.java | 10 +- .../fr/ird/observe/ui/tree/SetLonglineNode.java | 10 +- .../java/fr/ird/observe/ui/tree/SetSeineNode.java | 10 +- .../fr/ird/observe/ui/tree/TripLonglineNode.java | 10 +- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 10 +- .../loadors/AbstractDataReferenceChildLoador.java | 17 + .../loadors/AbstractReferenceDtoChildLoador.java | 17 - .../loadors/ActivityLonglineNodeChildLoador.java | 8 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 19 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 22 +- .../loadors/ActivitySeinesNodeChildLoador.java | 20 +- .../loadors/FloatingObjectNodeChildLoador.java | 2 +- .../loadors/ProgramLonglineNodeChildLoador.java | 24 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 24 +- .../loadors/ReferenceCommonNodeChildLoador.java | 6 +- .../loadors/ReferenceLonglineNodeChildLoador.java | 6 +- .../loadors/ReferenceSeineNodeChildLoador.java | 6 +- .../ui/tree/loadors/RootNodeChildLoador.java | 21 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 19 +- .../MoveActivityLonglineNodeMenuPopulator.java | 5 +- .../menu/MoveActivitySeineNodeMenuPopulator.java | 5 +- .../ui/tree/menu/MoveRouteNodeMenuPopulator.java | 5 +- .../ui/tree/menu/MoveTripNodeMenuPopulator.java | 5 +- .../ird/observe/ui/util/DecoratedNodeEntity.java | 5 +- .../ui/util/decorator/DataReferenceDecorator.java | 45 + .../ui/util/decorator/ObserveDecorator.java | 14 +- ...tor.java => ReferentialReferenceDecorator.java} | 14 +- .../dto/AbstractEspeceFieldDtoValidator.java | 6 +- .../dto/SetLonglineUniqueHomeIdDtoValidator.java | 8 +- .../dto/SetLonglineUniqueNumberDtoValidator.java | 4 +- .../v1/ReferenceSetServiceController.java | 30 - .../v1/ReferentialServiceController.java | 36 +- .../ActivityLongLineEncouterServiceController.java | 4 +- ...ctivityLongLineSensorUsedServiceController.java | 4 +- .../ActivityLonglineServiceController.java | 14 +- .../v1/longline/BranchlineServiceController.java | 4 +- .../SetLonglineCatchServiceController.java | 4 +- ...LonglineDetailCompositionServiceController.java | 4 +- ...LonglineGlobalCompositionServiceController.java | 4 +- .../v1/longline/SetLonglineServiceController.java | 10 +- .../v1/longline/TdrServiceController.java | 4 +- .../TripLonglineGearUseServiceController.java | 4 +- .../v1/longline/TripLonglineServiceController.java | 16 +- ...tivitySeineObservedSystemServiceController.java | 4 +- .../v1/seine/ActivitySeineServiceController.java | 14 +- .../v1/seine/FloatingObjectServiceController.java | 14 +- .../v1/seine/NonTargetCatchServiceController.java | 4 +- .../v1/seine/NonTargetSampleServiceController.java | 4 +- .../ObjectObservedSpeciesServiceController.java | 4 +- .../ObjectSchoolEstimateServiceController.java | 4 +- .../v1/seine/RouteServiceController.java | 14 +- .../v1/seine/SchoolEstimateServiceController.java | 4 +- .../v1/seine/SetSeineServiceController.java | 10 +- .../v1/seine/TargetCatchServiceController.java | 4 +- .../v1/seine/TargetSampleServiceController.java | 4 +- ...TransmittingBuoyOperationServiceController.java | 4 +- .../seine/TripSeineGearUseServiceController.java | 4 +- .../v1/seine/TripSeineServiceController.java | 16 +- .../ObserveReferenceSetRequestInjector.java | 8 +- .../entities/constants/ReferenceLocale.java | 134 -- .../longline/ActivityLonglineTopiaDao.java | 20 +- .../entities/longline/TripLonglineTopiaDao.java | 22 +- .../migration/AbstractDataSourceMigration.java | 4 +- .../DataSourceMigrationForVersion_5_0_1.java | 72 + .../referentiel/I18nReferenceEntities.java | 54 +- .../entities/referentiel/ProgramTopiaDao.java | 23 +- .../entities/referentiel/ReferenceEntities.java | 67 +- .../entities/seine/ActivitySeineTopiaDao.java | 20 +- .../ird/observe/entities/seine/ActivitySeines.java | 6 +- .../entities/seine/FloatingObjectTopiaDao.java | 24 +- .../observe/entities/seine/TripSeineTopiaDao.java | 51 +- .../fr/ird/observe/entities/seine/TripSeines.java | 6 +- .../db/5.0.1/add_lastUpdate_field_2-H2.sql | 2 + .../db/5.0.1/add_lastUpdate_field_2-PG.sql | 2 + observe-entities/src/main/xmi/observe-seine.zargo | Bin 84457 -> 85015 bytes .../services/service/ObserveReferentialCache.java | 151 +- .../services/service/ReferenceSetService.java | 28 - .../services/service/ReferenceSetsRequest.java | 37 + .../services/service/ReferentialService.java | 25 +- .../actions/validate/ValidateResultForDto.java | 8 +- .../actions/validate/ValidateResultForDtoType.java | 4 +- .../longline/ActivityLongLineEncouterService.java | 4 +- .../ActivityLongLineSensorUsedService.java | 4 +- .../service/longline/ActivityLonglineService.java | 14 +- .../service/longline/BranchlineService.java | 4 +- .../service/longline/SetLonglineCatchService.java | 4 +- .../SetLonglineDetailCompositionService.java | 4 +- .../SetLonglineGlobalCompositionService.java | 4 +- .../service/longline/SetLonglineService.java | 10 +- .../services/service/longline/TdrService.java | 4 +- .../longline/TripLonglineGearUseService.java | 4 +- .../service/longline/TripLonglineService.java | 16 +- .../seine/ActivitySeineObservedSystemService.java | 4 +- .../service/seine/ActivitySeineService.java | 14 +- .../service/seine/FloatingObjectService.java | 14 +- .../service/seine/NonTargetCatchService.java | 4 +- .../service/seine/NonTargetSampleService.java | 4 +- .../seine/ObjectObservedSpeciesService.java | 4 +- .../service/seine/ObjectSchoolEstimateService.java | 4 +- .../services/service/seine/RouteService.java | 14 +- .../service/seine/SchoolEstimateService.java | 4 +- .../services/service/seine/SetSeineService.java | 10 +- .../services/service/seine/TargetCatchService.java | 4 +- .../service/seine/TargetSampleService.java | 4 +- .../seine/TransmittingBuoyOperationService.java | 4 +- .../service/seine/TripSeineGearUseService.java | 4 +- .../services/service/seine/TripSeineService.java | 16 +- .../observe/services/dto/AbstractReference.java | 163 ++ .../observe/services/dto/AbstractReferenceSet.java | 68 + .../fr/ird/observe/services/dto/DataReference.java | 71 + ...otFoundException.java => DataReferenceSet.java} | 41 +- .../java/fr/ird/observe/services/dto/Form.java | 95 + .../java/fr/ird/observe/services/dto/FormDto.java | 171 -- .../java/fr/ird/observe/services/dto/FormDtos.java | 44 - .../java/fr/ird/observe/services/dto/IdDtos.java | 28 +- .../fr/ird/observe/services/dto/ReferenceDto.java | 181 -- .../fr/ird/observe/services/dto/ReferenceDtos.java | 128 -- .../ird/observe/services/dto/ReferenceSetDto.java | 126 -- .../ird/observe/services/dto/ReferenceSetDtos.java | 86 - .../services/dto/constants/ReferentialLocale.java | 26 +- .../observe/services/dto/gson/FormDtoAdapter.java | 34 - .../services/dto/gson/ObserveDtoGsonSupplier.java | 29 +- .../dto/gson/ObserveReferenceSetAdapter.java | 122 -- .../services/dto/gson/ReferenceDtoAdapter.java | 133 -- .../dto/gson/ReferentialReferenceDtoAdapter.java | 57 - .../services/dto/gson/ReportVariableAdapter.java | 13 +- .../gson/reference/AbstractReferenceAdapter.java | 131 ++ .../reference/AbstractReferenceSetAdapter.java | 83 + .../dto/gson/reference/DataReferenceAdapter.java | 49 + .../gson/reference/DataReferenceSetAdapter.java | 37 + .../reference/ReferentialReferenceAdapter.java | 100 + .../reference/ReferentialReferenceSetAdapter.java | 50 + .../dto/longline/ActivityLonglineDtos.java | 24 - .../dto/longline/LonglinePositionAwareDto.java | 14 +- .../services/dto/longline/TripLonglineDtos.java | 27 - .../dto/reference/DataReferenceSetDefinitions.java | 163 ++ .../services/dto/reference/ObserveReference.java | 61 - .../dto/reference/ObserveReferenceSet.java | 125 -- .../dto/reference/ObserveReferenceSetRequest.java | 43 - .../dto/reference/ObserveReferenceSetResult.java | 72 - .../dto/reference/ObserveReferentialReference.java | 89 - .../dto/reference/ReferenceBinderEngine.java | 22 + .../reference/ReferenceBinderEngineSupplier.java | 41 + ...Definition.java => ReferenceSetDefinition.java} | 14 +- ...ava => ReferentialReferenceSetDefinitions.java} | 82 +- .../builder/AbstractToReferenceBuilder.java | 110 ++ .../reference/builder/DataToReferenceBuilder.java | 47 + .../builder/ReferentialToReferenceBuilder.java | 97 + .../ObserveReferenceSetRequestDefinition.java | 53 - .../ObserveReferenceSetRequestDefinitions.java | 391 ---- .../request/ReferenceSetRequestDefinition.java | 87 + .../request/ReferenceSetRequestDefinitions.java | 371 ++++ .../ReferenceSetRequestKeyDefinition.java} | 30 +- .../dto/referential/I18nReferentialDtos.java | 42 + .../services/dto/referential/PersonDtos.java | 31 +- .../services/dto/referential/ProgramDtos.java | 32 +- .../services/dto/referential/ReferentialDtos.java | 16 +- .../dto/referential/ReferentialReference.java | 93 + .../dto/referential/ReferentialReferenceDto.java | 120 -- .../dto/referential/ReferentialReferenceDtos.java | 48 - .../dto/referential/ReferentialReferenceSet.java | 68 + .../services/dto/result/SaveResultDtos.java | 2 +- .../services/dto/seine/ActivitySeineDtos.java | 22 - .../services/dto/seine/FloatingObjectDtos.java | 26 - .../seine/FloatingObjectTransmittingBuoyDto.java | 4 +- .../ird/observe/services/dto/seine/RouteDtos.java | 21 - .../observe/services/dto/seine/TripSeineDtos.java | 28 - .../xmi/observe-services-dto-common.properties | 17 +- .../src/main/xmi/observe-services-dto-common.zargo | Bin 42562 -> 43178 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 66568 -> 64456 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 62122 -> 59797 bytes .../services/service/AbstractServiceRestTest.java | 81 +- .../service/ReferenceSetServiceRestTest.java | 96 - .../service/ReferenceValuesSetServiceRestTest.java | 90 + .../service/ReferentialServiceRestTest.java | 22 +- .../report/AbstractReportServiceRestTest.java | 4 +- .../seine/TripSeineGearUseServiceRestTest.java | 32 +- .../service/seine/TripSeineServiceRestTest.java | 72 +- .../services/ObserveServiceFactoryTopia.java | 27 +- .../ird/observe/services/ObserveServiceTopia.java | 591 ++---- .../ird/observe/services/binder/BinderEngine.java | 228 +++ .../services/binder/BinderEngineInitializer.java | 1149 ++++++++++++ .../ird/observe/services/binder/BinderSupport.java | 269 +++ .../binder/ReferenceBinderEngineSupplierTopia.java | 18 + .../binder/data/ActivityLonglineBinder.java | 71 + .../data/ActivityLonglineEncouterDtoBinder.java | 56 + .../data/ActivityLonglineSensorUsedDtoBinder.java | 42 + .../binder/data/ActivityLonglineStubDtoBinder.java | 37 + .../services/binder/data/ActivitySeineBinder.java | 99 + .../data/ActivitySeineObservedSystemDtoBinder.java | 42 + .../binder/data/ActivitySeineStubDtoBinder.java | 40 + .../binder/data/BaitsCompositionBinder.java | 48 + .../observe/services/binder/data/BasketBinder.java | 60 + .../services/binder/data/BranchlineBinder.java | 108 ++ .../binder/data/BranchlinesCompositionBinder.java | 44 + .../services/binder/data/CatchLonglineBinder.java | 123 ++ .../services/binder/data/DataBinderSupport.java | 223 +++ .../services/binder/data/EncounterBinder.java | 64 + .../services/binder/data/FloatingObjectBinder.java | 67 + .../FloatingObjectObservedSpeciesDtoBinder.java | 39 + .../FloatingObjectSchoolEstimateDtoBinder.java | 39 + .../FloatingObjectTransmittingBuoyDtoBinder.java | 39 + .../binder/data/FloatlinesCompositionBinder.java | 42 + .../binder/data/GearUseFeaturesLonglineBinder.java | 46 + .../GearUseFeaturesMeasurementLonglineBinder.java | 40 + .../GearUseFeaturesMeasurementSeineBinder.java | 41 + .../binder/data/GearUseFeaturesSeineBinder.java | 47 + .../binder/data/HooksCompositionBinder.java | 46 + .../services/binder/data/NonTargetCatchBinder.java | 84 + .../binder/data/NonTargetLengthBinder.java | 57 + .../binder/data/NonTargetSampleBinder.java | 39 + .../binder/data/ObjectObservedSpeciesBinder.java | 47 + .../binder/data/ObjectSchoolEstimateBinder.java | 39 + .../observe/services/binder/data/RouteBinder.java | 64 + .../services/binder/data/RouteStubDtoBinder.java | 39 + .../services/binder/data/SchoolEstimateBinder.java | 62 + .../services/binder/data/SectionBinder.java | 56 + .../services/binder/data/SensorUsedBinder.java | 53 + .../services/binder/data/SetLonglineBinder.java | 135 ++ .../binder/data/SetLonglineCatchDtoBinder.java | 39 + .../SetLonglineDetailCompositionDtoBinder.java | 54 + .../SetLonglineGlobalCompositionDtoBinder.java | 58 + .../binder/data/SetLonglineStubDtoBinder.java | 34 + .../binder/data/SetLonglineTdrDtoBinder.java | 37 + .../services/binder/data/SetSeineBinder.java | 89 + .../data/SetSeineNonTargetCatchDtoBinder.java | 36 + .../data/SetSeineSchoolEstimateDtoBinder.java | 40 + .../binder/data/SetSeineTargetCatchDtoBinder.java | 39 + .../services/binder/data/SizeMeasureBinder.java | 40 + .../services/binder/data/TargetCatchBinder.java | 55 + .../services/binder/data/TargetLengthBinder.java | 76 + .../services/binder/data/TargetSampleBinder.java | 44 + .../observe/services/binder/data/TdrBinder.java | 100 + .../binder/data/TransmittingBuoyBinder.java | 63 + .../binder/data/TripLonglineActivityDtoBinder.java | 35 + .../services/binder/data/TripLonglineBinder.java | 102 + .../binder/data/TripLonglineGearUseDtoBinder.java | 39 + .../services/binder/data/TripSeineBinder.java | 103 + .../binder/data/TripSeineGearUseDtoBinder.java | 39 + .../services/binder/data/WeightMeasureBinder.java | 39 + .../referential/BaitHaulingStatusBinder.java | 50 + .../referential/BaitSettingStatusBinder.java | 50 + .../binder/referential/BaitTypeBinder.java | 50 + .../referential/CatchFateLonglineBinder.java | 50 + .../services/binder/referential/CountryBinder.java | 54 + .../binder/referential/DetectionModeBinder.java | 50 + .../binder/referential/EncounterTypeBinder.java | 50 + .../services/binder/referential/FpaZoneBinder.java | 54 + .../services/binder/referential/GearBinder.java | 53 + .../referential/GearCaracteristicBinder.java | 60 + .../referential/GearCaracteristicTypeBinder.java | 50 + .../services/binder/referential/HarbourBinder.java | 62 + .../binder/referential/HealthnessBinder.java | 50 + .../binder/referential/HookPositionBinder.java | 50 + .../binder/referential/HookSizeBinder.java | 54 + .../binder/referential/HookTypeBinder.java | 50 + .../referential/ItemHorizontalPositionBinder.java | 54 + .../referential/ItemVerticalPositionBinder.java | 54 + .../referential/LengthWeightParameterBinder.java | 71 + .../binder/referential/LightsticksColorBinder.java | 50 + .../binder/referential/LightsticksTypeBinder.java | 50 + .../binder/referential/LineTypeBinder.java | 50 + .../binder/referential/MaturityStatusBinder.java | 54 + .../binder/referential/MitigationTypeBinder.java | 50 + .../binder/referential/ObjectFateBinder.java | 50 + .../binder/referential/ObjectOperationBinder.java | 50 + .../binder/referential/ObjectTypeBinder.java | 50 + .../binder/referential/ObservedSystemBinder.java | 56 + .../services/binder/referential/OceanBinder.java | 50 + .../binder/referential/OrganismBinder.java | 60 + .../services/binder/referential/PersonBinder.java | 72 + .../services/binder/referential/ProgramBinder.java | 86 + .../binder/referential/ReasonForDiscardBinder.java | 54 + .../referential/ReasonForNoFishingBinder.java | 54 + .../binder/referential/ReasonForNullSetBinder.java | 54 + .../referential/ReferentialBinderSupport.java | 150 ++ .../binder/referential/SensorBrandBinder.java | 56 + .../binder/referential/SensorDataFormatBinder.java | 54 + .../binder/referential/SensorTypeBinder.java | 54 + .../binder/referential/SettingShapeBinder.java | 54 + .../services/binder/referential/SexBinder.java | 54 + .../binder/referential/SizeMeasureTypeBinder.java | 54 + .../services/binder/referential/SpeciesBinder.java | 86 + .../binder/referential/SpeciesFateBinder.java | 54 + .../binder/referential/SpeciesGroupBinder.java | 54 + .../binder/referential/SpeciesListBinder.java | 54 + .../binder/referential/SpeciesStatusBinder.java | 54 + .../binder/referential/StomacFullnessBinder.java | 54 + .../referential/SurroundingActivityBinder.java | 54 + .../TransmittingBuoyOperationBinder.java | 54 + .../referential/TransmittingBuoyTypeBinder.java | 54 + .../binder/referential/TripTypeBinder.java | 54 + .../referential/VesselActivityLonglineBinder.java | 54 + .../referential/VesselActivitySeineBinder.java | 54 + .../services/binder/referential/VesselBinder.java | 84 + .../referential/VesselSizeCategoryBinder.java | 60 + .../binder/referential/VesselTypeBinder.java | 54 + .../binder/referential/WeightCategoryBinder.java | 60 + .../referential/WeightMeasureTypeBinder.java | 54 + .../services/binder/referential/WindBinder.java | 57 + .../services/builder/DtoToEntityBuilder.java | 273 --- .../services/builder/EntityToDtoBuilder.java | 328 ---- .../builder/EntityToReferenceDtoBuilder.java | 98 - .../EntityToReferentialReferenceDtoBuilder.java | 122 -- .../observe/services/dto/ObserveDtoBinders.java | 62 - .../services/dto/ObserveDtosInitializer.java | 1962 -------------------- .../observe/services/dto/ReferenceTypeName.java | 49 - .../dto/reference/ObserveReferenceSetBuilder.java | 262 --- .../services/service/ReferenceSetServiceTopia.java | 170 -- .../services/service/ReferentialServiceTopia.java | 221 +-- .../ConsolidateActivitySeineDataResultBuilder.java | 14 +- .../consolidate/ConsolidateDataServiceTopia.java | 10 +- .../service/actions/report/ReportServiceTopia.java | 62 +- .../GenerateValidatorDescriptorsFileTool.java | 22 +- .../actions/validate/ValidateServiceTopia.java | 68 +- .../validate/ValidationMessageDetector.java | 8 +- .../ActivityLongLineEncouterServiceTopia.java | 20 +- .../ActivityLongLineSensorUsedServiceTopia.java | 22 +- .../longline/ActivityLonglineServiceTopia.java | 112 +- .../service/longline/BranchlineServiceTopia.java | 26 +- .../longline/SetLonglineCatchServiceTopia.java | 114 +- .../SetLonglineDetailCompositionServiceTopia.java | 35 +- .../SetLonglineGlobalCompositionServiceTopia.java | 26 +- .../service/longline/SetLonglineServiceTopia.java | 73 +- .../services/service/longline/TdrServiceTopia.java | 114 +- .../longline/TripLonglineGearUseServiceTopia.java | 24 +- .../service/longline/TripLonglineServiceTopia.java | 125 +- .../ActivitySeineObservedSystemServiceTopia.java | 22 +- .../service/seine/ActivitySeineServiceTopia.java | 130 +- .../service/seine/FloatingObjectServiceTopia.java | 106 +- .../service/seine/NonTargetCatchServiceTopia.java | 34 +- .../service/seine/NonTargetSampleServiceTopia.java | 52 +- .../seine/ObjectObservedSpeciesServiceTopia.java | 22 +- .../seine/ObjectSchoolEstimateServiceTopia.java | 29 +- .../services/service/seine/RouteServiceTopia.java | 106 +- .../service/seine/SchoolEstimateServiceTopia.java | 26 +- .../service/seine/SetSeineServiceTopia.java | 61 +- .../service/seine/TargetCatchServiceTopia.java | 45 +- .../service/seine/TargetSampleServiceTopia.java | 56 +- .../TransmittingBuoyOperationServiceTopia.java | 25 +- .../seine/TripSeineGearUseServiceTopia.java | 24 +- .../service/seine/TripSeineServiceTopia.java | 123 +- ...ces.dto.reference.ReferenceBinderEngineSupplier | 1 + .../services/ApplicationContextResource.java | 2 - .../services/binder/BinderEngineMetadataTest.java | 167 ++ .../observe/services/binder/BinderEngineTest.java | 374 ++++ .../services/binder/ReferenceBinderEngineTest.java | 25 + .../services/builder/DtoToEntityBuilderTest.java | 214 --- .../services/builder/EntityToDtoBuilderTest.java | 250 --- ...EntityToReferentialReferenceDtoBuilderTest.java | 90 - .../services/service/AbstractServiceTopiaTest.java | 38 +- .../DataSourceDumpProducerServiceTopiaTest.java | 3 + .../service/DataSourceServiceTopiaTest.java | 38 +- .../service/ReferenceSetServiceTopiaTest.java | 57 - .../service/ReferentialServiceTopiaTest.java | 148 +- .../fr/ird/observe/services/service/RigthTest.java | 13 +- .../report/AbstractReportServiceTopiaTest.java | 12 +- .../report/ReportAccessoryCatchByGroupTest.java | 3 +- .../actions/report/ReportAccessoryCatchTest.java | 3 +- .../report/ReportActivityWithCommentTest.java | 3 +- .../actions/report/ReportAllActivitysTest.java | 3 +- .../actions/report/ReportDailySetAndCatchTest.java | 3 +- .../service/actions/report/ReportDcpUsageTest.java | 3 +- .../actions/report/ReportSetByAssociationTest.java | 3 +- .../report/ReportTargetCatchByAssociationTest.java | 12 +- .../ReportTargetDiscardedByAssociationTest.java | 12 +- ...tLonglineDetailCompositionServiceTopiaTest.java | 50 +- .../service/seine/RouteServiceTopiaTest.java | 8 +- .../seine/TargetSampleServiceTopiaTest.java | 21 +- .../seine/TripSeineGearUseServiceTopiaTest.java | 79 +- .../service/seine/TripSeineServiceTopiaTest.java | 156 +- pom.xml | 4 +- 523 files changed, 16095 insertions(+), 11611 deletions(-) copy observe-application-swing/src/main/java/fr/ird/observe/ui/tree/{DtoNodeSupport.java => AbstrctReferenceNodeSupport.java} (55%) rename observe-application-swing/src/main/java/fr/ird/observe/ui/tree/{DtoNodeSupport.java => DataReferenceNodeSupport.java} (53%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ReferentialReferenceNodeSupport.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractDataReferenceChildLoador.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/AbstractReferenceDtoChildLoador.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/DataReferenceDecorator.java rename observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/{ReferenceDecorator.java => ReferentialReferenceDecorator.java} (66%) delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferenceSetServiceController.java delete mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/constants/ReferenceLocale.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0_1.java create mode 100644 observe-entities/src/main/resources/db/5.0.1/add_lastUpdate_field_2-H2.sql create mode 100644 observe-entities/src/main/resources/db/5.0.1/add_lastUpdate_field_2-PG.sql delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/ReferenceSetService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/ReferenceSetsRequest.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/AbstractReference.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/AbstractReferenceSet.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/DataReference.java rename observe-services-model/src/main/java/fr/ird/observe/services/dto/{ReferenceSetNotFoundException.java => DataReferenceSet.java} (54%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/Form.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDto.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDtos.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDto.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDtos.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/FormDtoAdapter.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveReferenceSetAdapter.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReferenceDtoAdapter.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReferentialReferenceDtoAdapter.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceSetAdapter.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceAdapter.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceSetAdapter.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceAdapter.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceSetAdapter.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineDtos.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/TripLonglineDtos.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReference.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSet.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSetRequest.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSetResult.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferentialReference.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngine.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngineSupplier.java rename observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/{definition/ObserveReferenceSetDefinition.java => ReferenceSetDefinition.java} (77%) rename observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/{definition/ObserveReferenceSetDefinitions.java => ReferentialReferenceSetDefinitions.java} (81%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/builder/AbstractToReferenceBuilder.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/builder/DataToReferenceBuilder.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/builder/ReferentialToReferenceBuilder.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetRequestDefinition.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetRequestDefinitions.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinition.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java rename observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/{definition/ObserveReferenceSetRequestKeyDefinition.java => request/ReferenceSetRequestKeyDefinition.java} (59%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/I18nReferentialDtos.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReference.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDto.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDtos.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceSet.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDtos.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectDtos.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDtos.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TripSeineDtos.java delete mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/service/ReferenceSetServiceRestTest.java create mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/service/ReferenceValuesSetServiceRestTest.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngine.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderSupport.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/ReferenceBinderEngineSupplierTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineEncouterDtoBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineSensorUsedDtoBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivityLonglineStubDtoBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineObservedSystemDtoBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineStubDtoBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BaitsCompositionBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BasketBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BranchlineBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/BranchlinesCompositionBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/CatchLonglineBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/DataBinderSupport.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/EncounterBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectObservedSpeciesDtoBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectSchoolEstimateDtoBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/FloatlinesCompositionBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesLonglineBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesMeasurementLonglineBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesMeasurementSeineBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/GearUseFeaturesSeineBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/HooksCompositionBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetCatchBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetLengthBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/NonTargetSampleBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ObjectObservedSpeciesBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ObjectSchoolEstimateBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/RouteStubDtoBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SchoolEstimateBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SectionBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SensorUsedBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineCatchDtoBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineDetailCompositionDtoBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineGlobalCompositionDtoBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineStubDtoBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetLonglineTdrDtoBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineNonTargetCatchDtoBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineSchoolEstimateDtoBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SetSeineTargetCatchDtoBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/SizeMeasureBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetCatchBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetLengthBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TargetSampleBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TdrBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TransmittingBuoyBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineActivityDtoBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripLonglineGearUseDtoBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TripSeineGearUseDtoBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/WeightMeasureBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/BaitHaulingStatusBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/BaitSettingStatusBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/BaitTypeBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/CatchFateLonglineBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/CountryBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/DetectionModeBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/EncounterTypeBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/FpaZoneBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearCaracteristicBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearCaracteristicTypeBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/HarbourBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/HealthnessBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/HookPositionBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/HookSizeBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/HookTypeBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ItemHorizontalPositionBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ItemVerticalPositionBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/LengthWeightParameterBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/LightsticksColorBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/LightsticksTypeBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/LineTypeBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/MaturityStatusBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/MitigationTypeBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObjectFateBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObjectOperationBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObjectTypeBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ObservedSystemBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/OceanBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/OrganismBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/PersonBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ProgramBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReasonForDiscardBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReasonForNoFishingBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReasonForNullSetBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SensorBrandBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SensorDataFormatBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SensorTypeBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SettingShapeBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SexBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SizeMeasureTypeBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesFateBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesGroupBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesListBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SpeciesStatusBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/StomacFullnessBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/SurroundingActivityBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/TransmittingBuoyOperationBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/TransmittingBuoyTypeBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/TripTypeBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselActivityLonglineBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselActivitySeineBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselSizeCategoryBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/VesselTypeBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/WeightCategoryBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/WeightMeasureTypeBinder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/WindBinder.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToReferenceDtoBuilder.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToReferentialReferenceDtoBuilder.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtoBinders.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/dto/ReferenceTypeName.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSetBuilder.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferenceSetServiceTopia.java create mode 100644 observe-services-topia/src/main/resources/META-INF/services/fr.ird.observe.services.dto.reference.ReferenceBinderEngineSupplier create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/binder/ReferenceBinderEngineTest.java delete mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/builder/DtoToEntityBuilderTest.java delete mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/builder/EntityToDtoBuilderTest.java delete mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/builder/EntityToReferentialReferenceDtoBuilderTest.java delete mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferenceSetServiceTopiaTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 11

branch feature/7739 updated (b42e495 -> f9047bd)
by codelutin.com scm 26 Nov '15

26 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7739 in repository observe. See http://git.codelutin.com/observe.git from b42e495 ajout de tests (refs #7739) new f9047bd debut du remplacement des ref obsolètes (refs #7739) 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 f9047bdd8b5374fc9694082e08ba56b022f78e91 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Nov 26 10:17:38 2015 +0100 debut du remplacement des ref obsolètes (refs #7739) Summary of changes: .../synchro/SynchronizationServiceController.java | 7 ++ .../synchro/PropertyReplacementDefinition.java | 37 +++++++++ .../actions/synchro/SynchronizationService.java | 3 + .../java/fr/ird/observe/services/dto/DtoMap.java | 13 ++++ .../synchro/SynchronizationServiceTopia.java | 49 ++++++++++++ .../synchro/SynchronizationServiceTopiaTest.java | 87 ++++++++++++++++++++++ 6 files changed, 196 insertions(+) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/PropertyReplacementDefinition.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/refactor_reference updated (55c4670 -> 8c38c6e)
by codelutin.com scm 21 Nov '15

21 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/refactor_reference in repository observe. See http://git.codelutin.com/observe.git from 55c4670 Fix test new 8c38c6e Fix test 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 8c38c6e1a5e9471222753fca0dd4e4c72e15e98f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 21 18:37:26 2015 +0100 Fix test Summary of changes: .../observe/services/service/seine/TripSeineGearUseServiceRestTest.java | 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)list.forge.codelutin.com>.

1 1

branch feature/refactor_reference updated (0ffc6cb -> 55c4670)
by codelutin.com scm 21 Nov '15

21 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/refactor_reference in repository observe. See http://git.codelutin.com/observe.git from 0ffc6cb - Suppression des méthodes getDecorator du context applicatif (ce n'est pas le role du context de décorer ou fournir des décorateurs mais celui du DecoratorService) - Arrêter d'exposer comment on récupère un décorateur de référence, on le code une fois pour toute dans DecoratorService et on s'en sert partout ailleurs (ce n'est certainement pas à un handler d'ui à savoir comment récupérer un décorateur...) - Revue un peu des actions pour déplacer les noeuds (manque de [...] new 55c4670 Fix test 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 55c4670ed229c4a8683cf3cb62f787b5a8b829e1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 21 14:33:10 2015 +0100 Fix test Summary of changes: .../seine/TripSeineGearUseServiceTopiaTest.java | 47 ---------------------- 1 file changed, 47 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/refactor_reference updated (7235469 -> 0ffc6cb)
by codelutin.com scm 21 Nov '15

21 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/refactor_reference in repository observe. See http://git.codelutin.com/observe.git from 7235469 Impact dans les handlers dues aux renommages de l'API des services + début d'utilisation des bons objets là où il faut : si j'ai un ReferentialReference et bien je veux m'en servir; toujours être le plus précis possible) new 26c02d7 Dans une référence, on n'expose pas d'autres références, on récupère juste l'id (si possible) new 0ffc6cb - Suppression des méthodes getDecorator du context applicatif (ce n'est pas le role du context de décorer ou fournir des décorateurs mais celui du DecoratorService) - Arrêter d'exposer comment on récupère un décorateur de référence, on le code une fois pour toute dans DecoratorService et on s'en sert partout ailleurs (ce n'est certainement pas à un handler d'ui à savoir comment récupérer un décorateur...) - Revue un peu des actions pour déplacer les noeuds (manque de [...] 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 0ffc6cb156f4c129f47a013641f95d3fc5e64466 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 21 12:59:34 2015 +0100 - Suppression des méthodes getDecorator du context applicatif (ce n'est pas le role du context de décorer ou fournir des décorateurs mais celui du DecoratorService) - Arrêter d'exposer comment on récupère un décorateur de référence, on le code une fois pour toute dans DecoratorService et on s'en sert partout ailleurs (ce n'est certainement pas à un handler d'ui à savoir comment récupérer un décorateur...) - Revue un peu des actions pour déplacer les noeuds (manque de précision, c'est facile de faire des casts sauvages, mais après on ne sait pas sur quoi on bosse, essayer toujours d'être le plus précis possible) - Les premiers écrans avec tableaux sur la seine refonctionne \o/ (il faut absoluement supprimer les references de references lorsqu'on remonte des dto, remonter juste l'id suffit, ensuite l'ui connait les référeniels et donc sait retrouver la référence complète si besoin...) Je me demande même si on ne devrait pas juste remonter que des ids pour toutes les références et on reconstruit côté applicatif... commit 26c02d75104857d6a517f90977c7bb1142e5bcea Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 21 11:56:52 2015 +0100 Dans une référence, on n'expose pas d'autres références, on récupère juste l'id (si possible) Summary of changes: .../observe/ObserveSwingApplicationContext.java | 32 +---- .../java/fr/ird/observe/ui/DecoratorService.java | 47 ++++--- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 19 ++- .../ird/observe/ui/actions/ShowConfigAction.java | 2 +- .../shared/MoveActivityLonglinesUIAction.java | 27 ++-- .../actions/shared/MoveActivitySeinesUIAction.java | 18 +-- .../ui/actions/shared/MoveRoutesUIAction.java | 13 +- .../ui/actions/shared/MoveTripsUIAction.java | 45 ++---- .../observe/ui/admin/export/ExportUIHandler.java | 5 +- .../ui/admin/gps/GPSActivityTableModel.java | 2 +- .../ird/observe/ui/content/ContentUIHandler.java | 13 +- .../observe/ui/content/ContentUIInitializer.java | 25 ++-- .../fr/ird/observe/ui/content/ContentUIModel.java | 22 +++ .../ui/content/impl/seine/SetSeineUIHandler.java | 6 +- .../ui/content/table/ContentTableModel.java | 4 + .../ui/content/table/ContentTableUIHandler.java | 62 +++++++- .../impl/longline/BaitsCompositionUIHandler.java | 6 +- .../longline/BranchlinesCompositionUIHandler.java | 5 +- .../impl/longline/CatchLonglineUIHandler.java | 23 +-- .../table/impl/longline/EncounterUIHandler.java | 5 +- .../longline/FloatlinesCompositionUIHandler.java | 4 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 4 +- .../impl/longline/HooksCompositionUIHandler.java | 5 +- .../impl/longline/LonglinePositionHelper.java | 4 +- .../table/impl/longline/SensorUsedUIHandler.java | 7 +- .../content/table/impl/longline/TdrUIHandler.java | 23 +-- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 4 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 7 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 7 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 5 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 3 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 3 +- .../table/impl/seine/TargetCatchUIHandler.java | 69 ++++----- .../impl/seine/TargetDiscardCatchUIHandler.java | 156 +++++++++------------ .../table/impl/seine/TargetSampleUIHandler.java | 5 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 2 +- .../MoveActivityLonglineNodeMenuPopulator.java | 18 ++- .../menu/MoveActivitySeineNodeMenuPopulator.java | 18 ++- .../ui/tree/menu/MoveRouteNodeMenuPopulator.java | 18 ++- .../ui/tree/menu/MoveTripNodeMenuPopulator.java | 44 +++--- .../fr/ird/observe/ui/usage/UsagesUIHandler.java | 2 +- .../ird/observe/ui/util/DecoratedNodeEntity.java | 18 +-- ...tchDecorator.java => TargetCatchDecorator.java} | 12 +- .../dto/ActivitySimpleSpeedDtoValidator.java | 6 +- .../validator/dto/ActivitySpeedDtoValidator.java | 4 +- .../dto/SetLonglineUniqueHomeIdDtoValidator.java | 2 +- .../dto/SetLonglineUniqueNumberDtoValidator.java | 2 +- .../dto/reference/ObserveReferenceSetBuilder.java | 7 +- 48 files changed, 439 insertions(+), 401 deletions(-) copy observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/{NonTargetCatchDecorator.java => TargetCatchDecorator.java} (81%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 2

branch feature/refactor_reference updated (ad00d80 -> 7235469)
by codelutin.com scm 21 Nov '15

21 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/refactor_reference in repository observe. See http://git.codelutin.com/observe.git from ad00d80 little improvments new 33e0b82 Ajout d'un message sur l'exception new 6af8c2c enabled et needComment ne sont pas des propriétés techniques, on doit les recopier à chaque fois new 8f0094f recharger les ensembles de références à l'ouverture d'un écran de type table new 0fb6505 Suppression de la méthode loadForRead (vu qu'elle n'a plus de raison d'être si les referenceSets sont gérés au niveau de l'application) + renommage de loadForEdit en loadFrom + réorganisation des méthodes new 2d620b8 Impact du changement de l'API des services sur l'implatantion webmotion new c91d3de Impact du changement de l'API des services sur l'implatantion webmotion new 6b02894 Ajout propriétés sur le FormDto, revue du constructeur et de l'adapter json (on ne deserialise plus les labels qui de toute façon seront supprimés au prochain wagon...) new 887b090 Ajout de requetes manquantes + aussi de définition l'ensemble de références new a89286e Utilisation des requetes dans les formulaires (en fait juste passé le nom de la requete) et ne plus calculer les labels dans le formulaire new bbc5db8 Fix some tests new 7235469 Impact dans les handlers dues aux renommages de l'API des services + début d'utilisation des bons objets là où il faut : si j'ai un ReferentialReference et bien je veux m'en servir; toujours être le plus précis possible) The 11 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 72354693d1f7b6dd25d302ba45b1fcdcd8e54e19 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 21 08:27:57 2015 +0100 Impact dans les handlers dues aux renommages de l'API des services + début d'utilisation des bons objets là où il faut : si j'ai un ReferentialReference et bien je veux m'en servir; toujours être le plus précis possible) commit bbc5db8a99377d090ab685f53772ed85d865016e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 21 08:26:17 2015 +0100 Fix some tests commit a89286eb4960047b105e0a9683c41b229aa2001e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 21 08:25:58 2015 +0100 Utilisation des requetes dans les formulaires (en fait juste passé le nom de la requete) et ne plus calculer les labels dans le formulaire commit 887b0905b397e152fd722ea5d0ec28b1215c1d5d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 21 08:22:13 2015 +0100 Ajout de requetes manquantes + aussi de définition l'ensemble de références commit 6b02894cab1b057adb9d7ba117287b9836077372 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 21 08:16:56 2015 +0100 Ajout propriétés sur le FormDto, revue du constructeur et de l'adapter json (on ne deserialise plus les labels qui de toute façon seront supprimés au prochain wagon...) commit c91d3def72ba089198fb3070bf76ac3bf7e953ba Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 21 08:14:20 2015 +0100 Impact du changement de l'API des services sur l'implatantion webmotion commit 2d620b818612f297c7c4cb2ab6aa11734fb78b40 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 21 08:12:26 2015 +0100 Impact du changement de l'API des services sur l'implatantion webmotion commit 0fb6505ab6668f1e3efcdc9d08e776c3781c9a03 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 21 08:08:17 2015 +0100 Suppression de la méthode loadForRead (vu qu'elle n'a plus de raison d'être si les referenceSets sont gérés au niveau de l'application) + renommage de loadForEdit en loadFrom + réorganisation des méthodes commit 8f0094f83f87a934427057b889849a7adeeeb4ef Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Nov 20 23:16:22 2015 +0100 recharger les ensembles de références à l'ouverture d'un écran de type table commit 6af8c2c5c6e583615a223b1a52e20c5b8067a6ee Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Nov 20 23:15:25 2015 +0100 enabled et needComment ne sont pas des propriétés techniques, on doit les recopier à chaque fois commit 33e0b828c07990542c50f3b3a22667350ec73456 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Nov 20 23:14:42 2015 +0100 Ajout d'un message sur l'exception Summary of changes: .../fr/ird/observe/ui/content/ContentUIModel.java | 14 ++ .../LonglineDetailCompositionUIHandler.java | 27 ++- .../LonglineGlobalCompositionUIHandler.java | 2 +- .../impl/longline/SetLonglineUIHandler.java | 2 +- .../ActivitySeineObservedSystemUIHandler.java | 6 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 2 +- .../impl/seine/FloatingObjectUIHandler.java | 2 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 6 +- .../impl/longline/ActivityLonglinesUIHandler.java | 2 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 2 +- .../impl/longline/ActivityLonglineUIHandler.java | 2 +- .../open/impl/longline/TripLonglineUIHandler.java | 2 +- .../open/impl/seine/ActivitySeineUIHandler.java | 2 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 2 +- .../ui/content/table/ContentTableUIHandler.java | 2 +- .../impl/longline/CatchLonglineUIHandler.java | 4 +- .../table/impl/longline/EncounterUIHandler.java | 2 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 2 +- .../table/impl/longline/SensorUsedUIHandler.java | 5 +- .../content/table/impl/longline/TdrUIHandler.java | 2 +- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 3 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 23 ++- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 7 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 22 ++- .../table/impl/seine/NonTargetSampleUI.jaxx | 5 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 12 +- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 5 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 2 +- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 3 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 2 +- .../content/table/impl/seine/SchoolEstimateUI.jaxx | 3 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 18 +- .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 7 +- .../table/impl/seine/TargetCatchUIHandler.java | 46 ++--- .../table/impl/seine/TargetDiscardCatchUI.jaxx | 9 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 138 +++++++------ .../content/table/impl/seine/TargetSampleUI.jaxx | 3 +- .../table/impl/seine/TargetSampleUIHandler.java | 5 +- .../ActivityLongLineEncouterServiceController.java | 9 +- ...ctivityLongLineSensorUsedServiceController.java | 9 +- .../ActivityLonglineServiceController.java | 17 +- .../v1/longline/BranchlineServiceController.java | 9 +- .../SetLonglineCatchServiceController.java | 9 +- ...LonglineDetailCompositionServiceController.java | 9 +- ...LonglineGlobalCompositionServiceController.java | 9 +- .../v1/longline/SetLonglineServiceController.java | 17 +- .../v1/longline/TdrServiceController.java | 9 +- .../TripLonglineGearUseServiceController.java | 9 +- .../v1/longline/TripLonglineServiceController.java | 19 +- ...tivitySeineObservedSystemServiceController.java | 9 +- .../v1/seine/ActivitySeineServiceController.java | 17 +- .../v1/seine/FloatingObjectServiceController.java | 17 +- .../v1/seine/NonTargetCatchServiceController.java | 9 +- .../v1/seine/NonTargetSampleServiceController.java | 9 +- .../ObjectObservedSpeciesServiceController.java | 9 +- .../ObjectSchoolEstimateServiceController.java | 9 +- .../v1/seine/RouteServiceController.java | 17 +- .../v1/seine/SchoolEstimateServiceController.java | 9 +- .../v1/seine/SetSeineServiceController.java | 17 +- .../v1/seine/TargetCatchServiceController.java | 9 +- .../v1/seine/TargetSampleServiceController.java | 9 +- ...TransmittingBuoyOperationServiceController.java | 9 +- .../seine/TripSeineGearUseServiceController.java | 9 +- .../v1/seine/TripSeineServiceController.java | 18 +- .../longline/ActivityLongLineEncouterService.java | 5 +- .../ActivityLongLineSensorUsedService.java | 5 +- .../service/longline/ActivityLonglineService.java | 15 +- .../service/longline/BranchlineService.java | 5 +- .../service/longline/SetLonglineCatchService.java | 5 +- .../SetLonglineDetailCompositionService.java | 5 +- .../SetLonglineGlobalCompositionService.java | 5 +- .../service/longline/SetLonglineService.java | 9 +- .../services/service/longline/TdrService.java | 5 +- .../longline/TripLonglineGearUseService.java | 5 +- .../service/longline/TripLonglineService.java | 11 +- .../seine/ActivitySeineObservedSystemService.java | 5 +- .../service/seine/ActivitySeineService.java | 9 +- .../service/seine/FloatingObjectService.java | 9 +- .../service/seine/NonTargetCatchService.java | 5 +- .../service/seine/NonTargetSampleService.java | 5 +- .../seine/ObjectObservedSpeciesService.java | 5 +- .../service/seine/ObjectSchoolEstimateService.java | 5 +- .../services/service/seine/RouteService.java | 9 +- .../service/seine/SchoolEstimateService.java | 5 +- .../services/service/seine/SetSeineService.java | 9 +- .../services/service/seine/TargetCatchService.java | 5 +- .../service/seine/TargetSampleService.java | 5 +- .../seine/TransmittingBuoyOperationService.java | 5 +- .../service/seine/TripSeineGearUseService.java | 5 +- .../services/service/seine/TripSeineService.java | 2 +- .../java/fr/ird/observe/services/dto/FormDto.java | 4 + .../java/fr/ird/observe/services/dto/FormDtos.java | 18 +- .../dto/ReferenceSetNotFoundException.java | 5 + .../fr/ird/observe/services/dto/TripMapDtos.java | 15 ++ .../observe/services/dto/gson/FormDtoAdapter.java | 12 +- .../definition/ObserveReferenceSetDefinitions.java | 23 ++- .../ObserveReferenceSetRequestDefinitions.java | 214 ++++++++++++++++++--- .../seine/TripSeineGearUseServiceRestTest.java | 6 +- .../ird/observe/services/ObserveServiceTopia.java | 94 ++------- .../services/builder/EntityToDtoBuilder.java | 6 +- .../dto/reference/ObserveReferenceSetBuilder.java | 8 +- .../services/service/ReferentialServiceTopia.java | 10 +- .../ActivityLongLineEncouterServiceTopia.java | 23 +-- .../ActivityLongLineSensorUsedServiceTopia.java | 29 +-- .../longline/ActivityLonglineServiceTopia.java | 24 +-- .../service/longline/BranchlineServiceTopia.java | 37 +--- .../longline/SetLonglineCatchServiceTopia.java | 50 +---- .../SetLonglineDetailCompositionServiceTopia.java | 32 +-- .../SetLonglineGlobalCompositionServiceTopia.java | 42 +--- .../service/longline/SetLonglineServiceTopia.java | 42 ++-- .../services/service/longline/TdrServiceTopia.java | 35 +--- .../longline/TripLonglineGearUseServiceTopia.java | 22 +-- .../service/longline/TripLonglineServiceTopia.java | 39 ++-- .../ActivitySeineObservedSystemServiceTopia.java | 19 +- .../service/seine/ActivitySeineServiceTopia.java | 25 +-- .../service/seine/FloatingObjectServiceTopia.java | 23 +-- .../service/seine/NonTargetCatchServiceTopia.java | 26 +-- .../service/seine/NonTargetSampleServiceTopia.java | 29 +-- .../seine/ObjectObservedSpeciesServiceTopia.java | 26 +-- .../seine/ObjectSchoolEstimateServiceTopia.java | 17 +- .../services/service/seine/RouteServiceTopia.java | 18 +- .../service/seine/SchoolEstimateServiceTopia.java | 23 +-- .../service/seine/SetSeineServiceTopia.java | 23 +-- .../service/seine/TargetCatchServiceTopia.java | 42 +--- .../service/seine/TargetSampleServiceTopia.java | 19 +- .../TransmittingBuoyOperationServiceTopia.java | 25 +-- .../seine/TripSeineGearUseServiceTopia.java | 22 +-- .../service/seine/TripSeineServiceTopia.java | 25 +-- ...tLonglineDetailCompositionServiceTopiaTest.java | 4 +- .../seine/TargetSampleServiceTopiaTest.java | 2 +- .../seine/TripSeineGearUseServiceTopiaTest.java | 4 +- 131 files changed, 783 insertions(+), 1246 deletions(-) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/TripMapDtos.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 11

branch feature/7739 created (now b42e495)
by codelutin.com scm 20 Nov '15

20 Nov '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7739 in repository observe. See http://git.codelutin.com/observe.git at b42e495 ajout de tests (refs #7739) This branch includes the following new commits: new b5f2d85 construction du différentiel de référéntiel dans les services (refs #7739) new b42e495 ajout de tests (refs #7739) 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 b42e49524a61611847a49cba7ff2d894880a8ddb Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Nov 20 17:24:43 2015 +0100 ajout de tests (refs #7739) commit b5f2d85b26c11d5ec0325c9f1259e70c0f034b56 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Nov 20 17:15:50 2015 +0100 construction du différentiel de référéntiel dans les services (refs #7739) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 2