branch develop updated (412c00e -> ba4b822)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 412c00e Ajouter le descripteurs de validateurs d'entités pour les tests du service de validation new f25c00c Ajout des validateurs sur les référentiels new d07cdbe Ajout des validateurs sur les écrans de référentiel Merge branch 'feature/7610_validation' into develop new fd4b004 Correction de clef i18n sur HookSize et HookType new b2a8a87 Amélioration des clefs de traductions sur le module entités + remplissage de traudction manquantes new 796c00c Suppression d'une déclaration de generique sur une méthode de service inutile new bc94926 Ajout de TODO dans la javadoc des classes + ajout de javadoc new 3c158a8 Ajout d'un equals et hashcode sur ReferenceTypeName sinon on remonte plusieur fois le même objet new 90788a1 Filtrage des listes de références en une seule passe + fix cast new 97eb25e Ajout FIXME new f6df518 Introduction de la configuration des listes d'espèces + revue de code sur les filtrage de LabelSet new b039355 Correction de la template de résumé d'ouverture de base new 6c2e0fa Ajout d'un equals sur IdDto sinon on ne compare que des références mémoire new 7c241e8d Amélioration code: ne pas recalculer si une annotation est présente plusieurs fois new 087444c Correction du chargement des double liste (mais non fini) new 0ac05ee Charger la liste des systèmes observés dans le FormDto new 2e12f69 Utilisation dernière version de H2 mais j'ai l'impression qu'elle est buggée) new 1a77e25 Changement de la configuration h2 mais sans conviction new ba4b822 Revue de code (retour sur develop pour que ça avance) Merge branch 'feature/correction + revue de code' into develop The 18 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 ba4b82287e618c83bce0dd029d429ddc83876bb1 Merge: d07cdbe 1a77e25 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 19 01:57:51 2015 +0200 Revue de code (retour sur develop pour que ça avance) Merge branch 'feature/correction + revue de code' into develop commit 1a77e25e907321c2a64f232414ccab5a7decb476 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 19 01:57:48 2015 +0200 Changement de la configuration h2 mais sans conviction commit 2e12f690bfef8cd9d4e06983171e95c04cca2021 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 19 01:56:35 2015 +0200 Utilisation dernière version de H2 mais j'ai l'impression qu'elle est buggée) commit 0ac05ee189779f01134c91f28c1c8a28a51ff998 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 19 01:55:38 2015 +0200 Charger la liste des systèmes observés dans le FormDto commit 087444cbc26db7940625c723c34e94d9236a9a7e Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 19 01:54:26 2015 +0200 Correction du chargement des double liste (mais non fini) commit 7c241e8da1d78c846c483c8ed6a8c935b8433689 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 19 01:25:20 2015 +0200 Amélioration code: ne pas recalculer si une annotation est présente plusieurs fois commit 6c2e0fae31833d7fd21f633e2311d79bd25cb8ec Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 19 01:09:10 2015 +0200 Ajout d'un equals sur IdDto sinon on ne compare que des références mémoire commit b039355b90dc8c34ccaac6ab063435179673ae9a Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 19 01:08:36 2015 +0200 Correction de la template de résumé d'ouverture de base commit f6df5185599564edb114fcf969a9b25ab47f2589 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 18 23:23:54 2015 +0200 Introduction de la configuration des listes d'espèces + revue de code sur les filtrage de LabelSet commit 97eb25ecf93558104d73ea66c96cde5f0f40c52c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 18 23:16:30 2015 +0200 Ajout FIXME commit 90788a12aab91d3aff6f571697ba56d814367128 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 18 20:11:30 2015 +0200 Filtrage des listes de références en une seule passe + fix cast commit 3c158a89493ddbec885fbf6330061c43abca1501 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 18 20:00:34 2015 +0200 Ajout d'un equals et hashcode sur ReferenceTypeName sinon on remonte plusieur fois le même objet commit bc949266b42680d25fe970b42e93d8cca54bb6e5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 18 18:20:37 2015 +0200 Ajout de TODO dans la javadoc des classes + ajout de javadoc commit 796c00c313ee46d7dcb6a25b5db9dc9dc96dc2c5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 18 17:59:10 2015 +0200 Suppression d'une déclaration de generique sur une méthode de service inutile commit b2a8a87b3e324598a2f3eef54c60ea884e930715 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 18 17:54:19 2015 +0200 Amélioration des clefs de traductions sur le module entités + remplissage de traudction manquantes commit fd4b0045116bbd71e8cea7cbeada6ffafeac1358 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 18 17:49:35 2015 +0200 Correction de clef i18n sur HookSize et HookType commit d07cdbed498b96513e6a5e269296d4a08dd592d8 Merge: 412c00e f25c00c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 18 17:46:40 2015 +0200 Ajout des validateurs sur les écrans de référentiel Merge branch 'feature/7610_validation' into develop commit f25c00c9a0ee6ff49baf2a1ad0ff6fe5ac7ba301 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 18 17:32:17 2015 +0200 Ajout des validateurs sur les référentiels Summary of changes: .../ObserveSwingApplicationConfigOption.java | 17 +- .../fr/ird/observe/db/ObserveSwingDataSource.java | 16 +- .../observe/entities/tripMap/TripMapPointType.java | 4 +- .../observe/ui/content/ContentUIInitializer.java | 7 +- .../ui/content/ref/impl/longline/HookSizeUI.jaxx | 10 +- .../ui/content/ref/impl/longline/HookTypeUI.jaxx | 10 +- .../ui/content/table/ContentTableUIHandler.java | 4 +- .../CountryDto-n1-create-error-validation.xml | 0 .../CountryDto-n1-create-warning-validation.xml | 0 .../CountryDto-n1-update-error-validation.xml | 0 .../CountryDto-n1-update-warning-validation.xml | 0 .../FpaZoneDto-n1-create-error-validation.xml | 0 .../FpaZoneDto-n1-create-warning-validation.xml | 0 .../FpaZoneDto-n1-update-error-validation.xml | 0 .../FpaZoneDto-n1-update-warning-validation.xml | 0 ...CaracteristicDto-n1-create-error-validation.xml | 0 ...racteristicDto-n1-create-warning-validation.xml | 0 ...CaracteristicDto-n1-update-error-validation.xml | 0 ...racteristicDto-n1-update-warning-validation.xml | 0 ...cteristicTypeDto-n1-create-error-validation.xml | 0 ...eristicTypeDto-n1-create-warning-validation.xml | 0 ...cteristicTypeDto-n1-update-error-validation.xml | 0 ...eristicTypeDto-n1-update-warning-validation.xml | 0 .../GearDto-n1-create-error-validation.xml | 0 .../GearDto-n1-create-warning-validation.xml | 0 .../GearDto-n1-update-error-validation.xml | 0 .../GearDto-n1-update-warning-validation.xml | 0 .../HarbourDto-n1-create-error-validation.xml | 0 .../HarbourDto-n1-create-warning-validation.xml | 0 .../HarbourDto-n1-update-error-validation.xml | 0 .../HarbourDto-n1-update-warning-validation.xml | 0 ...ightParameterDto-n1-create-error-validation.xml | 0 ...htParameterDto-n1-create-warning-validation.xml | 0 ...ightParameterDto-n1-update-error-validation.xml | 0 ...htParameterDto-n1-update-warning-validation.xml | 0 .../OceanDto-n1-create-error-validation.xml | 0 .../OceanDto-n1-create-warning-validation.xml | 0 .../OceanDto-n1-update-error-validation.xml | 0 .../OceanDto-n1-update-warning-validation.xml | 0 .../OrganismDto-n1-create-error-validation.xml | 0 .../OrganismDto-n1-create-warning-validation.xml | 0 .../OrganismDto-n1-update-error-validation.xml | 0 .../OrganismDto-n1-update-warning-validation.xml | 0 .../PersonDto-n1-create-error-validation.xml | 0 .../PersonDto-n1-create-warning-validation.xml | 0 .../PersonDto-n1-update-error-validation.xml | 0 .../PersonDto-n1-update-warning-validation.xml | 0 .../ProgramDto-n1-create-error-validation.xml | 0 .../ProgramDto-n1-create-warning-validation.xml | 0 .../ProgramDto-n1-update-error-validation.xml | 0 .../ProgramDto-n1-update-warning-validation.xml | 0 .../SexDto-n1-create-error-validation.xml | 0 .../SexDto-n1-create-warning-validation.xml | 0 .../SexDto-n1-update-error-validation.xml | 0 .../SexDto-n1-update-warning-validation.xml | 0 .../SpeciesDto-n1-create-error-validation.xml | 0 .../SpeciesDto-n1-create-warning-validation.xml | 0 .../SpeciesDto-n1-update-error-validation.xml | 0 .../SpeciesDto-n1-update-warning-validation.xml | 0 .../SpeciesGroupDto-n1-create-error-validation.xml | 0 ...peciesGroupDto-n1-create-warning-validation.xml | 0 .../SpeciesGroupDto-n1-update-error-validation.xml | 0 ...peciesGroupDto-n1-update-warning-validation.xml | 0 .../SpeciesListDto-n1-create-error-validation.xml | 0 ...SpeciesListDto-n1-create-warning-validation.xml | 0 .../SpeciesListDto-n1-update-error-validation.xml | 0 ...SpeciesListDto-n1-update-warning-validation.xml | 0 .../VesselDto-n1-create-error-validation.xml | 0 .../VesselDto-n1-create-warning-validation.xml | 0 .../VesselDto-n1-update-error-validation.xml | 0 .../VesselDto-n1-update-warning-validation.xml | 0 ...lSizeCategoryDto-n1-create-error-validation.xml | 0 ...izeCategoryDto-n1-create-warning-validation.xml | 0 ...lSizeCategoryDto-n1-update-error-validation.xml | 0 ...izeCategoryDto-n1-update-warning-validation.xml | 0 .../VesselTypeDto-n1-create-error-validation.xml | 0 .../VesselTypeDto-n1-create-warning-validation.xml | 0 .../VesselTypeDto-n1-update-error-validation.xml | 0 .../VesselTypeDto-n1-update-warning-validation.xml | 0 ...HaulingStatusDto-n1-create-error-validation.xml | 0 ...ulingStatusDto-n1-create-warning-validation.xml | 0 ...HaulingStatusDto-n1-update-error-validation.xml | 0 ...ulingStatusDto-n1-update-warning-validation.xml | 0 ...SettingStatusDto-n1-create-error-validation.xml | 0 ...ttingStatusDto-n1-create-warning-validation.xml | 0 ...SettingStatusDto-n1-update-error-validation.xml | 0 ...ttingStatusDto-n1-update-warning-validation.xml | 0 .../BaitTypeDto-n1-create-error-validation.xml | 0 .../BaitTypeDto-n1-create-warning-validation.xml | 0 .../BaitTypeDto-n1-update-error-validation.xml | 0 .../BaitTypeDto-n1-update-warning-validation.xml | 0 ...hFateLonglineDto-n1-create-error-validation.xml | 0 ...ateLonglineDto-n1-create-warning-validation.xml | 0 ...hFateLonglineDto-n1-update-error-validation.xml | 0 ...ateLonglineDto-n1-update-warning-validation.xml | 0 ...EncounterTypeDto-n1-create-error-validation.xml | 0 ...counterTypeDto-n1-create-warning-validation.xml | 0 ...EncounterTypeDto-n1-update-error-validation.xml | 0 ...counterTypeDto-n1-update-warning-validation.xml | 0 .../HealthnessDto-n1-create-error-validation.xml | 0 .../HealthnessDto-n1-create-warning-validation.xml | 0 .../HealthnessDto-n1-update-error-validation.xml | 0 .../HealthnessDto-n1-update-warning-validation.xml | 0 .../HookPositionDto-n1-create-error-validation.xml | 0 ...ookPositionDto-n1-create-warning-validation.xml | 0 .../HookPositionDto-n1-update-error-validation.xml | 0 ...ookPositionDto-n1-update-warning-validation.xml | 0 .../HookSizeDto-n1-create-error-validation.xml | 0 .../HookSizeDto-n1-create-warning-validation.xml | 0 .../HookSizeDto-n1-update-error-validation.xml | 0 .../HookSizeDto-n1-update-warning-validation.xml | 0 .../HookTypeDto-n1-create-error-validation.xml | 0 .../HookTypeDto-n1-create-warning-validation.xml | 0 .../HookTypeDto-n1-update-error-validation.xml | 0 .../HookTypeDto-n1-update-warning-validation.xml | 0 ...ontalPositionDto-n1-create-error-validation.xml | 0 ...talPositionDto-n1-create-warning-validation.xml | 0 ...ontalPositionDto-n1-update-error-validation.xml | 0 ...talPositionDto-n1-update-warning-validation.xml | 0 ...ticalPositionDto-n1-create-error-validation.xml | 0 ...calPositionDto-n1-create-warning-validation.xml | 0 ...ticalPositionDto-n1-update-error-validation.xml | 0 ...calPositionDto-n1-update-warning-validation.xml | 0 ...htsticksColorDto-n1-create-error-validation.xml | 0 ...sticksColorDto-n1-create-warning-validation.xml | 0 ...htsticksColorDto-n1-update-error-validation.xml | 0 ...sticksColorDto-n1-update-warning-validation.xml | 0 ...ghtsticksTypeDto-n1-create-error-validation.xml | 0 ...tsticksTypeDto-n1-create-warning-validation.xml | 0 ...ghtsticksTypeDto-n1-update-error-validation.xml | 0 ...tsticksTypeDto-n1-update-warning-validation.xml | 0 .../LineTypeDto-n1-create-error-validation.xml | 0 .../LineTypeDto-n1-create-warning-validation.xml | 0 .../LineTypeDto-n1-update-error-validation.xml | 0 .../LineTypeDto-n1-update-warning-validation.xml | 0 ...aturityStatusDto-n1-create-error-validation.xml | 0 ...urityStatusDto-n1-create-warning-validation.xml | 0 ...aturityStatusDto-n1-update-error-validation.xml | 0 ...urityStatusDto-n1-update-warning-validation.xml | 0 ...itigationTypeDto-n1-create-error-validation.xml | 0 ...igationTypeDto-n1-create-warning-validation.xml | 0 ...itigationTypeDto-n1-update-error-validation.xml | 0 ...igationTypeDto-n1-update-warning-validation.xml | 0 .../SensorBrandDto-n1-create-error-validation.xml | 0 ...SensorBrandDto-n1-create-warning-validation.xml | 0 .../SensorBrandDto-n1-update-error-validation.xml | 0 ...SensorBrandDto-n1-update-warning-validation.xml | 0 ...sorDataFormatDto-n1-create-error-validation.xml | 0 ...rDataFormatDto-n1-create-warning-validation.xml | 0 ...sorDataFormatDto-n1-update-error-validation.xml | 0 ...rDataFormatDto-n1-update-warning-validation.xml | 0 .../SensorTypeDto-n1-create-error-validation.xml | 0 .../SensorTypeDto-n1-create-warning-validation.xml | 0 .../SensorTypeDto-n1-update-error-validation.xml | 0 .../SensorTypeDto-n1-update-warning-validation.xml | 0 .../SettingShapeDto-n1-create-error-validation.xml | 0 ...ettingShapeDto-n1-create-warning-validation.xml | 0 .../SettingShapeDto-n1-update-error-validation.xml | 0 ...ettingShapeDto-n1-update-warning-validation.xml | 0 ...zeMeasureTypeDto-n1-create-error-validation.xml | 0 ...MeasureTypeDto-n1-create-warning-validation.xml | 0 ...zeMeasureTypeDto-n1-update-error-validation.xml | 0 ...MeasureTypeDto-n1-update-warning-validation.xml | 0 ...tomacFullnessDto-n1-create-error-validation.xml | 0 ...macFullnessDto-n1-create-warning-validation.xml | 0 ...tomacFullnessDto-n1-update-error-validation.xml | 0 ...macFullnessDto-n1-update-warning-validation.xml | 0 .../TripTypeDto-n1-create-error-validation.xml | 0 .../TripTypeDto-n1-create-warning-validation.xml | 0 .../TripTypeDto-n1-update-error-validation.xml | 0 .../TripTypeDto-n1-update-warning-validation.xml | 0 ...ivityLonglineDto-n1-create-error-validation.xml | 0 ...ityLonglineDto-n1-create-warning-validation.xml | 0 ...ivityLonglineDto-n1-update-error-validation.xml | 0 ...ityLonglineDto-n1-update-warning-validation.xml | 0 ...htMeasureTypeDto-n1-create-error-validation.xml | 0 ...MeasureTypeDto-n1-create-warning-validation.xml | 0 ...htMeasureTypeDto-n1-update-error-validation.xml | 0 ...MeasureTypeDto-n1-update-warning-validation.xml | 0 ...DetectionModeDto-n1-create-error-validation.xml | 0 ...tectionModeDto-n1-create-warning-validation.xml | 0 ...DetectionModeDto-n1-update-error-validation.xml | 0 ...tectionModeDto-n1-update-warning-validation.xml | 0 .../ObjectFateDto-n1-create-error-validation.xml | 0 .../ObjectFateDto-n1-create-warning-validation.xml | 0 .../ObjectFateDto-n1-update-error-validation.xml | 0 .../ObjectFateDto-n1-update-warning-validation.xml | 0 ...jectOperationDto-n1-create-error-validation.xml | 0 ...ctOperationDto-n1-create-warning-validation.xml | 0 ...jectOperationDto-n1-update-error-validation.xml | 0 ...ctOperationDto-n1-update-warning-validation.xml | 0 .../ObjectTypeDto-n1-create-error-validation.xml | 0 .../ObjectTypeDto-n1-create-warning-validation.xml | 0 .../ObjectTypeDto-n1-update-error-validation.xml | 0 .../ObjectTypeDto-n1-update-warning-validation.xml | 0 ...bservedSystemDto-n1-create-error-validation.xml | 0 ...ervedSystemDto-n1-create-warning-validation.xml | 0 ...bservedSystemDto-n1-update-error-validation.xml | 0 ...ervedSystemDto-n1-update-warning-validation.xml | 0 ...sonForDiscardDto-n1-create-error-validation.xml | 0 ...nForDiscardDto-n1-create-warning-validation.xml | 0 ...sonForDiscardDto-n1-update-error-validation.xml | 0 ...nForDiscardDto-n1-update-warning-validation.xml | 0 ...nForNoFishingDto-n1-create-error-validation.xml | 0 ...orNoFishingDto-n1-create-warning-validation.xml | 0 ...nForNoFishingDto-n1-update-error-validation.xml | 0 ...orNoFishingDto-n1-update-warning-validation.xml | 0 ...sonForNullSetDto-n1-create-error-validation.xml | 0 ...nForNullSetDto-n1-create-warning-validation.xml | 0 ...sonForNullSetDto-n1-update-error-validation.xml | 0 ...nForNullSetDto-n1-update-warning-validation.xml | 0 .../SpeciesFateDto-n1-create-error-validation.xml | 0 ...SpeciesFateDto-n1-create-warning-validation.xml | 0 .../SpeciesFateDto-n1-update-error-validation.xml | 0 ...SpeciesFateDto-n1-update-warning-validation.xml | 0 ...SpeciesStatusDto-n1-create-error-validation.xml | 0 ...eciesStatusDto-n1-create-warning-validation.xml | 0 ...SpeciesStatusDto-n1-update-error-validation.xml | 0 ...eciesStatusDto-n1-update-warning-validation.xml | 0 ...ndingActivityDto-n1-create-error-validation.xml | 0 ...ingActivityDto-n1-create-warning-validation.xml | 0 ...ndingActivityDto-n1-update-error-validation.xml | 0 ...ingActivityDto-n1-update-warning-validation.xml | 0 ...BuoyOperationDto-n1-create-error-validation.xml | 0 ...oyOperationDto-n1-create-warning-validation.xml | 0 ...BuoyOperationDto-n1-update-error-validation.xml | 0 ...oyOperationDto-n1-update-warning-validation.xml | 0 ...ttingBuoyTypeDto-n1-create-error-validation.xml | 0 ...ingBuoyTypeDto-n1-create-warning-validation.xml | 0 ...ttingBuoyTypeDto-n1-update-error-validation.xml | 0 ...ingBuoyTypeDto-n1-update-warning-validation.xml | 0 ...ActivitySeineDto-n1-create-error-validation.xml | 0 ...tivitySeineDto-n1-create-warning-validation.xml | 0 ...ActivitySeineDto-n1-update-error-validation.xml | 0 ...tivitySeineDto-n1-update-warning-validation.xml | 0 ...eightCategoryDto-n1-create-error-validation.xml | 0 ...ghtCategoryDto-n1-create-warning-validation.xml | 0 ...eightCategoryDto-n1-update-error-validation.xml | 0 ...ghtCategoryDto-n1-update-warning-validation.xml | 0 .../seine/WindDto-n1-create-error-validation.xml | 0 .../seine/WindDto-n1-create-warning-validation.xml | 0 .../seine/WindDto-n1-update-error-validation.xml | 0 .../seine/WindDto-n1-update-warning-validation.xml | 0 .../ftl/dataSourceConnectionReport_fr.ftl | 2 +- .../observe-application-swing_en_GB.properties | 14 +- .../observe-application-swing_es_ES.properties | 14 +- .../observe-application-swing_fr_FR.properties | 16 +- .../application/web/ObserveWebMotionFilter.java | 18 ++- .../web/request/ObserveWebRequestContext.java | 7 + .../observe/ObserveTopiaConfigurationFactory.java | 7 + .../ird/observe/entities/constants/GearType.java | 4 +- .../seine/NonTargetCatchComputedValueSource.java | 6 +- .../entities/constants/seine/Ownership.java | 6 +- .../entities/constants/seine/SchoolType.java | 6 +- .../seine/TypeTransmittingBuoyOperation.java | 10 +- .../entities/referentiel/ReferenceEntities.java | 9 +- .../ird/observe/entities/referentiel/Species2.java | 2 +- .../observe/entities/referentiel/SpeciesLists.java | 15 -- .../i18n/observe-entities_en_GB.properties | 74 ++++----- .../i18n/observe-entities_es_ES.properties | 42 ++--- .../i18n/observe-entities_fr_FR.properties | 42 ++--- .../services/ObserveServiceInitializer.java | 22 +++ .../services/ObserveSpeciesListConfiguration.java | 149 +++++++++++++++++ .../services/service/DataSourceService.java | 2 +- ...bserveDataSourceConfigurationRestConstants.java | 2 + .../java/fr/ird/observe/services/dto/FormDto.java | 12 +- .../java/fr/ird/observe/services/dto/IdDto.java | 15 ++ .../services/dto/constants/ReferenceStatus.java | 4 +- .../services/dto/constants/TripMapPointType.java | 4 +- .../services/ObserveServiceFactoryRest.java | 7 +- .../fr/ird/observe/services/TestClassResource.java | 2 + .../fr/ird/observe/services/ObserveJdbcHelper.java | 2 + .../observe/services/ObserveSecurityHelper.java | 2 + .../services/ObserveServiceContextTopia.java | 12 ++ .../services/ObserveServiceFactoryTopia.java | 20 ++- .../ird/observe/services/ObserveServiceTopia.java | 74 ++++----- .../ObserveTopiaApplicationContextFactory.java | 2 + .../services/builder/DtoToEntityBuilder.java | 2 + .../services/builder/EntityToDtoBuilder.java | 2 + .../builder/EntityToReferenceDtoBuilder.java | 2 + .../EntityToReferentialReferenceDtoBuilder.java | 2 + .../observe/services/dto/ObserveDtoBinders.java | 2 + .../observe/services/dto/ReferenceTypeName.java | 18 +++ .../ird/observe/services/entity/EntitiesSet.java | 31 +++- .../services/entity/EntitiesSetFactory.java | 177 +++++++++++++++++++++ .../services/entity/ObserveEntitiesFilters.java | 143 ----------------- .../services/entity/ObserveEntityFilter.java | 71 --------- .../services/entity/SpeciesListEntitiesSet.java | 19 +-- .../entity/SpeciesListOceanEntitiesSet.java | 15 +- .../services/entity/UniverseEntitiesSet.java | 39 ----- .../ConsolidateActivitySeineDataResultBuilder.java | 3 + .../ActivitySeineObservedSystemServiceTopia.java | 8 +- .../services/ApplicationContextResource.java | 5 + .../fr/ird/observe/services/service/RigthTest.java | 7 +- .../service/seine/TripSeineServiceTopiaTest.java | 6 +- pom.xml | 3 +- 296 files changed, 721 insertions(+), 527 deletions(-) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-create-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-create-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-update-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-create-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-create-warning-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-update-error-validation.xml (100%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-update-warning-validation.xml (100%) delete mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/referentiel/SpeciesLists.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/ObserveSpeciesListConfiguration.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSetFactory.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/entity/ObserveEntitiesFilters.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/entity/ObserveEntityFilter.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/entity/UniverseEntitiesSet.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit f25c00c9a0ee6ff49baf2a1ad0ff6fe5ac7ba301 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 18 17:32:17 2015 +0200 Ajout des validateurs sur les référentiels --- .../CountryDto-n1-create-error-validation.xml | 109 ++++++++++++++++ .../CountryDto-n1-create-warning-validation.xml | 67 ++++++++++ .../CountryDto-n1-update-error-validation.xml | 109 ++++++++++++++++ .../CountryDto-n1-update-warning-validation.xml | 67 ++++++++++ .../FpaZoneDto-n1-create-error-validation.xml | 73 +++++++++++ .../FpaZoneDto-n1-create-warning-validation.xml | 80 ++++++++++++ .../FpaZoneDto-n1-update-error-validation.xml | 73 +++++++++++ .../FpaZoneDto-n1-update-warning-validation.xml | 81 ++++++++++++ ...CaracteristicDto-n1-create-error-validation.xml | 90 ++++++++++++++ ...racteristicDto-n1-create-warning-validation.xml | 67 ++++++++++ ...CaracteristicDto-n1-update-error-validation.xml | 90 ++++++++++++++ ...racteristicDto-n1-update-warning-validation.xml | 67 ++++++++++ ...cteristicTypeDto-n1-create-error-validation.xml | 75 +++++++++++ ...eristicTypeDto-n1-create-warning-validation.xml | 67 ++++++++++ ...cteristicTypeDto-n1-update-error-validation.xml | 75 +++++++++++ ...eristicTypeDto-n1-update-warning-validation.xml | 67 ++++++++++ .../GearDto-n1-create-error-validation.xml | 75 +++++++++++ .../GearDto-n1-create-warning-validation.xml | 67 ++++++++++ .../GearDto-n1-update-error-validation.xml | 75 +++++++++++ .../GearDto-n1-update-warning-validation.xml | 67 ++++++++++ .../HarbourDto-n1-create-error-validation.xml | 75 +++++++++++ .../HarbourDto-n1-create-warning-validation.xml | 67 ++++++++++ .../HarbourDto-n1-update-error-validation.xml | 74 +++++++++++ .../HarbourDto-n1-update-warning-validation.xml | 67 ++++++++++ ...ightParameterDto-n1-create-error-validation.xml | 137 ++++++++++++++++++++ ...htParameterDto-n1-create-warning-validation.xml | 69 +++++++++++ ...ightParameterDto-n1-update-error-validation.xml | 138 +++++++++++++++++++++ ...htParameterDto-n1-update-warning-validation.xml | 62 +++++++++ .../OceanDto-n1-create-error-validation.xml | 74 +++++++++++ .../OceanDto-n1-create-warning-validation.xml | 67 ++++++++++ .../OceanDto-n1-update-error-validation.xml | 74 +++++++++++ .../OceanDto-n1-update-warning-validation.xml | 67 ++++++++++ .../OrganismDto-n1-create-error-validation.xml | 88 +++++++++++++ .../OrganismDto-n1-create-warning-validation.xml | 74 +++++++++++ .../OrganismDto-n1-update-error-validation.xml | 88 +++++++++++++ .../OrganismDto-n1-update-warning-validation.xml | 74 +++++++++++ .../PersonDto-n1-create-error-validation.xml | 81 ++++++++++++ .../PersonDto-n1-create-warning-validation.xml | 46 +++++++ .../PersonDto-n1-update-error-validation.xml | 82 ++++++++++++ .../PersonDto-n1-update-warning-validation.xml | 46 +++++++ .../ProgramDto-n1-create-error-validation.xml | 96 ++++++++++++++ .../ProgramDto-n1-create-warning-validation.xml | 91 ++++++++++++++ .../ProgramDto-n1-update-error-validation.xml | 89 +++++++++++++ .../ProgramDto-n1-update-warning-validation.xml | 91 ++++++++++++++ .../SexDto-n1-create-error-validation.xml | 73 +++++++++++ .../SexDto-n1-create-warning-validation.xml | 65 ++++++++++ .../SexDto-n1-update-error-validation.xml | 73 +++++++++++ .../SexDto-n1-update-warning-validation.xml | 65 ++++++++++ .../SpeciesDto-n1-create-error-validation.xml | 138 +++++++++++++++++++++ .../SpeciesDto-n1-create-warning-validation.xml | 90 ++++++++++++++ .../SpeciesDto-n1-update-error-validation.xml | 138 +++++++++++++++++++++ .../SpeciesDto-n1-update-warning-validation.xml | 100 +++++++++++++++ .../SpeciesGroupDto-n1-create-error-validation.xml | 74 +++++++++++ ...peciesGroupDto-n1-create-warning-validation.xml | 67 ++++++++++ .../SpeciesGroupDto-n1-update-error-validation.xml | 74 +++++++++++ ...peciesGroupDto-n1-update-warning-validation.xml | 67 ++++++++++ .../SpeciesListDto-n1-create-error-validation.xml | 75 +++++++++++ ...SpeciesListDto-n1-create-warning-validation.xml | 75 +++++++++++ .../SpeciesListDto-n1-update-error-validation.xml | 75 +++++++++++ ...SpeciesListDto-n1-update-warning-validation.xml | 75 +++++++++++ .../VesselDto-n1-create-error-validation.xml | 134 ++++++++++++++++++++ .../VesselDto-n1-create-warning-validation.xml | 127 +++++++++++++++++++ .../VesselDto-n1-update-error-validation.xml | 134 ++++++++++++++++++++ .../VesselDto-n1-update-warning-validation.xml | 127 +++++++++++++++++++ ...lSizeCategoryDto-n1-create-error-validation.xml | 67 ++++++++++ ...izeCategoryDto-n1-create-warning-validation.xml | 46 +++++++ ...lSizeCategoryDto-n1-update-error-validation.xml | 67 ++++++++++ ...izeCategoryDto-n1-update-warning-validation.xml | 46 +++++++ .../VesselTypeDto-n1-create-error-validation.xml | 74 +++++++++++ .../VesselTypeDto-n1-create-warning-validation.xml | 67 ++++++++++ .../VesselTypeDto-n1-update-error-validation.xml | 74 +++++++++++ .../VesselTypeDto-n1-update-warning-validation.xml | 67 ++++++++++ ...HaulingStatusDto-n1-create-error-validation.xml | 75 +++++++++++ ...ulingStatusDto-n1-create-warning-validation.xml | 68 ++++++++++ ...HaulingStatusDto-n1-update-error-validation.xml | 75 +++++++++++ ...ulingStatusDto-n1-update-warning-validation.xml | 68 ++++++++++ ...SettingStatusDto-n1-create-error-validation.xml | 75 +++++++++++ ...ttingStatusDto-n1-create-warning-validation.xml | 68 ++++++++++ ...SettingStatusDto-n1-update-error-validation.xml | 75 +++++++++++ ...ttingStatusDto-n1-update-warning-validation.xml | 68 ++++++++++ .../BaitTypeDto-n1-create-error-validation.xml | 75 +++++++++++ .../BaitTypeDto-n1-create-warning-validation.xml | 68 ++++++++++ .../BaitTypeDto-n1-update-error-validation.xml | 75 +++++++++++ .../BaitTypeDto-n1-update-warning-validation.xml | 68 ++++++++++ ...hFateLonglineDto-n1-create-error-validation.xml | 75 +++++++++++ ...ateLonglineDto-n1-create-warning-validation.xml | 68 ++++++++++ ...hFateLonglineDto-n1-update-error-validation.xml | 75 +++++++++++ ...ateLonglineDto-n1-update-warning-validation.xml | 68 ++++++++++ ...EncounterTypeDto-n1-create-error-validation.xml | 75 +++++++++++ ...counterTypeDto-n1-create-warning-validation.xml | 68 ++++++++++ ...EncounterTypeDto-n1-update-error-validation.xml | 75 +++++++++++ ...counterTypeDto-n1-update-warning-validation.xml | 68 ++++++++++ .../HealthnessDto-n1-create-error-validation.xml | 75 +++++++++++ .../HealthnessDto-n1-create-warning-validation.xml | 68 ++++++++++ .../HealthnessDto-n1-update-error-validation.xml | 75 +++++++++++ .../HealthnessDto-n1-update-warning-validation.xml | 68 ++++++++++ .../HookPositionDto-n1-create-error-validation.xml | 75 +++++++++++ ...ookPositionDto-n1-create-warning-validation.xml | 68 ++++++++++ .../HookPositionDto-n1-update-error-validation.xml | 75 +++++++++++ ...ookPositionDto-n1-update-warning-validation.xml | 68 ++++++++++ .../HookSizeDto-n1-create-error-validation.xml | 75 +++++++++++ .../HookSizeDto-n1-create-warning-validation.xml | 68 ++++++++++ .../HookSizeDto-n1-update-error-validation.xml | 75 +++++++++++ .../HookSizeDto-n1-update-warning-validation.xml | 68 ++++++++++ .../HookTypeDto-n1-create-error-validation.xml | 75 +++++++++++ .../HookTypeDto-n1-create-warning-validation.xml | 68 ++++++++++ .../HookTypeDto-n1-update-error-validation.xml | 75 +++++++++++ .../HookTypeDto-n1-update-warning-validation.xml | 68 ++++++++++ ...ontalPositionDto-n1-create-error-validation.xml | 75 +++++++++++ ...talPositionDto-n1-create-warning-validation.xml | 68 ++++++++++ ...ontalPositionDto-n1-update-error-validation.xml | 75 +++++++++++ ...talPositionDto-n1-update-warning-validation.xml | 68 ++++++++++ ...ticalPositionDto-n1-create-error-validation.xml | 75 +++++++++++ ...calPositionDto-n1-create-warning-validation.xml | 68 ++++++++++ ...ticalPositionDto-n1-update-error-validation.xml | 75 +++++++++++ ...calPositionDto-n1-update-warning-validation.xml | 68 ++++++++++ ...htsticksColorDto-n1-create-error-validation.xml | 75 +++++++++++ ...sticksColorDto-n1-create-warning-validation.xml | 68 ++++++++++ ...htsticksColorDto-n1-update-error-validation.xml | 75 +++++++++++ ...sticksColorDto-n1-update-warning-validation.xml | 68 ++++++++++ ...ghtsticksTypeDto-n1-create-error-validation.xml | 75 +++++++++++ ...tsticksTypeDto-n1-create-warning-validation.xml | 68 ++++++++++ ...ghtsticksTypeDto-n1-update-error-validation.xml | 75 +++++++++++ ...tsticksTypeDto-n1-update-warning-validation.xml | 68 ++++++++++ .../LineTypeDto-n1-create-error-validation.xml | 75 +++++++++++ .../LineTypeDto-n1-create-warning-validation.xml | 68 ++++++++++ .../LineTypeDto-n1-update-error-validation.xml | 75 +++++++++++ .../LineTypeDto-n1-update-warning-validation.xml | 68 ++++++++++ ...aturityStatusDto-n1-create-error-validation.xml | 75 +++++++++++ ...urityStatusDto-n1-create-warning-validation.xml | 68 ++++++++++ ...aturityStatusDto-n1-update-error-validation.xml | 75 +++++++++++ ...urityStatusDto-n1-update-warning-validation.xml | 68 ++++++++++ ...itigationTypeDto-n1-create-error-validation.xml | 75 +++++++++++ ...igationTypeDto-n1-create-warning-validation.xml | 68 ++++++++++ ...itigationTypeDto-n1-update-error-validation.xml | 75 +++++++++++ ...igationTypeDto-n1-update-warning-validation.xml | 68 ++++++++++ .../SensorBrandDto-n1-create-error-validation.xml | 61 +++++++++ ...SensorBrandDto-n1-create-warning-validation.xml | 47 +++++++ .../SensorBrandDto-n1-update-error-validation.xml | 61 +++++++++ ...SensorBrandDto-n1-update-warning-validation.xml | 47 +++++++ ...sorDataFormatDto-n1-create-error-validation.xml | 75 +++++++++++ ...rDataFormatDto-n1-create-warning-validation.xml | 68 ++++++++++ ...sorDataFormatDto-n1-update-error-validation.xml | 75 +++++++++++ ...rDataFormatDto-n1-update-warning-validation.xml | 68 ++++++++++ .../SensorTypeDto-n1-create-error-validation.xml | 75 +++++++++++ .../SensorTypeDto-n1-create-warning-validation.xml | 68 ++++++++++ .../SensorTypeDto-n1-update-error-validation.xml | 75 +++++++++++ .../SensorTypeDto-n1-update-warning-validation.xml | 68 ++++++++++ .../SettingShapeDto-n1-create-error-validation.xml | 75 +++++++++++ ...ettingShapeDto-n1-create-warning-validation.xml | 68 ++++++++++ .../SettingShapeDto-n1-update-error-validation.xml | 75 +++++++++++ ...ettingShapeDto-n1-update-warning-validation.xml | 68 ++++++++++ ...zeMeasureTypeDto-n1-create-error-validation.xml | 75 +++++++++++ ...MeasureTypeDto-n1-create-warning-validation.xml | 68 ++++++++++ ...zeMeasureTypeDto-n1-update-error-validation.xml | 75 +++++++++++ ...MeasureTypeDto-n1-update-warning-validation.xml | 68 ++++++++++ ...tomacFullnessDto-n1-create-error-validation.xml | 75 +++++++++++ ...macFullnessDto-n1-create-warning-validation.xml | 68 ++++++++++ ...tomacFullnessDto-n1-update-error-validation.xml | 75 +++++++++++ ...macFullnessDto-n1-update-warning-validation.xml | 68 ++++++++++ .../TripTypeDto-n1-create-error-validation.xml | 75 +++++++++++ .../TripTypeDto-n1-create-warning-validation.xml | 68 ++++++++++ .../TripTypeDto-n1-update-error-validation.xml | 75 +++++++++++ .../TripTypeDto-n1-update-warning-validation.xml | 68 ++++++++++ ...ivityLonglineDto-n1-create-error-validation.xml | 75 +++++++++++ ...ityLonglineDto-n1-create-warning-validation.xml | 68 ++++++++++ ...ivityLonglineDto-n1-update-error-validation.xml | 75 +++++++++++ ...ityLonglineDto-n1-update-warning-validation.xml | 68 ++++++++++ ...htMeasureTypeDto-n1-create-error-validation.xml | 75 +++++++++++ ...MeasureTypeDto-n1-create-warning-validation.xml | 68 ++++++++++ ...htMeasureTypeDto-n1-update-error-validation.xml | 75 +++++++++++ ...MeasureTypeDto-n1-update-warning-validation.xml | 68 ++++++++++ ...DetectionModeDto-n1-create-error-validation.xml | 74 +++++++++++ ...tectionModeDto-n1-create-warning-validation.xml | 67 ++++++++++ ...DetectionModeDto-n1-update-error-validation.xml | 74 +++++++++++ ...tectionModeDto-n1-update-warning-validation.xml | 67 ++++++++++ .../ObjectFateDto-n1-create-error-validation.xml | 74 +++++++++++ .../ObjectFateDto-n1-create-warning-validation.xml | 67 ++++++++++ .../ObjectFateDto-n1-update-error-validation.xml | 74 +++++++++++ .../ObjectFateDto-n1-update-warning-validation.xml | 67 ++++++++++ ...jectOperationDto-n1-create-error-validation.xml | 74 +++++++++++ ...ctOperationDto-n1-create-warning-validation.xml | 67 ++++++++++ ...jectOperationDto-n1-update-error-validation.xml | 74 +++++++++++ ...ctOperationDto-n1-update-warning-validation.xml | 67 ++++++++++ .../ObjectTypeDto-n1-create-error-validation.xml | 74 +++++++++++ .../ObjectTypeDto-n1-create-warning-validation.xml | 67 ++++++++++ .../ObjectTypeDto-n1-update-error-validation.xml | 74 +++++++++++ .../ObjectTypeDto-n1-update-warning-validation.xml | 67 ++++++++++ ...bservedSystemDto-n1-create-error-validation.xml | 74 +++++++++++ ...ervedSystemDto-n1-create-warning-validation.xml | 67 ++++++++++ ...bservedSystemDto-n1-update-error-validation.xml | 74 +++++++++++ ...ervedSystemDto-n1-update-warning-validation.xml | 67 ++++++++++ ...sonForDiscardDto-n1-create-error-validation.xml | 74 +++++++++++ ...nForDiscardDto-n1-create-warning-validation.xml | 67 ++++++++++ ...sonForDiscardDto-n1-update-error-validation.xml | 74 +++++++++++ ...nForDiscardDto-n1-update-warning-validation.xml | 67 ++++++++++ ...nForNoFishingDto-n1-create-error-validation.xml | 74 +++++++++++ ...orNoFishingDto-n1-create-warning-validation.xml | 67 ++++++++++ ...nForNoFishingDto-n1-update-error-validation.xml | 74 +++++++++++ ...orNoFishingDto-n1-update-warning-validation.xml | 67 ++++++++++ ...sonForNullSetDto-n1-create-error-validation.xml | 74 +++++++++++ ...nForNullSetDto-n1-create-warning-validation.xml | 67 ++++++++++ ...sonForNullSetDto-n1-update-error-validation.xml | 74 +++++++++++ ...nForNullSetDto-n1-update-warning-validation.xml | 67 ++++++++++ .../SpeciesFateDto-n1-create-error-validation.xml | 74 +++++++++++ ...SpeciesFateDto-n1-create-warning-validation.xml | 67 ++++++++++ .../SpeciesFateDto-n1-update-error-validation.xml | 74 +++++++++++ ...SpeciesFateDto-n1-update-warning-validation.xml | 67 ++++++++++ ...SpeciesStatusDto-n1-create-error-validation.xml | 74 +++++++++++ ...eciesStatusDto-n1-create-warning-validation.xml | 67 ++++++++++ ...SpeciesStatusDto-n1-update-error-validation.xml | 74 +++++++++++ ...eciesStatusDto-n1-update-warning-validation.xml | 67 ++++++++++ ...ndingActivityDto-n1-create-error-validation.xml | 74 +++++++++++ ...ingActivityDto-n1-create-warning-validation.xml | 67 ++++++++++ ...ndingActivityDto-n1-update-error-validation.xml | 74 +++++++++++ ...ingActivityDto-n1-update-warning-validation.xml | 67 ++++++++++ ...BuoyOperationDto-n1-create-error-validation.xml | 74 +++++++++++ ...oyOperationDto-n1-create-warning-validation.xml | 67 ++++++++++ ...BuoyOperationDto-n1-update-error-validation.xml | 74 +++++++++++ ...oyOperationDto-n1-update-warning-validation.xml | 67 ++++++++++ ...ttingBuoyTypeDto-n1-create-error-validation.xml | 74 +++++++++++ ...ingBuoyTypeDto-n1-create-warning-validation.xml | 67 ++++++++++ ...ttingBuoyTypeDto-n1-update-error-validation.xml | 74 +++++++++++ ...ingBuoyTypeDto-n1-update-warning-validation.xml | 67 ++++++++++ ...ActivitySeineDto-n1-create-error-validation.xml | 74 +++++++++++ ...tivitySeineDto-n1-create-warning-validation.xml | 67 ++++++++++ ...ActivitySeineDto-n1-update-error-validation.xml | 74 +++++++++++ ...tivitySeineDto-n1-update-warning-validation.xml | 67 ++++++++++ ...eightCategoryDto-n1-create-error-validation.xml | 89 +++++++++++++ ...ghtCategoryDto-n1-create-warning-validation.xml | 67 ++++++++++ ...eightCategoryDto-n1-update-error-validation.xml | 75 +++++++++++ ...ghtCategoryDto-n1-update-warning-validation.xml | 67 ++++++++++ .../seine/WindDto-n1-create-error-validation.xml | 89 +++++++++++++ .../seine/WindDto-n1-create-warning-validation.xml | 67 ++++++++++ .../seine/WindDto-n1-update-error-validation.xml | 89 +++++++++++++ .../seine/WindDto-n1-update-warning-validation.xml | 67 ++++++++++ 236 files changed, 17450 insertions(+) diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-create-error-validation.xml new file mode 100644 index 0000000..6aad3b1 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-create-error-validation.xml @@ -0,0 +1,109 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="iso2Code"> + <!-- pas de iso2Code renseigne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.country.required.iso2Code</message> + </field-validator> + + <!-- clef unique sur le iso2Code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">iso2Code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.country.invalid.iso2Code.uniqueKey##${codeIso2}</message> + </field-validator> + + </field> + + <field name="iso3Code"> + <!-- pas de iso3Code renseigne --> + <field-validator type="requiredstring"> + <message>validator.country.required.iso3Code</message> + </field-validator> + + <!-- clef unique sur le iso3Code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">iso3Code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.country.invalid.iso3Code.uniqueKey##${codeIso3}</message> + </field-validator> + + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-update-error-validation.xml new file mode 100644 index 0000000..6aad3b1 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-update-error-validation.xml @@ -0,0 +1,109 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="iso2Code"> + <!-- pas de iso2Code renseigne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.country.required.iso2Code</message> + </field-validator> + + <!-- clef unique sur le iso2Code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">iso2Code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.country.invalid.iso2Code.uniqueKey##${codeIso2}</message> + </field-validator> + + </field> + + <field name="iso3Code"> + <!-- pas de iso3Code renseigne --> + <field-validator type="requiredstring"> + <message>validator.country.required.iso3Code</message> + </field-validator> + + <!-- clef unique sur le iso3Code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">iso3Code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.country.invalid.iso3Code.uniqueKey##${codeIso3}</message> + </field-validator> + + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-create-error-validation.xml new file mode 100644 index 0000000..b323f8c --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-create-error-validation.xml @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..9544187 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-create-warning-validation.xml @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + + <field name="startDate"> + <!-- pas de startDate renseigne --> + <field-validator type="required"> + <message>validator.lengthWeightParameter.required.startDate + </message> + </field-validator> + </field> + + <field name="endDate"> + <!-- pas de endDate renseigne --> + <field-validator type="required"> + <message>validator.lengthWeightParameter.required.endDate + </message> + </field-validator> + </field> +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-update-error-validation.xml new file mode 100644 index 0000000..b323f8c --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-update-error-validation.xml @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..1f75abb --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-update-warning-validation.xml @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="startDate"> + <!-- pas de startDate renseigne --> + <field-validator type="required"> + <message>validator.lengthWeightParameter.required.startDate + </message> + </field-validator> + </field> + + <field name="endDate"> + <!-- pas de endDate renseigne --> + <field-validator type="required"> + <message>validator.lengthWeightParameter.required.endDate + </message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-create-error-validation.xml new file mode 100644 index 0000000..cdd92c8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-create-error-validation.xml @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="gearCaracteristicType"> + + <!-- pas de gearCaracteristicType renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.gearCaracteristic.required.gearCaracteristicType</message> + </field-validator> + + <!-- gearCaracteristicType desactivee --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ disabled || gearCaracteristicType.enabled ]]> + </param> + <message>validator.gearCaracteristic.desactivated.gearCaracteristicType</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..fddb53e --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-update-error-validation.xml new file mode 100644 index 0000000..cdd92c8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-update-error-validation.xml @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="gearCaracteristicType"> + + <!-- pas de gearCaracteristicType renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.gearCaracteristic.required.gearCaracteristicType</message> + </field-validator> + + <!-- gearCaracteristicType desactivee --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ disabled || gearCaracteristicType.enabled ]]> + </param> + <message>validator.gearCaracteristic.desactivated.gearCaracteristicType</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..fddb53e --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-create-error-validation.xml new file mode 100644 index 0000000..9ac1e38 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..fddb53e --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-update-error-validation.xml new file mode 100644 index 0000000..9ac1e38 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..fddb53e --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-create-error-validation.xml new file mode 100644 index 0000000..39b9df0 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntityEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..fddb53e --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-update-error-validation.xml new file mode 100644 index 0000000..9ac1e38 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..fddb53e --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-create-error-validation.xml new file mode 100644 index 0000000..b9958a9 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="country"> + <!-- pas de country renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.organism.required.country</message> + </field-validator> + + <!-- country desactivee --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ disabled || country.enabled ]]> + </param> + <message>validator.organism.desactivated.country</message> + </field-validator> + </field> + + <field name="name"> + <!-- pas de name renseigne --> + <field-validator type="requiredstring"> + <message>validator.harbour.required.name</message> + </field-validator> + </field> + + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..f7ebe25 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="locode"> + <!-- pas de description renseignee --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.harbour.null.locode</message> + </field-validator> + </field> + + <field name="latitude"> + <!-- pas de latitude renseignee --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.harbour.null.latitude</message> + </field-validator> + </field> + + <field name="longitude"> + <!-- pas de longitude renseignee --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.harbour.null.longitude</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-update-error-validation.xml new file mode 100644 index 0000000..0d8f609 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-update-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="country"> + <!-- pas de country renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.harbour.required.country</message> + </field-validator> + + <!-- country desactivee --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ disabled || country.enabled ]]> + </param> + <message>validator.harbour.desactivated.country</message> + </field-validator> + </field> + + <field name="name"> + <!-- pas de name renseigne --> + <field-validator type="requiredstring"> + <message>validator.harbour.required.name</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..f7ebe25 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="locode"> + <!-- pas de description renseignee --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.harbour.null.locode</message> + </field-validator> + </field> + + <field name="latitude"> + <!-- pas de latitude renseignee --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.harbour.null.latitude</message> + </field-validator> + </field> + + <field name="longitude"> + <!-- pas de longitude renseignee --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.harbour.null.longitude</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-create-error-validation.xml new file mode 100644 index 0000000..f6311ae --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-create-error-validation.xml @@ -0,0 +1,137 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="species"> + <!-- pas de species selectionne --> + <field-validator type="required" short-circuit="true"> + <message>validator.lengthWeightParameter.required.species</message> + </field-validator> + + <!-- clef unique species - gender - ocean - startDate --> + <field-validator type="observeCollectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">species,sex,ocean,startDate</param> + <!--<param name="againstMe">true</param>--> + <message>validator.lengthWeightParameter.invalid.uniqueKey</message> + </field-validator> + </field> + + <field name="ocean"> + <!-- clef unique species - gender - ocean - startDate --> + <field-validator type="observeCollectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">species,sex,ocean,startDate</param> + <!--<param name="againstMe">true</param>--> + <message>validator.lengthWeightParameter.invalid.uniqueKey</message> + </field-validator> + </field> + + <field name="sex"> + <!-- clef unique species - gender - ocean - startDate --> + <field-validator type="observeCollectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">species,sex,ocean,startDate</param> + <!--<param name="againstMe">true</param>--> + <message>validator.lengthWeightParameter.invalid.uniqueKey</message> + </field-validator> + </field> + + <field name="startDate"> + <!-- clef unique species - gender - ocean - startDate --> + <field-validator type="observeCollectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">species,sex,ocean,startDate</param> + <!--<param name="againstMe">true</param>--> + <message>validator.lengthWeightParameter.invalid.uniqueKey</message> + </field-validator> + </field> + + <field name="lengthWeightFormula"> + <!-- pas de relation weight renseignee --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.lengthWeightParameter.required.lengthWeightFormula + </message> + </field-validator> + + <!-- relation weight invalide --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ lengthWeightFormulaValid ]]> + </param> + <message>validator.lengthWeightParameter.invalid.lengthWeightFormula + </message> + </field-validator> + + </field> + + <field name="weightLengthFormula"> + <!-- pas de relation taille renseignee --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.lengthWeightParameter.required.weightLengthFormula + </message> + </field-validator> + + <!-- relation taille invalide --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ weightLengthFormulaValid ]]> + </param> + <message>validator.lengthWeightParameter.invalid.weightLengthFormula + </message> + </field-validator> + + </field> + + <field name="coefficients"> + <!-- pas de coefficients renseigne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.lengthWeightParameter.required.coefficients + </message> + </field-validator> + + <!-- syntaxe coefficients invalide FIXME chemit 2010_08-21 Il faut autoriser les ecritures scientifique E[+-][0-9]+--> + <!--field-validator type="regex"> + <param name="expression">\w+=[0-9]+(\.[0-9]+(E[+-]*[0-9]+)*)*(:\w+=[0-9]+(\.[0-9]+(E[+-]*[0-9]+)*)*)*</param> + <message>validator.lengthWeightParameter.invalid.coefficients</message> + </field-validator--> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..1135ba0 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-create-warning-validation.xml @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="ocean"> + <!-- pas de ocean renseigne --> + <field-validator type="required"> + <message>validator.lengthWeightParameter.null.ocean</message> + </field-validator> + </field> + + <field name="startDate"> + <!-- pas de startDate renseigne --> + <field-validator type="required"> + <message>validator.lengthWeightParameter.required.startDate + </message> + </field-validator> + </field> + + <field name="endDate"> + <!-- pas de endDate renseigne --> + <field-validator type="required"> + <message>validator.lengthWeightParameter.required.endDate + </message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-update-error-validation.xml new file mode 100644 index 0000000..eeb730b --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-update-error-validation.xml @@ -0,0 +1,138 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="species"> + <!-- pas de species selectionne --> + <field-validator type="required" short-circuit="true"> + <message>validator.lengthWeightParameter.required.species</message> + </field-validator> + + <!-- clef unique species - gender - ocean - startDate --> + <field-validator type="observeCollectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">species,sex,ocean,startDate</param> + <!--<param name="againstMe">true</param>--> + <message>validator.lengthWeightParameter.invalid.uniqueKey</message> + </field-validator> + </field> + + <field name="ocean"> + <!-- clef unique species - gender - ocean - startDate --> + <field-validator type="observeCollectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">species,sex,ocean,startDate</param> + <!--<param name="againstMe">true</param>--> + <message>validator.lengthWeightParameter.invalid.uniqueKey</message> + </field-validator> + </field> + + <field name="sex"> + <!-- clef unique species - gender - ocean - startDate --> + <field-validator type="observeCollectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">species,sex,ocean,startDate</param> + <!--<param name="againstMe">true</param>--> + <message>validator.lengthWeightParameter.invalid.uniqueKey</message> + </field-validator> + </field> + + <field name="startDate"> + <!-- clef unique species - gender - ocean - startDate --> + <field-validator type="observeCollectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">species,sex,ocean,startDate</param> + <!--<param name="againstMe">true</param>--> + <message>validator.lengthWeightParameter.invalid.uniqueKey</message> + </field-validator> + </field> + + <field name="lengthWeightFormula"> + <!-- pas de relation weight renseignee --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.lengthWeightParameter.required.lengthWeightFormula + </message> + </field-validator> + + <!-- relation weight invalide --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ lengthWeightFormulaValid ]]> + </param> + <message>validator.lengthWeightParameter.invalid.lengthWeightFormula + </message> + </field-validator> + + </field> + + <field name="weightLengthFormula"> + <!-- pas de relation taille renseignee --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.lengthWeightParameter.required.weightLengthFormula + </message> + </field-validator> + + <!-- relation taille invalide --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ weightLengthFormulaValid ]]> + </param> + <message>validator.lengthWeightParameter.invalid.weightLengthFormula + </message> + </field-validator> + + </field> + + <field name="coefficients"> + <!-- pas de coefficients renseigne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.lengthWeightParameter.required.coefficients + </message> + </field-validator> + + <!-- syntaxe coefficients invalide FIXME chemit 2010_08-21 Il faut autoriser les ecritures scientifique E[+-][0-9]+--> + <!--field-validator type="regex"> + <param name="expression">\w+=[0-9]+(\.[0-9]+(E[+-]*[0-9]+)*)*(:\w+=[0-9]+(\.[0-9]+(E[+-]*[0-9]+)*)*)*</param> + <message>validator.lengthWeightParameter.invalid.coefficients</message> + </field-validator--> + + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..9aba964 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-update-warning-validation.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="startDate"> + <!-- pas de startDate renseigne --> + <field-validator type="required"> + <message>validator.lengthWeightParameter.required.startDate + </message> + </field-validator> + </field> + + <field name="endDate"> + <!-- pas de endDate renseigne --> + <field-validator type="required"> + <message>validator.lengthWeightParameter.required.endDate + </message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-create-error-validation.xml new file mode 100644 index 0000000..2a90a31 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-create-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-update-error-validation.xml new file mode 100644 index 0000000..139ecae --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-update-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-create-error-validation.xml new file mode 100644 index 0000000..01a4ba4 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-create-error-validation.xml @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="country"> + <!-- pas de country renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.organism.required.country</message> + </field-validator> + + <!-- country desactivee --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ disabled || country.enabled ]]> + </param> + <message>validator.organism.desactivated.country</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..87bc45b --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-create-warning-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="description"> + <!-- pas de description selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.organism.null.description</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-update-error-validation.xml new file mode 100644 index 0000000..2692af5 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-update-error-validation.xml @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="country"> + <!-- pas de country renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.organism.required.country</message> + </field-validator> + + <!-- country desactivee --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ disabled || country.enabled ]]> + </param> + <message>validator.organism.desactivated.country</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..87bc45b --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-update-warning-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="description"> + <!-- pas de description selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.organism.null.description</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-create-error-validation.xml new file mode 100644 index 0000000..fdb057d --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-create-error-validation.xml @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri--> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="lastName"> + <!-- pas de lastName renseigne --> + <field-validator type="requiredstring"> + <message>validator.person.required.lastName</message> + </field-validator> + </field> + + <field name="firstName"> + <!-- pas de firstName renseigne --> + <field-validator type="requiredstring"> + <message>validator.person.required.firstName</message> + </field-validator> + </field> + + <field name="country"> + <!-- pas de country renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.person.required.country</message> + </field-validator> + + <!-- country desactivee --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ disabled || country.enabled ]]> + </param> + <message>validator.person.desactivated.country</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..ea7caa4 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-create-warning-validation.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-update-error-validation.xml new file mode 100644 index 0000000..194ce1a --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-update-error-validation.xml @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri--> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="lastName"> + <!-- pas de lastName renseigne --> + <field-validator type="requiredstring"> + <message>validator.person.required.lastName</message> + </field-validator> + </field> + + <field name="firstName"> + <!-- pas de firstName renseigne --> + <field-validator type="requiredstring"> + <message>validator.person.required.firstName</message> + </field-validator> + </field> + + <field name="country"> + + <!-- pas de country renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.person.required.country</message> + </field-validator> + + <!-- country desactivee --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ country == null || disabled || country.enabled ]]> + </param> + <message>validator.person.desactivated.country</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..ea7caa4 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-update-warning-validation.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-create-error-validation.xml new file mode 100644 index 0000000..6726c03 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-create-error-validation.xml @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="organism"> + <!-- pas de organism renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.program.required.organism</message> + </field-validator> + + <!-- organism desactivee --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ disabled || organism.enabled ]]> + </param> + <message>validator.program.desactivated.organism</message> + </field-validator> + </field> + + <field name="gearType"> + <!-- pas de type d'engin renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.program.required.gearType</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..600fe7c --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-create-warning-validation.xml @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="startDate"> + <!-- pas de startDate renseigne --> + <field-validator type="required"> + <message>validator.program.required.startDate</message> + </field-validator> + </field> + + <field name="endDate"> + <!-- pas de endDate renseigne --> + <field-validator type="required"> + <message>validator.program.required.endDate</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + + <field name="comment"> + + <!-- comentaire de moins de 1024 caractères --> + <field-validator type="stringlength"> + <param name="maxLength">1024</param> + <message>validator.program.comment.tobig</message> + </field-validator> + + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-update-error-validation.xml new file mode 100644 index 0000000..3b021dc --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-update-error-validation.xml @@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="organism"> + <!-- pas de organism renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.program.required.organism</message> + </field-validator> + + <!-- organism desactivee --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ disabled || organism.enabled ]]> + </param> + <message>validator.program.desactivated.organism</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..600fe7c --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-update-warning-validation.xml @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="startDate"> + <!-- pas de startDate renseigne --> + <field-validator type="required"> + <message>validator.program.required.startDate</message> + </field-validator> + </field> + + <field name="endDate"> + <!-- pas de endDate renseigne --> + <field-validator type="required"> + <message>validator.program.required.endDate</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + + <field name="comment"> + + <!-- comentaire de moins de 1024 caractères --> + <field-validator type="stringlength"> + <param name="maxLength">1024</param> + <message>validator.program.comment.tobig</message> + </field-validator> + + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-create-error-validation.xml new file mode 100644 index 0000000..b323f8c --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-create-error-validation.xml @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..5edf71b --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-create-warning-validation.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-update-error-validation.xml new file mode 100644 index 0000000..b323f8c --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-update-error-validation.xml @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..5edf71b --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-update-warning-validation.xml @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-create-error-validation.xml new file mode 100644 index 0000000..e981a11 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-create-error-validation.xml @@ -0,0 +1,138 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="homeId"> + <!-- clef unique sur le homeId --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">homeId</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.species.invalid.homeId.uniqueKey##${homeId}</message> + </field-validator> + </field> + + <field name="faoCode"> + <!-- clef unique sur le faoCode --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">faoCode</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.species.invalid.faoCode.uniqueKey##${faoCode}</message> + </field-validator> + </field> + + <field name="wormsId"> + <!-- clef unique sur le wormsId --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">wormsId</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.species.invalid.wormsId.uniqueKey##${wormsId}</message> + </field-validator> + </field> + + <field name="speciesGroup"> + <!-- pas de speciesGroup renseigne --> + <!--field-validator type="required" short-circuit="true"> + <message>validator.species.required.speciesGroup</message> + </field-validator--> + + <!-- speciesGroup desactivee --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ disabled || speciesGroup.enabled ]]> + </param> + <message>validator.species.desactivated.speciesGroup</message> + </field-validator> + </field> + + <field name="scientificLabel"> + + <!-- pas de scientificLabel renseigne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.species.required.scientificLabel</message> + </field-validator> + + <!-- clef unique sur le scientificLabel --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">scientificLabel</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.species.invalid.scientificLabel.uniqueKey##${scientificLabel}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..fd865c6 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-create-warning-validation.xml @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="homeId"> + <!-- pas de homeId renseigne --> + <field-validator type="requiredstring"> + <message>validator.species.null.homeId</message> + </field-validator> + </field> + + <field name="faoCode"> + <!-- pas de faoCode renseigne --> + <field-validator type="requiredstring"> + <message>validator.species.null.faoCode</message> + </field-validator> + </field> + + <field name="wormsId"> + <!-- wormsId > 0 --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ wormsId > 0 ]]> + </param> + <message>validator.species.invalid.wormsId##${wormsId}</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-update-error-validation.xml new file mode 100644 index 0000000..f357281 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-update-error-validation.xml @@ -0,0 +1,138 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="homeId"> + <!-- clef unique sur le homeId --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">homeId</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.species.invalid.homeId.uniqueKey##${homeId}</message> + </field-validator> + </field> + + <field name="faoCode"> + <!-- clef unique sur le faoCode --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">faoCode</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.species.invalid.faoCode.uniqueKey##${faoCode}</message> + </field-validator> + </field> + + <field name="wormsId"> + <!-- clef unique sur le wormsId --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">wormsId</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.species.invalid.wormsId.uniqueKey##${wormsId}</message> + </field-validator> + </field> + + <field name="speciesGroup"> + <!-- pas de speciesGroup renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.species.required.speciesGroup</message> + </field-validator> + + <!-- speciesGroup desactivee --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ disabled || speciesGroup.enabled ]]> + </param> + <message>validator.species.desactivated.speciesGroup</message> + </field-validator> + </field> + + <field name="scientificLabel"> + <!-- pas de scientificLabel renseigne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.species.required.scientificLabel</message> + </field-validator> + + <!-- clef unique sur le scientificLabel --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">scientificLabel</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.species.invalid.scientificLabel.uniqueKey##${scientificLabel}</message> + </field-validator> + + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..5c26bc5 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-update-warning-validation.xml @@ -0,0 +1,100 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="homeId"> + <!-- pas de homeId renseigne --> + <field-validator type="requiredstring"> + <message>validator.species.null.homeId</message> + </field-validator> + </field> + + <field name="faoCode"> + <!-- pas de faoCode renseigne --> + <field-validator type="requiredstring"> + <message>validator.species.null.faoCode</message> + </field-validator> + </field> + + <field name="wormsId"> + <!-- wormsId > 0 --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ wormsId > 0 ]]> + </param> + <message>validator.species.invalid.wormsId##${wormsId}</message> + </field-validator> + </field> + + <field name="ocean"> + <!-- pas de ocean renseigne --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ !(ocean == null || ocean.empty) ]]> + </param> + <message>validator.species.required.ocean</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-create-error-validation.xml new file mode 100644 index 0000000..2a90a31 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-create-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-update-error-validation.xml new file mode 100644 index 0000000..139ecae --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-update-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..e981384 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-create-warning-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="code"> + <!-- pas de code renseigne --> + <field-validator type="requiredstring"> + <message>validator.speciesList.null.code</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..e981384 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-update-warning-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="code"> + <!-- pas de code renseigne --> + <field-validator type="requiredstring"> + <message>validator.speciesList.null.code</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-create-error-validation.xml new file mode 100644 index 0000000..a108075 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-create-error-validation.xml @@ -0,0 +1,134 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="keelCode"> + <!-- keelCode > 0 --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ keelCode > 0 ]]> + </param> + <message>validator.vessel.invalid.keelCode##${codeQuille}</message> + </field-validator> + </field> + + <field name="fleetCountry"> + <!-- fleetCountry > 0 --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ fleetCountry > 0 ]]> + </param> + <message>validator.vessel.invalid.fleetCountry##${codeFlotte}</message> + </field-validator> + </field> + + <field name="vesselType"> + <!-- pas de vesselType renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.vessel.required.vesselType</message> + </field-validator> + + <!-- vesselType desactive --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ disabled || vesselType.enabled ]]> + </param> + <message>validator.vessel.desactivated.vesselType</message> + </field-validator> + </field> + + <field name="vesselSizeCategory"> + <!-- pas de vesselSizeCategory renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.vessel.required.vesselSizeCategory</message> + </field-validator> + + <!-- vesselSizeCategory desactive --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ disabled || vesselSizeCategory.enabled ]]> + </param> + <message>validator.vessel.desactivated.vesselSizeCategory</message> + </field-validator> + </field> + + <field name="flagCountry"> + <!-- pas de flagCountry renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.vessel.required.flagCountry</message> + </field-validator> + + <!-- flagCountry desactive --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ disabled || flagCountry.enabled ]]> + </param> + <message>validator.vessel.desactivated.flagCountry</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..17498ff --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-create-warning-validation.xml @@ -0,0 +1,127 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="changeDate"> + <!-- pas de changeDate selectionne --> + <field-validator type="required" short-circuit="true"> + <message>validator.vessel.null.changeDate</message> + </field-validator> + </field> + + <field name="length"> + <!-- length > 0 --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ length > 0 ]]> + </param> + <message> + validator.vessel.invalid.length##${lengthHorsToute} + </message> + </field-validator> + </field> + + <field name="capacity"> + <!-- capacity > 0 --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ capacity > 0 ]]> + </param> + <message> + validator.vessel.invalid.capacity##${capaciteTransport} + </message> + </field-validator> + </field> + + <field name="power"> + <!-- power > 0 --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ power > 0 ]]> + </param> + <message> + validator.vessel.invalid.power##${puissanceGroupePrincipal} + </message> + </field-validator> + </field> + + <field name="yearService"> + <!-- yearService > 0 --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ yearService > 0 ]]> + </param> + <message>validator.vessel.invalid.yearService##${anneeService}</message> + </field-validator> + </field> + + <field name="searchMaximum"> + <!-- searchMaximum > 0 --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ searchMaximum > 0 ]]> + </param> + <message> + validator.vessel.invalid.searchMaximum##${vitesseMaximaleProcespection} + </message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-update-error-validation.xml new file mode 100644 index 0000000..ebed934 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-update-error-validation.xml @@ -0,0 +1,134 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="keelCode"> + <!-- keelCode > 0 --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ keelCode > 0 ]]> + </param> + <message>validator.vessel.invalid.keelCode##${codeQuille}</message> + </field-validator> + </field> + + <field name="fleetCountry"> + <!-- fleetCountry > 0 --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ fleetCountry > 0 ]]> + </param> + <message>validator.vessel.invalid.fleetCountry##${codeFlotte}</message> + </field-validator> + </field> + + <field name="vesselType"> + <!-- pas de vesselType renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.vessel.required.vesselType</message> + </field-validator> + + <!-- vesselType desactive --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ disabled || vesselType.enabled ]]> + </param> + <message>validator.vessel.desactivated.vesselType</message> + </field-validator> + </field> + + <field name="vesselSizeCategory"> + <!-- pas de vesselSizeCategory renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.vessel.required.vesselSizeCategory</message> + </field-validator> + + <!-- vesselSizeCategory desactive --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ disabled || vesselSizeCategory.enabled ]]> + </param> + <message>validator.vessel.desactivated.vesselSizeCategory</message> + </field-validator> + </field> + + <field name="flagCountry"> + <!-- pas de flagCountry renseigne --> + <field-validator type="required" short-circuit="true"> + <message>validator.vessel.required.flagCountry</message> + </field-validator> + + <!-- flagCountry desactive --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ disabled || flagCountry.enabled ]]> + </param> + <message>validator.vessel.desactivated.flagCountry</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..17498ff --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-update-warning-validation.xml @@ -0,0 +1,127 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="changeDate"> + <!-- pas de changeDate selectionne --> + <field-validator type="required" short-circuit="true"> + <message>validator.vessel.null.changeDate</message> + </field-validator> + </field> + + <field name="length"> + <!-- length > 0 --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ length > 0 ]]> + </param> + <message> + validator.vessel.invalid.length##${lengthHorsToute} + </message> + </field-validator> + </field> + + <field name="capacity"> + <!-- capacity > 0 --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ capacity > 0 ]]> + </param> + <message> + validator.vessel.invalid.capacity##${capaciteTransport} + </message> + </field-validator> + </field> + + <field name="power"> + <!-- power > 0 --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ power > 0 ]]> + </param> + <message> + validator.vessel.invalid.power##${puissanceGroupePrincipal} + </message> + </field-validator> + </field> + + <field name="yearService"> + <!-- yearService > 0 --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ yearService > 0 ]]> + </param> + <message>validator.vessel.invalid.yearService##${anneeService}</message> + </field-validator> + </field> + + <field name="searchMaximum"> + <!-- searchMaximum > 0 --> + <field-validator type="fieldexpression"> + <param name="expression"><![CDATA[ searchMaximum > 0 ]]> + </param> + <message> + validator.vessel.invalid.searchMaximum##${vitesseMaximaleProcespection} + </message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-create-error-validation.xml new file mode 100644 index 0000000..827ebd4 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-create-error-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="gaugeLabel"> + <!-- pas de gaugeLabel renseigne --> + <field-validator type="requiredstring"> + <message>validator.vesselSizeCategory.required.gaugeLabel</message> + </field-validator> + </field> + + <field name="capacityLabel"> + <!-- pas de capacityLabel renseigne --> + <field-validator type="requiredstring"> + <message>validator.vesselSizeCategory.required.capacityLabel</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..ea7caa4 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-create-warning-validation.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-update-error-validation.xml new file mode 100644 index 0000000..d9e00c4 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-update-error-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="gaugeLabel"> + <!-- pas de gaugeLabel renseigne --> + <field-validator type="requiredstring"> + <message>validator.vesselSizeCategory.required.gaugeLabel</message> + </field-validator> + </field> + + <field name="capacityLabel"> + <!-- pas de capacityLabel renseigne --> + <field-validator type="requiredstring"> + <message>validator.vesselSizeCategory.required.capacityLabel</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..ea7caa4 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-update-warning-validation.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-create-error-validation.xml new file mode 100644 index 0000000..2a90a31 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-create-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-update-error-validation.xml new file mode 100644 index 0000000..139ecae --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-update-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-create-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-update-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-create-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-update-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-create-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-update-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-create-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-update-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-create-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-update-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-create-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-update-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-create-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-update-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-create-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-update-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-create-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-update-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-create-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-update-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-create-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-update-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-create-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-update-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-create-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-update-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-create-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-update-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-create-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-update-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-create-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-update-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1869733 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-create-error-validation.xml @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="brandName"> + <!-- pas de brandName renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.brandName</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..bf2770f --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-create-warning-validation.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1869733 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-update-error-validation.xml @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="brandName"> + <!-- pas de brandName renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.brandName</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..bf2770f --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-update-warning-validation.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-create-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-update-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-create-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-update-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-create-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-update-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-create-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-update-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-create-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-update-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-create-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-update-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-create-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-update-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-create-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-create-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-create-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-update-error-validation.xml new file mode 100644 index 0000000..1967477 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..52b9227 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-update-warning-validation.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2014 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% + --> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-create-error-validation.xml new file mode 100644 index 0000000..2a90a31 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-create-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-update-error-validation.xml new file mode 100644 index 0000000..139ecae --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-update-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-create-error-validation.xml new file mode 100644 index 0000000..2a90a31 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-create-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-update-error-validation.xml new file mode 100644 index 0000000..139ecae --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-update-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-create-error-validation.xml new file mode 100644 index 0000000..2a90a31 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-create-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-update-error-validation.xml new file mode 100644 index 0000000..139ecae --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-update-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-create-error-validation.xml new file mode 100644 index 0000000..2a90a31 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-create-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-update-error-validation.xml new file mode 100644 index 0000000..139ecae --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-update-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..a885609 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-create-error-validation.xml new file mode 100644 index 0000000..2a90a31 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-create-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-update-error-validation.xml new file mode 100644 index 0000000..139ecae --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-update-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-create-error-validation.xml new file mode 100644 index 0000000..2a90a31 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-create-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-update-error-validation.xml new file mode 100644 index 0000000..139ecae --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-update-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-create-error-validation.xml new file mode 100644 index 0000000..2a90a31 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-create-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-update-error-validation.xml new file mode 100644 index 0000000..139ecae --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-update-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-create-error-validation.xml new file mode 100644 index 0000000..2a90a31 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-create-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-update-error-validation.xml new file mode 100644 index 0000000..139ecae --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-update-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-create-error-validation.xml new file mode 100644 index 0000000..2a90a31 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-create-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-update-error-validation.xml new file mode 100644 index 0000000..139ecae --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-update-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-create-error-validation.xml new file mode 100644 index 0000000..2a90a31 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-create-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-update-error-validation.xml new file mode 100644 index 0000000..139ecae --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-update-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-create-error-validation.xml new file mode 100644 index 0000000..2a90a31 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-create-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-update-error-validation.xml new file mode 100644 index 0000000..139ecae --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-update-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-create-error-validation.xml new file mode 100644 index 0000000..2a90a31 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-create-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-update-error-validation.xml new file mode 100644 index 0000000..139ecae --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-update-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-create-error-validation.xml new file mode 100644 index 0000000..2a90a31 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-create-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-update-error-validation.xml new file mode 100644 index 0000000..139ecae --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-update-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-create-error-validation.xml new file mode 100644 index 0000000..2a90a31 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-create-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-update-error-validation.xml new file mode 100644 index 0000000..139ecae --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-update-error-validation.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-create-error-validation.xml new file mode 100644 index 0000000..043a266 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-create-error-validation.xml @@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri} + </message> + </field-validator> + </field> + + <field name="species"> + <!-- pas de species selectionne --> + <field-validator type="required" short-circuit="true"> + <message>validator.weightCategory.required.species</message> + </field-validator> + + <!-- species desactivee --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"><![CDATA[ disabled || species.enabled ]]> + </param> + <message>validator.weightCategory.desactivated.species</message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-update-error-validation.xml new file mode 100644 index 0000000..82a637d --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-update-error-validation.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri} + </message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-create-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-create-error-validation.xml new file mode 100644 index 0000000..a44070e --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-create-error-validation.xml @@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="speedRange"> + <!-- pas de speedRange renseigne --> + <field-validator type="requiredstring"> + <message>validator.wind.required.speedRange</message> + </field-validator> + </field> + + <field name="waveHeight"> + <!-- pas de waveHeight renseigne --> + <field-validator type="requiredstring"> + <message>validator.wind.required.waveHeight + </message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-create-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-create-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-create-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-update-error-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-update-error-validation.xml new file mode 100644 index 0000000..a44070e --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-update-error-validation.xml @@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="code"> + + <!-- clef unique sur le code --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">code</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.code.uniqueKey##${code}</message> + </field-validator> + + </field> + + <field name="uri"> + <!-- clef unique sur l'uri --> + <field-validator type="collectionUniqueKey" short-circuit="true"> + <param name="collectionFieldName">editingReferentielListEntity</param> + <param name="keys">uri</param> + <param name="againstMe">true</param> + <param name="nullValueSkipped">true</param> + <message>validator.referentiel.invalid.uri.uniqueKey##${uri}</message> + </field-validator> + </field> + + <field name="speedRange"> + <!-- pas de speedRange renseigne --> + <field-validator type="requiredstring"> + <message>validator.wind.required.speedRange</message> + </field-validator> + </field> + + <field name="waveHeight"> + <!-- pas de waveHeight renseigne --> + <field-validator type="requiredstring"> + <message>validator.wind.required.waveHeight + </message> + </field-validator> + </field> + + <field name="label1"> + <!-- pas de libelle 1 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label1</message> + </field-validator> + </field> + + <field name="label2"> + <!-- pas de libelle 2 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label2</message> + </field-validator> + </field> + + <field name="label3"> + <!-- pas de libelle 3 renseigne --> + <field-validator type="requiredstring"> + <message>validator.referentiel.required.label3</message> + </field-validator> + </field> + +</validators> diff --git a/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-update-warning-validation.xml b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-update-warning-validation.xml new file mode 100644 index 0000000..13a5be8 --- /dev/null +++ b/observe-application-swing/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-update-warning-validation.xml @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + ObServe :: Validation + %% + Copyright (C) 2008 - 2010 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% + --> + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + + <field name="status"> + <!-- objet desactive --> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ enabled ]]> + </param> + <message>validator.referentiel.status.desactivated</message> + </field-validator> + </field> + + <field name="uri"> + <!-- pas d'uri selectionne --> + <field-validator type="requiredstring" short-circuit="true"> + <message>validator.referentiel.null.uri</message> + </field-validator> + </field> + + <field name="label1"> + + <!-- libelle 1 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label1 == null || label1.empty || label1 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label1</message> + </field-validator> + </field> + + <field name="label3"> + <!-- libelle 3 non traduit (egal a label2) --> + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ label3 == null || label3.empty || label3 != label2 ]]> + </param> + <message>validator.referentiel.untranslated.label3</message> + </field-validator> + </field> + +</validators> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit d07cdbed498b96513e6a5e269296d4a08dd592d8 Merge: 412c00e f25c00c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 18 17:46:40 2015 +0200 Ajout des validateurs sur les écrans de référentiel Merge branch 'feature/7610_validation' into develop .../CountryDto-n1-create-error-validation.xml | 109 ++++++++++++++++ .../CountryDto-n1-create-warning-validation.xml | 67 ++++++++++ .../CountryDto-n1-update-error-validation.xml | 109 ++++++++++++++++ .../CountryDto-n1-update-warning-validation.xml | 67 ++++++++++ .../FpaZoneDto-n1-create-error-validation.xml | 73 +++++++++++ .../FpaZoneDto-n1-create-warning-validation.xml | 80 ++++++++++++ .../FpaZoneDto-n1-update-error-validation.xml | 73 +++++++++++ .../FpaZoneDto-n1-update-warning-validation.xml | 81 ++++++++++++ ...CaracteristicDto-n1-create-error-validation.xml | 90 ++++++++++++++ ...racteristicDto-n1-create-warning-validation.xml | 67 ++++++++++ ...CaracteristicDto-n1-update-error-validation.xml | 90 ++++++++++++++ ...racteristicDto-n1-update-warning-validation.xml | 67 ++++++++++ ...cteristicTypeDto-n1-create-error-validation.xml | 75 +++++++++++ ...eristicTypeDto-n1-create-warning-validation.xml | 67 ++++++++++ ...cteristicTypeDto-n1-update-error-validation.xml | 75 +++++++++++ ...eristicTypeDto-n1-update-warning-validation.xml | 67 ++++++++++ .../GearDto-n1-create-error-validation.xml | 75 +++++++++++ .../GearDto-n1-create-warning-validation.xml | 67 ++++++++++ .../GearDto-n1-update-error-validation.xml | 75 +++++++++++ .../GearDto-n1-update-warning-validation.xml | 67 ++++++++++ .../HarbourDto-n1-create-error-validation.xml | 75 +++++++++++ .../HarbourDto-n1-create-warning-validation.xml | 67 ++++++++++ .../HarbourDto-n1-update-error-validation.xml | 74 +++++++++++ .../HarbourDto-n1-update-warning-validation.xml | 67 ++++++++++ ...ightParameterDto-n1-create-error-validation.xml | 137 ++++++++++++++++++++ ...htParameterDto-n1-create-warning-validation.xml | 69 +++++++++++ ...ightParameterDto-n1-update-error-validation.xml | 138 +++++++++++++++++++++ ...htParameterDto-n1-update-warning-validation.xml | 62 +++++++++ .../OceanDto-n1-create-error-validation.xml | 74 +++++++++++ .../OceanDto-n1-create-warning-validation.xml | 67 ++++++++++ .../OceanDto-n1-update-error-validation.xml | 74 +++++++++++ .../OceanDto-n1-update-warning-validation.xml | 67 ++++++++++ .../OrganismDto-n1-create-error-validation.xml | 88 +++++++++++++ .../OrganismDto-n1-create-warning-validation.xml | 74 +++++++++++ .../OrganismDto-n1-update-error-validation.xml | 88 +++++++++++++ .../OrganismDto-n1-update-warning-validation.xml | 74 +++++++++++ .../PersonDto-n1-create-error-validation.xml | 81 ++++++++++++ .../PersonDto-n1-create-warning-validation.xml | 46 +++++++ .../PersonDto-n1-update-error-validation.xml | 82 ++++++++++++ .../PersonDto-n1-update-warning-validation.xml | 46 +++++++ .../ProgramDto-n1-create-error-validation.xml | 96 ++++++++++++++ .../ProgramDto-n1-create-warning-validation.xml | 91 ++++++++++++++ .../ProgramDto-n1-update-error-validation.xml | 89 +++++++++++++ .../ProgramDto-n1-update-warning-validation.xml | 91 ++++++++++++++ .../SexDto-n1-create-error-validation.xml | 73 +++++++++++ .../SexDto-n1-create-warning-validation.xml | 65 ++++++++++ .../SexDto-n1-update-error-validation.xml | 73 +++++++++++ .../SexDto-n1-update-warning-validation.xml | 65 ++++++++++ .../SpeciesDto-n1-create-error-validation.xml | 138 +++++++++++++++++++++ .../SpeciesDto-n1-create-warning-validation.xml | 90 ++++++++++++++ .../SpeciesDto-n1-update-error-validation.xml | 138 +++++++++++++++++++++ .../SpeciesDto-n1-update-warning-validation.xml | 100 +++++++++++++++ .../SpeciesGroupDto-n1-create-error-validation.xml | 74 +++++++++++ ...peciesGroupDto-n1-create-warning-validation.xml | 67 ++++++++++ .../SpeciesGroupDto-n1-update-error-validation.xml | 74 +++++++++++ ...peciesGroupDto-n1-update-warning-validation.xml | 67 ++++++++++ .../SpeciesListDto-n1-create-error-validation.xml | 75 +++++++++++ ...SpeciesListDto-n1-create-warning-validation.xml | 75 +++++++++++ .../SpeciesListDto-n1-update-error-validation.xml | 75 +++++++++++ ...SpeciesListDto-n1-update-warning-validation.xml | 75 +++++++++++ .../VesselDto-n1-create-error-validation.xml | 134 ++++++++++++++++++++ .../VesselDto-n1-create-warning-validation.xml | 127 +++++++++++++++++++ .../VesselDto-n1-update-error-validation.xml | 134 ++++++++++++++++++++ .../VesselDto-n1-update-warning-validation.xml | 127 +++++++++++++++++++ ...lSizeCategoryDto-n1-create-error-validation.xml | 67 ++++++++++ ...izeCategoryDto-n1-create-warning-validation.xml | 46 +++++++ ...lSizeCategoryDto-n1-update-error-validation.xml | 67 ++++++++++ ...izeCategoryDto-n1-update-warning-validation.xml | 46 +++++++ .../VesselTypeDto-n1-create-error-validation.xml | 74 +++++++++++ .../VesselTypeDto-n1-create-warning-validation.xml | 67 ++++++++++ .../VesselTypeDto-n1-update-error-validation.xml | 74 +++++++++++ .../VesselTypeDto-n1-update-warning-validation.xml | 67 ++++++++++ ...HaulingStatusDto-n1-create-error-validation.xml | 75 +++++++++++ ...ulingStatusDto-n1-create-warning-validation.xml | 68 ++++++++++ ...HaulingStatusDto-n1-update-error-validation.xml | 75 +++++++++++ ...ulingStatusDto-n1-update-warning-validation.xml | 68 ++++++++++ ...SettingStatusDto-n1-create-error-validation.xml | 75 +++++++++++ ...ttingStatusDto-n1-create-warning-validation.xml | 68 ++++++++++ ...SettingStatusDto-n1-update-error-validation.xml | 75 +++++++++++ ...ttingStatusDto-n1-update-warning-validation.xml | 68 ++++++++++ .../BaitTypeDto-n1-create-error-validation.xml | 75 +++++++++++ .../BaitTypeDto-n1-create-warning-validation.xml | 68 ++++++++++ .../BaitTypeDto-n1-update-error-validation.xml | 75 +++++++++++ .../BaitTypeDto-n1-update-warning-validation.xml | 68 ++++++++++ ...hFateLonglineDto-n1-create-error-validation.xml | 75 +++++++++++ ...ateLonglineDto-n1-create-warning-validation.xml | 68 ++++++++++ ...hFateLonglineDto-n1-update-error-validation.xml | 75 +++++++++++ ...ateLonglineDto-n1-update-warning-validation.xml | 68 ++++++++++ ...EncounterTypeDto-n1-create-error-validation.xml | 75 +++++++++++ ...counterTypeDto-n1-create-warning-validation.xml | 68 ++++++++++ ...EncounterTypeDto-n1-update-error-validation.xml | 75 +++++++++++ ...counterTypeDto-n1-update-warning-validation.xml | 68 ++++++++++ .../HealthnessDto-n1-create-error-validation.xml | 75 +++++++++++ .../HealthnessDto-n1-create-warning-validation.xml | 68 ++++++++++ .../HealthnessDto-n1-update-error-validation.xml | 75 +++++++++++ .../HealthnessDto-n1-update-warning-validation.xml | 68 ++++++++++ .../HookPositionDto-n1-create-error-validation.xml | 75 +++++++++++ ...ookPositionDto-n1-create-warning-validation.xml | 68 ++++++++++ .../HookPositionDto-n1-update-error-validation.xml | 75 +++++++++++ ...ookPositionDto-n1-update-warning-validation.xml | 68 ++++++++++ .../HookSizeDto-n1-create-error-validation.xml | 75 +++++++++++ .../HookSizeDto-n1-create-warning-validation.xml | 68 ++++++++++ .../HookSizeDto-n1-update-error-validation.xml | 75 +++++++++++ .../HookSizeDto-n1-update-warning-validation.xml | 68 ++++++++++ .../HookTypeDto-n1-create-error-validation.xml | 75 +++++++++++ .../HookTypeDto-n1-create-warning-validation.xml | 68 ++++++++++ .../HookTypeDto-n1-update-error-validation.xml | 75 +++++++++++ .../HookTypeDto-n1-update-warning-validation.xml | 68 ++++++++++ ...ontalPositionDto-n1-create-error-validation.xml | 75 +++++++++++ ...talPositionDto-n1-create-warning-validation.xml | 68 ++++++++++ ...ontalPositionDto-n1-update-error-validation.xml | 75 +++++++++++ ...talPositionDto-n1-update-warning-validation.xml | 68 ++++++++++ ...ticalPositionDto-n1-create-error-validation.xml | 75 +++++++++++ ...calPositionDto-n1-create-warning-validation.xml | 68 ++++++++++ ...ticalPositionDto-n1-update-error-validation.xml | 75 +++++++++++ ...calPositionDto-n1-update-warning-validation.xml | 68 ++++++++++ ...htsticksColorDto-n1-create-error-validation.xml | 75 +++++++++++ ...sticksColorDto-n1-create-warning-validation.xml | 68 ++++++++++ ...htsticksColorDto-n1-update-error-validation.xml | 75 +++++++++++ ...sticksColorDto-n1-update-warning-validation.xml | 68 ++++++++++ ...ghtsticksTypeDto-n1-create-error-validation.xml | 75 +++++++++++ ...tsticksTypeDto-n1-create-warning-validation.xml | 68 ++++++++++ ...ghtsticksTypeDto-n1-update-error-validation.xml | 75 +++++++++++ ...tsticksTypeDto-n1-update-warning-validation.xml | 68 ++++++++++ .../LineTypeDto-n1-create-error-validation.xml | 75 +++++++++++ .../LineTypeDto-n1-create-warning-validation.xml | 68 ++++++++++ .../LineTypeDto-n1-update-error-validation.xml | 75 +++++++++++ .../LineTypeDto-n1-update-warning-validation.xml | 68 ++++++++++ ...aturityStatusDto-n1-create-error-validation.xml | 75 +++++++++++ ...urityStatusDto-n1-create-warning-validation.xml | 68 ++++++++++ ...aturityStatusDto-n1-update-error-validation.xml | 75 +++++++++++ ...urityStatusDto-n1-update-warning-validation.xml | 68 ++++++++++ ...itigationTypeDto-n1-create-error-validation.xml | 75 +++++++++++ ...igationTypeDto-n1-create-warning-validation.xml | 68 ++++++++++ ...itigationTypeDto-n1-update-error-validation.xml | 75 +++++++++++ ...igationTypeDto-n1-update-warning-validation.xml | 68 ++++++++++ .../SensorBrandDto-n1-create-error-validation.xml | 61 +++++++++ ...SensorBrandDto-n1-create-warning-validation.xml | 47 +++++++ .../SensorBrandDto-n1-update-error-validation.xml | 61 +++++++++ ...SensorBrandDto-n1-update-warning-validation.xml | 47 +++++++ ...sorDataFormatDto-n1-create-error-validation.xml | 75 +++++++++++ ...rDataFormatDto-n1-create-warning-validation.xml | 68 ++++++++++ ...sorDataFormatDto-n1-update-error-validation.xml | 75 +++++++++++ ...rDataFormatDto-n1-update-warning-validation.xml | 68 ++++++++++ .../SensorTypeDto-n1-create-error-validation.xml | 75 +++++++++++ .../SensorTypeDto-n1-create-warning-validation.xml | 68 ++++++++++ .../SensorTypeDto-n1-update-error-validation.xml | 75 +++++++++++ .../SensorTypeDto-n1-update-warning-validation.xml | 68 ++++++++++ .../SettingShapeDto-n1-create-error-validation.xml | 75 +++++++++++ ...ettingShapeDto-n1-create-warning-validation.xml | 68 ++++++++++ .../SettingShapeDto-n1-update-error-validation.xml | 75 +++++++++++ ...ettingShapeDto-n1-update-warning-validation.xml | 68 ++++++++++ ...zeMeasureTypeDto-n1-create-error-validation.xml | 75 +++++++++++ ...MeasureTypeDto-n1-create-warning-validation.xml | 68 ++++++++++ ...zeMeasureTypeDto-n1-update-error-validation.xml | 75 +++++++++++ ...MeasureTypeDto-n1-update-warning-validation.xml | 68 ++++++++++ ...tomacFullnessDto-n1-create-error-validation.xml | 75 +++++++++++ ...macFullnessDto-n1-create-warning-validation.xml | 68 ++++++++++ ...tomacFullnessDto-n1-update-error-validation.xml | 75 +++++++++++ ...macFullnessDto-n1-update-warning-validation.xml | 68 ++++++++++ .../TripTypeDto-n1-create-error-validation.xml | 75 +++++++++++ .../TripTypeDto-n1-create-warning-validation.xml | 68 ++++++++++ .../TripTypeDto-n1-update-error-validation.xml | 75 +++++++++++ .../TripTypeDto-n1-update-warning-validation.xml | 68 ++++++++++ ...ivityLonglineDto-n1-create-error-validation.xml | 75 +++++++++++ ...ityLonglineDto-n1-create-warning-validation.xml | 68 ++++++++++ ...ivityLonglineDto-n1-update-error-validation.xml | 75 +++++++++++ ...ityLonglineDto-n1-update-warning-validation.xml | 68 ++++++++++ ...htMeasureTypeDto-n1-create-error-validation.xml | 75 +++++++++++ ...MeasureTypeDto-n1-create-warning-validation.xml | 68 ++++++++++ ...htMeasureTypeDto-n1-update-error-validation.xml | 75 +++++++++++ ...MeasureTypeDto-n1-update-warning-validation.xml | 68 ++++++++++ ...DetectionModeDto-n1-create-error-validation.xml | 74 +++++++++++ ...tectionModeDto-n1-create-warning-validation.xml | 67 ++++++++++ ...DetectionModeDto-n1-update-error-validation.xml | 74 +++++++++++ ...tectionModeDto-n1-update-warning-validation.xml | 67 ++++++++++ .../ObjectFateDto-n1-create-error-validation.xml | 74 +++++++++++ .../ObjectFateDto-n1-create-warning-validation.xml | 67 ++++++++++ .../ObjectFateDto-n1-update-error-validation.xml | 74 +++++++++++ .../ObjectFateDto-n1-update-warning-validation.xml | 67 ++++++++++ ...jectOperationDto-n1-create-error-validation.xml | 74 +++++++++++ ...ctOperationDto-n1-create-warning-validation.xml | 67 ++++++++++ ...jectOperationDto-n1-update-error-validation.xml | 74 +++++++++++ ...ctOperationDto-n1-update-warning-validation.xml | 67 ++++++++++ .../ObjectTypeDto-n1-create-error-validation.xml | 74 +++++++++++ .../ObjectTypeDto-n1-create-warning-validation.xml | 67 ++++++++++ .../ObjectTypeDto-n1-update-error-validation.xml | 74 +++++++++++ .../ObjectTypeDto-n1-update-warning-validation.xml | 67 ++++++++++ ...bservedSystemDto-n1-create-error-validation.xml | 74 +++++++++++ ...ervedSystemDto-n1-create-warning-validation.xml | 67 ++++++++++ ...bservedSystemDto-n1-update-error-validation.xml | 74 +++++++++++ ...ervedSystemDto-n1-update-warning-validation.xml | 67 ++++++++++ ...sonForDiscardDto-n1-create-error-validation.xml | 74 +++++++++++ ...nForDiscardDto-n1-create-warning-validation.xml | 67 ++++++++++ ...sonForDiscardDto-n1-update-error-validation.xml | 74 +++++++++++ ...nForDiscardDto-n1-update-warning-validation.xml | 67 ++++++++++ ...nForNoFishingDto-n1-create-error-validation.xml | 74 +++++++++++ ...orNoFishingDto-n1-create-warning-validation.xml | 67 ++++++++++ ...nForNoFishingDto-n1-update-error-validation.xml | 74 +++++++++++ ...orNoFishingDto-n1-update-warning-validation.xml | 67 ++++++++++ ...sonForNullSetDto-n1-create-error-validation.xml | 74 +++++++++++ ...nForNullSetDto-n1-create-warning-validation.xml | 67 ++++++++++ ...sonForNullSetDto-n1-update-error-validation.xml | 74 +++++++++++ ...nForNullSetDto-n1-update-warning-validation.xml | 67 ++++++++++ .../SpeciesFateDto-n1-create-error-validation.xml | 74 +++++++++++ ...SpeciesFateDto-n1-create-warning-validation.xml | 67 ++++++++++ .../SpeciesFateDto-n1-update-error-validation.xml | 74 +++++++++++ ...SpeciesFateDto-n1-update-warning-validation.xml | 67 ++++++++++ ...SpeciesStatusDto-n1-create-error-validation.xml | 74 +++++++++++ ...eciesStatusDto-n1-create-warning-validation.xml | 67 ++++++++++ ...SpeciesStatusDto-n1-update-error-validation.xml | 74 +++++++++++ ...eciesStatusDto-n1-update-warning-validation.xml | 67 ++++++++++ ...ndingActivityDto-n1-create-error-validation.xml | 74 +++++++++++ ...ingActivityDto-n1-create-warning-validation.xml | 67 ++++++++++ ...ndingActivityDto-n1-update-error-validation.xml | 74 +++++++++++ ...ingActivityDto-n1-update-warning-validation.xml | 67 ++++++++++ ...BuoyOperationDto-n1-create-error-validation.xml | 74 +++++++++++ ...oyOperationDto-n1-create-warning-validation.xml | 67 ++++++++++ ...BuoyOperationDto-n1-update-error-validation.xml | 74 +++++++++++ ...oyOperationDto-n1-update-warning-validation.xml | 67 ++++++++++ ...ttingBuoyTypeDto-n1-create-error-validation.xml | 74 +++++++++++ ...ingBuoyTypeDto-n1-create-warning-validation.xml | 67 ++++++++++ ...ttingBuoyTypeDto-n1-update-error-validation.xml | 74 +++++++++++ ...ingBuoyTypeDto-n1-update-warning-validation.xml | 67 ++++++++++ ...ActivitySeineDto-n1-create-error-validation.xml | 74 +++++++++++ ...tivitySeineDto-n1-create-warning-validation.xml | 67 ++++++++++ ...ActivitySeineDto-n1-update-error-validation.xml | 74 +++++++++++ ...tivitySeineDto-n1-update-warning-validation.xml | 67 ++++++++++ ...eightCategoryDto-n1-create-error-validation.xml | 89 +++++++++++++ ...ghtCategoryDto-n1-create-warning-validation.xml | 67 ++++++++++ ...eightCategoryDto-n1-update-error-validation.xml | 75 +++++++++++ ...ghtCategoryDto-n1-update-warning-validation.xml | 67 ++++++++++ .../seine/WindDto-n1-create-error-validation.xml | 89 +++++++++++++ .../seine/WindDto-n1-create-warning-validation.xml | 67 ++++++++++ .../seine/WindDto-n1-update-error-validation.xml | 89 +++++++++++++ .../seine/WindDto-n1-update-warning-validation.xml | 67 ++++++++++ 236 files changed, 17450 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit fd4b0045116bbd71e8cea7cbeada6ffafeac1358 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 18 17:49:35 2015 +0200 Correction de clef i18n sur HookSize et HookType --- .../observe/ui/content/ref/impl/longline/HookSizeUI.jaxx | 10 +++++----- .../observe/ui/content/ref/impl/longline/HookTypeUI.jaxx | 10 +++++----- .../i18n/observe-application-swing_en_GB.properties | 14 ++------------ .../i18n/observe-application-swing_es_ES.properties | 14 ++------------ .../i18n/observe-application-swing_fr_FR.properties | 16 +++------------- 5 files changed, 17 insertions(+), 47 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookSizeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookSizeUI.jaxx index f4c9c95..d31c56a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookSizeUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookSizeUI.jaxx @@ -23,11 +23,11 @@ superGenericType='HookSizeDto' contentTitle='{n("observe.title.content.HookSizes")}' listText='{n("observe.list.HookSize")}' - createToolTip='{n("observe.action.HookSize.create.tip")}' - detailToolTip='{n("observe.action.HookSize.detail.tip")}' - modifyToolTip='{n("observe.action.HookSize.modify.tip")}' - deleteToolTip='{n("observe.action.HookSize.delete.tip")}' - saveToolTip='{n("observe.action.HookSize.save.tip")}' + createToolTip='{n("observe.action.hookSize.create.tip")}' + detailToolTip='{n("observe.action.hookSize.detail.tip")}' + modifyToolTip='{n("observe.action.hookSize.modify.tip")}' + deleteToolTip='{n("observe.action.hookSize.delete.tip")}' + saveToolTip='{n("observe.action.hookSize.save.tip")}'
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookTypeUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookTypeUI.jaxx index 7982ebb..080434e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookTypeUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/longline/HookTypeUI.jaxx @@ -23,11 +23,11 @@ superGenericType='HookTypeDto' contentTitle='{n("observe.title.content.HookTypes")}' listText='{n("observe.list.HookType")}' - createToolTip='{n("observe.action.HookType.create.tip")}' - detailToolTip='{n("observe.action.HookType.detail.tip")}' - modifyToolTip='{n("observe.action.HookType.modify.tip")}' - deleteToolTip='{n("observe.action.HookType.delete.tip")}' - saveToolTip='{n("observe.action.HookType.save.tip")}' + createToolTip='{n("observe.action.hookType.create.tip")}' + detailToolTip='{n("observe.action.hookType.detail.tip")}' + modifyToolTip='{n("observe.action.hookType.modify.tip")}' + deleteToolTip='{n("observe.action.hookType.delete.tip")}' + saveToolTip='{n("observe.action.hookType.save.tip")}'
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 7d4e572..3c2bc2e 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 @@ -4,16 +4,6 @@ nuitonutil.error.no.convertor= observe.about.message=<h3>ObServe</h3><a href\="http\://www.ird.fr/informatique-scientifique/projets/observe/">Système d'Information, d'Observation et de Suivi des pêches thonières tropicales de surface.</a><hr/><p>Application de saisie des données observateurs et de consultation de telles données depuis une base <i>Obstuna</i>.</p> <p>Ce projet a été initiée en 2008 par l'unité US 007-OSIRIS de <a href\="http\://www.ird.fr">l'IRD</a> dans le cadre d'un <a href\="http\://www.ird.fr/infor [...] observe.about.translate.content=<h2>Comment traduire ObServe</h2>Vous pouvez nous aider à traduire l'application.<hr/><br/><ul><li>Récupérer le fichier <a href\="%s">observe-i18n.csv</a> dans le répertoire <strong>i18n</strong></li><li>ouvrez le avec un tableur avec les options suivantes \: <ul><li>caractère séparateur \: <strong><i>|</i></strong></li><li>encoding <strong><i>UTF-8</i></strong></li><li>texte encapsulé par des <strong><i>"</i></strong></li></ul></li><li>Traduisez, Améliore [...] observe.about.translate.title=translate ObServe -observe.action.HookSize.create.tip= -observe.action.HookSize.delete.tip= -observe.action.HookSize.detail.tip= -observe.action.HookSize.modify.tip= -observe.action.HookSize.save.tip= -observe.action.HookType.create.tip= -observe.action.HookType.delete.tip= -observe.action.HookType.detail.tip= -observe.action.HookType.modify.tip= -observe.action.HookType.save.tip= observe.action.about=About observe.action.about.tip=About ObServe... observe.action.add.floatingObject=Add FAD @@ -1435,8 +1425,8 @@ observe.map.miles= observe.map.north= observe.map.seine.activity= observe.map.seine.activity.inHarbour= -observe.map.seine.activity.schollType.free= -observe.map.seine.activity.schollType.object= +observe.map.seine.activity.schoolType.free= +observe.map.seine.activity.schoolType.object= observe.map.seine.harbour.departure= observe.map.seine.harbour.landing= observe.map.south= 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 9e9787e..3760ec4 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 @@ -4,16 +4,6 @@ nuitonutil.error.no.convertor= observe.about.message=<h3>ObServe</h3><a href\="http\://www.ird.fr/informatique-scientifique/projets/observe/">Système d'Information, d'Observation et de Suivi des pêches thonières tropicales de surface.</a><hr/><p>Aplicación de adquisición Application de datos de observadores y de consulta de estos datos desde una base <i>Obstuna</i>.</p> <p>Este projecto se ha iniciado en 2009 por la unidad US 007-OSIRIS del <a href\="http\://www.ird.fr">IRD</a> dentro del marco de <a href\="http\://ww [...] observe.about.translate.content=<h2>Comment traduire ObServe</h2>Vous pouvez nous aider à traduire l'application.<hr/><br/><ul><li>Récupérer le fichier <a href\="%s">observe-i18n.csv</a> dans le répertoire <strong>i18n</strong></li><li>ouvrez le avec un tableur avec les options suivantes \: <ul><li>caractère séparateur \: <strong><i>|</i></strong></li><li>encoding <strong><i>UTF-8</i></strong></li><li>texte encapsulé par des <strong><i>"</i></strong></li></ul></li><li>Traduisez, Améliore [...] observe.about.translate.title=Traducir ObServe -observe.action.HookSize.create.tip= -observe.action.HookSize.delete.tip= -observe.action.HookSize.detail.tip= -observe.action.HookSize.modify.tip= -observe.action.HookSize.save.tip= -observe.action.HookType.create.tip= -observe.action.HookType.delete.tip= -observe.action.HookType.detail.tip= -observe.action.HookType.modify.tip= -observe.action.HookType.save.tip= observe.action.about=A cerca de observe.action.about.tip=A cerca de ObServe... observe.action.add.floatingObject=Añadir un DCP @@ -1437,8 +1427,8 @@ observe.map.miles= observe.map.north= observe.map.seine.activity= observe.map.seine.activity.inHarbour= -observe.map.seine.activity.schollType.free= -observe.map.seine.activity.schollType.object= +observe.map.seine.activity.schoolType.free= +observe.map.seine.activity.schoolType.object= observe.map.seine.harbour.departure= observe.map.seine.harbour.landing= observe.map.south= 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 8c2348d..2ff259f 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 @@ -4,16 +4,6 @@ nuitonutil.error.no.convertor= observe.about.message=<h3>ObServe</h3><a href\="http\://www.ird.fr/informatique-scientifique/projets/observe/">Système d'Information, d'Observation et de Suivi des pêches thonières tropicales de surface.</a><hr/><p>Application de saisie des données observateurs et de consultation de telles données depuis une base <i>Obstuna</i>.</p> <p>Ce projet a été initiée en 2008 par l'unité US 007-OSIRIS de <a href\="http\://www.ird.fr">l'IRD</a> dans le cadre d'un <a href\="http\://www.ird.fr/infor [...] observe.about.translate.content=<h2>Comment traduire ObServe</h2>Vous pouvez nous aider à traduire l'application.<hr/><br/><ul><li>Récupérer le fichier <a href\="%s">observe-i18n.csv</a> dans le répertoire <strong>i18n</strong></li><li>ouvrez le avec un tableur avec les options suivantes \: <ul><li>caractère séparateur \: <strong><i>|</i></strong></li><li>encoding <strong><i>UTF-8</i></strong></li><li>texte encapsulé par des <strong><i>"</i></strong></li></ul></li><li>Traduisez, Améliore [...] observe.about.translate.title=Traduire ObServe -observe.action.HookSize.create.tip= -observe.action.HookSize.delete.tip= -observe.action.HookSize.detail.tip= -observe.action.HookSize.modify.tip= -observe.action.HookSize.save.tip= -observe.action.HookType.create.tip= -observe.action.HookType.delete.tip= -observe.action.HookType.detail.tip= -observe.action.HookType.modify.tip= -observe.action.HookType.save.tip= observe.action.about=À propos observe.action.about.tip=À propos d'ObServe... observe.action.add.floatingObject=Ajouter un DCP @@ -730,7 +720,7 @@ observe.common.acquisitionMode.individu=Saisie par individu observe.common.activities=Activités observe.common.activities.list=Liste des activités observe.common.activity=Activité -observe.common.activityLongline= +observe.common.activityLongline=Activité observe.common.activitySeine=Activité observe.common.baitHaulingStatus=Statut de l'appât au virage observe.common.baitObservation=Gleure @@ -1430,8 +1420,8 @@ observe.map.miles=milles observe.map.north=Nord observe.map.seine.activity= observe.map.seine.activity.inHarbour= -observe.map.seine.activity.schollType.free= -observe.map.seine.activity.schollType.object= +observe.map.seine.activity.schoolType.free= +observe.map.seine.activity.schoolType.object= observe.map.seine.harbour.departure= observe.map.seine.harbour.landing= observe.map.south=Sud -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit b2a8a87b3e324598a2f3eef54c60ea884e930715 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 18 17:54:19 2015 +0200 Amélioration des clefs de traductions sur le module entités + remplissage de traudction manquantes --- .../observe/entities/tripMap/TripMapPointType.java | 4 +- .../ird/observe/entities/constants/GearType.java | 4 +- .../seine/NonTargetCatchComputedValueSource.java | 6 +- .../entities/constants/seine/Ownership.java | 6 +- .../entities/constants/seine/SchoolType.java | 6 +- .../seine/TypeTransmittingBuoyOperation.java | 10 +-- .../ird/observe/entities/referentiel/Species2.java | 2 +- .../i18n/observe-entities_en_GB.properties | 74 +++++++++++----------- .../i18n/observe-entities_es_ES.properties | 42 ++++++------ .../i18n/observe-entities_fr_FR.properties | 42 ++++++------ .../services/dto/constants/ReferenceStatus.java | 4 +- .../services/dto/constants/TripMapPointType.java | 4 +- 12 files changed, 102 insertions(+), 102 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/entities/tripMap/TripMapPointType.java b/observe-application-swing/src/main/java/fr/ird/observe/entities/tripMap/TripMapPointType.java index 917ac54..4dac356 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/entities/tripMap/TripMapPointType.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/entities/tripMap/TripMapPointType.java @@ -34,8 +34,8 @@ public enum TripMapPointType { SEINE_LANDING_HARBOUR(n("observe.map.seine.harbour.landing")), SEINE_ACTIVITY(n("observe.map.seine.activity")), SEINE_ACTIVITY_IN_HARBOUR(n("observe.map.seine.activity.inHarbour")), - SEINE_ACTIVITY_WITH_FREE_SCHOOL_TYPE(n("observe.map.seine.activity.schollType.free")), - SEINE_ACTIVITY_WITH_OBJECT_SCHOOL_TYPE(n("observe.map.seine.activity.schollType.object")), + SEINE_ACTIVITY_WITH_FREE_SCHOOL_TYPE(n("observe.map.seine.activity.schoolType.free")), + SEINE_ACTIVITY_WITH_OBJECT_SCHOOL_TYPE(n("observe.map.seine.activity.schoolType.object")), LONGLINE_IN_HARBOUR(n("observe.map.longLine.seine.harbour")), LONGLINE_ACTIVITY(n("observe.map.longLine.activity")), diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/GearType.java b/observe-entities/src/main/java/fr/ird/observe/entities/constants/GearType.java index 26f07f9..01a2a49 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/constants/GearType.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/constants/GearType.java @@ -34,10 +34,10 @@ import static org.nuiton.i18n.I18n.t; public enum GearType { /** Seine */ - seine(n("observe.common.reference.gearType.seine")), + seine(n("observe.reference.gearType.seine")), /** Longline */ - longline(n("observe.common.reference.gearType.longline")); + longline(n("observe.reference.gearType.longline")); private String i18nKey; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSource.java b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSource.java index 948f66c..e3c1523 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSource.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSource.java @@ -38,19 +38,19 @@ public enum NonTargetCatchComputedValueSource { * * @since 3.0 */ - FROM_DATA(n("observe.persistence.computedValueSource.fromData")), + FROM_DATA(n("observe.computedValueSource.fromData")), /** * Donnée calculée à partir de l'échantillon pour la même espèce et la même calée. * * @since 3.0 */ - FROM_SAMPLE(n("observe.common.computedValueSource.fromSample")), + FROM_SAMPLE(n("observe.computedValueSource.fromSample")), /** * Donnée calculée à partir du référentiel. * * @since 3.0 */ - FROM_REFERENTIEL(n("observe.persistence.computedValueSource.fromReferentiel")); + FROM_REFERENTIEL(n("observe.computedValueSource.fromReferentiel")); private final String i18nKey; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/Ownership.java b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/Ownership.java index fbfd2a7..c0572a7 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/Ownership.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/Ownership.java @@ -32,13 +32,13 @@ import static org.nuiton.i18n.I18n.t; public enum Ownership implements Comparable<Ownership> { /** inconnue */ - unknown(n("observe.common.ownership.unknown")), + unknown(n("observe.ownership.unknown")), /** appartient a ce vessel */ - ceVessel(n("observe.common.ownership.ceVessel")), + ceVessel(n("observe.ownership.ceVessel")), /** appartien a un autre vessel */ - autreVessel(n("observe.common.ownership.autreVessel")); + autreVessel(n("observe.ownership.autreVessel")); private String i18nKey; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/SchoolType.java b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/SchoolType.java index 0c74c0b..7da4d02 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/SchoolType.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/SchoolType.java @@ -33,13 +33,13 @@ import static org.nuiton.i18n.I18n.t; public enum SchoolType { /** banc indéterminé (valeur par défaut) // was 3 before version 4.0 */ - undefined(n("observe.persistence.schoolType.undefined")), + undefined(n("observe.schoolType.undefined")), /** banc objet // was 1 before version 4.0 */ - objet(n("observe.persistence.schoolType.objet")), + objet(n("observe.schoolType.objet")), /** banc libre // was 2 before version 4.0 */ - libre(n("observe.persistence.schoolType.libre")); + libre(n("observe.schoolType.libre")); private String i18nKey; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperation.java b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperation.java index 75516b8..80c4a9b 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperation.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperation.java @@ -27,15 +27,15 @@ import static org.nuiton.i18n.I18n.t; /** @author Tony Chemit - chemit@codelutin.com */ public enum TypeTransmittingBuoyOperation { // pas de balise lue - pasDeBalise(n("observe.persistence.balise.objectOperation.no.balise")), + pasDeBalise(n("observe.typeTransmittingBuoyOperation.no.balise")), // une balise lue - visite(n("observe.persistence.balise.objectOperation.visite"), "1"), - recuperation(n("observe.persistence.balise.objectOperation.recupere"), "2"), - pose(n("observe.persistence.balise.objectOperation.pose"), "3"), + visite(n("observe.typeTransmittingBuoyOperation.visite"), "1"), + recuperation(n("observe.typeTransmittingBuoyOperation.recupere"), "2"), + pose(n("observe.typeTransmittingBuoyOperation.pose"), "3"), // deux balises lues - recuperationEtRemplacement(n("observe.persistence.balise.objectOperation.recupere.et.change"), "2", "3"); + recuperationEtRemplacement(n("observe.typeTransmittingBuoyOperation.recupere.et.change"), "2", "3"); /** clef i18n du type d'opération sur balise */ private String i18nKey; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/Species2.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/Species2.java index 971a471..52c9420 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/Species2.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/Species2.java @@ -91,7 +91,7 @@ public class Species2 { public static String decorate(Locale locale, Species species) { - String oldCode = l(locale, "observe.persistence.oldCode3L"); + String oldCode = l(locale, "observe.common.oldCode3L"); StringBuilder builder = new StringBuilder(); builder.append(species.getFaoCode()); if (species.getScientificLabel() == null) { diff --git a/observe-entities/src/main/resources/i18n/observe-entities_en_GB.properties b/observe-entities/src/main/resources/i18n/observe-entities_en_GB.properties index 42275ef..3250a63 100644 --- a/observe-entities/src/main/resources/i18n/observe-entities_en_GB.properties +++ b/observe-entities/src/main/resources/i18n/observe-entities_en_GB.properties @@ -1,37 +1,37 @@ -observe.common.computedValueSource.fromSample= -observe.common.endDate= -observe.common.endPursingDate= -observe.common.gpsPointInterval= -observe.common.ownership.autreVessel= -observe.common.ownership.ceVessel= -observe.common.ownership.unknown= -observe.common.quadrant= -observe.common.reference.gearType.longline= -observe.common.reference.gearType.seine= -observe.common.reference.status.disabled= -observe.common.reference.status.enabled= -observe.map.longLine.activity= -observe.map.longLine.activity.hauling.end= -observe.map.longLine.activity.hauling.start= -observe.map.longLine.activity.interaction= -observe.map.longLine.activity.setting.end= -observe.map.longLine.activity.setting.start= -observe.map.longLine.activity.station= -observe.map.longLine.seine.harbour= -observe.map.seine.activity= -observe.map.seine.activity.inHarbour= -observe.map.seine.activity.schollType.free= -observe.map.seine.activity.schollType.object= -observe.map.seine.harbour.departure= -observe.map.seine.harbour.landing= -observe.persistence.balise.objectOperation.no.balise= -observe.persistence.balise.objectOperation.pose= -observe.persistence.balise.objectOperation.recupere= -observe.persistence.balise.objectOperation.recupere.et.change= -observe.persistence.balise.objectOperation.visite= -observe.persistence.computedValueSource.fromData=Computed from data -observe.persistence.computedValueSource.fromReferentiel=Computed from referential -observe.persistence.oldCode3L=Old code\: -observe.persistence.schoolType.libre=Free school type -observe.persistence.schoolType.objet=Object school type -observe.persistence.schoolType.undefined=Undefined school type +observe.typeTransmittingBuoyOperation.no.balise=No Beacon +observe.typeTransmittingBuoyOperation.pose=Posing +observe.typeTransmittingBuoyOperation.recupere=Grab +observe.typeTransmittingBuoyOperation.recupere.et.change=Grab and change +observe.typeTransmittingBuoyOperation.visite=Visit +observe.common.endDate=End date +observe.common.endPursingDate=End pursing date +observe.common.gpsPointInterval=Interval %1$td/%1$tm/%1$tY %1$tH\:%1$tM\:%1$tS - %2$td/%2$tm/%2$tY %2$tH\:%2$tM\:%2$tM ( number if point(s) \: %3$s ) +observe.common.oldCode3L=Old code\: +observe.common.quadrant=Quadrant +observe.computedValueSource.fromData=Computed from data +observe.computedValueSource.fromReferentiel=Computed from referential +observe.computedValueSource.fromSample=Computed from samples +observe.map.longLine.activity=Activity +observe.map.longLine.activity.hauling.end=Hauling end +observe.map.longLine.activity.hauling.start=Hauling start +observe.map.longLine.activity.interaction=Encounter +observe.map.longLine.activity.setting.end=Setting end +observe.map.longLine.activity.setting.start=Setting start +observe.map.longLine.activity.station=Station +observe.map.longLine.seine.harbour=Harbour +observe.map.seine.activity=Activity +observe.map.seine.activity.inHarbour=In harbour +observe.map.seine.activity.schoolType.free=Free School type +observe.map.seine.activity.schoolType.object=Object School type +observe.map.seine.harbour.departure=Harbour departure +observe.map.seine.harbour.landing=Harbour landing +observe.ownership.autreVessel=Other vessel +observe.ownership.ceVessel=This vessel +observe.ownership.unknown=Unknown +observe.reference.gearType.longline=Longline gear type +observe.reference.gearType.seine=Senne gear type +observe.reference.status.disabled=Disabled +observe.reference.status.enabled=Enabled +observe.schoolType.libre=Free school type +observe.schoolType.objet=Object school type +observe.schoolType.undefined=Undefined school type diff --git a/observe-entities/src/main/resources/i18n/observe-entities_es_ES.properties b/observe-entities/src/main/resources/i18n/observe-entities_es_ES.properties index c12ab41..c9219a9 100644 --- a/observe-entities/src/main/resources/i18n/observe-entities_es_ES.properties +++ b/observe-entities/src/main/resources/i18n/observe-entities_es_ES.properties @@ -1,15 +1,16 @@ -observe.common.computedValueSource.fromSample= +observe.typeTransmittingBuoyOperation.no.balise=DCP sin balizar +observe.typeTransmittingBuoyOperation.pose=Colocación de nueva baliza +observe.typeTransmittingBuoyOperation.recupere=Recogida de baliza sin regreso al agua +observe.typeTransmittingBuoyOperation.recupere.et.change=Recuperación y colocación de una nueva baliza +observe.typeTransmittingBuoyOperation.visite=Visita a la baliza observe.common.endDate=Fecha de fin observe.common.endPursingDate=Fecha de final de recogida de la jareta observe.common.gpsPointInterval=Intervalo %1$td/%1$tm/%1$tY %1$tH\:%1$tM\:%1$tS - %2$td/%2$tm/%2$tY %2$tH\:%2$tM\:%2$tM ( número de punto(s) \: %3$s ) -observe.common.ownership.autreVessel=Barco ajeno -observe.common.ownership.ceVessel=Este barco o un barco del mismo armador -observe.common.ownership.unknown=Desconocido +observe.common.oldCode3L=Antiguo código\: observe.common.quadrant=Cuadrante -observe.common.reference.gearType.longline=Senne -observe.common.reference.gearType.seine= -observe.common.reference.status.disabled=Desactivado -observe.common.reference.status.enabled=Activado +observe.computedValueSource.fromData=Calculado a partir de otros datos +observe.computedValueSource.fromReferentiel=Calculado a partir del Referencial +observe.computedValueSource.fromSample=Calculado a partir de las muestras observe.map.longLine.activity= observe.map.longLine.activity.hauling.end= observe.map.longLine.activity.hauling.start= @@ -20,18 +21,17 @@ observe.map.longLine.activity.station= observe.map.longLine.seine.harbour= observe.map.seine.activity= observe.map.seine.activity.inHarbour= -observe.map.seine.activity.schollType.free= -observe.map.seine.activity.schollType.object= +observe.map.seine.activity.schoolType.free=Banco libre +observe.map.seine.activity.schoolType.object=Banco a objeto observe.map.seine.harbour.departure= observe.map.seine.harbour.landing= -observe.persistence.balise.objectOperation.no.balise=DCP sin balizar -observe.persistence.balise.objectOperation.pose=Colocación de nueva baliza -observe.persistence.balise.objectOperation.recupere=Recogida de baliza sin regreso al agua -observe.persistence.balise.objectOperation.recupere.et.change=Recuperación y colocación de una nueva baliza -observe.persistence.balise.objectOperation.visite=Visita a la baliza -observe.persistence.computedValueSource.fromData=Calculado a partir de otros datos -observe.persistence.computedValueSource.fromReferentiel=Calculado a partir del Referencial -observe.persistence.oldCode3L=Antiguo código\: -observe.persistence.schoolType.libre=Banco libre -observe.persistence.schoolType.objet=Banco a objeto -observe.persistence.schoolType.undefined=Banco indeterminado +observe.ownership.autreVessel=Barco ajeno +observe.ownership.ceVessel=Este barco o un barco del mismo armador +observe.ownership.unknown=Desconocido +observe.reference.gearType.longline=Palangre +observe.reference.gearType.seine=Senne +observe.reference.status.disabled=Desactivado +observe.reference.status.enabled=Activado +observe.schoolType.libre=Banco libre +observe.schoolType.objet=Banco a objeto +observe.schoolType.undefined=Banco indeterminado diff --git a/observe-entities/src/main/resources/i18n/observe-entities_fr_FR.properties b/observe-entities/src/main/resources/i18n/observe-entities_fr_FR.properties index 0fa154d..eb795c5 100644 --- a/observe-entities/src/main/resources/i18n/observe-entities_fr_FR.properties +++ b/observe-entities/src/main/resources/i18n/observe-entities_fr_FR.properties @@ -1,15 +1,16 @@ -observe.common.computedValueSource.fromSample= +observe.typeTransmittingBuoyOperation.no.balise=Pas de balise liée au DCP +observe.typeTransmittingBuoyOperation.pose=Pose d'une nouvelle balise +observe.typeTransmittingBuoyOperation.recupere=Récupération d'une balise sans remise à l'eau +observe.typeTransmittingBuoyOperation.recupere.et.change=Récupération et pose d'une nouvelle balise +observe.typeTransmittingBuoyOperation.visite=Simple visite de la balise observe.common.endDate=Fin de validité observe.common.endPursingDate=Date de fin de coulissage observe.common.gpsPointInterval=Intervalle %1$td/%1$tm/%1$tY %1$tH\:%1$tM\:%1$tS - %2$td/%2$tm/%2$tY %2$tH\:%2$tM\:%2$tM ( nombre de point(s) \: %3$s ) -observe.common.ownership.autreVessel=Navire d'un autre armement -observe.common.ownership.ceVessel=Ce navire ou cet armement -observe.common.ownership.unknown=Inconnue +observe.common.oldCode3L=ancien code \: observe.common.quadrant=Quadrant -observe.common.reference.gearType.longline=Longline -observe.common.reference.gearType.seine=Seine -observe.common.reference.status.disabled=Désactivé -observe.common.reference.status.enabled=Activé +observe.computedValueSource.fromData=calculé à partir des autres données +observe.computedValueSource.fromReferentiel=calculé à partir du référentiel +observe.computedValueSource.fromSample=calculé à partir des échantillons observe.map.longLine.activity=point d'activité observe.map.longLine.activity.hauling.end=Fin de virage observe.map.longLine.activity.hauling.start=Début de virage @@ -20,18 +21,17 @@ observe.map.longLine.activity.station=Station océanographique observe.map.longLine.seine.harbour=Au port observe.map.seine.activity=point d'activité observe.map.seine.activity.inHarbour=Au port -observe.map.seine.activity.schollType.free=Banc libre -observe.map.seine.activity.schollType.object=Banc objet +observe.map.seine.activity.schoolType.free=Banc libre +observe.map.seine.activity.schoolType.object=Banc objet observe.map.seine.harbour.departure=Port de départ observe.map.seine.harbour.landing=Port d'arrivée -observe.persistence.balise.objectOperation.no.balise=Pas de balise liée au DCP -observe.persistence.balise.objectOperation.pose=Pose d'une nouvelle balise -observe.persistence.balise.objectOperation.recupere=Récupération d'une balise sans remise à l'eau -observe.persistence.balise.objectOperation.recupere.et.change=Récupération et pose d'une nouvelle balise -observe.persistence.balise.objectOperation.visite=Simple visite de la balise -observe.persistence.computedValueSource.fromData=calculé à partir des autres données -observe.persistence.computedValueSource.fromReferentiel=calculé à partir du référentiel -observe.persistence.oldCode3L=ancien code \: -observe.persistence.schoolType.libre=Banc libre -observe.persistence.schoolType.objet=Banc objet -observe.persistence.schoolType.undefined=Banc indéterminé +observe.ownership.autreVessel=Navire d'un autre armement +observe.ownership.ceVessel=Ce navire ou cet armement +observe.ownership.unknown=Inconnue +observe.reference.gearType.longline=Longline +observe.reference.gearType.seine=Seine +observe.reference.status.disabled=Désactivé +observe.reference.status.enabled=Activé +observe.schoolType.libre=Banc libre +observe.schoolType.objet=Banc objet +observe.schoolType.undefined=Banc indéterminé diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferenceStatus.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferenceStatus.java index 166a458..445e694 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferenceStatus.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferenceStatus.java @@ -35,10 +35,10 @@ import static org.nuiton.i18n.I18n.t; public enum ReferenceStatus { /** status desactive */ - disabled(n("observe.common.reference.status.disabled")), + disabled(n("observe.reference.status.disabled")), /** status active */ - enabled(n("observe.common.reference.status.enabled")); + enabled(n("observe.reference.status.enabled")); private String i18nKey; diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java index a604760..f686560 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java @@ -34,8 +34,8 @@ public enum TripMapPointType { SEINE_LANDING_HARBOUR(n("observe.map.seine.harbour.landing")), SEINE_ACTIVITY(n("observe.map.seine.activity")), SEINE_ACTIVITY_IN_HARBOUR(n("observe.map.seine.activity.inHarbour")), - SEINE_ACTIVITY_WITH_FREE_SCHOOL_TYPE(n("observe.map.seine.activity.schollType.free")), - SEINE_ACTIVITY_WITH_OBJECT_SCHOOL_TYPE(n("observe.map.seine.activity.schollType.object")), + SEINE_ACTIVITY_WITH_FREE_SCHOOL_TYPE(n("observe.map.seine.activity.schoolType.free")), + SEINE_ACTIVITY_WITH_OBJECT_SCHOOL_TYPE(n("observe.map.seine.activity.schoolType.object")), LONGLINE_IN_HARBOUR(n("observe.map.longLine.seine.harbour")), LONGLINE_ACTIVITY(n("observe.map.longLine.activity")), -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 796c00c313ee46d7dcb6a25b5db9dc9dc96dc2c5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 18 17:59:10 2015 +0200 Suppression d'une déclaration de generique sur une méthode de service inutile --- .../main/java/fr/ird/observe/services/service/DataSourceService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/DataSourceService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/DataSourceService.java index 38798bd..9bb7a62 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/DataSourceService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/DataSourceService.java @@ -78,6 +78,6 @@ public interface DataSourceService extends ObserveService { <D extends IdDto> D getObserveDto(Class<D> dtoType, String id); @NoDataAccess - <D extends IdDto> void migrateData(); + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit bc949266b42680d25fe970b42e93d8cca54bb6e5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 18 18:20:37 2015 +0200 Ajout de TODO dans la javadoc des classes + ajout de javadoc --- .../src/main/java/fr/ird/observe/services/ObserveJdbcHelper.java | 2 ++ .../src/main/java/fr/ird/observe/services/ObserveSecurityHelper.java | 2 ++ .../main/java/fr/ird/observe/services/ObserveServiceContextTopia.java | 2 ++ .../src/main/java/fr/ird/observe/services/ObserveServiceTopia.java | 4 +++- .../ird/observe/services/ObserveTopiaApplicationContextFactory.java | 2 ++ .../main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java | 2 ++ .../main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java | 2 ++ .../fr/ird/observe/services/builder/EntityToReferenceDtoBuilder.java | 2 ++ .../services/builder/EntityToReferentialReferenceDtoBuilder.java | 2 ++ .../src/main/java/fr/ird/observe/services/dto/ObserveDtoBinders.java | 2 ++ .../src/main/java/fr/ird/observe/services/dto/ReferenceTypeName.java | 1 + .../src/main/java/fr/ird/observe/services/entity/EntitiesSet.java | 1 + .../java/fr/ird/observe/services/entity/ObserveEntitiesFilters.java | 2 ++ .../main/java/fr/ird/observe/services/entity/ObserveEntityFilter.java | 2 ++ .../java/fr/ird/observe/services/entity/SpeciesListEntitiesSet.java | 2 ++ .../fr/ird/observe/services/entity/SpeciesListOceanEntitiesSet.java | 2 ++ .../main/java/fr/ird/observe/services/entity/UniverseEntitiesSet.java | 2 ++ .../consolidate/ConsolidateActivitySeineDataResultBuilder.java | 3 +++ 18 files changed, 36 insertions(+), 1 deletion(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveJdbcHelper.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveJdbcHelper.java index 1efa7bf..a2d85c6 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveJdbcHelper.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveJdbcHelper.java @@ -24,6 +24,8 @@ import java.util.List; import java.util.Set; /** + * FIXME Ca sert à quoi? + * * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public class ObserveJdbcHelper extends JdbcHelper { diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveSecurityHelper.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveSecurityHelper.java index 37ce8c4..b74d8a2 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveSecurityHelper.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveSecurityHelper.java @@ -25,6 +25,8 @@ import java.util.List; import java.util.Set; /** + * FIXME Ca sert à quoi? + * * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public class ObserveSecurityHelper { diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java index 6ebad2b..b9a0a3e 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java @@ -41,6 +41,8 @@ import java.util.Locale; import java.util.Set; /** + * Contexte d'un service ToPIA. + * * Created on 16/08/15. * * @author Tony Chemit - chemit@codelutin.com diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java index a7f8a1a..9c82ada 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java @@ -81,11 +81,13 @@ import java.util.Map; import java.util.Set; /** + * Support pour toute implantation d'un service ToPIA. + * * Created on 16/08/15. * * @author Tony Chemit - chemit@codelutin.com */ -public class ObserveServiceTopia implements ObserveService { +public abstract class ObserveServiceTopia implements ObserveService { /** Logger. */ private static final Log log = LogFactory.getLog(ObserveServiceTopia.class); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveTopiaApplicationContextFactory.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveTopiaApplicationContextFactory.java index 88602dc..124a7d3 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveTopiaApplicationContextFactory.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveTopiaApplicationContextFactory.java @@ -39,6 +39,8 @@ import java.util.LinkedHashSet; import java.util.Map; /** + * Usine de contexte applicatif ToPIA. + * * Created on 23/08/15. * * @author Tony Chemit - chemit@codelutin.com diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java index 4a54e2e..407b2c1 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java @@ -44,6 +44,8 @@ import java.util.Map; import java.util.Set; /** + * Un constructeur de recopie d'un dto vers une entité. + * * Created on 19/08/15. * * @author Tony Chemit - chemit@codelutin.com diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java index 73e62f9..719f9ce 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java @@ -49,6 +49,8 @@ import java.util.Map; import java.util.Set; /** + * un constructeur de recopie d'une entité vers un dto. + * * Created on 18/08/15. * * @author Tony Chemit - chemit@codelutin.com diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToReferenceDtoBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToReferenceDtoBuilder.java index 4567151..bc97a46 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToReferenceDtoBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToReferenceDtoBuilder.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.Set; /** + * Un constructeur de recopie d'une entité vers un dto de type référentiel. + * * Created on 19/08/15. * * @author Tony Chemit - chemit@codelutin.com diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToReferentialReferenceDtoBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToReferentialReferenceDtoBuilder.java index 2efd83c..d1fd630 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToReferentialReferenceDtoBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToReferentialReferenceDtoBuilder.java @@ -42,6 +42,8 @@ import java.util.Map; import java.util.Set; /** + * Une constructeur de recopie d'une entité vers une référence d'un dto de type référentiel. + * * Created on 19/08/15. * * @author Tony Chemit - chemit@codelutin.com diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtoBinders.java b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtoBinders.java index e96362a..df73ba5 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtoBinders.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtoBinders.java @@ -27,6 +27,8 @@ import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; /** + * Méthodes utilitaires sur les binders de dto. + * * Created on 18/08/15. * * @author Tony Chemit - chemit@codelutin.com diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ReferenceTypeName.java b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ReferenceTypeName.java index 165cd06..b9999e1 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ReferenceTypeName.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ReferenceTypeName.java @@ -1,6 +1,7 @@ package fr.ird.observe.services.dto; /** + * FIXME Ca sert à quoi? * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public class ReferenceTypeName { diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSet.java b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSet.java index 6ddaab4..56679cf 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSet.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSet.java @@ -8,6 +8,7 @@ import org.nuiton.topia.persistence.TopiaEntity; import java.util.Map; /** + * FIXME Ca sert à quoi? * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public abstract class EntitiesSet<E extends TopiaEntity> { diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/ObserveEntitiesFilters.java b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/ObserveEntitiesFilters.java index e20afce..c3e27d5 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/ObserveEntitiesFilters.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/ObserveEntitiesFilters.java @@ -23,6 +23,8 @@ import org.nuiton.topia.persistence.TopiaEntity; import java.util.Map; /** + * FIXME Ca sert à quoi? + * * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public class ObserveEntitiesFilters { diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/ObserveEntityFilter.java b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/ObserveEntityFilter.java index 216d867..ff5dbcd 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/ObserveEntityFilter.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/ObserveEntityFilter.java @@ -4,6 +4,8 @@ import fr.ird.observe.services.dto.IdDto; import org.nuiton.topia.persistence.TopiaEntity; /** + * FIXME Ca sert à quoi? + * * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public class ObserveEntityFilter<P extends TopiaEntity, C extends TopiaEntity, D extends IdDto> { diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListEntitiesSet.java b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListEntitiesSet.java index abd3858..a4d6ebc 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListEntitiesSet.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListEntitiesSet.java @@ -9,6 +9,8 @@ import fr.ird.observe.entities.referentiel.SpeciesListTopiaDao; import java.util.Map; /** + * FIXME Ca sert à quoi? + * * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public class SpeciesListEntitiesSet extends EntitiesSet<Species> { diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListOceanEntitiesSet.java b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListOceanEntitiesSet.java index fcf1ed7..2f7468a 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListOceanEntitiesSet.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListOceanEntitiesSet.java @@ -9,6 +9,8 @@ import fr.ird.observe.entities.referentiel.Species2; import java.util.Map; /** + * FIXME Ca sert à quoi? + * * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public class SpeciesListOceanEntitiesSet extends SpeciesListEntitiesSet { diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/UniverseEntitiesSet.java b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/UniverseEntitiesSet.java index 5a1f61f..f0e0953 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/UniverseEntitiesSet.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/UniverseEntitiesSet.java @@ -8,6 +8,8 @@ import org.nuiton.topia.persistence.TopiaEntity; import java.util.Map; /** + * FIXME Ca sert à quoi? + * * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public class UniverseEntitiesSet<E extends TopiaEntity> extends EntitiesSet<E> { diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java index 56a2271..e59835e 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java @@ -48,6 +48,8 @@ import static fr.ird.observe.services.service.actions.consolidate.ConsolidateAct import static org.nuiton.i18n.I18n.l; /** + * Un constructeur de résultat de l'opération de consolidation des données de type Seine. + * * Created on 29/08/15. * * @author Tony Chemit - chemit@codelutin.com @@ -64,6 +66,7 @@ public class ConsolidateActivitySeineDataResultBuilder { protected final ReferenceLocale referenceLocale; protected final Locale locale; + protected final ActivitySeine activitySeine; protected String oldSchoolType; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 3c158a89493ddbec885fbf6330061c43abca1501 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 18 20:00:34 2015 +0200 Ajout d'un equals et hashcode sur ReferenceTypeName sinon on remonte plusieur fois le même objet --- .../fr/ird/observe/services/dto/ReferenceTypeName.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ReferenceTypeName.java b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ReferenceTypeName.java index b9999e1..6657b5c 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ReferenceTypeName.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ReferenceTypeName.java @@ -1,5 +1,7 @@ package fr.ird.observe.services.dto; +import java.util.Objects; + /** * FIXME Ca sert à quoi? * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -29,4 +31,19 @@ public class ReferenceTypeName { public String getProperty() { return property; } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof ReferenceTypeName)) return false; + ReferenceTypeName that = (ReferenceTypeName) o; + return Objects.equals(parentType, that.parentType) && + Objects.equals(type, that.type) && + Objects.equals(property, that.property); + } + + @Override + public int hashCode() { + return Objects.hash(parentType, type, property); + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 90788a12aab91d3aff6f571697ba56d814367128 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 18 20:11:30 2015 +0200 Filtrage des listes de références en une seule passe + fix cast --- .../ird/observe/services/ObserveServiceTopia.java | 44 ++++++++++------------ 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java index 9c82ada..baa2bb6 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java @@ -27,7 +27,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; import fr.ird.observe.ObserveTopiaApplicationContext; import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.Entities; @@ -288,8 +287,10 @@ public abstract class ObserveServiceTopia implements ObserveService { // build label sets detected while copy (keep the reference for each label, or nothing if value not set) ImmutableSet<ReferenceTypeName> referenceTypesNames = dtoBuilder.getReferenceTypesNames(); - Set<ObserveEntityFilter> entitiesFilters = Sets.newHashSet(); + ImmutableSet.Builder<ReferenceSetDto> labels = new ImmutableSet.Builder<>(); + for (ReferenceTypeName referenceDtoTypeName : referenceTypesNames) { + Class<TopiaEntity> entityParentType = getEntityType(referenceDtoTypeName.getParentType()); Class<TopiaEntity> entityChildType = getEntityType(referenceDtoTypeName.getType()); @@ -298,18 +299,15 @@ public abstract class ObserveServiceTopia implements ObserveService { entityChildType, referenceDtoTypeName.getType(), referenceDtoTypeName.getProperty()); - entitiesFilters.add(filter); - } - - ImmutableSet.Builder<ReferenceSetDto> labels = new ImmutableSet.Builder<>(); - for (ObserveEntityFilter filter : entitiesFilters) { ReferenceSetDto referentialLabelSet = ReferenceSetDtos.newEmptyReferenceSetDto( filter.getDtoType(), filter.getPropertyName()); labels.add(referentialLabelSet); + } + FormDto<D> form = FormDtos.newFormDto(dtoType, dto, labels.build()); return form; @@ -350,32 +348,28 @@ public abstract class ObserveServiceTopia implements ObserveService { // build label sets detected while copy ImmutableSet<ReferenceTypeName> referenceDtoTypesNames = dtoBuilder.getReferenceTypesNames(); + ImmutableSet.Builder<ReferenceSetDto> labels = new ImmutableSet.Builder<>(); - - Set<ObserveEntityFilter> entitiesFilters = Sets.newHashSet(); for (ReferenceTypeName referenceDtoTypeName : referenceDtoTypesNames) { + Class<TopiaEntity> entityParentType = getEntityType(referenceDtoTypeName.getParentType()); Class<TopiaEntity> entityChildType = getEntityType(referenceDtoTypeName.getType()); - ObserveEntityFilter filter = ObserveEntitiesFilters.getFilter( - entityParentType, - entityChildType, - referenceDtoTypeName.getType(), - referenceDtoTypeName.getProperty()); - entitiesFilters.add(filter); + ObserveEntityFilter filter = ObserveEntitiesFilters.getFilter(entityParentType, + entityChildType, + referenceDtoTypeName.getType(), + referenceDtoTypeName.getProperty()); - } + ReferenceSetDto referenceSet = getReferenceSet(filter.getDtoType(), + filter.getPropertyName(), + filter.getEntityType(), + filter.getEntitiesSet(), + dataContext); - ImmutableSet.Builder<ReferenceSetDto> labels = new ImmutableSet.Builder<>(); - for (ObserveEntityFilter filter : entitiesFilters) { - ReferenceSetDto referenceSet = getReferenceSet( - filter.getDtoType(), - filter.getPropertyName(), - filter.getEntityType(), - filter.getEntitiesSet(), - dataContext); labels.add(referenceSet); + } + FormDto<D> form = FormDtos.newFormDto(dtoType, dto, labels.build()); return form; @@ -472,7 +466,7 @@ public abstract class ObserveServiceTopia implements ObserveService { Optional<Date> lastUpdateOptional = getLastUpdate(entityType); - ReferenceSetDto labelSetDto = ReferenceSetDtos.newReferenceSetDto(dtoType, propertyName, labels, lastUpdateOptional.orNull()); + ReferenceSetDto<D> labelSetDto = ReferenceSetDtos.newReferenceSetDto(dtoType, propertyName, labels, lastUpdateOptional.orNull()); return labelSetDto; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 97eb25ecf93558104d73ea66c96cde5f0f40c52c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 18 23:16:30 2015 +0200 Ajout FIXME --- .../src/main/java/fr/ird/observe/services/dto/FormDto.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java index cafc603..96af78c 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java @@ -24,8 +24,6 @@ package fr.ird.observe.services.dto; import com.google.common.base.Optional; import com.google.common.collect.Iterables; -import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; public class FormDto<R extends IdDto> extends AbstractFormDto { @@ -51,6 +49,8 @@ public class FormDto<R extends IdDto> extends AbstractFormDto { return type; } + //FIXME Supprimer cette méthode et toujours utiliser celle dessous car un ReferenceSetDto porte aussi sur le nom + //FIXME éviter d'avoir des API non déterministes public <D extends IdDto> ReferenceSetDto<D> getReferenceSetDto(Class<D> type) { Optional<ReferenceSetDto> referenceSetDto = Iterables.tryFind(getLabels(), ReferenceSetDtos.newTypePredicate(type)); @@ -77,6 +77,8 @@ public class FormDto<R extends IdDto> extends AbstractFormDto { } + //FIXME Supprimer cette méthode et toujours utiliser celle dessous car un ReferenceSetDto porte aussi sur le nom + //FIXME éviter d'avoir des API non déterministes public <D extends IdDto> ReferenceDto<D> getReferenceById(Class<D> type, String id) { ReferenceSetDto<D> referenceSetDto = getReferenceSetDto(type); @@ -85,10 +87,10 @@ public class FormDto<R extends IdDto> extends AbstractFormDto { } - public <D extends ReferentialDto> ReferentialReferenceDto<D> getReferentialReferenceById(Class<D> type, String id) { + public <D extends IdDto> ReferenceDto<D> getReferenceById(Class<D> type, String name, String id) { - ReferenceSetDto<D> referenceSetDto = getReferenceSetDto(type); - ReferentialReferenceDto<D> referenceDto = (ReferentialReferenceDto<D>) referenceSetDto.getById(id); + ReferenceSetDto<D> referenceSetDto = getReferenceSetDto(type, name); + ReferenceDto<D> referenceDto = referenceSetDto.getById(id); return referenceDto; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit f6df5185599564edb114fcf969a9b25ab47f2589 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 18 23:23:54 2015 +0200 Introduction de la configuration des listes d'espèces + revue de code sur les filtrage de LabelSet --- .../ObserveSwingApplicationConfigOption.java | 17 +- .../fr/ird/observe/db/ObserveSwingDataSource.java | 16 +- .../ui/content/table/ContentTableUIHandler.java | 4 +- .../application/web/ObserveWebMotionFilter.java | 18 ++- .../web/request/ObserveWebRequestContext.java | 7 + .../entities/referentiel/ReferenceEntities.java | 9 +- .../observe/entities/referentiel/SpeciesLists.java | 15 -- .../i18n/observe-entities_en_GB.properties | 10 +- .../i18n/observe-entities_es_ES.properties | 10 +- .../i18n/observe-entities_fr_FR.properties | 10 +- .../services/ObserveServiceInitializer.java | 22 +++ .../services/ObserveSpeciesListConfiguration.java | 149 +++++++++++++++++ ...bserveDataSourceConfigurationRestConstants.java | 2 + .../services/ObserveServiceFactoryRest.java | 7 +- .../fr/ird/observe/services/TestClassResource.java | 2 + .../services/ObserveServiceContextTopia.java | 10 ++ .../ird/observe/services/ObserveServiceTopia.java | 52 +++--- .../ird/observe/services/entity/EntitiesSet.java | 30 +++- .../services/entity/EntitiesSetFactory.java | 177 +++++++++++++++++++++ .../services/entity/ObserveEntitiesFilters.java | 145 ----------------- .../services/entity/ObserveEntityFilter.java | 73 --------- .../services/entity/SpeciesListEntitiesSet.java | 17 +- .../entity/SpeciesListOceanEntitiesSet.java | 13 +- .../services/entity/UniverseEntitiesSet.java | 41 ----- .../services/ApplicationContextResource.java | 5 + .../fr/ird/observe/services/service/RigthTest.java | 7 +- .../service/seine/TripSeineServiceTopiaTest.java | 6 +- 27 files changed, 506 insertions(+), 368 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigOption.java b/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigOption.java index ca2b649..2b76356 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigOption.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigOption.java @@ -25,6 +25,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import fr.ird.observe.db.constantes.CreationMode; import fr.ird.observe.db.constantes.DbMode; +import fr.ird.observe.services.ObserveSpeciesListConfiguration; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ConfigOptionDef; import org.nuiton.util.version.Version; @@ -613,7 +614,7 @@ public enum ObserveSwingApplicationConfigOption implements ConfigOptionDef { "speciesList.seine.targetCatch", ObserveSwingApplicationConfig.PROPERTY_SPECIES_LIST_SEINE_TARGET_CATCH_ID, n("observe.config.speciesList.seine.targetCatch"), - "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.1", // espece thon + ObserveSpeciesListConfiguration.DEFAULT_SPECIES_LIST_SEINE_TARGET_CATCH_ID, String.class, false, false @@ -624,7 +625,7 @@ public enum ObserveSwingApplicationConfigOption implements ConfigOptionDef { "speciesList.seine.schoolEstimate", ObserveSwingApplicationConfig.PROPERTY_SPECIES_LIST_SEINE_SCHOOL_ESTIMATE_ID, n("observe.config.speciesList.seine.schoolEstimate"), - "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.1", // espece thons + ObserveSpeciesListConfiguration.DEFAULT_SPECIES_LIST_SEINE_SCHOOL_ESTIMATE_ID, String.class, false, false @@ -635,7 +636,7 @@ public enum ObserveSwingApplicationConfigOption implements ConfigOptionDef { "speciesList.seine.objectSchoolEstimate", ObserveSwingApplicationConfig.PROPERTY_SPECIES_LIST_SEINE_OBJECT_SCHOOL_ESTIMATE_ID, n("observe.config.speciesList.seine.objectSchoolEstimate"), - "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.1", // espece thon + ObserveSpeciesListConfiguration.DEFAULT_SPECIES_LIST_SEINE_OBJECT_SCHOOL_ESTIMATE_ID, String.class, false, false @@ -646,7 +647,7 @@ public enum ObserveSwingApplicationConfigOption implements ConfigOptionDef { "speciesList.seine.nonTargetCatch", ObserveSwingApplicationConfig.PROPERTY_SPECIES_LIST_SEINE_NON_TARGET_CATCH_ID, n("observe.config.speciesList.seine.nonTargetCatch"), - "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.2", // espece faune + ObserveSpeciesListConfiguration.DEFAULT_SPECIES_LIST_SEINE_NON_TARGET_CATCH_ID, String.class, false, false @@ -657,7 +658,7 @@ public enum ObserveSwingApplicationConfigOption implements ConfigOptionDef { "speciesList.seine.objectObservedSpecies", ObserveSwingApplicationConfig.PROPERTY_SPECIES_LIST_SEINE_OBJECT_OBSERVED_SPECIES_ID, n("observe.config.speciesList.seine.objectObservedSpecies"), - "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.2", // espece faune + ObserveSpeciesListConfiguration.DEFAULT_SPECIES_LIST_SEINE_OBJECT_OBSERVED_SPECIES_ID, String.class, false, false @@ -668,7 +669,7 @@ public enum ObserveSwingApplicationConfigOption implements ConfigOptionDef { "speciesList.longline.catch", ObserveSwingApplicationConfig.PROPERTY_SPECIES_LIST_LONGLINE_CATCH_ID, n("observe.config.speciesList.longline.catch"), - "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.3", // catch + ObserveSpeciesListConfiguration.DEFAULT_SPECIES_LIST_LONGLINE_CATCH_ID, String.class, false, false @@ -679,7 +680,7 @@ public enum ObserveSwingApplicationConfigOption implements ConfigOptionDef { "speciesList.longline.encounter", ObserveSwingApplicationConfig.PROPERTY_SPECIES_LIST_LONGLINE_ENCOUNTER_ID, n("observe.config.speciesList.longline.encounter"), - "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.4", // encounter + ObserveSpeciesListConfiguration.DEFAULT_SPECIES_LIST_LONGLINE_ENCOUNTER_ID, String.class, false, false @@ -689,7 +690,7 @@ public enum ObserveSwingApplicationConfigOption implements ConfigOptionDef { "speciesList.longline.depredator", ObserveSwingApplicationConfig.PROPERTY_SPECIES_LIST_LONGLINE_DEPREDATOR_ID, n("observe.config.speciesList.longline.encounter"), - "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.5", // encounter + ObserveSpeciesListConfiguration.DEFAULT_SPECIES_LIST_LONGLINE_DEPREDATOR_ID, String.class, false, false diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java index 0654765..f3d808f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java @@ -8,6 +8,7 @@ import fr.ird.observe.db.event.ObserveSwingDataSourceListener; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.ObserveServiceInitializer; import fr.ird.observe.services.ObserveServiceMainFactory; +import fr.ird.observe.services.ObserveSpeciesListConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationAndConnection; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; @@ -194,7 +195,6 @@ public class ObserveSwingDataSource extends AbstractSerializableBean { } - public <D extends IdDto> D getObserveDto(Class<D> dtoType, String id) { Preconditions.checkState(isOpen(), "Connection is not open"); @@ -273,12 +273,22 @@ public class ObserveSwingDataSource extends AbstractSerializableBean { ObserveDataSourceConfigurationAndConnection configurationAndConnection = new ObserveDataSourceConfigurationAndConnection(configuration, connection); + ObserveSpeciesListConfiguration speciesListConfiguration = new ObserveSpeciesListConfiguration(); + speciesListConfiguration.setSpeciesListLonglineCatchId(config.getSpeciesListLonglineCatchId()); + speciesListConfiguration.setSpeciesListLonglineDepredatorId(config.getSpeciesListLonglineDepredatorId()); + speciesListConfiguration.setSpeciesListLonglineEncounterId(config.getSpeciesListLonglineEncounterId()); + speciesListConfiguration.setSpeciesListSeineNonTargetCatchId(config.getSpeciesListSeineNonTargetCatchId()); + speciesListConfiguration.setSpeciesListSeineObjectObservedSpeciesId(config.getSpeciesListSeineObjectObservedSpeciesId()); + speciesListConfiguration.setSpeciesListSeineObjectSchoolEstimateId(config.getSpeciesListSeineObjectSchoolEstimateId()); + speciesListConfiguration.setSpeciesListSeineSchoolEstimateId(config.getSpeciesListSeineSchoolEstimateId()); + speciesListConfiguration.setSpeciesListSeineTargetCatchId(config.getSpeciesListSeineTargetCatchId()); + ObserveServiceInitializer observeServiceInitializer = ObserveServiceInitializer.create( locale, referentialLocale, tmpDirectory, - configurationAndConnection - ); + speciesListConfiguration, + configurationAndConnection); return observeServiceInitializer; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java index 081c03b..e5e1b94 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java @@ -255,7 +255,7 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto> ex public void initUI() throws Exception { final ContentTableUIInitializer<E, D, ObserveContentTableUI<E, D>> uiInitializer = - new ContentTableUIInitializer<E, D, ObserveContentTableUI<E, D>>(getUi()); + new ContentTableUIInitializer<>(getUi()); uiInitializer.initUI(); getModel().addPropertyChangeListener(ContentUIModel.PROPERTY_FORM_DTO, new PropertyChangeListener() { @@ -267,6 +267,7 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto> ex } + //FIXME Ne plus utiliser cela mais directement le labelSet sur la propriété Species qui contient la liste des espèces public Set<String> loadSpeciesList(String speciesListId, String errorMessage) { Set<String> speciesIds; @@ -287,6 +288,7 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto> ex } + //FIXME Ne plus utiliser cela mais directement le labelSet sur la propriété Species qui contient la liste des espèces protected void prepareSpeciesList(String speciesListId, JComponent speciesComponent, String errorMessage) { Set<String> speciesIds = loadSpeciesList(speciesListId, errorMessage); diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java index e71f6fe..c1cebd4 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java @@ -23,7 +23,9 @@ package fr.ird.observe.application.web; */ import com.google.common.base.Strings; +import com.google.gson.Gson; import fr.ird.observe.application.web.request.ObserveWebRequestContext; +import fr.ird.observe.services.ObserveSpeciesListConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRestConstants; import fr.ird.observe.services.dto.constants.ReferentialLocale; import org.apache.commons.lang3.StringUtils; @@ -39,7 +41,7 @@ import java.util.Locale; */ public class ObserveWebMotionFilter extends WebMotionFilter implements ObserveDataSourceConfigurationRestConstants { - public void inject(HttpContext context) { + public void inject(HttpContext context) { ObserveWebApplicationContext applicationContext = ObserveWebApplicationContext.getApplicationContext(context); @@ -47,6 +49,7 @@ public class ObserveWebMotionFilter extends WebMotionFilter implements ObserveDa Locale applicationLocale = getApplicationLocale(request); ReferentialLocale referentialLocale = getReferentialLocale(request); + ObserveSpeciesListConfiguration speciesListConfiguration = getSpeciesListConfiguration(applicationContext.getGsonSupplier().get(), request); String adminApiKey = getRequestHeaderOrParameterValueOrNull(request, REQUEST_ADMIN_API_KEY); if (Strings.isNullOrEmpty(adminApiKey)) { @@ -58,7 +61,7 @@ public class ObserveWebMotionFilter extends WebMotionFilter implements ObserveDa authenticationToken = null; } - ObserveWebRequestContext requestContext = new ObserveWebRequestContext(applicationContext, applicationLocale, referentialLocale, adminApiKey, authenticationToken); + ObserveWebRequestContext requestContext = new ObserveWebRequestContext(applicationContext, applicationLocale, referentialLocale, speciesListConfiguration, adminApiKey, authenticationToken); ObserveWebRequestContext.setRequestContext(context, requestContext); doProcess(); @@ -77,6 +80,17 @@ public class ObserveWebMotionFilter extends WebMotionFilter implements ObserveDa } + protected ObserveSpeciesListConfiguration getSpeciesListConfiguration(Gson gson, HttpServletRequest request) { + + ObserveSpeciesListConfiguration speciesListConfiguration = null; + String speciesListConfigurationStr = getRequestHeaderOrParameterValueOrNull(request, REQUEST_SPECIES_LIST_CONFIGURATION); + if (speciesListConfigurationStr != null) { + speciesListConfiguration = gson.fromJson(speciesListConfigurationStr, ObserveSpeciesListConfiguration.class); + } + return speciesListConfiguration; + + } + protected Locale getApplicationLocale(HttpServletRequest request) { Locale applicationLocale = null; diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java index 3b3f221..251782c 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java @@ -29,6 +29,7 @@ import fr.ird.observe.application.web.security.AuthenticationTokenNotFoundExcept import fr.ird.observe.application.web.security.InvalidAdminKeyApiException; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.ObserveServiceInitializer; +import fr.ird.observe.services.ObserveSpeciesListConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationAndConnection; import fr.ird.observe.services.dto.constants.ReferentialLocale; @@ -63,6 +64,8 @@ public class ObserveWebRequestContext { protected final ReferentialLocale referentialLocale; + protected final ObserveSpeciesListConfiguration speciesListConfiguration; + protected final Optional<String> optionalAdminApiKey; protected final Optional<String> optionalAuthenticationToken; @@ -70,11 +73,13 @@ public class ObserveWebRequestContext { public ObserveWebRequestContext(ObserveWebApplicationContext applicationContext, Locale applicationLocale, ReferentialLocale referentialLocale, + ObserveSpeciesListConfiguration speciesListConfiguration, String adminApiKey, String authenticationToken) { this.applicationContext = applicationContext; this.applicationLocale = applicationLocale; this.referentialLocale = referentialLocale; + this.speciesListConfiguration = speciesListConfiguration; this.optionalAdminApiKey = Optional.fromNullable(adminApiKey); this.optionalAuthenticationToken = Optional.fromNullable(authenticationToken); } @@ -89,6 +94,7 @@ public class ObserveWebRequestContext { applicationLocale, referentialLocale, applicationContext.getApplicationConfiguration().getTemporaryDirectory(), + speciesListConfiguration, dataSourceConfiguration); S service = applicationContext.newService(observeServiceInitializer, serviceType); return service; @@ -101,6 +107,7 @@ public class ObserveWebRequestContext { applicationLocale, referentialLocale, applicationContext.getApplicationConfiguration().getTemporaryDirectory(), + speciesListConfiguration, configurationAndConnection); S service = applicationContext.newService(observeServiceInitializer, serviceType); return service; diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ReferenceEntities.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ReferenceEntities.java index bf72832..31d51c3 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ReferenceEntities.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ReferenceEntities.java @@ -88,7 +88,7 @@ public class ReferenceEntities { } } - public static final Predicate<ReferenceEntity> IS_ACTIF_PREDICATE = new Predicate<ReferenceEntity>() { + public static final Predicate<? extends ReferenceEntity> IS_ACTIF_PREDICATE = new Predicate<ReferenceEntity>() { @Override public boolean apply(ReferenceEntity input) { return ReferenceStatus.disabled != input.getStatus(); @@ -96,12 +96,7 @@ public class ReferenceEntities { }; public static <R extends ReferenceEntity> Predicate<R> newEnablePredicate() { - return new Predicate<R>() { - @Override - public boolean apply(R r) { - return ReferenceStatus.disabled != r.getStatus(); - } - }; + return (Predicate<R>) IS_ACTIF_PREDICATE; } public static void walk(ReferentielWalker walker) throws Exception { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/SpeciesLists.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/SpeciesLists.java deleted file mode 100644 index 5f563b7..0000000 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/SpeciesLists.java +++ /dev/null @@ -1,15 +0,0 @@ -package fr.ird.observe.entities.referentiel; - -/** - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public class SpeciesLists { - - // FIXME ces valeurs ne sont pas au bon endroit ici - public static String SPECIES_LIST_SEINE_OBJECT_SCHOOL_ESTIMATE_ID = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.1"; - - public static String SPECIES_LIST_SEINE_OBJECT_OBSERVED_SPECIES_ID = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.2"; - - public static String SPECIES_LIST_SEINE_SCHOOL_ESTIMATE_ID = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.1"; - -} diff --git a/observe-entities/src/main/resources/i18n/observe-entities_en_GB.properties b/observe-entities/src/main/resources/i18n/observe-entities_en_GB.properties index 3250a63..05833ca 100644 --- a/observe-entities/src/main/resources/i18n/observe-entities_en_GB.properties +++ b/observe-entities/src/main/resources/i18n/observe-entities_en_GB.properties @@ -1,8 +1,3 @@ -observe.typeTransmittingBuoyOperation.no.balise=No Beacon -observe.typeTransmittingBuoyOperation.pose=Posing -observe.typeTransmittingBuoyOperation.recupere=Grab -observe.typeTransmittingBuoyOperation.recupere.et.change=Grab and change -observe.typeTransmittingBuoyOperation.visite=Visit observe.common.endDate=End date observe.common.endPursingDate=End pursing date observe.common.gpsPointInterval=Interval %1$td/%1$tm/%1$tY %1$tH\:%1$tM\:%1$tS - %2$td/%2$tm/%2$tY %2$tH\:%2$tM\:%2$tM ( number if point(s) \: %3$s ) @@ -35,3 +30,8 @@ observe.reference.status.enabled=Enabled observe.schoolType.libre=Free school type observe.schoolType.objet=Object school type observe.schoolType.undefined=Undefined school type +observe.typeTransmittingBuoyOperation.no.balise=No Beacon +observe.typeTransmittingBuoyOperation.pose=Posing +observe.typeTransmittingBuoyOperation.recupere=Grab +observe.typeTransmittingBuoyOperation.recupere.et.change=Grab and change +observe.typeTransmittingBuoyOperation.visite=Visit diff --git a/observe-entities/src/main/resources/i18n/observe-entities_es_ES.properties b/observe-entities/src/main/resources/i18n/observe-entities_es_ES.properties index c9219a9..dec12ff 100644 --- a/observe-entities/src/main/resources/i18n/observe-entities_es_ES.properties +++ b/observe-entities/src/main/resources/i18n/observe-entities_es_ES.properties @@ -1,8 +1,3 @@ -observe.typeTransmittingBuoyOperation.no.balise=DCP sin balizar -observe.typeTransmittingBuoyOperation.pose=Colocación de nueva baliza -observe.typeTransmittingBuoyOperation.recupere=Recogida de baliza sin regreso al agua -observe.typeTransmittingBuoyOperation.recupere.et.change=Recuperación y colocación de una nueva baliza -observe.typeTransmittingBuoyOperation.visite=Visita a la baliza observe.common.endDate=Fecha de fin observe.common.endPursingDate=Fecha de final de recogida de la jareta observe.common.gpsPointInterval=Intervalo %1$td/%1$tm/%1$tY %1$tH\:%1$tM\:%1$tS - %2$td/%2$tm/%2$tY %2$tH\:%2$tM\:%2$tM ( número de punto(s) \: %3$s ) @@ -35,3 +30,8 @@ observe.reference.status.enabled=Activado observe.schoolType.libre=Banco libre observe.schoolType.objet=Banco a objeto observe.schoolType.undefined=Banco indeterminado +observe.typeTransmittingBuoyOperation.no.balise=DCP sin balizar +observe.typeTransmittingBuoyOperation.pose=Colocación de nueva baliza +observe.typeTransmittingBuoyOperation.recupere=Recogida de baliza sin regreso al agua +observe.typeTransmittingBuoyOperation.recupere.et.change=Recuperación y colocación de una nueva baliza +observe.typeTransmittingBuoyOperation.visite=Visita a la baliza diff --git a/observe-entities/src/main/resources/i18n/observe-entities_fr_FR.properties b/observe-entities/src/main/resources/i18n/observe-entities_fr_FR.properties index eb795c5..0c8bb72 100644 --- a/observe-entities/src/main/resources/i18n/observe-entities_fr_FR.properties +++ b/observe-entities/src/main/resources/i18n/observe-entities_fr_FR.properties @@ -1,8 +1,3 @@ -observe.typeTransmittingBuoyOperation.no.balise=Pas de balise liée au DCP -observe.typeTransmittingBuoyOperation.pose=Pose d'une nouvelle balise -observe.typeTransmittingBuoyOperation.recupere=Récupération d'une balise sans remise à l'eau -observe.typeTransmittingBuoyOperation.recupere.et.change=Récupération et pose d'une nouvelle balise -observe.typeTransmittingBuoyOperation.visite=Simple visite de la balise observe.common.endDate=Fin de validité observe.common.endPursingDate=Date de fin de coulissage observe.common.gpsPointInterval=Intervalle %1$td/%1$tm/%1$tY %1$tH\:%1$tM\:%1$tS - %2$td/%2$tm/%2$tY %2$tH\:%2$tM\:%2$tM ( nombre de point(s) \: %3$s ) @@ -35,3 +30,8 @@ observe.reference.status.enabled=Activé observe.schoolType.libre=Banc libre observe.schoolType.objet=Banc objet observe.schoolType.undefined=Banc indéterminé +observe.typeTransmittingBuoyOperation.no.balise=Pas de balise liée au DCP +observe.typeTransmittingBuoyOperation.pose=Pose d'une nouvelle balise +observe.typeTransmittingBuoyOperation.recupere=Récupération d'une balise sans remise à l'eau +observe.typeTransmittingBuoyOperation.recupere.et.change=Récupération et pose d'une nouvelle balise +observe.typeTransmittingBuoyOperation.visite=Simple visite de la balise diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java index 52b318b..70d033e 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java @@ -45,12 +45,14 @@ public class ObserveServiceInitializer { public static ObserveServiceInitializer create(Locale applicationLocale, ReferentialLocale referentialLocale, File temporaryDirectoryRoot, + ObserveSpeciesListConfiguration speciesListConfiguration, ObserveDataSourceConnection dataSourceConnection) { ObserveServiceInitializer observeServiceInitializer = new ObserveServiceInitializer(); observeServiceInitializer.setApplicationLocale(applicationLocale); observeServiceInitializer.setReferentialLocale(referentialLocale); observeServiceInitializer.setTemporaryDirectoryRoot(temporaryDirectoryRoot); + observeServiceInitializer.setSpeciesListConfiguration(speciesListConfiguration); observeServiceInitializer.setDataSourceConfiguration(null); observeServiceInitializer.setDataSourceConnection(dataSourceConnection); return observeServiceInitializer; @@ -60,12 +62,14 @@ public class ObserveServiceInitializer { public static ObserveServiceInitializer create(Locale applicationLocale, ReferentialLocale referentialLocale, File temporaryDirectoryRoot, + ObserveSpeciesListConfiguration speciesListConfiguration, ObserveDataSourceConfiguration dataSourceConfiguration) { ObserveServiceInitializer observeServiceInitializer = new ObserveServiceInitializer(); observeServiceInitializer.setApplicationLocale(applicationLocale); observeServiceInitializer.setReferentialLocale(referentialLocale); observeServiceInitializer.setTemporaryDirectoryRoot(temporaryDirectoryRoot); + observeServiceInitializer.setSpeciesListConfiguration(speciesListConfiguration); observeServiceInitializer.setDataSourceConfiguration(dataSourceConfiguration); observeServiceInitializer.setDataSourceConnection(null); return observeServiceInitializer; @@ -75,12 +79,14 @@ public class ObserveServiceInitializer { public static ObserveServiceInitializer create(Locale applicationLocale, ReferentialLocale referentialLocale, File temporaryDirectoryRoot, + ObserveSpeciesListConfiguration speciesListConfiguration, ObserveDataSourceConfigurationAndConnection configurationAndConnection) { ObserveServiceInitializer observeServiceInitializer = new ObserveServiceInitializer(); observeServiceInitializer.setApplicationLocale(applicationLocale); observeServiceInitializer.setReferentialLocale(referentialLocale); observeServiceInitializer.setTemporaryDirectoryRoot(temporaryDirectoryRoot); + observeServiceInitializer.setSpeciesListConfiguration(speciesListConfiguration); observeServiceInitializer.setDataSourceConfiguration(null); observeServiceInitializer.setDataSourceConnection(configurationAndConnection.getConnection()); observeServiceInitializer.setDataSourceConfiguration(configurationAndConnection.getConfiguration()); @@ -96,12 +102,14 @@ public class ObserveServiceInitializer { otherObserveServiceInitializer.getApplicationLocale(), otherObserveServiceInitializer.getReferentialLocale(), otherObserveServiceInitializer.getTemporaryDirectoryRoot(), + otherObserveServiceInitializer.getSpeciesListConfiguration(), otherObserveServiceInitializer.getDataSourceConnection()); } else { observeServiceInitializer = create( otherObserveServiceInitializer.getApplicationLocale(), otherObserveServiceInitializer.getReferentialLocale(), otherObserveServiceInitializer.getTemporaryDirectoryRoot(), + otherObserveServiceInitializer.getSpeciesListConfiguration(), otherObserveServiceInitializer.getDataSourceConfiguration()); } @@ -135,6 +143,12 @@ public class ObserveServiceInitializer { */ protected File temporaryDirectoryRoot; + /** + * La configuration des listes d'espèces (utilisé pour filtrer les listes d'espèces). + */ + protected ObserveSpeciesListConfiguration speciesListConfiguration; + + public Locale getApplicationLocale() { return applicationLocale; } @@ -155,6 +169,10 @@ public class ObserveServiceInitializer { return temporaryDirectoryRoot; } + public ObserveSpeciesListConfiguration getSpeciesListConfiguration() { + return speciesListConfiguration; + } + public boolean withDataSourceConnection() { return dataSourceConnection.isPresent(); } @@ -183,6 +201,10 @@ public class ObserveServiceInitializer { this.temporaryDirectoryRoot = temporaryDirectoryRoot; } + protected void setSpeciesListConfiguration(ObserveSpeciesListConfiguration speciesListConfiguration) { + this.speciesListConfiguration = speciesListConfiguration; + } + protected ObserveServiceInitializer() { } } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveSpeciesListConfiguration.java b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveSpeciesListConfiguration.java new file mode 100644 index 0000000..43a0e77 --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveSpeciesListConfiguration.java @@ -0,0 +1,149 @@ +package fr.ird.observe.services; + +/** + * Contient la configuration des listes de favoris d'espèces à utiliser. + * + * Created on 18/10/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class ObserveSpeciesListConfiguration { + + /** + * La valeur par défaut pour obtenir la liste des espèces capture du modèle palangre. + */ + public static final String DEFAULT_SPECIES_LIST_LONGLINE_CATCH_ID = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.3"; // catch + + /** + * La valeur par défaut pour obtenir la liste des espèces rencontrées du modèle palangre. + */ + public static final String DEFAULT_SPECIES_LIST_LONGLINE_ENCOUNTER_ID = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.4"; // encounter + + /** + * La valeur par défaut pour obtenir la liste des espèces de déprédation capture du modèle palangre. + */ + public static final String DEFAULT_SPECIES_LIST_LONGLINE_DEPREDATOR_ID = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.5"; // depradator + + /** + * La valeur par défaut pour obtenir la liste des espèces d'estimation du modèle seine. + */ + public static final String DEFAULT_SPECIES_LIST_SEINE_SCHOOL_ESTIMATE_ID = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.1"; // espece thons + + /** + * La valeur par défaut pour obtenir la liste des espèces non cible du modèle seine. + */ + public static final String DEFAULT_SPECIES_LIST_SEINE_NON_TARGET_CATCH_ID = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.2"; // espece faune + + /** + * La valeur par défaut pour obtenir la liste des espèces estimées d'objet du modèle seine. + */ + public static final String DEFAULT_SPECIES_LIST_SEINE_OBJECT_SCHOOL_ESTIMATE_ID = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.1"; // espece thons + + /** + * La valeur par défaut pour obtenir la liste des espèces observées sur objet du modèle seine. + */ + public static final String DEFAULT_SPECIES_LIST_SEINE_OBJECT_OBSERVED_SPECIES_ID = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.2"; // espece faune + + /** + * La valeur par défaut pour obtenir la liste des espèces capture du modèle seine. + */ + public static final String DEFAULT_SPECIES_LIST_SEINE_TARGET_CATCH_ID = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.1"; // espece thons + + protected String speciesListLonglineCatchId; + + protected String speciesListLonglineDepredatorId; + + protected String speciesListLonglineEncounterId; + + protected String speciesListSeineNonTargetCatchId; + + protected String speciesListSeineSchoolEstimateId; + + protected String speciesListSeineObjectSchoolEstimateId; + + protected String speciesListSeineObjectObservedSpeciesId; + + protected String speciesListSeineTargetCatchId; + + /** + * @return une configuration avec les valeurs par défaut. + */ + public static ObserveSpeciesListConfiguration newDefaultConfiguration() { + + ObserveSpeciesListConfiguration speciesListConfiguration = new ObserveSpeciesListConfiguration(); + speciesListConfiguration.setSpeciesListLonglineCatchId(DEFAULT_SPECIES_LIST_LONGLINE_CATCH_ID); + speciesListConfiguration.setSpeciesListLonglineDepredatorId(DEFAULT_SPECIES_LIST_LONGLINE_DEPREDATOR_ID); + speciesListConfiguration.setSpeciesListLonglineEncounterId(DEFAULT_SPECIES_LIST_LONGLINE_ENCOUNTER_ID); + speciesListConfiguration.setSpeciesListSeineNonTargetCatchId(DEFAULT_SPECIES_LIST_SEINE_NON_TARGET_CATCH_ID); + speciesListConfiguration.setSpeciesListSeineObjectObservedSpeciesId(DEFAULT_SPECIES_LIST_SEINE_OBJECT_OBSERVED_SPECIES_ID); + speciesListConfiguration.setSpeciesListSeineObjectSchoolEstimateId(DEFAULT_SPECIES_LIST_SEINE_OBJECT_SCHOOL_ESTIMATE_ID); + speciesListConfiguration.setSpeciesListSeineSchoolEstimateId(DEFAULT_SPECIES_LIST_SEINE_SCHOOL_ESTIMATE_ID); + speciesListConfiguration.setSpeciesListSeineTargetCatchId(DEFAULT_SPECIES_LIST_SEINE_TARGET_CATCH_ID); + return speciesListConfiguration; + } + + public String getSpeciesListLonglineCatchId() { + return speciesListLonglineCatchId; + } + + public void setSpeciesListLonglineCatchId(String speciesListLonglineCatchId) { + this.speciesListLonglineCatchId = speciesListLonglineCatchId; + } + + public String getSpeciesListLonglineDepredatorId() { + return speciesListLonglineDepredatorId; + } + + public void setSpeciesListLonglineDepredatorId(String speciesListLonglineDepredatorId) { + this.speciesListLonglineDepredatorId = speciesListLonglineDepredatorId; + } + + public String getSpeciesListLonglineEncounterId() { + return speciesListLonglineEncounterId; + } + + public void setSpeciesListLonglineEncounterId(String speciesListLonglineEncounterId) { + this.speciesListLonglineEncounterId = speciesListLonglineEncounterId; + } + + public String getSpeciesListSeineNonTargetCatchId() { + return speciesListSeineNonTargetCatchId; + } + + public void setSpeciesListSeineNonTargetCatchId(String speciesListSeineNonTargetCatchId) { + this.speciesListSeineNonTargetCatchId = speciesListSeineNonTargetCatchId; + } + + public String getSpeciesListSeineSchoolEstimateId() { + return speciesListSeineSchoolEstimateId; + } + + public void setSpeciesListSeineSchoolEstimateId(String speciesListSeineSchoolEstimateId) { + this.speciesListSeineSchoolEstimateId = speciesListSeineSchoolEstimateId; + } + + public String getSpeciesListSeineObjectSchoolEstimateId() { + return speciesListSeineObjectSchoolEstimateId; + } + + public void setSpeciesListSeineObjectSchoolEstimateId(String speciesListSeineObjectSchoolEstimateId) { + this.speciesListSeineObjectSchoolEstimateId = speciesListSeineObjectSchoolEstimateId; + } + + public String getSpeciesListSeineObjectObservedSpeciesId() { + return speciesListSeineObjectObservedSpeciesId; + } + + public void setSpeciesListSeineObjectObservedSpeciesId(String speciesListSeineObjectObservedSpeciesId) { + this.speciesListSeineObjectObservedSpeciesId = speciesListSeineObjectObservedSpeciesId; + } + + public String getSpeciesListSeineTargetCatchId() { + return speciesListSeineTargetCatchId; + } + + public void setSpeciesListSeineTargetCatchId(String speciesListSeineTargetCatchId) { + this.speciesListSeineTargetCatchId = speciesListSeineTargetCatchId; + } + +} diff --git a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java index ab827b8..2570a0d 100644 --- a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java +++ b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java @@ -39,6 +39,8 @@ public interface ObserveDataSourceConfigurationRestConstants { String REQUEST_REFERENTIAL_LOCALE = "referentialLocale"; + String REQUEST_SPECIES_LIST_CONFIGURATION = "speciesListConfiguration"; + String REQUEST_AUTHENTICATION_TOKEN = "authenticationToken"; String REQUEST_ADMIN_API_KEY = "adminApiKey"; diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java index f564b48..918a6c3 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java @@ -155,6 +155,8 @@ public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport impl protected final String referentialLocale; + protected final String speciesListConfigurationAsString; + protected final String locateService; protected final ObserveResponseBuilder responseBuilder; @@ -174,6 +176,7 @@ public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport impl this.gsonSupplier = gsonSupplier; this.applicationLocale = observeServiceInitializer.getApplicationLocale().toString(); this.referentialLocale = observeServiceInitializer.getReferentialLocale().getLocale().toString(); + this.speciesListConfigurationAsString = gsonSupplier.get().toJson(observeServiceInitializer.getSpeciesListConfiguration()); this.responseBuilder = responseBuilder; } @@ -341,7 +344,7 @@ public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport impl requestBuilder.addHeader(REQUEST_AUTHENTICATION_TOKEN, dataSourceConnection.getAuthenticationToken()); } - + if (!Strings.isNullOrEmpty(applicationLocale)) { requestBuilder.addHeader(REQUEST_APPLICATION_LOCALE, applicationLocale); } @@ -349,6 +352,8 @@ public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport impl requestBuilder.addHeader(REQUEST_REFERENTIAL_LOCALE, referentialLocale); } + requestBuilder.addHeader(REQUEST_SPECIES_LIST_CONFIGURATION, speciesListConfigurationAsString); + } } diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java b/observe-services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java index 0286bfd..6cf42cd 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java @@ -86,6 +86,7 @@ public class TestClassResource implements TestRule { Locale.FRANCE, ReferentialLocale.FR, temporaryDirectoryRoot.toFile(), + ObserveSpeciesListConfiguration.newDefaultConfiguration(), dataSourceConfiguration ); return serviceFactory.newService(observeServiceInitializer, serviceType); @@ -96,6 +97,7 @@ public class TestClassResource implements TestRule { Locale.FRANCE, ReferentialLocale.FR, temporaryDirectoryRoot.toFile(), + ObserveSpeciesListConfiguration.newDefaultConfiguration(), dataSourceConnection ); return serviceFactory.newService(observeServiceInitializer, serviceType); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java index b9a0a3e..91a332e 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java @@ -29,6 +29,7 @@ import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopia import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.configuration.ObserveDataSourceConnectionTopia; import fr.ird.observe.services.dto.constants.ReferentialLocale; +import fr.ird.observe.services.entity.EntitiesSetFactory; import java.io.File; import java.io.IOException; @@ -59,6 +60,8 @@ public class ObserveServiceContextTopia { protected ObserveTopiaApplicationContext topiaApplicationContext; + protected EntitiesSetFactory entitiesSetFactory; + public ObserveServiceContextTopia(ObserveServiceInitializer observeServiceInitializer, ObserveServiceFactory mainServiceFactory, ObserveServiceFactory serviceFactory) { @@ -99,6 +102,13 @@ public class ObserveServiceContextTopia { return new Date(); } + public EntitiesSetFactory getEntitiesSetFactory() { + if (entitiesSetFactory == null) { + entitiesSetFactory = new EntitiesSetFactory(observeServiceInitializer.getSpeciesListConfiguration()); + } + return entitiesSetFactory; + } + public <S extends ObserveService> S newService(Class<S> serviceType) { return serviceFactory.newService(observeServiceInitializer, serviceType); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java index baa2bb6..bbbcfab 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java @@ -57,8 +57,7 @@ import fr.ird.observe.services.dto.ReferenceTypeName; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.entity.EntitiesSet; -import fr.ird.observe.services.entity.ObserveEntitiesFilters; -import fr.ird.observe.services.entity.ObserveEntityFilter; +import fr.ird.observe.services.entity.EntitiesSetFactory; import fr.ird.observe.services.service.ConcurrentModificationException; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.observe.services.service.DataSourceService; @@ -285,26 +284,16 @@ public abstract class ObserveServiceTopia implements ObserveService { // copy entity D dto = dtoBuilder.build(serviceContext.getReferentialLocale(), entity); - // build label sets detected while copy (keep the reference for each label, or nothing if value not set) - ImmutableSet<ReferenceTypeName> referenceTypesNames = dtoBuilder.getReferenceTypesNames(); - ImmutableSet.Builder<ReferenceSetDto> labels = new ImmutableSet.Builder<>(); - - for (ReferenceTypeName referenceDtoTypeName : referenceTypesNames) { - - Class<TopiaEntity> entityParentType = getEntityType(referenceDtoTypeName.getParentType()); - Class<TopiaEntity> entityChildType = getEntityType(referenceDtoTypeName.getType()); + // build label sets detected while copy + // For read form, we don't need to get any values in labelSet (since there is nothing to edit^^) + ImmutableSet.Builder<ReferenceSetDto> labels = ImmutableSet.builder(); - ObserveEntityFilter filter = ObserveEntitiesFilters.getFilter( - entityParentType, - entityChildType, - referenceDtoTypeName.getType(), - referenceDtoTypeName.getProperty()); + for (ReferenceTypeName referenceDtoTypeName : dtoBuilder.getReferenceTypesNames()) { - ReferenceSetDto referentialLabelSet = ReferenceSetDtos.newEmptyReferenceSetDto( - filter.getDtoType(), - filter.getPropertyName()); + Class<? extends IdDto> childDtoType = referenceDtoTypeName.getType(); + String propertyName = referenceDtoTypeName.getProperty(); - labels.add(referentialLabelSet); + labels.add(ReferenceSetDtos.newEmptyReferenceSetDto(childDtoType, propertyName)); } @@ -347,23 +336,26 @@ public abstract class ObserveServiceTopia implements ObserveService { D dto = dtoBuilder.build(serviceContext.getReferentialLocale(), entity, includeReferenceDtoTypesNames); // build label sets detected while copy - ImmutableSet<ReferenceTypeName> referenceDtoTypesNames = dtoBuilder.getReferenceTypesNames(); ImmutableSet.Builder<ReferenceSetDto> labels = new ImmutableSet.Builder<>(); - for (ReferenceTypeName referenceDtoTypeName : referenceDtoTypesNames) { + EntitiesSetFactory entityFilterFactory = serviceContext.getEntitiesSetFactory(); + + for (ReferenceTypeName referenceDtoTypeName : dtoBuilder.getReferenceTypesNames()) { + + Class<? extends IdDto> childDtoType = referenceDtoTypeName.getType(); + String propertyName = referenceDtoTypeName.getProperty(); Class<TopiaEntity> entityParentType = getEntityType(referenceDtoTypeName.getParentType()); - Class<TopiaEntity> entityChildType = getEntityType(referenceDtoTypeName.getType()); + Class<TopiaEntity> entityChildType = getEntityType(childDtoType); - ObserveEntityFilter filter = ObserveEntitiesFilters.getFilter(entityParentType, - entityChildType, - referenceDtoTypeName.getType(), - referenceDtoTypeName.getProperty()); + EntitiesSet<TopiaEntity> entitiesSet = entityFilterFactory.newEntitiesSet(entityParentType, + entityChildType, + propertyName); - ReferenceSetDto referenceSet = getReferenceSet(filter.getDtoType(), - filter.getPropertyName(), - filter.getEntityType(), - filter.getEntitiesSet(), + ReferenceSetDto referenceSet = getReferenceSet(childDtoType, + propertyName, + entityChildType, + entitiesSet, dataContext); labels.add(referenceSet); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSet.java b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSet.java index 56679cf..fc3cabe 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSet.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSet.java @@ -1,21 +1,30 @@ package fr.ird.observe.services.entity; +import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import fr.ird.observe.ObserveTopiaPersistenceContext; +import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntity; import java.util.Map; /** * FIXME Ca sert à quoi? + * * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public abstract class EntitiesSet<E extends TopiaEntity> { +public class EntitiesSet<E extends TopiaEntity> { - protected abstract Iterable<E> getEntitiesSetBase(ObserveTopiaPersistenceContext persistenceContext); + /** + * Le type de l'entité dont on cherche des éléments. + */ + protected final Class<E> entityType; - protected abstract Predicate<E> getFilter(Map<String, Object> requestContext); + /** + * Un prédicat de filtrage optionnel. + */ + protected final Optional<Predicate<E>> optionalFilter; public Iterable<E> getEntities(ObserveTopiaPersistenceContext persistenceContext, Map<String, Object> requestContext) { Iterable<E> result = getEntitiesSetBase(persistenceContext); @@ -25,4 +34,19 @@ public abstract class EntitiesSet<E extends TopiaEntity> { } return result; } + + protected EntitiesSet(Class<E> entityType, Predicate<E> optionalFilter) { + this.entityType = entityType; + this.optionalFilter = Optional.fromNullable(optionalFilter); + } + + protected Iterable<E> getEntitiesSetBase(ObserveTopiaPersistenceContext persistenceContext) { + TopiaDao<E> dao = persistenceContext.getDao(entityType); + return dao.findAll(); + } + + protected Predicate<E> getFilter(Map<String, Object> requestContext) { + return optionalFilter.orNull(); + } + } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSetFactory.java b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSetFactory.java new file mode 100644 index 0000000..7bc9167 --- /dev/null +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/EntitiesSetFactory.java @@ -0,0 +1,177 @@ +package fr.ird.observe.services.entity; + +import com.google.common.base.Preconditions; +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; +import com.google.common.collect.ImmutableMap; +import fr.ird.observe.entities.Entities; +import fr.ird.observe.entities.longline.TripLongline; +import fr.ird.observe.entities.referentiel.Person; +import fr.ird.observe.entities.referentiel.Persons; +import fr.ird.observe.entities.referentiel.ReferenceEntities; +import fr.ird.observe.entities.referentiel.ReferenceEntity; +import fr.ird.observe.entities.referentiel.Species; +import fr.ird.observe.entities.referentiel.Vessel; +import fr.ird.observe.entities.referentiel.Vessels; +import fr.ird.observe.entities.seine.ObjectObservedSpecies; +import fr.ird.observe.entities.seine.ObjectSchoolEstimate; +import fr.ird.observe.entities.seine.SchoolEstimate; +import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.services.ObserveSpeciesListConfiguration; +import org.nuiton.topia.persistence.TopiaEntity; + +/** + * Une usine de {@link EntitiesSet}. + * + * Created on 18/10/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class EntitiesSetFactory { + + protected final ImmutableMap<String, EntitiesSet> cache; + + public EntitiesSetFactory(ObserveSpeciesListConfiguration speciesListConfiguration) { + + ImmutableMap.Builder<String, EntitiesSet> builder = ImmutableMap.builder(); + + // TripSeine + registerReferentialEntitiesSet(builder, + TripSeine.class, + TripSeine.PROPERTY_CAPTAIN, + Person.class, + Persons.newCaptainPredicate()); + registerReferentialEntitiesSet(builder, + TripSeine.class, + TripSeine.PROPERTY_OBSERVER, + Person.class, + Persons.newObserverPredicate()); + registerReferentialEntitiesSet(builder, + TripSeine.class, + TripSeine.PROPERTY_DATA_ENTRY_OPERATOR, + Person.class, + Persons.newDataEntryOperatorPredicate()); + registerReferentialEntitiesSet(builder, + TripSeine.class, + TripSeine.PROPERTY_VESSEL, + Vessel.class, + Vessels.newVesselSeinePredicate()); + + // TripLongLine + registerReferentialEntitiesSet(builder, + TripLongline.class, + TripLongline.PROPERTY_CAPTAIN, + Person.class, + Persons.newCaptainPredicate()); + registerReferentialEntitiesSet(builder, + TripLongline.class, + TripLongline.PROPERTY_OBSERVER, + Person.class, + Persons.newObserverPredicate()); + registerReferentialEntitiesSet(builder, + TripLongline.class, + TripLongline.PROPERTY_DATA_ENTRY_OPERATOR, + Person.class, + Persons.newDataEntryOperatorPredicate()); + registerReferentialEntitiesSet(builder, + TripLongline.class, + TripLongline.PROPERTY_VESSEL, + Vessel.class, + Vessels.newVesselLonglinePredicate()); + + // ObjectSchoolEstimate + registerSpeciesListEntitiesSet(builder, + ObjectSchoolEstimate.class, + ObjectSchoolEstimate.PROPERTY_SPECIES, + speciesListConfiguration.getSpeciesListSeineObjectSchoolEstimateId()); + + // ObjectObservedSpecies + registerSpeciesListEntitiesSet(builder, + ObjectObservedSpecies.class, + ObjectObservedSpecies.PROPERTY_SPECIES, + speciesListConfiguration.getSpeciesListSeineObjectObservedSpeciesId()); + + // SchoolEstimate + registerSpeciesListEntitiesSet(builder, + SchoolEstimate.class, + SchoolEstimate.PROPERTY_SPECIES, + speciesListConfiguration.getSpeciesListSeineSchoolEstimateId()); + + this.cache = builder.build(); + + } + + public <P extends TopiaEntity, C extends TopiaEntity> EntitiesSet<C> newEntitiesSet(Class<P> parentType, + Class<C> propertyType, + String propertyName) { + + Preconditions.checkNotNull(parentType, "Parent type is required"); + Preconditions.checkNotNull(propertyName, "Property name is required"); + Preconditions.checkNotNull(propertyType, "Property type is required"); + + String key = buildKey(parentType, propertyName); + EntitiesSet<C> entitiesSet = cache.get(key); + + if (entitiesSet == null) { + + // Pas de filtre spécifique trouvé, on en construit un générique + + if (Entities.isReferentielClass(propertyType)) { + + // On veut tous les référentiels sauf ceux qui sont désactivés + entitiesSet = new EntitiesSet<>(propertyType, (Predicate<C>) ReferenceEntities.newEnablePredicate()); + + } else { + + // On veut toutes les entités + entitiesSet = new EntitiesSet<>(propertyType, null); + + } + + } + + return entitiesSet; + + } + + protected <P extends TopiaEntity> String buildKey(Class<P> parentType, String propertyName) { + return parentType.getName() + "#" + propertyName; + } + + protected <P extends TopiaEntity, C extends ReferenceEntity> void registerReferentialEntitiesSet( + ImmutableMap.Builder<String, EntitiesSet> builder, + Class<P> parentType, + String propertyName, + Class<C> propertyType, + Predicate<C> filter) { + + filter = Predicates.and(filter, ReferenceEntities.newEnablePredicate()); + + EntitiesSet<C> entitiesSet = new EntitiesSet<>(propertyType, filter); + registerEntitiesSet(builder, parentType, propertyName, entitiesSet); + + } + + protected <P extends TopiaEntity> void registerSpeciesListEntitiesSet( + ImmutableMap.Builder<String, EntitiesSet> builder, + Class<P> parentType, + String propertyName, + String speciesListId) { + + EntitiesSet<Species> entitiesSet = new SpeciesListEntitiesSet(speciesListId); + registerEntitiesSet(builder, parentType, propertyName, entitiesSet); + + } + + protected <P extends TopiaEntity, C extends TopiaEntity> void registerEntitiesSet( + ImmutableMap.Builder<String, EntitiesSet> builder, + Class<P> parentType, + String propertyName, + EntitiesSet<C> entitiesSet) { + + String key = buildKey(parentType, propertyName); + builder.put(key, entitiesSet); + + } + +} diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/ObserveEntitiesFilters.java b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/ObserveEntitiesFilters.java deleted file mode 100644 index c3e27d5..0000000 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/ObserveEntitiesFilters.java +++ /dev/null @@ -1,145 +0,0 @@ -package fr.ird.observe.services.entity; - -import com.google.common.base.Preconditions; -import com.google.common.base.Predicate; -import com.google.common.base.Predicates; -import com.google.common.collect.Maps; -import fr.ird.observe.entities.longline.TripLongline; -import fr.ird.observe.entities.referentiel.Person; -import fr.ird.observe.entities.referentiel.Persons; -import fr.ird.observe.entities.referentiel.ReferenceEntities; -import fr.ird.observe.entities.referentiel.ReferenceEntity; -import fr.ird.observe.entities.referentiel.Species; -import fr.ird.observe.entities.referentiel.SpeciesLists; -import fr.ird.observe.entities.referentiel.Vessel; -import fr.ird.observe.entities.referentiel.Vessels; -import fr.ird.observe.entities.seine.ObjectObservedSpecies; -import fr.ird.observe.entities.seine.ObjectSchoolEstimate; -import fr.ird.observe.entities.seine.SchoolEstimate; -import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.services.dto.IdDto; -import org.nuiton.topia.persistence.TopiaEntity; - -import java.util.Map; - -/** - * FIXME Ca sert à quoi? - * - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public class ObserveEntitiesFilters { - - protected static Map<Class<? extends TopiaEntity>, Map<String, EntitiesSet>> ENTITIES_SETS = null; - - protected static <P extends TopiaEntity, C extends TopiaEntity> void addFilter( - Class<P> parentType, - Class<C> propertyType, - String propertyName, - Predicate<C> filter) { - - if (ReferenceEntity.class.isAssignableFrom(propertyType)) { - - filter = Predicates.and(filter, (Predicate<C>) ReferenceEntities.newEnablePredicate()); - - } - - EntitiesSet<C> entitiesSet = new UniverseEntitiesSet<C>(propertyType, filter); - - addFilter(parentType, propertyName, entitiesSet); - - } - - protected static <P extends TopiaEntity, C extends TopiaEntity> void addFilter( - Class<P> parentType, - String propertyName, - EntitiesSet<C> entitiesSet) { - - Map<String, EntitiesSet> entitiesSetByProperty = ENTITIES_SETS.get(parentType); - - if (entitiesSetByProperty == null) { - entitiesSetByProperty = Maps.newHashMap(); - ENTITIES_SETS.put(parentType, entitiesSetByProperty); - } - - entitiesSetByProperty.put(propertyName, entitiesSet); - - } - - public static <P extends TopiaEntity, C extends TopiaEntity, D extends IdDto> ObserveEntityFilter<P, C, D> getFilter( - Class<P> parentType, - Class<C> propertyType, - Class<D> dtoType, - String propertyName) { - - Preconditions.checkNotNull(parentType, "Parent type is required"); - Preconditions.checkNotNull(propertyType, "Property type is required"); - Preconditions.checkNotNull(dtoType, "DTO type is required"); - Preconditions.checkNotNull(propertyName, "Property name is required"); - - if (ENTITIES_SETS == null) { - init(); - } - - EntitiesSet<C> entitiesSet = null; - - Map<String, EntitiesSet> filterByProperty = ENTITIES_SETS.get(parentType); - - if (filterByProperty != null) { - entitiesSet = (EntitiesSet<C>) filterByProperty.get(propertyName); - } - - ObserveEntityFilter<P, C, D> observeEntityFilter; - - if (entitiesSet == null) { - - if (ReferenceEntity.class.isAssignableFrom(propertyType)) { - - entitiesSet = new UniverseEntitiesSet<C>(propertyType, (Predicate<C>) ReferenceEntities.newEnablePredicate()); - - } else { - - entitiesSet = new UniverseEntitiesSet<C>(propertyType); - - } - - observeEntityFilter = new ObserveEntityFilter<P, C, D>(parentType, propertyType, dtoType, null, entitiesSet); - - } else { - - observeEntityFilter = new ObserveEntityFilter<P, C, D>(parentType, propertyType, dtoType, propertyName, entitiesSet); - } - - return observeEntityFilter; - - } - - public static void init() { - ENTITIES_SETS = Maps.newHashMap(); - // TripSeine - addFilter(TripSeine.class, Person.class, TripSeine.PROPERTY_CAPTAIN, Persons.newCaptainPredicate()); - addFilter(TripSeine.class, Person.class, TripSeine.PROPERTY_OBSERVER, Persons.newObserverPredicate()); - addFilter(TripSeine.class, Person.class, TripSeine.PROPERTY_DATA_ENTRY_OPERATOR, Persons.newDataEntryOperatorPredicate()); - addFilter(TripSeine.class, Vessel.class, TripSeine.PROPERTY_VESSEL, Vessels.newVesselSeinePredicate()); - - // TripLongLine - addFilter(TripLongline.class, Person.class, TripLongline.PROPERTY_CAPTAIN, Persons.newCaptainPredicate()); - addFilter(TripLongline.class, Person.class, TripLongline.PROPERTY_OBSERVER, Persons.newObserverPredicate()); - addFilter(TripLongline.class, Person.class, TripLongline.PROPERTY_DATA_ENTRY_OPERATOR, Persons.newDataEntryOperatorPredicate()); - addFilter(TripLongline.class, Vessel.class, TripLongline.PROPERTY_VESSEL, Vessels.newVesselLonglinePredicate()); - - // ObjectSchoolEstimate - addFilter(ObjectSchoolEstimate.class, - ObjectSchoolEstimate.PROPERTY_SPECIES, - new SpeciesListEntitiesSet(ReferenceEntities.<Species>newEnablePredicate(), SpeciesLists.SPECIES_LIST_SEINE_OBJECT_SCHOOL_ESTIMATE_ID)); - - addFilter(ObjectObservedSpecies.class, - ObjectObservedSpecies.PROPERTY_SPECIES, - new SpeciesListEntitiesSet(ReferenceEntities.<Species>newEnablePredicate(), SpeciesLists.SPECIES_LIST_SEINE_OBJECT_OBSERVED_SPECIES_ID)); - - addFilter(SchoolEstimate.class, - SchoolEstimate.PROPERTY_SPECIES, - new SpeciesListOceanEntitiesSet(ReferenceEntities.<Species>newEnablePredicate(), SpeciesLists.SPECIES_LIST_SEINE_SCHOOL_ESTIMATE_ID)); - - } - -} diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/ObserveEntityFilter.java b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/ObserveEntityFilter.java deleted file mode 100644 index ff5dbcd..0000000 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/ObserveEntityFilter.java +++ /dev/null @@ -1,73 +0,0 @@ -package fr.ird.observe.services.entity; - -import fr.ird.observe.services.dto.IdDto; -import org.nuiton.topia.persistence.TopiaEntity; - -/** - * FIXME Ca sert à quoi? - * - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public class ObserveEntityFilter<P extends TopiaEntity, C extends TopiaEntity, D extends IdDto> { - - protected final Class<P> parentType; - - protected final Class<C> entityType; - - protected final Class<D> dtoType; - - protected final String propertyName; - - protected final EntitiesSet<C> entitiesSet; - - public ObserveEntityFilter(Class<P> parentType, Class<C> entityType, Class<D> dtoType, String propertyName, EntitiesSet<C> entitiesSet) { - this.parentType = parentType; - this.entityType = entityType; - this.dtoType = dtoType; - this.propertyName = propertyName; - this.entitiesSet = entitiesSet; - } - - public Class<P> getParentType() { - return parentType; - } - - public Class<C> getEntityType() { - return entityType; - } - - public Class<D> getDtoType() { - return dtoType; - } - - public String getPropertyName() { - return propertyName; - } - - public EntitiesSet<C> getEntitiesSet() { - return entitiesSet; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - ObserveEntityFilter<?, ?, ?> filter = (ObserveEntityFilter<?, ?, ?>) o; - - if (!parentType.equals(filter.parentType)) return false; - if (!entityType.equals(filter.entityType)) return false; - if (!dtoType.equals(filter.dtoType)) return false; - return !(propertyName != null ? !propertyName.equals(filter.propertyName) : filter.propertyName != null); - - } - - @Override - public int hashCode() { - int result = parentType.hashCode(); - result = 31 * result + entityType.hashCode(); - result = 31 * result + dtoType.hashCode(); - result = 31 * result + (propertyName != null ? propertyName.hashCode() : 0); - return result; - } -} diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListEntitiesSet.java b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListEntitiesSet.java index a4d6ebc..f191f76 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListEntitiesSet.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListEntitiesSet.java @@ -1,13 +1,11 @@ package fr.ird.observe.services.entity; -import com.google.common.base.Predicate; import fr.ird.observe.ObserveTopiaPersistenceContext; +import fr.ird.observe.entities.referentiel.ReferenceEntities; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.SpeciesList; import fr.ird.observe.entities.referentiel.SpeciesListTopiaDao; -import java.util.Map; - /** * FIXME Ca sert à quoi? * @@ -15,12 +13,13 @@ import java.util.Map; */ public class SpeciesListEntitiesSet extends EntitiesSet<Species> { + /** + * L'id de la liste d'espèces à utiliser. + */ protected final String speciesListId; - protected final Predicate<Species> filter; - - public SpeciesListEntitiesSet(Predicate<Species> filter, String speciesListId) { - this.filter = filter; + public SpeciesListEntitiesSet(String speciesListId) { + super(Species.class, ReferenceEntities.<Species>newEnablePredicate()); this.speciesListId = speciesListId; } @@ -31,8 +30,4 @@ public class SpeciesListEntitiesSet extends EntitiesSet<Species> { return speciesList.getSpecies(); } - @Override - protected Predicate<Species> getFilter(Map<String, Object> requestContext) { - return filter; - } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListOceanEntitiesSet.java b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListOceanEntitiesSet.java index 2f7468a..74505c7 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListOceanEntitiesSet.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/SpeciesListOceanEntitiesSet.java @@ -15,24 +15,21 @@ import java.util.Map; */ public class SpeciesListOceanEntitiesSet extends SpeciesListEntitiesSet { - public SpeciesListOceanEntitiesSet(Predicate<Species> filter, String speciesListId) { - super(filter, speciesListId); + public SpeciesListOceanEntitiesSet(String speciesListId) { + super(speciesListId); } @Override protected Predicate<Species> getFilter(Map<String, Object> requestContext) { + Predicate<Species> filter = super.getFilter(requestContext); Ocean ocean = (Ocean) requestContext.get(Species.PROPERTY_OCEAN); if (ocean != null) { - Predicate<Species> oceanFilter = Species2.newSpeciesByOceanPredicate(ocean); - if (filter == null) { - filter = oceanFilter; - } else { - filter = Predicates.and(filter, oceanFilter); - } + Predicate<Species> oceanFilter = Species2.newSpeciesByOceanPredicate(ocean); + filter = Predicates.and(filter, oceanFilter); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/UniverseEntitiesSet.java b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/UniverseEntitiesSet.java deleted file mode 100644 index f0e0953..0000000 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/UniverseEntitiesSet.java +++ /dev/null @@ -1,41 +0,0 @@ -package fr.ird.observe.services.entity; - -import com.google.common.base.Predicate; -import fr.ird.observe.ObserveTopiaPersistenceContext; -import org.nuiton.topia.persistence.TopiaDao; -import org.nuiton.topia.persistence.TopiaEntity; - -import java.util.Map; - -/** - * FIXME Ca sert à quoi? - * - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public class UniverseEntitiesSet<E extends TopiaEntity> extends EntitiesSet<E> { - - protected final Class<E> entityClass; - - protected final Predicate<E> filter; - - public UniverseEntitiesSet(Class<E> entityClass, Predicate<E> filter) { - this.filter = filter; - this.entityClass = entityClass; - } - - public UniverseEntitiesSet(Class<E> entityClass) { - this.filter = null; - this.entityClass = entityClass; - } - - protected Iterable<E> getEntitiesSetBase(ObserveTopiaPersistenceContext persistenceContext) { - TopiaDao<E> dao = persistenceContext.getDao(entityClass); - return dao.findAll(); - } - - @Override - protected Predicate<E> getFilter(Map<String, Object> requestContext) { - return filter; - } - -} diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java b/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java index 16395c2..22a5b6b 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java @@ -63,7 +63,10 @@ public class ApplicationContextResource implements TestRule { private Path temporaryDirectoryRoot; + private final ObserveSpeciesListConfiguration speciesListConfiguration; + public ApplicationContextResource() { + this.speciesListConfiguration = ObserveSpeciesListConfiguration.newDefaultConfiguration(); this.serviceFactory = new ObserveServiceFactoryTopia() { @Override @@ -84,6 +87,7 @@ public class ApplicationContextResource implements TestRule { Locale.FRANCE, ReferentialLocale.FR, temporaryDirectoryRoot.toFile(), + speciesListConfiguration, dataSourceConfiguration ); return serviceFactory.newService(observeServiceInitializer, serviceType); @@ -94,6 +98,7 @@ public class ApplicationContextResource implements TestRule { Locale.FRANCE, ReferentialLocale.FR, temporaryDirectoryRoot.toFile(), + speciesListConfiguration, dataSourceConnection ); return serviceFactory.newService(observeServiceInitializer, serviceType); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java index 94ea9a9..065ac30 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java @@ -6,6 +6,7 @@ import fr.ird.observe.services.ObserveServiceContextTopia; import fr.ird.observe.services.ObserveServiceContextTopiaTaiste; import fr.ird.observe.services.ObserveServiceFactoryTopia; import fr.ird.observe.services.ObserveServiceInitializer; +import fr.ird.observe.services.ObserveSpeciesListConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; @@ -25,6 +26,8 @@ import java.io.File; import java.util.Locale; /** + * FIXME Ca sert à quoi ? et je comprends pas le mot rigth ? + * * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @Ignore @@ -81,13 +84,12 @@ public class RigthTest { } - - public <S extends ObserveService> S newService(ObserveDataSourceConnection dataSourceConnection, Class<S> serviceType) { ObserveServiceInitializer observeServiceInitializer = ObserveServiceInitializer.create( Locale.FRANCE, ReferentialLocale.FR, temporaryDirectoryRoot, + ObserveSpeciesListConfiguration.newDefaultConfiguration(), dataSourceConnection ); return serviceFactory.newService(observeServiceInitializer, serviceType); @@ -98,6 +100,7 @@ public class RigthTest { Locale.FRANCE, ReferentialLocale.FR, temporaryDirectoryRoot, + ObserveSpeciesListConfiguration.newDefaultConfiguration(), dataSourceConfiguration ); return serviceFactory.newService(observeServiceInitializer, serviceType); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java index f44daa5..c79d232 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java @@ -150,7 +150,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertTrue(types.contains(VesselDto.class)); Assert.assertTrue(types.contains(OceanDto.class)); Assert.assertTrue(types.contains(HarbourDto.class)); - Assert.assertEquals(formDto.sizeLabels(), 6); + Assert.assertEquals(formDto.sizeLabels(), 7); for (ReferenceSetDto referenceSetDto : formDto.getLabels()) { @@ -191,7 +191,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertTrue(types.contains(VesselDto.class)); Assert.assertTrue(types.contains(OceanDto.class)); Assert.assertTrue(types.contains(HarbourDto.class)); - Assert.assertEquals(formDto.sizeLabels(), 6); + Assert.assertEquals(formDto.sizeLabels(), 7); for (ReferenceSetDto referenceSetDto : formDto.getLabels()) { @@ -230,7 +230,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertTrue(types.contains(VesselDto.class)); Assert.assertTrue(types.contains(OceanDto.class)); Assert.assertTrue(types.contains(HarbourDto.class)); - Assert.assertEquals(formDto.sizeLabels(), 6); + Assert.assertEquals(formDto.sizeLabels(), 7); for (ReferenceSetDto referenceSetDto : formDto.getLabels()) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit b039355b90dc8c34ccaac6ab063435179673ae9a Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 19 01:08:36 2015 +0200 Correction de la template de résumé d'ouverture de base --- .../src/main/resources/ftl/dataSourceConnectionReport_fr.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl b/observe-application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl index 5209f90..e47bc7e 100644 --- a/observe-application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl +++ b/observe-application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl @@ -43,7 +43,7 @@ <h3>Emplacement de la base locale :</h3> <ul> - <li>${h2config.directory.absolutePath}</li> + <li>${h2Config.directory.absolutePath}</li> </ul> <#elseif dbMode.name() == "CREATE_LOCAL"> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 6c2e0fae31833d7fd21f633e2311d79bd25cb8ec Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 19 01:09:10 2015 +0200 Ajout d'un equals sur IdDto sinon on ne compare que des références mémoire --- .../src/main/java/fr/ird/observe/services/dto/IdDto.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDto.java index 0e32fd7..3b65566 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDto.java @@ -24,6 +24,8 @@ package fr.ird.observe.services.dto; import org.apache.commons.lang3.StringUtils; +import java.util.Objects; + public abstract class IdDto extends AbstractIdDto { private static final long serialVersionUID = 1L; @@ -36,4 +38,17 @@ public abstract class IdDto extends AbstractIdDto { return !isPersisted(); } + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof AbstractIdDto)) return false; + AbstractIdDto that = (AbstractIdDto) o; + return Objects.equals(id, that.id); + } + + @Override + public int hashCode() { + return Objects.hash(id); + } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 7c241e8da1d78c846c483c8ed6a8c935b8433689 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 19 01:25:20 2015 +0200 Amélioration code: ne pas recalculer si une annotation est présente plusieurs fois --- .../observe/services/ObserveServiceFactoryTopia.java | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java index 9220b3f..4b06b7b 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java @@ -194,19 +194,23 @@ public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport { } - if (method.isAnnotationPresent(ReadDataPermission.class) - || method.isAnnotationPresent(WriteDataPermission.class) - || method.isAnnotationPresent(ReadReferentialPermission.class) - || method.isAnnotationPresent(WriteReferentialPermission.class)) { + boolean readDataPermissionPresent = method.isAnnotationPresent(ReadDataPermission.class); + boolean writeDataPermissionPresent = method.isAnnotationPresent(WriteDataPermission.class); + boolean readReferentialPermissionPresent = method.isAnnotationPresent(ReadReferentialPermission.class); + boolean writeReferentialPermissionPresent = method.isAnnotationPresent(WriteReferentialPermission.class); + if (readDataPermissionPresent + || writeDataPermissionPresent + || readReferentialPermissionPresent + || writeReferentialPermissionPresent) { if (serviceContext.withDataSourceConnection()) { ObserveDataSourceConnectionTopia dataSourceConnection = serviceContext.getDataSourceConnection(); - if (method.isAnnotationPresent(ReadDataPermission.class) && !dataSourceConnection.canReadData() - || method.isAnnotationPresent(WriteDataPermission.class) && !dataSourceConnection.canWriteData() - || method.isAnnotationPresent(ReadReferentialPermission.class) && !dataSourceConnection.canReadReferential() - || method.isAnnotationPresent(WriteReferentialPermission.class) && !dataSourceConnection.canWriteReferential()) { + if (readDataPermissionPresent && !dataSourceConnection.canReadData() + || writeDataPermissionPresent && !dataSourceConnection.canWriteData() + || readReferentialPermissionPresent && !dataSourceConnection.canReadReferential() + || writeReferentialPermissionPresent && !dataSourceConnection.canWriteReferential()) { throw new UnauthorizedException(method.getClass().getCanonicalName(), method.getName()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 087444cbc26db7940625c723c34e94d9236a9a7e Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 19 01:54:26 2015 +0200 Correction du chargement des double liste (mais non fini) --- .../main/java/fr/ird/observe/ui/content/ContentUIInitializer.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java index e699d43..0cf03a7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java @@ -682,7 +682,8 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E if (formDto != null && ReferentialDto.class.isAssignableFrom(dtoClass)) { - ReferenceSetDto<E> referenceSetDto = formDto.getReferenceSetDto(dtoClass); + //FIXME Bien vérifier que cela fonctionne + ReferenceSetDto<E> referenceSetDto = formDto.getReferenceSetDto(dtoClass, list.getModel().getProperty()); data = new ArrayList<>(referenceSetDto.getReference()); @@ -697,7 +698,11 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E Decorator<ReferenceDto> decorator = tx.getDecorator(ReferenceDto.class, dtoClass.getSimpleName()); DecoratorUtil.sort((JXPathDecorator<ReferenceDto>) decorator, data, 0); + //FIXME A finir (bien vérifier que la sélection n'est plus dans l'univers) + List selected = list.getModel().getSelected(); list.setUniverse(data); + list.setSelected(selected); + list.putClientProperty("data", data); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 0ac05ee189779f01134c91f28c1c8a28a51ff998 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 19 01:55:38 2015 +0200 Charger la liste des systèmes observés dans le FormDto --- .../service/seine/ActivitySeineObservedSystemServiceTopia.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java index 054d6da..215e882 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java @@ -25,6 +25,8 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.ReferenceTypeName; +import fr.ird.observe.services.dto.referential.seine.ObservedSystemDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; @@ -49,7 +51,11 @@ public class ActivitySeineObservedSystemServiceTopia extends ObserveServiceTopia ActivitySeine activitySeine = loadEntity(ActivitySeineObservedSystemDto.class, ActivitySeine.class, activitySeineId); - FormDto<ActivitySeineObservedSystemDto> form = entityToEditFormDto(ActivitySeineObservedSystemDto.class, ActivitySeine.class, activitySeine); + //FIXME Voir s'il faut aussi le faire pour le read (je ne peux plus créer de base... donc pas finir de tester) + FormDto<ActivitySeineObservedSystemDto> form = entityToEditFormDto(ActivitySeineObservedSystemDto.class, + ActivitySeine.class, + activitySeine, + new ReferenceTypeName(ActivitySeineObservedSystemDto.class, ObservedSystemDto.class, ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM)); return form; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 2e12f690bfef8cd9d4e06983171e95c04cca2021 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 19 01:56:35 2015 +0200 Utilisation dernière version de H2 mais j'ai l'impression qu'elle est buggée) --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bf54549..822293c 100644 --- a/pom.xml +++ b/pom.xml @@ -467,7 +467,8 @@ <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <!-- tc20150811 On ne pleut pas utiliser une version plus récente, le format n'est pas compatible --> - <version>1.3.175</version> + <!-- FIXME Hum je ne suis pas sur que la 176 soit ok. --> + <version>1.3.176</version> </dependency> <dependency> <groupId>postgresql</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 1a77e25e907321c2a64f232414ccab5a7decb476 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 19 01:57:48 2015 +0200 Changement de la configuration h2 mais sans conviction --- .../main/java/fr/ird/observe/ObserveTopiaConfigurationFactory.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaConfigurationFactory.java b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaConfigurationFactory.java index be29942..116d6b7 100644 --- a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaConfigurationFactory.java +++ b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaConfigurationFactory.java @@ -158,6 +158,13 @@ public class ObserveTopiaConfigurationFactory { ); topiaConfiguration.addDeclaredService(ObserveTopiaApplicationContext.MIGRATION_SERVICE_NAME, ObserveMigrationEngine.class, migrationServiceConfiguration); topiaConfiguration.addDeclaredService(ObserveTopiaApplicationContext.REPLICATION_SERVICE_NAME, TopiaReplicationServiceImpl.class); + if (h2Configuration) { + //FIXME J'ai mis ça mais sans conviction car y'a d'autres pb à régler et c3p0 n'est peut-être pas la cause + // On ne veut pas utiliser c3pO dans ce cas + topiaConfiguration.setHibernateExtraConfiguration( + ImmutableMap.of("hibernate.connection.provider_class", "org.nuiton.topia.persistence.internal.TopiaConnectionProvider") + ); + } return topiaConfiguration; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit ba4b82287e618c83bce0dd029d429ddc83876bb1 Merge: d07cdbe 1a77e25 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 19 01:57:51 2015 +0200 Revue de code (retour sur develop pour que ça avance) Merge branch 'feature/correction + revue de code' into develop .../ObserveSwingApplicationConfigOption.java | 17 +- .../fr/ird/observe/db/ObserveSwingDataSource.java | 16 +- .../observe/entities/tripMap/TripMapPointType.java | 4 +- .../observe/ui/content/ContentUIInitializer.java | 7 +- .../ui/content/ref/impl/longline/HookSizeUI.jaxx | 10 +- .../ui/content/ref/impl/longline/HookTypeUI.jaxx | 10 +- .../ui/content/table/ContentTableUIHandler.java | 4 +- .../ftl/dataSourceConnectionReport_fr.ftl | 2 +- .../observe-application-swing_en_GB.properties | 14 +- .../observe-application-swing_es_ES.properties | 14 +- .../observe-application-swing_fr_FR.properties | 16 +- .../application/web/ObserveWebMotionFilter.java | 18 ++- .../web/request/ObserveWebRequestContext.java | 7 + .../observe/ObserveTopiaConfigurationFactory.java | 7 + .../ird/observe/entities/constants/GearType.java | 4 +- .../seine/NonTargetCatchComputedValueSource.java | 6 +- .../entities/constants/seine/Ownership.java | 6 +- .../entities/constants/seine/SchoolType.java | 6 +- .../seine/TypeTransmittingBuoyOperation.java | 10 +- .../entities/referentiel/ReferenceEntities.java | 9 +- .../ird/observe/entities/referentiel/Species2.java | 2 +- .../observe/entities/referentiel/SpeciesLists.java | 15 -- .../i18n/observe-entities_en_GB.properties | 74 ++++----- .../i18n/observe-entities_es_ES.properties | 42 ++--- .../i18n/observe-entities_fr_FR.properties | 42 ++--- .../services/ObserveServiceInitializer.java | 22 +++ .../services/ObserveSpeciesListConfiguration.java | 149 +++++++++++++++++ .../services/service/DataSourceService.java | 2 +- ...bserveDataSourceConfigurationRestConstants.java | 2 + .../java/fr/ird/observe/services/dto/FormDto.java | 12 +- .../java/fr/ird/observe/services/dto/IdDto.java | 15 ++ .../services/dto/constants/ReferenceStatus.java | 4 +- .../services/dto/constants/TripMapPointType.java | 4 +- .../services/ObserveServiceFactoryRest.java | 7 +- .../fr/ird/observe/services/TestClassResource.java | 2 + .../fr/ird/observe/services/ObserveJdbcHelper.java | 2 + .../observe/services/ObserveSecurityHelper.java | 2 + .../services/ObserveServiceContextTopia.java | 12 ++ .../services/ObserveServiceFactoryTopia.java | 20 ++- .../ird/observe/services/ObserveServiceTopia.java | 74 ++++----- .../ObserveTopiaApplicationContextFactory.java | 2 + .../services/builder/DtoToEntityBuilder.java | 2 + .../services/builder/EntityToDtoBuilder.java | 2 + .../builder/EntityToReferenceDtoBuilder.java | 2 + .../EntityToReferentialReferenceDtoBuilder.java | 2 + .../observe/services/dto/ObserveDtoBinders.java | 2 + .../observe/services/dto/ReferenceTypeName.java | 18 +++ .../ird/observe/services/entity/EntitiesSet.java | 31 +++- .../services/entity/EntitiesSetFactory.java | 177 +++++++++++++++++++++ .../services/entity/ObserveEntitiesFilters.java | 143 ----------------- .../services/entity/ObserveEntityFilter.java | 71 --------- .../services/entity/SpeciesListEntitiesSet.java | 19 +-- .../entity/SpeciesListOceanEntitiesSet.java | 15 +- .../services/entity/UniverseEntitiesSet.java | 39 ----- .../ConsolidateActivitySeineDataResultBuilder.java | 3 + .../ActivitySeineObservedSystemServiceTopia.java | 8 +- .../services/ApplicationContextResource.java | 5 + .../fr/ird/observe/services/service/RigthTest.java | 7 +- .../service/seine/TripSeineServiceTopiaTest.java | 6 +- pom.xml | 3 +- 60 files changed, 721 insertions(+), 527 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm