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 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 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 | 65 ++++++++ .../RouteDto-n1-create-warning-validation.xml | 59 ++++++++ .../seine/RouteDto-n1-update-error-validation.xml | 111 ++++++++++++++ .../RouteDto-n1-update-warning-validation.xml | 116 ++++++++++++++ .../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, 868 insertions(+), 622 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.