This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 72efaabb02c7956d0a633735a77c3ce3e60e1839 Merge: e360d4b c6577e5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 25 14:38:44 2015 +0100 Retour sur develop pour de nouvelles aventures... Merge branch 'feature/refactor_reference' into develop .gitlab-ci.yml | 4 + .../src/license/THIRD-PARTY.properties | 36 +- .../main/java/fr/ird/observe/ObserveRunner.java | 3 +- .../observe/ObserveSwingApplicationContext.java | 53 +- .../fr/ird/observe/db/ObserveSwingDataSource.java | 161 +- .../java/fr/ird/observe/ui/DecoratorService.java | 399 ++-- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 27 +- .../ird/observe/ui/actions/ShowConfigAction.java | 42 +- .../shared/MoveActivityLonglinesUIAction.java | 40 +- .../actions/shared/MoveActivitySeinesUIAction.java | 25 +- .../ui/actions/shared/MoveRoutesUIAction.java | 28 +- .../actions/shared/MoveTripLonglinesUIAction.java | 7 +- .../ui/actions/shared/MoveTripSeinesUIAction.java | 7 +- .../ui/actions/shared/MoveTripsUIAction.java | 80 +- .../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 | 23 +- .../fr/ird/observe/ui/admin/export/TripEntry.java | 13 +- .../ui/admin/export/TripToExportTableModel.java | 13 +- .../ui/admin/gps/GPSActivityTableModel.java | 2 +- .../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 | 607 ++++-- .../observe/ui/content/ContentUIInitializer.java | 584 ++---- .../fr/ird/observe/ui/content/ContentUIModel.java | 130 +- .../ird/observe/ui/content/ObserveContentUI.java | 2 - .../ui/content/impl/longline/BranchlineUI.jaxx | 16 +- .../LonglineDetailCompositionUIHandler.java | 38 +- .../impl/longline/LonglineGlobalCompositionUI.css | 2 +- .../impl/longline/LonglineGlobalCompositionUI.jaxx | 5 +- .../LonglineGlobalCompositionUIHandler.java | 27 +- .../ui/content/impl/longline/SetLonglineUI.jaxx | 10 +- .../impl/longline/SetLonglineUIHandler.java | 27 +- .../impl/seine/ActivitySeineObservedSystemUI.css | 2 +- .../impl/seine/ActivitySeineObservedSystemUI.jaxx | 6 +- .../ActivitySeineObservedSystemUIHandler.java | 18 +- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 15 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 31 +- .../ui/content/impl/seine/FloatingObjectUI.jaxx | 8 +- .../impl/seine/FloatingObjectUIHandler.java | 28 +- .../observe/ui/content/impl/seine/SetSeineUI.jaxx | 4 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 47 +- .../ird/observe/ui/content/list/ContentListUI.css | 3 +- .../ird/observe/ui/content/list/ContentListUI.jaxx | 15 +- .../ui/content/list/ContentListUIHandler.java | 23 +- .../ui/content/list/ContentListUIModel.java | 21 +- .../impl/longline/ActivityLonglinesUIHandler.java | 21 +- .../impl/longline/ActivityLonglinesUIModel.java | 2 - .../list/impl/longline/TripLonglinesUI.jaxx | 1 - .../list/impl/longline/TripLonglinesUIHandler.java | 19 +- .../list/impl/longline/TripLonglinesUIModel.java | 29 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 19 +- .../content/list/impl/seine/RoutesUIHandler.java | 19 +- .../ui/content/list/impl/seine/TripSeinesUI.jaxx | 1 - .../list/impl/seine/TripSeinesUIHandler.java | 19 +- .../content/list/impl/seine/TripSeinesUIModel.java | 16 +- .../ui/content/open/ContentOpenableUIHandler.java | 9 +- .../open/impl/longline/ActivityLonglineUI.jaxx | 6 +- .../impl/longline/ActivityLonglineUIHandler.java | 19 +- .../impl/longline/ActivityLonglineUIModel.java | 4 +- .../content/open/impl/longline/TripLonglineUI.jaxx | 18 +- .../open/impl/longline/TripLonglineUIHandler.java | 123 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 18 +- .../open/impl/seine/ActivitySeineUIHandler.java | 30 +- .../open/impl/seine/ActivitySeineUIModel.java | 4 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 28 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 16 +- .../open/impl/seine/TripSeineUIHandler.java | 128 +- .../observe/ui/content/ref/ContentReferenceUI.css | 4 +- .../observe/ui/content/ref/ContentReferenceUI.jaxx | 33 +- .../ui/content/ref/ContentReferenceUIHandler.java | 114 +- .../ref/ReferentialContentUIInitializer.java | 116 +- .../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/ContentTableModel.java | 4 + .../ui/content/table/ContentTableUIHandler.java | 114 +- .../table/impl/longline/BaitsCompositionUI.jaxx | 6 +- .../impl/longline/BaitsCompositionUIHandler.java | 6 +- .../impl/longline/BranchlinesCompositionUI.jaxx | 6 +- .../longline/BranchlinesCompositionUIHandler.java | 5 +- .../table/impl/longline/CatchLonglineUI.css | 2 +- .../table/impl/longline/CatchLonglineUI.jaxx | 38 +- .../impl/longline/CatchLonglineUIHandler.java | 412 ++-- .../content/table/impl/longline/EncounterUI.jaxx | 6 +- .../table/impl/longline/EncounterUIHandler.java | 21 +- .../impl/longline/FloatlinesCompositionUI.jaxx | 4 +- .../longline/FloatlinesCompositionUIHandler.java | 4 +- .../GearUseFeaturesLonglineTableModel.java | 4 +- .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 4 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 251 +-- ...rUseFeaturesMeasurementLonglinesTableModel.java | 4 +- .../table/impl/longline/HooksCompositionUI.jaxx | 6 +- .../impl/longline/HooksCompositionUIHandler.java | 5 +- .../impl/longline/LonglinePositionHelper.java | 111 +- .../content/table/impl/longline/SensorUsedUI.jaxx | 8 +- .../table/impl/longline/SensorUsedUIHandler.java | 25 +- .../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 | 39 +- .../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 | 4 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 251 +-- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 8 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 59 +- .../table/impl/seine/NonTargetCatchUIModel.java | 22 +- .../table/impl/seine/NonTargetSampleUI.jaxx | 8 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 32 +- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 6 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 20 +- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 4 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 18 +- .../content/table/impl/seine/SchoolEstimateUI.jaxx | 4 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 40 +- .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 8 +- .../table/impl/seine/TargetCatchUIHandler.java | 123 +- .../table/impl/seine/TargetDiscardCatchUI.jaxx | 10 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 253 ++- .../content/table/impl/seine/TargetSampleUI.jaxx | 4 +- .../table/impl/seine/TargetSampleUIHandler.java | 23 +- .../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 | 21 +- .../menu/MoveActivitySeineNodeMenuPopulator.java | 21 +- .../ui/tree/menu/MoveRouteNodeMenuPopulator.java | 21 +- .../ui/tree/menu/MoveTripNodeMenuPopulator.java | 47 +- .../fr/ird/observe/ui/usage/UsagesUIHandler.java | 2 +- .../ird/observe/ui/util/DecoratedNodeEntity.java | 21 +- .../ui/util/decorator/DataReferenceDecorator.java | 45 + .../ui/util/decorator/ObserveDecorator.java | 14 +- ...tor.java => ReferentialReferenceDecorator.java} | 14 +- .../ui/util/decorator/TargetCatchDecorator.java | 53 + .../dto/AbstractEspeceFieldDtoValidator.java | 6 +- .../dto/ActivitySimpleSpeedDtoValidator.java | 6 +- .../validator/dto/ActivitySpeedDtoValidator.java | 4 +- .../dto/SetLonglineUniqueHomeIdDtoValidator.java | 8 +- .../dto/SetLonglineUniqueNumberDtoValidator.java | 6 +- .../observe-application-swing_fr_FR.properties | 2 +- .../src/main/resources/log4j.properties | 2 +- .../src/main/resources/observe-log4j.properties | 2 +- observe-application-web/pom.xml | 8 +- .../web/ObserveWebApplicationContext.java | 16 + .../web/ObserveWebApplicationListener.java | 2 + .../application/web/ObserveWebMotionRender.java | 8 - .../web/controller/v1/ConfigurationController.java | 23 + .../v1/ReferentialServiceController.java | 39 +- .../ActivityLongLineEncouterServiceController.java | 11 +- ...ctivityLongLineSensorUsedServiceController.java | 11 +- .../ActivityLonglineServiceController.java | 27 +- .../v1/longline/BranchlineServiceController.java | 16 +- .../SetLonglineCatchServiceController.java | 11 +- ...LonglineDetailCompositionServiceController.java | 11 +- ...LonglineGlobalCompositionServiceController.java | 11 +- .../v1/longline/SetLonglineServiceController.java | 23 +- .../v1/longline/TdrServiceController.java | 11 +- .../TripLonglineGearUseServiceController.java | 11 +- .../v1/longline/TripLonglineServiceController.java | 33 +- ...tivitySeineObservedSystemServiceController.java | 11 +- .../v1/seine/ActivitySeineServiceController.java | 27 +- .../v1/seine/FloatingObjectServiceController.java | 30 +- .../v1/seine/NonTargetCatchServiceController.java | 11 +- .../v1/seine/NonTargetSampleServiceController.java | 14 +- .../ObjectObservedSpeciesServiceController.java | 14 +- .../ObjectSchoolEstimateServiceController.java | 14 +- .../v1/seine/RouteServiceController.java | 27 +- .../v1/seine/SchoolEstimateServiceController.java | 14 +- .../v1/seine/SetSeineServiceController.java | 26 +- .../v1/seine/TargetCatchServiceController.java | 11 +- .../v1/seine/TargetSampleServiceController.java | 11 +- ...TransmittingBuoyOperationServiceController.java | 14 +- .../seine/TripSeineGearUseServiceController.java | 11 +- .../v1/seine/TripSeineServiceController.java | 33 +- .../ObserveReferenceSetRequestInjector.java | 51 + .../observe/ObserveTopiaPersistenceContext.java | 15 + .../entities/constants/ReferenceLocale.java | 161 -- .../longline/ActivityLonglineTopiaDao.java | 20 +- .../entities/longline/TripLonglineTopiaDao.java | 22 +- .../migration/AbstractDataSourceMigration.java | 4 +- .../DataSourceMigrationForVersion_5_0_1.java | 72 + .../referentiel/I18nReferenceEntities.java | 83 +- .../entities/referentiel/ProgramTopiaDao.java | 23 +- .../entities/referentiel/ReferenceEntities.java | 23 +- .../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 | 130 ++ .../services/service/ReferenceSetsRequest.java | 37 + .../services/service/ReferentialService.java | 28 +- .../actions/validate/ValidateResultForDto.java | 8 +- .../actions/validate/ValidateResultForDtoType.java | 4 +- .../longline/ActivityLongLineEncouterService.java | 7 +- .../ActivityLongLineSensorUsedService.java | 7 +- .../service/longline/ActivityLonglineService.java | 25 +- .../service/longline/BranchlineService.java | 10 +- .../service/longline/SetLonglineCatchService.java | 7 +- .../SetLonglineDetailCompositionService.java | 7 +- .../SetLonglineGlobalCompositionService.java | 7 +- .../service/longline/SetLonglineService.java | 15 +- .../services/service/longline/TdrService.java | 7 +- .../longline/TripLonglineGearUseService.java | 7 +- .../service/longline/TripLonglineService.java | 25 +- .../seine/ActivitySeineObservedSystemService.java | 7 +- .../service/seine/ActivitySeineService.java | 19 +- .../service/seine/FloatingObjectService.java | 22 +- .../service/seine/NonTargetCatchService.java | 7 +- .../service/seine/NonTargetSampleService.java | 10 +- .../seine/ObjectObservedSpeciesService.java | 10 +- .../service/seine/ObjectSchoolEstimateService.java | 10 +- .../services/service/seine/RouteService.java | 19 +- .../service/seine/SchoolEstimateService.java | 10 +- .../services/service/seine/SetSeineService.java | 18 +- .../services/service/seine/TargetCatchService.java | 7 +- .../service/seine/TargetSampleService.java | 7 +- .../seine/TransmittingBuoyOperationService.java | 10 +- .../service/seine/TripSeineGearUseService.java | 7 +- .../services/service/seine/TripSeineService.java | 24 +- .../observe/services/dto/AbstractReference.java | 163 ++ ...erenceSetDto.java => AbstractReferenceSet.java} | 42 +- .../fr/ird/observe/services/dto/DataReference.java | 71 + ...{ReferenceSetDto.java => DataReferenceSet.java} | 31 +- .../java/fr/ird/observe/services/dto/Form.java | 95 + .../java/fr/ird/observe/services/dto/FormDto.java | 120 -- .../java/fr/ird/observe/services/dto/FormDtos.java | 46 - .../java/fr/ird/observe/services/dto/IdDtos.java | 28 +- .../fr/ird/observe/services/dto/ReferenceDto.java | 164 -- .../fr/ird/observe/services/dto/ReferenceDtos.java | 128 -- .../ird/observe/services/dto/ReferenceSetDtos.java | 106 -- .../dto/ReferenceSetNotFoundException.java | 57 - .../fr/ird/observe/services/dto/TripMapDtos.java | 15 + .../services/dto/constants/ReferentialLocale.java | 26 +- .../observe/services/dto/gson/ClassAdapter.java | 39 +- .../observe/services/dto/gson/FormDtoAdapter.java | 38 - .../services/dto/gson/ObserveDtoGsonSupplier.java | 27 +- .../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 | 164 ++ .../dto/reference/ReferenceBinderEngine.java | 22 + .../reference/ReferenceBinderEngineSupplier.java | 41 + .../dto/reference/ReferenceSetDefinition.java | 95 + .../ReferentialReferenceSetDefinitions.java | 290 +++ .../request/ReferenceSetRequestDefinition.java | 97 + .../request/ReferenceSetRequestDefinitions.java | 502 +++++ .../request/ReferenceSetRequestKeyDefinition.java | 78 + .../dto/referential/I18nReferentialDtos.java | 42 + .../services/dto/referential/PersonDtos.java | 31 +- .../services/dto/referential/ProgramDtos.java | 41 +- .../services/dto/referential/ReferentialDtos.java | 16 +- .../dto/referential/ReferentialReference.java | 93 + .../dto/referential/ReferentialReferenceDto.java | 104 -- .../dto/referential/ReferentialReferenceDtos.java | 48 - .../dto/referential/ReferentialReferenceSet.java | 68 + .../observe/services/dto/result/SaveResultDto.java | 15 + .../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 | 48 +- .../src/main/xmi/observe-services-dto-common.zargo | Bin 42827 -> 43178 bytes .../xmi/observe-services-dto-longline.properties | 151 +- .../main/xmi/observe-services-dto-longline.zargo | Bin 66568 -> 64908 bytes .../main/xmi/observe-services-dto-seine.properties | 81 +- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 62122 -> 60150 bytes .../services/service/AbstractServiceRestTest.java | 83 +- .../service/ReferenceValuesSetServiceRestTest.java | 90 + .../service/ReferentialServiceRestTest.java | 22 +- .../report/AbstractReportServiceRestTest.java | 4 +- .../seine/TripSeineGearUseServiceRestTest.java | 32 +- .../service/seine/TripSeineServiceRestTest.java | 112 +- .../services/ObserveServiceFactoryTopia.java | 27 +- .../ird/observe/services/ObserveServiceTopia.java | 694 +++---- .../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 | 72 + .../data/ActivityLonglineEncouterDtoBinder.java | 56 + .../data/ActivityLonglineSensorUsedDtoBinder.java | 42 + .../binder/data/ActivityLonglineStubDtoBinder.java | 37 + .../services/binder/data/ActivitySeineBinder.java | 104 ++ .../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 | 74 + .../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 | 90 + .../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 | 332 ---- .../builder/EntityToReferenceDtoBuilder.java | 98 - .../EntityToReferentialReferenceDtoBuilder.java | 122 -- .../observe/services/dto/ObserveDtoBinders.java | 62 - .../services/dto/ObserveDtosInitializer.java | 1962 -------------------- .../observe/services/dto/ReferenceTypeName.java | 49 - .../services/service/ReferentialServiceTopia.java | 223 +-- .../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 | 39 +- .../ActivityLongLineSensorUsedServiceTopia.java | 43 +- .../longline/ActivityLonglineServiceTopia.java | 118 +- .../service/longline/BranchlineServiceTopia.java | 59 +- .../longline/SetLonglineCatchServiceTopia.java | 161 +- .../SetLonglineDetailCompositionServiceTopia.java | 63 +- .../SetLonglineGlobalCompositionServiceTopia.java | 56 +- .../service/longline/SetLonglineServiceTopia.java | 93 +- .../services/service/longline/TdrServiceTopia.java | 148 +- .../longline/TripLonglineGearUseServiceTopia.java | 46 +- .../service/longline/TripLonglineServiceTopia.java | 144 +- .../ActivitySeineObservedSystemServiceTopia.java | 36 +- .../service/seine/ActivitySeineServiceTopia.java | 135 +- .../service/seine/FloatingObjectServiceTopia.java | 97 +- .../service/seine/NonTargetCatchServiceTopia.java | 57 +- .../service/seine/NonTargetSampleServiceTopia.java | 79 +- .../seine/ObjectObservedSpeciesServiceTopia.java | 47 +- .../seine/ObjectSchoolEstimateServiceTopia.java | 47 +- .../services/service/seine/RouteServiceTopia.java | 119 +- .../service/seine/SchoolEstimateServiceTopia.java | 51 +- .../service/seine/SetSeineServiceTopia.java | 71 +- .../service/seine/TargetCatchServiceTopia.java | 83 +- .../service/seine/TargetSampleServiceTopia.java | 75 +- .../TransmittingBuoyOperationServiceTopia.java | 50 +- .../seine/TripSeineGearUseServiceTopia.java | 46 +- .../service/seine/TripSeineServiceTopia.java | 154 +- ...ces.dto.reference.ReferenceBinderEngineSupplier | 1 + .../services/ApplicationContextResource.java | 2 - .../ird/observe/services/DataSourceResource.java | 20 +- .../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 | 36 +- .../DataSourceDumpProducerServiceTopiaTest.java | 3 + .../service/DataSourceServiceTopiaTest.java | 38 +- .../service/ReferentialServiceTopiaTest.java | 148 +- .../fr/ird/observe/services/service/RigthTest.java | 15 +- .../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 | 54 +- .../service/seine/RouteServiceTopiaTest.java | 8 +- .../seine/TargetSampleServiceTopiaTest.java | 20 +- .../seine/TripSeineGearUseServiceTopiaTest.java | 128 +- .../service/seine/TripSeineServiceTopiaTest.java | 202 +- pom.xml | 32 +- 537 files changed, 17873 insertions(+), 11547 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.