[Observe-commits] 02/05: [jgitflow-maven-plugin]merging 'release/6.0-RC-1' into 'master'

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 14f81d8cc3e296e5563057f3ac43e98999d374aa Merge: 011e671 50463df Author: Maven Release <maven-release@codelutin.com> Date: Sat Dec 17 14:55:17 2016 +0100 [jgitflow-maven-plugin]merging 'release/6.0-RC-1' into 'master' application-swing-configuration/pom.xml | 19 +- .../src/license/THIRD-PARTY.properties | 15 +- .../src/main/config/ObserveSwingApplication.ini | 564 +++++++++ .../src/main/config/ObserveSwingApplication.toml | 601 ---------- .../ObserveSwingApplicationConfig.java | 95 +- .../ObserveSwingApplicationConfigAction.java | 142 --- .../ObserveSwingApplicationConfigOption.java | 780 ------------- .../configuration/constants/CreationMode.java | 2 +- .../swing/configuration/constants/DbMode.java | 2 +- ...pplication-swing-configuration_en_GB.properties | 7 + ...pplication-swing-configuration_es_ES.properties | 7 + ...pplication-swing-configuration_fr_FR.properties | 7 + .../src/main/resources/log4j.properties | 6 +- .../src/main/resources/observe-log4j.properties | 4 +- .../src/main/resources/validators.xml | 5 +- application-swing-decoration/pom.xml | 2 +- .../swing/decoration/DecoratorService.java | 280 ++--- .../decoration/ObserveI18nDecoratorHelper.java | 2 +- .../decorators/DataReferenceDecorator.java | 7 +- .../decorators/LengthLengthParameterDecorator.java | 54 + .../decorators/LengthWeightParameterDecorator.java | 2 +- .../decorators/NonTargetCatchDecorator.java | 2 +- .../decorators/NonTargetLengthDecorator.java | 2 +- .../decorators/ObjectObservedSpeciesDecorator.java | 2 +- .../decoration/decorators/ObserveDecorator.java | 2 +- .../decorators/ReferentialReferenceDecorator.java | 2 +- .../decoration/decorators/SpeciesDecorator.java | 2 +- .../decorators/TargetCatchDecorator.java | 2 +- .../decorators/TripLonglineDecorator.java | 2 +- .../decoration/decorators/TripSeineDecorator.java | 2 +- .../application-swing-decoration_en_GB.properties | 11 +- .../application-swing-decoration_es_ES.properties | 9 +- .../application-swing-decoration_fr_FR.properties | 9 +- application-swing-validation/pom.xml | 2 +- ...ivityLonglineDto-ui-create-error-validation.xml | 12 +- ...ityLonglineDto-ui-create-warning-validation.xml | 2 +- ...ivityLonglineDto-ui-update-error-validation.xml | 12 +- ...ityLonglineDto-ui-update-warning-validation.xml | 2 +- ...lineEncounterDto-ui-update-error-validation.xml | 2 +- ...ineSensorUsedDto-ui-update-error-validation.xml | 2 +- ...tsCompositionDto-ui-update-error-validation.xml | 7 +- .../BasketDto-ui-update-table-error-validation.xml | 2 +- ...to-ui-update-catchLongline-error-validation.xml | 2 +- .../BranchlineDto-ui-update-error-validation.xml | 2 +- ...nchlineDto-ui-update-table-error-validation.xml | 2 +- .../BranchlineDto-ui-update-warning-validation.xml | 2 +- ...esCompositionDto-ui-update-error-validation.xml | 2 +- ...CatchLonglineDto-ui-update-error-validation.xml | 7 +- ...tchLonglineDto-ui-update-warning-validation.xml | 2 +- .../EncounterDto-ui-update-error-validation.xml | 2 +- .../EncounterDto-ui-update-warning-validation.xml | 2 +- ...esCompositionDto-ui-update-error-validation.xml | 2 +- ...turesLonglineDto-ui-update-error-validation.xml | 2 +- ...ksCompositionDto-ui-update-error-validation.xml | 9 +- ...SectionDto-ui-update-table-error-validation.xml | 2 +- .../SensorUsedDto-ui-update-error-validation.xml | 2 +- .../SensorUsedDto-ui-update-warning-validation.xml | 2 +- .../SetLonglineDto-ui-create-error-validation.xml | 102 +- ...SetLonglineDto-ui-create-warning-validation.xml | 11 +- .../SetLonglineDto-ui-update-error-validation.xml | 47 +- ...SetLonglineDto-ui-update-warning-validation.xml | 11 +- ...ui-update-baitsComposition-error-validation.xml | 2 +- ...ate-branchlinesComposition-error-validation.xml | 2 +- ...date-floatlinesComposition-error-validation.xml | 2 +- ...i-update-globalComposition-error-validation.xml | 2 +- ...ui-update-hooksComposition-error-validation.xml | 2 +- .../longline/TdrDto-ui-update-error-validation.xml | 2 +- .../TdrDto-ui-update-warning-validation.xml | 2 +- .../TripLonglineDto-ui-create-error-validation.xml | 2 +- ...ripLonglineDto-ui-create-warning-validation.xml | 2 +- .../TripLonglineDto-ui-update-error-validation.xml | 2 +- ...ripLonglineDto-ui-update-warning-validation.xml | 2 +- ...lineGearUseDto-ui-update-warning-validation.xml | 2 +- .../CountryDto-ui-create-error-validation.xml | 2 +- .../CountryDto-ui-create-warning-validation.xml | 2 +- .../CountryDto-ui-update-error-validation.xml | 2 +- .../CountryDto-ui-update-warning-validation.xml | 2 +- .../FpaZoneDto-ui-create-error-validation.xml | 2 +- .../FpaZoneDto-ui-create-warning-validation.xml | 2 +- .../FpaZoneDto-ui-update-error-validation.xml | 2 +- .../FpaZoneDto-ui-update-warning-validation.xml | 2 +- ...CaracteristicDto-ui-create-error-validation.xml | 2 +- ...racteristicDto-ui-create-warning-validation.xml | 2 +- ...CaracteristicDto-ui-update-error-validation.xml | 2 +- ...racteristicDto-ui-update-warning-validation.xml | 2 +- ...cteristicTypeDto-ui-create-error-validation.xml | 2 +- ...eristicTypeDto-ui-create-warning-validation.xml | 2 +- ...cteristicTypeDto-ui-update-error-validation.xml | 2 +- ...eristicTypeDto-ui-update-warning-validation.xml | 2 +- .../GearDto-ui-create-error-validation.xml | 2 +- .../GearDto-ui-create-warning-validation.xml | 2 +- .../GearDto-ui-update-error-validation.xml | 2 +- .../GearDto-ui-update-warning-validation.xml | 2 +- .../HarbourDto-ui-create-error-validation.xml | 2 +- .../HarbourDto-ui-create-warning-validation.xml | 2 +- .../HarbourDto-ui-update-error-validation.xml | 2 +- .../HarbourDto-ui-update-warning-validation.xml | 2 +- ...ngthParameterDto-ui-create-error-validation.xml | 108 ++ ...thParameterDto-ui-create-warning-validation.xml | 60 + ...ngthParameterDto-ui-update-error-validation.xml | 72 ++ ...thParameterDto-ui-update-warning-validation.xml | 46 + ...ightParameterDto-ui-create-error-validation.xml | 19 +- ...htParameterDto-ui-create-warning-validation.xml | 10 +- ...ightParameterDto-ui-update-error-validation.xml | 2 +- ...htParameterDto-ui-update-warning-validation.xml | 2 +- .../OceanDto-ui-create-error-validation.xml | 2 +- .../OceanDto-ui-create-warning-validation.xml | 2 +- .../OceanDto-ui-update-error-validation.xml | 2 +- .../OceanDto-ui-update-warning-validation.xml | 2 +- .../OrganismDto-ui-create-error-validation.xml | 2 +- .../OrganismDto-ui-create-warning-validation.xml | 2 +- .../OrganismDto-ui-update-error-validation.xml | 2 +- .../OrganismDto-ui-update-warning-validation.xml | 2 +- .../PersonDto-ui-create-error-validation.xml | 2 +- .../PersonDto-ui-create-warning-validation.xml | 2 +- .../PersonDto-ui-update-error-validation.xml | 2 +- .../PersonDto-ui-update-warning-validation.xml | 2 +- .../ProgramDto-ui-create-error-validation.xml | 2 +- .../ProgramDto-ui-create-warning-validation.xml | 2 +- .../ProgramDto-ui-update-error-validation.xml | 2 +- .../ProgramDto-ui-update-warning-validation.xml | 2 +- .../SexDto-ui-create-error-validation.xml | 2 +- .../SexDto-ui-create-warning-validation.xml | 2 +- .../SexDto-ui-update-error-validation.xml | 2 +- .../SexDto-ui-update-warning-validation.xml | 2 +- .../ShipOwnerDto-ui-create-error-validation.xml | 79 ++ .../ShipOwnerDto-ui-create-warning-validation.xml | 44 + .../ShipOwnerDto-ui-update-error-validation.xml | 79 ++ .../ShipOwnerDto-ui-update-warning-validation.xml | 44 + ...zeMeasureTypeDto-ui-create-error-validation.xml | 75 ++ ...MeasureTypeDto-ui-create-warning-validation.xml | 68 ++ ...zeMeasureTypeDto-ui-update-error-validation.xml | 75 ++ ...MeasureTypeDto-ui-update-warning-validation.xml | 68 ++ .../SpeciesDto-ui-create-error-validation.xml | 13 +- .../SpeciesDto-ui-create-warning-validation.xml | 2 +- .../SpeciesDto-ui-update-error-validation.xml | 12 +- .../SpeciesDto-ui-update-warning-validation.xml | 2 +- .../SpeciesGroupDto-ui-create-error-validation.xml | 2 +- ...peciesGroupDto-ui-create-warning-validation.xml | 2 +- .../SpeciesGroupDto-ui-update-error-validation.xml | 2 +- ...peciesGroupDto-ui-update-warning-validation.xml | 2 +- .../SpeciesListDto-ui-create-error-validation.xml | 2 +- ...SpeciesListDto-ui-create-warning-validation.xml | 2 +- .../SpeciesListDto-ui-update-error-validation.xml | 2 +- ...SpeciesListDto-ui-update-warning-validation.xml | 2 +- .../VesselDto-ui-create-error-validation.xml | 12 +- .../VesselDto-ui-create-warning-validation.xml | 2 +- .../VesselDto-ui-update-error-validation.xml | 12 +- .../VesselDto-ui-update-warning-validation.xml | 2 +- ...lSizeCategoryDto-ui-create-error-validation.xml | 2 +- ...izeCategoryDto-ui-create-warning-validation.xml | 2 +- ...lSizeCategoryDto-ui-update-error-validation.xml | 2 +- ...izeCategoryDto-ui-update-warning-validation.xml | 2 +- .../VesselTypeDto-ui-create-error-validation.xml | 2 +- .../VesselTypeDto-ui-create-warning-validation.xml | 2 +- .../VesselTypeDto-ui-update-error-validation.xml | 2 +- .../VesselTypeDto-ui-update-warning-validation.xml | 2 +- ...htMeasureTypeDto-ui-create-error-validation.xml | 75 ++ ...MeasureTypeDto-ui-create-warning-validation.xml | 68 ++ ...htMeasureTypeDto-ui-update-error-validation.xml | 75 ++ ...MeasureTypeDto-ui-update-warning-validation.xml | 68 ++ ...HaulingStatusDto-ui-create-error-validation.xml | 2 +- ...ulingStatusDto-ui-create-warning-validation.xml | 2 +- ...HaulingStatusDto-ui-update-error-validation.xml | 2 +- ...ulingStatusDto-ui-update-warning-validation.xml | 2 +- ...SettingStatusDto-ui-create-error-validation.xml | 2 +- ...ttingStatusDto-ui-create-warning-validation.xml | 2 +- ...SettingStatusDto-ui-update-error-validation.xml | 2 +- ...ttingStatusDto-ui-update-warning-validation.xml | 2 +- .../BaitTypeDto-ui-create-error-validation.xml | 2 +- .../BaitTypeDto-ui-create-warning-validation.xml | 2 +- .../BaitTypeDto-ui-update-error-validation.xml | 2 +- .../BaitTypeDto-ui-update-warning-validation.xml | 2 +- ...hFateLonglineDto-ui-create-error-validation.xml | 2 +- ...ateLonglineDto-ui-create-warning-validation.xml | 2 +- ...hFateLonglineDto-ui-update-error-validation.xml | 2 +- ...ateLonglineDto-ui-update-warning-validation.xml | 2 +- ...EncounterTypeDto-ui-create-error-validation.xml | 2 +- ...counterTypeDto-ui-create-warning-validation.xml | 2 +- ...EncounterTypeDto-ui-update-error-validation.xml | 2 +- ...counterTypeDto-ui-update-warning-validation.xml | 2 +- .../HealthnessDto-ui-create-error-validation.xml | 2 +- .../HealthnessDto-ui-create-warning-validation.xml | 2 +- .../HealthnessDto-ui-update-error-validation.xml | 2 +- .../HealthnessDto-ui-update-warning-validation.xml | 2 +- .../HookPositionDto-ui-create-error-validation.xml | 2 +- ...ookPositionDto-ui-create-warning-validation.xml | 2 +- .../HookPositionDto-ui-update-error-validation.xml | 2 +- ...ookPositionDto-ui-update-warning-validation.xml | 2 +- .../HookSizeDto-ui-create-error-validation.xml | 2 +- .../HookSizeDto-ui-create-warning-validation.xml | 2 +- .../HookSizeDto-ui-update-error-validation.xml | 2 +- .../HookSizeDto-ui-update-warning-validation.xml | 2 +- .../HookTypeDto-ui-create-error-validation.xml | 2 +- .../HookTypeDto-ui-create-warning-validation.xml | 2 +- .../HookTypeDto-ui-update-error-validation.xml | 2 +- .../HookTypeDto-ui-update-warning-validation.xml | 2 +- ...ontalPositionDto-ui-create-error-validation.xml | 2 +- ...talPositionDto-ui-create-warning-validation.xml | 2 +- ...ontalPositionDto-ui-update-error-validation.xml | 2 +- ...talPositionDto-ui-update-warning-validation.xml | 2 +- ...ticalPositionDto-ui-create-error-validation.xml | 2 +- ...calPositionDto-ui-create-warning-validation.xml | 2 +- ...ticalPositionDto-ui-update-error-validation.xml | 2 +- ...calPositionDto-ui-update-warning-validation.xml | 2 +- ...htsticksColorDto-ui-create-error-validation.xml | 2 +- ...sticksColorDto-ui-create-warning-validation.xml | 2 +- ...htsticksColorDto-ui-update-error-validation.xml | 2 +- ...sticksColorDto-ui-update-warning-validation.xml | 2 +- ...ghtsticksTypeDto-ui-create-error-validation.xml | 2 +- ...tsticksTypeDto-ui-create-warning-validation.xml | 2 +- ...ghtsticksTypeDto-ui-update-error-validation.xml | 2 +- ...tsticksTypeDto-ui-update-warning-validation.xml | 2 +- .../LineTypeDto-ui-create-error-validation.xml | 2 +- .../LineTypeDto-ui-create-warning-validation.xml | 2 +- .../LineTypeDto-ui-update-error-validation.xml | 2 +- .../LineTypeDto-ui-update-warning-validation.xml | 2 +- ...aturityStatusDto-ui-create-error-validation.xml | 2 +- ...urityStatusDto-ui-create-warning-validation.xml | 2 +- ...aturityStatusDto-ui-update-error-validation.xml | 2 +- ...urityStatusDto-ui-update-warning-validation.xml | 2 +- ...itigationTypeDto-ui-create-error-validation.xml | 2 +- ...igationTypeDto-ui-create-warning-validation.xml | 2 +- ...itigationTypeDto-ui-update-error-validation.xml | 2 +- ...igationTypeDto-ui-update-warning-validation.xml | 2 +- .../SensorBrandDto-ui-create-error-validation.xml | 2 +- ...SensorBrandDto-ui-create-warning-validation.xml | 2 +- .../SensorBrandDto-ui-update-error-validation.xml | 2 +- ...SensorBrandDto-ui-update-warning-validation.xml | 2 +- ...sorDataFormatDto-ui-create-error-validation.xml | 2 +- ...rDataFormatDto-ui-create-warning-validation.xml | 2 +- ...sorDataFormatDto-ui-update-error-validation.xml | 2 +- ...rDataFormatDto-ui-update-warning-validation.xml | 2 +- .../SensorTypeDto-ui-create-error-validation.xml | 2 +- .../SensorTypeDto-ui-create-warning-validation.xml | 2 +- .../SensorTypeDto-ui-update-error-validation.xml | 2 +- .../SensorTypeDto-ui-update-warning-validation.xml | 2 +- .../SettingShapeDto-ui-create-error-validation.xml | 2 +- ...ettingShapeDto-ui-create-warning-validation.xml | 2 +- .../SettingShapeDto-ui-update-error-validation.xml | 2 +- ...ettingShapeDto-ui-update-warning-validation.xml | 2 +- ...zeMeasureTypeDto-ui-create-error-validation.xml | 75 -- ...MeasureTypeDto-ui-create-warning-validation.xml | 68 -- ...zeMeasureTypeDto-ui-update-error-validation.xml | 75 -- ...MeasureTypeDto-ui-update-warning-validation.xml | 68 -- ...tomacFullnessDto-ui-create-error-validation.xml | 2 +- ...macFullnessDto-ui-create-warning-validation.xml | 2 +- ...tomacFullnessDto-ui-update-error-validation.xml | 2 +- ...macFullnessDto-ui-update-warning-validation.xml | 2 +- .../TripTypeDto-ui-create-error-validation.xml | 2 +- .../TripTypeDto-ui-create-warning-validation.xml | 2 +- .../TripTypeDto-ui-update-error-validation.xml | 2 +- .../TripTypeDto-ui-update-warning-validation.xml | 2 +- ...ivityLonglineDto-ui-create-error-validation.xml | 2 +- ...ityLonglineDto-ui-create-warning-validation.xml | 2 +- ...ivityLonglineDto-ui-update-error-validation.xml | 2 +- ...ityLonglineDto-ui-update-warning-validation.xml | 2 +- ...htMeasureTypeDto-ui-create-error-validation.xml | 75 -- ...MeasureTypeDto-ui-create-warning-validation.xml | 68 -- ...htMeasureTypeDto-ui-update-error-validation.xml | 75 -- ...MeasureTypeDto-ui-update-warning-validation.xml | 68 -- ...DetectionModeDto-ui-create-error-validation.xml | 2 +- ...tectionModeDto-ui-create-warning-validation.xml | 2 +- ...DetectionModeDto-ui-update-error-validation.xml | 2 +- ...tectionModeDto-ui-update-warning-validation.xml | 2 +- .../ObjectFateDto-ui-create-error-validation.xml | 2 +- .../ObjectFateDto-ui-create-warning-validation.xml | 2 +- .../ObjectFateDto-ui-update-error-validation.xml | 2 +- .../ObjectFateDto-ui-update-warning-validation.xml | 2 +- ...jectOperationDto-ui-create-error-validation.xml | 2 +- ...ctOperationDto-ui-create-warning-validation.xml | 2 +- ...jectOperationDto-ui-update-error-validation.xml | 2 +- ...ctOperationDto-ui-update-warning-validation.xml | 2 +- .../ObjectTypeDto-ui-create-error-validation.xml | 2 +- .../ObjectTypeDto-ui-create-warning-validation.xml | 2 +- .../ObjectTypeDto-ui-update-error-validation.xml | 2 +- .../ObjectTypeDto-ui-update-warning-validation.xml | 2 +- ...bservedSystemDto-ui-create-error-validation.xml | 2 +- ...ervedSystemDto-ui-create-warning-validation.xml | 2 +- ...bservedSystemDto-ui-update-error-validation.xml | 2 +- ...ervedSystemDto-ui-update-warning-validation.xml | 2 +- ...sonForDiscardDto-ui-create-error-validation.xml | 2 +- ...nForDiscardDto-ui-create-warning-validation.xml | 2 +- ...sonForDiscardDto-ui-update-error-validation.xml | 2 +- ...nForDiscardDto-ui-update-warning-validation.xml | 2 +- ...nForNoFishingDto-ui-create-error-validation.xml | 2 +- ...orNoFishingDto-ui-create-warning-validation.xml | 2 +- ...nForNoFishingDto-ui-update-error-validation.xml | 2 +- ...orNoFishingDto-ui-update-warning-validation.xml | 2 +- ...sonForNullSetDto-ui-create-error-validation.xml | 2 +- ...nForNullSetDto-ui-create-warning-validation.xml | 2 +- ...sonForNullSetDto-ui-update-error-validation.xml | 2 +- ...nForNullSetDto-ui-update-warning-validation.xml | 2 +- .../SpeciesFateDto-ui-create-error-validation.xml | 2 +- ...SpeciesFateDto-ui-create-warning-validation.xml | 2 +- .../SpeciesFateDto-ui-update-error-validation.xml | 2 +- ...SpeciesFateDto-ui-update-warning-validation.xml | 2 +- ...SpeciesStatusDto-ui-create-error-validation.xml | 2 +- ...eciesStatusDto-ui-create-warning-validation.xml | 2 +- ...SpeciesStatusDto-ui-update-error-validation.xml | 2 +- ...eciesStatusDto-ui-update-warning-validation.xml | 2 +- ...ndingActivityDto-ui-create-error-validation.xml | 2 +- ...ingActivityDto-ui-create-warning-validation.xml | 2 +- ...ndingActivityDto-ui-update-error-validation.xml | 2 +- ...ingActivityDto-ui-update-warning-validation.xml | 2 +- ...BuoyOperationDto-ui-create-error-validation.xml | 2 +- ...oyOperationDto-ui-create-warning-validation.xml | 2 +- ...BuoyOperationDto-ui-update-error-validation.xml | 2 +- ...oyOperationDto-ui-update-warning-validation.xml | 2 +- ...ttingBuoyTypeDto-ui-create-error-validation.xml | 2 +- ...ingBuoyTypeDto-ui-create-warning-validation.xml | 2 +- ...ttingBuoyTypeDto-ui-update-error-validation.xml | 2 +- ...ingBuoyTypeDto-ui-update-warning-validation.xml | 2 +- ...ActivitySeineDto-ui-create-error-validation.xml | 2 +- ...tivitySeineDto-ui-create-warning-validation.xml | 2 +- ...ActivitySeineDto-ui-update-error-validation.xml | 2 +- ...tivitySeineDto-ui-update-warning-validation.xml | 2 +- ...eightCategoryDto-ui-create-error-validation.xml | 2 +- ...ghtCategoryDto-ui-create-warning-validation.xml | 2 +- ...eightCategoryDto-ui-update-error-validation.xml | 2 +- ...ghtCategoryDto-ui-update-warning-validation.xml | 2 +- .../seine/WindDto-ui-create-error-validation.xml | 2 +- .../seine/WindDto-ui-create-warning-validation.xml | 2 +- .../seine/WindDto-ui-update-error-validation.xml | 2 +- .../seine/WindDto-ui-update-warning-validation.xml | 2 +- ...ActivitySeineDto-ui-create-error-validation.xml | 25 +- ...tivitySeineDto-ui-create-warning-validation.xml | 23 +- ...ActivitySeineDto-ui-update-error-validation.xml | 25 +- ...tivitySeineDto-ui-update-warning-validation.xml | 12 +- ...bservedSystemDto-ui-update-error-validation.xml | 63 -- ...ervedSystemDto-ui-update-warning-validation.xml | 50 - ...loatingObjectDto-ui-create-error-validation.xml | 15 +- ...atingObjectDto-ui-create-warning-validation.xml | 2 +- ...loatingObjectDto-ui-update-error-validation.xml | 15 +- ...atingObjectDto-ui-update-warning-validation.xml | 2 +- ...choolEstimateDto-ui-update-error-validation.xml | 2 +- ...nsmittingBuoyDto-ui-update-error-validation.xml | 2 +- ...FeaturesSeineDto-ui-update-error-validation.xml | 2 +- ...onTargetCatchDto-ui-update-error-validation.xml | 16 +- ...TargetCatchDto-ui-update-warning-validation.xml | 14 +- ...nTargetLengthDto-ui-update-error-validation.xml | 48 +- ...argetLengthDto-ui-update-warning-validation.xml | 14 +- ...nTargetSampleDto-ui-update-error-validation.xml | 2 +- ...servedSpeciesDto-ui-update-error-validation.xml | 2 +- ...choolEstimateDto-ui-update-error-validation.xml | 2 +- ...oolEstimateDto-ui-update-warning-validation.xml | 2 +- .../seine/RouteDto-ui-create-error-validation.xml | 2 +- .../RouteDto-ui-create-warning-validation.xml | 2 +- .../seine/RouteDto-ui-update-error-validation.xml | 2 +- .../RouteDto-ui-update-warning-validation.xml | 2 +- ...choolEstimateDto-ui-update-error-validation.xml | 2 +- .../SetSeineDto-ui-create-error-validation.xml | 2 +- .../SetSeineDto-ui-create-warning-validation.xml | 2 +- .../SetSeineDto-ui-update-error-validation.xml | 2 +- .../SetSeineDto-ui-update-warning-validation.xml | 2 +- ...onTargetCatchDto-ui-update-error-validation.xml | 2 +- ...choolEstimateDto-ui-update-error-validation.xml | 2 +- ...hDto-ui-update-targetCatch-error-validation.xml | 2 +- ...-ui-update-targetDiscarded-error-validation.xml | 4 +- ...hDto-ui-update-targetCatch-error-validation.xml | 2 +- ...to-ui-update-targetCatch-warning-validation.xml | 2 +- ...-ui-update-targetDiscarded-error-validation.xml | 2 +- ...i-update-targetDiscarded-warning-validation.xml | 2 +- .../TargetLengthDto-ui-update-error-validation.xml | 32 +- ...argetLengthDto-ui-update-warning-validation.xml | 2 +- .../TargetSampleDto-ui-update-error-validation.xml | 2 +- ...nsmittingBuoyDto-ui-update-error-validation.xml | 2 +- ...mittingBuoyDto-ui-update-warning-validation.xml | 2 +- .../TripSeineDto-ui-create-error-validation.xml | 2 +- .../TripSeineDto-ui-create-warning-validation.xml | 2 +- .../TripSeineDto-ui-update-error-validation.xml | 2 +- .../TripSeineDto-ui-update-warning-validation.xml | 2 +- ...eineGearUseDto-ui-update-warning-validation.xml | 2 +- .../application-swing-validation_en_GB.properties | 37 +- .../application-swing-validation_es_ES.properties | 37 +- .../application-swing-validation_fr_FR.properties | 37 +- .../validation/BeanValidatorDetectorTest.java | 20 +- .../src/test/resources/log4j.properties | 2 +- .../src/test/resources/validators.xml | 4 +- application-swing-validators/pom.xml | 27 +- .../AbstractSpeciesFieldDtoValidator.java | 63 +- .../ActivityFinDeVeilleExistsDtoValidator.java | 2 +- .../ActivitySimpleSpeedDtoValidator.java | 2 +- .../validators/ActivitySpeedDtoValidator.java | 2 +- .../CollectionUniqueKeyDtoValidator.java | 2 +- .../CoordinateLatitudeDtoFieldValidator.java | 147 +++ .../CoordinateLongitudeDtoFieldValidator.java | 149 +++ .../ObserveCollectionUniqueKeyDtoValidator.java | 2 +- .../validators/OpenableDtoFieldValidator.java | 2 +- .../validators/QuadrantFieldDtoValidator.java | 2 +- .../SetLonglineUniqueHomeIdDtoValidator.java | 8 +- .../SetLonglineUniqueNumberDtoValidator.java | 6 +- .../validators/SpeciesLengthFieldDtoValidator.java | 2 +- .../validators/SpeciesWeightFieldDtoValidator.java | 2 +- .../application-swing-validators_en_GB.properties | 6 + .../application-swing-validators_es_ES.properties | 6 + .../application-swing-validators_fr_FR.properties | 6 + application-swing/pom.xml | 26 +- application-swing/src/main/assembly/bin.xml | 6 +- application-swing/src/main/assembly/dist/go.bat | 2 +- application-swing/src/main/assembly/dist/go.sh | 3 +- .../extra/create-postgis-1-activity.sql | 2 +- .../extra/create-postgis-2-harbour.sql | 2 +- .../extra/create-postgis-3-activity-seine.sql | 2 +- .../extra/create-postgis-4-activity-longine.sql | 2 +- .../extra/function_enhanced_sets_school_types.sql | 2 +- application-swing/src/main/assembly/map.xml | 6 +- .../src/main/assembly/sql/v1/sql/obstuna.sql | 2 +- .../main/filters/observe-application.properties | 2 +- .../src/main/filters/observe-ui.properties | 6 +- .../application/swing/LocalDatabaseBackupTask.java | 6 +- .../application/swing/ObserveActionExecutor.java | 6 +- .../observe/application/swing/ObserveCLAction.java | 8 +- .../application/swing/ObserveOpenDataManager.java | 58 +- .../application/swing/ObserveResourceManager.java | 2 +- .../observe/application/swing/ObserveRunner.java | 27 +- .../swing/ObserveSwingApplicationContext.java | 119 +- .../ObserveSwingApplicationDataSourcesManager.java | 72 +- .../swing/ObserveSwingSessionHelper.java | 74 ++ .../swing/ObserveSwingTechnicalException.java | 2 +- .../application/swing/ObserveTextGenerator.java | 20 +- .../ird/observe/application/swing/RunObserve.java | 2 +- .../observe/application/swing/db/DataContext.java | 22 +- .../swing/db/ObserveSwingDataSource.java | 99 +- .../swing/db/constants/ConnexionStatus.java | 2 +- .../swing/db/constants/DataContextType.java | 2 +- .../db/event/ObserveSwingDataSourceEvent.java | 2 +- .../db/event/ObserveSwingDataSourceListener.java | 2 +- .../ObserveSwingDataSourceListenerAdapter.java | 2 +- .../fr/ird/observe/application/swing/package.html | 2 +- .../application/swing/ui/MnemonicHelper.java | 167 +++ .../application/swing/ui/ObserveCommon.jcss | 1 + .../application/swing/ui/ObserveMainUI.jaxx | 134 +-- .../application/swing/ui/ObserveMainUI.jcss | 242 ++-- .../application/swing/ui/ObserveMainUIHandler.java | 487 +------- .../swing/ui/ObserveMainUIInitializer.java | 556 +++++++++ .../application/swing/ui/ObserveMainUIModel.java | 446 ++++++++ .../application/swing/ui/ObserveUICallback.java | 17 +- .../application/swing/ui/ObserveUIMode.java | 2 +- .../ird/observe/application/swing/ui/UIHelper.java | 130 +-- .../swing/ui/actions/AbstractObserveAction.java | 2 +- .../swing/ui/actions/AbstractUIAction.java | 155 +++ .../actions/ChangeApplicationLanguageAction.java | 81 -- .../swing/ui/actions/ChangeDbLanguageAction.java | 82 -- .../swing/ui/actions/ChangeStorageAction.java | 97 -- .../swing/ui/actions/CloseApplicationAction.java | 87 -- .../swing/ui/actions/CloseHelpAction.java | 76 -- .../swing/ui/actions/CloseStorageAction.java | 86 -- .../swing/ui/actions/GotoSiteAction.java | 87 -- .../ui/actions/ImportStorageFromFileAction.java | 105 -- .../swing/ui/actions/LaunchAdminAction.java | 80 -- .../swing/ui/actions/ReloadApplicationAction.java | 70 -- .../actions/ReloadDefaultConfigurationAction.java | 95 -- .../swing/ui/actions/ReloadResourcesAction.java | 109 -- .../swing/ui/actions/ReloadStorageAction.java | 125 -- .../swing/ui/actions/SaveStorageToFileAction.java | 92 -- .../swing/ui/actions/ShowAboutAction.java | 99 -- .../swing/ui/actions/ShowConfigAction.java | 416 ------- .../swing/ui/actions/ShowStorageInfoAction.java | 81 -- .../swing/ui/actions/StartH2WebServerAction.java | 100 -- .../swing/ui/actions/StartServerModeAction.java | 127 --- .../swing/ui/actions/StopH2WebServerAction.java | 82 -- .../swing/ui/actions/StopServerModeAction.java | 105 -- .../actions/content/AbstractContentUIAction.java | 58 + .../content/AddActivityLonglineSetUIAction.java | 56 + .../AddActivitySeineFloatingObjectUIAction.java | 56 + .../content/AddActivitySeineSetUIAction.java | 56 + .../content/BackToReferentialListUIAction.java | 51 + .../ui/actions/content/CloseAndCreateUIAction.java | 162 +++ .../ui/actions/content/CloseOpenUIAction.java | 125 ++ .../content/CreateNewReferentialUIAction.java | 52 + .../ui/actions/content/CreateOpenUIAction.java | 51 + .../ui/actions/content/DeleteDataUIAction.java | 69 ++ .../actions/content/DeleteReferenceUIAction.java | 63 ++ .../actions/content/DeleteTableEntryUIAction.java | 51 + .../content/EditReferentialFromListUIAction.java | 52 + .../actions/content/EditReferentialUIAction.java | 52 + .../swing/ui/actions/content/GoDownUIAction.java | 102 ++ .../swing/ui/actions/content/GoUpUIAction.java | 101 ++ .../content/MoveActivityLonglinesUIAction.java | 181 +++ .../content/MoveActivitySeinesUIAction.java | 171 +++ .../ui/actions/content/MoveRoutesUIAction.java | 177 +++ .../actions/content/MoveTripLonglinesUIAction.java | 79 ++ .../ui/actions/content/MoveTripSeinesUIAction.java | 79 ++ .../ui/actions/content/MoveTripsUIAction.java | 186 +++ .../ui/actions/content/NewTableEntryUIAction.java | 52 + .../swing/ui/actions/content/ReOpenUIAction.java | 90 ++ .../ui/actions/content/ResetEditUIAction.java | 68 ++ .../actions/content/ResetTableEntryUIAction.java | 62 + .../swing/ui/actions/content/SaveEditUIAction.java | 58 + .../ui/actions/content/SaveTableEntryUIAction.java | 62 + .../ui/actions/content/SelectNodeUIAction.java | 96 ++ .../ui/actions/content/SelectOpenNodeUIAction.java | 64 ++ .../ui/actions/global/AbstractGlobalUIAction.java | 57 + .../actions/global/ChangeFocusGlobalUIAction.java | 83 ++ .../actions/global/DeleteDataGlobalUIAction.java | 75 ++ .../actions/global/NewNextDataGlobalUIAction.java | 71 ++ .../global/OpenCloseDataGlobalUIAction.java | 104 ++ .../ui/actions/global/ResetDataGlobalUIAction.java | 59 + .../ui/actions/global/SaveDataGlobalUIAction.java | 58 + .../menu/action/LaunchAdminActionSupport.java | 76 ++ .../menu/action/LaunchConsolidateAction.java | 42 + .../menu/action/LaunchDataSynchronizeAction.java | 42 + .../menu/action/LaunchExportDataAction.java | 42 + .../action/LaunchReferentialSynchronizeAction.java | 42 + .../ui/actions/menu/action/LaunchReportAction.java | 42 + .../menu/action/LaunchSynchronizeAction.java | 42 + .../actions/menu/action/LaunchValidateAction.java | 42 + .../ChangeApplicationLanguageActionSupport.java | 72 ++ .../ChangeApplicationLanguageToEnglishAction.java | 45 + .../ChangeApplicationLanguageToFrenchAction.java | 45 + .../ChangeApplicationLanguageToSpanishAction.java | 45 + .../menu/config/ChangeDbLanguageActionSupport.java | 74 ++ .../config/ChangeDbLanguageToEnglishAction.java | 44 + .../config/ChangeDbLanguageToFrenchAction.java | 44 + .../config/ChangeDbLanguageToSpanishAction.java | 44 + .../config/ReloadDefaultConfigurationAction.java | 90 ++ .../actions/menu/config/ReloadResourcesAction.java | 106 ++ .../ui/actions/menu/config/ShowConfigAction.java | 410 +++++++ .../actions/menu/file/CloseApplicationAction.java | 81 ++ .../actions/menu/file/ReloadApplicationAction.java | 70 ++ .../ui/actions/menu/file/ToFullScreenAction.java | 62 + .../ui/actions/menu/file/ToWindowScreenAction.java | 61 + .../swing/ui/actions/menu/help/GotoSiteAction.java | 84 ++ .../ui/actions/menu/help/ShowAboutAction.java | 97 ++ .../actions/menu/navigation/GotoActionSupport.java | 102 ++ .../menu/navigation/GotoOpenActivityAction.java | 72 ++ .../menu/navigation/GotoOpenProgramAction.java | 64 ++ .../menu/navigation/GotoOpenRouteAction.java | 64 ++ .../actions/menu/navigation/GotoOpenSetAction.java | 81 ++ .../menu/navigation/GotoOpenTripAction.java | 64 ++ .../menu/navigation/GotoReferentialAction.java | 64 ++ .../actions/menu/storage/ChangeStorageAction.java | 95 ++ .../actions/menu/storage/CloseStorageAction.java | 88 ++ .../menu/storage/ImportStorageFromFileAction.java | 110 ++ .../actions/menu/storage/ReloadStorageAction.java | 126 +++ .../menu/storage/SaveStorageToFileAction.java | 90 ++ .../menu/storage/ShowStorageInfoAction.java | 78 ++ .../menu/storage/StartH2WebServerAction.java | 96 ++ .../menu/storage/StartServerModeAction.java | 127 +++ .../menu/storage/StopH2WebServerAction.java | 84 ++ .../actions/menu/storage/StopServerModeAction.java | 82 ++ .../swing/ui/actions/shared/AbstractUIAction.java | 112 -- .../ui/actions/shared/CancelCreateUIAction.java | 72 -- .../ui/actions/shared/CloseAndCreateUIAction.java | 157 --- .../swing/ui/actions/shared/CloseOpenUIAction.java | 173 --- .../ui/actions/shared/DeleteDataUIAction.java | 80 -- .../ui/actions/shared/DeleteReferenceUIAction.java | 74 -- .../swing/ui/actions/shared/GoDownUIAction.java | 151 --- .../swing/ui/actions/shared/GoUpUIAction.java | 129 --- .../shared/MoveActivityLonglinesUIAction.java | 196 ---- .../actions/shared/MoveActivitySeinesUIAction.java | 191 ---- .../ui/actions/shared/MoveRoutesUIAction.java | 198 ---- .../actions/shared/MoveTripLonglinesUIAction.java | 85 -- .../ui/actions/shared/MoveTripSeinesUIAction.java | 85 -- .../swing/ui/actions/shared/MoveTripsUIAction.java | 197 ---- .../swing/ui/actions/shared/ReOpenUIAction.java | 103 -- .../swing/ui/actions/shared/ResetEditUIAction.java | 69 -- .../swing/ui/actions/shared/SaveEditUIAction.java | 69 -- .../ui/actions/shared/SelectNodeUIAction.java | 62 - .../ui/actions/shared/SelectOpenNodeUIAction.java | 58 - .../swing/ui/admin/AdminActionModel.java | 2 +- .../swing/ui/admin/AdminActionWorker.java | 2 +- .../application/swing/ui/admin/AdminStep.java | 2 +- .../application/swing/ui/admin/AdminTabUI.jaxx | 53 +- .../application/swing/ui/admin/AdminTabUI.jcss | 7 +- .../swing/ui/admin/AdminTabUIHandler.java | 143 +-- .../application/swing/ui/admin/AdminUI.jaxx | 59 +- .../application/swing/ui/admin/AdminUIHandler.java | 84 +- .../swing/ui/admin/AdminUILauncher.java | 74 +- .../application/swing/ui/admin/AdminUIModel.java | 1165 ++----------------- .../swing/ui/admin/config/ConfigModel.java | 710 ++++++++++++ .../swing/ui/admin/config/ConfigUI.jaxx | 54 +- .../swing/ui/admin/config/ConfigUI.jcss | 7 +- .../swing/ui/admin/config/ConfigUIHandler.java | 97 +- .../swing/ui/admin/config/SelectDataModel.java | 251 +++++ .../swing/ui/admin/config/SelectDataUI.jaxx | 58 +- .../swing/ui/admin/config/SelectDataUI.jcss | 15 - .../swing/ui/admin/config/SelectDataUIHandler.java | 72 ++ .../ui/admin/consolidate/ConsolidateModel.java | 38 +- .../swing/ui/admin/consolidate/ConsolidateUI.jaxx | 29 +- .../swing/ui/admin/consolidate/ConsolidateUI.jcss | 1 + .../ui/admin/consolidate/ConsolidateUIHandler.java | 100 +- .../swing/ui/admin/export/ExportModel.java | 89 +- .../swing/ui/admin/export/ExportUI.jaxx | 17 +- .../swing/ui/admin/export/ExportUI.jcss | 7 + .../swing/ui/admin/export/ExportUIHandler.java | 194 +++- .../swing/ui/admin/export/TripEntry.java | 2 +- .../ui/admin/export/TripToExportTableModel.java | 2 +- .../swing/ui/admin/report/ReportConfigUI.jaxx | 17 +- .../swing/ui/admin/report/ReportConfigUI.jcss | 9 + .../swing/ui/admin/report/ReportModel.java | 131 ++- .../swing/ui/admin/report/ReportUI.jaxx | 25 +- .../swing/ui/admin/report/ReportUIHandler.java | 108 +- .../swing/ui/admin/report/ResultTableModel.java | 2 +- .../swing/ui/admin/resume/ShowResumeModel.java | 43 + .../swing/ui/admin/resume/ShowResumeUI.jaxx | 20 +- .../swing/ui/admin/resume/ShowResumeUIHandler.java | 32 +- .../swing/ui/admin/save/SaveLocalModel.java | 53 +- .../swing/ui/admin/save/SaveLocalUI.jaxx | 28 +- .../swing/ui/admin/save/SaveLocalUI.jcss | 2 + .../swing/ui/admin/save/SaveLocalUIHandler.java | 38 +- .../admin/synchronize/data/DataSynchroModel.java | 68 +- .../data/DataSynchroSelectionTreeCellRenderer.java | 47 +- .../ui/admin/synchronize/data/DataSynchroUI.jaxx | 49 +- .../ui/admin/synchronize/data/DataSynchroUI.jcss | 24 +- .../synchronize/data/DataSynchroUIHandler.java | 202 ++-- .../data/DataSynchronizeTaskListCellRenderer.java | 2 +- .../data/task/CopyToLeftDataSynchronizeTask.java | 2 +- .../data/task/CopyToRightDataSynchronizeTask.java | 2 +- .../data/task/DataSynchronizeTaskSupport.java | 2 +- .../task/DeleteFromLeftDataSynchronizeTask.java | 2 +- .../task/DeleteFromRightDataSynchronizeTask.java | 2 +- .../referential/ReferentialSynchronizeMode.java | 2 +- .../legacy/ObsoleteReferentialReference.java | 2 +- ...soleteReferentialReferenceListCellRenderer.java | 2 +- .../referential/legacy/SynchronizeModel.java | 16 + .../referential/legacy/SynchronizeUI.jaxx | 15 +- .../referential/legacy/SynchronizeUI.jcss | 2 + .../referential/legacy/SynchronizeUIHandler.java | 42 +- .../referential/ng/ReferentialReplaceUI.jaxx | 12 +- .../ng/ReferentialReplaceUIHandler.java | 25 +- .../referential/ng/ReferentialSynchroConfigUI.jaxx | 2 +- .../referential/ng/ReferentialSynchroModel.java | 63 +- .../referential/ng/ReferentialSynchroUI.jaxx | 30 +- .../referential/ng/ReferentialSynchroUI.jcss | 1 + .../ng/ReferentialSynchroUIHandler.java | 75 +- .../ng/ReferentialSynchronizeResources.java | 2 +- ...ReferentialSynchronizeTaskListCellRenderer.java | 2 +- .../ng/ReferentialSynchronizeTaskListModel.java | 2 +- .../referential/ng/action/ApplyAction.java | 3 +- .../ng/action/RegisterAddTaskAction.java | 2 +- .../ng/action/RegisterCopyTaskAction.java | 2 +- .../ng/action/RegisterDeleteTaskAction.java | 2 +- .../ng/action/RegisterDesactivateTaskAction.java | 2 +- .../ng/action/RegisterRevertTaskAction.java | 2 +- .../ng/action/RegisterSkipTaskAction.java | 2 +- .../ng/action/RegisterTasksActionSupport.java | 2 +- .../ng/action/RegisterUpdateTaskAction.java | 2 +- .../ng/task/AddReferentialSynchronizeTask.java | 2 +- .../ng/task/DeleteReferentialSynchronizeTask.java | 2 +- .../DesactivateReferentialSynchronizeTask.java | 2 +- .../ng/task/ReferentialSynchronizeTaskSupport.java | 2 +- ...ferentialSynchronizeTaskWithReplaceSupport.java | 2 +- .../ng/task/RevertReferentialSynchronizeTask.java | 2 +- .../ng/task/SkipReferentialSynchronizeTask.java | 2 +- .../ng/task/UpdateReferentialSynchronizeTask.java | 2 +- .../ReferentialSynchronizeTreeCellRenderer.java | 2 +- .../ng/tree/ReferentialSynchronizeTreeModel.java | 2 +- .../ReferentialSynchronizeTreeModelsBuilder.java | 2 +- .../node/AddedReferenceReferentialSynchroNode.java | 2 +- .../ReferenceReferentialSynchroNodeSupport.java | 2 +- .../tree/node/ReferentialSynchroNodeSupport.java | 2 +- .../ng/tree/node/RootReferentialSynchroNode.java | 2 +- .../ng/tree/node/TypeReferentialSynchroNode.java | 2 +- .../UpdatedReferenceReferentialSynchroNode.java | 2 +- .../swing/ui/admin/validate/ValidateConfigUI.jaxx | 2 +- .../validate/ValidateEntityListCellRenderer.java | 8 +- .../swing/ui/admin/validate/ValidateModel.java | 90 +- .../swing/ui/admin/validate/ValidateUI.jaxx | 35 +- .../swing/ui/admin/validate/ValidateUI.jcss | 2 + .../swing/ui/admin/validate/ValidateUIHandler.java | 205 ++-- .../validate/ValidationMessageTableModel.java | 2 +- .../application/swing/ui/content/Common.jcss | 13 +- .../application/swing/ui/content/ContentMode.java | 2 +- .../application/swing/ui/content/ContentUI.jaxx | 32 +- .../application/swing/ui/content/ContentUI.jcss | 4 +- .../swing/ui/content/ContentUIBlockingLayerUI.java | 133 +++ .../swing/ui/content/ContentUIHandler.java | 274 +++-- .../swing/ui/content/ContentUIInitializer.java | 173 ++- .../swing/ui/content/ContentUIManager.java | 328 ++---- .../swing/ui/content/ContentUIModel.java | 12 +- .../swing/ui/content/ObserveActionMap.java | 142 +++ .../swing/ui/content/ObserveContentUI.java | 8 +- .../swing/ui/content/ObserveFocusManager.java | 1070 ++++++++++++++++++ .../content/impl/longline/BasketsTableModel.java | 11 +- .../ui/content/impl/longline/BranchlineUI.jaxx | 42 +- .../ui/content/impl/longline/BranchlineUI.jcss | 8 +- .../content/impl/longline/BranchlineUIHandler.java | 93 +- .../content/impl/longline/BranchlineUIModel.java | 14 +- .../impl/longline/BranchlinesTableModel.java | 9 +- .../LonglineCompositionTableModelSupport.java | 2 +- .../impl/longline/LonglineDetailCompositionUI.jaxx | 25 +- .../impl/longline/LonglineDetailCompositionUI.jcss | 21 + .../LonglineDetailCompositionUIHandler.java | 77 +- .../LonglineDetailCompositionUIInitializer.java | 27 +- .../longline/LonglineDetailCompositionUIModel.java | 4 +- ...onglineDetailCompositionUIValidationHelper.java | 2 +- ...LonglineDetailCompositionValidationContext.java | 2 +- .../LonglineDetailCompositionValidatorService.java | 2 +- .../impl/longline/LonglineGlobalCompositionUI.jaxx | 23 +- .../impl/longline/LonglineGlobalCompositionUI.jcss | 7 + .../LonglineGlobalCompositionUIHandler.java | 74 +- .../longline/LonglineGlobalCompositionUIModel.java | 2 +- .../impl/longline/SectionTemplatesTableModel.java | 2 +- .../content/impl/longline/SectionsTableModel.java | 10 +- .../ui/content/impl/longline/SetLonglineUI.jaxx | 226 ++-- .../ui/content/impl/longline/SetLonglineUI.jcss | 14 + .../impl/longline/SetLonglineUIHandler.java | 144 ++- .../content/impl/longline/SetLonglineUIModel.java | 2 +- .../impl/seine/ActivitySeineObservedSystemUI.jaxx | 113 -- .../impl/seine/ActivitySeineObservedSystemUI.jcss | 78 -- .../ActivitySeineObservedSystemUIHandler.java | 133 --- .../seine/ActivitySeineObservedSystemUIModel.java | 42 - .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 69 +- .../FloatingObjectTransmittingBuoyOperationUI.jcss | 2 + ...ngObjectTransmittingBuoyOperationUIHandler.java | 44 +- ...tingObjectTransmittingBuoyOperationUIModel.java | 2 +- .../ui/content/impl/seine/FloatingObjectUI.jaxx | 55 +- .../ui/content/impl/seine/FloatingObjectUI.jcss | 27 +- .../impl/seine/FloatingObjectUIHandler.java | 42 +- .../content/impl/seine/FloatingObjectUIModel.java | 2 +- .../swing/ui/content/impl/seine/SetSeineUI.jaxx | 40 +- .../swing/ui/content/impl/seine/SetSeineUI.jcss | 17 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 56 +- .../ui/content/impl/seine/SetSeineUIModel.java | 7 +- .../swing/ui/content/impl/seine/package.html | 2 +- .../swing/ui/content/list/ContentListUI.jaxx | 80 +- .../swing/ui/content/list/ContentListUI.jcss | 40 +- .../ui/content/list/ContentListUIHandler.java | 206 ++-- .../swing/ui/content/list/ContentListUIModel.java | 108 +- .../swing/ui/content/list/impl/CommonListUI.jcss | 64 ++ .../list/impl/longline/ActivityLonglinesUI.jaxx | 60 +- .../list/impl/longline/ActivityLonglinesUI.jcss | 26 +- .../impl/longline/ActivityLonglinesUIHandler.java | 66 +- .../impl/longline/ActivityLonglinesUIModel.java | 2 +- .../content/list/impl/longline/CommonListUI.jcss | 60 - .../list/impl/longline/TripLonglinesUI.jaxx | 55 +- .../list/impl/longline/TripLonglinesUI.jcss | 21 +- .../list/impl/longline/TripLonglinesUIHandler.java | 76 +- .../list/impl/longline/TripLonglinesUIModel.java | 6 +- .../content/list/impl/seine/ActivitySeinesUI.jaxx | 59 +- .../content/list/impl/seine/ActivitySeinesUI.jcss | 26 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 65 +- .../list/impl/seine/ActivitySeinesUIModel.java | 2 +- .../ui/content/list/impl/seine/CommonListUI.jcss | 77 -- .../swing/ui/content/list/impl/seine/RoutesUI.jaxx | 56 +- .../swing/ui/content/list/impl/seine/RoutesUI.jcss | 23 +- .../content/list/impl/seine/RoutesUIHandler.java | 71 +- .../ui/content/list/impl/seine/RoutesUIModel.java | 2 +- .../ui/content/list/impl/seine/TripSeinesUI.jaxx | 56 +- .../ui/content/list/impl/seine/TripSeinesUI.jcss | 22 +- .../list/impl/seine/TripSeinesUIHandler.java | 71 +- .../content/list/impl/seine/TripSeinesUIModel.java | 2 +- .../application/swing/ui/content/list/package.html | 2 +- .../swing/ui/content/open/ContentOpenableUI.jaxx | 43 +- .../swing/ui/content/open/ContentOpenableUI.jcss | 18 +- .../ui/content/open/ContentOpenableUIHandler.java | 67 +- .../ui/content/open/ContentOpenableUIModel.java | 2 +- .../open/impl/longline/ActivityLonglineUI.jaxx | 35 +- .../open/impl/longline/ActivityLonglineUI.jcss | 14 + .../impl/longline/ActivityLonglineUIHandler.java | 81 +- .../impl/longline/ActivityLonglineUIModel.java | 10 +- .../content/open/impl/longline/TripLonglineUI.jaxx | 54 +- .../content/open/impl/longline/TripLonglineUI.jcss | 4 + .../open/impl/longline/TripLonglineUIHandler.java | 57 +- .../open/impl/longline/TripLonglineUIModel.java | 2 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 109 +- .../content/open/impl/seine/ActivitySeineUI.jcss | 53 +- .../open/impl/seine/ActivitySeineUIHandler.java | 81 +- .../open/impl/seine/ActivitySeineUIModel.java | 57 +- .../swing/ui/content/open/impl/seine/RouteUI.jaxx | 21 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 96 +- .../ui/content/open/impl/seine/RouteUIModel.java | 2 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 43 +- .../open/impl/seine/TripSeineUIHandler.java | 68 +- .../content/open/impl/seine/TripSeineUIModel.java | 2 +- .../application/swing/ui/content/package.html | 2 +- .../ui/content/ref/ContentI18nReferenceUI.jaxx | 98 ++ .../ui/content/ref/ContentI18nReferenceUI.jcss | 75 ++ .../swing/ui/content/ref/ContentReferenceUI.jaxx | 54 +- .../swing/ui/content/ref/ContentReferenceUI.jcss | 51 +- .../ui/content/ref/ContentReferenceUIHandler.java | 221 ++-- .../ui/content/ref/ContentReferenceUIModel.java | 2 +- .../swing/ui/content/ref/ReferenceHomeUI.jaxx | 11 +- .../ui/content/ref/ReferenceHomeUIHandler.java | 11 +- .../swing/ui/content/ref/ReferenceHomeUIModel.java | 4 +- .../ref/ReferentialContentUIInitializer.java | 15 +- .../swing/ui/content/ref/UniqueKeyTableModel.java | 4 +- .../swing/ui/content/ref/impl/CountryUI.jaxx | 99 +- .../ui/content/ref/impl/CountryUIHandler.java | 36 + .../swing/ui/content/ref/impl/CountryUIModel.java | 4 +- .../swing/ui/content/ref/impl/FpaZoneUI.jaxx | 97 +- .../ui/content/ref/impl/FpaZoneUIHandler.java | 36 + .../swing/ui/content/ref/impl/FpaZoneUIModel.java | 4 +- .../content/ref/impl/GearCaracteristicTypeUI.jaxx | 97 +- .../ref/impl/GearCaracteristicTypeUIHandler.java | 36 + .../ref/impl/GearCaracteristicTypeUIModel.java | 4 +- .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 99 +- .../ref/impl/GearCaracteristicUIHandler.java | 36 + .../content/ref/impl/GearCaracteristicUIModel.java | 6 +- .../swing/ui/content/ref/impl/GearUI.jaxx | 30 +- .../swing/ui/content/ref/impl/GearUI.jcss | 4 - .../swing/ui/content/ref/impl/GearUIHandler.java | 24 +- .../swing/ui/content/ref/impl/GearUIModel.java | 4 +- .../swing/ui/content/ref/impl/HarbourUI.jaxx | 29 +- .../ui/content/ref/impl/HarbourUIHandler.java | 36 + .../swing/ui/content/ref/impl/HarbourUIModel.java | 24 +- .../ui/content/ref/impl/I18nReferenceEntity.jcss | 92 -- .../content/ref/impl/LengthLengthParameterUI.jaxx | 209 ++++ .../content/ref/impl/LengthLengthParameterUI.jcss | 126 +++ .../ref/impl/LengthLengthParameterUIHandler.java | 100 ++ .../ref/impl/LengthLengthParameterUIModel.java | 102 ++ .../content/ref/impl/LengthWeightParameterUI.jaxx | 60 +- .../content/ref/impl/LengthWeightParameterUI.jcss | 26 + .../ref/impl/LengthWeightParameterUIHandler.java | 25 +- .../ref/impl/LengthWeightParameterUIModel.java | 7 +- .../ref/impl/NeedCommentReferenceEntity.jcss | 25 - .../swing/ui/content/ref/impl/OceanUI.jaxx | 98 +- .../swing/ui/content/ref/impl/OceanUIHandler.java | 36 + .../swing/ui/content/ref/impl/OceanUIModel.java | 4 +- .../swing/ui/content/ref/impl/OrganismUI.jaxx | 100 +- .../ui/content/ref/impl/OrganismUIHandler.java | 36 + .../swing/ui/content/ref/impl/OrganismUIModel.java | 4 +- .../swing/ui/content/ref/impl/PersonUI.jaxx | 25 +- .../swing/ui/content/ref/impl/PersonUIHandler.java | 36 + .../swing/ui/content/ref/impl/PersonUIModel.java | 16 +- .../content/ref/impl/ProgramObservationEnum.java | 2 +- .../swing/ui/content/ref/impl/ProgramUI.jaxx | 46 +- .../swing/ui/content/ref/impl/ProgramUI.jcss | 4 - .../ui/content/ref/impl/ProgramUIHandler.java | 25 +- .../swing/ui/content/ref/impl/ProgramUIModel.java | 4 +- .../swing/ui/content/ref/impl/ReferenceEntity.jcss | 3 + .../swing/ui/content/ref/impl/SexUI.jaxx | 97 +- .../swing/ui/content/ref/impl/SexUIHandler.java | 36 + .../swing/ui/content/ref/impl/SexUIModel.java | 4 +- .../swing/ui/content/ref/impl/ShipOwnerUI.jaxx | 101 ++ .../swing/ui/content/ref/impl/ShipOwnerUI.jcss | 39 + .../ui/content/ref/impl/ShipOwnerUIHandler.java | 36 + .../ui/content/ref/impl/ShipOwnerUIModel.java | 45 + .../ui/content/ref/impl/SizeMeasureTypeUI.jaxx | 83 ++ .../content/ref/impl/SizeMeasureTypeUIHandler.java | 36 + .../content/ref/impl/SizeMeasureTypeUIModel.java | 42 + .../swing/ui/content/ref/impl/SpeciesGroupUI.jaxx | 99 +- .../ui/content/ref/impl/SpeciesGroupUIHandler.java | 36 + .../ui/content/ref/impl/SpeciesGroupUIModel.java | 4 +- .../swing/ui/content/ref/impl/SpeciesListUI.jaxx | 34 +- .../swing/ui/content/ref/impl/SpeciesListUI.jcss | 4 - .../ui/content/ref/impl/SpeciesListUIHandler.java | 20 +- .../ui/content/ref/impl/SpeciesListUIModel.java | 4 +- .../swing/ui/content/ref/impl/SpeciesUI.jaxx | 39 +- .../swing/ui/content/ref/impl/SpeciesUI.jcss | 26 +- .../ui/content/ref/impl/SpeciesUIHandler.java | 22 +- .../swing/ui/content/ref/impl/SpeciesUIModel.java | 27 +- .../ui/content/ref/impl/VesselSizeCategoryUI.jaxx | 34 +- .../ref/impl/VesselSizeCategoryUIHandler.java | 36 + .../ref/impl/VesselSizeCategoryUIModel.java | 4 +- .../swing/ui/content/ref/impl/VesselTypeUI.jaxx | 30 +- .../ui/content/ref/impl/VesselTypeUIHandler.java | 36 + .../ui/content/ref/impl/VesselTypeUIModel.java | 4 +- .../swing/ui/content/ref/impl/VesselUI.jaxx | 120 +- .../swing/ui/content/ref/impl/VesselUI.jcss | 77 +- .../swing/ui/content/ref/impl/VesselUIHandler.java | 24 +- .../swing/ui/content/ref/impl/VesselUIModel.java | 44 +- .../ui/content/ref/impl/WeightMeasureTypeUI.jaxx | 80 ++ .../ref/impl/WeightMeasureTypeUIHandler.java | 36 + .../content/ref/impl/WeightMeasureTypeUIModel.java | 42 + .../ref/impl/longline/BaitHaulingStatusUI.jaxx | 97 +- .../impl/longline/BaitHaulingStatusUIHandler.java | 36 + .../impl/longline/BaitHaulingStatusUIModel.java | 4 +- .../ref/impl/longline/BaitSettingStatusUI.jaxx | 99 +- .../impl/longline/BaitSettingStatusUIHandler.java | 36 + .../impl/longline/BaitSettingStatusUIModel.java | 4 +- .../ui/content/ref/impl/longline/BaitTypeUI.jaxx | 96 +- .../ref/impl/longline/BaitTypeUIHandler.java | 37 + .../content/ref/impl/longline/BaitTypeUIModel.java | 4 +- .../ref/impl/longline/CatchFateLonglineUI.jaxx | 97 +- .../impl/longline/CatchFateLonglineUIHandler.java | 36 + .../impl/longline/CatchFateLonglineUIModel.java | 4 +- .../content/ref/impl/longline/EncounterTypeUI.jaxx | 97 +- .../ref/impl/longline/EncounterTypeUIHandler.java | 36 + .../ref/impl/longline/EncounterTypeUIModel.java | 4 +- .../ui/content/ref/impl/longline/HealthnessUI.jaxx | 96 +- .../ref/impl/longline/HealthnessUIHandler.java | 36 + .../ref/impl/longline/HealthnessUIModel.java | 4 +- .../content/ref/impl/longline/HookPositionUI.jaxx | 97 +- .../ref/impl/longline/HookPositionUIHandler.java | 36 + .../ref/impl/longline/HookPositionUIModel.java | 4 +- .../ui/content/ref/impl/longline/HookSizeUI.jaxx | 96 +- .../ref/impl/longline/HookSizeUIHandler.java | 36 + .../content/ref/impl/longline/HookSizeUIModel.java | 4 +- .../ui/content/ref/impl/longline/HookTypeUI.jaxx | 98 +- .../ref/impl/longline/HookTypeUIHandler.java | 36 + .../content/ref/impl/longline/HookTypeUIModel.java | 4 +- .../impl/longline/ItemHorizontalPositionUI.jaxx | 97 +- .../longline/ItemHorizontalPositionUIHandler.java | 36 + .../longline/ItemHorizontalPositionUIModel.java | 4 +- .../ref/impl/longline/ItemVerticalPositionUI.jaxx | 97 +- .../longline/ItemVerticalPositionUIHandler.java | 36 + .../impl/longline/ItemVerticalPositionUIModel.java | 4 +- .../ref/impl/longline/LightsticksColorUI.jaxx | 97 +- .../impl/longline/LightsticksColorUIHandler.java | 36 + .../ref/impl/longline/LightsticksColorUIModel.java | 4 +- .../ref/impl/longline/LightsticksTypeUI.jaxx | 97 +- .../impl/longline/LightsticksTypeUIHandler.java | 36 + .../ref/impl/longline/LightsticksTypeUIModel.java | 4 +- .../ui/content/ref/impl/longline/LineTypeUI.jaxx | 96 +- .../ref/impl/longline/LineTypeUIHandler.java | 36 + .../content/ref/impl/longline/LineTypeUIModel.java | 4 +- .../ref/impl/longline/MaturityStatusUI.jaxx | 100 +- .../ref/impl/longline/MaturityStatusUIHandler.java | 36 + .../ref/impl/longline/MaturityStatusUIModel.java | 4 +- .../ref/impl/longline/MitigationTypeUI.jaxx | 97 +- .../ref/impl/longline/MitigationTypeUIHandler.java | 36 + .../ref/impl/longline/MitigationTypeUIModel.java | 4 +- .../content/ref/impl/longline/SensorBrandUI.jaxx | 26 +- .../ref/impl/longline/SensorBrandUIHandler.java | 36 + .../ref/impl/longline/SensorBrandUIModel.java | 4 +- .../ref/impl/longline/SensorDataFormatUI.jaxx | 97 +- .../impl/longline/SensorDataFormatUIHandler.java | 36 + .../ref/impl/longline/SensorDataFormatUIModel.java | 4 +- .../ui/content/ref/impl/longline/SensorTypeUI.jaxx | 96 +- .../ref/impl/longline/SensorTypeUIHandler.java | 36 + .../ref/impl/longline/SensorTypeUIModel.java | 4 +- .../content/ref/impl/longline/SettingShapeUI.jaxx | 97 +- .../ref/impl/longline/SettingShapeUIHandler.java | 36 + .../ref/impl/longline/SettingShapeUIModel.java | 4 +- .../ref/impl/longline/SizeMeasureTypeUI.jaxx | 153 --- .../ref/impl/longline/SizeMeasureTypeUIModel.java | 42 - .../ref/impl/longline/StomacFullnessUI.jaxx | 97 +- .../ref/impl/longline/StomacFullnessUIHandler.java | 36 + .../ref/impl/longline/StomacFullnessUIModel.java | 4 +- .../ui/content/ref/impl/longline/TripTypeUI.jaxx | 96 +- .../ref/impl/longline/TripTypeUIHandler.java | 36 + .../content/ref/impl/longline/TripTypeUIModel.java | 4 +- .../impl/longline/VesselActivityLonglineUI.jaxx | 97 +- .../longline/VesselActivityLonglineUIHandler.java | 36 + .../longline/VesselActivityLonglineUIModel.java | 4 +- .../ref/impl/longline/WeightMeasureTypeUI.jaxx | 153 --- .../impl/longline/WeightMeasureTypeUIModel.java | 42 - .../ui/content/ref/impl/seine/DetectionModeUI.jaxx | 97 +- .../ref/impl/seine/DetectionModeUIHandler.java | 36 + .../ref/impl/seine/DetectionModeUIModel.java | 4 +- .../ui/content/ref/impl/seine/ObjectFateUI.jaxx | 95 +- .../ref/impl/seine/ObjectFateUIHandler.java | 36 + .../content/ref/impl/seine/ObjectFateUIModel.java | 4 +- .../content/ref/impl/seine/ObjectOperationUI.jaxx | 98 +- .../ref/impl/seine/ObjectOperationUIHandler.java | 36 + .../ref/impl/seine/ObjectOperationUIModel.java | 4 +- .../ui/content/ref/impl/seine/ObjectTypeUI.jaxx | 95 +- .../ref/impl/seine/ObjectTypeUIHandler.java | 36 + .../content/ref/impl/seine/ObjectTypeUIModel.java | 4 +- .../content/ref/impl/seine/ObservedSystemUI.jaxx | 99 +- .../ref/impl/seine/ObservedSystemUIHandler.java | 36 + .../ref/impl/seine/ObservedSystemUIModel.java | 4 +- .../content/ref/impl/seine/ReasonForDiscardUI.jaxx | 98 +- .../ref/impl/seine/ReasonForDiscardUIHandler.java | 36 + .../ref/impl/seine/ReasonForDiscardUIModel.java | 4 +- .../ref/impl/seine/ReasonForNoFishingUI.jaxx | 101 +- .../impl/seine/ReasonForNoFishingUIHandler.java | 36 + .../ref/impl/seine/ReasonForNoFishingUIModel.java | 4 +- .../content/ref/impl/seine/ReasonForNullSetUI.jaxx | 96 +- .../ref/impl/seine/ReasonForNullSetUIHandler.java | 36 + .../ref/impl/seine/ReasonForNullSetUIModel.java | 4 +- .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx | 99 +- .../ui/content/ref/impl/seine/SpeciesFateUI.jcss | 32 + .../ref/impl/seine/SpeciesFateUIHandler.java | 36 + .../content/ref/impl/seine/SpeciesFateUIModel.java | 10 +- .../ui/content/ref/impl/seine/SpeciesStatusUI.jaxx | 96 +- .../ref/impl/seine/SpeciesStatusUIHandler.java | 36 + .../ref/impl/seine/SpeciesStatusUIModel.java | 4 +- .../ref/impl/seine/SurroundingActivityUI.jaxx | 96 +- .../impl/seine/SurroundingActivityUIHandler.java | 36 + .../ref/impl/seine/SurroundingActivityUIModel.java | 4 +- .../impl/seine/TransmittingBuoyOperationUI.jaxx | 98 +- .../seine/TransmittingBuoyOperationUIHandler.java | 36 + .../seine/TransmittingBuoyOperationUIModel.java | 4 +- .../ref/impl/seine/TransmittingBuoyTypeUI.jaxx | 95 +- .../impl/seine/TransmittingBuoyTypeUIHandler.java | 36 + .../impl/seine/TransmittingBuoyTypeUIModel.java | 4 +- .../ref/impl/seine/VesselActivitySeineUI.jaxx | 105 +- .../ref/impl/seine/VesselActivitySeineUI.jcss | 4 + .../impl/seine/VesselActivitySeineUIHandler.java | 36 + .../ref/impl/seine/VesselActivitySeineUIModel.java | 10 +- .../content/ref/impl/seine/WeightCategoryUI.jaxx | 96 +- .../ref/impl/seine/WeightCategoryUIHandler.java | 36 + .../ref/impl/seine/WeightCategoryUIModel.java | 4 +- .../swing/ui/content/ref/impl/seine/WindUI.jaxx | 100 +- .../ui/content/ref/impl/seine/WindUIHandler.java | 36 + .../ui/content/ref/impl/seine/WindUIModel.java | 4 +- .../application/swing/ui/content/ref/package.html | 2 +- .../swing/ui/content/table/CommonTable.jcss | 4 + .../swing/ui/content/table/ContentTableMeta.java | 2 +- .../swing/ui/content/table/ContentTableModel.java | 9 +- .../swing/ui/content/table/ContentTableUI.jaxx | 43 +- .../swing/ui/content/table/ContentTableUI.jcss | 37 +- .../ui/content/table/ContentTableUIHandler.java | 148 +-- .../content/table/ContentTableUIInitializer.java | 13 +- .../ui/content/table/ContentTableUIModel.java | 13 +- .../ui/content/table/ObserveContentTableUI.java | 12 +- .../impl/GearUseFeatureMeasurementCellEditor.java | 6 +- .../GearUseFeatureMeasurementCellRenderer.java | 6 +- .../table/impl/longline/BaitsCompositionUI.jaxx | 24 +- .../impl/longline/BaitsCompositionUIHandler.java | 17 +- .../impl/longline/BaitsCompositionUIModel.java | 24 +- .../impl/longline/BranchlinesCompositionUI.jaxx | 34 +- .../impl/longline/BranchlinesCompositionUI.jcss | 11 + .../longline/BranchlinesCompositionUIHandler.java | 20 +- .../longline/BranchlinesCompositionUIModel.java | 24 +- .../impl/longline/CatchAcquisitionModeEnum.java | 2 +- .../CatchLonglineContentTableUIInitializer.java | 2 +- .../impl/longline/CatchLonglineTableModel.java | 42 +- .../table/impl/longline/CatchLonglineUI.jaxx | 95 +- .../table/impl/longline/CatchLonglineUI.jcss | 48 +- .../impl/longline/CatchLonglineUIHandler.java | 205 +++- .../table/impl/longline/CatchLonglineUIModel.java | 76 +- .../content/table/impl/longline/EncounterUI.jaxx | 19 +- .../table/impl/longline/EncounterUIHandler.java | 26 +- .../table/impl/longline/EncounterUIModel.java | 16 +- .../impl/longline/FloatlinesCompositionUI.jaxx | 21 +- .../longline/FloatlinesCompositionUIHandler.java | 17 +- .../longline/FloatlinesCompositionUIModel.java | 21 +- .../GearUseFeaturesLonglineTableModel.java | 14 +- .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 30 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 37 +- .../longline/GearUseFeaturesLonglineUIModel.java | 12 +- ...rUseFeaturesMeasurementLonglinesTableModel.java | 6 +- .../table/impl/longline/HooksCompositionUI.jaxx | 25 +- .../impl/longline/HooksCompositionUIHandler.java | 17 +- .../impl/longline/HooksCompositionUIModel.java | 23 +- .../impl/longline/LonglinePositionHelper.java | 23 +- .../content/table/impl/longline/SensorUsedUI.jaxx | 23 +- .../content/table/impl/longline/SensorUsedUI.jcss | 1 - .../table/impl/longline/SensorUsedUIHandler.java | 56 +- .../table/impl/longline/SensorUsedUIModel.java | 27 +- .../impl/longline/SizeMeasuresTableModel.java | 4 +- .../ui/content/table/impl/longline/TdrUI.jaxx | 32 +- .../ui/content/table/impl/longline/TdrUI.jcss | 1 - .../content/table/impl/longline/TdrUIHandler.java | 83 +- .../ui/content/table/impl/longline/TdrUIModel.java | 11 +- .../impl/longline/WeightMeasuresTableModel.java | 4 +- .../content/table/impl/seine/AbstractSampleUI.jcss | 96 +- .../table/impl/seine/AbstractSampleUIHandler.java | 92 ++ .../content/table/impl/seine/CodeMesureEnum.java | 2 +- ...GearUseFeaturesMeasurementSeinesTableModel.java | 6 +- .../impl/seine/GearUseFeaturesSeineTableModel.java | 14 +- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 30 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 36 +- .../impl/seine/GearUseFeaturesSeineUIModel.java | 26 +- .../impl/seine/ModeSaisieEchantillonEnum.java | 2 +- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 67 +- .../content/table/impl/seine/NonTargetCatchUI.jcss | 20 + .../table/impl/seine/NonTargetCatchUIHandler.java | 50 +- .../table/impl/seine/NonTargetCatchUIModel.java | 18 +- .../table/impl/seine/NonTargetSampleUI.jaxx | 99 +- .../table/impl/seine/NonTargetSampleUI.jcss | 38 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 145 ++- .../table/impl/seine/NonTargetSampleUIModel.java | 50 +- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 36 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 26 +- .../impl/seine/ObjectObservedSpeciesUIModel.java | 17 +- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 36 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 26 +- .../impl/seine/ObjectSchoolEstimateUIModel.java | 17 +- .../content/table/impl/seine/SchoolEstimateUI.jaxx | 29 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 30 +- .../table/impl/seine/SchoolEstimateUIModel.java | 23 +- .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 43 +- .../ui/content/table/impl/seine/TargetCatchUI.jcss | 9 +- .../table/impl/seine/TargetCatchUIHandler.java | 44 +- .../table/impl/seine/TargetCatchUIModel.java | 31 +- .../table/impl/seine/TargetDiscardCatchUI.jaxx | 49 +- .../table/impl/seine/TargetDiscardCatchUI.jcss | 9 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 136 +-- .../impl/seine/TargetDiscardCatchUIModel.java | 31 +- .../table/impl/seine/TargetSampleCaptureUI.jaxx | 12 +- .../impl/seine/TargetSampleCaptureUIHandler.java | 48 + .../table/impl/seine/TargetSampleRejeteUI.jaxx | 12 +- .../impl/seine/TargetSampleRejeteUIHandler.java | 48 + .../content/table/impl/seine/TargetSampleUI.jaxx | 84 +- .../content/table/impl/seine/TargetSampleUI.jcss | 39 +- .../table/impl/seine/TargetSampleUIHandler.java | 218 ++-- .../table/impl/seine/TargetSampleUIModel.java | 46 +- .../swing/ui/content/table/package.html | 2 +- .../ird/observe/application/swing/ui/package.html | 2 +- .../swing/ui/storage/ObstunaAdminAction.java | 55 +- .../swing/ui/storage/RemoteUILauncher.java | 2 +- .../swing/ui/storage/StorageBackupUILauncher.java | 60 +- .../application/swing/ui/storage/StorageStep.java | 2 +- .../application/swing/ui/storage/StorageUI.jaxx | 49 +- .../swing/ui/storage/StorageUIHandler.java | 536 ++++----- .../swing/ui/storage/StorageUILauncher.java | 138 +-- .../swing/ui/storage/StorageUIModel.java | 200 ++-- .../application/swing/ui/storage/package.html | 2 +- .../swing/ui/storage/tabs/BackupUI.jaxx | 17 +- .../swing/ui/storage/tabs/BackupUIHandler.java | 96 ++ .../swing/ui/storage/tabs/ChooseDbModeUI.jaxx | 10 +- .../swing/ui/storage/tabs/ChooseDbModeUI.jcss | 6 +- .../ui/storage/tabs/ChooseDbModeUIHandler.java | 99 ++ .../swing/ui/storage/tabs/ConfigDataUI.jaxx | 29 +- .../swing/ui/storage/tabs/ConfigDataUIHandler.java | 114 ++ .../swing/ui/storage/tabs/ConfigReferentielUI.jaxx | 47 +- .../storage/tabs/ConfigReferentielUIHandler.java | 139 +++ .../swing/ui/storage/tabs/ConfigUI.jaxx | 401 +++---- .../swing/ui/storage/tabs/ConfigUI.jcss | 28 +- .../swing/ui/storage/tabs/ConfigUIHandler.java | 171 +++ .../swing/ui/storage/tabs/ConfirmUI.jaxx | 13 +- .../swing/ui/storage/tabs/ConfirmUI.jcss | 7 + .../swing/ui/storage/tabs/ConfirmUIHandler.java | 43 + .../swing/ui/storage/tabs/DataSelectionModel.java | 564 --------- .../swing/ui/storage/tabs/RolesTableModel.java | 8 +- .../application/swing/ui/storage/tabs/RolesUI.jaxx | 10 +- .../swing/ui/storage/tabs/RolesUIHandler.java | 96 ++ .../swing/ui/storage/tabs/SecurityModel.java | 16 +- .../swing/ui/storage/tabs/SelectDataUI.jaxx | 34 +- .../swing/ui/storage/tabs/SelectDataUI.jcss | 6 - .../swing/ui/storage/tabs/SelectDataUIHandler.java | 44 + .../swing/ui/storage/tabs/StorageTabUI.jaxx | 12 +- .../swing/ui/storage/tabs/StorageTabUIHandler.java | 494 +------- .../application/swing/ui/storage/tabs/package.html | 4 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 428 ------- .../swing/ui/tree/AbstrctReferenceNodeSupport.java | 115 -- .../swing/ui/tree/ActivityLonglineNode.java | 51 - .../swing/ui/tree/ActivitySeineNode.java | 51 - .../swing/ui/tree/DataReferenceNodeSupport.java | 97 -- .../ui/tree/DataSelectionTreeCellRenderer.java | 138 --- .../ui/tree/DataSelectionTreeSelectionModel.java | 706 ------------ .../swing/ui/tree/FloatingObjectSeineNode.java | 51 - .../swing/ui/tree/NavigationTreeCellRenderer.java | 99 -- .../ui/tree/NavigationTreeSelectionModel.java | 118 -- .../swing/ui/tree/ObserveDataProvider.java | 83 -- .../tree/ObserveNavigationTreeShowPopupAction.java | 74 +- .../application/swing/ui/tree/ObserveNode.java | 119 -- .../swing/ui/tree/ObserveTreeBridge.java | 141 --- .../swing/ui/tree/ObserveTreeHelper.java | 570 ---------- .../swing/ui/tree/ObserveTreeNodeSupport.java | 61 + .../swing/ui/tree/ProgramLonglineNode.java | 56 - .../swing/ui/tree/ProgramSeineNode.java | 55 - .../ui/tree/ReferentialReferenceNodeSupport.java | 84 -- .../application/swing/ui/tree/RouteSeineNode.java | 49 - .../application/swing/ui/tree/SetLonglineNode.java | 51 - .../application/swing/ui/tree/SetSeineNode.java | 51 - .../swing/ui/tree/TripLonglineNode.java | 50 - .../application/swing/ui/tree/TripSeineNode.java | 50 - .../actions/ChangeActivityRouteActionListener.java | 29 +- .../actions/ChangeActivityTripActionListener.java | 29 +- .../actions/ChangeRouteTripActionListener.java | 29 +- .../actions/ChangeTripProgramActionListener.java | 33 +- .../ui/tree/actions/NodeChangeActionListener.java | 38 +- .../loadors/AbstractDataReferenceChildLoador.java | 39 - .../ui/tree/loadors/AbstractNodeChildLoador.java | 95 -- .../loadors/ActivityLonglineNodeChildLoador.java | 92 -- .../loadors/ActivityLonglinesNodeChildLoador.java | 64 -- .../tree/loadors/ActivitySeineNodeChildLoador.java | 103 -- .../loadors/ActivitySeinesNodeChildLoador.java | 66 -- .../loadors/FloatingObjectNodeChildLoador.java | 60 - .../loadors/ProgramLonglineNodeChildLoador.java | 123 -- .../tree/loadors/ProgramSeineNodeChildLoador.java | 116 -- .../ui/tree/loadors/ReferenceNodeChildLoador.java | 80 -- .../swing/ui/tree/loadors/RootNodeChildLoador.java | 148 --- .../ui/tree/loadors/RoutesNodeChildLoador.java | 70 -- .../tree/loadors/SetLonglineNodeChildLoador.java | 67 -- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 76 -- .../MoveActivityLonglineNodeMenuPopulator.java | 33 +- .../menu/MoveActivitySeineNodeMenuPopulator.java | 33 +- .../swing/ui/tree/menu/MoveNodeMenuPopulator.java | 20 +- .../ui/tree/menu/MoveRouteNodeMenuPopulator.java | 33 +- .../menu/MoveTripLonglineNodeMenuPopulator.java | 86 ++ .../ui/tree/menu/MoveTripNodeMenuPopulator.java | 105 -- .../tree/menu/MoveTripSeineNodeMenuPopulator.java | 90 ++ .../swing/ui/tree/navigation/NavigationTree.java | 615 ++++++++++ .../navigation/NavigationTreeCellRenderer.java | 97 ++ .../ui/tree/navigation/NavigationTreeHeader.jaxx | 52 + .../ui/tree/navigation/NavigationTreeHeader.jcss | 66 ++ .../navigation/NavigationTreeHeaderHandler.java | 136 +++ .../ui/tree/navigation/NavigationTreeModel.java | 197 ++++ .../navigation/nodes/ClassNavigationTreeNode.java | 75 ++ .../nodes/NavigationTreeNodeSupport.java | 222 ++++ .../nodes/ReferenceNavigationTreeNodeSupport.java | 74 ++ .../navigation/nodes/RootNavigationTreeNode.java | 59 + .../nodes/StringNavigationTreeNodeSupport.java | 68 ++ .../tree/navigation/nodes/WithChildsToReload.java | 34 + .../ActivitiesLonglineNavigationTreeNode.java | 74 ++ .../ActivityLonglineNavigationTreeNode.java | 82 ++ .../longline/CatchLonglineNavigationTreeNode.java | 50 + .../EncounterLonglineNavigationTreeNode.java | 50 + .../GearUseFeaturesLonglineNavigationTreeNode.java | 56 + .../ProgramLonglineNavigationTreeNode.java | 83 ++ .../SensorUsedLonglineNavigationTreeNode.java | 50 + ...etailCompositionLonglineNavigationTreeNode.java | 50 + ...lobalCompositionLonglineNavigationTreeNode.java | 50 + .../longline/SetLonglineNavigationTreeNode.java | 76 ++ .../longline/TdrLonglineNavigationTreeNode.java | 50 + .../longline/TripLonglineNavigationTreeNode.java | 70 ++ .../referential/ReferentialNavigationTreeNode.java | 86 ++ .../ReferentialsNavigationTreeNode.java | 77 ++ .../seine/ActivitiesSeineNavigationTreeNode.java | 74 ++ .../seine/ActivitySeineNavigationTreeNode.java | 87 ++ ...cardedTargetCatchesSeineNavigationTreeNode.java | 50 + ...cardedTargetSamplesSeineNavigationTreeNode.java | 50 + .../FloatingObjectSeineNavigationTreeNode.java | 75 ++ ...ngObjectTransmittingBuoyNavigationTreeNode.java | 50 + .../GearUseFeaturesSeineNavigationTreeNode.java | 56 + .../KeptTargetCatchesSeineNavigationTreeNode.java | 51 + .../KeptTargetSamplesSeineNavigationTreeNode.java | 50 + .../NonTargetCatchesSeineNavigationTreeNode.java | 50 + .../NoneTargetSamplesSeineNavigationTreeNode.java | 51 + .../ObjectObservedSpeciesNavigationTreeNode.java | 50 + .../ObjectSchoolEstimateNavigationTreeNode.java | 50 + .../seine/ProgramSeineNavigationTreeNode.java | 82 ++ .../nodes/seine/RouteSeineNavigationTreeNode.java | 68 ++ .../nodes/seine/RoutesSeineNavigationTreeNode.java | 77 ++ .../SchoolEstimatesSeineNavigationTreeNode.java | 50 + .../nodes/seine/SetSeineNavigationTreeNode.java | 83 ++ .../nodes/seine/TripSeineNavigationTreeNode.java | 69 ++ .../swing/ui/tree/selection/SelectionTree.java | 106 ++ .../tree/selection/SelectionTreeCellRenderer.java | 75 ++ .../ui/tree/selection/SelectionTreeHeader.jaxx | 43 + .../ui/tree/selection/SelectionTreeHeader.jcss | 50 + .../tree/selection/SelectionTreeHeaderHandler.java | 96 ++ .../ui/tree/selection/SelectionTreeModel.java | 383 +++++++ .../selection/nodes/ProgramSelectionTreeNode.java | 107 ++ .../nodes/ReferenceSelectionTreeNodeSupport.java | 71 ++ .../nodes/ReferentialSelectionTreeNode.java | 73 ++ .../nodes/ReferentialsSelectionTreeNode.java | 108 ++ .../selection/nodes/RootSelectionTreeNode.java | 83 ++ .../selection/nodes/SelectionTreeNodeSupport.java | 89 ++ .../nodes/TripLonglineSelectionTreeNode.java | 66 ++ .../nodes/TripSeineSelectionTreeNode.java | 67 ++ .../nodes/TripSelectionTreeNodeSupport.java | 49 + .../application/swing/ui/usage/UsagesUI.jaxx | 39 +- .../swing/ui/usage/UsagesUIHandler.java | 77 +- .../application/swing/ui/util/BooleanEditor.java | 2 +- .../swing/ui/util/DecoratedNodeEntity.java | 8 +- .../application/swing/ui/util/FloatConverter.java | 2 +- .../swing/ui/util/JVetoableTabbedPane.java | 2 +- .../ObserveSwingValidatorMessageTableModel.java | 2 +- .../ObserveValidationMessageTableRenderer.java | 2 +- .../util/ObserveValidatorMessageTableRenderer.java | 2 +- .../application/swing/ui/util/ProgressModel.java | 76 ++ .../application/swing/ui/util/SpringUtilities.java | 2 +- .../ui/util/table/AbstractSelectTableAction.java | 2 +- .../AutotSelectRowAndShowPopupActionSupport.java | 2 +- .../swing/ui/util/table/EditableList.java | 2 +- .../ui/util/table/EditableTableModelSupport.java | 2 +- .../EditableTableWithCacheTableModelSupport.java | 2 +- ...nlineTableAutotSelectRowAndShowPopupAction.java | 2 +- .../util/table/MoveToNextEditableCellAction.java | 2 +- .../ui/util/table/MoveToNextEditableRowAction.java | 2 +- .../table/MoveToPreviousEditableCellAction.java | 2 +- .../table/MoveToPreviousEditableRowAction.java | 2 +- .../table/ObserveBooleanTableCellRenderer.java | 2 +- .../swing/ui/util/tree/BeanTreeHeader.jaxx | 2 +- .../swing/ui/util/tree/BeanTreeHeaderHandler.java | 2 +- .../swing/ui/util/tripMap/ObserveMapPane.java | 2 +- .../ui/util/tripMap/ObserveMapPaneLegendItem.java | 2 +- .../util/tripMap/ObserverMapPanLegendDrawer.java | 2 +- .../ui/util/tripMap/TripMapContentBuilder.java | 2 +- .../swing/ui/util/tripMap/TripMapUI.jaxx | 21 +- .../swing/ui/util/tripMap/TripMapUIHandler.java | 77 +- .../swing/validation/ObserveSwingValidator.java | 13 +- .../swing/validation/ValidationContext.java | 42 +- .../swing/validation/ValidationModelMode.java | 2 +- .../map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml | 2 +- application-swing/src/main/map/style.xml | 2 +- .../main/resources/ftl/connexionTestResult_en.ftl | 2 +- .../main/resources/ftl/connexionTestResult_es.ftl | 2 +- .../main/resources/ftl/connexionTestResult_fr.ftl | 2 +- .../ftl/dataSourceConnectionReport_en.ftl | 12 +- .../ftl/dataSourceConnectionReport_es.ftl | 12 +- .../ftl/dataSourceConnectionReport_fr.ftl | 12 +- .../resources/ftl/dataSourceInformation_en.ftl | 2 +- .../resources/ftl/dataSourceInformation_es.ftl | 2 +- .../resources/ftl/dataSourceInformation_fr.ftl | 2 +- .../src/main/resources/ftl/dataSourcePolicy_en.ftl | 2 +- .../src/main/resources/ftl/dataSourcePolicy_es.ftl | 2 +- .../src/main/resources/ftl/dataSourcePolicy_fr.ftl | 2 +- .../ftl/dataSourceSelectModeResume_en.ftl | 2 +- .../ftl/dataSourceSelectModeResume_es.ftl | 2 +- .../ftl/dataSourceSelectModeResume_fr.ftl | 2 +- .../ftl/storageModelDataSourceConfiguration_en.ftl | 2 +- .../ftl/storageModelDataSourceConfiguration_es.ftl | 2 +- .../ftl/storageModelDataSourceConfiguration_fr.ftl | 2 +- .../i18n/application-swing_en_GB.properties | 91 +- .../i18n/application-swing_es_ES.properties | 93 +- .../i18n/application-swing_fr_FR.properties | 91 +- .../src/main/resources/icons/action-fullScreen.png | Bin 0 -> 687 bytes .../main/resources/icons/action-windowScreen.png | Bin 0 -> 727 bytes .../src/main/resources/icons/logo OT_rvb.png | Bin 143337 -> 0 bytes .../src/main/resources/icons/logo-OT_web.png | Bin 34309 -> 0 bytes .../src/main/resources/icons/logo-small.png | Bin 0 -> 46914 bytes .../src/main/resources/icons/logo.png | Bin 0 -> 232898 bytes ...glineDetailCompositionValidatorServiceTest.java | 2 +- .../src/test/resources/log4j.properties | 2 +- application-web-configuration/pom.xml | 14 +- .../src/license/THIRD-PARTY.properties | 14 +- .../src/main/config/ObserveWebApplication.ini | 99 ++ .../src/main/config/ObserveWebApplication.toml | 112 -- .../configuration/ObserveWebApplicationConfig.java | 41 +- .../ObserveWebApplicationConfigInitException.java | 2 +- .../db/InvalidObserveWebDatabaseException.java | 2 +- .../db/InvalidObserveWebDatabaseRoleException.java | 2 +- .../db/InvalidObserveWebDatabasesException.java | 2 +- .../web/configuration/db/ObserveWebDatabase.java | 2 +- .../configuration/db/ObserveWebDatabaseRole.java | 2 +- .../web/configuration/db/ObserveWebDatabases.java | 2 +- .../db/ObserveWebDatabasesHelper.java | 2 +- .../db/impl/ObserveWebDatabaseBean.java | 2 +- .../db/impl/ObserveWebDatabaseImmutable.java | 2 +- .../db/impl/ObserveWebDatabaseRoleBean.java | 2 +- .../db/impl/ObserveWebDatabaseRoleImmutable.java | 2 +- .../db/impl/ObserveWebDatabasesBean.java | 2 +- .../db/impl/ObserveWebDatabasesImmutable.java | 2 +- .../user/InvalidObserveWebUserException.java | 2 +- .../InvalidObserveWebUserPermissionException.java | 2 +- .../user/InvalidObserveWebUsersException.java | 2 +- .../web/configuration/user/ObserveWebUser.java | 2 +- .../user/ObserveWebUserPermission.java | 2 +- .../web/configuration/user/ObserveWebUsers.java | 2 +- .../configuration/user/ObserveWebUsersHelper.java | 2 +- .../user/impl/ObserveWebUserBean.java | 2 +- .../user/impl/ObserveWebUserImmutable.java | 2 +- .../user/impl/ObserveWebUserPermissionBean.java | 2 +- .../impl/ObserveWebUserPermissionImmutable.java | 2 +- .../user/impl/ObserveWebUsersBean.java | 2 +- .../user/impl/ObserveWebUsersImmutable.java | 2 +- .../src/main/resources/log4j.properties | 2 +- .../src/main/resources/validators.xml | 4 +- application-web/pom.xml | 7 +- application-web/src/jetty/jetty-context.xml | 2 +- .../web/ObserveWebApplicationContext.java | 2 +- .../ObserveWebApplicationContextInitException.java | 2 +- .../web/ObserveWebApplicationListener.java | 2 +- .../application/web/ObserveWebMainHandler.java | 2 +- .../application/web/ObserveWebMotionFilter.java | 2 +- .../application/web/ObserveWebMotionRender.java | 2 +- .../web/controller/ConfigurationController.java | 2 +- .../web/controller/ObserveWebMotionController.java | 2 +- .../controller/v1/DataSourceServiceController.java | 2 +- .../v1/LastUpdateDateServiceController.java | 2 +- ...serveAuthenticatedServiceControllerSupport.java | 2 +- .../v1/ObserveServiceControllerSupport.java | 2 +- .../controller/v1/ObserveWebErrorController.java | 2 +- .../web/controller/v1/PingServiceController.java | 2 +- .../v1/ReferentialServiceController.java | 105 -- .../v1/SqlScriptProducerServiceController.java | 48 - .../ConsolidateDataServiceController.java | 8 +- .../v1/actions/report/ReportServiceController.java | 2 +- ...eferentialSynchronizeDiffServiceController.java | 2 +- ...ferentialSynchronizeLocalServiceController.java | 2 +- .../ReferentialSynchronizeServiceController.java | 2 +- .../validate/ValidateServiceController.java | 2 +- .../v1/data/NavigationServiceController.java | 46 + .../v1/data/TripManagementServiceController.java | 61 + ...ActivityLongLineEncounterServiceController.java | 49 + ...ctivityLongLineSensorUsedServiceController.java | 55 + .../ActivityLonglineServiceController.java | 98 ++ .../data/longline/BranchlineServiceController.java | 49 + .../SetLonglineCatchServiceController.java | 49 + ...LonglineDetailCompositionServiceController.java | 64 ++ ...LonglineGlobalCompositionServiceController.java | 49 + .../longline/SetLonglineServiceController.java | 76 ++ .../v1/data/longline/TdrServiceController.java | 55 + .../TripLonglineGearUseServiceController.java | 49 + .../longline/TripLonglineServiceController.java | 117 ++ .../data/seine/ActivitySeineServiceController.java | 98 ++ .../seine/FloatingObjectServiceController.java | 82 ++ .../seine/NonTargetCatchServiceController.java | 49 + .../seine/NonTargetSampleServiceController.java | 63 ++ .../ObjectObservedSpeciesServiceController.java | 49 + .../ObjectSchoolEstimateServiceController.java | 49 + .../v1/data/seine/RouteServiceController.java | 98 ++ .../seine/SchoolEstimateServiceController.java | 49 + .../v1/data/seine/SetSeineServiceController.java | 76 ++ .../data/seine/TargetCatchServiceController.java | 49 + .../data/seine/TargetSampleServiceController.java | 62 + ...TransmittingBuoyOperationServiceController.java | 49 + .../seine/TripSeineGearUseServiceController.java | 49 + .../v1/data/seine/TripSeineServiceController.java | 117 ++ ...ActivityLongLineEncounterServiceController.java | 49 - ...ctivityLongLineSensorUsedServiceController.java | 55 - .../ActivityLonglineServiceController.java | 98 -- .../v1/longline/BranchlineServiceController.java | 49 - .../SetLonglineCatchServiceController.java | 49 - ...LonglineDetailCompositionServiceController.java | 64 -- ...LonglineGlobalCompositionServiceController.java | 49 - .../v1/longline/SetLonglineServiceController.java | 76 -- .../v1/longline/TdrServiceController.java | 55 - .../TripLonglineGearUseServiceController.java | 49 - .../v1/longline/TripLonglineServiceController.java | 117 -- .../referential/ReferentialServiceController.java | 128 +++ ...tivitySeineObservedSystemServiceController.java | 49 - .../v1/seine/ActivitySeineServiceController.java | 98 -- .../v1/seine/FloatingObjectServiceController.java | 82 -- .../v1/seine/NonTargetCatchServiceController.java | 49 - .../v1/seine/NonTargetSampleServiceController.java | 63 -- .../ObjectObservedSpeciesServiceController.java | 49 - .../ObjectSchoolEstimateServiceController.java | 49 - .../v1/seine/RouteServiceController.java | 98 -- .../v1/seine/SchoolEstimateServiceController.java | 49 - .../v1/seine/SetSeineServiceController.java | 76 -- .../v1/seine/TargetCatchServiceController.java | 49 - .../v1/seine/TargetSampleServiceController.java | 62 - ...TransmittingBuoyOperationServiceController.java | 49 - .../seine/TripSeineGearUseServiceController.java | 49 - .../v1/seine/TripSeineServiceController.java | 117 -- .../v1/sql/SqlScriptProducerServiceController.java | 49 + .../v1/trip/TripManagementServiceController.java | 61 - .../web/converter/ObserveDtoConverter.java | 2 +- .../application/web/injector/DateInjector.java | 2 +- .../web/injector/ImmutableSetInjector.java | 2 +- .../web/injector/ObserveClassInjector.java | 2 +- .../ObserveDataSourceConfigurationInjector.java | 2 +- .../web/injector/ObserveDtoInjector.java | 2 +- .../ObserveReferenceSetRequestInjector.java | 4 +- .../injector/SqlScriptProducerRequestInjector.java | 4 +- .../web/request/ObserveWebRequestContext.java | 2 +- .../ObserveWebSecurityApplicationContext.java | 2 +- ...ObserveWebSecurityAuthenticationTokenCache.java | 2 +- application-web/src/main/resources/mapping | 291 ++--- application-web/src/main/webapp/WEB-INF/web.xml | 2 +- .../db/ObserveWebDatabasesHelperTest.java | 53 +- .../user/ObserveWebUsersHelperTest.java | 5 +- entities-migration/pom.xml | 6 +- .../migration/AbstractDataSourceMigration.java | 57 - .../AbstractObserveMigrationCallBack.java | 115 -- .../DataSourceMigrationForVersion_5_0.java | 116 ++ .../DataSourceMigrationForVersion_6_0.java | 302 +++++ .../entities/migration/H2DataSourceMigration.java | 281 ----- ...ObserveMigrationCallBackForVersionResolver.java | 94 -- .../ObserveMigrationConfigurationProviderImpl.java | 143 --- .../entities/migration/PGDataSourceMigration.java | 367 ------ .../old/DataSourceMigrationForVersion_3_1.java | 111 ++ .../old/DataSourceMigrationForVersion_3_10.java | 77 ++ .../old/DataSourceMigrationForVersion_3_11.java | 78 ++ .../old/DataSourceMigrationForVersion_3_12.java | 73 ++ .../old/DataSourceMigrationForVersion_3_14.java | 76 ++ .../old/DataSourceMigrationForVersion_3_15.java | 75 ++ .../old/DataSourceMigrationForVersion_3_16.java | 156 +++ .../old/DataSourceMigrationForVersion_3_5.java | 231 ++++ .../old/DataSourceMigrationForVersion_3_7.java | 82 ++ .../old/DataSourceMigrationForVersion_3_8.java | 76 ++ .../old/DataSourceMigrationForVersion_3_9.java | 74 ++ .../old/DataSourceMigrationForVersion_4_0.java | 75 ++ .../old/DataSourceMigrationForVersion_4_0_1.java | 216 ++++ .../old/DataSourceMigrationForVersion_4_0_2.java | 76 ++ .../old/DataSourceMigrationForVersion_4_0_4.java | 72 ++ .../old/DataSourceMigrationForVersion_4_0_RC2.java | 106 ++ .../old/DataSourceMigrationForVersion_4_0_RC3.java | 280 +++++ .../old/DataSourceMigrationForVersion_4_0_RC4.java | 76 ++ .../old/DataSourceMigrationForVersion_4_0_RC6.java | 93 ++ .../old/DataSourceMigrationForVersion_4_0_RC7.java | 82 ++ .../DataSourceMigrationForVersion_3_1.java | 110 -- .../DataSourceMigrationForVersion_3_10.java | 76 -- .../DataSourceMigrationForVersion_3_11.java | 77 -- .../DataSourceMigrationForVersion_3_12.java | 72 -- .../DataSourceMigrationForVersion_3_14.java | 75 -- .../DataSourceMigrationForVersion_3_15.java | 74 -- .../DataSourceMigrationForVersion_3_16.java | 155 --- .../DataSourceMigrationForVersion_3_5.java | 230 ---- .../DataSourceMigrationForVersion_3_7.java | 81 -- .../DataSourceMigrationForVersion_3_8.java | 75 -- .../DataSourceMigrationForVersion_3_9.java | 73 -- .../DataSourceMigrationForVersion_4_0.java | 74 -- .../DataSourceMigrationForVersion_4_0_1.java | 215 ---- .../DataSourceMigrationForVersion_4_0_2.java | 75 -- .../DataSourceMigrationForVersion_4_0_4.java | 71 -- .../DataSourceMigrationForVersion_4_0_RC2.java | 105 -- .../DataSourceMigrationForVersion_4_0_RC3.java | 279 ----- .../DataSourceMigrationForVersion_4_0_RC4.java | 75 -- .../DataSourceMigrationForVersion_4_0_RC6.java | 92 -- .../DataSourceMigrationForVersion_4_0_RC7.java | 81 -- .../DataSourceMigrationForVersion_4_900.java | 73 -- .../DataSourceMigrationForVersion_4_901.java | 73 -- .../DataSourceMigrationForVersion_4_902.java | 73 -- .../DataSourceMigrationForVersion_4_903.java | 74 -- .../DataSourceMigrationForVersion_4_904.java | 70 -- .../DataSourceMigrationForVersion_4_905.java | 71 -- .../DataSourceMigrationForVersion_4_906.java | 81 -- .../DataSourceMigrationForVersion_5_0.java | 72 -- .../resources/db/3.5/traduction_attributes.csv | 2 +- .../db/migration/5.0/01_remove_open_field-H2.sql | 26 + .../db/migration/5.0/01_remove_open_field-PG.sql | 26 + .../5.0/02_add_lastUpdateDate_field-H2.sql | 697 ++++++++++++ .../5.0/02_add_lastUpdateDate_field-PG.sql | 697 ++++++++++++ .../5.0/03_add_lastUpdateDate_table-H2.sql | 127 +++ .../5.0/03_add_lastUpdateDate_table-PG.sql | 127 +++ .../db/migration/5.0/04_remove_unit_field-H2.sql | 22 + .../db/migration/5.0/04_remove_unit_field-PG.sql | 22 + .../db/migration/5.0/05_remove_gender_field-H2.sql | 22 + .../db/migration/5.0/05_remove_gender_field-PG.sql | 22 + .../migration/5.0/06_remove_duplicate_rows-H2.sql | 42 + .../migration/5.0/06_remove_duplicate_rows-PG.sql | 42 + ...drop_not_null_constraint_gearUseFeatures-H2.sql | 22 + ...drop_not_null_constraint_gearUseFeatures-PG.sql | 22 + ...p_not_null_constraint_hauling_identifier-H2.sql | 24 + ...p_not_null_constraint_hauling_identifier-PG.sql | 24 + .../5.0/09_add_non_target_length_sex_fk-H2.sql | 22 + .../5.0/09_add_non_target_length_sex_fk-PG.sql | 22 + .../6.0/01_evol_8374_delete_sonarUsed-H2.sql | 22 + .../6.0/01_evol_8374_delete_sonarUsed-PG.sql | 22 + .../6.0/02_evol_7886_catch_add_set_idx-H2.sql | 23 + .../6.0/02_evol_7886_catch_add_set_idx-PG.sql | 23 + .../03_evol_6997_delete_supportVesselName-H2.sql | 22 + .../03_evol_6997_delete_supportVesselName-PG.sql | 22 + ...ranchlineComposition_add_tracelineLength-H2.sql | 22 + ...ranchlineComposition_add_tracelineLength-PG.sql | 22 + .../05_evol_6999_nonTargetCatch_add_well-H2.sql | 22 + .../05_evol_6999_nonTargetCatch_add_well-PG.sql | 22 + .../6.0/06_evol_8375_setSeine_add_booleans-H2.sql | 23 + .../6.0/06_evol_8375_setSeine_add_booleans-PG.sql | 23 + .../6.0/07_evol_8389_rename_source_columns-H2.sql | 25 + .../6.0/07_evol_8389_rename_source_columns-PG.sql | 25 + .../6.0/08_1_evol_8390_measure_type-H2.sql | 32 + .../6.0/08_1_evol_8390_measure_type-PG.sql | 32 + .../migration/6.0/08_evol_8390_measure_type-H2.sql | 40 + .../migration/6.0/08_evol_8390_measure_type-PG.sql | 41 + .../6.0/09_evol_7877_targetLength_add_sex-H2.sql | 23 + .../6.0/09_evol_7877_targetLength_add_sex-PG.sql | 23 + ...10_evol_8391_species_add_sizeMeasureType-H2.sql | 23 + ...10_evol_8391_species_add_sizeMeasureType-PG.sql | 23 + .../6.0/11_evol_8571_length_add_tagNumber-H2.sql | 24 + .../6.0/11_evol_8571_length_add_tagNumber-PG.sql | 24 + .../6.0/12_evol_8475_vessel_add_fields-H2.sql | 28 + .../6.0/12_evol_8475_vessel_add_fields-PG.sql | 28 + .../6.0/13_evol_7901_add_armateur_table-H2.sql | 58 + .../6.0/13_evol_7901_add_armateur_table-PG.sql | 58 + ...ol_8196_lengthWeightParameter_add_source-H2.sql | 24 + ...ol_8196_lengthWeightParameter_add_source-PG.sql | 24 + ...vol_8578_nonTargetLength_add_speciesFate-H2.sql | 23 + ...vol_8578_nonTargetLength_add_speciesFate-PG.sql | 23 + .../16_evol_8377_speciesFate_add_discard-H2.sql | 29 + .../16_evol_8377_speciesFate_add_discard-PG.sql | 29 + ...ol_8376_vesselActivitySeine_add_allowFad-H2.sql | 25 + ...ol_8376_vesselActivitySeine_add_allowFad-PG.sql | 25 + .../6.0/18_evol_8404_lengthLengthParameter-H2.sql | 35 + .../6.0/18_evol_8404_lengthLengthParameter-PG.sql | 35 + .../6.0/19_ano_8554_brancheline_add_section-H2.sql | 25 + .../6.0/19_ano_8554_brancheline_add_section-PG.sql | 25 + ...evol_8391_species_drop_lengthmeasuretype-H2.sql | 22 + ...evol_8391_species_drop_lengthmeasuretype-PG.sql | 22 + .../db/migration/V3_10_01_remove-person-H2.sql | 28 - .../db/migration/V3_10_01_remove-person-PG.sql | 28 - .../db/migration/V3_10_02_add-missing-fk-H2.sql | 26 - .../db/migration/V3_10_02_add-missing-fk-PG.sql | 26 - .../V3_10_03_increase-comment-field-H2.sql | 23 - .../V3_10_03_increase-comment-field-PG.sql | 23 - .../migration/V3_10_04_fix-sensorDataFormat-H2.sql | 22 - .../migration/V3_10_04_fix-sensorDataFormat-PG.sql | 22 - .../migration/V3_10_05_normalize-sections-H2.sql | 27 - .../migration/V3_10_05_normalize-sections-PG.sql | 27 - ...1_01_remove-speciesGroup-obsolete-fields-H2.sql | 26 - ...1_01_remove-speciesGroup-obsolete-fields-PG.sql | 26 - ...3_11_02_add-country-on-transmitting-buoy-H2.sql | 23 - ...3_11_02_add-country-on-transmitting-buoy-PG.sql | 23 - .../db/migration/V3_11_03_add-fpaZones-H2.sql | 62 - .../db/migration/V3_11_03_add-fpaZones-PG.sql | 62 - .../migration/V3_11_04_add-activity-ersId-H2.sql | 22 - .../migration/V3_11_04_add-activity-ersId-PG.sql | 22 - .../migration/V3_11_05_add-person-country-H2.sql | 23 - .../migration/V3_11_05_add-person-country-PG.sql | 23 - .../db/migration/V3_11_06_add-harbours-H2.sql | 107 -- .../db/migration/V3_11_06_add-harbours-PG.sql | 108 -- .../db/migration/V3_12_01_add-missing-boat-H2.sql | 22 - .../db/migration/V3_12_01_add-missing-boat-PG.sql | 22 - ...3_14_01_remove-hooksPerBasketCount-field-H2.sql | 23 - ...3_14_01_remove-hooksPerBasketCount-field-PG.sql | 22 - ...3_14_02_fix-targetsample-discarded-value-H2.sql | 22 - ...3_14_02_fix-targetsample-discarded-value-PG.sql | 22 - .../V3_14_03_remove-orphan-seine-sample-H2.sql | 22 - .../V3_14_03_remove-orphan-seine-sample-PG.sql | 22 - ...4_04_remove-targetlength-discarded-field-H2.sql | 22 - ...4_04_remove-targetlength-discarded-field-PG.sql | 22 - ..._15_01_change-tdr-integer-field-to-float-H2.sql | 29 - ..._15_01_change-tdr-integer-field-to-float-PG.sql | 30 - ..._15_02_remove-set-longline-length-fields-H2.sql | 23 - ..._15_02_remove-set-longline-length-fields-PG.sql | 23 - .../V3_15_03_remove-brancheline-fields-H2.sql | 23 - .../V3_15_03_remove-brancheline-fields-PG.sql | 23 - .../migration/V3_16_01_add-gear-referential-H2.sql | 141 --- .../migration/V3_16_01_add-gear-referential-PG.sql | 140 --- .../db/migration/V3_16_02_add-gear-data-H2.sql | 39 - .../db/migration/V3_16_02_add-gear-data-PG.sql | 39 - .../V3_16_03_remove-tripSeine-seine-H2.sql | 24 - .../V3_16_03_remove-tripSeine-seine-PG.sql | 24 - .../db/migration/V3_5_01_migration-H2.sql | 944 ---------------- .../db/migration/V3_5_01_migration-PG.sql | 945 ---------------- .../migration/V3_5_02_add-longline-schema-H2.sql | 226 ---- .../migration/V3_5_02_add-longline-schema-PG.sql | 226 ---- .../V3_5_03_update-common-references-H2.sql | 51 - .../V3_5_03_update-common-references-PG.sql | 51 - .../V3_5_04_add-longline-references-H2.sql | 214 ---- .../V3_5_04_add-longline-references-PG.sql | 214 ---- .../db/migration/V3_7_01_rename-seine-model-H2.sql | 71 -- .../db/migration/V3_7_01_rename-seine-model-PG.sql | 72 -- .../migration/V3_7_02_remove-trip-organism-H2.sql | 22 - .../migration/V3_7_02_remove-trip-organism-PG.sql | 22 - .../V3_7_03_add-referential-needComment-H2.sql | 115 -- .../V3_7_03_add-referential-needComment-PG.sql | 115 -- .../V3_7_04_normalize-triplongline-H2.sql | 27 - .../V3_7_04_normalize-triplongline-PG.sql | 26 - .../V3_7_05_normalize-activitylongline-H2.sql | 23 - .../V3_7_05_normalize-activitylongline-PG.sql | 23 - .../migration/V3_7_06_normalize-setlongline-H2.sql | 23 - .../migration/V3_7_06_normalize-setlongline-PG.sql | 24 - .../V3_7_07_normalize-catchlongline-H2.sql | 25 - .../V3_7_07_normalize-catchlongline-PG.sql | 27 - .../db/migration/V3_7_08_normalize-tdr-H2.sql | 27 - .../db/migration/V3_7_08_normalize-tdr-PG.sql | 28 - .../db/migration/V3_7_09_add-species-list-H2.sql | 87 -- .../db/migration/V3_7_09_add-species-list-PG.sql | 87 -- .../V3_7_10_increase-comment-field-H2.sql | 23 - .../V3_7_10_increase-comment-field-PG.sql | 23 - .../db/migration/V3_8_01_fix-person-H2.sql | 22 - .../db/migration/V3_8_01_fix-person-PG.sql | 22 - .../V3_8_02_fix-branchelinecomposition-H2.sql | 25 - .../V3_8_02_fix-branchelinecomposition-PG.sql | 24 - .../migration/V3_8_03_normalize-sensorused-H2.sql | 24 - .../migration/V3_8_03_normalize-sensorused-PG.sql | 24 - .../db/migration/V3_8_04_normalize-tdr-H2.sql | 26 - .../db/migration/V3_8_04_normalize-tdr-PG.sql | 26 - .../V3_9_01_add-dataFilename-attribute-H2.sql | 23 - .../V3_9_01_add-dataFilename-attribute-PG.sql | 23 - .../migration/V3_9_02_fill-sensorDataFormat-H2.sql | 23 - .../migration/V3_9_02_fill-sensorDataFormat-PG.sql | 23 - .../resources/db/migration/V4_0_01_empty-H2.sql | 23 - .../resources/db/migration/V4_0_01_empty-PG.sql | 23 - .../V4_0_1_01_remove-gender-column-H2.sql | 22 - .../db/migration/V4_0_1_02_add-missing-fk-H2.sql | 26 - .../db/migration/V4_0_1_02_add-missing-fk-PG.sql | 26 - .../V4_0_2_01_remove-gender-column-PG.sql | 22 - ...0_4_01_remove-trip-datearriveeport-field-H2.sql | 23 - ...0_4_01_remove-trip-datearriveeport-field-PG.sql | 23 - .../V4_0_RC_2_01_add-foreign-key-indexes-PG.sql | 65 -- .../V4_0_RC_2_01_clean-program-gear-type-H2.sql | 28 - .../V4_0_RC_2_01_clean-program-gear-type-PG.sql | 27 - ...4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql | 22 - ...4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql | 22 - .../V4_0_RC_2_03_rename-unknown-longliner-H2.sql | 22 - .../V4_0_RC_2_03_rename-unknown-longliner-PG.sql | 22 - .../db/migration/V4_0_RC_4_01_add-gear-data-H2.sql | 39 - .../db/migration/V4_0_RC_4_01_add-gear-data-PG.sql | 40 - ...4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql | 26 - ...4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql | 26 - ...4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql | 22 - ...4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql | 22 - .../V4_0_RC_7_02_rename-unknown-longliner-H2.sql | 22 - .../V4_0_RC_7_02_rename-unknown-longliner-PG.sql | 22 - .../migration/V4_900_01_remove_open_field-H2.sql | 26 - .../migration/V4_900_01_remove_open_field-PG.sql | 26 - .../V4_901_01_add_lastUpdateDate_field-H2.sql | 697 ------------ .../V4_901_01_add_lastUpdateDate_field-PG.sql | 697 ------------ .../V4_902_01_add_lastUpdateDate_table-H2.sql | 127 --- .../V4_902_01_add_lastUpdateDate_table-PG.sql | 127 --- .../migration/V4_903_01_remove_unit_field-H2.sql | 22 - .../migration/V4_903_01_remove_unit_field-PG.sql | 22 - .../migration/V4_903_02_remove_gender_field-H2.sql | 22 - .../migration/V4_903_02_remove_gender_field-PG.sql | 22 - .../V4_903_03_remove_duplicate_rows-H2.sql | 42 - .../V4_903_03_remove_duplicate_rows-PG.sql | 42 - ...drop_not_null_constraint_gearUseFeatures-H2.sql | 22 - ...drop_not_null_constraint_gearUseFeatures-PG.sql | 22 - ...p_not_null_constraint_hauling_identifier-H2.sql | 24 - ...p_not_null_constraint_hauling_identifier-PG.sql | 24 - .../V4_906_01_add_non_target_length_sex_fk-H2.sql | 22 - .../V4_906_01_add_non_target_length_sex_fk-PG.sql | 22 - .../old/3.10/V3_10_01_remove-person-H2.sql | 28 + .../old/3.10/V3_10_01_remove-person-PG.sql | 28 + .../old/3.10/V3_10_02_add-missing-fk-H2.sql | 26 + .../old/3.10/V3_10_02_add-missing-fk-PG.sql | 26 + .../3.10/V3_10_03_increase-comment-field-H2.sql | 23 + .../3.10/V3_10_03_increase-comment-field-PG.sql | 23 + .../old/3.10/V3_10_04_fix-sensorDataFormat-H2.sql | 22 + .../old/3.10/V3_10_04_fix-sensorDataFormat-PG.sql | 22 + .../old/3.10/V3_10_05_normalize-sections-H2.sql | 27 + .../old/3.10/V3_10_05_normalize-sections-PG.sql | 27 + ...1_01_remove-speciesGroup-obsolete-fields-H2.sql | 26 + ...1_01_remove-speciesGroup-obsolete-fields-PG.sql | 26 + ...3_11_02_add-country-on-transmitting-buoy-H2.sql | 23 + ...3_11_02_add-country-on-transmitting-buoy-PG.sql | 23 + .../old/3.11/V3_11_03_add-fpaZones-H2.sql | 62 + .../old/3.11/V3_11_03_add-fpaZones-PG.sql | 62 + .../old/3.11/V3_11_04_add-activity-ersId-H2.sql | 22 + .../old/3.11/V3_11_04_add-activity-ersId-PG.sql | 22 + .../old/3.11/V3_11_05_add-person-country-H2.sql | 23 + .../old/3.11/V3_11_05_add-person-country-PG.sql | 23 + .../old/3.11/V3_11_06_add-harbours-H2.sql | 107 ++ .../old/3.11/V3_11_06_add-harbours-PG.sql | 108 ++ .../old/3.12/V3_12_01_add-missing-boat-H2.sql | 22 + .../old/3.12/V3_12_01_add-missing-boat-PG.sql | 22 + ...3_14_01_remove-hooksPerBasketCount-field-H2.sql | 23 + ...3_14_01_remove-hooksPerBasketCount-field-PG.sql | 22 + ...3_14_02_fix-targetsample-discarded-value-H2.sql | 22 + ...3_14_02_fix-targetsample-discarded-value-PG.sql | 22 + .../V3_14_03_remove-orphan-seine-sample-H2.sql | 22 + .../V3_14_03_remove-orphan-seine-sample-PG.sql | 22 + ...4_04_remove-targetlength-discarded-field-H2.sql | 22 + ...4_04_remove-targetlength-discarded-field-PG.sql | 22 + ..._15_01_change-tdr-integer-field-to-float-H2.sql | 29 + ..._15_01_change-tdr-integer-field-to-float-PG.sql | 30 + ..._15_02_remove-set-longline-length-fields-H2.sql | 23 + ..._15_02_remove-set-longline-length-fields-PG.sql | 23 + .../3.15/V3_15_03_remove-brancheline-fields-H2.sql | 23 + .../3.15/V3_15_03_remove-brancheline-fields-PG.sql | 23 + .../old/3.16/V3_16_01_add-gear-referential-H2.sql | 141 +++ .../old/3.16/V3_16_01_add-gear-referential-PG.sql | 140 +++ .../old/3.16/V3_16_02_add-gear-data-H2.sql | 39 + .../old/3.16/V3_16_02_add-gear-data-PG.sql | 39 + .../3.16/V3_16_03_remove-tripSeine-seine-H2.sql | 24 + .../3.16/V3_16_03_remove-tripSeine-seine-PG.sql | 24 + .../db/migration/old/3.5/V3_5_01_migration-H2.sql | 944 ++++++++++++++++ .../db/migration/old/3.5/V3_5_01_migration-PG.sql | 945 ++++++++++++++++ .../old/3.5/V3_5_02_add-longline-schema-H2.sql | 226 ++++ .../old/3.5/V3_5_02_add-longline-schema-PG.sql | 226 ++++ .../3.5/V3_5_03_update-common-references-H2.sql | 51 + .../3.5/V3_5_03_update-common-references-PG.sql | 51 + .../old/3.5/V3_5_04_add-longline-references-H2.sql | 214 ++++ .../old/3.5/V3_5_04_add-longline-references-PG.sql | 214 ++++ .../old/3.7/V3_7_01_rename-seine-model-H2.sql | 71 ++ .../old/3.7/V3_7_01_rename-seine-model-PG.sql | 72 ++ .../old/3.7/V3_7_02_remove-trip-organism-H2.sql | 22 + .../old/3.7/V3_7_02_remove-trip-organism-PG.sql | 22 + .../3.7/V3_7_03_add-referential-needComment-H2.sql | 115 ++ .../3.7/V3_7_03_add-referential-needComment-PG.sql | 115 ++ .../old/3.7/V3_7_04_normalize-triplongline-H2.sql | 27 + .../old/3.7/V3_7_04_normalize-triplongline-PG.sql | 26 + .../3.7/V3_7_05_normalize-activitylongline-H2.sql | 23 + .../3.7/V3_7_05_normalize-activitylongline-PG.sql | 23 + .../old/3.7/V3_7_06_normalize-setlongline-H2.sql | 23 + .../old/3.7/V3_7_06_normalize-setlongline-PG.sql | 24 + .../old/3.7/V3_7_07_normalize-catchlongline-H2.sql | 25 + .../old/3.7/V3_7_07_normalize-catchlongline-PG.sql | 27 + .../migration/old/3.7/V3_7_08_normalize-tdr-H2.sql | 27 + .../migration/old/3.7/V3_7_08_normalize-tdr-PG.sql | 28 + .../old/3.7/V3_7_09_add-species-list-H2.sql | 87 ++ .../old/3.7/V3_7_09_add-species-list-PG.sql | 87 ++ .../old/3.7/V3_7_10_increase-comment-field-H2.sql | 23 + .../old/3.7/V3_7_10_increase-comment-field-PG.sql | 23 + .../db/migration/old/3.8/V3_8_01_fix-person-H2.sql | 22 + .../db/migration/old/3.8/V3_8_01_fix-person-PG.sql | 22 + .../3.8/V3_8_02_fix-branchelinecomposition-H2.sql | 25 + .../3.8/V3_8_02_fix-branchelinecomposition-PG.sql | 24 + .../old/3.8/V3_8_03_normalize-sensorused-H2.sql | 24 + .../old/3.8/V3_8_03_normalize-sensorused-PG.sql | 24 + .../migration/old/3.8/V3_8_04_normalize-tdr-H2.sql | 26 + .../migration/old/3.8/V3_8_04_normalize-tdr-PG.sql | 26 + .../3.9/V3_9_01_add-dataFilename-attribute-H2.sql | 23 + .../3.9/V3_9_01_add-dataFilename-attribute-PG.sql | 23 + .../old/3.9/V3_9_02_fill-sensorDataFormat-H2.sql | 23 + .../old/3.9/V3_9_02_fill-sensorDataFormat-PG.sql | 23 + .../V4_0_RC_2_01_add-foreign-key-indexes-PG.sql | 65 ++ .../V4_0_RC_2_01_clean-program-gear-type-H2.sql | 28 + .../V4_0_RC_2_01_clean-program-gear-type-PG.sql | 27 + ...4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql | 22 + ...4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql | 22 + .../V4_0_RC_2_03_rename-unknown-longliner-H2.sql | 22 + .../V4_0_RC_2_03_rename-unknown-longliner-PG.sql | 22 + .../old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-H2.sql | 39 + .../old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-PG.sql | 40 + ...4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql | 26 + ...4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql | 26 + ...4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql | 22 + ...4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql | 22 + .../V4_0_RC_7_02_rename-unknown-longliner-H2.sql | 22 + .../V4_0_RC_7_02_rename-unknown-longliner-PG.sql | 22 + .../4.0.1/V4_0_1_01_remove-gender-column-H2.sql | 22 + .../old/4.0.1/V4_0_1_02_add-missing-fk-H2.sql | 26 + .../old/4.0.1/V4_0_1_02_add-missing-fk-PG.sql | 26 + .../4.0.2/V4_0_2_01_remove-gender-column-PG.sql | 22 + ...0_4_01_remove-trip-datearriveeport-field-H2.sql | 23 + ...0_4_01_remove-trip-datearriveeport-field-PG.sql | 23 + .../db/migration/old/4.0/V4_0_01_empty-H2.sql | 23 + .../db/migration/old/4.0/V4_0_01_empty-PG.sql | 23 + ...rveMigrationCallBackForVersionResolverTest.java | 2 +- .../src/test/resources/log4j.properties | 2 +- entities/pom.xml | 23 +- .../fr/ird/observe/AbstractObserveTopiaDao.java | 2 +- .../observe/ObserveTopiaApplicationContext.java | 75 +- .../fr/ird/observe/ObserveTopiaConfiguration.java | 24 +- .../observe/ObserveTopiaConfigurationFactory.java | 19 +- .../java/fr/ird/observe/ObserveTopiaIdFactory.java | 2 +- .../observe/ObserveTopiaPersistenceContext.java | 20 +- .../java/fr/ird/observe/RunScriptTopiaSqlWork.java | 13 +- .../fr/ird/observe/RunScriptsTopiaSqlWork.java | 8 +- .../java/fr/ird/observe/entities/Activity.java | 2 +- .../java/fr/ird/observe/entities/Entities.java | 10 +- .../java/fr/ird/observe/entities/EntityMap.java | 2 +- .../observe/entities/LastUpdateDateTopiaDao.java | 2 +- .../observe/entities/LengthWeightComputable.java | 15 +- .../java/fr/ird/observe/entities/ObserveSet.java | 2 +- .../main/java/fr/ird/observe/entities/Trip.java | 2 +- .../java/fr/ird/observe/entities/TripMapPoint.java | 2 +- .../main/java/fr/ird/observe/entities/Trips.java | 2 +- .../entities/constants/GearTypePersist.java | 2 +- .../entities/constants/ReferenceStatusPersist.java | 2 +- .../constants/TripMapPointTypePersist.java | 2 +- .../NonTargetCatchComputedValueSourcePersist.java | 2 +- .../entities/constants/seine/OwnershipPersist.java | 2 +- .../constants/seine/SchoolTypePersist.java | 2 +- .../TypeTransmittingBuoyOperationPersist.java | 2 +- .../ird/observe/entities/gps/CoordinateHelper.java | 2 +- .../entities/longline/ActivityLonglineImpl.java | 2 +- .../longline/ActivityLonglineTopiaDao.java | 8 +- .../entities/longline/ActivityLonglines.java | 2 +- .../observe/entities/longline/BasketTopiaDao.java | 2 +- .../fr/ird/observe/entities/longline/Baskets.java | 2 +- .../observe/entities/longline/BranchlineImpl.java | 2 +- .../entities/longline/BranchlineTopiaDao.java | 2 +- .../ird/observe/entities/longline/Branchlines.java | 2 +- .../longline/GearUseFeaturesLonglineImpl.java | 58 + .../longline/LonglineCompositionEntity.java | 2 +- .../entities/longline/LonglinePositionAware.java | 2 +- .../observe/entities/longline/SectionTemplate.java | 2 +- .../observe/entities/longline/SectionTopiaDao.java | 2 +- .../entities/longline/SectionWithTemplate.java | 2 +- .../entities/longline/SectionWithTemplateImpl.java | 2 +- .../entities/longline/SectionWithTemplates.java | 2 +- .../fr/ird/observe/entities/longline/Sections.java | 2 +- .../observe/entities/longline/SetLonglineImpl.java | 2 +- .../fr/ird/observe/entities/longline/TdrImpl.java | 2 +- .../ird/observe/entities/longline/TdrTopiaDao.java | 2 +- .../entities/longline/TripLonglineImpl.java | 13 +- .../entities/longline/TripLonglineTopiaDao.java | 41 +- .../observe/entities/longline/TripLonglines.java | 2 +- .../migration/AbstractDataSourceMigration.java | 52 + .../AbstractObserveMigrationCallBack.java | 123 ++ .../entities/migration/H2DataSourceMigration.java | 281 +++++ .../entities/migration/MigrationVersion.java | 42 + ...ObserveMigrationCallBackForVersionResolver.java | 87 ++ .../ObserveMigrationConfigurationProvider.java | 107 +- .../entities/migration/ObserveMigrationEngine.java | 6 +- .../entities/migration/PGDataSourceMigration.java | 367 ++++++ .../DuplicateLengthWeightParameterException.java | 2 +- .../entities/referentiel/FormulaHelper.java | 191 ++++ .../entities/referentiel/FormulaSupportImpl.java | 110 ++ .../referentiel/GearCaracteristicTypes.java | 2 +- .../observe/entities/referentiel/HarbourImpl.java | 2 +- .../referentiel/I18nReferenceEntities.java | 2 +- .../referentiel/LengthLengthParameterImpl.java | 77 ++ .../referentiel/LengthLengthParameterTopiaDao.java | 38 + .../referentiel/LengthLengthParameters.java | 43 + .../referentiel/LengthWeightParameterImpl.java | 112 +- .../LengthWeightParameterNotFoundException.java | 2 +- .../referentiel/LengthWeightParameters.java | 262 +---- .../referentiel/LengthWeightParemeterHelper.java | 332 ------ .../referentiel/ObserveReferentialEntities.java | 2 +- .../referentiel/ObserveReferentialEntityImpl.java | 2 +- .../ird/observe/entities/referentiel/Persons.java | 2 +- .../observe/entities/referentiel/ProgramImpl.java | 18 +- .../entities/referentiel/ProgramTopiaDao.java | 121 -- .../ird/observe/entities/referentiel/Programs.java | 2 +- .../ird/observe/entities/referentiel/Species2.java | 2 +- .../observe/entities/referentiel/SpeciesImpl.java | 2 +- .../observe/entities/referentiel/VesselImpl.java | 2 +- .../ird/observe/entities/referentiel/Vessels.java | 2 +- .../observe/entities/seine/ActivitySeineImpl.java | 2 +- .../entities/seine/ActivitySeineTopiaDao.java | 8 +- .../ird/observe/entities/seine/ActivitySeines.java | 2 +- .../observe/entities/seine/FloatingObjectImpl.java | 2 +- .../entities/seine/FloatingObjectTopiaDao.java | 2 +- .../entities/seine/GearUseFeaturesSeineImpl.java | 58 + .../observe/entities/seine/NonTargetCatchImpl.java | 16 +- .../observe/entities/seine/NonTargetCatches.java | 2 +- .../entities/seine/NonTargetLengthImpl.java | 2 +- .../fr/ird/observe/entities/seine/RouteImpl.java | 2 +- .../ird/observe/entities/seine/RouteTopiaDao.java | 2 +- .../java/fr/ird/observe/entities/seine/Routes.java | 2 +- .../ird/observe/entities/seine/SetSeineImpl.java | 2 +- .../fr/ird/observe/entities/seine/SetSeines.java | 15 +- .../observe/entities/seine/TargetCatchImpl.java | 6 +- .../ird/observe/entities/seine/TargetCatchs.java | 2 +- .../observe/entities/seine/TargetLengthImpl.java | 2 +- .../ird/observe/entities/seine/TripSeineImpl.java | 12 +- .../observe/entities/seine/TripSeineTopiaDao.java | 38 +- .../fr/ird/observe/entities/seine/TripSeines.java | 2 +- entities/src/main/xmi/observe-common.zargo | Bin 37331 -> 45811 bytes entities/src/main/xmi/observe-longline.zargo | Bin 93566 -> 95951 bytes entities/src/main/xmi/observe-seine.zargo | Bin 83234 -> 87287 bytes entities/src/main/xmi/observe.ini | 307 +++++ entities/src/main/xmi/observe.objectmodel-ext | 248 ---- .../java/fr/ird/observe/RelationRegexTest.java | 2 +- .../src/test/java/fr/ird/observe/ScriptTest.java | 2 +- .../entities/longline/SectionTemplateTest.java | 2 +- .../entities/referentiel/FormulaHelperTest.java | 49 + .../LengthWeightParemeterHelperTest.java | 48 - entities/src/test/resources/log4j.properties | 2 +- pom.xml | 86 +- services-configuration-rest/pom.xml | 2 +- .../rest/ObserveDataSourceConfigurationRest.java | 2 +- ...bserveDataSourceConfigurationRestConstants.java | 2 +- .../rest/ObserveDataSourceConnectionRest.java | 2 +- services-configuration-topia/pom.xml | 2 +- .../ObserveDataSourceConfigurationTopiaH2.java | 2 +- .../ObserveDataSourceConfigurationTopiaPG.java | 2 +- ...ObserveDataSourceConfigurationTopiaSupport.java | 13 +- .../topia/ObserveDataSourceConnectionTopia.java | 2 +- services-configuration/pom.xml | 2 +- .../ObserveDataSourceConfiguration.java | 2 +- ...bserveDataSourceConfigurationAndConnection.java | 2 +- .../configuration/ObserveDataSourceConnection.java | 2 +- .../ObserveDataSourceConnectionSupport.java | 2 +- .../ObserveDataSourceInformation.java | 14 +- .../configuration/ObserveDataSourceType.java | 2 +- .../src/test/resources/log4j.properties | 2 +- services-dto-gson/LICENSE.txt | 674 +++++++++++ services-dto-gson/README.md | 0 services-dto-gson/pom.xml | 68 ++ .../src/license/THIRD-PARTY.properties | 24 + .../dto/gson/ArrayListMultimapAdapter.java | 38 + .../ird/observe/services/dto/gson/BlobAdapter.java | 78 ++ .../observe/services/dto/gson/ClassAdapter.java | 84 ++ .../ird/observe/services/dto/gson/DateAdapter.java | 116 ++ .../ird/observe/services/dto/gson/FormAdapter.java | 60 + .../services/dto/gson/ImmutableListAdapter.java | 59 + .../services/dto/gson/ImmutableMapAdapter.java | 54 + .../dto/gson/ImmutableMultimapAdapter.java | 75 ++ .../services/dto/gson/ImmutableSetAdapter.java | 60 + .../observe/services/dto/gson/IntegerAdapter.java | 58 + .../services/dto/gson/MultimapAdapterSupport.java | 69 ++ .../dto/gson/ObserveBlobsContainerAdapter.java | 64 ++ .../services/dto/gson/ObserveDtoGsonSupplier.java | 142 +++ .../dto/gson/ReferentialMultimapAdapter.java | 82 ++ .../services/dto/gson/ReportVariableAdapter.java | 82 ++ .../services/dto/gson/SetMultimapAdapter.java | 39 + .../observe/services/dto/gson/VersionAdapter.java | 54 + .../gson/reference/AbstractReferenceAdapter.java | 128 +++ .../dto/gson/reference/DataReferenceAdapter.java | 49 + .../gson/reference/DataReferenceListAdapter.java | 64 ++ .../gson/reference/DataReferenceSetAdapter.java | 64 ++ .../ReferenceCollectionSupportAdapter.java | 84 ++ .../reference/ReferentialReferenceAdapter.java | 100 ++ .../reference/ReferentialReferenceSetAdapter.java | 75 ++ .../gson/reference/UnknownReferenceAdapter.java | 69 ++ services-dto-reference/LICENSE.txt | 674 +++++++++++ services-dto-reference/README.md | 0 services-dto-reference/pom.xml | 65 ++ .../src/license/THIRD-PARTY.properties | 23 + .../dto/reference/DataReferenceSetDefinitions.java | 323 ++++++ .../dto/reference/ReferenceBinderEngine.java | 44 + .../reference/ReferenceBinderEngineSupplier.java | 70 ++ .../dto/reference/ReferenceSetDefinition.java | 117 ++ .../ReferentialReferenceSetDefinitions.java | 329 ++++++ .../request/ReferenceSetRequestDefinition.java | 119 ++ .../request/ReferenceSetRequestDefinitions.java | 537 +++++++++ .../request/ReferenceSetRequestKeyDefinition.java | 100 ++ services-dto/pom.xml | 24 +- .../observe/services/dto/AbstractObserveDto.java | 2 +- .../observe/services/dto/AbstractReference.java | 8 +- .../observe/services/dto/AbstractReferenceSet.java | 72 -- .../fr/ird/observe/services/dto/DataReference.java | 6 +- .../observe/services/dto/DataReferenceList.java | 50 + .../ird/observe/services/dto/DataReferenceSet.java | 4 +- .../dto/DataSourceCreateConfigurationDto.java | 2 +- ...urceCreateWithNoReferentialImportException.java | 2 +- .../java/fr/ird/observe/services/dto/Form.java | 2 +- .../java/fr/ird/observe/services/dto/IdDto.java | 8 +- .../java/fr/ird/observe/services/dto/IdDtos.java | 167 --- .../java/fr/ird/observe/services/dto/IdHelper.java | 167 +++ ...ibleDataSourceCreateConfigurationException.java | 2 +- .../services/dto/ObserveBlobsContainer.java | 59 + .../observe/services/dto/ObserveDbUserDtos.java | 44 - .../observe/services/dto/ObserveDbUserHelper.java | 44 + .../fr/ird/observe/services/dto/ObserveDto.java | 2 +- .../ird/observe/services/dto/ObserveModelType.java | 34 + .../dto/ObserveSpeciesListConfiguration.java | 2 +- .../services/dto/ReferenceCollectionSupport.java | 72 ++ .../fr/ird/observe/services/dto/ReferenceMap.java | 2 +- .../dto/ReferenceValueNotFoundException.java | 2 +- .../services/dto/UnauthorizedException.java | 2 +- .../services/dto/actions/report/DataMatrix.java | 2 +- .../services/dto/actions/report/Report.java | 22 +- .../dto/actions/report/ReportOperation.java | 6 +- .../services/dto/actions/report/ReportRequest.java | 2 +- .../dto/actions/report/ReportVariable.java | 2 +- .../observe/services/dto/constants/GearType.java | 2 +- .../services/dto/constants/ObserveDbRole.java | 2 +- .../services/dto/constants/ReferenceStatus.java | 2 +- .../services/dto/constants/ReferentialLocale.java | 6 +- .../services/dto/constants/TripMapPointType.java | 2 +- .../seine/NonTargetCatchComputedValueSource.java | 2 +- .../services/dto/constants/seine/Ownership.java | 2 +- .../services/dto/constants/seine/SchoolType.java | 2 +- .../seine/TypeTransmittingBuoyOperation.java | 2 +- .../ird/observe/services/dto/gson/BlobAdapter.java | 78 -- .../observe/services/dto/gson/ClassAdapter.java | 84 -- .../ird/observe/services/dto/gson/DateAdapter.java | 116 -- .../ird/observe/services/dto/gson/FormAdapter.java | 60 - .../services/dto/gson/ImmutableListAdapter.java | 59 - .../services/dto/gson/ImmutableMapAdapter.java | 61 - .../dto/gson/ImmutableMultimapAdapter.java | 84 -- .../services/dto/gson/ImmutableSetAdapter.java | 58 - .../observe/services/dto/gson/IntegerAdapter.java | 58 - .../services/dto/gson/ObserveDtoGsonSupplier.java | 121 -- .../dto/gson/ReferentialMultimapAdapter.java | 82 -- .../services/dto/gson/ReportVariableAdapter.java | 82 -- .../observe/services/dto/gson/VersionAdapter.java | 54 - .../gson/reference/AbstractReferenceAdapter.java | 128 --- .../reference/AbstractReferenceSetAdapter.java | 82 -- .../dto/gson/reference/DataReferenceAdapter.java | 49 - .../gson/reference/DataReferenceSetAdapter.java | 58 - .../reference/ReferentialReferenceAdapter.java | 100 -- .../reference/ReferentialReferenceSetAdapter.java | 69 -- .../gson/reference/UnknownReferenceAdapter.java | 69 -- .../services/dto/longline/ActivityLonglineDto.java | 4 +- .../dto/longline/ActivityLonglineHelper.java | 48 + .../dto/longline/BasketWithSectionIdDto.java | 2 +- .../dto/longline/BranchlineWithBasketIdDto.java | 2 +- .../GearUseFeaturesMeasurementLonglineDto.java | 4 +- .../dto/longline/LonglineCompositionDto.java | 2 +- .../dto/longline/LonglinePositionAwareDto.java | 2 +- .../dto/longline/LonglinePositionSetDto.java | 2 +- .../services/dto/longline/SectionTemplate.java | 2 +- .../services/dto/longline/SectionWithTemplate.java | 2 +- .../dto/longline/SectionWithTemplateHelper.java | 60 + .../dto/longline/SectionWithTemplates.java | 60 - .../longline/SetLonglineGlobalCompositionDto.java | 4 +- .../services/dto/longline/TripLonglineHelper.java | 50 + .../dto/reference/DataReferenceSetDefinitions.java | 214 ---- .../dto/reference/ReferenceBinderEngine.java | 44 - .../reference/ReferenceBinderEngineSupplier.java | 70 -- .../dto/reference/ReferenceSetDefinition.java | 117 -- .../ReferentialReferenceSetDefinitions.java | 314 ------ .../request/ReferenceSetRequestDefinition.java | 119 -- .../request/ReferenceSetRequestDefinitions.java | 523 --------- .../request/ReferenceSetRequestKeyDefinition.java | 100 -- .../services/dto/referential/FormulaHelper.java | 156 +++ .../dto/referential/GearCaracteristicTypeDtos.java | 93 -- .../referential/GearCaracteristicTypeHelper.java | 93 ++ .../dto/referential/I18nReferentialDto.java | 4 +- .../dto/referential/I18nReferentialDtos.java | 64 -- .../dto/referential/I18nReferentialHelper.java | 63 ++ .../dto/referential/LengthLengthParameterDto.java | 70 ++ .../dto/referential/LengthWeightParameterDto.java | 70 ++ .../services/dto/referential/PersonDtos.java | 72 -- .../services/dto/referential/PersonHelper.java | 72 ++ .../services/dto/referential/ProgramDto.java | 4 +- .../services/dto/referential/ProgramDtos.java | 61 - .../services/dto/referential/ProgramHelper.java | 74 ++ .../services/dto/referential/ReferentialDto.java | 4 +- .../services/dto/referential/ReferentialDtos.java | 141 --- .../dto/referential/ReferentialHelper.java | 141 +++ .../dto/referential/ReferentialMultimap.java | 18 +- .../dto/referential/ReferentialReference.java | 2 +- .../dto/referential/ReferentialReferenceSet.java | 12 +- .../dto/referential/ReferentialReferences.java | 2 +- .../dto/referential/SizeMeasureTypeHelper.java | 63 ++ .../services/dto/referential/SpeciesListDto.java | 4 +- .../services/dto/referential/VesselDtos.java | 60 - .../services/dto/referential/VesselHelper.java | 60 + .../longline/VesselActivityLonglineDtos.java | 44 - .../longline/VesselActivityLonglineHelper.java | 44 + .../referential/seine/VesselActivitySeineDtos.java | 57 - .../seine/VesselActivitySeineHelper.java | 72 ++ .../dto/referential/seine/WeightCategoryDtos.java | 69 -- .../referential/seine/WeightCategoryHelper.java | 69 ++ .../observe/services/dto/result/SaveResultDto.java | 4 +- .../services/dto/result/SaveResultDtos.java | 36 - .../services/dto/result/SaveResultHelper.java | 36 + .../dto/result/TripChildSaveResultDtos.java | 34 - .../dto/result/TripChildSaveResultHelper.java | 34 + .../services/dto/seine/ActivitySeineDto.java | 35 +- .../services/dto/seine/ActivitySeineHelper.java | 32 + .../services/dto/seine/ActivitySeineStubDto.java | 4 +- .../dto/seine/DiscardedTargetCatchDto.java | 2 +- .../dto/seine/DiscardedTargetSampleDto.java | 2 +- .../seine/FloatingObjectTransmittingBuoyDto.java | 4 +- .../seine/GearUseFeaturesMeasurementSeineDto.java | 4 +- .../services/dto/seine/KeptTargetCatchDto.java | 2 +- .../services/dto/seine/KeptTargetSampleDto.java | 2 +- .../ird/observe/services/dto/seine/RouteDto.java | 10 +- .../observe/services/dto/seine/SetSeineDto.java | 4 +- .../services/dto/seine/TargetCatchDtos.java | 56 - .../services/dto/seine/TargetCatchHelper.java | 56 + .../services/dto/seine/TargetLengthDto.java | 4 +- .../services/dto/seine/TargetLengthHelper.java | 35 + .../observe/services/dto/seine/TripSeineDto.java | 12 +- .../services/dto/seine/TripSeineHelper.java | 49 + .../main/java/fr/ird/observe/util/GPSPoint.java | 2 +- .../main/java/fr/ird/observe/util/ObserveUtil.java | 2 +- .../src/main/xmi/observe-services-dto-common.zargo | Bin 41934 -> 49022 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 67504 -> 68017 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59520 -> 60919 bytes services-dto/src/main/xmi/observe-services-dto.ini | 281 +++++ .../main/xmi/observe-services-dto.objectmodel-ext | 216 ---- services-rest/pom.xml | 13 +- .../rest/ObserveDataSourceConnectionAdapter.java | 2 +- .../services/rest/ObserveHttpErrorAdapter.java | 2 +- .../services/rest/ObserveServiceFactoryRest.java | 2 +- .../rest/ObserveServiceRestErrorException.java | 2 +- .../ObserveServiceRestNotAvailableException.java | 2 +- .../observe/services/rest/http/ObserveRequest.java | 2 +- .../services/rest/http/ObserveRequestBuilder.java | 2 +- .../services/rest/http/ObserveRequestMethod.java | 2 +- .../services/rest/http/ObserveResponse.java | 2 +- .../services/rest/http/ObserveResponseBuilder.java | 31 +- .../services/rest/RestTestClassResource.java | 2 +- .../services/rest/RestTestMethodResource.java | 4 +- .../rest/service/AbstractServiceRestTest.java | 10 +- .../rest/service/DataSourceServiceRestTest.java | 2 +- .../services/rest/service/PingServiceRestTest.java | 2 +- .../service/ReferenceValuesSetServiceRestTest.java | 6 +- .../rest/service/ReferentialServiceRestTest.java | 4 +- .../ConsolidateDataServiceRestTest.java | 17 +- .../report/AbstractReportServiceRestTest.java | 2 +- .../report/ReportAccessoryCatchRestTest.java | 2 +- .../actions/validate/ValidateServiceRestTest.java | 20 +- .../seine/TripSeineGearUseServiceRestTest.java | 40 +- .../service/seine/TripSeineServiceRestTest.java | 10 +- services-rest/src/test/resources/log4j.properties | 2 +- services-runner/pom.xml | 8 +- .../ObserveDataSourceConfigurationMainFactory.java | 2 +- .../services/runner/ObserveServiceMainFactory.java | 2 +- services-topia-binder/LICENSE.txt | 674 +++++++++++ services-topia-binder/README.md | 2 + services-topia-binder/pom.xml | 83 ++ .../src/license/THIRD-PARTY.properties | 37 + .../services/topia/binder/BinderEngine.java | 251 +++++ .../topia/binder/BinderEngineInitializer.java | 1192 ++++++++++++++++++++ .../services/topia/binder/BinderSupport.java | 245 ++++ .../binder/ReferenceBinderEngineSupplierTopia.java | 40 + .../topia/binder/data/DataBinderSupport.java | 324 ++++++ .../data/longline/ActivityLonglineBinder.java | 96 ++ .../ActivityLonglineEncouterDtoBinder.java | 61 + .../ActivityLonglineSensorUsedDtoBinder.java | 62 + .../longline/ActivityLonglineStubDtoBinder.java | 61 + .../data/longline/BaitsCompositionBinder.java | 97 ++ .../topia/binder/data/longline/BasketBinder.java | 83 ++ .../binder/data/longline/BranchlineBinder.java | 129 +++ .../longline/BranchlinesCompositionBinder.java | 94 ++ .../binder/data/longline/CatchLonglineBinder.java | 146 +++ .../binder/data/longline/EncounterBinder.java | 88 ++ .../data/longline/FloatlinesCompositionBinder.java | 86 ++ .../longline/GearUseFeaturesLonglineBinder.java | 68 ++ .../GearUseFeaturesMeasurementLonglineBinder.java | 63 ++ .../data/longline/HooksCompositionBinder.java | 91 ++ .../topia/binder/data/longline/SectionBinder.java | 79 ++ .../binder/data/longline/SensorUsedBinder.java | 103 ++ .../binder/data/longline/SetLonglineBinder.java | 158 +++ .../data/longline/SetLonglineCatchDtoBinder.java | 62 + .../SetLonglineDetailCompositionDtoBinder.java | 76 ++ .../SetLonglineGlobalCompositionDtoBinder.java | 77 ++ .../data/longline/SetLonglineStubDtoBinder.java | 58 + .../data/longline/SetLonglineTdrDtoBinder.java | 63 ++ .../binder/data/longline/SizeMeasureBinder.java | 82 ++ .../topia/binder/data/longline/TdrBinder.java | 144 +++ .../longline/TripLonglineActivityDtoBinder.java | 59 + .../binder/data/longline/TripLonglineBinder.java | 130 +++ .../longline/TripLonglineGearUseDtoBinder.java | 61 + .../binder/data/longline/WeightMeasureBinder.java | 81 ++ .../binder/data/seine/ActivitySeineBinder.java | 129 +++ .../data/seine/ActivitySeineStubDtoBinder.java | 63 ++ .../binder/data/seine/FloatingObjectBinder.java | 86 ++ .../FloatingObjectObservedSpeciesDtoBinder.java | 61 + .../FloatingObjectSchoolEstimateDtoBinder.java | 61 + .../FloatingObjectTransmittingBuoyDtoBinder.java | 61 + .../GearUseFeaturesMeasurementSeineBinder.java | 64 ++ .../data/seine/GearUseFeaturesSeineBinder.java | 69 ++ .../binder/data/seine/NonTargetCatchBinder.java | 107 ++ .../binder/data/seine/NonTargetLengthBinder.java | 101 ++ .../binder/data/seine/NonTargetSampleBinder.java | 61 + .../data/seine/ObjectObservedSpeciesBinder.java | 79 ++ .../data/seine/ObjectSchoolEstimateBinder.java | 73 ++ .../topia/binder/data/seine/RouteBinder.java | 83 ++ .../binder/data/seine/RouteStubDtoBinder.java | 63 ++ .../binder/data/seine/SchoolEstimateBinder.java | 85 ++ .../topia/binder/data/seine/SetSeineBinder.java | 111 ++ .../seine/SetSeineNonTargetCatchDtoBinder.java | 59 + .../seine/SetSeineSchoolEstimateDtoBinder.java | 61 + .../data/seine/SetSeineTargetCatchDtoBinder.java | 64 ++ .../topia/binder/data/seine/TargetCatchBinder.java | 89 ++ .../binder/data/seine/TargetLengthBinder.java | 103 ++ .../binder/data/seine/TargetSampleBinder.java | 66 ++ .../binder/data/seine/TransmittingBuoyBinder.java | 90 ++ .../topia/binder/data/seine/TripSeineBinder.java | 127 +++ .../data/seine/TripSeineGearUseDtoBinder.java | 61 + .../referential/ReferentialBinderSupport.java | 171 +++ .../binder/referential/common/CountryBinder.java | 77 ++ .../binder/referential/common/FpaZoneBinder.java | 77 ++ .../binder/referential/common/GearBinder.java | 76 ++ .../common/GearCaracteristicBinder.java | 83 ++ .../common/GearCaracteristicTypeBinder.java | 73 ++ .../binder/referential/common/HarbourBinder.java | 85 ++ .../common/LengthLengthParameterBinder.java | 93 ++ .../common/LengthWeightParameterBinder.java | 101 ++ .../binder/referential/common/OceanBinder.java | 73 ++ .../binder/referential/common/OrganismBinder.java | 81 ++ .../binder/referential/common/PersonBinder.java | 95 ++ .../binder/referential/common/ProgramBinder.java | 116 ++ .../topia/binder/referential/common/SexBinder.java | 75 ++ .../binder/referential/common/ShipOwnerBinder.java | 79 ++ .../referential/common/SizeMeasureTypeBinder.java | 75 ++ .../binder/referential/common/SpeciesBinder.java | 111 ++ .../referential/common/SpeciesGroupBinder.java | 75 ++ .../referential/common/SpeciesListBinder.java | 77 ++ .../binder/referential/common/VesselBinder.java | 126 +++ .../common/VesselSizeCategoryBinder.java | 81 ++ .../referential/common/VesselTypeBinder.java | 75 ++ .../common/WeightMeasureTypeBinder.java | 75 ++ .../longline/BaitHaulingStatusBinder.java | 73 ++ .../longline/BaitSettingStatusBinder.java | 73 ++ .../referential/longline/BaitTypeBinder.java | 73 ++ .../longline/CatchFateLonglineBinder.java | 73 ++ .../referential/longline/EncounterTypeBinder.java | 73 ++ .../referential/longline/HealthnessBinder.java | 73 ++ .../referential/longline/HookPositionBinder.java | 73 ++ .../referential/longline/HookSizeBinder.java | 75 ++ .../referential/longline/HookTypeBinder.java | 73 ++ .../longline/ItemHorizontalPositionBinder.java | 75 ++ .../longline/ItemVerticalPositionBinder.java | 75 ++ .../longline/LightsticksColorBinder.java | 73 ++ .../longline/LightsticksTypeBinder.java | 73 ++ .../referential/longline/LineTypeBinder.java | 73 ++ .../referential/longline/MaturityStatusBinder.java | 77 ++ .../referential/longline/MitigationTypeBinder.java | 73 ++ .../referential/longline/SensorBrandBinder.java | 77 ++ .../longline/SensorDataFormatBinder.java | 75 ++ .../referential/longline/SensorTypeBinder.java | 75 ++ .../referential/longline/SettingShapeBinder.java | 75 ++ .../referential/longline/StomacFullnessBinder.java | 75 ++ .../referential/longline/TripTypeBinder.java | 75 ++ .../longline/VesselActivityLonglineBinder.java | 75 ++ .../referential/seine/DetectionModeBinder.java | 73 ++ .../binder/referential/seine/ObjectFateBinder.java | 73 ++ .../referential/seine/ObjectOperationBinder.java | 73 ++ .../binder/referential/seine/ObjectTypeBinder.java | 73 ++ .../referential/seine/ObservedSystemBinder.java | 77 ++ .../referential/seine/ReasonForDiscardBinder.java | 75 ++ .../seine/ReasonForNoFishingBinder.java | 75 ++ .../referential/seine/ReasonForNullSetBinder.java | 75 ++ .../referential/seine/SpeciesFateBinder.java | 72 ++ .../referential/seine/SpeciesStatusBinder.java | 75 ++ .../seine/SurroundingActivityBinder.java | 75 ++ .../seine/TransmittingBuoyOperationBinder.java | 75 ++ .../seine/TransmittingBuoyTypeBinder.java | 75 ++ .../seine/VesselActivitySeineBinder.java | 81 ++ .../referential/seine/WeightCategoryBinder.java | 83 ++ .../topia/binder/referential/seine/WindBinder.java | 80 ++ .../topia/binder/BinderEngineMetadataTest.java | 188 +++ .../topia/binder/ReferenceBinderEngineTest.java | 47 + services-topia-validation/pom.xml | 2 +- ...Longline-service-encounter-error-validation.xml | 2 +- .../ActivityLongline-service-error-validation.xml | 2 +- ...ongline-service-sensorUsed-error-validation.xml | 2 +- ...ActivityLongline-service-warning-validation.xml | 2 +- .../BaitsComposition-service-error-validation.xml | 2 +- .../Basket-service-table-error-validation.xml | 2 +- ...line-service-catchLongline-error-validation.xml | 2 +- .../Branchline-service-error-validation.xml | 2 +- .../Branchline-service-table-error-validation.xml | 2 +- .../Branchline-service-warning-validation.xml | 2 +- ...chlinesComposition-service-error-validation.xml | 2 +- .../CatchLongline-service-error-validation.xml | 2 +- .../CatchLongline-service-warning-validation.xml | 2 +- .../Encounter-service-error-validation.xml | 2 +- .../Encounter-service-warning-validation.xml | 2 +- ...atlinesComposition-service-error-validation.xml | 2 +- ...seFeaturesLongline-service-error-validation.xml | 2 +- .../HooksComposition-service-error-validation.xml | 2 +- .../Section-service-table-error-validation.xml | 2 +- .../SensorUsed-service-error-validation.xml | 2 +- .../SensorUsed-service-warning-validation.xml | 2 +- ...e-service-baitsComposition-error-validation.xml | 2 +- ...ice-branchlinesComposition-error-validation.xml | 2 +- .../SetLongline-service-error-validation.xml | 2 +- ...vice-floatlinesComposition-error-validation.xml | 2 +- ...-service-globalComposition-error-validation.xml | 2 +- ...e-service-hooksComposition-error-validation.xml | 2 +- .../SetLongline-service-warning-validation.xml | 2 +- .../longline/Tdr-service-error-validation.xml | 2 +- .../longline/Tdr-service-warning-validation.xml | 2 +- .../TripLongline-service-error-validation.xml | 2 +- .../TripLongline-service-warning-validation.xml | 2 +- .../Country-service-error-validation.xml | 2 +- .../Country-service-warning-validation.xml | 2 +- .../FpaZone-service-error-validation.xml | 2 +- .../FpaZone-service-warning-validation.xml | 2 +- .../referentiel/Gear-service-error-validation.xml | 2 +- .../Gear-service-warning-validation.xml | 2 +- .../GearCaracteristic-service-error-validation.xml | 2 +- ...earCaracteristic-service-warning-validation.xml | 2 +- ...rCaracteristicType-service-error-validation.xml | 2 +- ...aracteristicType-service-warning-validation.xml | 2 +- .../Harbour-service-error-validation.xml | 2 +- .../Harbour-service-warning-validation.xml | 2 +- ...gthLengthParameter-service-error-validation.xml | 87 ++ ...hLengthParameter-service-warning-validation.xml | 46 + ...gthWeightParameter-service-error-validation.xml | 12 +- ...hWeightParameter-service-warning-validation.xml | 2 +- .../referentiel/Ocean-service-error-validation.xml | 2 +- .../Ocean-service-warning-validation.xml | 2 +- .../Organism-service-error-validation.xml | 2 +- .../Organism-service-warning-validation.xml | 2 +- .../Person-service-error-validation.xml | 2 +- .../Person-service-warning-validation.xml | 2 +- .../Program-service-error-validation.xml | 2 +- .../Program-service-warning-validation.xml | 2 +- .../referentiel/Sex-service-error-validation.xml | 2 +- .../referentiel/Sex-service-warning-validation.xml | 2 +- .../ShipOwner-service-error-validation.xml | 77 ++ .../ShipOwner-service-warning-validation.xml | 44 + .../SizeMeasureType-service-error-validation.xml | 75 ++ .../SizeMeasureType-service-warning-validation.xml | 68 ++ .../Species-service-error-validation.xml | 12 +- .../Species-service-warning-validation.xml | 2 +- .../SpeciesGroup-service-error-validation.xml | 2 +- .../SpeciesGroup-service-warning-validation.xml | 2 +- .../SpeciesList-service-error-validation.xml | 2 +- .../SpeciesList-service-warning-validation.xml | 2 +- .../Vessel-service-error-validation.xml | 12 +- .../Vessel-service-warning-validation.xml | 2 +- ...VesselSizeCategory-service-error-validation.xml | 2 +- ...sselSizeCategory-service-warning-validation.xml | 2 +- .../VesselType-service-error-validation.xml | 2 +- .../VesselType-service-warning-validation.xml | 2 +- .../WeightMeasureType-service-error-validation.xml | 75 ++ ...eightMeasureType-service-warning-validation.xml | 68 ++ .../BaitHaulingStatus-service-error-validation.xml | 2 +- ...aitHaulingStatus-service-warning-validation.xml | 2 +- .../BaitSettingStatus-service-error-validation.xml | 2 +- ...aitSettingStatus-service-warning-validation.xml | 2 +- .../longline/BaitType-service-error-validation.xml | 2 +- .../BaitType-service-warning-validation.xml | 2 +- .../CatchFateLongline-service-error-validation.xml | 2 +- ...atchFateLongline-service-warning-validation.xml | 2 +- .../EncounterType-service-error-validation.xml | 2 +- .../EncounterType-service-warning-validation.xml | 2 +- .../Healthness-service-error-validation.xml | 2 +- .../Healthness-service-warning-validation.xml | 2 +- .../HookPosition-service-error-validation.xml | 2 +- .../HookPosition-service-warning-validation.xml | 2 +- .../longline/HookSize-service-error-validation.xml | 2 +- .../HookSize-service-warning-validation.xml | 2 +- .../longline/HookType-service-error-validation.xml | 2 +- .../HookType-service-warning-validation.xml | 2 +- ...HorizontalPosition-service-error-validation.xml | 2 +- ...rizontalPosition-service-warning-validation.xml | 2 +- ...emVerticalPosition-service-error-validation.xml | 2 +- ...VerticalPosition-service-warning-validation.xml | 2 +- .../LightsticksColor-service-error-validation.xml | 2 +- ...LightsticksColor-service-warning-validation.xml | 2 +- .../LightsticksType-service-error-validation.xml | 2 +- .../LightsticksType-service-warning-validation.xml | 2 +- .../longline/LineType-service-error-validation.xml | 2 +- .../LineType-service-warning-validation.xml | 2 +- .../MaturityStatus-service-error-validation.xml | 2 +- .../MaturityStatus-service-warning-validation.xml | 2 +- .../MitigationType-service-error-validation.xml | 2 +- .../MitigationType-service-warning-validation.xml | 2 +- .../SensorBrand-service-error-validation.xml | 2 +- .../SensorBrand-service-warning-validation.xml | 2 +- .../SensorDataFormat-service-error-validation.xml | 2 +- ...SensorDataFormat-service-warning-validation.xml | 2 +- .../SensorType-service-error-validation.xml | 2 +- .../SensorType-service-warning-validation.xml | 2 +- .../SettingShape-service-error-validation.xml | 2 +- .../SettingShape-service-warning-validation.xml | 2 +- .../SizeMeasureType-service-error-validation.xml | 75 -- .../SizeMeasureType-service-warning-validation.xml | 68 -- .../StomacFullness-service-error-validation.xml | 2 +- .../StomacFullness-service-warning-validation.xml | 2 +- .../longline/TripType-service-error-validation.xml | 2 +- .../TripType-service-warning-validation.xml | 2 +- ...elActivityLongline-service-error-validation.xml | 2 +- ...ActivityLongline-service-warning-validation.xml | 2 +- .../WeightMeasureType-service-error-validation.xml | 75 -- ...eightMeasureType-service-warning-validation.xml | 68 -- .../DetectionMode-service-error-validation.xml | 2 +- .../DetectionMode-service-warning-validation.xml | 2 +- .../seine/ObjectFate-service-error-validation.xml | 2 +- .../ObjectFate-service-warning-validation.xml | 2 +- .../ObjectOperation-service-error-validation.xml | 2 +- .../ObjectOperation-service-warning-validation.xml | 2 +- .../seine/ObjectType-service-error-validation.xml | 2 +- .../ObjectType-service-warning-validation.xml | 2 +- .../ObservedSystem-service-error-validation.xml | 2 +- .../ObservedSystem-service-warning-validation.xml | 2 +- .../ReasonForDiscard-service-error-validation.xml | 2 +- ...ReasonForDiscard-service-warning-validation.xml | 2 +- ...ReasonForNoFishing-service-error-validation.xml | 2 +- ...asonForNoFishing-service-warning-validation.xml | 2 +- .../ReasonForNullSet-service-error-validation.xml | 2 +- ...ReasonForNullSet-service-warning-validation.xml | 2 +- .../seine/SpeciesFate-service-error-validation.xml | 2 +- .../SpeciesFate-service-warning-validation.xml | 2 +- .../SpeciesStatus-service-error-validation.xml | 2 +- .../SpeciesStatus-service-warning-validation.xml | 2 +- ...urroundingActivity-service-error-validation.xml | 2 +- ...roundingActivity-service-warning-validation.xml | 2 +- ...ttingBuoyOperation-service-error-validation.xml | 2 +- ...ingBuoyOperation-service-warning-validation.xml | 2 +- ...ansmittingBuoyType-service-error-validation.xml | 2 +- ...smittingBuoyType-service-warning-validation.xml | 2 +- ...esselActivitySeine-service-error-validation.xml | 2 +- ...selActivitySeine-service-warning-validation.xml | 2 +- .../WeightCategory-service-error-validation.xml | 2 +- .../WeightCategory-service-warning-validation.xml | 2 +- .../seine/Wind-service-error-validation.xml | 2 +- .../seine/Wind-service-warning-validation.xml | 2 +- .../ActivitySeine-service-error-validation.xml | 2 +- ...ine-service-observedSystem-error-validation.xml | 2 +- ...e-service-observedSystem-warning-validation.xml | 2 +- .../ActivitySeine-service-warning-validation.xml | 2 +- .../FloatingObject-service-error-validation.xml | 15 +- ...rvice-objectSchoolEstimate-error-validation.xml | 2 +- ...-transmittingBuoyOperation-error-validation.xml | 2 +- .../FloatingObject-service-warning-validation.xml | 2 +- ...arUseFeaturesSeine-service-error-validation.xml | 2 +- .../NonTargetCatch-service-error-validation.xml | 2 +- .../NonTargetCatch-service-warning-validation.xml | 2 +- .../NonTargetLength-service-error-validation.xml | 14 +- .../NonTargetLength-service-warning-validation.xml | 11 +- .../NonTargetSample-service-error-validation.xml | 2 +- ...ectObservedSpecies-service-error-validation.xml | 2 +- ...jectSchoolEstimate-service-error-validation.xml | 2 +- ...ctSchoolEstimate-service-warning-validation.xml | 2 +- .../seine/Route-service-error-validation.xml | 2 +- .../seine/Route-service-warning-validation.xml | 2 +- .../SchoolEstimate-service-error-validation.xml | 2 +- .../seine/SetSeine-service-error-validation.xml | 2 +- ...ine-service-nonTargetCatch-error-validation.xml | 2 +- ...ine-service-schoolEstimate-error-validation.xml | 2 +- ...tSeine-service-targetCatch-error-validation.xml | 2 +- ...ne-service-targetDiscarded-error-validation.xml | 2 +- .../seine/SetSeine-service-warning-validation.xml | 2 +- ...tCatch-service-targetCatch-error-validation.xml | 2 +- ...atch-service-targetCatch-warning-validation.xml | 2 +- ...ch-service-targetDiscarded-error-validation.xml | 2 +- ...-service-targetDiscarded-warning-validation.xml | 2 +- .../TargetLength-service-error-validation.xml | 31 +- .../TargetLength-service-warning-validation.xml | 2 +- .../TargetSample-service-error-validation.xml | 2 +- .../TransmittingBuoy-service-error-validation.xml | 2 +- ...TransmittingBuoy-service-warning-validation.xml | 2 +- .../seine/TripSeine-service-error-validation.xml | 2 +- ...-service-gearUseFeatures-warning-validation.xml | 2 +- .../seine/TripSeine-service-warning-validation.xml | 2 +- .../services-topia-validation_en_GB.properties | 21 +- .../services-topia-validation_es_ES.properties | 21 +- .../services-topia-validation_fr_FR.properties | 21 +- .../src/main/resources/xwork.xml | 2 +- .../validation/BeanValidatorDetectorTest.java | 12 +- .../ActivitySeineSpeedValidatorTest.java | 2 +- .../seine/Route-testSpeed-error-validation.xml | 2 +- .../src/test/resources/log4j.properties | 2 +- .../src/test/resources/validators.xml | 2 +- services-topia-validators/pom.xml | 2 +- .../validators/AbstractSpeciesFieldValidator.java | 2 +- .../ActivityFinDeVeilleExistsValidator.java | 2 +- .../validators/ActivitySimpleSpeedValidator.java | 2 +- .../topia/validators/ActivitySpeedValidator.java | 2 +- .../validators/CollectionUniqueKeyValidator2.java | 2 +- .../ObserveCollectionUniqueKeyValidator.java | 2 +- .../topia/validators/QuadrantFieldValidator.java | 2 +- .../SetLonglineUniqueHomeIdValidator.java | 2 +- .../SetLonglineUniqueNumberValidator.java | 2 +- .../validators/SpeciesLengthFieldValidator.java | 2 +- .../validators/SpeciesWeightFieldValidator.java | 2 +- services-topia/pom.xml | 19 +- .../observe/services/topia/ObserveJdbcHelper.java | 2 +- .../services/topia/ObserveSecurityHelper.java | 8 +- .../services/topia/ObserveServiceContextTopia.java | 35 +- .../services/topia/ObserveServiceFactoryTopia.java | 5 +- .../services/topia/ObserveServiceTopia.java | 34 +- .../ObserveTopiaApplicationContextFactory.java | 17 +- .../services/topia/binder/BinderEngine.java | 251 ----- .../topia/binder/BinderEngineInitializer.java | 1182 ------------------- .../services/topia/binder/BinderSupport.java | 235 ---- .../binder/ReferenceBinderEngineSupplierTopia.java | 40 - .../topia/binder/data/ActivityLonglineBinder.java | 93 -- .../data/ActivityLonglineEncouterDtoBinder.java | 74 -- .../data/ActivityLonglineSensorUsedDtoBinder.java | 60 - .../binder/data/ActivityLonglineStubDtoBinder.java | 59 - .../topia/binder/data/ActivitySeineBinder.java | 122 -- .../data/ActivitySeineObservedSystemDtoBinder.java | 62 - .../binder/data/ActivitySeineStubDtoBinder.java | 62 - .../topia/binder/data/BaitsCompositionBinder.java | 70 -- .../services/topia/binder/data/BasketBinder.java | 82 -- .../topia/binder/data/BranchlineBinder.java | 128 --- .../binder/data/BranchlinesCompositionBinder.java | 66 -- .../topia/binder/data/CatchLonglineBinder.java | 143 --- .../topia/binder/data/DataBinderSupport.java | 296 ----- .../topia/binder/data/EncounterBinder.java | 87 -- .../topia/binder/data/FloatingObjectBinder.java | 87 -- .../FloatingObjectObservedSpeciesDtoBinder.java | 59 - .../FloatingObjectSchoolEstimateDtoBinder.java | 59 - .../FloatingObjectTransmittingBuoyDtoBinder.java | 59 - .../binder/data/FloatlinesCompositionBinder.java | 64 -- .../binder/data/GearUseFeaturesLonglineBinder.java | 66 -- .../GearUseFeaturesMeasurementLonglineBinder.java | 62 - .../GearUseFeaturesMeasurementSeineBinder.java | 63 -- .../binder/data/GearUseFeaturesSeineBinder.java | 67 -- .../topia/binder/data/HooksCompositionBinder.java | 68 -- .../topia/binder/data/NonTargetCatchBinder.java | 104 -- .../topia/binder/data/NonTargetLengthBinder.java | 79 -- .../topia/binder/data/NonTargetSampleBinder.java | 59 - .../binder/data/ObjectObservedSpeciesBinder.java | 67 -- .../binder/data/ObjectSchoolEstimateBinder.java | 61 - .../services/topia/binder/data/RouteBinder.java | 82 -- .../topia/binder/data/RouteStubDtoBinder.java | 61 - .../topia/binder/data/SchoolEstimateBinder.java | 84 -- .../services/topia/binder/data/SectionBinder.java | 78 -- .../topia/binder/data/SensorUsedBinder.java | 102 -- .../topia/binder/data/SetLonglineBinder.java | 153 --- .../binder/data/SetLonglineCatchDtoBinder.java | 59 - .../SetLonglineDetailCompositionDtoBinder.java | 74 -- .../SetLonglineGlobalCompositionDtoBinder.java | 76 -- .../binder/data/SetLonglineStubDtoBinder.java | 56 - .../topia/binder/data/SetLonglineTdrDtoBinder.java | 61 - .../services/topia/binder/data/SetSeineBinder.java | 107 -- .../data/SetSeineNonTargetCatchDtoBinder.java | 58 - .../data/SetSeineSchoolEstimateDtoBinder.java | 58 - .../binder/data/SetSeineTargetCatchDtoBinder.java | 59 - .../topia/binder/data/SizeMeasureBinder.java | 62 - .../topia/binder/data/TargetCatchBinder.java | 75 -- .../topia/binder/data/TargetLengthBinder.java | 94 -- .../topia/binder/data/TargetSampleBinder.java | 64 -- .../services/topia/binder/data/TdrBinder.java | 143 --- .../topia/binder/data/TransmittingBuoyBinder.java | 89 -- .../binder/data/TripLonglineActivityDtoBinder.java | 57 - .../topia/binder/data/TripLonglineBinder.java | 121 -- .../binder/data/TripLonglineGearUseDtoBinder.java | 59 - .../topia/binder/data/TripSeineBinder.java | 122 -- .../binder/data/TripSeineGearUseDtoBinder.java | 59 - .../topia/binder/data/WeightMeasureBinder.java | 61 - .../referential/BaitHaulingStatusBinder.java | 72 -- .../referential/BaitSettingStatusBinder.java | 72 -- .../topia/binder/referential/BaitTypeBinder.java | 72 -- .../referential/CatchFateLonglineBinder.java | 72 -- .../topia/binder/referential/CountryBinder.java | 76 -- .../binder/referential/DetectionModeBinder.java | 72 -- .../binder/referential/EncounterTypeBinder.java | 72 -- .../topia/binder/referential/FpaZoneBinder.java | 76 -- .../topia/binder/referential/GearBinder.java | 75 -- .../referential/GearCaracteristicBinder.java | 82 -- .../referential/GearCaracteristicTypeBinder.java | 72 -- .../topia/binder/referential/HarbourBinder.java | 84 -- .../topia/binder/referential/HealthnessBinder.java | 72 -- .../binder/referential/HookPositionBinder.java | 72 -- .../topia/binder/referential/HookSizeBinder.java | 74 -- .../topia/binder/referential/HookTypeBinder.java | 72 -- .../referential/ItemHorizontalPositionBinder.java | 74 -- .../referential/ItemVerticalPositionBinder.java | 74 -- .../referential/LengthWeightParameterBinder.java | 96 -- .../binder/referential/LightsticksColorBinder.java | 72 -- .../binder/referential/LightsticksTypeBinder.java | 72 -- .../topia/binder/referential/LineTypeBinder.java | 72 -- .../binder/referential/MaturityStatusBinder.java | 76 -- .../binder/referential/MitigationTypeBinder.java | 72 -- .../topia/binder/referential/ObjectFateBinder.java | 72 -- .../binder/referential/ObjectOperationBinder.java | 72 -- .../topia/binder/referential/ObjectTypeBinder.java | 72 -- .../binder/referential/ObservedSystemBinder.java | 76 -- .../topia/binder/referential/OceanBinder.java | 72 -- .../topia/binder/referential/OrganismBinder.java | 80 -- .../topia/binder/referential/PersonBinder.java | 94 -- .../topia/binder/referential/ProgramBinder.java | 112 -- .../binder/referential/ReasonForDiscardBinder.java | 74 -- .../referential/ReasonForNoFishingBinder.java | 74 -- .../binder/referential/ReasonForNullSetBinder.java | 74 -- .../referential/ReferentialBinderSupport.java | 171 --- .../binder/referential/SensorBrandBinder.java | 76 -- .../binder/referential/SensorDataFormatBinder.java | 74 -- .../topia/binder/referential/SensorTypeBinder.java | 74 -- .../binder/referential/SettingShapeBinder.java | 74 -- .../topia/binder/referential/SexBinder.java | 74 -- .../binder/referential/SizeMeasureTypeBinder.java | 74 -- .../topia/binder/referential/SpeciesBinder.java | 108 -- .../binder/referential/SpeciesFateBinder.java | 74 -- .../binder/referential/SpeciesGroupBinder.java | 74 -- .../binder/referential/SpeciesListBinder.java | 76 -- .../binder/referential/SpeciesStatusBinder.java | 74 -- .../binder/referential/StomacFullnessBinder.java | 74 -- .../referential/SurroundingActivityBinder.java | 74 -- .../TransmittingBuoyOperationBinder.java | 74 -- .../referential/TransmittingBuoyTypeBinder.java | 74 -- .../topia/binder/referential/TripTypeBinder.java | 74 -- .../referential/VesselActivityLonglineBinder.java | 74 -- .../referential/VesselActivitySeineBinder.java | 74 -- .../topia/binder/referential/VesselBinder.java | 108 -- .../referential/VesselSizeCategoryBinder.java | 80 -- .../topia/binder/referential/VesselTypeBinder.java | 74 -- .../binder/referential/WeightCategoryBinder.java | 82 -- .../referential/WeightMeasureTypeBinder.java | 74 -- .../topia/binder/referential/WindBinder.java | 79 -- .../topia/entity/BasketEntitiesExtractor.java | 59 - .../topia/entity/BranchlineEntitiesExtractor.java | 66 -- .../services/topia/entity/EntitiesExtractor.java | 76 -- .../services/topia/entity/EntitiesSetFactory.java | 310 ----- .../topia/entity/SectionEntitiesExtractor.java | 47 - .../topia/entity/SpeciesListEntitiesExtractor.java | 59 - .../entity/SpeciesListOceanEntitiesExtractor.java | 58 - .../services/topia/entity/TripMapDtoFactory.java | 59 - .../topia/service/DataSourceServiceTopia.java | 55 +- .../service/ImportTripScriptTopiaSqlWork.java | 90 -- .../topia/service/LastUpdateDateServiceTopia.java | 4 +- .../topia/service/ReferentialServiceTopia.java | 260 ----- .../service/SqlScriptProducerServiceTopia.java | 248 ---- .../topia/service/TripManagementServiceTopia.java | 213 ---- .../ConsolidateActivitySeineDataResultBuilder.java | 2 +- .../consolidate/ConsolidateDataServiceTopia.java | 97 +- .../service/actions/report/ReportServiceTopia.java | 70 +- .../ReferentialSynchronizeDiffServiceTopia.java | 2 +- ...nalReferentialSynchronizeLocalServiceTopia.java | 2 +- .../ng/ReferentialSynchronizeServiceTopia.java | 2 +- .../ReferentialSynchronizeSqlsRequestBuilder.java | 11 +- .../referential/sql/ApplySqlRequestWork.java | 2 +- .../sql/DeleteSqlStatementGenerator.java | 2 +- .../sql/DesactivateSqlStatementGenerator.java | 2 +- .../sql/InsertSqlStatementGenerator.java | 2 +- .../InsertSqlWithCascadeStatementGenerator.java | 2 +- .../sql/ReplaceSqlStatementGenerator.java | 2 +- .../sql/UpdateSqlStatementGenerator.java | 2 +- .../UpdateSqlWithCascadeStatementGenerator.java | 2 +- .../validate/ServiceValidationException.java | 2 +- .../actions/validate/ValidateServiceTopia.java | 14 +- .../actions/validate/ValidationDataContext.java | 2 +- .../validate/ValidationMessageDetector.java | 2 +- .../service/actions/validate/ValidatorsMap.java | 2 +- .../service/data/ImportTripScriptTopiaSqlWork.java | 100 ++ .../topia/service/data/NavigationServiceTopia.java | 115 ++ .../service/data/TripManagementServiceTopia.java | 214 ++++ .../topia/service/data/TripMapDtoFactory.java | 57 + .../ActivityLongLineEncounterServiceTopia.java | 70 ++ .../ActivityLongLineSensorUsedServiceTopia.java | 87 ++ .../longline/ActivityLonglineServiceTopia.java | 269 +++++ .../data/longline/BranchlineServiceTopia.java | 67 ++ .../longline/LonglinePositionSetDtoHelper.java | 154 +++ .../longline/SetLonglineCatchServiceTopia.java | 83 ++ .../SetLonglineDetailCompositionServiceTopia.java | 136 +++ .../SetLonglineGlobalCompositionServiceTopia.java | 68 ++ .../data/longline/SetLonglineServiceTopia.java | 217 ++++ .../service/data/longline/TdrServiceTopia.java | 101 ++ .../longline/TripLonglineGearUseServiceTopia.java | 91 ++ .../data/longline/TripLonglineServiceTopia.java | 302 +++++ .../data/seine/ActivitySeineServiceTopia.java | 268 +++++ .../data/seine/FloatingObjectServiceTopia.java | 161 +++ .../data/seine/NonTargetCatchServiceTopia.java | 140 +++ .../data/seine/NonTargetSampleServiceTopia.java | 158 +++ .../seine/ObjectObservedSpeciesServiceTopia.java | 69 ++ .../seine/ObjectSchoolEstimateServiceTopia.java | 70 ++ .../service/data/seine/RouteServiceTopia.java | 320 ++++++ .../data/seine/SchoolEstimateServiceTopia.java | 75 ++ .../service/data/seine/SetSeineServiceTopia.java | 183 +++ .../data/seine/TargetCatchServiceTopia.java | 176 +++ .../data/seine/TargetSampleServiceTopia.java | 174 +++ .../TransmittingBuoyOperationServiceTopia.java | 70 ++ .../data/seine/TripSeineGearUseServiceTopia.java | 90 ++ .../service/data/seine/TripSeineServiceTopia.java | 302 +++++ .../ActivityLongLineEncounterServiceTopia.java | 70 -- .../ActivityLongLineSensorUsedServiceTopia.java | 87 -- .../longline/ActivityLonglineServiceTopia.java | 269 ----- .../service/longline/BranchlineServiceTopia.java | 67 -- .../longline/LonglinePositionSetDtoHelper.java | 154 --- .../longline/SetLonglineCatchServiceTopia.java | 83 -- .../SetLonglineDetailCompositionServiceTopia.java | 131 --- .../SetLonglineGlobalCompositionServiceTopia.java | 68 -- .../service/longline/SetLonglineServiceTopia.java | 223 ---- .../topia/service/longline/TdrServiceTopia.java | 101 -- .../longline/TripLonglineGearUseServiceTopia.java | 91 -- .../service/longline/TripLonglineServiceTopia.java | 301 ----- .../referential/ReferentialServiceTopia.java | 361 ++++++ .../referential/ReferentialsShellBuilder.java | 138 +++ .../ActivitySeineObservedSystemServiceTopia.java | 67 -- .../service/seine/ActivitySeineServiceTopia.java | 270 ----- .../service/seine/FloatingObjectServiceTopia.java | 161 --- .../service/seine/NonTargetCatchServiceTopia.java | 140 --- .../service/seine/NonTargetSampleServiceTopia.java | 143 --- .../seine/ObjectObservedSpeciesServiceTopia.java | 69 -- .../seine/ObjectSchoolEstimateServiceTopia.java | 70 -- .../topia/service/seine/RouteServiceTopia.java | 320 ------ .../service/seine/SchoolEstimateServiceTopia.java | 75 -- .../topia/service/seine/SetSeineServiceTopia.java | 183 --- .../service/seine/TargetCatchServiceTopia.java | 176 --- .../service/seine/TargetSampleServiceTopia.java | 174 --- .../TransmittingBuoyOperationServiceTopia.java | 70 -- .../seine/TripSeineGearUseServiceTopia.java | 90 -- .../topia/service/seine/TripSeineServiceTopia.java | 301 ----- .../service/sql/SqlScriptProducerServiceTopia.java | 282 +++++ .../services/topia/DataSourcesForTestManager.java | 4 +- .../ObserveDataSourceConnectionTopiaTaiste.java | 2 +- .../topia/ObserveServiceContextTopiaTaiste.java | 3 +- .../services/topia/TopiaTestClassResource.java | 6 +- .../services/topia/TopiaTestMethodResource.java | 6 +- .../topia/binder/BinderEngineMetadataTest.java | 188 --- .../services/topia/binder/BinderEngineTest.java | 12 +- .../topia/binder/ReferenceBinderEngineTest.java | 47 - .../topia/entity/LengthWeightParemetersTest.java | 32 +- .../topia/entity/ReplicateReferentialsTest.java | 2 +- .../topia/entity/ReplicateTestSupport.java | 6 +- .../topia/entity/ReplicateTripLonglineTest.java | 10 +- .../topia/entity/ReplicateTripSeineTest.java | 2 +- .../topia/service/AbstractServiceTopiaTest.java | 12 +- .../AddSqlScriptProducerServiceTopiaTest.java | 105 -- .../topia/service/DataSourceServiceTopiaTest.java | 16 +- .../topia/service/MigrateTestsDatabases.java | 147 --- .../topia/service/ReferentialServiceTopiaTest.java | 7 +- .../observe/services/topia/service/RigthTest.java | 8 +- .../service/TripManagementServiceTopiaTest.java | 151 --- .../ConsolidateDataServiceTopiaTest.java | 20 +- .../report/AbstractReportServiceTopiaTest.java | 2 +- .../actions/report/ReportAccessoryCatch2Test.java | 2 +- .../report/ReportAccessoryCatchByGroup2Test.java | 2 +- .../report/ReportAccessoryCatchByGroupTest.java | 22 +- .../actions/report/ReportAccessoryCatchTest.java | 8 +- .../report/ReportActivityWithCommentTest.java | 10 +- .../actions/report/ReportAllActivitysTest.java | 2 +- .../actions/report/ReportDailySetAndCatchTest.java | 6 +- .../service/actions/report/ReportDcpUsageTest.java | 2 +- .../actions/report/ReportSeineEquipmentsTest.java | 85 ++ .../actions/report/ReportSetByAssociationTest.java | 14 +- .../report/ReportTargetCatchByAssociationTest.java | 14 +- .../ReportTargetDiscardedByAssociationTest.java | 14 +- .../UnidirectionalSynchronizeReferentialTest.java | 10 +- .../actions/validate/ValidateServiceTopiaTest.java | 56 +- .../data/TripManagementServiceTopiaTest.java | 153 +++ ...tLonglineDetailCompositionServiceTopiaTest.java | 188 +++ .../service/data/seine/RouteServiceTopiaTest.java | 70 ++ .../data/seine/TargetSampleServiceTopiaTest.java | 74 ++ .../seine/TripSeineGearUseServiceTopiaTest.java | 169 +++ .../data/seine/TripSeineServiceTopiaTest.java | 338 ++++++ ...tLonglineDetailCompositionServiceTopiaTest.java | 188 --- .../topia/service/seine/RouteServiceTopiaTest.java | 71 -- .../seine/TargetSampleServiceTopiaTest.java | 74 -- .../seine/TripSeineGearUseServiceTopiaTest.java | 169 --- .../service/seine/TripSeineServiceTopiaTest.java | 338 ------ .../topia/service/sql/MigrateTestsDatabases.java | 159 +++ .../sql/SqlScriptProducerServiceTopiaTest.java | 116 ++ services-topia/src/test/resources/log4j.properties | 4 +- services-topia/src/test/resources/validators.xml | 2 +- services/pom.xml | 11 +- .../src/main/filters/observe-reports.properties | 103 +- .../fr/ird/observe/services/ObserveService.java | 2 +- .../observe/services/ObserveServiceFactory.java | 2 +- .../services/ObserveServiceFactorySupport.java | 2 +- .../services/ObserveServiceInitializer.java | 2 +- .../observe/services/ObserveServicesProvider.java | 64 +- .../observe/services/http/ObserveHttpError.java | 2 +- .../security/AdminApiKeyNotFoundException.java | 2 +- .../AuthenticationTokenNotFoundException.java | 2 +- .../BadObserveWebUserPasswordException.java | 2 +- .../security/InvalidAdminKeyApiException.java | 2 +- .../InvalidAuthenticationTokenException.java | 2 +- .../ObserveWebSecurityExceptionSupport.java | 2 +- .../SecurityRequestContextNotFoundException.java | 2 +- .../security/UnknownObserveWebUserException.java | 2 +- .../UnknownObserveWebUserForDatabaseException.java | 2 +- .../security/UserLoginNotFoundException.java | 2 +- .../security/UserPasswordNotFoundException.java | 2 +- .../service/AddSqlScriptProducerRequest.java | 110 -- .../service/AddSqlScriptProducerResult.java | 49 - .../services/service/BabModelVersionException.java | 2 +- .../service/ConcurrentModificationException.java | 2 +- .../service/DataFileNotFoundException.java | 2 +- .../services/service/DataNotFoundException.java | 2 +- .../services/service/DataSourceService.java | 2 +- .../DatabaseConnexionNotAuthorizedException.java | 2 +- .../DatabaseDestroyNotAuthorizedException.java | 2 +- .../service/DatabaseNotFoundException.java | 2 +- .../service/DeleteSqlScriptProducerRequest.java | 81 -- .../services/service/LastUpdateDateService.java | 2 +- .../services/service/ObserveBlobsContainer.java | 59 - .../services/service/ObserveReferentialCache.java | 152 --- .../ird/observe/services/service/PingService.java | 2 +- .../services/service/ReferenceSetsRequest.java | 59 - .../services/service/ReferentialService.java | 92 -- .../services/service/SqlScriptProducerService.java | 37 - .../ConsolidateActivitySeineDataResult.java | 2 +- .../consolidate/ConsolidateDataService.java | 7 +- .../ConsolidateTripSeineDataRequest.java | 17 +- .../ConsolidateTripSeineDataResult.java | 2 +- .../service/actions/report/ReportBuilder.java | 7 +- .../service/actions/report/ReportService.java | 2 +- .../diff/ReferentialDataSourceState.java | 2 +- .../diff/ReferentialDataSourceStates.java | 2 +- .../diff/ReferentialSynchronizeDiff.java | 2 +- .../diff/ReferentialSynchronizeDiffService.java | 2 +- .../diff/ReferentialSynchronizeDiffState.java | 2 +- .../diff/ReferentialSynchronizeDiffStateType.java | 2 +- .../diff/ReferentialSynchronizeDiffs.java | 2 +- .../diff/ReferentialSynchronizeDiffsEngine.java | 2 +- ...ionalReferentialSynchronizeCallbackRequest.java | 2 +- ...onalReferentialSynchronizeCallbackRequests.java | 2 +- ...tionalReferentialSynchronizeCallbackResult.java | 2 +- ...ionalReferentialSynchronizeCallbackResults.java | 2 +- ...nidirectionalReferentialSynchronizeContext.java | 2 +- ...UnidirectionalReferentialSynchronizeEngine.java | 23 +- ...ectionalReferentialSynchronizeLocalService.java | 2 +- ...nidirectionalReferentialSynchronizeRequest.java | 2 +- ...UnidirectionalReferentialSynchronizeResult.java | 2 +- .../ng/ReferentialSynchronizeRequest.java | 2 +- .../ng/ReferentialSynchronizeService.java | 11 +- .../ng/ReferentialSynchronizeServiceEngine.java | 2 +- ...entialSynchronizeServiceProduceSqlsRequest.java | 2 +- ...rentialSynchronizeServiceProduceSqlsResult.java | 2 +- .../ng/ReferentialSynchronizeSqlsRequest.java | 2 +- .../ng/task/ReferentialSynchronizeTask.java | 2 +- .../ng/task/ReferentialSynchronizeTaskType.java | 2 +- .../actions/validate/ValidateDataRequest.java | 2 +- .../actions/validate/ValidateDataResult.java | 8 +- .../validate/ValidateReferentialsRequest.java | 2 +- .../validate/ValidateReferentialsResult.java | 9 +- .../actions/validate/ValidateResultForDto.java | 2 +- .../validate/ValidateResultForDtoHelper.java | 82 ++ .../actions/validate/ValidateResultForDtoType.java | 2 +- .../actions/validate/ValidateResultForDtos.java | 82 -- .../service/actions/validate/ValidateService.java | 2 +- .../actions/validate/ValidateServiceUtils.java | 2 +- .../actions/validate/ValidationMessage.java | 2 +- .../service/actions/validate/ValidatorDto.java | 2 +- .../service/actions/validate/ValidatorDtos.java | 53 - .../service/actions/validate/ValidatorHelper.java | 53 + .../validate/ValidatorInitializationException.java | 2 +- .../services/service/data/DeleteTripRequest.java | 51 + .../services/service/data/DeleteTripResult.java | 50 + .../services/service/data/ExportTripRequest.java | 57 + .../services/service/data/ExportTripResult.java | 74 ++ .../services/service/data/ImportTripRequest.java | 65 ++ .../services/service/data/ImportTripResult.java | 75 ++ .../services/service/data/NavigationRequest.java | 63 ++ .../services/service/data/NavigationResult.java | 64 ++ .../services/service/data/NavigationService.java | 37 + .../service/data/TripManagementService.java | 55 + .../longline/ActivityLongLineEncounterService.java | 47 + .../ActivityLongLineSensorUsedService.java | 51 + .../data/longline/ActivityLonglineService.java | 87 ++ .../service/data/longline/BranchlineService.java | 47 + .../data/longline/SetLonglineCatchService.java | 47 + .../SetLonglineDetailCompositionService.java | 56 + .../SetLonglineGlobalCompositionService.java | 47 + .../service/data/longline/SetLonglineService.java | 66 ++ .../services/service/data/longline/TdrService.java | 51 + .../data/longline/TripLonglineGearUseService.java | 47 + .../service/data/longline/TripLonglineService.java | 98 ++ .../service/data/seine/ActivitySeineService.java | 84 ++ .../service/data/seine/FloatingObjectService.java | 70 ++ .../service/data/seine/NonTargetCatchService.java | 46 + .../service/data/seine/NonTargetSampleService.java | 57 + .../data/seine/ObjectObservedSpeciesService.java | 47 + .../data/seine/ObjectSchoolEstimateService.java | 46 + .../services/service/data/seine/RouteService.java | 84 ++ .../service/data/seine/SchoolEstimateService.java | 47 + .../service/data/seine/SetSeineService.java | 66 ++ .../service/data/seine/TargetCatchService.java | 46 + .../service/data/seine/TargetSampleService.java | 56 + .../seine/TransmittingBuoyOperationService.java | 47 + .../data/seine/TripSeineGearUseService.java | 47 + .../service/data/seine/TripSeineService.java | 98 ++ .../longline/ActivityLongLineEncounterService.java | 47 - .../ActivityLongLineSensorUsedService.java | 51 - .../service/longline/ActivityLonglineService.java | 87 -- .../service/longline/BranchlineService.java | 47 - .../service/longline/SetLonglineCatchService.java | 47 - .../SetLonglineDetailCompositionService.java | 56 - .../SetLonglineGlobalCompositionService.java | 47 - .../service/longline/SetLonglineService.java | 66 -- .../services/service/longline/TdrService.java | 51 - .../longline/TripLonglineGearUseService.java | 47 - .../service/longline/TripLonglineService.java | 97 -- .../referential/MissingReferentialResult.java | 55 + .../referential/ObserveReferentialCache.java | 152 +++ .../service/referential/ReferenceSetsRequest.java | 59 + .../service/referential/ReferentialService.java | 116 ++ .../seine/ActivitySeineObservedSystemService.java | 47 - .../service/seine/ActivitySeineService.java | 84 -- .../service/seine/FloatingObjectService.java | 70 -- .../service/seine/NonTargetCatchService.java | 46 - .../service/seine/NonTargetSampleService.java | 57 - .../seine/ObjectObservedSpeciesService.java | 47 - .../service/seine/ObjectSchoolEstimateService.java | 46 - .../services/service/seine/RouteService.java | 84 -- .../service/seine/SchoolEstimateService.java | 47 - .../services/service/seine/SetSeineService.java | 66 -- .../services/service/seine/TargetCatchService.java | 46 - .../service/seine/TargetSampleService.java | 56 - .../seine/TransmittingBuoyOperationService.java | 47 - .../service/seine/TripSeineGearUseService.java | 47 - .../services/service/seine/TripSeineService.java | 97 -- .../service/sql/AddSqlScriptProducerRequest.java | 133 +++ .../service/sql/AddSqlScriptProducerResult.java | 50 + .../sql/DeleteSqlScriptProducerRequest.java | 81 ++ .../service/sql/SqlScriptProducerService.java | 37 + .../services/service/trip/DeleteTripRequest.java | 51 - .../services/service/trip/DeleteTripResult.java | 50 - .../services/service/trip/ExportTripRequest.java | 57 - .../services/service/trip/ExportTripResult.java | 74 -- .../services/service/trip/ImportTripRequest.java | 65 -- .../services/service/trip/ImportTripResult.java | 75 -- .../service/trip/TripManagementService.java | 55 - .../fr/ird/observe/services/spi/DeleteRequest.java | 2 +- .../fr/ird/observe/services/spi/NoDataAccess.java | 2 +- .../fr/ird/observe/services/spi/PostRequest.java | 2 +- .../observe/services/spi/ReadDataPermission.java | 2 +- .../services/spi/ReadReferentialPermission.java | 2 +- .../java/fr/ird/observe/services/spi/Write.java | 2 +- .../observe/services/spi/WriteDataPermission.java | 2 +- .../services/spi/WriteReferentialPermission.java | 2 +- .../service/actions/report/ReportBuilderTest.java | 2 +- .../actions/report/observe-reports-test.properties | 4 +- services/src/test/resources/log4j.properties | 2 +- src/site/resources/images/logo-OT_web.png | Bin 34309 -> 0 bytes src/site/resources/images/logo-small.png | Bin 0 -> 46914 bytes src/site/resources/images/logo.png | Bin 0 -> 232898 bytes src/site/rst/architecture-logicielle.rst | 2 +- src/site/rst/index.rst | 10 +- src/site/rst/install-serverPG.rst | 2 +- src/site/rst/install.rst | 2 +- src/site/site_fr.xml | 4 +- test/pom.xml | 2 +- .../java/fr/ird/observe/test/DatabaseName.java | 2 +- .../java/fr/ird/observe/test/ObserveFixtures.java | 64 +- .../ird/observe/test/ObserveTestConfiguration.java | 59 +- .../fr/ird/observe/test/ObserveTestResources.java | 2 +- .../ird/observe/test/TestClassResourceSupport.java | 24 +- .../main/java/fr/ird/observe/test/TestHelper.java | 2 +- .../observe/test/TestMethodResourceSupport.java | 27 +- .../test/spi/CopyDatabaseConfiguration.java | 2 +- .../test/spi/CopyDatabaseConfigurations.java | 2 +- .../ird/observe/test/spi/DatabaseClassifier.java | 2 +- .../test/spi/DatabaseLoginConfiguration.java | 2 +- .../test/spi/DatabaseNameConfiguration.java | 2 +- .../test/spi/DatabaseNameConfigurations.java | 2 +- .../test/spi/DatabasePasswordConfiguration.java | 2 +- .../test/spi/DatabaseServerNameConfiguration.java | 45 + .../observe/test/spi/DatabaseUrlConfiguration.java | 2 +- .../test/spi/DatabaseVersionConfiguration.java | 2 +- .../test/spi/DatabaseVersionConfigurations.java | 2 +- .../resources/db/4.0.1/dataForTestLongline.sql.gz | Bin 1520436 -> 0 bytes .../resources/db/4.0.1/dataForTestSeine.sql.gz | Bin 430080 -> 0 bytes test/src/main/resources/db/4.0.1/empty_h2.sql.gz | Bin 5992 -> 0 bytes test/src/main/resources/db/4.0.1/empty_pg.sql.gz | Bin 5983 -> 0 bytes .../src/main/resources/db/4.0.1/referentiel.sql.gz | Bin 137641 -> 0 bytes test/src/main/resources/db/4.0/referentiel.sql.gz | Bin 138262 -> 0 bytes .../resources/db/4.902/dataForTestLongline.sql.gz | Bin 1621369 -> 0 bytes .../resources/db/4.902/dataForTestSeine.sql.gz | Bin 440282 -> 0 bytes test/src/main/resources/db/4.902/empty_h2.sql.gz | Bin 6020 -> 0 bytes test/src/main/resources/db/4.902/empty_pg.sql.gz | Bin 5994 -> 0 bytes .../src/main/resources/db/4.902/referentiel.sql.gz | Bin 162596 -> 0 bytes .../resources/db/4.903/dataForTestLongline.sql.gz | Bin 1627285 -> 0 bytes .../resources/db/4.903/dataForTestSeine.sql.gz | Bin 441224 -> 0 bytes ...aForTestUnidirectionalReferentialSynchro.sql.gz | Bin 441247 -> 0 bytes test/src/main/resources/db/4.903/empty_h2.sql.gz | Bin 6020 -> 0 bytes test/src/main/resources/db/4.903/empty_pg.sql.gz | Bin 5994 -> 0 bytes .../src/main/resources/db/4.903/referentiel.sql.gz | Bin 162763 -> 0 bytes .../resources/db/4.904/dataForTestLongline.sql.gz | Bin 1626934 -> 0 bytes .../resources/db/4.904/dataForTestSeine.sql.gz | Bin 451066 -> 0 bytes ...aForTestUnidirectionalReferentialSynchro.sql.gz | Bin 441263 -> 0 bytes test/src/main/resources/db/4.904/empty_h2.sql.gz | Bin 6018 -> 0 bytes test/src/main/resources/db/4.904/empty_pg.sql.gz | Bin 6003 -> 0 bytes .../src/main/resources/db/4.904/referentiel.sql.gz | Bin 140244 -> 0 bytes .../resources/db/4.905/dataForTestLongline.sql.gz | Bin 1622096 -> 0 bytes .../resources/db/4.905/dataForTestSeine.sql.gz | Bin 451016 -> 0 bytes ...aForTestUnidirectionalReferentialSynchro.sql.gz | Bin 441248 -> 0 bytes test/src/main/resources/db/4.905/empty_h2.sql.gz | Bin 6006 -> 0 bytes test/src/main/resources/db/4.905/empty_pg.sql.gz | Bin 6004 -> 0 bytes .../src/main/resources/db/4.905/referentiel.sql.gz | Bin 140214 -> 0 bytes .../resources/db/4.906/dataForTestLongline.sql.gz | Bin 1622154 -> 0 bytes .../resources/db/4.906/dataForTestSeine.sql.gz | Bin 451054 -> 0 bytes ...aForTestUnidirectionalReferentialSynchro.sql.gz | Bin 441255 -> 0 bytes test/src/main/resources/db/4.906/empty_h2.sql.gz | Bin 6012 -> 0 bytes test/src/main/resources/db/4.906/empty_pg.sql.gz | Bin 6006 -> 0 bytes .../src/main/resources/db/4.906/referentiel.sql.gz | Bin 140211 -> 0 bytes .../resources/db/5.0/dataForTestLongline.sql.gz | Bin 1622126 -> 1579264 bytes .../main/resources/db/5.0/dataForTestSeine.sql.gz | Bin 451053 -> 448129 bytes ...aForTestUnidirectionalReferentialSynchro.sql.gz | Bin 441245 -> 439131 bytes test/src/main/resources/db/5.0/referentiel.sql.gz | Bin 140210 -> 179173 bytes .../resources/db/6.0/dataForTestLongline.sql.gz | Bin 0 -> 1636168 bytes .../main/resources/db/6.0/dataForTestSeine.sql.gz | Bin 0 -> 455791 bytes test/src/main/resources/db/6.0/empty_h2.sql.gz | Bin 0 -> 6310 bytes test/src/main/resources/db/6.0/empty_pg.sql.gz | Bin 0 -> 6302 bytes test/src/main/resources/db/6.0/referentiel.sql.gz | Bin 0 -> 183215 bytes test/src/main/resources/observetest.properties | 9 +- toolbox-maven-plugin/pom.xml | 2 +- .../maven/plugins/toolbox/CheckApiMojo.java | 2 +- .../plugins/toolbox/GenerateI18nTypesMojo.java | 2 +- .../toolbox/GenerateI18nValidatorFieldsMojo.java | 2 +- .../toolbox/GenerateValidatorMojoSupport.java | 2 +- .../toolbox/GenerateValidatorsDescriptorMojo.java | 2 +- .../toolbox/GenerateWebmotionMappingMojo.java | 2 +- .../MismatchMethodParameterNameException.java | 2 +- .../plugins/toolbox/MissingClassException.java | 2 +- .../plugins/toolbox/MissingMethodException.java | 2 +- .../maven/plugins/toolbox/ToolboxMojoSupport.java | 2 +- .../plugins/toolbox/ValidatorCacheRequest.java | 2 +- .../maven/plugins/toolbox/ValidatorsCache.java | 2 +- .../src/main/resources/log4j.properties | 2 +- topia-extension/pom.xml | 18 +- .../support/TopiaMetadataModelSupportImpl.java | 2 +- .../persistence/metadata/TopiaMetadataEntity.java | 45 +- .../persistence/metadata/TopiaMetadataModel.java | 2 +- .../metadata/TopiaMetadataModelVisitor.java | 5 +- .../support/TopiaMetadataModelSupport.java | 2 +- .../topia/service/sql/batch/SqlRequests.java | 110 +- .../nuiton/topia/service/sql/batch/SqlResult.java | 2 +- .../service/sql/batch/TopiaSqlBatchService.java | 2 +- .../batch/TopiaSqlBatchServiceConfiguration.java | 2 +- .../sql/batch/TopiaSqlBatchServiceImpl.java | 47 +- .../sql/batch/actions/AbstractSchemaAction.java | 44 +- .../sql/batch/actions/AbstractSchemaRequest.java | 2 +- .../sql/batch/actions/AbstractSqlAction.java | 19 +- .../sql/batch/actions/AbstractSqlRequest.java | 9 +- .../sql/batch/actions/AbstractTablesAction.java | 50 +- .../sql/batch/actions/AbstractTablesRequest.java | 2 +- .../service/sql/batch/actions/BlobsContainer.java | 2 +- .../sql/batch/actions/CreateSchemaAction.java | 36 +- .../sql/batch/actions/CreateSchemaRequest.java | 2 +- .../sql/batch/actions/DeleteTablesAction.java | 12 +- .../sql/batch/actions/DeleteTablesRequest.java | 2 +- .../sql/batch/actions/DropSchemaAction.java | 51 +- .../sql/batch/actions/DropSchemaRequest.java | 2 +- .../sql/batch/actions/ReplicateTablesAction.java | 122 +- .../sql/batch/actions/ReplicateTablesRequest.java | 2 +- .../batch/actions/TopiaSqlTableSelectArgument.java | 2 +- .../sql/batch/actions/UpdateTablesAction.java | 12 +- .../sql/batch/actions/UpdateTablesRequest.java | 2 +- .../service/sql/batch/tables/TopiaSqlTable.java | 2 +- .../service/sql/batch/tables/TopiaSqlTables.java | 27 +- .../sql/batch/tables/TopiaSqlTablesFactory.java | 14 +- topia-templates-extension/pom.xml | 2 +- .../templates/TopiaMetadataModelGenerator.java | 31 +- 3009 files changed, 79964 insertions(+), 69382 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.