branch feature/7553_ajoute_un_widget_pour_les_arbres updated (e1b67c2 -> 6cc7137)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7553_ajoute_un_widget_pour_les_arbres in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git omits e1b67c2 Configure le label du BeanTreeHeader avec un attibut de composant 'labelText' omits 1deb0c7 Ajoute le BeanTreeHeader au panneau de sélection des données omits 5c4079d Ajoute des icones sur les boutons du BeanTreeHeader omits 352e407 Implementation du comportement des boutons de la toolbar du BeanTreeHeader dans le handler omits d6f48d4 Crée le composant BeanTreeHeader visant à offrir un group d'actions facilitant l'utilisation des composants arbre par l'utilisateur adds 7de7265 Normalisation de démarrage des synchro adds 76693a3 suppression code de test adds 60bce99 réajout de l'opération de synchronisation de référentiel avant export adds 3f80809 Permettre de choisir une base locale pour la base de gauche dans la synchro ref et données adds 3d6cc52 fix possible memory leak adds e49194e Amélioration des labels de sources à choisir adds 7bd7052 renomage syncho simple + regroupement des actions de synchronisation adds 1338aeb Corrige les problèmes de sérialisation/deserialisation liés à la synchro referentiel en serveur distant adds d98552c Ajoute le schema et les données referentiel à la sauvegarde de la base lors de la synchro referentiels adds 17974bd Ajoute l'entete de licence manquant adds 3645334 Renverse le test d'assignabilité (la superclass doit etre placée à gauche) adds d20d5f0 Amélioration syntaxique adds 855d58c Merge branch 'feature/7739_syncrho_ref_en_serveur_distant' into 'develop' adds 9d5bba1 Renommage du context de validation pour les services adds cbd0626 On ne propose plus de choisir le context de validation (puisqu'il en reste plus qu'un seul adds 34878ac Renommage des contextes de validation côté ui adds b9b9378 Merge branch 'feature/review_validators' into develop adds a3a5c4c Corrige une erreur de tipo dans une chaine i18n concernant l'ecran de l'action des données observées adds 906c0ad optimize i18n adds 1699f4a Correction du type d'objet dans la popup des combobox de référentiels + ajout traduction manquante adds d45ed4e Suppression de la propriété enabled sur les referentels adds ea02bf6 Utilisation de la dernière version d'eugene avec le nouveau tv java8 adds 9094764 ajout traduction pour le status d'un référentiel dans les écrans d'édition adds 4ede04c Bien recharger le modèle des référentiels après modification de celui-ci adds 8d1761c Bien renseigné le type de toutes les popups de décoration adds 8935677 fixes some tests adds dd17532 Utiliser la bonne source de données pour l'action de validation adds 22e7b05 Du nettoyage + migration en api java 8 adds d8be62d Remove guava Optional usage adds 594e01c Suppression code mort adds bcefef2 Fix NPE if no set defined on activity adds 76821c7 Improve unselect of report adds 009bb7c Suppression configuration en double adds 7cc4776 optimize dependencies new 168834f Crée le composant BeanTreeHeader visant à offrir un group d'actions facilitant l'utilisation des composants arbre par l'utilisateur new 80c8169 Implementation du comportement des boutons de la toolbar du BeanTreeHeader dans le handler new c3f84f9 Ajoute des icones sur les boutons du BeanTreeHeader new 8b2e0c5 Ajoute le BeanTreeHeader au panneau de sélection des données new 69b37f6 Configure le label du BeanTreeHeader avec un attibut de composant 'labelText' new b9d55aa merge i18n new 2e10ca6 Optimize css new 396fd07 Be able to show or not actions (fold or select) of the tree header new 1dc22bc Rename tree header id new 6cc7137 Add tree header in other places in application This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (e1b67c2) \ N -- N -- N refs/heads/feature/7553_ajoute_un_widget_pour_les_arbres (6cc7137) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 6cc7137f84c60d90d4bd534b3488cac2c9d7e94d Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 13:11:51 2016 +0200 Add tree header in other places in application commit 1dc22bc864262f49bf54236e6ec19441f649825e Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 12:55:38 2016 +0200 Rename tree header id commit 396fd071a565d0a8f528d755ac71504718ad413b Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 12:45:40 2016 +0200 Be able to show or not actions (fold or select) of the tree header commit 2e10ca61d85b14b570729ae14192fd0f2fb54c2f Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 12:32:24 2016 +0200 Optimize css commit b9d55aa82af46df16ca20f6bb2c3fa727966ed14 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 12:32:11 2016 +0200 merge i18n commit 69b37f61441a17ec19eed33b75f0717e2b18afcb Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Tue Aug 23 10:14:52 2016 +0200 Configure le label du BeanTreeHeader avec un attibut de composant 'labelText' refs #7553 commit 8b2e0c5f41d92da2b72ffabad1e0173f451cd517 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Mon Aug 22 23:24:52 2016 +0200 Ajoute le BeanTreeHeader au panneau de sélection des données commit c3f84f9ae58ff8bb628120cd0b87e921083c23a5 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Mon Aug 22 23:20:15 2016 +0200 Ajoute des icones sur les boutons du BeanTreeHeader refs #7553 commit 80c8169f4ef3f1f42ca72b90a3cd4651cdefd2c3 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Mon Aug 22 20:10:11 2016 +0200 Implementation du comportement des boutons de la toolbar du BeanTreeHeader dans le handler refs #7553 commit 168834f002b4d5b11fe11cfa530b9b42ef51bd2b Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Sun Aug 21 23:45:16 2016 +0200 Crée le composant BeanTreeHeader visant à offrir un group d'actions facilitant l'utilisation des composants arbre par l'utilisateur refs #7553 Summary of changes: .../swing/decoration/DecoratorService.java | 1 + ...e-application-swing-decoration_en_GB.properties | 1 + ...e-application-swing-decoration_es_ES.properties | 1 + ...e-application-swing-decoration_fr_FR.properties | 1 + .../SetLonglineUniqueHomeIdDtoValidator.java | 11 +- .../SetLonglineUniqueNumberDtoValidator.java | 9 +- ...vityLonglineDto-ui-create-error-validation.xml} | 0 ...tyLonglineDto-ui-create-warning-validation.xml} | 0 ...vityLonglineDto-ui-update-error-validation.xml} | 0 ...tyLonglineDto-ui-update-warning-validation.xml} | 0 ...ineEncounterDto-ui-update-error-validation.xml} | 0 ...neSensorUsedDto-ui-update-error-validation.xml} | 0 ...sCompositionDto-ui-update-error-validation.xml} | 0 ...BasketDto-ui-update-table-error-validation.xml} | 0 ...o-ui-update-catchLongline-error-validation.xml} | 0 ...> BranchlineDto-ui-update-error-validation.xml} | 0 ...chlineDto-ui-update-table-error-validation.xml} | 0 ...BranchlineDto-ui-update-warning-validation.xml} | 0 ...sCompositionDto-ui-update-error-validation.xml} | 0 ...atchLonglineDto-ui-update-error-validation.xml} | 0 ...chLonglineDto-ui-update-warning-validation.xml} | 0 ...=> EncounterDto-ui-update-error-validation.xml} | 0 ... EncounterDto-ui-update-warning-validation.xml} | 0 ...sCompositionDto-ui-update-error-validation.xml} | 0 ...uresLonglineDto-ui-update-error-validation.xml} | 0 ...sCompositionDto-ui-update-error-validation.xml} | 0 ...ectionDto-ui-update-table-error-validation.xml} | 0 ...> SensorUsedDto-ui-update-error-validation.xml} | 0 ...SensorUsedDto-ui-update-warning-validation.xml} | 0 ... SetLonglineDto-ui-create-error-validation.xml} | 0 ...etLonglineDto-ui-create-warning-validation.xml} | 0 ... SetLonglineDto-ui-update-error-validation.xml} | 0 ...etLonglineDto-ui-update-warning-validation.xml} | 0 ...i-update-baitsComposition-error-validation.xml} | 0 ...te-branchlinesComposition-error-validation.xml} | 0 ...ate-floatlinesComposition-error-validation.xml} | 0 ...-update-globalComposition-error-validation.xml} | 0 ...i-update-hooksComposition-error-validation.xml} | 0 ...n.xml => TdrDto-ui-update-error-validation.xml} | 0 ...xml => TdrDto-ui-update-warning-validation.xml} | 0 ...TripLonglineDto-ui-create-error-validation.xml} | 0 ...ipLonglineDto-ui-create-warning-validation.xml} | 0 ...TripLonglineDto-ui-update-error-validation.xml} | 0 ...ipLonglineDto-ui-update-warning-validation.xml} | 0 ...ineGearUseDto-ui-update-warning-validation.xml} | 0 ...l => CountryDto-ui-create-error-validation.xml} | 0 ...=> CountryDto-ui-create-warning-validation.xml} | 0 ...l => CountryDto-ui-update-error-validation.xml} | 0 ...=> CountryDto-ui-update-warning-validation.xml} | 0 ...l => FpaZoneDto-ui-create-error-validation.xml} | 0 ...=> FpaZoneDto-ui-create-warning-validation.xml} | 0 ...l => FpaZoneDto-ui-update-error-validation.xml} | 0 ...=> FpaZoneDto-ui-update-warning-validation.xml} | 0 ...aracteristicDto-ui-create-error-validation.xml} | 0 ...acteristicDto-ui-create-warning-validation.xml} | 0 ...aracteristicDto-ui-update-error-validation.xml} | 0 ...acteristicDto-ui-update-warning-validation.xml} | 0 ...teristicTypeDto-ui-create-error-validation.xml} | 0 ...risticTypeDto-ui-create-warning-validation.xml} | 0 ...teristicTypeDto-ui-update-error-validation.xml} | 0 ...risticTypeDto-ui-update-warning-validation.xml} | 0 ....xml => GearDto-ui-create-error-validation.xml} | 0 ...ml => GearDto-ui-create-warning-validation.xml} | 0 ....xml => GearDto-ui-update-error-validation.xml} | 0 ...ml => GearDto-ui-update-warning-validation.xml} | 0 ...l => HarbourDto-ui-create-error-validation.xml} | 0 ...=> HarbourDto-ui-create-warning-validation.xml} | 0 ...l => HarbourDto-ui-update-error-validation.xml} | 0 ...=> HarbourDto-ui-update-warning-validation.xml} | 0 ...ghtParameterDto-ui-create-error-validation.xml} | 0 ...tParameterDto-ui-create-warning-validation.xml} | 0 ...ghtParameterDto-ui-update-error-validation.xml} | 0 ...tParameterDto-ui-update-warning-validation.xml} | 0 ...xml => OceanDto-ui-create-error-validation.xml} | 0 ...l => OceanDto-ui-create-warning-validation.xml} | 0 ...xml => OceanDto-ui-update-error-validation.xml} | 0 ...l => OceanDto-ui-update-warning-validation.xml} | 0 ... => OrganismDto-ui-create-error-validation.xml} | 0 ...> OrganismDto-ui-create-warning-validation.xml} | 0 ... => OrganismDto-ui-update-error-validation.xml} | 0 ...> OrganismDto-ui-update-warning-validation.xml} | 0 ...ml => PersonDto-ui-create-error-validation.xml} | 0 ... => PersonDto-ui-create-warning-validation.xml} | 0 ...ml => PersonDto-ui-update-error-validation.xml} | 0 ... => PersonDto-ui-update-warning-validation.xml} | 0 ...l => ProgramDto-ui-create-error-validation.xml} | 0 ...=> ProgramDto-ui-create-warning-validation.xml} | 0 ...l => ProgramDto-ui-update-error-validation.xml} | 0 ...=> ProgramDto-ui-update-warning-validation.xml} | 0 ...n.xml => SexDto-ui-create-error-validation.xml} | 0 ...xml => SexDto-ui-create-warning-validation.xml} | 0 ...n.xml => SexDto-ui-update-error-validation.xml} | 0 ...xml => SexDto-ui-update-warning-validation.xml} | 0 ...l => SpeciesDto-ui-create-error-validation.xml} | 0 ...=> SpeciesDto-ui-create-warning-validation.xml} | 0 ...l => SpeciesDto-ui-update-error-validation.xml} | 0 ...=> SpeciesDto-ui-update-warning-validation.xml} | 0 ...SpeciesGroupDto-ui-create-error-validation.xml} | 0 ...eciesGroupDto-ui-create-warning-validation.xml} | 0 ...SpeciesGroupDto-ui-update-error-validation.xml} | 0 ...eciesGroupDto-ui-update-warning-validation.xml} | 0 ... SpeciesListDto-ui-create-error-validation.xml} | 0 ...peciesListDto-ui-create-warning-validation.xml} | 0 ... SpeciesListDto-ui-update-error-validation.xml} | 0 ...peciesListDto-ui-update-warning-validation.xml} | 0 ...ml => VesselDto-ui-create-error-validation.xml} | 0 ... => VesselDto-ui-create-warning-validation.xml} | 0 ...ml => VesselDto-ui-update-error-validation.xml} | 0 ... => VesselDto-ui-update-warning-validation.xml} | 0 ...SizeCategoryDto-ui-create-error-validation.xml} | 0 ...zeCategoryDto-ui-create-warning-validation.xml} | 0 ...SizeCategoryDto-ui-update-error-validation.xml} | 0 ...zeCategoryDto-ui-update-warning-validation.xml} | 0 ...> VesselTypeDto-ui-create-error-validation.xml} | 0 ...VesselTypeDto-ui-create-warning-validation.xml} | 0 ...> VesselTypeDto-ui-update-error-validation.xml} | 0 ...VesselTypeDto-ui-update-warning-validation.xml} | 0 ...aulingStatusDto-ui-create-error-validation.xml} | 0 ...lingStatusDto-ui-create-warning-validation.xml} | 0 ...aulingStatusDto-ui-update-error-validation.xml} | 0 ...lingStatusDto-ui-update-warning-validation.xml} | 0 ...ettingStatusDto-ui-create-error-validation.xml} | 0 ...tingStatusDto-ui-create-warning-validation.xml} | 0 ...ettingStatusDto-ui-update-error-validation.xml} | 0 ...tingStatusDto-ui-update-warning-validation.xml} | 0 ... => BaitTypeDto-ui-create-error-validation.xml} | 0 ...> BaitTypeDto-ui-create-warning-validation.xml} | 0 ... => BaitTypeDto-ui-update-error-validation.xml} | 0 ...> BaitTypeDto-ui-update-warning-validation.xml} | 0 ...FateLonglineDto-ui-create-error-validation.xml} | 0 ...teLonglineDto-ui-create-warning-validation.xml} | 0 ...FateLonglineDto-ui-update-error-validation.xml} | 0 ...teLonglineDto-ui-update-warning-validation.xml} | 0 ...ncounterTypeDto-ui-create-error-validation.xml} | 0 ...ounterTypeDto-ui-create-warning-validation.xml} | 0 ...ncounterTypeDto-ui-update-error-validation.xml} | 0 ...ounterTypeDto-ui-update-warning-validation.xml} | 0 ...> HealthnessDto-ui-create-error-validation.xml} | 0 ...HealthnessDto-ui-create-warning-validation.xml} | 0 ...> HealthnessDto-ui-update-error-validation.xml} | 0 ...HealthnessDto-ui-update-warning-validation.xml} | 0 ...HookPositionDto-ui-create-error-validation.xml} | 0 ...okPositionDto-ui-create-warning-validation.xml} | 0 ...HookPositionDto-ui-update-error-validation.xml} | 0 ...okPositionDto-ui-update-warning-validation.xml} | 0 ... => HookSizeDto-ui-create-error-validation.xml} | 0 ...> HookSizeDto-ui-create-warning-validation.xml} | 0 ... => HookSizeDto-ui-update-error-validation.xml} | 0 ...> HookSizeDto-ui-update-warning-validation.xml} | 0 ... => HookTypeDto-ui-create-error-validation.xml} | 0 ...> HookTypeDto-ui-create-warning-validation.xml} | 0 ... => HookTypeDto-ui-update-error-validation.xml} | 0 ...> HookTypeDto-ui-update-warning-validation.xml} | 0 ...ntalPositionDto-ui-create-error-validation.xml} | 0 ...alPositionDto-ui-create-warning-validation.xml} | 0 ...ntalPositionDto-ui-update-error-validation.xml} | 0 ...alPositionDto-ui-update-warning-validation.xml} | 0 ...icalPositionDto-ui-create-error-validation.xml} | 0 ...alPositionDto-ui-create-warning-validation.xml} | 0 ...icalPositionDto-ui-update-error-validation.xml} | 0 ...alPositionDto-ui-update-warning-validation.xml} | 0 ...tsticksColorDto-ui-create-error-validation.xml} | 0 ...ticksColorDto-ui-create-warning-validation.xml} | 0 ...tsticksColorDto-ui-update-error-validation.xml} | 0 ...ticksColorDto-ui-update-warning-validation.xml} | 0 ...htsticksTypeDto-ui-create-error-validation.xml} | 0 ...sticksTypeDto-ui-create-warning-validation.xml} | 0 ...htsticksTypeDto-ui-update-error-validation.xml} | 0 ...sticksTypeDto-ui-update-warning-validation.xml} | 0 ... => LineTypeDto-ui-create-error-validation.xml} | 0 ...> LineTypeDto-ui-create-warning-validation.xml} | 0 ... => LineTypeDto-ui-update-error-validation.xml} | 0 ...> LineTypeDto-ui-update-warning-validation.xml} | 0 ...turityStatusDto-ui-create-error-validation.xml} | 0 ...rityStatusDto-ui-create-warning-validation.xml} | 0 ...turityStatusDto-ui-update-error-validation.xml} | 0 ...rityStatusDto-ui-update-warning-validation.xml} | 0 ...tigationTypeDto-ui-create-error-validation.xml} | 0 ...gationTypeDto-ui-create-warning-validation.xml} | 0 ...tigationTypeDto-ui-update-error-validation.xml} | 0 ...gationTypeDto-ui-update-warning-validation.xml} | 0 ... SensorBrandDto-ui-create-error-validation.xml} | 0 ...ensorBrandDto-ui-create-warning-validation.xml} | 0 ... SensorBrandDto-ui-update-error-validation.xml} | 0 ...ensorBrandDto-ui-update-warning-validation.xml} | 0 ...orDataFormatDto-ui-create-error-validation.xml} | 0 ...DataFormatDto-ui-create-warning-validation.xml} | 0 ...orDataFormatDto-ui-update-error-validation.xml} | 0 ...DataFormatDto-ui-update-warning-validation.xml} | 0 ...> SensorTypeDto-ui-create-error-validation.xml} | 0 ...SensorTypeDto-ui-create-warning-validation.xml} | 0 ...> SensorTypeDto-ui-update-error-validation.xml} | 0 ...SensorTypeDto-ui-update-warning-validation.xml} | 0 ...SettingShapeDto-ui-create-error-validation.xml} | 0 ...ttingShapeDto-ui-create-warning-validation.xml} | 0 ...SettingShapeDto-ui-update-error-validation.xml} | 0 ...ttingShapeDto-ui-update-warning-validation.xml} | 0 ...eMeasureTypeDto-ui-create-error-validation.xml} | 0 ...easureTypeDto-ui-create-warning-validation.xml} | 0 ...eMeasureTypeDto-ui-update-error-validation.xml} | 0 ...easureTypeDto-ui-update-warning-validation.xml} | 0 ...omacFullnessDto-ui-create-error-validation.xml} | 0 ...acFullnessDto-ui-create-warning-validation.xml} | 0 ...omacFullnessDto-ui-update-error-validation.xml} | 0 ...acFullnessDto-ui-update-warning-validation.xml} | 0 ... => TripTypeDto-ui-create-error-validation.xml} | 0 ...> TripTypeDto-ui-create-warning-validation.xml} | 0 ... => TripTypeDto-ui-update-error-validation.xml} | 0 ...> TripTypeDto-ui-update-warning-validation.xml} | 0 ...vityLonglineDto-ui-create-error-validation.xml} | 0 ...tyLonglineDto-ui-create-warning-validation.xml} | 0 ...vityLonglineDto-ui-update-error-validation.xml} | 0 ...tyLonglineDto-ui-update-warning-validation.xml} | 0 ...tMeasureTypeDto-ui-create-error-validation.xml} | 0 ...easureTypeDto-ui-create-warning-validation.xml} | 0 ...tMeasureTypeDto-ui-update-error-validation.xml} | 0 ...easureTypeDto-ui-update-warning-validation.xml} | 0 ...etectionModeDto-ui-create-error-validation.xml} | 0 ...ectionModeDto-ui-create-warning-validation.xml} | 0 ...etectionModeDto-ui-update-error-validation.xml} | 0 ...ectionModeDto-ui-update-warning-validation.xml} | 0 ...> ObjectFateDto-ui-create-error-validation.xml} | 0 ...ObjectFateDto-ui-create-warning-validation.xml} | 0 ...> ObjectFateDto-ui-update-error-validation.xml} | 0 ...ObjectFateDto-ui-update-warning-validation.xml} | 0 ...ectOperationDto-ui-create-error-validation.xml} | 0 ...tOperationDto-ui-create-warning-validation.xml} | 0 ...ectOperationDto-ui-update-error-validation.xml} | 0 ...tOperationDto-ui-update-warning-validation.xml} | 0 ...> ObjectTypeDto-ui-create-error-validation.xml} | 0 ...ObjectTypeDto-ui-create-warning-validation.xml} | 0 ...> ObjectTypeDto-ui-update-error-validation.xml} | 0 ...ObjectTypeDto-ui-update-warning-validation.xml} | 0 ...servedSystemDto-ui-create-error-validation.xml} | 0 ...rvedSystemDto-ui-create-warning-validation.xml} | 0 ...servedSystemDto-ui-update-error-validation.xml} | 0 ...rvedSystemDto-ui-update-warning-validation.xml} | 0 ...onForDiscardDto-ui-create-error-validation.xml} | 0 ...ForDiscardDto-ui-create-warning-validation.xml} | 0 ...onForDiscardDto-ui-update-error-validation.xml} | 0 ...ForDiscardDto-ui-update-warning-validation.xml} | 0 ...ForNoFishingDto-ui-create-error-validation.xml} | 0 ...rNoFishingDto-ui-create-warning-validation.xml} | 0 ...ForNoFishingDto-ui-update-error-validation.xml} | 0 ...rNoFishingDto-ui-update-warning-validation.xml} | 0 ...onForNullSetDto-ui-create-error-validation.xml} | 0 ...ForNullSetDto-ui-create-warning-validation.xml} | 0 ...onForNullSetDto-ui-update-error-validation.xml} | 0 ...ForNullSetDto-ui-update-warning-validation.xml} | 0 ... SpeciesFateDto-ui-create-error-validation.xml} | 0 ...peciesFateDto-ui-create-warning-validation.xml} | 0 ... SpeciesFateDto-ui-update-error-validation.xml} | 0 ...peciesFateDto-ui-update-warning-validation.xml} | 0 ...peciesStatusDto-ui-create-error-validation.xml} | 0 ...ciesStatusDto-ui-create-warning-validation.xml} | 0 ...peciesStatusDto-ui-update-error-validation.xml} | 0 ...ciesStatusDto-ui-update-warning-validation.xml} | 0 ...dingActivityDto-ui-create-error-validation.xml} | 0 ...ngActivityDto-ui-create-warning-validation.xml} | 0 ...dingActivityDto-ui-update-error-validation.xml} | 0 ...ngActivityDto-ui-update-warning-validation.xml} | 0 ...uoyOperationDto-ui-create-error-validation.xml} | 0 ...yOperationDto-ui-create-warning-validation.xml} | 0 ...uoyOperationDto-ui-update-error-validation.xml} | 0 ...yOperationDto-ui-update-warning-validation.xml} | 0 ...tingBuoyTypeDto-ui-create-error-validation.xml} | 0 ...ngBuoyTypeDto-ui-create-warning-validation.xml} | 0 ...tingBuoyTypeDto-ui-update-error-validation.xml} | 0 ...ngBuoyTypeDto-ui-update-warning-validation.xml} | 0 ...ctivitySeineDto-ui-create-error-validation.xml} | 0 ...ivitySeineDto-ui-create-warning-validation.xml} | 0 ...ctivitySeineDto-ui-update-error-validation.xml} | 0 ...ivitySeineDto-ui-update-warning-validation.xml} | 0 ...ightCategoryDto-ui-create-error-validation.xml} | 0 ...htCategoryDto-ui-create-warning-validation.xml} | 0 ...ightCategoryDto-ui-update-error-validation.xml} | 0 ...htCategoryDto-ui-update-warning-validation.xml} | 0 ....xml => WindDto-ui-create-error-validation.xml} | 0 .../WindDto-ui-create-warning-validation.xml} | 0 ....xml => WindDto-ui-update-error-validation.xml} | 0 .../WindDto-ui-update-warning-validation.xml} | 0 ...ctivitySeineDto-ui-create-error-validation.xml} | 0 ...ivitySeineDto-ui-create-warning-validation.xml} | 0 ...ctivitySeineDto-ui-update-error-validation.xml} | 0 ...ivitySeineDto-ui-update-warning-validation.xml} | 0 ...servedSystemDto-ui-update-error-validation.xml} | 0 ...rvedSystemDto-ui-update-warning-validation.xml} | 0 ...oatingObjectDto-ui-create-error-validation.xml} | 0 ...tingObjectDto-ui-create-warning-validation.xml} | 0 ...oatingObjectDto-ui-update-error-validation.xml} | 0 ...tingObjectDto-ui-update-warning-validation.xml} | 0 ...hoolEstimateDto-ui-update-error-validation.xml} | 0 ...smittingBuoyDto-ui-update-error-validation.xml} | 0 ...eaturesSeineDto-ui-update-error-validation.xml} | 0 ...nTargetCatchDto-ui-update-error-validation.xml} | 0 ...argetCatchDto-ui-update-warning-validation.xml} | 0 ...TargetLengthDto-ui-update-error-validation.xml} | 0 ...rgetLengthDto-ui-update-warning-validation.xml} | 0 ...TargetSampleDto-ui-update-error-validation.xml} | 0 ...ervedSpeciesDto-ui-update-error-validation.xml} | 0 ...hoolEstimateDto-ui-update-error-validation.xml} | 0 ...olEstimateDto-ui-update-warning-validation.xml} | 0 ...xml => RouteDto-ui-create-error-validation.xml} | 0 ...l => RouteDto-ui-create-warning-validation.xml} | 0 ...xml => RouteDto-ui-update-error-validation.xml} | 0 ...l => RouteDto-ui-update-warning-validation.xml} | 0 ...hoolEstimateDto-ui-update-error-validation.xml} | 0 ... => SetSeineDto-ui-create-error-validation.xml} | 0 ...> SetSeineDto-ui-create-warning-validation.xml} | 0 ... => SetSeineDto-ui-update-error-validation.xml} | 0 ...> SetSeineDto-ui-update-warning-validation.xml} | 0 ...nTargetCatchDto-ui-update-error-validation.xml} | 0 ...hoolEstimateDto-ui-update-error-validation.xml} | 0 ...Dto-ui-update-targetCatch-error-validation.xml} | 0 ...ui-update-targetDiscarded-error-validation.xml} | 0 ...Dto-ui-update-targetCatch-error-validation.xml} | 0 ...o-ui-update-targetCatch-warning-validation.xml} | 0 ...ui-update-targetDiscarded-error-validation.xml} | 0 ...-update-targetDiscarded-warning-validation.xml} | 0 ...TargetLengthDto-ui-update-error-validation.xml} | 0 ...rgetLengthDto-ui-update-warning-validation.xml} | 0 ...TargetSampleDto-ui-update-error-validation.xml} | 0 ...smittingBuoyDto-ui-update-error-validation.xml} | 0 ...ittingBuoyDto-ui-update-warning-validation.xml} | 0 ...=> TripSeineDto-ui-create-error-validation.xml} | 0 .../TripSeineDto-ui-create-warning-validation.xml} | 0 ...=> TripSeineDto-ui-update-error-validation.xml} | 0 ... TripSeineDto-ui-update-warning-validation.xml} | 0 ...ineGearUseDto-ui-update-warning-validation.xml} | 0 ...e-application-swing-validation_fr_FR.properties | 16 +- .../validation/BeanValidatorDetectorTest.java | 10 +- .../ObserveApplicationConfigProvider.java | 60 - .../ObserveSwingApplicationConfigProvider.java | 5 +- .../ird/observe/entities/tripMap/TripMapPoint.java | 71 - .../observe/entities/tripMap/TripMapPointType.java | 58 - .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 9 +- .../main/java/fr/ird/observe/ui/ObserveMainUI.jcss | 24 +- .../shared/MoveActivityLonglinesUIAction.java | 13 +- .../actions/shared/MoveActivitySeinesUIAction.java | 6 +- .../ui/actions/shared/MoveRoutesUIAction.java | 4 +- .../ui/actions/shared/MoveTripsUIAction.java | 4 +- .../fr/ird/observe/ui/admin/AdminUIHandler.java | 19 - .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 130 +- .../ird/observe/ui/admin/config/SelectDataUI.jaxx | 4 +- .../ui/admin/consolidate/ConsolidateUIHandler.java | 15 +- .../fr/ird/observe/ui/admin/report/ReportUI.jaxx | 3 +- .../observe/ui/admin/report/ReportUIHandler.java | 145 +- .../observe/ui/admin/save/SaveLocalUIHandler.java | 2 +- .../ui/admin/synchronize/data/DataSynchroUI.jaxx | 17 +- .../ui/admin/synchronize/data/DataSynchroUI.jcss | 9 + .../synchronize/data/DataSynchroUIHandler.java | 46 +- .../referential/legacy/SynchronizeUIHandler.java | 6 +- .../referential/ng/ReferentialSynchroModel.java | 28 +- .../referential/ng/ReferentialSynchroUI.jaxx | 17 +- .../referential/ng/ReferentialSynchroUI.jcss | 9 + .../ng/ReferentialSynchroUIHandler.java | 72 +- .../ui/admin/validate/ValidateConfigUI.jaxx | 11 - .../ui/admin/validate/ValidateConfigUI.jcss | 16 - .../observe/ui/admin/validate/ValidateModel.java | 16 +- .../ui/admin/validate/ValidateUIHandler.java | 7 +- .../ird/observe/ui/content/ContentUIHandler.java | 2 +- .../observe/ui/content/ContentUIInitializer.java | 24 +- .../ui/content/impl/longline/BranchlineUI.jaxx | 2 +- .../impl/longline/LonglineDetailCompositionUI.jaxx | 8 +- .../impl/longline/LonglineGlobalCompositionUI.jaxx | 2 +- .../ui/content/impl/longline/SetLonglineUI.jaxx | 2 +- .../impl/seine/ActivitySeineObservedSystemUI.jaxx | 2 +- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 6 +- .../ui/content/impl/seine/FloatingObjectUI.jaxx | 2 +- .../observe/ui/content/impl/seine/SetSeineUI.jaxx | 2 +- .../open/impl/longline/ActivityLonglineUI.jaxx | 2 +- .../content/open/impl/longline/TripLonglineUI.jaxx | 2 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 2 +- .../ui/content/open/impl/seine/RouteUI.jaxx | 2 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 2 +- .../ui/content/ref/ContentReferenceUIHandler.java | 17 +- .../ird/observe/ui/content/ref/impl/CountryUI.jaxx | 2 +- .../ird/observe/ui/content/ref/impl/FpaZoneUI.jaxx | 2 +- .../content/ref/impl/GearCaracteristicTypeUI.jaxx | 2 +- .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 2 +- .../fr/ird/observe/ui/content/ref/impl/GearUI.jaxx | 2 +- .../ird/observe/ui/content/ref/impl/HarbourUI.jaxx | 2 +- .../content/ref/impl/LengthWeightParameterUI.jaxx | 2 +- .../ird/observe/ui/content/ref/impl/OceanUI.jaxx | 2 +- .../observe/ui/content/ref/impl/OrganismUI.jaxx | 2 +- .../ird/observe/ui/content/ref/impl/PersonUI.jaxx | 2 +- .../ird/observe/ui/content/ref/impl/ProgramUI.jaxx | 2 +- .../fr/ird/observe/ui/content/ref/impl/SexUI.jaxx | 2 +- .../ui/content/ref/impl/SpeciesGroupUI.jaxx | 2 +- .../observe/ui/content/ref/impl/SpeciesListUI.jaxx | 2 +- .../ird/observe/ui/content/ref/impl/SpeciesUI.jaxx | 2 +- .../ui/content/ref/impl/VesselSizeCategoryUI.jaxx | 2 +- .../observe/ui/content/ref/impl/VesselTypeUI.jaxx | 2 +- .../ird/observe/ui/content/ref/impl/VesselUI.jaxx | 2 +- .../ref/impl/longline/BaitHaulingStatusUI.jaxx | 2 +- .../ref/impl/longline/BaitSettingStatusUI.jaxx | 2 +- .../ui/content/ref/impl/longline/BaitTypeUI.jaxx | 2 +- .../ref/impl/longline/CatchFateLonglineUI.jaxx | 2 +- .../content/ref/impl/longline/EncounterTypeUI.jaxx | 2 +- .../ui/content/ref/impl/longline/HealthnessUI.jaxx | 2 +- .../content/ref/impl/longline/HookPositionUI.jaxx | 2 +- .../ui/content/ref/impl/longline/HookSizeUI.jaxx | 2 +- .../ui/content/ref/impl/longline/HookTypeUI.jaxx | 2 +- .../impl/longline/ItemHorizontalPositionUI.jaxx | 2 +- .../ref/impl/longline/ItemVerticalPositionUI.jaxx | 2 +- .../ref/impl/longline/LightsticksColorUI.jaxx | 2 +- .../ref/impl/longline/LightsticksTypeUI.jaxx | 2 +- .../ui/content/ref/impl/longline/LineTypeUI.jaxx | 2 +- .../ref/impl/longline/MaturityStatusUI.jaxx | 2 +- .../ref/impl/longline/MitigationTypeUI.jaxx | 2 +- .../content/ref/impl/longline/SensorBrandUI.jaxx | 2 +- .../ref/impl/longline/SensorDataFormatUI.jaxx | 2 +- .../ui/content/ref/impl/longline/SensorTypeUI.jaxx | 2 +- .../content/ref/impl/longline/SettingShapeUI.jaxx | 2 +- .../ref/impl/longline/SizeMeasureTypeUI.jaxx | 2 +- .../ref/impl/longline/StomacFullnessUI.jaxx | 2 +- .../ui/content/ref/impl/longline/TripTypeUI.jaxx | 2 +- .../impl/longline/VesselActivityLonglineUI.jaxx | 2 +- .../ref/impl/longline/WeightMeasureTypeUI.jaxx | 2 +- .../ui/content/ref/impl/seine/DetectionModeUI.jaxx | 2 +- .../ui/content/ref/impl/seine/ObjectFateUI.jaxx | 2 +- .../content/ref/impl/seine/ObjectOperationUI.jaxx | 2 +- .../ui/content/ref/impl/seine/ObjectTypeUI.jaxx | 2 +- .../content/ref/impl/seine/ObservedSystemUI.jaxx | 2 +- .../content/ref/impl/seine/ReasonForDiscardUI.jaxx | 2 +- .../ref/impl/seine/ReasonForNoFishingUI.jaxx | 2 +- .../content/ref/impl/seine/ReasonForNullSetUI.jaxx | 2 +- .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx | 2 +- .../ui/content/ref/impl/seine/SpeciesStatusUI.jaxx | 2 +- .../ref/impl/seine/SurroundingActivityUI.jaxx | 2 +- .../impl/seine/TransmittingBuoyOperationUI.jaxx | 2 +- .../ref/impl/seine/TransmittingBuoyTypeUI.jaxx | 2 +- .../ref/impl/seine/VesselActivitySeineUI.jaxx | 2 +- .../content/ref/impl/seine/WeightCategoryUI.jaxx | 2 +- .../observe/ui/content/ref/impl/seine/WindUI.jaxx | 2 +- .../observe/ui/content/table/ContentTableMeta.java | 13 +- .../table/impl/longline/BaitsCompositionUI.jaxx | 4 +- .../impl/longline/BranchlinesCompositionUI.jaxx | 4 +- .../table/impl/longline/CatchLonglineUI.jaxx | 6 +- .../content/table/impl/longline/EncounterUI.jaxx | 4 +- .../impl/longline/FloatlinesCompositionUI.jaxx | 4 +- .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 4 +- .../table/impl/longline/HooksCompositionUI.jaxx | 4 +- .../content/table/impl/longline/SensorUsedUI.jaxx | 4 +- .../ui/content/table/impl/longline/TdrUI.jaxx | 4 +- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 4 +- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 4 +- .../table/impl/seine/NonTargetSampleUI.jaxx | 4 +- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 4 +- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 4 +- .../content/table/impl/seine/SchoolEstimateUI.jaxx | 4 +- .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 4 +- .../table/impl/seine/TargetDiscardCatchUI.jaxx | 4 +- .../content/table/impl/seine/TargetSampleUI.jaxx | 4 +- .../ird/observe/ui/storage/StorageUIHandler.java | 4 +- .../ui/storage/tabs/DataSelectionModel.java | 5 +- .../ird/observe/ui/storage/tabs/SecurityModel.java | 31 +- .../ird/observe/ui/util/tree/BeanTreeHeader.jaxx | 11 +- .../ird/observe/ui/util/tree/BeanTreeHeader.jcss | 41 +- .../ui/util/tripMap/TripMapContentBuilder.java | 5 +- .../org.nuiton.config.ApplicationConfigProvider | 2 +- .../observe-application-swing_en_GB.properties | 22 +- .../observe-application-swing_es_ES.properties | 23 +- .../observe-application-swing_fr_FR.properties | 32 +- ...glineDetailCompositionValidatorServiceTest.java | 6 +- .../web/ObserveWebApplicationListener.java | 2 + ...eferentialSynchronizeDiffServiceController.java | 5 +- ...lassInjector.java => ImmutableSetInjector.java} | 46 +- observe-application-web/src/main/resources/mapping | 2 + .../observe/ObserveTopiaPersistenceContext.java | 4 +- .../java/fr/ird/observe/entities/Entities.java | 201 +-- .../entities/longline/ActivityLonglines.java | 5 +- .../referentiel/ObserveReferentialEntities.java | 18 +- .../ird/observe/entities/referentiel/Persons.java | 15 +- .../ird/observe/entities/referentiel/Species2.java | 75 +- .../ird/observe/entities/referentiel/Vessels.java | 4 +- .../ird/observe/entities/seine/ActivitySeines.java | 4 +- .../observe/entities/seine/NonTargetCatchs.java | 37 - .../observe/entities/seine/NonTargetLenghts.java | 37 - .../java/fr/ird/observe/entities/seine/Routes.java | 2 +- .../ird/observe/entities/seine/TargetCatchs.java | 12 - .../ird/observe/entities/seine/TargetLenghts.java | 38 - .../diff/ReferentialSynchronizeDiff.java | 8 +- .../diff/ReferentialSynchronizeDiffService.java | 5 +- .../diff/ReferentialSynchronizeDiffState.java | 2 +- .../diff/ReferentialSynchronizeDiffsEngine.java | 7 +- .../actions/validate/ValidateResultForDtoType.java | 9 +- .../service/actions/validate/ValidateService.java | 6 +- .../actions/validate/ValidateServiceUtils.java | 4 - .../service/actions/validate/ValidatorDtos.java | 23 +- .../fr/ird/observe/services/util/I18nEnumUtil.java | 3 + .../service/actions/validate/validators.json | 843 +++++++++++ .../i18n/observe-services-api_en_GB.properties | 2 + .../i18n/observe-services-api_es_ES.properties | 2 + .../i18n/observe-services-api_fr_FR.properties | 2 + .../observe/services/dto/AbstractReference.java | 32 +- .../observe/services/dto/AbstractReferenceSet.java | 4 +- .../fr/ird/observe/services/dto/DataReference.java | 2 +- .../java/fr/ird/observe/services/dto/IdDtos.java | 15 +- .../services/dto/gson/ImmutableSetAdapter.java | 1 - .../services/dto/gson/ObserveDtoGsonSupplier.java | 3 + .../dto/gson/ReferentialMultimapAdapter.java | 83 ++ .../services/dto/referential/ReferentialDto.java | 9 +- .../dto/referential/ReferentialMultimap.java | 156 ++ .../dto/referential/ReferentialReferences.java | 2 +- .../ird/observe/services/dto/seine/RouteDto.java | 7 +- .../observe/services/dto/seine/TripSeineDto.java | 21 +- .../xmi/observe-services-dto-common.properties | 1 + .../src/main/xmi/observe-services-dto-common.zargo | Bin 42022 -> 41934 bytes .../xmi/observe-services-dto-longline.properties | 1 + .../main/xmi/observe-services-dto-seine.properties | 1 + .../report/AbstractReportServiceRestTest.java | 6 +- .../actions/validate/ValidateServiceRestTest.java | 6 +- .../seine/TripSeineGearUseServiceRestTest.java | 13 +- ...ongline-service-encounter-error-validation.xml} | 0 ... ActivityLongline-service-error-validation.xml} | 0 ...ngline-service-sensorUsed-error-validation.xml} | 0 ...ctivityLongline-service-warning-validation.xml} | 0 ... BaitsComposition-service-error-validation.xml} | 0 ...l => Basket-service-table-error-validation.xml} | 0 ...ine-service-catchLongline-error-validation.xml} | 0 ...xml => Branchline-service-error-validation.xml} | 0 ... Branchline-service-table-error-validation.xml} | 0 ...l => Branchline-service-warning-validation.xml} | 0 ...hlinesComposition-service-error-validation.xml} | 0 ... => CatchLongline-service-error-validation.xml} | 0 ...> CatchLongline-service-warning-validation.xml} | 0 ....xml => Encounter-service-error-validation.xml} | 0 ...ml => Encounter-service-warning-validation.xml} | 0 ...tlinesComposition-service-error-validation.xml} | 0 ...eFeaturesLongline-service-error-validation.xml} | 0 ... HooksComposition-service-error-validation.xml} | 0 ... => Section-service-table-error-validation.xml} | 0 ...xml => SensorUsed-service-error-validation.xml} | 0 ...l => SensorUsed-service-warning-validation.xml} | 0 ...-service-baitsComposition-error-validation.xml} | 0 ...ce-branchlinesComposition-error-validation.xml} | 0 ...ml => SetLongline-service-error-validation.xml} | 0 ...ice-floatlinesComposition-error-validation.xml} | 0 ...service-globalComposition-error-validation.xml} | 0 ...-service-hooksComposition-error-validation.xml} | 0 ... => SetLongline-service-warning-validation.xml} | 0 ...dation.xml => Tdr-service-error-validation.xml} | 0 ...tion.xml => Tdr-service-warning-validation.xml} | 0 ...l => TripLongline-service-error-validation.xml} | 0 ...=> TripLongline-service-warning-validation.xml} | 0 ...on.xml => Country-service-error-validation.xml} | 0 ....xml => Country-service-warning-validation.xml} | 0 ...on.xml => FpaZone-service-error-validation.xml} | 0 ....xml => FpaZone-service-warning-validation.xml} | 0 ...ation.xml => Gear-service-error-validation.xml} | 0 ...ion.xml => Gear-service-warning-validation.xml} | 0 ...GearCaracteristic-service-error-validation.xml} | 0 ...arCaracteristic-service-warning-validation.xml} | 0 ...CaracteristicType-service-error-validation.xml} | 0 ...racteristicType-service-warning-validation.xml} | 0 ...on.xml => Harbour-service-error-validation.xml} | 0 ....xml => Harbour-service-warning-validation.xml} | 0 ...thWeightParameter-service-error-validation.xml} | 0 ...WeightParameter-service-warning-validation.xml} | 0 ...tion.xml => Ocean-service-error-validation.xml} | 0 ...on.xml => Ocean-service-warning-validation.xml} | 0 ...n.xml => Organism-service-error-validation.xml} | 0 ...xml => Organism-service-warning-validation.xml} | 0 ...ion.xml => Person-service-error-validation.xml} | 0 ...n.xml => Person-service-warning-validation.xml} | 0 ...on.xml => Program-service-error-validation.xml} | 0 ....xml => Program-service-warning-validation.xml} | 0 ...dation.xml => Sex-service-error-validation.xml} | 0 ...tion.xml => Sex-service-warning-validation.xml} | 0 ...on.xml => Species-service-error-validation.xml} | 0 ....xml => Species-service-warning-validation.xml} | 0 ...l => SpeciesGroup-service-error-validation.xml} | 0 ...=> SpeciesGroup-service-warning-validation.xml} | 0 ...ml => SpeciesList-service-error-validation.xml} | 0 ... => SpeciesList-service-warning-validation.xml} | 0 ...ion.xml => Vessel-service-error-validation.xml} | 0 ...n.xml => Vessel-service-warning-validation.xml} | 0 ...esselSizeCategory-service-error-validation.xml} | 0 ...selSizeCategory-service-warning-validation.xml} | 0 ...xml => VesselType-service-error-validation.xml} | 0 ...l => VesselType-service-warning-validation.xml} | 0 ...BaitHaulingStatus-service-error-validation.xml} | 0 ...itHaulingStatus-service-warning-validation.xml} | 0 ...BaitSettingStatus-service-error-validation.xml} | 0 ...itSettingStatus-service-warning-validation.xml} | 0 ...n.xml => BaitType-service-error-validation.xml} | 0 ...xml => BaitType-service-warning-validation.xml} | 0 ...CatchFateLongline-service-error-validation.xml} | 0 ...tchFateLongline-service-warning-validation.xml} | 0 ... => EncounterType-service-error-validation.xml} | 0 ...> EncounterType-service-warning-validation.xml} | 0 ...xml => Healthness-service-error-validation.xml} | 0 ...l => Healthness-service-warning-validation.xml} | 0 ...l => HookPosition-service-error-validation.xml} | 0 ...=> HookPosition-service-warning-validation.xml} | 0 ...n.xml => HookSize-service-error-validation.xml} | 0 ...xml => HookSize-service-warning-validation.xml} | 0 ...n.xml => HookType-service-error-validation.xml} | 0 ...xml => HookType-service-warning-validation.xml} | 0 ...orizontalPosition-service-error-validation.xml} | 0 ...izontalPosition-service-warning-validation.xml} | 0 ...mVerticalPosition-service-error-validation.xml} | 0 ...erticalPosition-service-warning-validation.xml} | 0 ... LightsticksColor-service-error-validation.xml} | 0 ...ightsticksColor-service-warning-validation.xml} | 0 ...> LightsticksType-service-error-validation.xml} | 0 ...LightsticksType-service-warning-validation.xml} | 0 ...n.xml => LineType-service-error-validation.xml} | 0 ...xml => LineType-service-warning-validation.xml} | 0 ...=> MaturityStatus-service-error-validation.xml} | 0 ... MaturityStatus-service-warning-validation.xml} | 0 ...=> MitigationType-service-error-validation.xml} | 0 ... MitigationType-service-warning-validation.xml} | 0 ...ml => SensorBrand-service-error-validation.xml} | 0 ... => SensorBrand-service-warning-validation.xml} | 0 ... SensorDataFormat-service-error-validation.xml} | 0 ...ensorDataFormat-service-warning-validation.xml} | 0 ...xml => SensorType-service-error-validation.xml} | 0 ...l => SensorType-service-warning-validation.xml} | 0 ...l => SettingShape-service-error-validation.xml} | 0 ...=> SettingShape-service-warning-validation.xml} | 0 ...> SizeMeasureType-service-error-validation.xml} | 0 ...SizeMeasureType-service-warning-validation.xml} | 0 ...=> StomacFullness-service-error-validation.xml} | 0 ... StomacFullness-service-warning-validation.xml} | 0 ...n.xml => TripType-service-error-validation.xml} | 0 ...xml => TripType-service-warning-validation.xml} | 0 ...lActivityLongline-service-error-validation.xml} | 0 ...ctivityLongline-service-warning-validation.xml} | 0 ...WeightMeasureType-service-error-validation.xml} | 0 ...ightMeasureType-service-warning-validation.xml} | 0 ... => DetectionMode-service-error-validation.xml} | 0 ...> DetectionMode-service-warning-validation.xml} | 0 ...xml => ObjectFate-service-error-validation.xml} | 0 ...l => ObjectFate-service-warning-validation.xml} | 0 ...> ObjectOperation-service-error-validation.xml} | 0 ...ObjectOperation-service-warning-validation.xml} | 0 ...xml => ObjectType-service-error-validation.xml} | 0 ...l => ObjectType-service-warning-validation.xml} | 0 ...=> ObservedSystem-service-error-validation.xml} | 0 ... ObservedSystem-service-warning-validation.xml} | 0 ... ReasonForDiscard-service-error-validation.xml} | 0 ...easonForDiscard-service-warning-validation.xml} | 0 ...easonForNoFishing-service-error-validation.xml} | 0 ...sonForNoFishing-service-warning-validation.xml} | 0 ... ReasonForNullSet-service-error-validation.xml} | 0 ...easonForNullSet-service-warning-validation.xml} | 0 ...ml => SpeciesFate-service-error-validation.xml} | 0 ... => SpeciesFate-service-warning-validation.xml} | 0 ... => SpeciesStatus-service-error-validation.xml} | 0 ...> SpeciesStatus-service-warning-validation.xml} | 0 ...rroundingActivity-service-error-validation.xml} | 0 ...oundingActivity-service-warning-validation.xml} | 0 ...tingBuoyOperation-service-error-validation.xml} | 0 ...ngBuoyOperation-service-warning-validation.xml} | 0 ...nsmittingBuoyType-service-error-validation.xml} | 0 ...mittingBuoyType-service-warning-validation.xml} | 0 ...sselActivitySeine-service-error-validation.xml} | 0 ...elActivitySeine-service-warning-validation.xml} | 0 ...=> WeightCategory-service-error-validation.xml} | 0 .../WeightCategory-service-warning-validation.xml} | 0 ...ation.xml => Wind-service-error-validation.xml} | 0 .../Wind-service-warning-validation.xml} | 0 ... => ActivitySeine-service-error-validation.xml} | 0 ...ne-service-observedSystem-error-validation.xml} | 0 ...-service-observedSystem-warning-validation.xml} | 0 ...> ActivitySeine-service-warning-validation.xml} | 0 ...=> FloatingObject-service-error-validation.xml} | 0 ...vice-objectSchoolEstimate-error-validation.xml} | 0 ...transmittingBuoyOperation-error-validation.xml} | 0 ... FloatingObject-service-warning-validation.xml} | 0 ...rUseFeaturesSeine-service-error-validation.xml} | 0 ...=> NonTargetCatch-service-error-validation.xml} | 0 ... NonTargetCatch-service-warning-validation.xml} | 0 ...> NonTargetLength-service-error-validation.xml} | 0 ...NonTargetLength-service-warning-validation.xml} | 0 ...> NonTargetSample-service-error-validation.xml} | 0 ...ctObservedSpecies-service-error-validation.xml} | 0 ...ectSchoolEstimate-service-error-validation.xml} | 0 ...tSchoolEstimate-service-warning-validation.xml} | 0 ...tion.xml => Route-service-error-validation.xml} | 0 ...on.xml => Route-service-warning-validation.xml} | 0 ...=> SchoolEstimate-service-error-validation.xml} | 0 ...n.xml => SetSeine-service-error-validation.xml} | 0 ...ne-service-nonTargetCatch-error-validation.xml} | 0 ...ne-service-schoolEstimate-error-validation.xml} | 0 ...Seine-service-targetCatch-error-validation.xml} | 0 ...e-service-targetDiscarded-error-validation.xml} | 0 ...xml => SetSeine-service-warning-validation.xml} | 0 ...Catch-service-targetCatch-error-validation.xml} | 0 ...tch-service-targetCatch-warning-validation.xml} | 0 ...h-service-targetDiscarded-error-validation.xml} | 0 ...service-targetDiscarded-warning-validation.xml} | 0 ...l => TargetLength-service-error-validation.xml} | 0 ...=> TargetLength-service-warning-validation.xml} | 0 ...l => TargetSample-service-error-validation.xml} | 0 ... TransmittingBuoy-service-error-validation.xml} | 0 ...ransmittingBuoy-service-warning-validation.xml} | 0 ....xml => TripSeine-service-error-validation.xml} | 0 ...service-gearUseFeatures-warning-validation.xml} | 0 ...ml => TripSeine-service-warning-validation.xml} | 0 .../validation/BeanValidatorDetectorTest.java | 22 +- .../observe/services/ObserveSecurityHelper.java | 38 +- .../ird/observe/services/binder/BinderSupport.java | 2 +- .../referential/ReferentialBinderSupport.java | 1 - .../services/entity/BasketEntitiesExtractor.java | 3 +- .../entity/BranchlineEntitiesExtractor.java | 3 +- .../observe/services/entity/EntitiesExtractor.java | 22 +- .../services/entity/EntitiesSetFactory.java | 157 +- .../services/entity/SectionEntitiesExtractor.java | 3 +- .../entity/SpeciesListEntitiesExtractor.java | 6 +- .../entity/SpeciesListOceanEntitiesExtractor.java | 9 +- .../services/service/DataSourceServiceTopia.java | 2 +- .../services/service/ReferentialServiceTopia.java | 3 +- .../service/SqlScriptProducerServiceTopia.java | 38 +- .../consolidate/ConsolidateDataServiceTopia.java | 9 +- .../ReferentialSynchronizeDiffServiceTopia.java | 12 +- .../sql/InsertSqlStatementGenerator.java | 5 +- .../sql/UpdateSqlStatementGenerator.java | 3 +- .../longline/ActivityLonglineServiceTopia.java | 8 +- .../service/seine/ActivitySeineServiceTopia.java | 10 +- .../services/service/seine/RouteServiceTopia.java | 8 +- .../service/seine/TargetCatchServiceTopia.java | 15 +- .../service/actions/validate/validators.json | 1513 -------------------- .../referentiel/LengthWeightParemetersTest.java | 28 +- .../report/AbstractReportServiceTopiaTest.java | 6 +- .../actions/validate/ValidateServiceTopiaTest.java | 6 +- .../seine/TripSeineGearUseServiceTopiaTest.java | 29 +- .../persistence/metadata/TopiaMetadataModel.java | 4 +- observe-topia-templates-extension/pom.xml | 4 - .../templates/TopiaMetadataModelGenerator.java | 23 +- pom.xml | 2 +- 733 files changed, 2095 insertions(+), 3027 deletions(-) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{ActivityLonglineDto-n1-create-error-validation.xml => ActivityLonglineDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{ActivityLonglineDto-n1-create-warning-validation.xml => ActivityLonglineDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{ActivityLonglineDto-n1-update-error-validation.xml => ActivityLonglineDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{ActivityLonglineDto-n1-update-warning-validation.xml => ActivityLonglineDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{SetLonglineGlobalCompositionDto-n1-update-globalComposition-error-validation.xml => ActivityLonglineEncounterDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{ActivityLonglineSensorUsedDto-n1-update-error-validation.xml => ActivityLonglineSensorUsedDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{BaitsCompositionDto-n1-update-error-validation.xml => BaitsCompositionDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{BasketDto-n1-update-table-error-validation.xml => BasketDto-ui-update-table-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{BranchlineDto-n1-update-catchLongline-error-validation.xml => BranchlineDto-ui-update-catchLongline-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{BranchlineDto-n1-update-error-validation.xml => BranchlineDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{BranchlineDto-n1-update-table-error-validation.xml => BranchlineDto-ui-update-table-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{BranchlineDto-n1-update-warning-validation.xml => BranchlineDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{BranchlinesCompositionDto-n1-update-error-validation.xml => BranchlinesCompositionDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{CatchLonglineDto-n1-update-error-validation.xml => CatchLonglineDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{CatchLonglineDto-n1-update-warning-validation.xml => CatchLonglineDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{EncounterDto-n1-update-error-validation.xml => EncounterDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{EncounterDto-n1-update-warning-validation.xml => EncounterDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{FloatlinesCompositionDto-n1-update-error-validation.xml => FloatlinesCompositionDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{GearUseFeaturesLonglineDto-n1-update-error-validation.xml => GearUseFeaturesLonglineDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{HooksCompositionDto-n1-update-error-validation.xml => HooksCompositionDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{SectionDto-n1-update-table-error-validation.xml => SectionDto-ui-update-table-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{SensorUsedDto-n1-update-error-validation.xml => SensorUsedDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{SensorUsedDto-n1-update-warning-validation.xml => SensorUsedDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{SetLonglineDto-n1-create-error-validation.xml => SetLonglineDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{SetLonglineDto-n1-update-warning-validation.xml => SetLonglineDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{SetLonglineDto-n1-update-error-validation.xml => SetLonglineDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{SetLonglineDto-n1-create-warning-validation.xml => SetLonglineDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{SetLonglineGlobalCompositionDto-n1-update-baitsComposition-error-validation.xml => SetLonglineGlobalCompositionDto-ui-update-baitsComposition-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{SetLonglineGlobalCompositionDto-n1-update-branchlinesComposition-error-validation.xml => SetLonglineGlobalCompositionDto-ui-update-branchlinesComposition-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{SetLonglineGlobalCompositionDto-n1-update-floatlinesComposition-error-validation.xml => SetLonglineGlobalCompositionDto-ui-update-floatlinesComposition-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{ActivityLonglineEncounterDto-n1-update-error-validation.xml => SetLonglineGlobalCompositionDto-ui-update-globalComposition-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{SetLonglineGlobalCompositionDto-n1-update-hooksComposition-error-validation.xml => SetLonglineGlobalCompositionDto-ui-update-hooksComposition-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{TdrDto-n1-update-error-validation.xml => TdrDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{TdrDto-n1-update-warning-validation.xml => TdrDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{TripLonglineDto-n1-create-error-validation.xml => TripLonglineDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/{seine/TripSeineDto-n1-create-warning-validation.xml => longline/TripLonglineDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{TripLonglineDto-n1-update-error-validation.xml => TripLonglineDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{TripLonglineDto-n1-update-warning-validation.xml => TripLonglineDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/{TripLonglineGearUseDto-n1-update-warning-validation.xml => TripLonglineGearUseDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{CountryDto-n1-update-error-validation.xml => CountryDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{seine/WindDto-n1-update-warning-validation.xml => CountryDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{CountryDto-n1-create-error-validation.xml => CountryDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{seine/WindDto-n1-create-warning-validation.xml => CountryDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{SexDto-n1-update-error-validation.xml => FpaZoneDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{FpaZoneDto-n1-create-warning-validation.xml => FpaZoneDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{SexDto-n1-create-error-validation.xml => FpaZoneDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{FpaZoneDto-n1-update-warning-validation.xml => FpaZoneDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{GearCaracteristicDto-n1-update-error-validation.xml => GearCaracteristicDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{GearDto-n1-update-warning-validation.xml => GearCaracteristicDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{GearCaracteristicDto-n1-create-error-validation.xml => GearCaracteristicDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{GearDto-n1-create-warning-validation.xml => GearCaracteristicDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{GearDto-n1-update-error-validation.xml => GearCaracteristicTypeDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{GearCaracteristicTypeDto-n1-update-warning-validation.xml => GearCaracteristicTypeDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{GearCaracteristicTypeDto-n1-update-error-validation.xml => GearCaracteristicTypeDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{GearCaracteristicTypeDto-n1-create-warning-validation.xml => GearCaracteristicTypeDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{GearDto-n1-create-error-validation.xml => GearDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{GearCaracteristicDto-n1-update-warning-validation.xml => GearDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{GearCaracteristicTypeDto-n1-create-error-validation.xml => GearDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{GearCaracteristicDto-n1-create-warning-validation.xml => GearDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{HarbourDto-n1-create-error-validation.xml => HarbourDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{HarbourDto-n1-update-warning-validation.xml => HarbourDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{HarbourDto-n1-update-error-validation.xml => HarbourDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{HarbourDto-n1-create-warning-validation.xml => HarbourDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{LengthWeightParameterDto-n1-create-error-validation.xml => LengthWeightParameterDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{LengthWeightParameterDto-n1-create-warning-validation.xml => LengthWeightParameterDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{LengthWeightParameterDto-n1-update-error-validation.xml => LengthWeightParameterDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{LengthWeightParameterDto-n1-update-warning-validation.xml => LengthWeightParameterDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{seine/VesselActivitySeineDto-n1-create-error-validation.xml => OceanDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{seine/WeightCategoryDto-n1-update-warning-validation.xml => OceanDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{seine/VesselActivitySeineDto-n1-update-error-validation.xml => OceanDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{seine/WeightCategoryDto-n1-create-warning-validation.xml => OceanDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{OrganismDto-n1-create-error-validation.xml => OrganismDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{OrganismDto-n1-update-warning-validation.xml => OrganismDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{OrganismDto-n1-update-error-validation.xml => OrganismDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{OrganismDto-n1-create-warning-validation.xml => OrganismDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{PersonDto-n1-create-error-validation.xml => PersonDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{VesselSizeCategoryDto-n1-update-warning-validation.xml => PersonDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{PersonDto-n1-update-error-validation.xml => PersonDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{VesselSizeCategoryDto-n1-create-warning-validation.xml => PersonDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{ProgramDto-n1-create-error-validation.xml => ProgramDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{ProgramDto-n1-create-warning-validation.xml => ProgramDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{ProgramDto-n1-update-error-validation.xml => ProgramDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{ProgramDto-n1-update-warning-validation.xml => ProgramDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{FpaZoneDto-n1-update-error-validation.xml => SexDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{SexDto-n1-update-warning-validation.xml => SexDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{FpaZoneDto-n1-create-error-validation.xml => SexDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{SexDto-n1-create-warning-validation.xml => SexDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{SpeciesDto-n1-create-error-validation.xml => SpeciesDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{SpeciesDto-n1-create-warning-validation.xml => SpeciesDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{SpeciesDto-n1-update-error-validation.xml => SpeciesDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{SpeciesDto-n1-update-warning-validation.xml => SpeciesDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{seine/TransmittingBuoyTypeDto-n1-create-error-validation.xml => SpeciesGroupDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{seine/VesselActivitySeineDto-n1-update-warning-validation.xml => SpeciesGroupDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{seine/TransmittingBuoyTypeDto-n1-update-error-validation.xml => SpeciesGroupDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{seine/VesselActivitySeineDto-n1-create-warning-validation.xml => SpeciesGroupDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{longline/WeightMeasureTypeDto-n1-update-error-validation.xml => SpeciesListDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{SpeciesListDto-n1-update-warning-validation.xml => SpeciesListDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{longline/WeightMeasureTypeDto-n1-create-error-validation.xml => SpeciesListDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{SpeciesListDto-n1-create-warning-validation.xml => SpeciesListDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{VesselDto-n1-create-error-validation.xml => VesselDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{VesselDto-n1-update-warning-validation.xml => VesselDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{VesselDto-n1-update-error-validation.xml => VesselDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{VesselDto-n1-create-warning-validation.xml => VesselDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{VesselSizeCategoryDto-n1-create-error-validation.xml => VesselSizeCategoryDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{PersonDto-n1-update-warning-validation.xml => VesselSizeCategoryDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{VesselSizeCategoryDto-n1-update-error-validation.xml => VesselSizeCategoryDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{PersonDto-n1-create-warning-validation.xml => VesselSizeCategoryDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{seine/TransmittingBuoyOperationDto-n1-create-error-validation.xml => VesselTypeDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{seine/TransmittingBuoyTypeDto-n1-update-warning-validation.xml => VesselTypeDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{seine/TransmittingBuoyOperationDto-n1-update-error-validation.xml => VesselTypeDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{seine/TransmittingBuoyTypeDto-n1-create-warning-validation.xml => VesselTypeDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{VesselActivityLonglineDto-n1-update-error-validation.xml => BaitHaulingStatusDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{WeightMeasureTypeDto-n1-update-warning-validation.xml => BaitHaulingStatusDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{VesselActivityLonglineDto-n1-create-error-validation.xml => BaitHaulingStatusDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{WeightMeasureTypeDto-n1-create-warning-validation.xml => BaitHaulingStatusDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{TripTypeDto-n1-update-error-validation.xml => BaitSettingStatusDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{VesselActivityLonglineDto-n1-update-warning-validation.xml => BaitSettingStatusDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{TripTypeDto-n1-create-error-validation.xml => BaitSettingStatusDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{VesselActivityLonglineDto-n1-create-warning-validation.xml => BaitSettingStatusDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{StomacFullnessDto-n1-update-error-validation.xml => BaitTypeDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{TripTypeDto-n1-update-warning-validation.xml => BaitTypeDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{StomacFullnessDto-n1-create-error-validation.xml => BaitTypeDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{TripTypeDto-n1-create-warning-validation.xml => BaitTypeDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{SizeMeasureTypeDto-n1-update-error-validation.xml => CatchFateLonglineDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{StomacFullnessDto-n1-update-warning-validation.xml => CatchFateLonglineDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{SizeMeasureTypeDto-n1-create-error-validation.xml => CatchFateLonglineDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{StomacFullnessDto-n1-create-warning-validation.xml => CatchFateLonglineDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{SettingShapeDto-n1-update-error-validation.xml => EncounterTypeDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{SizeMeasureTypeDto-n1-update-warning-validation.xml => EncounterTypeDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{SettingShapeDto-n1-create-error-validation.xml => EncounterTypeDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{SizeMeasureTypeDto-n1-create-warning-validation.xml => EncounterTypeDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{SensorTypeDto-n1-update-error-validation.xml => HealthnessDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{SettingShapeDto-n1-update-warning-validation.xml => HealthnessDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{SensorTypeDto-n1-create-error-validation.xml => HealthnessDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{SettingShapeDto-n1-create-warning-validation.xml => HealthnessDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{SensorDataFormatDto-n1-update-error-validation.xml => HookPositionDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{SensorTypeDto-n1-update-warning-validation.xml => HookPositionDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{SensorDataFormatDto-n1-create-error-validation.xml => HookPositionDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{SensorTypeDto-n1-create-warning-validation.xml => HookPositionDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{MitigationTypeDto-n1-update-error-validation.xml => HookSizeDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{SensorDataFormatDto-n1-update-warning-validation.xml => HookSizeDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{MitigationTypeDto-n1-create-error-validation.xml => HookSizeDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{SensorDataFormatDto-n1-create-warning-validation.xml => HookSizeDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{MaturityStatusDto-n1-update-error-validation.xml => HookTypeDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{MitigationTypeDto-n1-update-warning-validation.xml => HookTypeDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{MaturityStatusDto-n1-create-error-validation.xml => HookTypeDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{MitigationTypeDto-n1-create-warning-validation.xml => HookTypeDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{LineTypeDto-n1-update-error-validation.xml => ItemHorizontalPositionDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{MaturityStatusDto-n1-update-warning-validation.xml => ItemHorizontalPositionDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{LineTypeDto-n1-create-error-validation.xml => ItemHorizontalPositionDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{MaturityStatusDto-n1-create-warning-validation.xml => ItemHorizontalPositionDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{LightsticksTypeDto-n1-update-error-validation.xml => ItemVerticalPositionDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{LineTypeDto-n1-update-warning-validation.xml => ItemVerticalPositionDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{LightsticksTypeDto-n1-create-error-validation.xml => ItemVerticalPositionDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{LineTypeDto-n1-create-warning-validation.xml => ItemVerticalPositionDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{LightsticksColorDto-n1-update-error-validation.xml => LightsticksColorDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{LightsticksTypeDto-n1-update-warning-validation.xml => LightsticksColorDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{LightsticksColorDto-n1-create-error-validation.xml => LightsticksColorDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{LightsticksTypeDto-n1-create-warning-validation.xml => LightsticksColorDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{ItemVerticalPositionDto-n1-update-error-validation.xml => LightsticksTypeDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{LightsticksColorDto-n1-update-warning-validation.xml => LightsticksTypeDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{ItemVerticalPositionDto-n1-create-error-validation.xml => LightsticksTypeDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{LightsticksColorDto-n1-create-warning-validation.xml => LightsticksTypeDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{ItemHorizontalPositionDto-n1-update-error-validation.xml => LineTypeDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{ItemVerticalPositionDto-n1-update-warning-validation.xml => LineTypeDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{ItemHorizontalPositionDto-n1-create-error-validation.xml => LineTypeDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{ItemVerticalPositionDto-n1-create-warning-validation.xml => LineTypeDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{HookTypeDto-n1-update-error-validation.xml => MaturityStatusDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{ItemHorizontalPositionDto-n1-update-warning-validation.xml => MaturityStatusDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{HookTypeDto-n1-create-error-validation.xml => MaturityStatusDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{ItemHorizontalPositionDto-n1-create-warning-validation.xml => MaturityStatusDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{HookSizeDto-n1-update-error-validation.xml => MitigationTypeDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{HookTypeDto-n1-update-warning-validation.xml => MitigationTypeDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{HookSizeDto-n1-create-error-validation.xml => MitigationTypeDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{HookTypeDto-n1-create-warning-validation.xml => MitigationTypeDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{SensorBrandDto-n1-update-error-validation.xml => SensorBrandDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{SensorBrandDto-n1-update-warning-validation.xml => SensorBrandDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{SensorBrandDto-n1-create-error-validation.xml => SensorBrandDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{SensorBrandDto-n1-create-warning-validation.xml => SensorBrandDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{HookPositionDto-n1-update-error-validation.xml => SensorDataFormatDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{HookSizeDto-n1-update-warning-validation.xml => SensorDataFormatDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{HookPositionDto-n1-create-error-validation.xml => SensorDataFormatDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{HookSizeDto-n1-create-warning-validation.xml => SensorDataFormatDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{HealthnessDto-n1-update-error-validation.xml => SensorTypeDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{HookPositionDto-n1-update-warning-validation.xml => SensorTypeDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{HealthnessDto-n1-create-error-validation.xml => SensorTypeDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{HookPositionDto-n1-create-warning-validation.xml => SensorTypeDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{EncounterTypeDto-n1-update-error-validation.xml => SettingShapeDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{HealthnessDto-n1-update-warning-validation.xml => SettingShapeDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{EncounterTypeDto-n1-create-error-validation.xml => SettingShapeDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{HealthnessDto-n1-create-warning-validation.xml => SettingShapeDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{CatchFateLonglineDto-n1-update-error-validation.xml => SizeMeasureTypeDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{EncounterTypeDto-n1-update-warning-validation.xml => SizeMeasureTypeDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{CatchFateLonglineDto-n1-create-error-validation.xml => SizeMeasureTypeDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{EncounterTypeDto-n1-create-warning-validation.xml => SizeMeasureTypeDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{BaitTypeDto-n1-update-error-validation.xml => StomacFullnessDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{CatchFateLonglineDto-n1-update-warning-validation.xml => StomacFullnessDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{BaitTypeDto-n1-create-error-validation.xml => StomacFullnessDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{CatchFateLonglineDto-n1-create-warning-validation.xml => StomacFullnessDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{BaitSettingStatusDto-n1-update-error-validation.xml => TripTypeDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{BaitTypeDto-n1-update-warning-validation.xml => TripTypeDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{BaitSettingStatusDto-n1-create-error-validation.xml => TripTypeDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{BaitTypeDto-n1-create-warning-validation.xml => TripTypeDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{BaitHaulingStatusDto-n1-update-error-validation.xml => VesselActivityLonglineDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{BaitSettingStatusDto-n1-update-warning-validation.xml => VesselActivityLonglineDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{BaitHaulingStatusDto-n1-create-error-validation.xml => VesselActivityLonglineDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{BaitSettingStatusDto-n1-create-warning-validation.xml => VesselActivityLonglineDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{SpeciesListDto-n1-update-error-validation.xml => longline/WeightMeasureTypeDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{BaitHaulingStatusDto-n1-update-warning-validation.xml => WeightMeasureTypeDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{SpeciesListDto-n1-create-error-validation.xml => longline/WeightMeasureTypeDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/{BaitHaulingStatusDto-n1-create-warning-validation.xml => WeightMeasureTypeDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{SurroundingActivityDto-n1-create-error-validation.xml => DetectionModeDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{TransmittingBuoyOperationDto-n1-update-warning-validation.xml => DetectionModeDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{SurroundingActivityDto-n1-update-error-validation.xml => DetectionModeDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{TransmittingBuoyOperationDto-n1-create-warning-validation.xml => DetectionModeDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{SpeciesStatusDto-n1-create-error-validation.xml => ObjectFateDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{SurroundingActivityDto-n1-update-warning-validation.xml => ObjectFateDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{SpeciesStatusDto-n1-update-error-validation.xml => ObjectFateDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{SurroundingActivityDto-n1-create-warning-validation.xml => ObjectFateDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{SpeciesFateDto-n1-create-error-validation.xml => ObjectOperationDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{SpeciesStatusDto-n1-update-warning-validation.xml => ObjectOperationDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{SpeciesFateDto-n1-update-error-validation.xml => ObjectOperationDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{SpeciesStatusDto-n1-create-warning-validation.xml => ObjectOperationDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ReasonForNullSetDto-n1-create-error-validation.xml => ObjectTypeDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{SpeciesFateDto-n1-update-warning-validation.xml => ObjectTypeDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ReasonForNullSetDto-n1-update-error-validation.xml => ObjectTypeDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ObjectTypeDto-n1-update-warning-validation.xml => ObjectTypeDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ReasonForNoFishingDto-n1-create-error-validation.xml => ObservedSystemDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{SpeciesFateDto-n1-create-warning-validation.xml => ObservedSystemDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ReasonForNoFishingDto-n1-update-error-validation.xml => ObservedSystemDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ReasonForNullSetDto-n1-update-warning-validation.xml => ObservedSystemDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ReasonForDiscardDto-n1-create-error-validation.xml => ReasonForDiscardDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ReasonForNullSetDto-n1-create-warning-validation.xml => ReasonForDiscardDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ReasonForDiscardDto-n1-update-error-validation.xml => ReasonForDiscardDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ReasonForNoFishingDto-n1-update-warning-validation.xml => ReasonForDiscardDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ObservedSystemDto-n1-create-error-validation.xml => ReasonForNoFishingDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ReasonForNoFishingDto-n1-create-warning-validation.xml => ReasonForNoFishingDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ObservedSystemDto-n1-update-error-validation.xml => ReasonForNoFishingDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ReasonForDiscardDto-n1-update-warning-validation.xml => ReasonForNoFishingDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ObjectTypeDto-n1-create-error-validation.xml => ReasonForNullSetDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ReasonForDiscardDto-n1-create-warning-validation.xml => ReasonForNullSetDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ObjectTypeDto-n1-update-error-validation.xml => ReasonForNullSetDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ObservedSystemDto-n1-update-warning-validation.xml => ReasonForNullSetDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ObjectOperationDto-n1-create-error-validation.xml => SpeciesFateDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ObservedSystemDto-n1-create-warning-validation.xml => SpeciesFateDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ObjectOperationDto-n1-update-error-validation.xml => SpeciesFateDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ObjectTypeDto-n1-create-warning-validation.xml => SpeciesFateDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ObjectFateDto-n1-create-error-validation.xml => SpeciesStatusDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ObjectOperationDto-n1-update-warning-validation.xml => SpeciesStatusDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ObjectFateDto-n1-update-error-validation.xml => SpeciesStatusDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ObjectOperationDto-n1-create-warning-validation.xml => SpeciesStatusDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{DetectionModeDto-n1-create-error-validation.xml => SurroundingActivityDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ObjectFateDto-n1-update-warning-validation.xml => SurroundingActivityDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{DetectionModeDto-n1-update-error-validation.xml => SurroundingActivityDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{ObjectFateDto-n1-create-warning-validation.xml => SurroundingActivityDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{VesselTypeDto-n1-create-error-validation.xml => seine/TransmittingBuoyOperationDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{DetectionModeDto-n1-update-warning-validation.xml => TransmittingBuoyOperationDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{VesselTypeDto-n1-update-error-validation.xml => seine/TransmittingBuoyOperationDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{DetectionModeDto-n1-create-warning-validation.xml => TransmittingBuoyOperationDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{SpeciesGroupDto-n1-create-error-validation.xml => seine/TransmittingBuoyTypeDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{VesselTypeDto-n1-update-warning-validation.xml => seine/TransmittingBuoyTypeDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{SpeciesGroupDto-n1-update-error-validation.xml => seine/TransmittingBuoyTypeDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{VesselTypeDto-n1-create-warning-validation.xml => seine/TransmittingBuoyTypeDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{OceanDto-n1-create-error-validation.xml => seine/VesselActivitySeineDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{SpeciesGroupDto-n1-update-warning-validation.xml => seine/VesselActivitySeineDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{OceanDto-n1-update-error-validation.xml => seine/VesselActivitySeineDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{SpeciesGroupDto-n1-create-warning-validation.xml => seine/VesselActivitySeineDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{WeightCategoryDto-n1-create-error-validation.xml => WeightCategoryDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{OceanDto-n1-update-warning-validation.xml => seine/WeightCategoryDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{WeightCategoryDto-n1-update-error-validation.xml => WeightCategoryDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{OceanDto-n1-create-warning-validation.xml => seine/WeightCategoryDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{WindDto-n1-update-error-validation.xml => WindDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{CountryDto-n1-update-warning-validation.xml => seine/WindDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/{WindDto-n1-create-error-validation.xml => WindDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/{CountryDto-n1-create-warning-validation.xml => seine/WindDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{ActivitySeineDto-n1-create-error-validation.xml => ActivitySeineDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{ActivitySeineDto-n1-create-warning-validation.xml => ActivitySeineDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{ActivitySeineDto-n1-update-error-validation.xml => ActivitySeineDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{ActivitySeineDto-n1-update-warning-validation.xml => ActivitySeineDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{ActivitySeineObservedSystemDto-n1-update-error-validation.xml => ActivitySeineObservedSystemDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{ActivitySeineObservedSystemDto-n1-update-warning-validation.xml => ActivitySeineObservedSystemDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{FloatingObjectDto-n1-create-error-validation.xml => FloatingObjectDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{FloatingObjectDto-n1-update-warning-validation.xml => FloatingObjectDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{FloatingObjectDto-n1-update-error-validation.xml => FloatingObjectDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{FloatingObjectDto-n1-create-warning-validation.xml => FloatingObjectDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{FloatingObjectSchoolEstimateDto-n1-update-error-validation.xml => FloatingObjectSchoolEstimateDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{FloatingObjectTransmittingBuoyDto-n1-update-error-validation.xml => FloatingObjectTransmittingBuoyDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{GearUseFeaturesSeineDto-n1-update-error-validation.xml => GearUseFeaturesSeineDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{NonTargetCatchDto-n1-update-error-validation.xml => NonTargetCatchDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{NonTargetCatchDto-n1-update-warning-validation.xml => NonTargetCatchDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{NonTargetLengthDto-n1-update-error-validation.xml => NonTargetLengthDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{NonTargetLengthDto-n1-update-warning-validation.xml => NonTargetLengthDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{NonTargetSampleDto-n1-update-error-validation.xml => NonTargetSampleDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{ObjectObservedSpeciesDto-n1-update-error-validation.xml => ObjectObservedSpeciesDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{ObjectSchoolEstimateDto-n1-update-error-validation.xml => ObjectSchoolEstimateDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{ObjectSchoolEstimateDto-n1-update-warning-validation.xml => ObjectSchoolEstimateDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{RouteDto-n1-create-error-validation.xml => RouteDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{RouteDto-n1-create-warning-validation.xml => RouteDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{RouteDto-n1-update-error-validation.xml => RouteDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{RouteDto-n1-update-warning-validation.xml => RouteDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{SchoolEstimateDto-n1-update-error-validation.xml => SchoolEstimateDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{SetSeineDto-n1-create-error-validation.xml => SetSeineDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{SetSeineDto-n1-update-warning-validation.xml => SetSeineDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{SetSeineDto-n1-update-error-validation.xml => SetSeineDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{SetSeineDto-n1-create-warning-validation.xml => SetSeineDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{SetSeineNonTargetCatchDto-n1-update-error-validation.xml => SetSeineNonTargetCatchDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{SetSeineSchoolEstimateDto-n1-update-error-validation.xml => SetSeineSchoolEstimateDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{SetSeineTargetCatchDto-n1-update-targetCatch-error-validation.xml => SetSeineTargetCatchDto-ui-update-targetCatch-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{SetSeineTargetCatchDto-n1-update-targetDiscarded-error-validation.xml => SetSeineTargetCatchDto-ui-update-targetDiscarded-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{TargetCatchDto-n1-update-targetCatch-error-validation.xml => TargetCatchDto-ui-update-targetCatch-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{TargetCatchDto-n1-update-targetCatch-warning-validation.xml => TargetCatchDto-ui-update-targetCatch-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{TargetCatchDto-n1-update-targetDiscarded-error-validation.xml => TargetCatchDto-ui-update-targetDiscarded-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{TargetCatchDto-n1-update-targetDiscarded-warning-validation.xml => TargetCatchDto-ui-update-targetDiscarded-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{TargetLengthDto-n1-update-error-validation.xml => TargetLengthDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{TargetLengthDto-n1-update-warning-validation.xml => TargetLengthDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{TargetSampleDto-n1-update-error-validation.xml => TargetSampleDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{TransmittingBuoyDto-n1-update-error-validation.xml => TransmittingBuoyDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{TransmittingBuoyDto-n1-update-warning-validation.xml => TransmittingBuoyDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{TripSeineDto-n1-create-error-validation.xml => TripSeineDto-ui-create-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/{longline/TripLonglineDto-n1-create-warning-validation.xml => seine/TripSeineDto-ui-create-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{TripSeineDto-n1-update-error-validation.xml => TripSeineDto-ui-update-error-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{TripSeineDto-n1-update-warning-validation.xml => TripSeineDto-ui-update-warning-validation.xml} (100%) rename observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/{TripSeineGearUseDto-n1-update-warning-validation.xml => TripSeineGearUseDto-ui-update-warning-validation.xml} (100%) delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveApplicationConfigProvider.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/entities/tripMap/TripMapPoint.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/entities/tripMap/TripMapPointType.java copy observe-application-web/src/main/java/fr/ird/observe/application/web/injector/{ObserveClassInjector.java => ImmutableSetInjector.java} (50%) delete mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchs.java delete mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/seine/NonTargetLenghts.java delete mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/seine/TargetLenghts.java create mode 100644 observe-services-api/src/main/resources/fr/ird/observe/services/service/actions/validate/validators.json create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReferentialMultimapAdapter.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{SetLongline-n1-update-globalComposition-error-validation.xml => ActivityLongline-service-encounter-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{ActivityLongline-n1-update-error-validation.xml => ActivityLongline-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{ActivityLongline-n1-update-sensorUsed-error-validation.xml => ActivityLongline-service-sensorUsed-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{ActivityLongline-n1-update-warning-validation.xml => ActivityLongline-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{BaitsComposition-n1-update-error-validation.xml => BaitsComposition-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{Basket-n1-update-table-error-validation.xml => Basket-service-table-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{Branchline-n1-update-catchLongline-error-validation.xml => Branchline-service-catchLongline-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{Branchline-n1-update-error-validation.xml => Branchline-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{Branchline-n1-update-table-error-validation.xml => Branchline-service-table-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{Branchline-n1-update-warning-validation.xml => Branchline-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{BranchlinesComposition-n1-update-error-validation.xml => BranchlinesComposition-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{CatchLongline-n1-update-error-validation.xml => CatchLongline-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{CatchLongline-n1-update-warning-validation.xml => CatchLongline-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{Encounter-n1-update-error-validation.xml => Encounter-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{Encounter-n1-update-warning-validation.xml => Encounter-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{FloatlinesComposition-n1-update-error-validation.xml => FloatlinesComposition-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{GearUseFeaturesLongline-n1-update-error-validation.xml => GearUseFeaturesLongline-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{HooksComposition-n1-update-error-validation.xml => HooksComposition-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{Section-n1-update-table-error-validation.xml => Section-service-table-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{SensorUsed-n1-update-error-validation.xml => SensorUsed-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{SensorUsed-n1-update-warning-validation.xml => SensorUsed-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{SetLongline-n1-update-baitsComposition-error-validation.xml => SetLongline-service-baitsComposition-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{SetLongline-n1-update-branchlinesComposition-error-validation.xml => SetLongline-service-branchlinesComposition-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{SetLongline-n1-update-error-validation.xml => SetLongline-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{SetLongline-n1-update-floatlinesComposition-error-validation.xml => SetLongline-service-floatlinesComposition-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{ActivityLongline-n1-update-encounter-error-validation.xml => SetLongline-service-globalComposition-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{SetLongline-n1-update-hooksComposition-error-validation.xml => SetLongline-service-hooksComposition-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{SetLongline-n1-update-warning-validation.xml => SetLongline-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{Tdr-n1-update-error-validation.xml => Tdr-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{Tdr-n1-update-warning-validation.xml => Tdr-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{TripLongline-n1-update-error-validation.xml => TripLongline-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/longline/{TripLongline-n1-update-warning-validation.xml => TripLongline-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Country-n1-update-error-validation.xml => Country-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{seine/Wind-n1-update-warning-validation.xml => Country-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Sex-n1-update-error-validation.xml => FpaZone-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{FpaZone-n1-update-warning-validation.xml => FpaZone-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{GearCaracteristicType-n1-update-error-validation.xml => Gear-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{GearCaracteristicType-n1-update-warning-validation.xml => Gear-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{GearCaracteristic-n1-update-error-validation.xml => GearCaracteristic-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{GearCaracteristic-n1-update-warning-validation.xml => GearCaracteristic-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Gear-n1-update-error-validation.xml => GearCaracteristicType-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Gear-n1-update-warning-validation.xml => GearCaracteristicType-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Harbour-n1-update-error-validation.xml => Harbour-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Harbour-n1-update-warning-validation.xml => Harbour-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{LengthWeightParameter-n1-update-error-validation.xml => LengthWeightParameter-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{LengthWeightParameter-n1-update-warning-validation.xml => LengthWeightParameter-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{seine/VesselActivitySeine-n1-update-error-validation.xml => Ocean-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{seine/WeightCategory-n1-update-warning-validation.xml => Ocean-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Organism-n1-update-error-validation.xml => Organism-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Organism-n1-update-warning-validation.xml => Organism-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Person-n1-update-error-validation.xml => Person-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{VesselSizeCategory-n1-update-warning-validation.xml => Person-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Program-n1-update-error-validation.xml => Program-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Program-n1-update-warning-validation.xml => Program-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{FpaZone-n1-update-error-validation.xml => Sex-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Sex-n1-update-warning-validation.xml => Sex-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Species-n1-update-error-validation.xml => Species-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Species-n1-update-warning-validation.xml => Species-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{seine/TransmittingBuoyType-n1-update-error-validation.xml => SpeciesGroup-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{seine/VesselActivitySeine-n1-update-warning-validation.xml => SpeciesGroup-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{longline/WeightMeasureType-n1-update-error-validation.xml => SpeciesList-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{SpeciesList-n1-update-warning-validation.xml => SpeciesList-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Vessel-n1-update-error-validation.xml => Vessel-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Vessel-n1-update-warning-validation.xml => Vessel-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{VesselSizeCategory-n1-update-error-validation.xml => VesselSizeCategory-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Person-n1-update-warning-validation.xml => VesselSizeCategory-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{seine/TransmittingBuoyOperation-n1-update-error-validation.xml => VesselType-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{seine/TransmittingBuoyType-n1-update-warning-validation.xml => VesselType-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{VesselActivityLongline-n1-update-error-validation.xml => BaitHaulingStatus-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{WeightMeasureType-n1-update-warning-validation.xml => BaitHaulingStatus-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{TripType-n1-update-error-validation.xml => BaitSettingStatus-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{VesselActivityLongline-n1-update-warning-validation.xml => BaitSettingStatus-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{StomacFullness-n1-update-error-validation.xml => BaitType-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{TripType-n1-update-warning-validation.xml => BaitType-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{SizeMeasureType-n1-update-error-validation.xml => CatchFateLongline-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{StomacFullness-n1-update-warning-validation.xml => CatchFateLongline-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{SettingShape-n1-update-error-validation.xml => EncounterType-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{SizeMeasureType-n1-update-warning-validation.xml => EncounterType-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{SensorType-n1-update-error-validation.xml => Healthness-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{SettingShape-n1-update-warning-validation.xml => Healthness-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{SensorDataFormat-n1-update-error-validation.xml => HookPosition-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{SensorType-n1-update-warning-validation.xml => HookPosition-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{MitigationType-n1-update-error-validation.xml => HookSize-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{SensorDataFormat-n1-update-warning-validation.xml => HookSize-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{MaturityStatus-n1-update-error-validation.xml => HookType-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{MitigationType-n1-update-warning-validation.xml => HookType-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{LineType-n1-update-error-validation.xml => ItemHorizontalPosition-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{MaturityStatus-n1-update-warning-validation.xml => ItemHorizontalPosition-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{LightsticksType-n1-update-error-validation.xml => ItemVerticalPosition-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{LineType-n1-update-warning-validation.xml => ItemVerticalPosition-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{LightsticksColor-n1-update-error-validation.xml => LightsticksColor-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{LightsticksType-n1-update-warning-validation.xml => LightsticksColor-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{ItemVerticalPosition-n1-update-error-validation.xml => LightsticksType-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{LightsticksColor-n1-update-warning-validation.xml => LightsticksType-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{ItemHorizontalPosition-n1-update-error-validation.xml => LineType-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{ItemVerticalPosition-n1-update-warning-validation.xml => LineType-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{HookType-n1-update-error-validation.xml => MaturityStatus-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{ItemHorizontalPosition-n1-update-warning-validation.xml => MaturityStatus-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{HookSize-n1-update-error-validation.xml => MitigationType-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{HookType-n1-update-warning-validation.xml => MitigationType-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{SensorBrand-n1-update-error-validation.xml => SensorBrand-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{SensorBrand-n1-update-warning-validation.xml => SensorBrand-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{HookPosition-n1-update-error-validation.xml => SensorDataFormat-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{HookSize-n1-update-warning-validation.xml => SensorDataFormat-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{Healthness-n1-update-error-validation.xml => SensorType-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{HookPosition-n1-update-warning-validation.xml => SensorType-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{EncounterType-n1-update-error-validation.xml => SettingShape-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{Healthness-n1-update-warning-validation.xml => SettingShape-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{CatchFateLongline-n1-update-error-validation.xml => SizeMeasureType-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{EncounterType-n1-update-warning-validation.xml => SizeMeasureType-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{BaitType-n1-update-error-validation.xml => StomacFullness-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{CatchFateLongline-n1-update-warning-validation.xml => StomacFullness-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{BaitSettingStatus-n1-update-error-validation.xml => TripType-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{BaitType-n1-update-warning-validation.xml => TripType-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{BaitHaulingStatus-n1-update-error-validation.xml => VesselActivityLongline-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{BaitSettingStatus-n1-update-warning-validation.xml => VesselActivityLongline-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{SpeciesList-n1-update-error-validation.xml => longline/WeightMeasureType-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/{BaitHaulingStatus-n1-update-warning-validation.xml => WeightMeasureType-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/{SurroundingActivity-n1-update-error-validation.xml => DetectionMode-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/{TransmittingBuoyOperation-n1-update-warning-validation.xml => DetectionMode-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/{SpeciesStatus-n1-update-error-validation.xml => ObjectFate-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/{SurroundingActivity-n1-update-warning-validation.xml => ObjectFate-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/{SpeciesFate-n1-update-error-validation.xml => ObjectOperation-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/{SpeciesStatus-n1-update-warning-validation.xml => ObjectOperation-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/{ReasonForNullSet-n1-update-error-validation.xml => ObjectType-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/{ObjectType-n1-update-warning-validation.xml => ObjectType-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/{ReasonForNoFishing-n1-update-error-validation.xml => ObservedSystem-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/{SpeciesFate-n1-update-warning-validation.xml => ObservedSystem-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/{ReasonForDiscard-n1-update-error-validation.xml => ReasonForDiscard-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/{ReasonForNullSet-n1-update-warning-validation.xml => ReasonForDiscard-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/{ObservedSystem-n1-update-error-validation.xml => ReasonForNoFishing-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/{ReasonForNoFishing-n1-update-warning-validation.xml => ReasonForNoFishing-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/{ObjectType-n1-update-error-validation.xml => ReasonForNullSet-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/{ReasonForDiscard-n1-update-warning-validation.xml => ReasonForNullSet-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/{ObjectOperation-n1-update-error-validation.xml => SpeciesFate-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/{ObservedSystem-n1-update-warning-validation.xml => SpeciesFate-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/{ObjectFate-n1-update-error-validation.xml => SpeciesStatus-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/{ObjectOperation-n1-update-warning-validation.xml => SpeciesStatus-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/{DetectionMode-n1-update-error-validation.xml => SurroundingActivity-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/{ObjectFate-n1-update-warning-validation.xml => SurroundingActivity-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{VesselType-n1-update-error-validation.xml => seine/TransmittingBuoyOperation-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/{DetectionMode-n1-update-warning-validation.xml => TransmittingBuoyOperation-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{SpeciesGroup-n1-update-error-validation.xml => seine/TransmittingBuoyType-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{VesselType-n1-update-warning-validation.xml => seine/TransmittingBuoyType-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Ocean-n1-update-error-validation.xml => seine/VesselActivitySeine-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{SpeciesGroup-n1-update-warning-validation.xml => seine/VesselActivitySeine-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/{WeightCategory-n1-update-error-validation.xml => WeightCategory-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Ocean-n1-update-warning-validation.xml => seine/WeightCategory-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/{Wind-n1-update-error-validation.xml => Wind-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/referentiel/{Country-n1-update-warning-validation.xml => seine/Wind-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{ActivitySeine-n1-update-error-validation.xml => ActivitySeine-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{ActivitySeine-n1-update-observedSystem-error-validation.xml => ActivitySeine-service-observedSystem-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{ActivitySeine-n1-update-observedSystem-warning-validation.xml => ActivitySeine-service-observedSystem-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{ActivitySeine-n1-update-warning-validation.xml => ActivitySeine-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{FloatingObject-n1-update-error-validation.xml => FloatingObject-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{FloatingObject-n1-update-objectSchoolEstimate-error-validation.xml => FloatingObject-service-objectSchoolEstimate-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{FloatingObject-n1-update-transmittingBuoyOperation-error-validation.xml => FloatingObject-service-transmittingBuoyOperation-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{FloatingObject-n1-update-warning-validation.xml => FloatingObject-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{GearUseFeaturesSeine-n1-update-error-validation.xml => GearUseFeaturesSeine-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{NonTargetCatch-n1-update-error-validation.xml => NonTargetCatch-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{NonTargetCatch-n1-update-warning-validation.xml => NonTargetCatch-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{NonTargetLength-n1-update-error-validation.xml => NonTargetLength-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{NonTargetLength-n1-update-warning-validation.xml => NonTargetLength-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{NonTargetSample-n1-update-error-validation.xml => NonTargetSample-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{ObjectObservedSpecies-n1-update-error-validation.xml => ObjectObservedSpecies-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{ObjectSchoolEstimate-n1-update-error-validation.xml => ObjectSchoolEstimate-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{ObjectSchoolEstimate-n1-update-warning-validation.xml => ObjectSchoolEstimate-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{Route-n1-update-error-validation.xml => Route-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{Route-n1-update-warning-validation.xml => Route-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{SchoolEstimate-n1-update-error-validation.xml => SchoolEstimate-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{SetSeine-n1-update-error-validation.xml => SetSeine-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{SetSeine-n1-update-nonTargetCatch-error-validation.xml => SetSeine-service-nonTargetCatch-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{SetSeine-n1-update-schoolEstimate-error-validation.xml => SetSeine-service-schoolEstimate-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{SetSeine-n1-update-targetCatch-error-validation.xml => SetSeine-service-targetCatch-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{SetSeine-n1-update-targetDiscarded-error-validation.xml => SetSeine-service-targetDiscarded-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{SetSeine-n1-update-warning-validation.xml => SetSeine-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{TargetCatch-n1-update-targetCatch-error-validation.xml => TargetCatch-service-targetCatch-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{TargetCatch-n1-update-targetCatch-warning-validation.xml => TargetCatch-service-targetCatch-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{TargetCatch-n1-update-targetDiscarded-error-validation.xml => TargetCatch-service-targetDiscarded-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{TargetCatch-n1-update-targetDiscarded-warning-validation.xml => TargetCatch-service-targetDiscarded-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{TargetLength-n1-update-error-validation.xml => TargetLength-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{TargetLength-n1-update-warning-validation.xml => TargetLength-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{TargetSample-n1-update-error-validation.xml => TargetSample-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{TransmittingBuoy-n1-update-error-validation.xml => TransmittingBuoy-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{TransmittingBuoy-n1-update-warning-validation.xml => TransmittingBuoy-service-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{TripSeine-n1-update-error-validation.xml => TripSeine-service-error-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{TripSeine-n1-update-gearUseFeatures-warning-validation.xml => TripSeine-service-gearUseFeatures-warning-validation.xml} (100%) rename observe-services-topia-validation/src/main/resources/fr/ird/observe/entities/seine/{TripSeine-n1-update-warning-validation.xml => TripSeine-service-warning-validation.xml} (100%) delete mode 100644 observe-services-topia/src/main/resources/fr/ird/observe/services/service/actions/validate/validators.json -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553_ajoute_un_widget_pour_les_arbres in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 168834f002b4d5b11fe11cfa530b9b42ef51bd2b Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Sun Aug 21 23:45:16 2016 +0200 Crée le composant BeanTreeHeader visant à offrir un group d'actions facilitant l'utilisation des composants arbre par l'utilisateur refs #7553 --- .../ird/observe/ui/util/tree/BeanTreeHeader.jaxx | 50 ++++++++++++++++ .../ird/observe/ui/util/tree/BeanTreeHeader.jcss | 67 ++++++++++++++++++++++ .../ui/util/tree/BeanTreeHeaderHandler.java | 45 +++++++++++++++ .../observe-application-swing_en_GB.properties | 11 ++-- .../observe-application-swing_es_ES.properties | 11 ++-- .../observe-application-swing_fr_FR.properties | 8 +-- 6 files changed, 178 insertions(+), 14 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx new file mode 100644 index 0000000..6110ef1 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx @@ -0,0 +1,50 @@ +<!-- + #%L + ObServe :: Swing + %% + Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<JPanel id="beanTreeHeader" + layout='{new BorderLayout()}'> + + <BeanTreeHeaderHandler id='handler' constructorParams='this'/> + + <script><![CDATA[ + +void $afterCompleteSetup() { + getHandler().initUI(); +} + +]]> + </script> + + <JLabel id="label" constraints='BorderLayout.CENTER'/> + + <JToolBar id='toolbar' constraints='BorderLayout.EAST'> + + <!-- les boutons pour grouper/déplier tout l'arbre --> + <JButton id='colapseAll'/> + <JButton id='expandAll'/> + + <!-- les boutons pour sélectionner/déselctionner tout l'arbre --> + <JButton id='selectAll'/> + <JButton id='deselectAll'/> + + </JToolBar> + +</JPanel> \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss new file mode 100644 index 0000000..8b8c11d --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss @@ -0,0 +1,67 @@ +/* + * #%L + * ObServe :: Swing + * %% + * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +#label { + opaque:false; + text:{""}; +} + +#toolbar { + floatable:false; + borderPainted:false; +} + +#colapseAll { + actionIcon:"combobox-reset"; + toolTipText:"observe.tree.action.collapseAll.tip"; + focusable:false; + focusPainted:false; + visible:{true}; + enabled:{true}; +} + +#expandAll { + actionIcon:"add"; + toolTipText:"observe.tree.action.expandAll.tip"; + focusable:false; + focusPainted:false; + visible:{true}; + enabled:{true}; +} + +#selectAll { + actionIcon:"add"; + toolTipText:"observe.tree.action.selectAll.tip"; + focusable:false; + focusPainted:false; + visible:{true}; + enabled:{true}; +} + +#deselectAll { + actionIcon:"combobox-reset"; + toolTipText:"observe.tree.action.deselectAll.tip"; + focusable:false; + focusPainted:false; + visible:{true}; + enabled:{true}; +} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeaderHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeaderHandler.java new file mode 100644 index 0000000..e9d09a4 --- /dev/null +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeaderHandler.java @@ -0,0 +1,45 @@ +package fr.ird.observe.ui.util.tree; + +/* + * #%L + * ObServe :: Swing + * %% + * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * @author Samuel Maisonneuve- maisonneuve@codelutin.com + */ +public class BeanTreeHeaderHandler { + + private static final Log log = LogFactory.getLog(BeanTreeHeaderHandler.class); + + private final BeanTreeHeader ui; + + public BeanTreeHeaderHandler(BeanTreeHeader ui) { + this.ui = ui; + } + + public void initUI() { + + } + +} diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index 7ccf536..37f022f 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -340,6 +340,7 @@ observe.admin.resume.operation.failed= observe.admin.resume.operation.need.fix= observe.admin.resume.operation.not.started= observe.admin.resume.operation.running= +observe.application.config=ObServe Configuration observe.catchAcquisitionModeEnum.GROUPED=Batch observe.catchAcquisitionModeEnum.INDIVIDUAL=Individual observe.choice.cancel=Cancel @@ -602,7 +603,6 @@ observe.config.map.layer7.description= observe.config.map.layer8.description= observe.config.map.layer9.description= observe.config.map.style.description= -observe.config.name= observe.config.observation.activitysDetaillees= observe.config.observation.fauneAssociee= observe.config.observation.floatingObject= @@ -639,6 +639,7 @@ observe.config.ui.showNumberEditorButton=Flag sets to true to show button to inv observe.config.ui.showTimeEditorSlider=Show timer slider observe.config.ui.storeRemoteStorage=Flag sets to true to store in config a remote connexion (except passwords) observe.config.ui.treeOpenNodes= +observe.configuration.description= observe.content.action.activity=Create a new activity observe.content.action.activity.tip=Create a new activity observe.content.action.baitHaulingStatus.create.tip= @@ -2116,10 +2117,10 @@ observe.title.storage.info=Storage details observe.title.technical.informations=Technical information of %1$s observe.title.unique.key=Unique keys used in a referentiel observe.title.welcome.admin=Observe Admin -observe.tree.action.collapseAll.tip= -observe.tree.action.expandAll.tip= -observe.tree.action.selectAll.tip= -observe.tree.action.unselectAll.tip= +observe.tree.action.collapseAll.tip=Collapse all +observe.tree.action.deselectAll.tip=Deselect All +observe.tree.action.expandAll.tip=Expand all +observe.tree.action.selectAll.tip=Select All observe.tree.activityLongline=Activity observe.tree.activityLongline.unsaved=New activity observe.tree.activitySeine=Activity diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index 35fc99f..27110cd 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -340,6 +340,7 @@ observe.admin.resume.operation.failed=la operación no realizada observe.admin.resume.operation.need.fix=la operación nesista correcciones observe.admin.resume.operation.not.started=operación no empezada observe.admin.resume.operation.running=operación en curso... +observe.config.name=Configuración de ObServe observe.catchAcquisitionModeEnum.GROUPED= observe.catchAcquisitionModeEnum.INDIVIDUAL= observe.choice.cancel=Cancelar @@ -602,7 +603,6 @@ observe.config.map.layer7.description= observe.config.map.layer8.description= observe.config.map.layer9.description= observe.config.map.style.description= -observe.config.name= observe.config.observation.activitysDetaillees=Observación de actividades detalladas observe.config.observation.fauneAssociee=Observación de Fauna asociada observe.config.observation.floatingObject=Observación de objetos flotantes @@ -639,6 +639,7 @@ observe.config.ui.showNumberEditorButton=Para mostrar el botón que permite usar observe.config.ui.showTimeEditorSlider= observe.config.ui.storeRemoteStorage=Para activar la copia de seguridad de la configuración del origen de datos remota observe.config.ui.treeOpenNodes= +observe.configuration.description= observe.content.action.activity=Crear una nueva actividad observe.content.action.activity.tip=Crear una nueva actividad para la ruta actual observe.content.action.baitHaulingStatus.create.tip= @@ -2116,10 +2117,10 @@ observe.title.storage.info= observe.title.technical.informations= observe.title.unique.key= observe.title.welcome.admin= -observe.tree.action.collapseAll.tip= -observe.tree.action.expandAll.tip= -observe.tree.action.selectAll.tip= -observe.tree.action.unselectAll.tip= +observe.tree.action.collapseAll.tip=Cerrar los nudos +observe.tree.action.deselectAll.tip=Deseleccionar todo +observe.tree.action.expandAll.tip=Abrir los nudos +observe.tree.action.selectAll.tip=Seleccionar todo observe.tree.activityLongline=Actividad observe.tree.activityLongline.unsaved=Nueva actividad observe.tree.activitySeine=Actividad diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 5348eda..ef8ba97 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -2116,10 +2116,10 @@ observe.title.storage.info=Information sur la source de données observe.title.technical.informations=Informations techniques du référentiel %1$s observe.title.unique.key=Clefs métier du référentiel %1$s observe.title.welcome.admin=Observe Administrateur -observe.tree.action.collapseAll.tip= -observe.tree.action.expandAll.tip= -observe.tree.action.selectAll.tip= -observe.tree.action.unselectAll.tip= +observe.tree.action.collapseAll.tip=Tout grouper +observe.tree.action.deselectAll.tip=Tout désélectionner +observe.tree.action.expandAll.tip=Tout déplier +observe.tree.action.selectAll.tip=Tout sélectionner observe.tree.activityLongline=Activités observe.tree.activityLongline.unsaved=Nouvelle activité observe.tree.activitySeine=Activités -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553_ajoute_un_widget_pour_les_arbres in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 80c8169f4ef3f1f42ca72b90a3cd4651cdefd2c3 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Mon Aug 22 20:10:11 2016 +0200 Implementation du comportement des boutons de la toolbar du BeanTreeHeader dans le handler refs #7553 --- observe-application-swing/pom.xml | 1 + .../ird/observe/ui/util/tree/BeanTreeHeader.jaxx | 24 +++----- .../ui/util/tree/BeanTreeHeaderHandler.java | 68 ++++++++++++++++++++-- 3 files changed, 71 insertions(+), 22 deletions(-) diff --git a/observe-application-swing/pom.xml b/observe-application-swing/pom.xml index ed97561..56611b8 100644 --- a/observe-application-swing/pom.xml +++ b/observe-application-swing/pom.xml @@ -52,6 +52,7 @@ ${project.basedir}/src/main/java/fr/ird/observe/ui/ObserveCommon.jcss </jaxx.commonCss> <jaxx.cssExtension>jcss</jaxx.cssExtension> + <jaxx.addAutoHandlerUI>true</jaxx.addAutoHandlerUI> <!-- main class in JAR --> <maven.jar.main.class>fr.ird.observe.ObserveAdminCLI</maven.jar.main.class> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx index 6110ef1..4cf27ed 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx @@ -19,31 +19,21 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JPanel id="beanTreeHeader" - layout='{new BorderLayout()}'> +<JPanel layout='{new BorderLayout()}'> - <BeanTreeHeaderHandler id='handler' constructorParams='this'/> - - <script><![CDATA[ - -void $afterCompleteSetup() { - getHandler().initUI(); -} - -]]> - </script> + <JTree id='tree' javaBean='new JTree()'/> <JLabel id="label" constraints='BorderLayout.CENTER'/> <JToolBar id='toolbar' constraints='BorderLayout.EAST'> <!-- les boutons pour grouper/déplier tout l'arbre --> - <JButton id='colapseAll'/> - <JButton id='expandAll'/> + <JButton id='colapseAll' onActionPerformed='handler.collapseAll()'/> + <JButton id='expandAll' onActionPerformed='handler.expandAll()'/> - <!-- les boutons pour sélectionner/déselctionner tout l'arbre --> - <JButton id='selectAll'/> - <JButton id='deselectAll'/> + <!-- les boutons pour sélectionner/déselectionner tout l'arbre --> + <JButton id='selectAll' onActionPerformed='handler.selectAll()'/> + <JButton id='deselectAll' onActionPerformed='handler.deselectAll()'/> </JToolBar> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeaderHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeaderHandler.java index e9d09a4..5dc51b8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeaderHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeaderHandler.java @@ -22,24 +22,82 @@ package fr.ird.observe.ui.util.tree; * #L% */ +import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.JTree; +import javax.swing.tree.TreePath; +import javax.swing.tree.TreeSelectionModel; + /** * @author Samuel Maisonneuve- maisonneuve@codelutin.com */ -public class BeanTreeHeaderHandler { +public class BeanTreeHeaderHandler implements UIHandler<BeanTreeHeader> { private static final Log log = LogFactory.getLog(BeanTreeHeaderHandler.class); - private final BeanTreeHeader ui; + public BeanTreeHeader getUi() { + return ui; + } + + private BeanTreeHeader ui; + + private JTree getTree() { + return getUi().getTree(); + } + + @Override + public void beforeInit(BeanTreeHeader beanTreeHeader) { + this.ui = beanTreeHeader; + } + + @Override + public void afterInit(BeanTreeHeader beanTreeHeader) {} - public BeanTreeHeaderHandler(BeanTreeHeader ui) { - this.ui = ui; + public void collapseAll() { + // Let's deselect the nodes before collapsing them + deselectAll(); + + JTree tree = getTree(); + for (int i = 0; i < tree.getRowCount(); i++) { + tree.collapseRow(i); + } + } + + public void expandAll() { + JTree tree = getTree(); + for (int i = 0; i < tree.getRowCount(); i++) { + tree.expandRow(i); + } } - public void initUI() { + public void selectAll() { + // To be selected, nodes need to be expanded + expandAll(); + + JTree tree = getTree(); + TreeSelectionModel selectionModel = tree.getSelectionModel(); + for (int i = 0, l = tree.getRowCount(); i < l; i++) { + + TreePath path = tree.getPathForRow(i); + if (!selectionModel.isPathSelected(path)) { + tree.setSelectionPath(path); + } + } } + public void deselectAll() { + JTree tree = getTree(); + TreeSelectionModel selectionModel = tree.getSelectionModel(); + + for (int i = 0, l = tree.getRowCount(); i < l; i++) { + + TreePath path = tree.getPathForRow(i); + if (selectionModel.isPathSelected(path)) { + tree.setSelectionPath(path); + } + } + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553_ajoute_un_widget_pour_les_arbres in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit c3f84f9ae58ff8bb628120cd0b87e921083c23a5 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Mon Aug 22 23:20:15 2016 +0200 Ajoute des icones sur les boutons du BeanTreeHeader refs #7553 --- .../src/main/filters/observe-ui.properties | 5 +++++ .../java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx | 2 +- .../java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss | 12 ++++++------ .../ird/observe/ui/util/tree/BeanTreeHeaderHandler.java | 6 +++--- .../i18n/observe-application-swing_en_GB.properties | 2 +- .../i18n/observe-application-swing_es_ES.properties | 2 +- .../i18n/observe-application-swing_fr_FR.properties | 2 +- .../src/main/resources/icons/action-collapse.png | Bin 0 -> 372 bytes .../src/main/resources/icons/action-expand.png | Bin 0 -> 371 bytes .../src/main/resources/icons/action-select.png | Bin 0 -> 392 bytes .../src/main/resources/icons/action-unselect.png | Bin 0 -> 311 bytes 11 files changed, 18 insertions(+), 13 deletions(-) diff --git a/observe-application-swing/src/main/filters/observe-ui.properties b/observe-application-swing/src/main/filters/observe-ui.properties index 84c9f1c..308e53a 100644 --- a/observe-application-swing/src/main/filters/observe-ui.properties +++ b/observe-application-swing/src/main/filters/observe-ui.properties @@ -190,6 +190,11 @@ icon.action.generate=action-generate.png icon.action.insert-before=action-insert-before.png icon.action.insert-after=action-insert-after.png +icon.action.expand=action-expand.png +icon.action.collapse=action-collapse.png +icon.action.select=action-select.png +icon.action.unselect=action-unselect.png + icon.action.wizard-state-pending=action-wizard-state-pending-16.png icon.action.wizard-state-running=action-wizard-state-running-16.png icon.action.wizard-state-need_fix=action-wizard-state-need_fix-16.png diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx index 4cf27ed..4579ce1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx @@ -33,7 +33,7 @@ <!-- les boutons pour sélectionner/déselectionner tout l'arbre --> <JButton id='selectAll' onActionPerformed='handler.selectAll()'/> - <JButton id='deselectAll' onActionPerformed='handler.deselectAll()'/> + <JButton id='unselectAll' onActionPerformed='handler.unselectAll()'/> </JToolBar> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss index 8b8c11d..06d1a49 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss @@ -31,7 +31,7 @@ } #colapseAll { - actionIcon:"combobox-reset"; + actionIcon:"collapse"; toolTipText:"observe.tree.action.collapseAll.tip"; focusable:false; focusPainted:false; @@ -40,7 +40,7 @@ } #expandAll { - actionIcon:"add"; + actionIcon:"expand"; toolTipText:"observe.tree.action.expandAll.tip"; focusable:false; focusPainted:false; @@ -49,7 +49,7 @@ } #selectAll { - actionIcon:"add"; + actionIcon:"select"; toolTipText:"observe.tree.action.selectAll.tip"; focusable:false; focusPainted:false; @@ -57,9 +57,9 @@ enabled:{true}; } -#deselectAll { - actionIcon:"combobox-reset"; - toolTipText:"observe.tree.action.deselectAll.tip"; +#unselectAll { + actionIcon:"unselect"; + toolTipText:"observe.tree.action.unselectAll.tip"; focusable:false; focusPainted:false; visible:{true}; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeaderHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeaderHandler.java index 5dc51b8..97016be 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeaderHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeaderHandler.java @@ -56,8 +56,8 @@ public class BeanTreeHeaderHandler implements UIHandler<BeanTreeHeader> { public void afterInit(BeanTreeHeader beanTreeHeader) {} public void collapseAll() { - // Let's deselect the nodes before collapsing them - deselectAll(); + // Let's unselect the nodes before collapsing them + unselectAll(); JTree tree = getTree(); for (int i = 0; i < tree.getRowCount(); i++) { @@ -88,7 +88,7 @@ public class BeanTreeHeaderHandler implements UIHandler<BeanTreeHeader> { } } - public void deselectAll() { + public void unselectAll() { JTree tree = getTree(); TreeSelectionModel selectionModel = tree.getSelectionModel(); diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index 37f022f..0f60c6e 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -2118,9 +2118,9 @@ observe.title.technical.informations=Technical information of %1$s observe.title.unique.key=Unique keys used in a referentiel observe.title.welcome.admin=Observe Admin observe.tree.action.collapseAll.tip=Collapse all -observe.tree.action.deselectAll.tip=Deselect All observe.tree.action.expandAll.tip=Expand all observe.tree.action.selectAll.tip=Select All +observe.tree.action.unselectAll.tip=Unselect All observe.tree.activityLongline=Activity observe.tree.activityLongline.unsaved=New activity observe.tree.activitySeine=Activity diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index 27110cd..2732801 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -2118,9 +2118,9 @@ observe.title.technical.informations= observe.title.unique.key= observe.title.welcome.admin= observe.tree.action.collapseAll.tip=Cerrar los nudos -observe.tree.action.deselectAll.tip=Deseleccionar todo observe.tree.action.expandAll.tip=Abrir los nudos observe.tree.action.selectAll.tip=Seleccionar todo +observe.tree.action.unselectAll.tip=Deseleccionar todo observe.tree.activityLongline=Actividad observe.tree.activityLongline.unsaved=Nueva actividad observe.tree.activitySeine=Actividad diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index ef8ba97..3ebf942 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -2117,9 +2117,9 @@ observe.title.technical.informations=Informations techniques du référentiel %1 observe.title.unique.key=Clefs métier du référentiel %1$s observe.title.welcome.admin=Observe Administrateur observe.tree.action.collapseAll.tip=Tout grouper -observe.tree.action.deselectAll.tip=Tout désélectionner observe.tree.action.expandAll.tip=Tout déplier observe.tree.action.selectAll.tip=Tout sélectionner +observe.tree.action.unselectAll.tip=Tout désélectionner observe.tree.activityLongline=Activités observe.tree.activityLongline.unsaved=Nouvelle activité observe.tree.activitySeine=Activités diff --git a/observe-application-swing/src/main/resources/icons/action-collapse.png b/observe-application-swing/src/main/resources/icons/action-collapse.png new file mode 100644 index 0000000..f88a24a Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-collapse.png differ diff --git a/observe-application-swing/src/main/resources/icons/action-expand.png b/observe-application-swing/src/main/resources/icons/action-expand.png new file mode 100644 index 0000000..3c19e48 Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-expand.png differ diff --git a/observe-application-swing/src/main/resources/icons/action-select.png b/observe-application-swing/src/main/resources/icons/action-select.png new file mode 100644 index 0000000..bbee129 Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-select.png differ diff --git a/observe-application-swing/src/main/resources/icons/action-unselect.png b/observe-application-swing/src/main/resources/icons/action-unselect.png new file mode 100644 index 0000000..3b49008 Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-unselect.png differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553_ajoute_un_widget_pour_les_arbres in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 8b2e0c5f41d92da2b72ffabad1e0173f451cd517 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Mon Aug 22 23:24:52 2016 +0200 Ajoute le BeanTreeHeader au panneau de sélection des données --- .../main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx index d6e5b71..cfe9a52 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx @@ -35,6 +35,8 @@ fr.ird.observe.ui.tree.DataSelectionTreeSelectionModel fr.ird.observe.ui.storage.tabs.DataSelectionModel + fr.ird.observe.ui.util.tree.BeanTreeHeader + jaxx.runtime.SwingUtil javax.swing.tree.TreeSelectionModel @@ -76,11 +78,15 @@ public void destroy() { <JPanel id='PENDING_content'> <JScrollPane id='selectTreePane' constraints='BorderLayout.CENTER' - decorator='boxed'> + decorator='boxed' columnHeaderView='{treeHeader}'> <!-- arbre de selection des exports --> <JTree id='selectTree'/> + + <BeanTreeHeader id='treeHeader' tree='{selectTree}'/> + </JScrollPane> + </JPanel> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553_ajoute_un_widget_pour_les_arbres in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 69b37f61441a17ec19eed33b75f0717e2b18afcb Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Tue Aug 23 10:14:52 2016 +0200 Configure le label du BeanTreeHeader avec un attibut de composant 'labelText' refs #7553 --- .../src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx | 4 ++++ .../src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx index 4579ce1..9419d8e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx @@ -21,8 +21,12 @@ --> <JPanel layout='{new BorderLayout()}'> + <!-- label --> + <String id='labelText' javaBean='null'/> + <!-- tree --> <JTree id='tree' javaBean='new JTree()'/> + <JLabel id="label" constraints='BorderLayout.CENTER'/> <JToolBar id='toolbar' constraints='BorderLayout.EAST'> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss index 06d1a49..3b253f6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss @@ -22,7 +22,7 @@ #label { opaque:false; - text:{""}; + text:{SwingUtil.getStringValue(getLabelText())}; } #toolbar { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553_ajoute_un_widget_pour_les_arbres in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit b9d55aa82af46df16ca20f6bb2c3fa727966ed14 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 12:32:11 2016 +0200 merge i18n --- .../src/main/resources/i18n/observe-application-swing_en_GB.properties | 1 + .../src/main/resources/i18n/observe-application-swing_es_ES.properties | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index 0f60c6e..c41c73c 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -603,6 +603,7 @@ observe.config.map.layer7.description= observe.config.map.layer8.description= observe.config.map.layer9.description= observe.config.map.style.description= +observe.config.name= observe.config.observation.activitysDetaillees= observe.config.observation.fauneAssociee= observe.config.observation.floatingObject= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index 2732801..9aed392 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -340,7 +340,6 @@ observe.admin.resume.operation.failed=la operación no realizada observe.admin.resume.operation.need.fix=la operación nesista correcciones observe.admin.resume.operation.not.started=operación no empezada observe.admin.resume.operation.running=operación en curso... -observe.config.name=Configuración de ObServe observe.catchAcquisitionModeEnum.GROUPED= observe.catchAcquisitionModeEnum.INDIVIDUAL= observe.choice.cancel=Cancelar @@ -603,6 +602,7 @@ observe.config.map.layer7.description= observe.config.map.layer8.description= observe.config.map.layer9.description= observe.config.map.style.description= +observe.config.name=Configuración de ObServe observe.config.observation.activitysDetaillees=Observación de actividades detalladas observe.config.observation.fauneAssociee=Observación de Fauna asociada observe.config.observation.floatingObject=Observación de objetos flotantes -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553_ajoute_un_widget_pour_les_arbres in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 2e10ca61d85b14b570729ae14192fd0f2fb54c2f Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 12:32:24 2016 +0200 Optimize css --- .../ird/observe/ui/util/tree/BeanTreeHeader.jcss | 35 +++++++--------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss index 3b253f6..46d0bdf 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss @@ -21,47 +21,32 @@ */ #label { - opaque:false; - text:{SwingUtil.getStringValue(getLabelText())}; + text:{getLabelText()}; } -#toolbar { - floatable:false; - borderPainted:false; +JButton { + focusable:false; + focusPainted:false; + visible:true; + enabled:true; } #colapseAll { - actionIcon:"collapse"; + actionIcon:collapse; toolTipText:"observe.tree.action.collapseAll.tip"; - focusable:false; - focusPainted:false; - visible:{true}; - enabled:{true}; } #expandAll { - actionIcon:"expand"; + actionIcon:expand; toolTipText:"observe.tree.action.expandAll.tip"; - focusable:false; - focusPainted:false; - visible:{true}; - enabled:{true}; } #selectAll { - actionIcon:"select"; + actionIcon:select; toolTipText:"observe.tree.action.selectAll.tip"; - focusable:false; - focusPainted:false; - visible:{true}; - enabled:{true}; } #unselectAll { - actionIcon:"unselect"; + actionIcon:unselect; toolTipText:"observe.tree.action.unselectAll.tip"; - focusable:false; - focusPainted:false; - visible:{true}; - enabled:{true}; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553_ajoute_un_widget_pour_les_arbres in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 396fd071a565d0a8f528d755ac71504718ad413b Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 12:45:40 2016 +0200 Be able to show or not actions (fold or select) of the tree header --- .../main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx | 11 +++++++---- .../main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss | 10 ++++++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx index 9419d8e..eb502c5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jaxx @@ -23,6 +23,9 @@ <!-- label --> <String id='labelText' javaBean='null'/> + <Boolean id='showFoldActions' javaBean='true'/> + <Boolean id='showSelectActions' javaBean='true'/> + <!-- tree --> <JTree id='tree' javaBean='new JTree()'/> @@ -32,12 +35,12 @@ <JToolBar id='toolbar' constraints='BorderLayout.EAST'> <!-- les boutons pour grouper/déplier tout l'arbre --> - <JButton id='colapseAll' onActionPerformed='handler.collapseAll()'/> - <JButton id='expandAll' onActionPerformed='handler.expandAll()'/> + <JButton id='colapseAll' styleClass='showFoldActions' onActionPerformed='handler.collapseAll()'/> + <JButton id='expandAll' styleClass='showFoldActions' onActionPerformed='handler.expandAll()'/> <!-- les boutons pour sélectionner/déselectionner tout l'arbre --> - <JButton id='selectAll' onActionPerformed='handler.selectAll()'/> - <JButton id='unselectAll' onActionPerformed='handler.unselectAll()'/> + <JButton id='selectAll' styleClass='showSelectActions' onActionPerformed='handler.selectAll()'/> + <JButton id='unselectAll' styleClass='showSelectActions' onActionPerformed='handler.unselectAll()'/> </JToolBar> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss index 46d0bdf..267aee1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tree/BeanTreeHeader.jcss @@ -27,8 +27,14 @@ JButton { focusable:false; focusPainted:false; - visible:true; - enabled:true; +} + +.showFoldActions { + visible:{isShowFoldActions()}; +} + +.showSelectActions { + visible:{isShowSelectActions()}; } #colapseAll { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553_ajoute_un_widget_pour_les_arbres in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 1dc22bc864262f49bf54236e6ec19441f649825e Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 12:55:38 2016 +0200 Rename tree header id --- .../src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx index cfe9a52..ab0da89 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/config/SelectDataUI.jaxx @@ -78,12 +78,12 @@ public void destroy() { <JPanel id='PENDING_content'> <JScrollPane id='selectTreePane' constraints='BorderLayout.CENTER' - decorator='boxed' columnHeaderView='{treeHeader}'> + decorator='boxed' columnHeaderView='{selectTreeHeader}'> <!-- arbre de selection des exports --> <JTree id='selectTree'/> - <BeanTreeHeader id='treeHeader' tree='{selectTree}'/> + <BeanTreeHeader id='selectTreeHeader' tree='{selectTree}'/> </JScrollPane> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553_ajoute_un_widget_pour_les_arbres in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 6cc7137f84c60d90d4bd534b3488cac2c9d7e94d Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 13:11:51 2016 +0200 Add tree header in other places in application --- .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 4 +++- .../main/java/fr/ird/observe/ui/ObserveMainUI.jcss | 24 +++++++++++++--------- .../ui/admin/synchronize/data/DataSynchroUI.jaxx | 7 +++++-- .../referential/ng/ReferentialSynchroUI.jaxx | 7 +++++-- 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx index 4aad01d..53bcefc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jaxx @@ -46,6 +46,7 @@ fr.ird.observe.ui.content.ContentUIManager fr.ird.observe.ui.tree.ObserveTreeHelper fr.ird.observe.ui.tree.NavigationTreeCellRenderer + fr.ird.observe.ui.util.tree.BeanTreeHeader jaxx.runtime.swing.CardLayout2 jaxx.runtime.swing.CardLayout2Ext @@ -255,8 +256,9 @@ void $afterCompleteSetup() { <!-- left : navigation --> <JXTitledPanel id='navigationView'> - <JScrollPane id='navigationScrollPane'> + <JScrollPane id='navigationScrollPane' columnHeaderView='{navigationTreeHeader}'> <JTree id="navigation"/> + <BeanTreeHeader id='navigationTreeHeader' tree='{navigation}'/> </JScrollPane> </JXTitledPanel> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jcss b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jcss index d9bed5c..1acfc0b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jcss +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/ObserveMainUI.jcss @@ -361,16 +361,6 @@ JSplitPane { acceptedComponentNames: {UIHelper.ACCEPTABLE_COMPONENTS}; } -#navigation { - rootVisible: false; - largeModel: true; - minimumSize: {UIHelper.newMinDimension()}; - font-size:11; - model: {getTreeHelper().getModel()}; - selectionModel: {getTreeHelper().newNavigationSelectionModel()}; - cellRenderer: {new NavigationTreeCellRenderer()}; -} - #splitpane { orientation: {JSplitPane.HORIZONTAL_SPLIT}; resizeWeight: 1.0; @@ -389,6 +379,20 @@ JSplitPane { title: "observe.view.navigation"; } +#navigation { + rootVisible: false; + largeModel: true; + minimumSize: {UIHelper.newMinDimension()}; + font-size:11; + model: {getTreeHelper().getModel()}; + selectionModel: {getTreeHelper().newNavigationSelectionModel()}; + cellRenderer: {new NavigationTreeCellRenderer()}; +} + +#navigationTreeHeader { + showSelectActions: false; +} + #messageView { title: "observe.view.message"; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUI.jaxx index 014ed8c..b7222a5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/data/DataSynchroUI.jaxx @@ -34,6 +34,7 @@ fr.ird.observe.ui.tree.DataSelectionTreeCellRenderer fr.ird.observe.ui.tree.DataSelectionTreeSelectionModel fr.ird.observe.ui.storage.tabs.DataSelectionModel + fr.ird.observe.ui.util.tree.BeanTreeHeader jaxx.runtime.SwingUtil @@ -94,8 +95,9 @@ public void destroy() { <Table id='contentNorth' fill="both" weighty="1"> <row> <cell weightx="0.45"> - <JScrollPane id='leftTreePane' decorator='boxed'> + <JScrollPane id='leftTreePane' decorator='boxed' columnHeaderView='{leftTreeHeader}'> <JTree id='leftTree'/> + <BeanTreeHeader id='leftTreeHeader' tree='{leftTree}'/> </JScrollPane> </cell> <cell weightx="0.1"> @@ -109,8 +111,9 @@ public void destroy() { </JPanel> </cell> <cell weightx="0.45"> - <JScrollPane id='rightTreePane' decorator='boxed'> + <JScrollPane id='rightTreePane' decorator='boxed' columnHeaderView='{rightTreeHeader}'> <JTree id='rightTree'/> + <BeanTreeHeader id='rightTreeHeader' tree='{rightTree}'/> </JScrollPane> </cell> </row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jaxx index 2c08573..28296b9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jaxx @@ -39,6 +39,7 @@ fr.ird.observe.ui.admin.synchronize.referential.ng.tree.ReferentialSynchronizeTreeModel fr.ird.observe.ui.admin.synchronize.referential.ng.tree.ReferentialSynchronizeTreeCellRenderer fr.ird.observe.ui.tree.ObserveTreeHelper + fr.ird.observe.ui.util.tree.BeanTreeHeader javax.swing.ListSelectionModel @@ -92,8 +93,9 @@ public void destroy() { <Table id='contentNorth' fill="both" weighty="1"> <row> <cell weightx="0.5"> - <JScrollPane id='leftTreePane'> + <JScrollPane id='leftTreePane' columnHeaderView='{leftTreeHeader}'> <JTree id='leftTree'/> + <BeanTreeHeader id='leftTreeHeader' tree='{leftTree}'/> </JScrollPane> </cell> <cell> @@ -115,8 +117,9 @@ public void destroy() { </JPanel> </cell> <cell weightx="0.5"> - <JScrollPane id='rightTreePane'> + <JScrollPane id='rightTreePane' columnHeaderView='{rightTreeHeader}'> <JTree id='rightTree'/> + <BeanTreeHeader id='rightTreeHeader' tree='{rightTree}'/> </JScrollPane> </cell> </row> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm