[Observe-commits] branch master updated (6ab4608 -> 54a7f32)

This is an automated email from the git hooks/post-receive script. New change to branch master in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 6ab4608 [jgitflow-maven-plugin]merging 'release/6.0-RC-2' into 'master' adds e40e076 [jgitflow-maven-plugin]updating poms for 6.0-SNAPSHOT development adds b7222c1 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 4444a8f [jgitflow-maven-plugin]merging 'master' into 'develop' adds 82b5909 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds d6cea90 improve error logging adds d192ea3 Ajout de raccourcis claviers sur l'écran de configuration adds beb9286 Amélioration de l'écran de finalisation de configuration adds 686fd96 Clean code + Impossible de se connecter à un serveur distant (closes #24) adds 2f0dd8c Merge branch 'feature/24' into 'develop' adds 34b0e4e use jaxx 3.0-alpha-1 + change my email adds 6e96a6f ajout des raccourcis claviers sur les onglets (Closes #25) adds 796e690 Merge branch 'feature/25' into 'develop' adds fa95e7d [iso] use jaxx 3.0-alpha-2 adds f4eb2ed add missing license header adds 5a3a7db [iso] fix possible bugs in code adds c3942c7 Move an gson adapater + reduce timeout of connection to 30 seconds instead of 1 minute (Closes #4) adds df7e0c5 Merge branch 'feature/4' into 'develop' adds 5940ebd Ajouter le buildNumber (Closes #26) adds 0be181d Merge branch 'feature/26' into 'develop' adds d8c24f0 Pouvoir configurer le temps de connection (closes #27) adds bb9e63d Merge branch 'feature/27' into 'develop' adds b52b940 Utilisation de templates pour le A propos + correction lien manquants (Closes #28) adds 33d23a9 Merge branch 'feature/28' into 'develop' adds 934348b Ajouter un bundle i18n (Closes #29) adds 2dc15f4 Merge branch 'feature/29' into 'develop' adds cfb7ced Happy new Year commit adds 9264a70 use jaxx 3.0-alpha-3 adds f91a1bd use pom 10.5 adds 724ad90 [jgitflow-maven-plugin]updating poms for 6.0-RC-3 branch with snapshot versions adds 194db81 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-3' with non-snapshot versions adds 54a7f32 [jgitflow-maven-plugin]merging 'release/6.0-RC-3' into 'master' No new revisions were added by this update. Summary of changes: application-swing-configuration/pom.xml | 35 +++- .../src/main/config/ObserveSwingApplication.ini | 27 +++ .../ObserveSwingApplicationConfig.java | 16 +- .../configuration/constants/CreationMode.java | 2 +- .../swing/configuration/constants/DbMode.java | 2 +- ...pplication-swing-configuration_en_GB.properties | 4 + ...pplication-swing-configuration_es_ES.properties | 4 + ...pplication-swing-configuration_fr_FR.properties | 4 + .../src/main/resources/log4j.properties | 4 +- .../src/main/resources/observe-log4j.properties | 4 +- .../src/main/resources/validators.xml | 2 +- application-swing-decoration/pom.xml | 18 +- .../swing/decoration/DecoratorService.java | 2 +- .../decoration/ObserveI18nDecoratorHelper.java | 2 +- .../decorators/DataReferenceDecorator.java | 2 +- .../decorators/LengthLengthParameterDecorator.java | 2 +- .../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-validation/pom.xml | 18 +- ...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 +- ...lineEncounterDto-ui-update-error-validation.xml | 2 +- ...ineSensorUsedDto-ui-update-error-validation.xml | 2 +- ...tsCompositionDto-ui-update-error-validation.xml | 2 +- .../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 | 2 +- ...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 | 2 +- ...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 | 2 +- ...SetLonglineDto-ui-create-warning-validation.xml | 2 +- .../SetLonglineDto-ui-update-error-validation.xml | 2 +- ...SetLonglineDto-ui-update-warning-validation.xml | 2 +- ...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 | 2 +- ...thParameterDto-ui-create-warning-validation.xml | 2 +- ...ngthParameterDto-ui-update-error-validation.xml | 2 +- ...thParameterDto-ui-update-warning-validation.xml | 2 +- ...ightParameterDto-ui-create-error-validation.xml | 2 +- ...htParameterDto-ui-create-warning-validation.xml | 2 +- ...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 | 2 +- .../ShipOwnerDto-ui-create-warning-validation.xml | 2 +- .../ShipOwnerDto-ui-update-error-validation.xml | 2 +- .../ShipOwnerDto-ui-update-warning-validation.xml | 2 +- ...zeMeasureTypeDto-ui-create-error-validation.xml | 2 +- ...MeasureTypeDto-ui-create-warning-validation.xml | 2 +- ...zeMeasureTypeDto-ui-update-error-validation.xml | 2 +- ...MeasureTypeDto-ui-update-warning-validation.xml | 2 +- .../SpeciesDto-ui-create-error-validation.xml | 2 +- .../SpeciesDto-ui-create-warning-validation.xml | 2 +- .../SpeciesDto-ui-update-error-validation.xml | 2 +- .../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 | 2 +- .../VesselDto-ui-create-warning-validation.xml | 2 +- .../VesselDto-ui-update-error-validation.xml | 2 +- .../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 | 2 +- ...MeasureTypeDto-ui-create-warning-validation.xml | 2 +- ...htMeasureTypeDto-ui-update-error-validation.xml | 2 +- ...MeasureTypeDto-ui-update-warning-validation.xml | 2 +- ...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 +- ...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 +- ...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 | 2 +- ...tivitySeineDto-ui-create-warning-validation.xml | 2 +- ...ActivitySeineDto-ui-update-error-validation.xml | 2 +- ...tivitySeineDto-ui-update-warning-validation.xml | 2 +- ...loatingObjectDto-ui-create-error-validation.xml | 2 +- ...atingObjectDto-ui-create-warning-validation.xml | 2 +- ...loatingObjectDto-ui-update-error-validation.xml | 2 +- ...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 | 2 +- ...TargetCatchDto-ui-update-warning-validation.xml | 2 +- ...nTargetLengthDto-ui-update-error-validation.xml | 2 +- ...argetLengthDto-ui-update-warning-validation.xml | 2 +- ...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 | 2 +- ...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 | 2 +- ...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 +- .../validation/BeanValidatorDetectorTest.java | 2 +- .../src/test/resources/log4j.properties | 2 +- .../src/test/resources/validators.xml | 2 +- application-swing-validators/pom.xml | 18 +- .../AbstractSpeciesFieldDtoValidator.java | 2 +- .../ActivityFinDeVeilleExistsDtoValidator.java | 2 +- .../ActivitySimpleSpeedDtoValidator.java | 2 +- .../validators/ActivitySpeedDtoValidator.java | 2 +- .../CollectionUniqueKeyDtoValidator.java | 2 +- .../CoordinateLatitudeDtoFieldValidator.java | 2 +- .../CoordinateLongitudeDtoFieldValidator.java | 2 +- .../ObserveCollectionUniqueKeyDtoValidator.java | 2 +- .../validators/OpenableDtoFieldValidator.java | 2 +- .../validators/QuadrantFieldDtoValidator.java | 2 +- .../SetLonglineUniqueHomeIdDtoValidator.java | 2 +- .../SetLonglineUniqueNumberDtoValidator.java | 2 +- .../validators/SpeciesLengthFieldDtoValidator.java | 2 +- .../validators/SpeciesWeightFieldDtoValidator.java | 2 +- application-swing/pom.xml | 100 +++++++--- application-swing/src/main/assembly/bin.xml | 2 +- .../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 +- .../src/main/assembly/{map.xml => i18n.xml} | 18 +- application-swing/src/main/assembly/map.xml | 2 +- .../src/main/assembly/sql/v1/sql/obstuna.sql | 2 +- .../main/filters/observe-application.properties | 2 +- .../src/main/filters/observe-ui.properties | 7 +- .../application/swing/LocalDatabaseBackupTask.java | 2 +- .../application/swing/ObserveActionExecutor.java | 8 +- .../observe/application/swing/ObserveCLAction.java | 4 +- .../application/swing/ObserveOpenDataManager.java | 2 +- .../application/swing/ObserveResourceManager.java | 56 ++---- .../observe/application/swing/ObserveRunner.java | 10 +- .../swing/ObserveSwingApplicationContext.java | 6 +- .../ObserveSwingApplicationDataSourcesManager.java | 4 +- .../swing/ObserveSwingSessionHelper.java | 4 +- .../swing/ObserveSwingTechnicalException.java | 2 +- .../application/swing/ObserveTextGenerator.java | 26 ++- .../ird/observe/application/swing/RunObserve.java | 2 +- .../observe/application/swing/db/DataContext.java | 2 +- .../swing/db/ObserveSwingDataSource.java | 20 +- .../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/ObserveCommon.jcss | 36 +++- .../application/swing/ui/ObserveKeyStrokes.java | 52 +++++- .../application/swing/ui/ObserveMainUI.jaxx | 12 +- .../application/swing/ui/ObserveMainUIHandler.java | 4 +- .../swing/ui/ObserveMainUIInitializer.java | 10 +- .../application/swing/ui/ObserveMainUIModel.java | 15 +- .../application/swing/ui/ObserveUICallback.java | 2 +- .../application/swing/ui/ObserveUIMode.java | 2 +- .../ird/observe/application/swing/ui/UIHelper.java | 34 +++- .../swing/ui/actions/AbstractObserveAction.java | 2 +- .../swing/ui/actions/AbstractUIAction.java | 4 +- .../actions/content/AbstractContentUIAction.java | 2 +- .../content/AddActivityLonglineSetUIAction.java | 2 +- .../AddActivitySeineFloatingObjectUIAction.java | 2 +- .../content/AddActivitySeineSetUIAction.java | 2 +- .../content/BackToReferentialListUIAction.java | 2 +- .../ui/actions/content/CloseAndCreateUIAction.java | 2 +- .../ui/actions/content/CloseOpenUIAction.java | 2 +- .../content/CreateNewReferentialUIAction.java | 2 +- .../ui/actions/content/CreateOpenUIAction.java | 2 +- .../ui/actions/content/DeleteDataUIAction.java | 2 +- .../actions/content/DeleteReferenceUIAction.java | 2 +- .../actions/content/DeleteTableEntryUIAction.java | 2 +- .../content/EditReferentialFromListUIAction.java | 2 +- .../actions/content/EditReferentialUIAction.java | 2 +- .../swing/ui/actions/content/GoDownUIAction.java | 4 +- .../GoToSubTab1UIAction.java} | 16 +- .../GoToSubTab2UIAction.java} | 16 +- .../GoToSubTab3UIAction.java} | 16 +- .../GoToTab1UIAction.java} | 16 +- .../GoToTab2UIAction.java} | 16 +- .../GoToTab3UIAction.java} | 16 +- .../GoToTab4UIAction.java} | 16 +- .../GoToTab5UIAction.java} | 16 +- .../GoToTab6UIAction.java} | 16 +- ...enUIAction.java => GoToTabUIActionSupport.java} | 30 ++- .../swing/ui/actions/content/GoUpUIAction.java | 4 +- .../content/MoveActivityLonglinesUIAction.java | 2 +- .../content/MoveActivitySeinesUIAction.java | 2 +- .../ui/actions/content/MoveRoutesUIAction.java | 2 +- .../actions/content/MoveTripLonglinesUIAction.java | 2 +- .../ui/actions/content/MoveTripSeinesUIAction.java | 2 +- .../ui/actions/content/MoveTripsUIAction.java | 2 +- .../ui/actions/content/NewTableEntryUIAction.java | 2 +- .../swing/ui/actions/content/ReOpenUIAction.java | 2 +- .../ui/actions/content/ResetEditUIAction.java | 2 +- .../actions/content/ResetTableEntryUIAction.java | 2 +- .../swing/ui/actions/content/SaveEditUIAction.java | 2 +- .../ui/actions/content/SaveTableEntryUIAction.java | 2 +- .../ui/actions/content/SelectNodeUIAction.java | 2 +- .../ui/actions/content/SelectOpenNodeUIAction.java | 2 +- .../ui/actions/global/AbstractGlobalUIAction.java | 2 +- .../actions/global/ChangeFocusGlobalUIAction.java | 2 +- .../actions/global/DeleteDataGlobalUIAction.java | 2 +- .../actions/global/NewNextDataGlobalUIAction.java | 2 +- .../global/OpenCloseDataGlobalUIAction.java | 2 +- .../ui/actions/global/ResetDataGlobalUIAction.java | 2 +- .../ui/actions/global/SaveDataGlobalUIAction.java | 2 +- .../menu/action/LaunchAdminActionSupport.java | 2 +- .../menu/action/LaunchConsolidateAction.java | 2 +- .../menu/action/LaunchDataSynchronizeAction.java | 2 +- .../menu/action/LaunchExportDataAction.java | 2 +- .../action/LaunchReferentialSynchronizeAction.java | 2 +- .../ui/actions/menu/action/LaunchReportAction.java | 2 +- .../menu/action/LaunchSynchronizeAction.java | 2 +- .../actions/menu/action/LaunchValidateAction.java | 2 +- .../ChangeApplicationLanguageActionSupport.java | 2 +- .../ChangeApplicationLanguageToEnglishAction.java | 2 +- .../ChangeApplicationLanguageToFrenchAction.java | 2 +- .../ChangeApplicationLanguageToSpanishAction.java | 2 +- .../menu/config/ChangeDbLanguageActionSupport.java | 2 +- .../config/ChangeDbLanguageToEnglishAction.java | 2 +- .../config/ChangeDbLanguageToFrenchAction.java | 2 +- .../config/ChangeDbLanguageToSpanishAction.java | 2 +- .../config/ReloadDefaultConfigurationAction.java | 2 +- .../actions/menu/config/ReloadResourcesAction.java | 2 +- .../ui/actions/menu/config/ShowConfigAction.java | 39 +++- .../menu/config/ShowDataSourcePresetsAction.java | 2 +- .../actions/menu/file/CloseApplicationAction.java | 2 +- .../actions/menu/file/ReloadApplicationAction.java | 2 +- .../ui/actions/menu/file/ToFullScreenAction.java | 2 +- .../ui/actions/menu/file/ToWindowScreenAction.java | 2 +- .../swing/ui/actions/menu/help/GotoSiteAction.java | 2 +- .../ui/actions/menu/help/ShowAboutAction.java | 24 ++- .../actions/menu/navigation/GotoActionSupport.java | 2 +- .../menu/navigation/GotoOpenActivityAction.java | 2 +- .../menu/navigation/GotoOpenProgramAction.java | 2 +- .../menu/navigation/GotoOpenRouteAction.java | 2 +- .../actions/menu/navigation/GotoOpenSetAction.java | 2 +- .../menu/navigation/GotoOpenTripAction.java | 2 +- .../navigation/GotoReferentialCommonAction.java | 2 +- .../navigation/GotoReferentialLonglineAction.java | 2 +- .../navigation/GotoReferentialSeineAction.java | 2 +- .../actions/menu/storage/ChangeStorageAction.java | 2 +- .../actions/menu/storage/CloseStorageAction.java | 2 +- .../menu/storage/ImportStorageFromFileAction.java | 2 +- .../actions/menu/storage/ReloadStorageAction.java | 2 +- .../menu/storage/SaveStorageToFileAction.java | 2 +- .../menu/storage/ShowStorageInfoAction.java | 2 +- .../menu/storage/StartH2WebServerAction.java | 2 +- .../menu/storage/StartServerModeAction.java | 4 +- .../menu/storage/StopH2WebServerAction.java | 2 +- .../actions/menu/storage/StopServerModeAction.java | 2 +- .../SaveCurrentRemoteConfigurationUIAction.java | 2 +- .../SaveCurrentServerConfigurationUIAction.java | 2 +- .../storage/UseRemoteConfigurationUIAction.java | 2 +- .../storage/UseServerConfigurationUIAction.java | 2 +- .../swing/ui/admin/AdminActionModel.java | 4 +- .../swing/ui/admin/AdminActionWorker.java | 6 +- .../application/swing/ui/admin/AdminStep.java | 6 +- .../application/swing/ui/admin/AdminTabUI.jaxx | 8 +- .../swing/ui/admin/AdminTabUIHandler.java | 13 +- .../application/swing/ui/admin/AdminUI.jaxx | 14 +- .../application/swing/ui/admin/AdminUIHandler.java | 10 +- .../swing/ui/admin/AdminUILauncher.java | 10 +- .../application/swing/ui/admin/AdminUIModel.java | 6 +- .../swing/ui/admin/config/ConfigModel.java | 2 +- .../swing/ui/admin/config/ConfigUI.jaxx | 4 +- .../swing/ui/admin/config/ConfigUIHandler.java | 11 +- .../swing/ui/admin/config/SelectDataModel.java | 2 +- .../swing/ui/admin/config/SelectDataUI.jaxx | 4 +- .../swing/ui/admin/config/SelectDataUIHandler.java | 6 +- .../ui/admin/consolidate/ConsolidateModel.java | 4 +- .../swing/ui/admin/consolidate/ConsolidateUI.jaxx | 2 +- .../ui/admin/consolidate/ConsolidateUIHandler.java | 12 +- .../swing/ui/admin/export/ExportModel.java | 4 +- .../swing/ui/admin/export/ExportUI.jaxx | 4 +- .../swing/ui/admin/export/ExportUIHandler.java | 14 +- .../swing/ui/admin/export/TripEntry.java | 2 +- .../ui/admin/export/TripToExportTableModel.java | 2 +- .../swing/ui/admin/report/ReportConfigUI.jaxx | 2 +- .../swing/ui/admin/report/ReportModel.java | 2 +- .../swing/ui/admin/report/ReportUI.jaxx | 2 +- .../swing/ui/admin/report/ReportUIHandler.java | 38 ++-- .../swing/ui/admin/report/ResultTableModel.java | 2 +- .../swing/ui/admin/resume/ShowResumeModel.java | 2 +- .../swing/ui/admin/resume/ShowResumeUI.jaxx | 2 +- .../swing/ui/admin/resume/ShowResumeUIHandler.java | 8 +- .../swing/ui/admin/save/SaveLocalModel.java | 4 +- .../swing/ui/admin/save/SaveLocalUI.jaxx | 4 +- .../swing/ui/admin/save/SaveLocalUIHandler.java | 14 +- .../admin/synchronize/data/DataSynchroModel.java | 2 +- .../data/DataSynchroSelectionTreeCellRenderer.java | 2 +- .../ui/admin/synchronize/data/DataSynchroUI.jaxx | 4 +- .../synchronize/data/DataSynchroUIHandler.java | 8 +- .../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 | 6 +- .../referential/legacy/SynchronizeUI.jaxx | 6 +- .../referential/legacy/SynchronizeUIHandler.java | 23 ++- .../referential/ng/ReferentialReplaceUI.jaxx | 4 +- .../ng/ReferentialReplaceUIHandler.java | 6 +- .../referential/ng/ReferentialSynchroConfigUI.jaxx | 2 +- .../referential/ng/ReferentialSynchroModel.java | 2 +- .../referential/ng/ReferentialSynchroUI.jaxx | 2 +- .../ng/ReferentialSynchroUIHandler.java | 10 +- .../ng/ReferentialSynchronizeResources.java | 2 +- ...ReferentialSynchronizeTaskListCellRenderer.java | 2 +- .../ng/ReferentialSynchronizeTaskListModel.java | 2 +- .../referential/ng/action/ApplyAction.java | 4 +- .../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 | 4 +- .../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 | 2 +- .../swing/ui/admin/validate/ValidateModel.java | 4 +- .../swing/ui/admin/validate/ValidateUI.jaxx | 6 +- .../swing/ui/admin/validate/ValidateUIHandler.java | 34 ++-- .../validate/ValidationMessageTableModel.java | 8 +- .../application/swing/ui/content/ContentMode.java | 2 +- .../application/swing/ui/content/ContentUI.jaxx | 6 +- .../swing/ui/content/ContentUIBlockingLayerUI.java | 43 +++-- .../swing/ui/content/ContentUIHandler.java | 17 +- .../swing/ui/content/ContentUIInitializer.java | 204 ++++++++++----------- .../swing/ui/content/ContentUIManager.java | 8 +- .../swing/ui/content/ContentUIModel.java | 2 +- .../ui/content/DataReferenceListCellRenderer.java | 76 ++++++++ .../swing/ui/content/ObserveActionMap.java | 6 +- .../swing/ui/content/ObserveContentUI.java | 8 +- .../swing/ui/content/ObserveFocusManager.java | 40 ++-- .../ReferentialReferenceListCellRenderer.java | 92 ++++++++++ .../content/impl/longline/BasketsTableModel.java | 2 +- .../ui/content/impl/longline/BranchlineUI.jaxx | 14 +- .../ui/content/impl/longline/BranchlineUI.jcss | 9 +- .../content/impl/longline/BranchlineUIHandler.java | 14 +- .../content/impl/longline/BranchlineUIModel.java | 2 +- .../impl/longline/BranchlinesTableModel.java | 2 +- .../LonglineCompositionTableModelSupport.java | 2 +- .../impl/longline/LonglineDetailCompositionUI.jaxx | 4 +- .../LonglineDetailCompositionUIHandler.java | 27 ++- .../LonglineDetailCompositionUIInitializer.java | 5 +- .../longline/LonglineDetailCompositionUIModel.java | 2 +- ...onglineDetailCompositionUIValidationHelper.java | 10 +- ...LonglineDetailCompositionValidationContext.java | 6 +- .../LonglineDetailCompositionValidatorService.java | 6 +- .../impl/longline/LonglineGlobalCompositionUI.jaxx | 4 +- .../LonglineGlobalCompositionUIHandler.java | 4 +- .../longline/LonglineGlobalCompositionUIModel.java | 2 +- .../impl/longline/SectionTemplatesTableModel.java | 2 +- .../content/impl/longline/SectionsTableModel.java | 2 +- .../ui/content/impl/longline/SetLonglineUI.jaxx | 36 ++-- .../ui/content/impl/longline/SetLonglineUI.jcss | 44 ++--- .../impl/longline/SetLonglineUIHandler.java | 40 ++-- .../content/impl/longline/SetLonglineUIModel.java | 2 +- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 4 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 4 +- ...tingObjectTransmittingBuoyOperationUIModel.java | 2 +- .../ui/content/impl/seine/FloatingObjectUI.jaxx | 8 +- .../ui/content/impl/seine/FloatingObjectUI.jcss | 5 +- .../impl/seine/FloatingObjectUIHandler.java | 6 +- .../content/impl/seine/FloatingObjectUIModel.java | 2 +- .../swing/ui/content/impl/seine/SetSeineUI.jaxx | 22 +-- .../swing/ui/content/impl/seine/SetSeineUI.jcss | 22 +-- .../ui/content/impl/seine/SetSeineUIHandler.java | 26 +-- .../ui/content/impl/seine/SetSeineUIModel.java | 2 +- .../swing/ui/content/impl/seine/package.html | 2 +- .../swing/ui/content/list/ContentListUI.jaxx | 4 +- .../ui/content/list/ContentListUIHandler.java | 4 +- .../swing/ui/content/list/ContentListUIModel.java | 2 +- .../list/impl/longline/ActivityLonglinesUI.jaxx | 2 +- .../impl/longline/ActivityLonglinesUIHandler.java | 4 +- .../impl/longline/ActivityLonglinesUIModel.java | 2 +- .../list/impl/longline/TripLonglinesUI.jaxx | 2 +- .../list/impl/longline/TripLonglinesUIHandler.java | 4 +- .../list/impl/longline/TripLonglinesUIModel.java | 2 +- .../content/list/impl/seine/ActivitySeinesUI.jaxx | 2 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 4 +- .../list/impl/seine/ActivitySeinesUIModel.java | 2 +- .../swing/ui/content/list/impl/seine/RoutesUI.jaxx | 2 +- .../content/list/impl/seine/RoutesUIHandler.java | 4 +- .../ui/content/list/impl/seine/RoutesUIModel.java | 2 +- .../ui/content/list/impl/seine/TripSeinesUI.jaxx | 2 +- .../list/impl/seine/TripSeinesUIHandler.java | 4 +- .../content/list/impl/seine/TripSeinesUIModel.java | 2 +- .../application/swing/ui/content/list/package.html | 2 +- .../swing/ui/content/open/ContentOpenableUI.jaxx | 2 +- .../ui/content/open/ContentOpenableUIHandler.java | 2 +- .../ui/content/open/ContentOpenableUIModel.java | 2 +- .../open/impl/longline/ActivityLonglineUI.jaxx | 8 +- .../open/impl/longline/ActivityLonglineUI.jcss | 4 +- .../impl/longline/ActivityLonglineUIHandler.java | 6 +- .../impl/longline/ActivityLonglineUIModel.java | 2 +- .../content/open/impl/longline/TripLonglineUI.jaxx | 10 +- .../content/open/impl/longline/TripLonglineUI.jcss | 10 +- .../open/impl/longline/TripLonglineUIHandler.java | 10 +- .../open/impl/longline/TripLonglineUIModel.java | 2 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 14 +- .../content/open/impl/seine/ActivitySeineUI.jcss | 12 +- .../open/impl/seine/ActivitySeineUIHandler.java | 12 +- .../open/impl/seine/ActivitySeineUIModel.java | 2 +- .../swing/ui/content/open/impl/seine/RouteUI.jaxx | 8 +- .../swing/ui/content/open/impl/seine/RouteUI.jcss | 6 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 6 +- .../ui/content/open/impl/seine/RouteUIModel.java | 2 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 8 +- .../open/impl/seine/TripSeineUIHandler.java | 8 +- .../content/open/impl/seine/TripSeineUIModel.java | 2 +- .../application/swing/ui/content/package.html | 2 +- .../ui/content/ref/ContentI18nReferenceUI.jaxx | 2 +- .../swing/ui/content/ref/ContentReferenceUI.jaxx | 6 +- .../ui/content/ref/ContentReferenceUIHandler.java | 8 +- .../content/ref/ContentReferenceUIInitializer.java | 2 +- .../ui/content/ref/ContentReferenceUIModel.java | 2 +- .../ui/content/ref/ReferenceHomeCommonUI.java | 6 +- .../ui/content/ref/ReferenceHomeLonglineUI.java | 6 +- .../swing/ui/content/ref/ReferenceHomeSeineUI.java | 6 +- .../swing/ui/content/ref/ReferenceHomeUI.jaxx | 2 +- .../ui/content/ref/ReferenceHomeUIHandler.java | 4 +- .../swing/ui/content/ref/ReferenceHomeUIModel.java | 2 +- .../swing/ui/content/ref/UniqueKeyTableModel.java | 2 +- .../swing/ui/content/ref/impl/CountryUI.jaxx | 2 +- .../ui/content/ref/impl/CountryUIHandler.java | 4 +- .../swing/ui/content/ref/impl/CountryUIModel.java | 2 +- .../swing/ui/content/ref/impl/FpaZoneUI.jaxx | 2 +- .../ui/content/ref/impl/FpaZoneUIHandler.java | 4 +- .../swing/ui/content/ref/impl/FpaZoneUIModel.java | 2 +- .../content/ref/impl/GearCaracteristicTypeUI.jaxx | 2 +- .../ref/impl/GearCaracteristicTypeUIHandler.java | 4 +- .../ref/impl/GearCaracteristicTypeUIModel.java | 2 +- .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 4 +- .../ref/impl/GearCaracteristicUIHandler.java | 4 +- .../content/ref/impl/GearCaracteristicUIModel.java | 2 +- .../swing/ui/content/ref/impl/GearUI.jaxx | 4 +- .../swing/ui/content/ref/impl/GearUIHandler.java | 10 +- .../swing/ui/content/ref/impl/GearUIModel.java | 2 +- .../swing/ui/content/ref/impl/HarbourUI.jaxx | 4 +- .../ui/content/ref/impl/HarbourUIHandler.java | 4 +- .../swing/ui/content/ref/impl/HarbourUIModel.java | 2 +- .../content/ref/impl/LengthLengthParameterUI.jaxx | 8 +- .../ref/impl/LengthLengthParameterUIHandler.java | 10 +- .../ref/impl/LengthLengthParameterUIModel.java | 2 +- .../content/ref/impl/LengthWeightParameterUI.jaxx | 8 +- .../content/ref/impl/LengthWeightParameterUI.jcss | 4 +- .../ref/impl/LengthWeightParameterUIHandler.java | 10 +- .../ref/impl/LengthWeightParameterUIModel.java | 2 +- .../swing/ui/content/ref/impl/OceanUI.jaxx | 2 +- .../swing/ui/content/ref/impl/OceanUIHandler.java | 4 +- .../swing/ui/content/ref/impl/OceanUIModel.java | 2 +- .../swing/ui/content/ref/impl/OrganismUI.jaxx | 4 +- .../ui/content/ref/impl/OrganismUIHandler.java | 4 +- .../swing/ui/content/ref/impl/OrganismUIModel.java | 2 +- .../swing/ui/content/ref/impl/PersonUI.jaxx | 4 +- .../swing/ui/content/ref/impl/PersonUIHandler.java | 4 +- .../swing/ui/content/ref/impl/PersonUIModel.java | 2 +- .../content/ref/impl/ProgramObservationEnum.java | 2 +- .../swing/ui/content/ref/impl/ProgramUI.jaxx | 6 +- .../ui/content/ref/impl/ProgramUIHandler.java | 10 +- .../swing/ui/content/ref/impl/ProgramUIModel.java | 2 +- .../swing/ui/content/ref/impl/SexUI.jaxx | 2 +- .../swing/ui/content/ref/impl/SexUIHandler.java | 4 +- .../swing/ui/content/ref/impl/SexUIModel.java | 2 +- .../swing/ui/content/ref/impl/ShipOwnerUI.jaxx | 4 +- .../ui/content/ref/impl/ShipOwnerUIHandler.java | 4 +- .../ui/content/ref/impl/ShipOwnerUIModel.java | 2 +- .../ui/content/ref/impl/SizeMeasureTypeUI.jaxx | 2 +- .../content/ref/impl/SizeMeasureTypeUIHandler.java | 4 +- .../content/ref/impl/SizeMeasureTypeUIModel.java | 2 +- .../swing/ui/content/ref/impl/SpeciesGroupUI.jaxx | 4 +- .../ui/content/ref/impl/SpeciesGroupUIHandler.java | 4 +- .../ui/content/ref/impl/SpeciesGroupUIModel.java | 2 +- .../swing/ui/content/ref/impl/SpeciesListUI.jaxx | 4 +- .../ui/content/ref/impl/SpeciesListUIHandler.java | 10 +- .../ui/content/ref/impl/SpeciesListUIModel.java | 2 +- .../swing/ui/content/ref/impl/SpeciesUI.jaxx | 8 +- .../swing/ui/content/ref/impl/SpeciesUI.jcss | 8 +- .../ui/content/ref/impl/SpeciesUIHandler.java | 10 +- .../swing/ui/content/ref/impl/SpeciesUIModel.java | 2 +- .../ui/content/ref/impl/VesselSizeCategoryUI.jaxx | 2 +- .../ref/impl/VesselSizeCategoryUIHandler.java | 4 +- .../ref/impl/VesselSizeCategoryUIModel.java | 2 +- .../swing/ui/content/ref/impl/VesselTypeUI.jaxx | 2 +- .../ui/content/ref/impl/VesselTypeUIHandler.java | 4 +- .../ui/content/ref/impl/VesselTypeUIModel.java | 2 +- .../swing/ui/content/ref/impl/VesselUI.jaxx | 16 +- .../swing/ui/content/ref/impl/VesselUI.jcss | 14 +- .../swing/ui/content/ref/impl/VesselUIHandler.java | 10 +- .../swing/ui/content/ref/impl/VesselUIModel.java | 16 +- .../ui/content/ref/impl/WeightMeasureTypeUI.jaxx | 2 +- .../ref/impl/WeightMeasureTypeUIHandler.java | 4 +- .../content/ref/impl/WeightMeasureTypeUIModel.java | 2 +- .../ref/impl/longline/BaitHaulingStatusUI.jaxx | 2 +- .../impl/longline/BaitHaulingStatusUIHandler.java | 4 +- .../impl/longline/BaitHaulingStatusUIModel.java | 2 +- .../ref/impl/longline/BaitSettingStatusUI.jaxx | 2 +- .../impl/longline/BaitSettingStatusUIHandler.java | 4 +- .../impl/longline/BaitSettingStatusUIModel.java | 2 +- .../ui/content/ref/impl/longline/BaitTypeUI.jaxx | 2 +- .../ref/impl/longline/BaitTypeUIHandler.java | 4 +- .../content/ref/impl/longline/BaitTypeUIModel.java | 2 +- .../ref/impl/longline/CatchFateLonglineUI.jaxx | 2 +- .../impl/longline/CatchFateLonglineUIHandler.java | 4 +- .../impl/longline/CatchFateLonglineUIModel.java | 2 +- .../content/ref/impl/longline/EncounterTypeUI.jaxx | 2 +- .../ref/impl/longline/EncounterTypeUIHandler.java | 4 +- .../ref/impl/longline/EncounterTypeUIModel.java | 2 +- .../ui/content/ref/impl/longline/HealthnessUI.jaxx | 2 +- .../ref/impl/longline/HealthnessUIHandler.java | 4 +- .../ref/impl/longline/HealthnessUIModel.java | 2 +- .../content/ref/impl/longline/HookPositionUI.jaxx | 2 +- .../ref/impl/longline/HookPositionUIHandler.java | 4 +- .../ref/impl/longline/HookPositionUIModel.java | 2 +- .../ui/content/ref/impl/longline/HookSizeUI.jaxx | 2 +- .../ref/impl/longline/HookSizeUIHandler.java | 4 +- .../content/ref/impl/longline/HookSizeUIModel.java | 2 +- .../ui/content/ref/impl/longline/HookTypeUI.jaxx | 2 +- .../ref/impl/longline/HookTypeUIHandler.java | 4 +- .../content/ref/impl/longline/HookTypeUIModel.java | 2 +- .../impl/longline/ItemHorizontalPositionUI.jaxx | 2 +- .../longline/ItemHorizontalPositionUIHandler.java | 4 +- .../longline/ItemHorizontalPositionUIModel.java | 2 +- .../ref/impl/longline/ItemVerticalPositionUI.jaxx | 2 +- .../longline/ItemVerticalPositionUIHandler.java | 4 +- .../impl/longline/ItemVerticalPositionUIModel.java | 2 +- .../ref/impl/longline/LightsticksColorUI.jaxx | 2 +- .../impl/longline/LightsticksColorUIHandler.java | 4 +- .../ref/impl/longline/LightsticksColorUIModel.java | 2 +- .../ref/impl/longline/LightsticksTypeUI.jaxx | 2 +- .../impl/longline/LightsticksTypeUIHandler.java | 4 +- .../ref/impl/longline/LightsticksTypeUIModel.java | 2 +- .../ui/content/ref/impl/longline/LineTypeUI.jaxx | 2 +- .../ref/impl/longline/LineTypeUIHandler.java | 4 +- .../content/ref/impl/longline/LineTypeUIModel.java | 2 +- .../ref/impl/longline/MaturityStatusUI.jaxx | 2 +- .../ref/impl/longline/MaturityStatusUIHandler.java | 4 +- .../ref/impl/longline/MaturityStatusUIModel.java | 2 +- .../ref/impl/longline/MitigationTypeUI.jaxx | 2 +- .../ref/impl/longline/MitigationTypeUIHandler.java | 4 +- .../ref/impl/longline/MitigationTypeUIModel.java | 2 +- .../content/ref/impl/longline/SensorBrandUI.jaxx | 2 +- .../ref/impl/longline/SensorBrandUIHandler.java | 4 +- .../ref/impl/longline/SensorBrandUIModel.java | 2 +- .../ref/impl/longline/SensorDataFormatUI.jaxx | 2 +- .../impl/longline/SensorDataFormatUIHandler.java | 4 +- .../ref/impl/longline/SensorDataFormatUIModel.java | 2 +- .../ui/content/ref/impl/longline/SensorTypeUI.jaxx | 2 +- .../ref/impl/longline/SensorTypeUIHandler.java | 4 +- .../ref/impl/longline/SensorTypeUIModel.java | 2 +- .../content/ref/impl/longline/SettingShapeUI.jaxx | 2 +- .../ref/impl/longline/SettingShapeUIHandler.java | 4 +- .../ref/impl/longline/SettingShapeUIModel.java | 2 +- .../ref/impl/longline/StomacFullnessUI.jaxx | 2 +- .../ref/impl/longline/StomacFullnessUIHandler.java | 4 +- .../ref/impl/longline/StomacFullnessUIModel.java | 2 +- .../ui/content/ref/impl/longline/TripTypeUI.jaxx | 2 +- .../ref/impl/longline/TripTypeUIHandler.java | 4 +- .../content/ref/impl/longline/TripTypeUIModel.java | 2 +- .../impl/longline/VesselActivityLonglineUI.jaxx | 2 +- .../longline/VesselActivityLonglineUIHandler.java | 4 +- .../longline/VesselActivityLonglineUIModel.java | 2 +- .../ui/content/ref/impl/seine/DetectionModeUI.jaxx | 2 +- .../ref/impl/seine/DetectionModeUIHandler.java | 4 +- .../ref/impl/seine/DetectionModeUIModel.java | 2 +- .../ui/content/ref/impl/seine/ObjectFateUI.jaxx | 2 +- .../ref/impl/seine/ObjectFateUIHandler.java | 4 +- .../content/ref/impl/seine/ObjectFateUIModel.java | 2 +- .../content/ref/impl/seine/ObjectOperationUI.jaxx | 2 +- .../ref/impl/seine/ObjectOperationUIHandler.java | 4 +- .../ref/impl/seine/ObjectOperationUIModel.java | 2 +- .../ui/content/ref/impl/seine/ObjectTypeUI.jaxx | 2 +- .../ref/impl/seine/ObjectTypeUIHandler.java | 4 +- .../content/ref/impl/seine/ObjectTypeUIModel.java | 2 +- .../content/ref/impl/seine/ObservedSystemUI.jaxx | 2 +- .../ref/impl/seine/ObservedSystemUIHandler.java | 4 +- .../ref/impl/seine/ObservedSystemUIModel.java | 2 +- .../content/ref/impl/seine/ReasonForDiscardUI.jaxx | 2 +- .../ref/impl/seine/ReasonForDiscardUIHandler.java | 4 +- .../ref/impl/seine/ReasonForDiscardUIModel.java | 2 +- .../ref/impl/seine/ReasonForNoFishingUI.jaxx | 2 +- .../impl/seine/ReasonForNoFishingUIHandler.java | 4 +- .../ref/impl/seine/ReasonForNoFishingUIModel.java | 2 +- .../content/ref/impl/seine/ReasonForNullSetUI.jaxx | 2 +- .../ref/impl/seine/ReasonForNullSetUIHandler.java | 4 +- .../ref/impl/seine/ReasonForNullSetUIModel.java | 2 +- .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx | 2 +- .../ref/impl/seine/SpeciesFateUIHandler.java | 4 +- .../content/ref/impl/seine/SpeciesFateUIModel.java | 2 +- .../ui/content/ref/impl/seine/SpeciesStatusUI.jaxx | 2 +- .../ref/impl/seine/SpeciesStatusUIHandler.java | 4 +- .../ref/impl/seine/SpeciesStatusUIModel.java | 2 +- .../ref/impl/seine/SurroundingActivityUI.jaxx | 2 +- .../impl/seine/SurroundingActivityUIHandler.java | 4 +- .../ref/impl/seine/SurroundingActivityUIModel.java | 2 +- .../impl/seine/TransmittingBuoyOperationUI.jaxx | 2 +- .../seine/TransmittingBuoyOperationUIHandler.java | 4 +- .../seine/TransmittingBuoyOperationUIModel.java | 2 +- .../ref/impl/seine/TransmittingBuoyTypeUI.jaxx | 2 +- .../impl/seine/TransmittingBuoyTypeUIHandler.java | 4 +- .../impl/seine/TransmittingBuoyTypeUIModel.java | 2 +- .../ref/impl/seine/VesselActivitySeineUI.jaxx | 2 +- .../impl/seine/VesselActivitySeineUIHandler.java | 4 +- .../ref/impl/seine/VesselActivitySeineUIModel.java | 2 +- .../content/ref/impl/seine/WeightCategoryUI.jaxx | 4 +- .../ref/impl/seine/WeightCategoryUIHandler.java | 4 +- .../ref/impl/seine/WeightCategoryUIModel.java | 2 +- .../swing/ui/content/ref/impl/seine/WindUI.jaxx | 2 +- .../ui/content/ref/impl/seine/WindUIHandler.java | 4 +- .../ui/content/ref/impl/seine/WindUIModel.java | 2 +- .../application/swing/ui/content/ref/package.html | 2 +- .../ui/content/ref/usage/UsageForDeleteUI.jaxx | 6 +- .../content/ref/usage/UsageForDeleteUIHandler.java | 4 +- .../content/ref/usage/UsageForDesactivateUI.jaxx | 6 +- .../ref/usage/UsageForDesactivateUIHandler.java | 4 +- .../ui/content/ref/usage/UsageForDisplayUI.jaxx | 4 +- .../ref/usage/UsageForDisplayUIHandler.java | 4 +- .../content/ref/usage/UsageUIHandlerSupport.java | 8 +- .../swing/ui/content/table/ContentTableMeta.java | 2 +- .../swing/ui/content/table/ContentTableModel.java | 4 +- .../swing/ui/content/table/ContentTableUI.jaxx | 6 +- .../ui/content/table/ContentTableUIHandler.java | 2 +- .../content/table/ContentTableUIInitializer.java | 21 +-- .../ui/content/table/ContentTableUIModel.java | 2 +- .../ui/content/table/ObserveContentTableUI.java | 6 +- .../impl/GearUseFeatureMeasurementCellEditor.java | 2 +- .../GearUseFeatureMeasurementCellRenderer.java | 2 +- .../table/impl/longline/BaitsCompositionUI.jaxx | 12 +- .../table/impl/longline/BaitsCompositionUI.jcss | 9 +- .../impl/longline/BaitsCompositionUIHandler.java | 4 +- .../impl/longline/BaitsCompositionUIModel.java | 2 +- .../impl/longline/BranchlinesCompositionUI.jaxx | 12 +- .../impl/longline/BranchlinesCompositionUI.jcss | 9 +- .../longline/BranchlinesCompositionUIHandler.java | 4 +- .../longline/BranchlinesCompositionUIModel.java | 2 +- .../impl/longline/CatchAcquisitionModeEnum.java | 2 +- .../CatchLonglineContentTableUIInitializer.java | 6 +- .../impl/longline/CatchLonglineTableModel.java | 2 +- .../table/impl/longline/CatchLonglineUI.jaxx | 16 +- .../table/impl/longline/CatchLonglineUI.jcss | 12 +- .../impl/longline/CatchLonglineUIHandler.java | 18 +- .../table/impl/longline/CatchLonglineUIModel.java | 2 +- .../content/table/impl/longline/EncounterUI.jaxx | 10 +- .../content/table/impl/longline/EncounterUI.jcss | 6 +- .../table/impl/longline/EncounterUIHandler.java | 4 +- .../table/impl/longline/EncounterUIModel.java | 2 +- .../impl/longline/FloatlinesCompositionUI.jaxx | 10 +- .../impl/longline/FloatlinesCompositionUI.jcss | 6 +- .../longline/FloatlinesCompositionUIHandler.java | 4 +- .../longline/FloatlinesCompositionUIModel.java | 2 +- .../GearUseFeaturesLonglineTableModel.java | 2 +- .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 10 +- .../impl/longline/GearUseFeaturesLonglineUI.jcss | 3 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 15 +- .../longline/GearUseFeaturesLonglineUIModel.java | 2 +- ...rUseFeaturesMeasurementLonglinesTableModel.java | 2 +- .../table/impl/longline/HooksCompositionUI.jaxx | 10 +- .../table/impl/longline/HooksCompositionUI.jcss | 6 +- .../impl/longline/HooksCompositionUIHandler.java | 4 +- .../impl/longline/HooksCompositionUIModel.java | 2 +- .../impl/longline/LonglinePositionHelper.java | 4 +- .../content/table/impl/longline/SensorUsedUI.jaxx | 4 +- .../table/impl/longline/SensorUsedUIHandler.java | 6 +- .../table/impl/longline/SensorUsedUIModel.java | 2 +- .../impl/longline/SizeMeasuresTableModel.java | 2 +- .../ui/content/table/impl/longline/TdrUI.jaxx | 12 +- .../ui/content/table/impl/longline/TdrUI.jcss | 22 +-- .../content/table/impl/longline/TdrUIHandler.java | 16 +- .../ui/content/table/impl/longline/TdrUIModel.java | 2 +- .../impl/longline/WeightMeasuresTableModel.java | 2 +- .../content/table/impl/seine/AbstractSampleUI.jcss | 7 +- .../table/impl/seine/AbstractSampleUIHandler.java | 2 +- .../content/table/impl/seine/CodeMesureEnum.java | 2 +- ...GearUseFeaturesMeasurementSeinesTableModel.java | 2 +- .../impl/seine/GearUseFeaturesSeineTableModel.java | 2 +- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 10 +- .../table/impl/seine/GearUseFeaturesSeineUI.jcss | 3 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 15 +- .../impl/seine/GearUseFeaturesSeineUIModel.java | 2 +- .../impl/seine/ModeSaisieEchantillonEnum.java | 2 +- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 14 +- .../content/table/impl/seine/NonTargetCatchUI.jcss | 13 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 4 +- .../table/impl/seine/NonTargetCatchUIModel.java | 2 +- .../table/impl/seine/NonTargetSampleUI.jaxx | 12 +- .../table/impl/seine/NonTargetSampleUI.jcss | 3 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 4 +- .../table/impl/seine/NonTargetSampleUIModel.java | 2 +- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 8 +- .../table/impl/seine/ObjectObservedSpeciesUI.jcss | 3 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 4 +- .../impl/seine/ObjectObservedSpeciesUIModel.java | 2 +- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 8 +- .../table/impl/seine/ObjectSchoolEstimateUI.jcss | 3 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 4 +- .../impl/seine/ObjectSchoolEstimateUIModel.java | 2 +- .../content/table/impl/seine/SchoolEstimateUI.jaxx | 10 +- .../content/table/impl/seine/SchoolEstimateUI.jcss | 6 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 4 +- .../table/impl/seine/SchoolEstimateUIModel.java | 2 +- .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 8 +- .../ui/content/table/impl/seine/TargetCatchUI.jcss | 4 +- .../table/impl/seine/TargetCatchUIHandler.java | 6 +- .../table/impl/seine/TargetCatchUIModel.java | 2 +- .../table/impl/seine/TargetDiscardCatchUI.jaxx | 8 +- .../table/impl/seine/TargetDiscardCatchUI.jcss | 4 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 6 +- .../impl/seine/TargetDiscardCatchUIModel.java | 2 +- .../table/impl/seine/TargetSampleCaptureUI.jaxx | 2 +- .../impl/seine/TargetSampleCaptureUIHandler.java | 4 +- .../table/impl/seine/TargetSampleRejeteUI.jaxx | 2 +- .../impl/seine/TargetSampleRejeteUIHandler.java | 4 +- .../content/table/impl/seine/TargetSampleUI.jaxx | 12 +- .../content/table/impl/seine/TargetSampleUI.jcss | 3 +- .../table/impl/seine/TargetSampleUIHandler.java | 2 +- .../table/impl/seine/TargetSampleUIModel.java | 2 +- .../swing/ui/content/table/package.html | 2 +- .../ird/observe/application/swing/ui/package.html | 2 +- .../swing/ui/storage/ObstunaAdminAction.java | 4 +- .../swing/ui/storage/RemoteUILauncher.java | 4 +- .../swing/ui/storage/StorageBackupUILauncher.java | 4 +- .../application/swing/ui/storage/StorageStep.java | 4 +- .../application/swing/ui/storage/StorageUI.jaxx | 6 +- .../swing/ui/storage/StorageUIHandler.java | 16 +- .../swing/ui/storage/StorageUILauncher.java | 107 +---------- .../swing/ui/storage/StorageUIModel.java | 8 +- .../application/swing/ui/storage/package.html | 2 +- .../swing/ui/storage/presets/RemotePresetsUI.jaxx | 4 +- .../ui/storage/presets/RemotePresetsUIHandler.java | 6 +- .../ui/storage/presets/RemotePresetsUIModel.java | 2 +- .../swing/ui/storage/tabs/BackupUI.jaxx | 2 +- .../swing/ui/storage/tabs/BackupUIHandler.java | 4 +- .../swing/ui/storage/tabs/ChooseDbModeUI.jaxx | 2 +- .../ui/storage/tabs/ChooseDbModeUIHandler.java | 4 +- .../swing/ui/storage/tabs/ConfigDataUI.jaxx | 2 +- .../swing/ui/storage/tabs/ConfigDataUIHandler.java | 4 +- .../swing/ui/storage/tabs/ConfigReferentielUI.jaxx | 2 +- .../storage/tabs/ConfigReferentielUIHandler.java | 4 +- .../swing/ui/storage/tabs/ConfigUI.jaxx | 2 +- .../swing/ui/storage/tabs/ConfigUIHandler.java | 4 +- .../swing/ui/storage/tabs/ConfirmUI.jaxx | 2 +- .../swing/ui/storage/tabs/ConfirmUIHandler.java | 4 +- .../swing/ui/storage/tabs/RolesTableModel.java | 2 +- .../application/swing/ui/storage/tabs/RolesUI.jaxx | 2 +- .../swing/ui/storage/tabs/RolesUIHandler.java | 6 +- .../swing/ui/storage/tabs/SecurityModel.java | 2 +- .../swing/ui/storage/tabs/SelectDataUI.jaxx | 2 +- .../swing/ui/storage/tabs/SelectDataUIHandler.java | 4 +- .../swing/ui/storage/tabs/StorageTabUI.jaxx | 4 +- .../swing/ui/storage/tabs/StorageTabUIHandler.java | 4 +- .../application/swing/ui/storage/tabs/package.html | 2 +- .../tree/ObserveNavigationTreeShowPopupAction.java | 6 +- .../swing/ui/tree/ObserveTreeNodeSupport.java | 2 +- .../actions/ChangeActivityRouteActionListener.java | 2 +- .../actions/ChangeActivityTripActionListener.java | 2 +- .../actions/ChangeRouteTripActionListener.java | 2 +- .../actions/ChangeTripProgramActionListener.java | 2 +- .../ui/tree/actions/NodeChangeActionListener.java | 2 +- .../MoveActivityLonglineNodeMenuPopulator.java | 2 +- .../menu/MoveActivitySeineNodeMenuPopulator.java | 2 +- .../swing/ui/tree/menu/MoveNodeMenuPopulator.java | 2 +- .../ui/tree/menu/MoveRouteNodeMenuPopulator.java | 2 +- .../menu/MoveTripLonglineNodeMenuPopulator.java | 2 +- .../tree/menu/MoveTripSeineNodeMenuPopulator.java | 2 +- .../swing/ui/tree/navigation/NavigationTree.java | 2 +- .../navigation/NavigationTreeCellRenderer.java | 2 +- .../ui/tree/navigation/NavigationTreeHeader.jaxx | 2 +- .../navigation/NavigationTreeHeaderHandler.java | 4 +- .../ui/tree/navigation/NavigationTreeModel.java | 2 +- .../navigation/nodes/ClassNavigationTreeNode.java | 2 +- .../nodes/NavigationTreeNodeSupport.java | 4 +- .../nodes/ReferenceNavigationTreeNodeSupport.java | 2 +- .../navigation/nodes/RootNavigationTreeNode.java | 2 +- .../nodes/StringNavigationTreeNodeSupport.java | 2 +- .../tree/navigation/nodes/WithChildsToReload.java | 2 +- .../ActivitiesLonglineNavigationTreeNode.java | 2 +- .../ActivityLonglineNavigationTreeNode.java | 2 +- .../longline/CatchLonglineNavigationTreeNode.java | 2 +- .../EncounterLonglineNavigationTreeNode.java | 2 +- .../GearUseFeaturesLonglineNavigationTreeNode.java | 2 +- .../ProgramLonglineNavigationTreeNode.java | 2 +- .../SensorUsedLonglineNavigationTreeNode.java | 2 +- ...etailCompositionLonglineNavigationTreeNode.java | 2 +- ...lobalCompositionLonglineNavigationTreeNode.java | 2 +- .../longline/SetLonglineNavigationTreeNode.java | 2 +- .../longline/TdrLonglineNavigationTreeNode.java | 2 +- .../longline/TripLonglineNavigationTreeNode.java | 2 +- .../referential/ReferentialNavigationTreeNode.java | 2 +- .../ReferentialsCommonNavigationTreeNode.java | 2 +- .../ReferentialsLonglineNavigationTreeNode.java | 2 +- .../ReferentialsNavigationTreeNodeSupport.java | 2 +- .../ReferentialsSeineNavigationTreeNode.java | 2 +- .../seine/ActivitiesSeineNavigationTreeNode.java | 2 +- .../seine/ActivitySeineNavigationTreeNode.java | 2 +- ...cardedTargetCatchesSeineNavigationTreeNode.java | 2 +- ...cardedTargetSamplesSeineNavigationTreeNode.java | 2 +- .../FloatingObjectSeineNavigationTreeNode.java | 2 +- ...ngObjectTransmittingBuoyNavigationTreeNode.java | 2 +- .../GearUseFeaturesSeineNavigationTreeNode.java | 2 +- .../KeptTargetCatchesSeineNavigationTreeNode.java | 2 +- .../KeptTargetSamplesSeineNavigationTreeNode.java | 2 +- .../NonTargetCatchesSeineNavigationTreeNode.java | 2 +- .../NoneTargetSamplesSeineNavigationTreeNode.java | 2 +- .../ObjectObservedSpeciesNavigationTreeNode.java | 2 +- .../ObjectSchoolEstimateNavigationTreeNode.java | 2 +- .../seine/ProgramSeineNavigationTreeNode.java | 2 +- .../nodes/seine/RouteSeineNavigationTreeNode.java | 2 +- .../nodes/seine/RoutesSeineNavigationTreeNode.java | 2 +- .../SchoolEstimatesSeineNavigationTreeNode.java | 2 +- .../nodes/seine/SetSeineNavigationTreeNode.java | 2 +- .../nodes/seine/TripSeineNavigationTreeNode.java | 2 +- .../swing/ui/tree/selection/SelectionTree.java | 2 +- .../tree/selection/SelectionTreeCellRenderer.java | 2 +- .../ui/tree/selection/SelectionTreeHeader.jaxx | 2 +- .../tree/selection/SelectionTreeHeaderHandler.java | 4 +- .../ui/tree/selection/SelectionTreeModel.java | 2 +- .../selection/nodes/ProgramSelectionTreeNode.java | 2 +- .../nodes/ReferenceSelectionTreeNodeSupport.java | 2 +- .../nodes/ReferentialSelectionTreeNode.java | 2 +- .../nodes/ReferentialsSelectionTreeNode.java | 2 +- .../selection/nodes/RootSelectionTreeNode.java | 2 +- .../selection/nodes/SelectionTreeNodeSupport.java | 2 +- .../nodes/TripLonglineSelectionTreeNode.java | 2 +- .../nodes/TripSeineSelectionTreeNode.java | 2 +- .../nodes/TripSelectionTreeNodeSupport.java | 2 +- .../application/swing/ui/util/BooleanEditor.java | 2 +- .../swing/ui/util/DecoratedNodeEntity.java | 2 +- .../application/swing/ui/util/FloatConverter.java | 2 +- .../application/swing/ui/util/JComment.jaxx | 2 +- .../swing/ui/util/JVetoableTabbedPane.java | 2 +- .../ObserveSwingValidatorMessageTableModel.java | 6 +- .../ObserveValidationMessageTableRenderer.java | 4 +- .../util/ObserveValidatorMessageTableRenderer.java | 8 +- .../application/swing/ui/util/ProgressModel.java | 2 +- .../application/swing/ui/util/SpringUtilities.java | 2 +- .../ui/util/table/AbstractSelectTableAction.java | 4 +- .../AutotSelectRowAndShowPopupActionSupport.java | 2 +- .../swing/ui/util/table/EditableList.java | 2 +- .../ui/util/table/EditableTableModelSupport.java | 4 +- .../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 | 4 +- .../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 | 2 +- .../swing/ui/util/tripMap/TripMapUIHandler.java | 4 +- .../swing/validation/ObserveSwingValidator.java | 6 +- .../swing/validation/ValidationContext.java | 2 +- .../swing/validation/ValidationModelMode.java | 2 +- .../map/shapeFiles/zee/World_EEZ_v8_2014.shp.xml | 2 +- application-swing/src/main/map/style.xml | 2 +- .../src/main/resources/ftl/about_en.ftl | 54 ++++++ .../src/main/resources/ftl/about_es.ftl | 54 ++++++ .../src/main/resources/ftl/about_fr.ftl | 54 ++++++ .../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 | 2 +- .../ftl/dataSourceConnectionReport_es.ftl | 2 +- .../ftl/dataSourceConnectionReport_fr.ftl | 2 +- .../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 +- .../src/main/resources/ftl/translate_en.ftl | 45 +++++ .../src/main/resources/ftl/translate_es.ftl | 45 +++++ .../src/main/resources/ftl/translate_fr.ftl | 45 +++++ .../i18n/application-swing_en_GB.properties | 2 - .../i18n/application-swing_es_ES.properties | 2 - .../i18n/application-swing_fr_FR.properties | 2 - ...glineDetailCompositionValidatorServiceTest.java | 6 +- .../src/test/resources/log4j.properties | 2 +- application-web-configuration/pom.xml | 35 +++- .../src/main/config/ObserveWebApplication.ini | 6 + .../configuration/ObserveWebApplicationConfig.java | 2 +- .../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 +- .../application-web-configuration_en_GB.properties | 1 + .../application-web-configuration_es_ES.properties | 1 + .../application-web-configuration_fr_FR.properties | 1 + .../src/main/resources/log4j.properties | 2 +- .../src/main/resources/validators.xml | 2 +- application-web/pom.xml | 26 ++- 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 | 6 +- .../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 +- .../ConsolidateDataServiceController.java | 2 +- .../v1/actions/report/ReportServiceController.java | 2 +- ...eferentialSynchronizeDiffServiceController.java | 2 +- ...ferentialSynchronizeLocalServiceController.java | 2 +- .../ReferentialSynchronizeServiceController.java | 2 +- .../validate/ValidateServiceController.java | 2 +- .../v1/data/NavigationServiceController.java | 2 +- .../v1/data/TripManagementServiceController.java | 2 +- ...ActivityLongLineEncounterServiceController.java | 2 +- ...ctivityLongLineSensorUsedServiceController.java | 2 +- .../ActivityLonglineServiceController.java | 2 +- .../data/longline/BranchlineServiceController.java | 2 +- .../SetLonglineCatchServiceController.java | 2 +- ...LonglineDetailCompositionServiceController.java | 2 +- ...LonglineGlobalCompositionServiceController.java | 2 +- .../longline/SetLonglineServiceController.java | 2 +- .../v1/data/longline/TdrServiceController.java | 2 +- .../TripLonglineGearUseServiceController.java | 2 +- .../longline/TripLonglineServiceController.java | 2 +- .../data/seine/ActivitySeineServiceController.java | 2 +- .../seine/FloatingObjectServiceController.java | 2 +- .../seine/NonTargetCatchServiceController.java | 2 +- .../seine/NonTargetSampleServiceController.java | 2 +- .../ObjectObservedSpeciesServiceController.java | 2 +- .../ObjectSchoolEstimateServiceController.java | 2 +- .../v1/data/seine/RouteServiceController.java | 2 +- .../seine/SchoolEstimateServiceController.java | 2 +- .../v1/data/seine/SetSeineServiceController.java | 2 +- .../data/seine/TargetCatchServiceController.java | 2 +- .../data/seine/TargetSampleServiceController.java | 2 +- ...TransmittingBuoyOperationServiceController.java | 2 +- .../seine/TripSeineGearUseServiceController.java | 2 +- .../v1/data/seine/TripSeineServiceController.java | 2 +- .../referential/ReferentialServiceController.java | 2 +- .../v1/sql/SqlScriptProducerServiceController.java | 2 +- .../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 | 2 +- .../injector/SqlScriptProducerRequestInjector.java | 2 +- .../web/request/ObserveWebRequestContext.java | 8 +- .../ObserveWebSecurityApplicationContext.java | 5 +- ...ObserveWebSecurityAuthenticationTokenCache.java | 2 +- application-web/src/main/webapp/WEB-INF/web.xml | 2 +- .../db/ObserveWebDatabasesHelperTest.java | 2 +- .../user/ObserveWebUsersHelperTest.java | 2 +- common/pom.xml | 26 ++- .../fr/ird/observe/common/CoordinateHelper.java | 2 +- .../java/fr/ird/observe/common/FormulaHelper.java | 2 +- .../main/java/fr/ird/observe/common/GPSPoint.java | 2 +- .../java/fr/ird/observe/common/ObserveUtil.java | 2 +- .../java/fr/ird/observe/common/TripMapPoint.java | 2 +- .../java/fr/ird/observe/common/WithFormula.java | 2 +- .../fr/ird/observe/common/constants/GearType.java | 2 +- .../observe/common/constants/ReferenceStatus.java | 2 +- .../observe/common/constants/TripMapPointType.java | 2 +- .../seine/NonTargetCatchComputedValueSource.java | 2 +- .../observe/common/constants/seine/Ownership.java | 2 +- .../observe/common/constants/seine/SchoolType.java | 2 +- .../seine/TypeTransmittingBuoyOperation.java | 2 +- .../fr/ird/observe/common/FormulaHelperTest.java | 2 +- .../fr/ird/observe/common/RelationRegexTest.java | 2 +- .../java/fr/ird/observe/common/ScriptTest.java | 2 +- common/src/test/resources/log4j.properties | 2 +- persistence/pom.xml | 20 +- .../java/fr/ird/observe/entities/Activity.java | 2 +- .../java/fr/ird/observe/entities/EntityMap.java | 2 +- .../observe/entities/LastUpdateDateTopiaDao.java | 2 +- .../observe/entities/LengthWeightComputable.java | 2 +- .../java/fr/ird/observe/entities/ObserveSet.java | 2 +- .../main/java/fr/ird/observe/entities/Trip.java | 2 +- .../entities/longline/ActivityLonglineImpl.java | 2 +- .../longline/ActivityLonglineTopiaDao.java | 2 +- .../entities/longline/ActivityLonglines.java | 2 +- .../observe/entities/longline/BasketTopiaDao.java | 2 +- .../observe/entities/longline/BranchlineImpl.java | 2 +- .../entities/longline/BranchlineTopiaDao.java | 2 +- .../longline/GearUseFeaturesLonglineImpl.java | 2 +- .../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 +- .../observe/entities/longline/SetLonglineImpl.java | 2 +- .../fr/ird/observe/entities/longline/TdrImpl.java | 2 +- .../entities/longline/TripLonglineImpl.java | 2 +- .../entities/longline/TripLonglineTopiaDao.java | 2 +- .../observe/entities/longline/TripLonglines.java | 2 +- .../DuplicateLengthWeightParameterException.java | 2 +- .../entities/referentiel/FormulaSupportImpl.java | 2 +- .../observe/entities/referentiel/HarbourImpl.java | 2 +- .../referentiel/I18nReferenceEntities.java | 2 +- .../referentiel/LengthLengthParameterImpl.java | 2 +- .../referentiel/LengthLengthParameterTopiaDao.java | 2 +- .../referentiel/LengthLengthParameters.java | 2 +- .../referentiel/LengthWeightParameterImpl.java | 2 +- .../LengthWeightParameterNotFoundException.java | 2 +- .../referentiel/LengthWeightParameters.java | 2 +- .../referentiel/ObserveReferentialEntityImpl.java | 2 +- .../observe/entities/referentiel/ProgramImpl.java | 2 +- .../ird/observe/entities/referentiel/Species2.java | 2 +- .../observe/entities/referentiel/SpeciesImpl.java | 2 +- .../observe/entities/referentiel/VesselImpl.java | 2 +- .../observe/entities/seine/ActivitySeineImpl.java | 2 +- .../entities/seine/ActivitySeineTopiaDao.java | 2 +- .../ird/observe/entities/seine/ActivitySeines.java | 2 +- .../observe/entities/seine/FloatingObjectImpl.java | 2 +- .../entities/seine/FloatingObjectTopiaDao.java | 2 +- .../entities/seine/GearUseFeaturesSeineImpl.java | 2 +- .../observe/entities/seine/NonTargetCatchImpl.java | 2 +- .../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 | 2 +- .../observe/entities/seine/TargetCatchImpl.java | 2 +- .../ird/observe/entities/seine/TargetCatchs.java | 2 +- .../observe/entities/seine/TargetLengthImpl.java | 2 +- .../ird/observe/entities/seine/TripSeineImpl.java | 2 +- .../observe/entities/seine/TripSeineTopiaDao.java | 2 +- .../fr/ird/observe/entities/seine/TripSeines.java | 2 +- .../persistence/AbstractObserveTopiaDao.java | 2 +- .../java/fr/ird/observe/persistence/Entities.java | 2 +- .../ObserveTopiaApplicationContext.java | 2 +- .../persistence/ObserveTopiaConfiguration.java | 2 +- .../ObserveTopiaConfigurationFactory.java | 2 +- .../observe/persistence/ObserveTopiaIdFactory.java | 2 +- .../ObserveTopiaPersistenceContext.java | 2 +- .../observe/persistence/RunScriptTopiaSqlWork.java | 2 +- .../persistence/RunScriptsTopiaSqlWork.java | 2 +- .../migration/AbstractDataSourceMigration.java | 2 +- .../AbstractObserveMigrationCallBack.java | 2 +- .../DataSourceMigrationForVersion_5_0.java | 2 +- .../DataSourceMigrationForVersion_6_0.java | 2 +- .../migration/H2DataSourceMigration.java | 88 ++++----- .../persistence/migration/MigrationVersion.java | 2 +- ...ObserveMigrationCallBackForVersionResolver.java | 2 +- .../ObserveMigrationConfigurationProvider.java | 2 +- .../migration/ObserveMigrationEngine.java | 2 +- .../migration/PGDataSourceMigration.java | 199 ++++++++++---------- .../old/DataSourceMigrationForVersion_3_1.java | 2 +- .../old/DataSourceMigrationForVersion_3_10.java | 2 +- .../old/DataSourceMigrationForVersion_3_11.java | 2 +- .../old/DataSourceMigrationForVersion_3_12.java | 2 +- .../old/DataSourceMigrationForVersion_3_14.java | 2 +- .../old/DataSourceMigrationForVersion_3_15.java | 2 +- .../old/DataSourceMigrationForVersion_3_16.java | 2 +- .../old/DataSourceMigrationForVersion_3_5.java | 2 +- .../old/DataSourceMigrationForVersion_3_7.java | 2 +- .../old/DataSourceMigrationForVersion_3_8.java | 2 +- .../old/DataSourceMigrationForVersion_3_9.java | 2 +- .../old/DataSourceMigrationForVersion_4_0.java | 2 +- .../old/DataSourceMigrationForVersion_4_0_1.java | 2 +- .../old/DataSourceMigrationForVersion_4_0_2.java | 2 +- .../old/DataSourceMigrationForVersion_4_0_4.java | 2 +- .../old/DataSourceMigrationForVersion_4_0_RC2.java | 2 +- .../old/DataSourceMigrationForVersion_4_0_RC3.java | 2 +- .../old/DataSourceMigrationForVersion_4_0_RC4.java | 2 +- .../old/DataSourceMigrationForVersion_4_0_RC6.java | 2 +- .../old/DataSourceMigrationForVersion_4_0_RC7.java | 2 +- .../db/migration/5.0/01_remove_open_field-H2.sql | 2 +- .../db/migration/5.0/01_remove_open_field-PG.sql | 2 +- .../5.0/02_add_lastUpdateDate_field-H2.sql | 2 +- .../5.0/02_add_lastUpdateDate_field-PG.sql | 2 +- .../5.0/03_add_lastUpdateDate_table-H2.sql | 2 +- .../5.0/03_add_lastUpdateDate_table-PG.sql | 2 +- .../db/migration/5.0/04_remove_unit_field-H2.sql | 2 +- .../db/migration/5.0/04_remove_unit_field-PG.sql | 2 +- .../db/migration/5.0/05_remove_gender_field-H2.sql | 2 +- .../db/migration/5.0/05_remove_gender_field-PG.sql | 2 +- .../migration/5.0/06_remove_duplicate_rows-H2.sql | 2 +- .../migration/5.0/06_remove_duplicate_rows-PG.sql | 2 +- ...drop_not_null_constraint_gearUseFeatures-H2.sql | 2 +- ...drop_not_null_constraint_gearUseFeatures-PG.sql | 2 +- ...p_not_null_constraint_hauling_identifier-H2.sql | 2 +- ...p_not_null_constraint_hauling_identifier-PG.sql | 2 +- .../5.0/09_add_non_target_length_sex_fk-H2.sql | 2 +- .../5.0/09_add_non_target_length_sex_fk-PG.sql | 2 +- .../6.0/01_evol_8374_delete_sonarUsed-H2.sql | 2 +- .../6.0/01_evol_8374_delete_sonarUsed-PG.sql | 2 +- .../6.0/02_evol_7886_catch_add_set_idx-H2.sql | 2 +- .../6.0/02_evol_7886_catch_add_set_idx-PG.sql | 2 +- .../03_evol_6997_delete_supportVesselName-H2.sql | 2 +- .../03_evol_6997_delete_supportVesselName-PG.sql | 2 +- ...ranchlineComposition_add_tracelineLength-H2.sql | 2 +- ...ranchlineComposition_add_tracelineLength-PG.sql | 2 +- .../05_evol_6999_nonTargetCatch_add_well-H2.sql | 2 +- .../05_evol_6999_nonTargetCatch_add_well-PG.sql | 2 +- .../6.0/06_evol_8375_setSeine_add_booleans-H2.sql | 2 +- .../6.0/06_evol_8375_setSeine_add_booleans-PG.sql | 2 +- .../6.0/07_evol_8389_rename_source_columns-H2.sql | 2 +- .../6.0/07_evol_8389_rename_source_columns-PG.sql | 2 +- .../6.0/08_1_evol_8390_measure_type-H2.sql | 2 +- .../6.0/08_1_evol_8390_measure_type-PG.sql | 2 +- .../migration/6.0/08_evol_8390_measure_type-H2.sql | 2 +- .../migration/6.0/08_evol_8390_measure_type-PG.sql | 2 +- .../6.0/09_evol_7877_targetLength_add_sex-H2.sql | 2 +- .../6.0/09_evol_7877_targetLength_add_sex-PG.sql | 2 +- ...10_evol_8391_species_add_sizeMeasureType-H2.sql | 2 +- ...10_evol_8391_species_add_sizeMeasureType-PG.sql | 2 +- .../6.0/11_evol_8571_length_add_tagNumber-H2.sql | 2 +- .../6.0/11_evol_8571_length_add_tagNumber-PG.sql | 2 +- .../6.0/12_evol_8475_vessel_add_fields-H2.sql | 2 +- .../6.0/12_evol_8475_vessel_add_fields-PG.sql | 2 +- .../6.0/13_evol_7901_add_armateur_table-H2.sql | 2 +- .../6.0/13_evol_7901_add_armateur_table-PG.sql | 2 +- ...ol_8196_lengthWeightParameter_add_source-H2.sql | 2 +- ...ol_8196_lengthWeightParameter_add_source-PG.sql | 2 +- ...vol_8578_nonTargetLength_add_speciesFate-H2.sql | 2 +- ...vol_8578_nonTargetLength_add_speciesFate-PG.sql | 2 +- .../16_evol_8377_speciesFate_add_discard-H2.sql | 2 +- .../16_evol_8377_speciesFate_add_discard-PG.sql | 2 +- ...ol_8376_vesselActivitySeine_add_allowFad-H2.sql | 2 +- ...ol_8376_vesselActivitySeine_add_allowFad-PG.sql | 2 +- .../6.0/18_evol_8404_lengthLengthParameter-H2.sql | 2 +- .../6.0/18_evol_8404_lengthLengthParameter-PG.sql | 2 +- .../6.0/19_ano_8554_brancheline_add_section-H2.sql | 2 +- .../6.0/19_ano_8554_brancheline_add_section-PG.sql | 2 +- ...evol_8391_species_drop_lengthmeasuretype-H2.sql | 2 +- ...evol_8391_species_drop_lengthmeasuretype-PG.sql | 2 +- .../old/3.10/V3_10_01_remove-person-H2.sql | 2 +- .../old/3.10/V3_10_01_remove-person-PG.sql | 2 +- .../old/3.10/V3_10_02_add-missing-fk-H2.sql | 2 +- .../old/3.10/V3_10_02_add-missing-fk-PG.sql | 2 +- .../3.10/V3_10_03_increase-comment-field-H2.sql | 2 +- .../3.10/V3_10_03_increase-comment-field-PG.sql | 2 +- .../old/3.10/V3_10_04_fix-sensorDataFormat-H2.sql | 2 +- .../old/3.10/V3_10_04_fix-sensorDataFormat-PG.sql | 2 +- .../old/3.10/V3_10_05_normalize-sections-H2.sql | 2 +- .../old/3.10/V3_10_05_normalize-sections-PG.sql | 2 +- ...1_01_remove-speciesGroup-obsolete-fields-H2.sql | 2 +- ...1_01_remove-speciesGroup-obsolete-fields-PG.sql | 2 +- ...3_11_02_add-country-on-transmitting-buoy-H2.sql | 2 +- ...3_11_02_add-country-on-transmitting-buoy-PG.sql | 2 +- .../old/3.11/V3_11_03_add-fpaZones-H2.sql | 2 +- .../old/3.11/V3_11_03_add-fpaZones-PG.sql | 2 +- .../old/3.11/V3_11_04_add-activity-ersId-H2.sql | 2 +- .../old/3.11/V3_11_04_add-activity-ersId-PG.sql | 2 +- .../old/3.11/V3_11_05_add-person-country-H2.sql | 2 +- .../old/3.11/V3_11_05_add-person-country-PG.sql | 2 +- .../old/3.11/V3_11_06_add-harbours-H2.sql | 2 +- .../old/3.11/V3_11_06_add-harbours-PG.sql | 2 +- .../old/3.12/V3_12_01_add-missing-boat-H2.sql | 2 +- .../old/3.12/V3_12_01_add-missing-boat-PG.sql | 2 +- ...3_14_01_remove-hooksPerBasketCount-field-H2.sql | 2 +- ...3_14_01_remove-hooksPerBasketCount-field-PG.sql | 2 +- ...3_14_02_fix-targetsample-discarded-value-H2.sql | 2 +- ...3_14_02_fix-targetsample-discarded-value-PG.sql | 2 +- .../V3_14_03_remove-orphan-seine-sample-H2.sql | 2 +- .../V3_14_03_remove-orphan-seine-sample-PG.sql | 2 +- ...4_04_remove-targetlength-discarded-field-H2.sql | 2 +- ...4_04_remove-targetlength-discarded-field-PG.sql | 2 +- ..._15_01_change-tdr-integer-field-to-float-H2.sql | 2 +- ..._15_01_change-tdr-integer-field-to-float-PG.sql | 2 +- ..._15_02_remove-set-longline-length-fields-H2.sql | 2 +- ..._15_02_remove-set-longline-length-fields-PG.sql | 2 +- .../3.15/V3_15_03_remove-brancheline-fields-H2.sql | 2 +- .../3.15/V3_15_03_remove-brancheline-fields-PG.sql | 2 +- .../old/3.16/V3_16_01_add-gear-referential-H2.sql | 2 +- .../old/3.16/V3_16_01_add-gear-referential-PG.sql | 2 +- .../old/3.16/V3_16_02_add-gear-data-H2.sql | 2 +- .../old/3.16/V3_16_02_add-gear-data-PG.sql | 2 +- .../3.16/V3_16_03_remove-tripSeine-seine-H2.sql | 2 +- .../3.16/V3_16_03_remove-tripSeine-seine-PG.sql | 2 +- .../db/migration/old/3.5/V3_5_01_migration-H2.sql | 2 +- .../db/migration/old/3.5/V3_5_01_migration-PG.sql | 2 +- .../old/3.5/V3_5_02_add-longline-schema-H2.sql | 2 +- .../old/3.5/V3_5_02_add-longline-schema-PG.sql | 2 +- .../3.5/V3_5_03_update-common-references-H2.sql | 2 +- .../3.5/V3_5_03_update-common-references-PG.sql | 2 +- .../old/3.5/V3_5_04_add-longline-references-H2.sql | 2 +- .../old/3.5/V3_5_04_add-longline-references-PG.sql | 2 +- .../old/3.7/V3_7_01_rename-seine-model-H2.sql | 2 +- .../old/3.7/V3_7_01_rename-seine-model-PG.sql | 2 +- .../old/3.7/V3_7_02_remove-trip-organism-H2.sql | 2 +- .../old/3.7/V3_7_02_remove-trip-organism-PG.sql | 2 +- .../3.7/V3_7_03_add-referential-needComment-H2.sql | 2 +- .../3.7/V3_7_03_add-referential-needComment-PG.sql | 2 +- .../old/3.7/V3_7_04_normalize-triplongline-H2.sql | 2 +- .../old/3.7/V3_7_04_normalize-triplongline-PG.sql | 2 +- .../3.7/V3_7_05_normalize-activitylongline-H2.sql | 2 +- .../3.7/V3_7_05_normalize-activitylongline-PG.sql | 2 +- .../old/3.7/V3_7_06_normalize-setlongline-H2.sql | 2 +- .../old/3.7/V3_7_06_normalize-setlongline-PG.sql | 2 +- .../old/3.7/V3_7_07_normalize-catchlongline-H2.sql | 2 +- .../old/3.7/V3_7_07_normalize-catchlongline-PG.sql | 2 +- .../migration/old/3.7/V3_7_08_normalize-tdr-H2.sql | 2 +- .../migration/old/3.7/V3_7_08_normalize-tdr-PG.sql | 2 +- .../old/3.7/V3_7_09_add-species-list-H2.sql | 2 +- .../old/3.7/V3_7_09_add-species-list-PG.sql | 2 +- .../old/3.7/V3_7_10_increase-comment-field-H2.sql | 2 +- .../old/3.7/V3_7_10_increase-comment-field-PG.sql | 2 +- .../db/migration/old/3.8/V3_8_01_fix-person-H2.sql | 2 +- .../db/migration/old/3.8/V3_8_01_fix-person-PG.sql | 2 +- .../3.8/V3_8_02_fix-branchelinecomposition-H2.sql | 2 +- .../3.8/V3_8_02_fix-branchelinecomposition-PG.sql | 2 +- .../old/3.8/V3_8_03_normalize-sensorused-H2.sql | 2 +- .../old/3.8/V3_8_03_normalize-sensorused-PG.sql | 2 +- .../migration/old/3.8/V3_8_04_normalize-tdr-H2.sql | 2 +- .../migration/old/3.8/V3_8_04_normalize-tdr-PG.sql | 2 +- .../3.9/V3_9_01_add-dataFilename-attribute-H2.sql | 2 +- .../3.9/V3_9_01_add-dataFilename-attribute-PG.sql | 2 +- .../old/3.9/V3_9_02_fill-sensorDataFormat-H2.sql | 2 +- .../old/3.9/V3_9_02_fill-sensorDataFormat-PG.sql | 2 +- .../V4_0_RC_2_01_add-foreign-key-indexes-PG.sql | 2 +- .../V4_0_RC_2_01_clean-program-gear-type-H2.sql | 2 +- .../V4_0_RC_2_01_clean-program-gear-type-PG.sql | 2 +- ...4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql | 2 +- ...4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql | 2 +- .../V4_0_RC_2_03_rename-unknown-longliner-H2.sql | 2 +- .../V4_0_RC_2_03_rename-unknown-longliner-PG.sql | 2 +- .../old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-H2.sql | 2 +- .../old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-PG.sql | 2 +- ...4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql | 2 +- ...4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql | 2 +- ...4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql | 2 +- ...4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql | 2 +- .../V4_0_RC_7_02_rename-unknown-longliner-H2.sql | 2 +- .../V4_0_RC_7_02_rename-unknown-longliner-PG.sql | 2 +- .../4.0.1/V4_0_1_01_remove-gender-column-H2.sql | 2 +- .../old/4.0.1/V4_0_1_02_add-missing-fk-H2.sql | 2 +- .../old/4.0.1/V4_0_1_02_add-missing-fk-PG.sql | 2 +- .../4.0.2/V4_0_2_01_remove-gender-column-PG.sql | 2 +- ...0_4_01_remove-trip-datearriveeport-field-H2.sql | 2 +- ...0_4_01_remove-trip-datearriveeport-field-PG.sql | 2 +- .../db/migration/old/4.0/V4_0_01_empty-H2.sql | 2 +- .../db/migration/old/4.0/V4_0_01_empty-PG.sql | 2 +- .../entities/longline/SectionTemplateTest.java | 2 +- ...rveMigrationCallBackForVersionResolverTest.java | 2 +- persistence/src/test/resources/log4j.properties | 2 +- pom.xml | 109 ++++------- services-binder/pom.xml | 26 ++- .../ird/observe/services/binder/BinderEngine.java | 2 +- .../services/binder/BinderEngineInitializer.java | 2 +- .../ird/observe/services/binder/BinderSupport.java | 4 +- .../DefaultReferenceBinderEngineSupplier.java | 2 +- .../services/binder/data/DataBinderSupport.java | 2 +- .../data/longline/ActivityLonglineBinder.java | 2 +- .../ActivityLonglineEncouterDtoBinder.java | 2 +- .../ActivityLonglineSensorUsedDtoBinder.java | 2 +- .../longline/ActivityLonglineStubDtoBinder.java | 2 +- .../data/longline/BaitsCompositionBinder.java | 2 +- .../binder/data/longline/BasketBinder.java | 2 +- .../binder/data/longline/BranchlineBinder.java | 2 +- .../longline/BranchlinesCompositionBinder.java | 2 +- .../binder/data/longline/CatchLonglineBinder.java | 2 +- .../binder/data/longline/EncounterBinder.java | 2 +- .../data/longline/FloatlinesCompositionBinder.java | 2 +- .../longline/GearUseFeaturesLonglineBinder.java | 2 +- .../GearUseFeaturesMeasurementLonglineBinder.java | 2 +- .../data/longline/HooksCompositionBinder.java | 2 +- .../binder/data/longline/SectionBinder.java | 2 +- .../binder/data/longline/SensorUsedBinder.java | 2 +- .../binder/data/longline/SetLonglineBinder.java | 2 +- .../data/longline/SetLonglineCatchDtoBinder.java | 2 +- .../SetLonglineDetailCompositionDtoBinder.java | 2 +- .../SetLonglineGlobalCompositionDtoBinder.java | 2 +- .../data/longline/SetLonglineStubDtoBinder.java | 2 +- .../data/longline/SetLonglineTdrDtoBinder.java | 2 +- .../binder/data/longline/SizeMeasureBinder.java | 2 +- .../services/binder/data/longline/TdrBinder.java | 2 +- .../longline/TripLonglineActivityDtoBinder.java | 2 +- .../binder/data/longline/TripLonglineBinder.java | 2 +- .../longline/TripLonglineGearUseDtoBinder.java | 2 +- .../binder/data/longline/WeightMeasureBinder.java | 2 +- .../binder/data/seine/ActivitySeineBinder.java | 2 +- .../data/seine/ActivitySeineStubDtoBinder.java | 2 +- .../binder/data/seine/FloatingObjectBinder.java | 2 +- .../FloatingObjectObservedSpeciesDtoBinder.java | 2 +- .../FloatingObjectSchoolEstimateDtoBinder.java | 2 +- .../FloatingObjectTransmittingBuoyDtoBinder.java | 2 +- .../GearUseFeaturesMeasurementSeineBinder.java | 2 +- .../data/seine/GearUseFeaturesSeineBinder.java | 2 +- .../binder/data/seine/NonTargetCatchBinder.java | 2 +- .../binder/data/seine/NonTargetLengthBinder.java | 2 +- .../binder/data/seine/NonTargetSampleBinder.java | 2 +- .../data/seine/ObjectObservedSpeciesBinder.java | 2 +- .../data/seine/ObjectSchoolEstimateBinder.java | 2 +- .../services/binder/data/seine/RouteBinder.java | 2 +- .../binder/data/seine/RouteStubDtoBinder.java | 2 +- .../binder/data/seine/SchoolEstimateBinder.java | 2 +- .../services/binder/data/seine/SetSeineBinder.java | 2 +- .../seine/SetSeineNonTargetCatchDtoBinder.java | 2 +- .../seine/SetSeineSchoolEstimateDtoBinder.java | 2 +- .../data/seine/SetSeineTargetCatchDtoBinder.java | 2 +- .../binder/data/seine/TargetCatchBinder.java | 2 +- .../binder/data/seine/TargetLengthBinder.java | 2 +- .../binder/data/seine/TargetSampleBinder.java | 2 +- .../binder/data/seine/TransmittingBuoyBinder.java | 2 +- .../binder/data/seine/TripSeineBinder.java | 2 +- .../data/seine/TripSeineGearUseDtoBinder.java | 2 +- .../referential/ReferentialBinderSupport.java | 2 +- .../binder/referential/common/CountryBinder.java | 2 +- .../binder/referential/common/FpaZoneBinder.java | 2 +- .../binder/referential/common/GearBinder.java | 2 +- .../common/GearCaracteristicBinder.java | 2 +- .../common/GearCaracteristicTypeBinder.java | 2 +- .../binder/referential/common/HarbourBinder.java | 2 +- .../common/LengthLengthParameterBinder.java | 2 +- .../common/LengthWeightParameterBinder.java | 2 +- .../binder/referential/common/OceanBinder.java | 2 +- .../binder/referential/common/OrganismBinder.java | 2 +- .../binder/referential/common/PersonBinder.java | 2 +- .../binder/referential/common/ProgramBinder.java | 2 +- .../binder/referential/common/SexBinder.java | 2 +- .../binder/referential/common/ShipOwnerBinder.java | 2 +- .../referential/common/SizeMeasureTypeBinder.java | 2 +- .../binder/referential/common/SpeciesBinder.java | 2 +- .../referential/common/SpeciesGroupBinder.java | 2 +- .../referential/common/SpeciesListBinder.java | 2 +- .../binder/referential/common/VesselBinder.java | 2 +- .../common/VesselSizeCategoryBinder.java | 2 +- .../referential/common/VesselTypeBinder.java | 2 +- .../common/WeightMeasureTypeBinder.java | 2 +- .../longline/BaitHaulingStatusBinder.java | 2 +- .../longline/BaitSettingStatusBinder.java | 2 +- .../referential/longline/BaitTypeBinder.java | 2 +- .../longline/CatchFateLonglineBinder.java | 2 +- .../referential/longline/EncounterTypeBinder.java | 2 +- .../referential/longline/HealthnessBinder.java | 2 +- .../referential/longline/HookPositionBinder.java | 2 +- .../referential/longline/HookSizeBinder.java | 2 +- .../referential/longline/HookTypeBinder.java | 2 +- .../longline/ItemHorizontalPositionBinder.java | 2 +- .../longline/ItemVerticalPositionBinder.java | 2 +- .../longline/LightsticksColorBinder.java | 2 +- .../longline/LightsticksTypeBinder.java | 2 +- .../referential/longline/LineTypeBinder.java | 2 +- .../referential/longline/MaturityStatusBinder.java | 2 +- .../referential/longline/MitigationTypeBinder.java | 2 +- .../referential/longline/SensorBrandBinder.java | 2 +- .../longline/SensorDataFormatBinder.java | 2 +- .../referential/longline/SensorTypeBinder.java | 2 +- .../referential/longline/SettingShapeBinder.java | 2 +- .../referential/longline/StomacFullnessBinder.java | 2 +- .../referential/longline/TripTypeBinder.java | 2 +- .../longline/VesselActivityLonglineBinder.java | 2 +- .../referential/seine/DetectionModeBinder.java | 2 +- .../binder/referential/seine/ObjectFateBinder.java | 2 +- .../referential/seine/ObjectOperationBinder.java | 2 +- .../binder/referential/seine/ObjectTypeBinder.java | 2 +- .../referential/seine/ObservedSystemBinder.java | 2 +- .../referential/seine/ReasonForDiscardBinder.java | 2 +- .../seine/ReasonForNoFishingBinder.java | 2 +- .../referential/seine/ReasonForNullSetBinder.java | 2 +- .../referential/seine/SpeciesFateBinder.java | 2 +- .../referential/seine/SpeciesStatusBinder.java | 2 +- .../seine/SurroundingActivityBinder.java | 2 +- .../seine/TransmittingBuoyOperationBinder.java | 2 +- .../seine/TransmittingBuoyTypeBinder.java | 2 +- .../seine/VesselActivitySeineBinder.java | 2 +- .../referential/seine/WeightCategoryBinder.java | 2 +- .../binder/referential/seine/WindBinder.java | 2 +- .../services/binder/BinderEngineMetadataTest.java | 2 +- .../services/binder/ReferenceBinderEngineTest.java | 2 +- services-configuration-rest/pom.xml | 26 ++- .../rest/ObserveDataSourceConfigurationRest.java | 2 +- ...bserveDataSourceConfigurationRestConstants.java | 2 +- .../rest/ObserveDataSourceConnectionRest.java | 2 +- services-configuration-topia/pom.xml | 26 ++- .../ObserveDataSourceConfigurationTopiaH2.java | 2 +- .../ObserveDataSourceConfigurationTopiaPG.java | 2 +- ...ObserveDataSourceConfigurationTopiaSupport.java | 2 +- .../topia/ObserveDataSourceConnectionTopia.java | 2 +- services-configuration/pom.xml | 26 ++- .../ObserveDataSourceConfiguration.java | 2 +- ...bserveDataSourceConfigurationAndConnection.java | 2 +- .../configuration/ObserveDataSourceConnection.java | 2 +- .../ObserveDataSourceConnectionSupport.java | 2 +- .../ObserveDataSourceInformation.java | 2 +- .../configuration/ObserveDataSourceType.java | 2 +- .../src/test/resources/log4j.properties | 2 +- services-rest/pom.xml | 26 ++- .../rest/ObserveDataSourceConnectionAdapter.java | 2 +- .../services/rest/ObserveServiceFactoryRest.java | 27 ++- .../rest/ObserveServiceRestErrorException.java | 2 +- .../ObserveServiceRestNotAvailableException.java | 2 +- .../observe/services/rest/http/ObserveRequest.java | 12 +- .../services/rest/http/ObserveRequestBuilder.java | 15 +- .../services/rest/http/ObserveRequestMethod.java | 2 +- .../services/rest/http/ObserveResponse.java | 4 +- .../services/rest/http/ObserveResponseBuilder.java | 59 +++--- .../services/rest/RestTestClassResource.java | 8 +- .../services/rest/RestTestMethodResource.java | 2 +- .../rest/service/AbstractServiceRestTest.java | 2 +- .../rest/service/DataSourceServiceRestTest.java | 2 +- .../services/rest/service/PingServiceRestTest.java | 2 +- .../service/ReferenceValuesSetServiceRestTest.java | 2 +- .../rest/service/ReferentialServiceRestTest.java | 2 +- .../ConsolidateDataServiceRestTest.java | 2 +- .../report/AbstractReportServiceRestTest.java | 2 +- .../report/ReportAccessoryCatchRestTest.java | 2 +- .../actions/validate/ValidateServiceRestTest.java | 2 +- .../seine/TripSeineGearUseServiceRestTest.java | 10 +- .../service/seine/TripSeineServiceRestTest.java | 2 +- services-rest/src/test/resources/log4j.properties | 2 +- services-runner/pom.xml | 26 ++- .../ObserveDataSourceConfigurationMainFactory.java | 2 +- .../services/runner/ObserveServiceMainFactory.java | 10 +- services-topia/pom.xml | 26 ++- .../observe/services/topia/ObserveJdbcHelper.java | 4 +- .../services/topia/ObserveSecurityHelper.java | 2 +- .../services/topia/ObserveServiceContextTopia.java | 2 +- .../services/topia/ObserveServiceFactoryTopia.java | 4 +- .../services/topia/ObserveServiceTopia.java | 2 +- .../ObserveTopiaApplicationContextFactory.java | 2 +- .../topia/service/DataSourceServiceTopia.java | 2 +- .../topia/service/LastUpdateDateServiceTopia.java | 2 +- .../ConsolidateActivitySeineDataResultBuilder.java | 2 +- .../consolidate/ConsolidateDataServiceTopia.java | 2 +- .../service/actions/report/ReportServiceTopia.java | 2 +- .../ReferentialSynchronizeDiffServiceTopia.java | 2 +- ...nalReferentialSynchronizeLocalServiceTopia.java | 2 +- .../ng/ReferentialSynchronizeServiceTopia.java | 2 +- .../ReferentialSynchronizeSqlsRequestBuilder.java | 2 +- .../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 | 15 +- .../validate/ServiceValidationException.java | 2 +- .../actions/validate/ValidateServiceTopia.java | 2 +- .../actions/validate/ValidationDataContext.java | 2 +- .../validate/ValidationMessageDetector.java | 2 +- .../service/actions/validate/ValidatorsMap.java | 2 +- .../service/data/ImportTripScriptTopiaSqlWork.java | 2 +- .../topia/service/data/NavigationServiceTopia.java | 2 +- .../service/data/TripManagementServiceTopia.java | 2 +- .../topia/service/data/TripMapDtoFactory.java | 2 +- .../ActivityLongLineEncounterServiceTopia.java | 2 +- .../ActivityLongLineSensorUsedServiceTopia.java | 2 +- .../longline/ActivityLonglineServiceTopia.java | 2 +- .../data/longline/BranchlineServiceTopia.java | 2 +- .../longline/LonglinePositionSetDtoHelper.java | 6 +- .../longline/SetLonglineCatchServiceTopia.java | 2 +- .../SetLonglineDetailCompositionServiceTopia.java | 2 +- .../SetLonglineGlobalCompositionServiceTopia.java | 2 +- .../data/longline/SetLonglineServiceTopia.java | 2 +- .../service/data/longline/TdrServiceTopia.java | 2 +- .../longline/TripLonglineGearUseServiceTopia.java | 2 +- .../data/longline/TripLonglineServiceTopia.java | 2 +- .../data/seine/ActivitySeineServiceTopia.java | 2 +- .../data/seine/FloatingObjectServiceTopia.java | 2 +- .../data/seine/NonTargetCatchServiceTopia.java | 2 +- .../data/seine/NonTargetSampleServiceTopia.java | 2 +- .../seine/ObjectObservedSpeciesServiceTopia.java | 2 +- .../seine/ObjectSchoolEstimateServiceTopia.java | 2 +- .../service/data/seine/RouteServiceTopia.java | 4 +- .../data/seine/SchoolEstimateServiceTopia.java | 2 +- .../service/data/seine/SetSeineServiceTopia.java | 2 +- .../data/seine/TargetCatchServiceTopia.java | 2 +- .../data/seine/TargetSampleServiceTopia.java | 2 +- .../TransmittingBuoyOperationServiceTopia.java | 2 +- .../data/seine/TripSeineGearUseServiceTopia.java | 2 +- .../service/data/seine/TripSeineServiceTopia.java | 2 +- .../referential/ReferentialServiceTopia.java | 2 +- .../referential/ReferentialsShellBuilder.java | 2 +- .../service/sql/SqlScriptProducerServiceTopia.java | 2 +- .../services/topia/DataSourcesForTestManager.java | 2 +- .../ObserveDataSourceConnectionTopiaTaiste.java | 2 +- .../topia/ObserveServiceContextTopiaTaiste.java | 2 +- .../services/topia/TopiaTestClassResource.java | 4 +- .../services/topia/TopiaTestMethodResource.java | 2 +- .../services/topia/binder/BinderEngineTest.java | 2 +- .../topia/entity/LengthWeightParemetersTest.java | 24 +-- .../topia/entity/ReplicateReferentialsTest.java | 2 +- .../topia/entity/ReplicateTestSupport.java | 2 +- .../topia/entity/ReplicateTripLonglineTest.java | 2 +- .../topia/entity/ReplicateTripSeineTest.java | 2 +- .../topia/service/AbstractServiceTopiaTest.java | 2 +- .../topia/service/DataSourceServiceTopiaTest.java | 2 +- .../topia/service/ReferentialServiceTopiaTest.java | 2 +- .../observe/services/topia/service/RigthTest.java | 2 +- .../ConsolidateDataServiceTopiaTest.java | 2 +- .../report/AbstractReportServiceTopiaTest.java | 2 +- .../actions/report/ReportAccessoryCatch2Test.java | 2 +- .../report/ReportAccessoryCatchByGroup2Test.java | 2 +- .../report/ReportAccessoryCatchByGroupTest.java | 2 +- .../actions/report/ReportAccessoryCatchTest.java | 2 +- .../report/ReportActivityWithCommentTest.java | 2 +- .../actions/report/ReportAllActivitysTest.java | 2 +- .../actions/report/ReportDailySetAndCatchTest.java | 2 +- .../service/actions/report/ReportDcpUsageTest.java | 2 +- .../actions/report/ReportSeineEquipmentsTest.java | 2 +- .../actions/report/ReportSetByAssociationTest.java | 2 +- .../report/ReportTargetCatchByAssociationTest.java | 2 +- .../ReportTargetDiscardedByAssociationTest.java | 2 +- .../UnidirectionalSynchronizeReferentialTest.java | 2 +- .../actions/validate/ValidateServiceTopiaTest.java | 2 +- .../data/TripManagementServiceTopiaTest.java | 2 +- ...tLonglineDetailCompositionServiceTopiaTest.java | 2 +- .../service/data/seine/RouteServiceTopiaTest.java | 2 +- .../data/seine/TargetSampleServiceTopiaTest.java | 2 +- .../seine/TripSeineGearUseServiceTopiaTest.java | 10 +- .../data/seine/TripSeineServiceTopiaTest.java | 2 +- .../topia/service/sql/MigrateTestsDatabases.java | 2 +- .../sql/SqlScriptProducerServiceTopiaTest.java | 2 +- services-topia/src/test/resources/log4j.properties | 2 +- services-topia/src/test/resources/validators.xml | 2 +- services-validation/pom.xml | 20 +- ...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 | 2 +- ...hLengthParameter-service-warning-validation.xml | 2 +- ...gthWeightParameter-service-error-validation.xml | 2 +- ...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 | 2 +- .../ShipOwner-service-warning-validation.xml | 2 +- .../SizeMeasureType-service-error-validation.xml | 2 +- .../SizeMeasureType-service-warning-validation.xml | 2 +- .../Species-service-error-validation.xml | 2 +- .../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 | 2 +- .../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 | 2 +- ...eightMeasureType-service-warning-validation.xml | 2 +- .../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 +- .../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 +- .../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 | 2 +- ...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 | 2 +- .../NonTargetLength-service-warning-validation.xml | 2 +- .../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 | 2 +- .../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-validation/src/main/resources/xwork.xml | 2 +- .../validation/BeanValidatorDetectorTest.java | 2 +- .../ActivitySeineSpeedValidatorTest.java | 2 +- .../seine/Route-testSpeed-error-validation.xml | 2 +- .../src/test/resources/log4j.properties | 2 +- .../src/test/resources/validators.xml | 2 +- services-validators/pom.xml | 18 +- .../validators/AbstractSpeciesFieldValidator.java | 2 +- .../ActivityFinDeVeilleExistsValidator.java | 2 +- .../validators/ActivitySimpleSpeedValidator.java | 2 +- .../validators/ActivitySpeedValidator.java | 2 +- .../validators/CollectionUniqueKeyValidator2.java | 2 +- .../ObserveCollectionUniqueKeyValidator.java | 2 +- .../validators/QuadrantFieldValidator.java | 2 +- .../SetLonglineUniqueHomeIdValidator.java | 2 +- .../SetLonglineUniqueNumberValidator.java | 2 +- .../validators/SpeciesLengthFieldValidator.java | 2 +- .../validators/SpeciesWeightFieldValidator.java | 2 +- services/pom.xml | 32 +++- .../src/main/filters/observe-reports.properties | 2 +- .../observe/services/ObserveDataReferenceSets.java | 2 +- .../ird/observe/services/ObserveFormRequests.java | 6 +- .../services/ObserveReferentialReferenceSets.java | 2 +- .../fr/ird/observe/services/ObserveService.java | 2 +- .../observe/services/ObserveServiceFactory.java | 2 +- .../services/ObserveServiceFactorySupport.java | 2 +- .../services/ObserveServiceInitializer.java | 25 ++- .../observe/services/ObserveServicesProvider.java | 2 +- .../services/binder/ReferenceBinderEngine.java | 2 +- .../binder/ReferenceBinderEngineSupplier.java | 2 +- .../observe/services/dto/AbstractObserveDto.java | 6 +- .../java/fr/ird/observe/services/dto/IdDto.java | 2 +- .../java/fr/ird/observe/services/dto/IdHelper.java | 2 +- .../services/dto/ObserveBlobsContainer.java | 2 +- .../observe/services/dto/ObserveDbUserHelper.java | 2 +- .../fr/ird/observe/services/dto/ObserveDto.java | 2 +- .../dto/ObserveSpeciesListConfiguration.java | 2 +- .../fr/ird/observe/services/dto/WithComment.java | 2 +- .../services/dto/constants/ObserveDbRole.java | 2 +- .../services/dto/constants/ObserveModelType.java | 2 +- .../services/dto/constants/ReferentialLocale.java | 2 +- .../fr/ird/observe/services/dto/form/Form.java | 2 +- .../services/dto/form/FormRequestDefinition.java | 2 +- .../dto/form/FormRequestKeyDefinition.java | 2 +- .../services/dto/longline/ActivityLonglineDto.java | 2 +- .../dto/longline/ActivityLonglineHelper.java | 2 +- .../dto/longline/BasketWithSectionIdDto.java | 2 +- .../dto/longline/BranchlineWithBasketIdDto.java | 2 +- .../GearUseFeaturesMeasurementLonglineDto.java | 2 +- .../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 | 4 +- .../dto/longline/SectionWithTemplateHelper.java | 2 +- .../longline/SetLonglineGlobalCompositionDto.java | 2 +- .../services/dto/longline/TripLonglineHelper.java | 2 +- .../dto/presets/RemoteDataSourceConfiguration.java | 2 +- .../dto/presets/ServerDataSourceConfiguration.java | 2 +- .../services/dto/reference/AbstractReference.java | 2 +- .../services/dto/reference/DataReference.java | 2 +- .../services/dto/reference/DataReferenceList.java | 2 +- .../services/dto/reference/DataReferenceSet.java | 2 +- .../dto/reference/ReferenceCollectionSupport.java | 2 +- .../services/dto/reference/ReferenceMap.java | 2 +- .../dto/reference/ReferenceSetDefinition.java | 2 +- .../reference/ReferenceValueNotFoundException.java | 2 +- .../dto/reference/ReferentialReference.java | 2 +- .../dto/reference/ReferentialReferenceSet.java | 2 +- .../dto/reference/ReferentialReferences.java | 2 +- .../referential/GearCaracteristicTypeHelper.java | 2 +- .../dto/referential/I18nReferentialDto.java | 2 +- .../dto/referential/I18nReferentialHelper.java | 2 +- .../dto/referential/LengthLengthParameterDto.java | 2 +- .../dto/referential/LengthWeightParameterDto.java | 2 +- .../services/dto/referential/PersonHelper.java | 2 +- .../services/dto/referential/ProgramDto.java | 2 +- .../services/dto/referential/ProgramHelper.java | 2 +- .../services/dto/referential/ReferentialDto.java | 2 +- .../dto/referential/ReferentialHelper.java | 2 +- .../dto/referential/ReferentialMultimap.java | 143 +++++++-------- .../dto/referential/SizeMeasureTypeHelper.java | 2 +- .../services/dto/referential/SpeciesListDto.java | 2 +- .../services/dto/referential/VesselHelper.java | 2 +- .../longline/VesselActivityLonglineHelper.java | 2 +- .../seine/VesselActivitySeineHelper.java | 2 +- .../referential/seine/WeightCategoryHelper.java | 2 +- .../observe/services/dto/result/SaveResultDto.java | 2 +- .../services/dto/result/SaveResultHelper.java | 2 +- .../dto/result/TripChildSaveResultHelper.java | 2 +- .../services/dto/seine/ActivitySeineDto.java | 2 +- .../services/dto/seine/ActivitySeineHelper.java | 2 +- .../services/dto/seine/ActivitySeineStubDto.java | 2 +- .../dto/seine/DiscardedTargetCatchDto.java | 2 +- .../dto/seine/DiscardedTargetSampleDto.java | 2 +- .../seine/FloatingObjectTransmittingBuoyDto.java | 2 +- .../seine/GearUseFeaturesMeasurementSeineDto.java | 2 +- .../services/dto/seine/KeptTargetCatchDto.java | 2 +- .../services/dto/seine/KeptTargetSampleDto.java | 2 +- .../ird/observe/services/dto/seine/RouteDto.java | 2 +- .../observe/services/dto/seine/SetSeineDto.java | 2 +- .../services/dto/seine/TargetCatchHelper.java | 2 +- .../services/dto/seine/TargetLengthDto.java | 2 +- .../services/dto/seine/TargetLengthHelper.java | 2 +- .../observe/services/dto/seine/TripSeineDto.java | 2 +- .../services/dto/seine/TripSeineHelper.java | 2 +- .../source/DataSourceCreateConfigurationDto.java | 2 +- ...urceCreateWithNoReferentialImportException.java | 2 +- ...ibleDataSourceCreateConfigurationException.java | 2 +- .../services/gson/ArrayListMultimapAdapter.java | 2 +- .../fr/ird/observe/services/gson/BlobAdapter.java | 2 +- .../fr/ird/observe/services/gson/ClassAdapter.java | 6 +- .../fr/ird/observe/services/gson/DateAdapter.java | 4 +- .../fr/ird/observe/services/gson/FormAdapter.java | 2 +- .../services/gson/ImmutableListAdapter.java | 2 +- .../observe/services/gson/ImmutableMapAdapter.java | 2 +- .../services/gson/ImmutableMultimapAdapter.java | 2 +- .../observe/services/gson/ImmutableSetAdapter.java | 2 +- .../ird/observe/services/gson/IntegerAdapter.java | 2 +- .../services/gson/MultimapAdapterSupport.java | 2 +- .../gson/ObserveBlobsContainerAdapter.java | 2 +- .../services/gson/ObserveDtoGsonSupplier.java | 4 +- .../services/gson}/ObserveHttpErrorAdapter.java | 6 +- .../services/gson/ReferentialMultimapAdapter.java | 2 +- .../services/gson/ReportVariableAdapter.java | 2 +- .../observe/services/gson/SetMultimapAdapter.java | 2 +- .../ird/observe/services/gson/VersionAdapter.java | 2 +- .../gson/reference/AbstractReferenceAdapter.java | 2 +- .../gson/reference/DataReferenceAdapter.java | 2 +- .../gson/reference/DataReferenceListAdapter.java | 2 +- .../gson/reference/DataReferenceSetAdapter.java | 2 +- .../ReferenceCollectionSupportAdapter.java | 2 +- .../reference/ReferentialReferenceAdapter.java | 2 +- .../reference/ReferentialReferenceSetAdapter.java | 2 +- .../gson/reference/UnknownReferenceAdapter.java | 2 +- .../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 +- .../services/security/UnauthorizedException.java | 2 +- .../security/UnknownObserveWebUserException.java | 2 +- .../UnknownObserveWebUserForDatabaseException.java | 2 +- .../security/UserLoginNotFoundException.java | 2 +- .../security/UserPasswordNotFoundException.java | 2 +- .../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 +- .../services/service/LastUpdateDateService.java | 2 +- .../ird/observe/services/service/PingService.java | 2 +- .../ConsolidateActivitySeineDataResult.java | 2 +- .../consolidate/ConsolidateDataService.java | 2 +- .../ConsolidateTripSeineDataRequest.java | 2 +- .../ConsolidateTripSeineDataResult.java | 2 +- .../service/actions/report/DataMatrix.java | 2 +- .../services/service/actions/report/Report.java | 6 +- .../service/actions/report/ReportBuilder.java | 6 +- .../service/actions/report/ReportOperation.java | 2 +- .../service/actions/report/ReportRequest.java | 2 +- .../service/actions/report/ReportService.java | 2 +- .../service/actions/report/ReportVariable.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 | 2 +- ...ectionalReferentialSynchronizeLocalService.java | 2 +- ...nidirectionalReferentialSynchronizeRequest.java | 2 +- ...UnidirectionalReferentialSynchronizeResult.java | 2 +- .../ng/ReferentialSynchronizeRequest.java | 2 +- .../ng/ReferentialSynchronizeService.java | 2 +- .../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 | 2 +- .../validate/ValidateReferentialsRequest.java | 2 +- .../validate/ValidateReferentialsResult.java | 2 +- .../actions/validate/ValidateResultForDto.java | 2 +- .../validate/ValidateResultForDtoHelper.java | 2 +- .../actions/validate/ValidateResultForDtoType.java | 2 +- .../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/ValidatorHelper.java | 2 +- .../validate/ValidatorInitializationException.java | 2 +- .../services/service/data/DeleteTripRequest.java | 2 +- .../services/service/data/DeleteTripResult.java | 2 +- .../services/service/data/ExportTripRequest.java | 2 +- .../services/service/data/ExportTripResult.java | 2 +- .../services/service/data/ImportTripRequest.java | 2 +- .../services/service/data/ImportTripResult.java | 2 +- .../services/service/data/NavigationRequest.java | 2 +- .../services/service/data/NavigationResult.java | 2 +- .../services/service/data/NavigationService.java | 2 +- .../service/data/TripManagementService.java | 2 +- .../longline/ActivityLongLineEncounterService.java | 2 +- .../ActivityLongLineSensorUsedService.java | 2 +- .../data/longline/ActivityLonglineService.java | 2 +- .../service/data/longline/BranchlineService.java | 2 +- .../data/longline/SetLonglineCatchService.java | 2 +- .../SetLonglineDetailCompositionService.java | 2 +- .../SetLonglineGlobalCompositionService.java | 2 +- .../service/data/longline/SetLonglineService.java | 2 +- .../services/service/data/longline/TdrService.java | 2 +- .../data/longline/TripLonglineGearUseService.java | 2 +- .../service/data/longline/TripLonglineService.java | 2 +- .../service/data/seine/ActivitySeineService.java | 2 +- .../service/data/seine/FloatingObjectService.java | 2 +- .../service/data/seine/NonTargetCatchService.java | 2 +- .../service/data/seine/NonTargetSampleService.java | 2 +- .../data/seine/ObjectObservedSpeciesService.java | 2 +- .../data/seine/ObjectSchoolEstimateService.java | 2 +- .../services/service/data/seine/RouteService.java | 2 +- .../service/data/seine/SchoolEstimateService.java | 2 +- .../service/data/seine/SetSeineService.java | 2 +- .../service/data/seine/TargetCatchService.java | 2 +- .../service/data/seine/TargetSampleService.java | 2 +- .../seine/TransmittingBuoyOperationService.java | 2 +- .../data/seine/TripSeineGearUseService.java | 2 +- .../service/data/seine/TripSeineService.java | 2 +- .../referential/MissingReferentialResult.java | 2 +- .../referential/ObserveReferentialCache.java | 2 +- .../service/referential/ReferenceSetsRequest.java | 2 +- .../service/referential/ReferentialService.java | 2 +- .../service/sql/AddSqlScriptProducerRequest.java | 2 +- .../service/sql/AddSqlScriptProducerResult.java | 2 +- .../sql/DeleteSqlScriptProducerRequest.java | 2 +- .../service/sql/SqlScriptProducerService.java | 2 +- .../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 | 2 +- services/src/test/resources/log4j.properties | 2 +- src/site/rst/architecture-logicielle.rst | 2 +- src/site/rst/index.rst | 2 +- src/site/rst/install-serverPG.rst | 2 +- src/site/rst/install.rst | 2 +- src/site/site_fr.xml | 2 +- test/pom.xml | 18 +- .../java/fr/ird/observe/test/DatabaseName.java | 2 +- .../java/fr/ird/observe/test/ObserveFixtures.java | 2 +- .../ird/observe/test/ObserveTestConfiguration.java | 2 +- .../fr/ird/observe/test/ObserveTestResources.java | 2 +- .../ird/observe/test/TestClassResourceSupport.java | 2 +- .../main/java/fr/ird/observe/test/TestHelper.java | 2 +- .../observe/test/TestMethodResourceSupport.java | 2 +- .../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 | 2 +- .../observe/test/spi/DatabaseUrlConfiguration.java | 2 +- .../test/spi/DatabaseVersionConfiguration.java | 2 +- .../test/spi/DatabaseVersionConfigurations.java | 2 +- test/src/main/resources/observetest.properties | 2 +- toolbox-maven-plugin/pom.xml | 20 +- .../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 | 20 +- .../support/TopiaMetadataModelSupportImpl.java | 2 +- .../persistence/metadata/TopiaMetadataEntity.java | 2 +- .../persistence/metadata/TopiaMetadataModel.java | 2 +- .../metadata/TopiaMetadataModelVisitor.java | 2 +- .../support/TopiaMetadataModelSupport.java | 2 +- .../topia/service/sql/batch/SqlRequests.java | 2 +- .../nuiton/topia/service/sql/batch/SqlResult.java | 2 +- .../service/sql/batch/TopiaSqlBatchService.java | 2 +- .../batch/TopiaSqlBatchServiceConfiguration.java | 2 +- .../sql/batch/TopiaSqlBatchServiceImpl.java | 2 +- .../sql/batch/actions/AbstractSchemaAction.java | 2 +- .../sql/batch/actions/AbstractSchemaRequest.java | 2 +- .../sql/batch/actions/AbstractSqlAction.java | 2 +- .../sql/batch/actions/AbstractSqlRequest.java | 2 +- .../sql/batch/actions/AbstractTablesAction.java | 2 +- .../sql/batch/actions/AbstractTablesRequest.java | 2 +- .../service/sql/batch/actions/BlobsContainer.java | 2 +- .../sql/batch/actions/CreateSchemaAction.java | 2 +- .../sql/batch/actions/CreateSchemaRequest.java | 2 +- .../sql/batch/actions/DeleteTablesAction.java | 2 +- .../sql/batch/actions/DeleteTablesRequest.java | 2 +- .../sql/batch/actions/DropSchemaAction.java | 2 +- .../sql/batch/actions/DropSchemaRequest.java | 2 +- .../sql/batch/actions/ReplicateTablesAction.java | 2 +- .../sql/batch/actions/ReplicateTablesRequest.java | 2 +- .../batch/actions/TopiaSqlTableSelectArgument.java | 2 +- .../sql/batch/actions/UpdateTablesAction.java | 2 +- .../sql/batch/actions/UpdateTablesRequest.java | 2 +- .../service/sql/batch/tables/TopiaSqlTable.java | 2 +- .../service/sql/batch/tables/TopiaSqlTables.java | 2 +- .../sql/batch/tables/TopiaSqlTablesFactory.java | 2 +- topia-templates-extension/pom.xml | 20 +- .../templates/TopiaMetadataModelGenerator.java | 2 +- 2357 files changed, 4836 insertions(+), 4076 deletions(-) copy application-swing/src/main/assembly/{map.xml => i18n.xml} (75%) copy application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/{menu/action/LaunchExportDataAction.java => content/GoToSubTab1UIAction.java} (63%) copy application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/{menu/action/LaunchExportDataAction.java => content/GoToSubTab2UIAction.java} (63%) copy application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/{menu/action/LaunchExportDataAction.java => content/GoToSubTab3UIAction.java} (63%) copy application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/{menu/action/LaunchExportDataAction.java => content/GoToTab1UIAction.java} (63%) copy application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/{menu/action/LaunchExportDataAction.java => content/GoToTab2UIAction.java} (63%) copy application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/{menu/action/LaunchExportDataAction.java => content/GoToTab3UIAction.java} (63%) copy application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/{menu/action/LaunchExportDataAction.java => content/GoToTab4UIAction.java} (63%) copy application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/{menu/action/LaunchExportDataAction.java => content/GoToTab5UIAction.java} (63%) copy application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/{menu/action/LaunchExportDataAction.java => content/GoToTab6UIAction.java} (63%) copy application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/{CreateOpenUIAction.java => GoToTabUIActionSupport.java} (53%) create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/DataReferenceListCellRenderer.java create mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ReferentialReferenceListCellRenderer.java create mode 100644 application-swing/src/main/resources/ftl/about_en.ftl create mode 100644 application-swing/src/main/resources/ftl/about_es.ftl create mode 100644 application-swing/src/main/resources/ftl/about_fr.ftl create mode 100644 application-swing/src/main/resources/ftl/translate_en.ftl create mode 100644 application-swing/src/main/resources/ftl/translate_es.ftl create mode 100644 application-swing/src/main/resources/ftl/translate_fr.ftl rename {services-rest/src/main/java/fr/ird/observe/services/rest => services/src/main/java/fr/ird/observe/services/gson}/ObserveHttpErrorAdapter.java (93%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.