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 831b535 ajout d'un Dto pour les resultat de methode save. new 7c2189f mise en place de la validation de DTO (refs #7591) new b06e4ad migration de l'ecran de route (refs #7591) new c13f56e Merge branch 'feature/7591' into develop The 3 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 c13f56ed1f1641ee139c55510fabe27f30837814 Merge: 831b535 b06e4ad Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Oct 9 08:57:10 2015 +0200 Merge branch 'feature/7591' into develop commit b06e4ad0836465df59de7ddfd08e772a7abaad30 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Oct 9 08:56:45 2015 +0200 migration de l'ecran de route (refs #7591) commit 7c2189f74e2fbae5a24bc62acfcc681ca8a1a68f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Oct 9 08:46:55 2015 +0200 mise en place de la validation de DTO (refs #7591) Summary of changes: observe-application-swing/pom.xml | 2 +- .../java/fr/ird/observe/ObserveServiceHelper.java | 4 +- .../observe/ObserveSwingApplicationContext.java | 11 +- .../business/ObserveApplicationContext.java | 8 +- .../fr/ird/observe/business/gps/GpsPoints.java | 22 +++ .../fr/ird/observe/db/ObserveSwingDataSource.java | 13 ++ .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 2 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 4 +- .../ui/admin/validate/ValidateConfigUI.jaxx | 2 +- .../observe/ui/admin/validate/ValidateModel.java | 6 +- .../ui/admin/validate/ValidateUIHandler.java | 8 +- .../observe/ui/content/ContentUIInitializer.java | 2 +- .../open/impl/longline/TripLonglineUIHandler.java | 4 +- .../ui/content/open/impl/seine/RouteUI.jaxx | 3 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 136 +++-------------- .../ui/content/open/impl/seine/RouteUIModel.java | 24 +-- .../open/impl/seine/TripSeineUIHandler.java | 2 +- .../ui/content/ref/ContentReferenceUIHandler.java | 2 +- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 2 +- .../fr/ird/observe/ui/tree/RouteSeineNode.java | 2 +- .../validation/ObserveSwingValidator.java | 2 +- .../validation/ValidationContext.java | 167 +++------------------ .../validation/ValidationMessageDetector.java | 2 +- .../validation/ValidationModelMode.java | 2 +- .../validation/ValidationService.java | 7 +- .../{business => }/validation/ValidatorsMap.java | 2 +- .../dto/AbstractEspeceFieldDtoValidator.java | 16 +- .../dto/ActivityDebutDePecheSaneDtoValidator.java | 50 +++--- .../dto/ActivityFinDePecheSaneDtoValidator.java | 51 ++++--- .../dto/ActivityFinDeVeilleExistsDtoValidator.java | 28 ++-- .../dto/ActivitySimpleSpeedDtoValidator.java | 22 +-- .../validator/dto/ActivitySpeedDtoValidator.java | 26 ++-- .../dto/RouteActivitysFieldDtoValidator.java | 41 +++-- .../dto/SetLonglineUniqueHomeIdDtoValidator.java | 27 ++-- .../dto/SetLonglineUniqueNumberDtoValidator.java | 67 ++++----- .../dto/SpeciesLengthFieldDtoValidator.java | 10 +- .../dto/SpeciesWeightFieldDtoValidator.java | 10 +- .../dto/VesselActivityFieldDtoValidator.java | 137 +++++++++-------- .../seine/RouteDto-n1-create-error-validation.xml | 6 +- .../RouteDto-n1-create-warning-validation.xml | 2 +- .../seine/RouteDto-n1-update-error-validation.xml | 16 +- .../RouteDto-n1-update-warning-validation.xml | 6 +- .../src/main/resources/validators.xml | 38 +++-- .../controller/v1/DataSourceServiceController.java | 6 + .../v1/longline/TripLonglineServiceController.java | 2 +- .../v1/seine/RouteServiceController.java | 5 + .../v1/seine/TripSeineServiceController.java | 2 +- .../src/main/resources/validators.xml | 27 ++-- .../CollectionFieldExpressionValidator2.java | 2 +- .../validator}/CollectionUniqueKeyValidator2.java | 2 +- .../ObserveCollectionUniqueKeyValidator.java | 2 +- .../entities}/AbstractEspeceFieldValidator.java | 2 +- .../ActivityDebutDePecheSaneValidator.java | 2 +- .../entities}/ActivityFinDePecheSaneValidator.java | 2 +- .../ActivityFinDeVeilleExistsValidator.java | 2 +- .../entities}/ActivitySimpleSpeedValidator.java | 2 +- .../entities}/ActivitySpeedValidator.java | 2 +- .../entities}/RouteActivitysFieldValidator.java | 2 +- .../SetLonglineUniqueHomeIdValidator.java | 2 +- .../SetLonglineUniqueNumberValidator.java | 2 +- .../entities}/SpeciesLengthFieldValidator.java | 2 +- .../entities}/SpeciesWeightFieldValidator.java | 2 +- .../entities}/VesselActivityFieldValidator.java | 2 +- .../entities}/ActivitySeineSpeedValidatorTest.java | 2 +- .../services/service/DataSourceService.java | 6 + .../service/longline/TripLonglineService.java | 2 +- .../services/service/seine/RouteService.java | 4 +- .../services/service/seine/TripSeineService.java | 2 +- .../services/dto/{ => result}/SaveResultDtos.java | 2 +- .../src/main/xmi/observe-services-dto-common.zargo | Bin 42247 -> 42474 bytes .../main/xmi/observe-services-dto-seine.properties | 1 + .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59456 -> 59881 bytes .../services/dto/ObserveDtosInitializer.java | 16 +- .../services/service/DataSourceServiceTopia.java | 14 ++ .../service/longline/TripLonglineServiceTopia.java | 4 +- .../services/service/seine/RouteServiceTopia.java | 44 +++++- .../service/seine/TripSeineServiceTopia.java | 4 +- .../service/seine/TripSeineServiceTopiaTest.java | 2 +- 78 files changed, 532 insertions(+), 637 deletions(-) rename observe-application-swing/src/main/java/fr/ird/observe/{business => }/validation/ObserveSwingValidator.java (99%) rename observe-application-swing/src/main/java/fr/ird/observe/{business => }/validation/ValidationContext.java (52%) rename observe-application-swing/src/main/java/fr/ird/observe/{business => }/validation/ValidationMessageDetector.java (99%) rename observe-application-swing/src/main/java/fr/ird/observe/{business => }/validation/ValidationModelMode.java (98%) rename observe-application-swing/src/main/java/fr/ird/observe/{business => }/validation/ValidationService.java (97%) rename observe-application-swing/src/main/java/fr/ird/observe/{business => }/validation/ValidatorsMap.java (98%) copy observe-entities-validation/src/main/java/fr/ird/observe/business/validation/field/AbstractEspeceFieldValidator.java => observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/AbstractEspeceFieldDtoValidator.java (93%) copy observe-entities-validation/src/main/java/fr/ird/observe/business/validation/field/ActivityDebutDePecheSaneValidator.java => observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivityDebutDePecheSaneDtoValidator.java (78%) copy observe-entities-validation/src/main/java/fr/ird/observe/business/validation/field/ActivityFinDePecheSaneValidator.java => observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivityFinDePecheSaneDtoValidator.java (79%) copy observe-entities-validation/src/main/java/fr/ird/observe/business/validation/field/ActivityFinDeVeilleExistsValidator.java => observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivityFinDeVeilleExistsDtoValidator.java (85%) copy observe-entities-validation/src/main/java/fr/ird/observe/business/validation/field/ActivitySimpleSpeedValidator.java => observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivitySimpleSpeedDtoValidator.java (89%) copy observe-entities-validation/src/main/java/fr/ird/observe/business/validation/field/ActivitySpeedValidator.java => observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivitySpeedDtoValidator.java (90%) copy observe-entities-validation/src/main/java/fr/ird/observe/business/validation/field/RouteActivitysFieldValidator.java => observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/RouteActivitysFieldDtoValidator.java (78%) copy observe-entities-validation/src/main/java/fr/ird/observe/business/validation/field/SetLonglineUniqueHomeIdValidator.java => observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/SetLonglineUniqueHomeIdDtoValidator.java (71%) copy observe-entities-validation/src/main/java/fr/ird/observe/business/validation/field/SetLonglineUniqueNumberValidator.java => observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/SetLonglineUniqueNumberDtoValidator.java (54%) copy observe-entities-validation/src/main/java/fr/ird/observe/business/validation/field/SpeciesLengthFieldValidator.java => observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/SpeciesLengthFieldDtoValidator.java (78%) copy observe-entities-validation/src/main/java/fr/ird/observe/business/validation/field/SpeciesWeightFieldValidator.java => observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/SpeciesWeightFieldDtoValidator.java (78%) copy observe-entities-validation/src/main/java/fr/ird/observe/business/validation/field/VesselActivityFieldValidator.java => observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/VesselActivityFieldDtoValidator.java (77%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-n1-create-error-validation.xml (90%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-n1-create-warning-validation.xml (96%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-error-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-n1-update-error-validation.xml (84%) copy observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-warning-validation.xml => observe-application-swing/src/main/resources/fr/ird/observe/services/dto/seine/RouteDto-n1-update-warning-validation.xml (96%) copy {observe-entities-validation => observe-application-swing}/src/main/resources/validators.xml (65%) rename {observe-entities-validation => observe-application-web}/src/main/resources/validators.xml (80%) rename observe-entities-validation/src/main/java/fr/ird/observe/{business/validation/field => validation/validator}/CollectionFieldExpressionValidator2.java (98%) rename observe-entities-validation/src/main/java/fr/ird/observe/{business/validation/field => validation/validator}/CollectionUniqueKeyValidator2.java (96%) rename observe-entities-validation/src/main/java/fr/ird/observe/{business/validation/field => validation/validator}/ObserveCollectionUniqueKeyValidator.java (99%) rename observe-entities-validation/src/main/java/fr/ird/observe/{business/validation/field => validation/validator/entities}/AbstractEspeceFieldValidator.java (99%) rename observe-entities-validation/src/main/java/fr/ird/observe/{business/validation/field => validation/validator/entities}/ActivityDebutDePecheSaneValidator.java (99%) rename observe-entities-validation/src/main/java/fr/ird/observe/{business/validation/field => validation/validator/entities}/ActivityFinDePecheSaneValidator.java (99%) rename observe-entities-validation/src/main/java/fr/ird/observe/{business/validation/field => validation/validator/entities}/ActivityFinDeVeilleExistsValidator.java (99%) rename observe-entities-validation/src/main/java/fr/ird/observe/{business/validation/field => validation/validator/entities}/ActivitySimpleSpeedValidator.java (99%) rename observe-entities-validation/src/main/java/fr/ird/observe/{business/validation/field => validation/validator/entities}/ActivitySpeedValidator.java (99%) rename observe-entities-validation/src/main/java/fr/ird/observe/{business/validation/field => validation/validator/entities}/RouteActivitysFieldValidator.java (98%) rename observe-entities-validation/src/main/java/fr/ird/observe/{business/validation/field => validation/validator/entities}/SetLonglineUniqueHomeIdValidator.java (98%) rename observe-entities-validation/src/main/java/fr/ird/observe/{business/validation/field => validation/validator/entities}/SetLonglineUniqueNumberValidator.java (98%) rename observe-entities-validation/src/main/java/fr/ird/observe/{business/validation/field => validation/validator/entities}/SpeciesLengthFieldValidator.java (96%) rename observe-entities-validation/src/main/java/fr/ird/observe/{business/validation/field => validation/validator/entities}/SpeciesWeightFieldValidator.java (96%) rename observe-entities-validation/src/main/java/fr/ird/observe/{business/validation/field => validation/validator/entities}/VesselActivityFieldValidator.java (99%) rename observe-entities-validation/src/test/java/fr/ird/observe/{business/validation/field => validation/validator/entities}/ActivitySeineSpeedValidatorTest.java (98%) rename observe-services-model/src/main/java/fr/ird/observe/services/dto/{ => result}/SaveResultDtos.java (87%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.