This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 3e1e193463ed4e330447c241f47a4d99e2e07771 Merge: 51036b6 081446b Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 2 12:24:42 2016 +0200 Fixes #8482 Merge branch 'feature/8482' into develop .../src/main/resources/validators.xml | 3 +- ...ivityLonglineDto-ui-create-error-validation.xml | 10 +- ...ivityLonglineDto-ui-update-error-validation.xml | 10 +- .../SetLonglineDto-ui-create-error-validation.xml | 148 ++++++++++++------ ...ActivitySeineDto-ui-create-error-validation.xml | 10 +- ...ActivitySeineDto-ui-update-error-validation.xml | 10 +- .../application-swing-validation_en_GB.properties | 6 + .../application-swing-validation_es_ES.properties | 6 + .../application-swing-validation_fr_FR.properties | 6 + .../src/test/resources/validators.xml | 1 + .../validators/QuadrantFieldDtoValidator.java | 54 +++++++ .../ui/content/impl/longline/SetLonglineUI.jaxx | 4 + .../ui/content/impl/longline/SetLonglineUI.jcss | 8 + .../i18n/application-swing_en_GB.properties | 1 - .../i18n/application-swing_es_ES.properties | 1 - .../i18n/application-swing_fr_FR.properties | 1 - .../src/main/resources/validators.xml | 14 ++ .../java/fr/ird/observe/entities/Activity.java | 6 +- .../main/java/fr/ird/observe/entities/GPSAble.java | 59 -------- .../java/fr/ird/observe/entities/ObserveSet.java | 2 - .../entities/longline/ActivityLonglineImpl.java | 52 +++---- .../observe/entities/longline/SetLonglineImpl.java | 11 -- .../observe/entities/seine/ActivitySeineImpl.java | 62 +++----- .../ird/observe/entities/seine/SetSeineImpl.java | 4 - entities/src/main/xmi/observe-seine.zargo | Bin 84619 -> 83234 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 67306 -> 67504 bytes .../ActivityLongline-service-error-validation.xml | 12 +- .../SetLongline-service-error-validation.xml | 56 ++----- .../ActivitySeine-service-error-validation.xml | 12 +- .../seine/Route-service-error-validation.xml | 2 +- .../services-topia-validation_en_GB.properties | 10 +- .../services-topia-validation_es_ES.properties | 10 +- .../services-topia-validation_fr_FR.properties | 10 +- .../src/main/resources/xwork.xml | 7 + .../src/test/resources/validators.xml | 1 + .../topia/validators/QuadrantFieldValidator.java | 53 +++++++ .../topia/binder/data/ActivityLonglineBinder.java | 1 - .../topia/binder/data/ActivitySeineBinder.java | 1 - .../service/actions/validate/ObserveValidator.java | 166 --------------------- .../validate/ServiceValidationException.java | 13 ++ .../actions/validate/ValidateServiceTopia.java | 130 ++++++++++------ .../actions/validate/ValidationDataContext.java | 65 ++++++-- .../validate/ValidationMessageDetector.java | 7 +- .../service/actions/validate/ValidatorsMap.java | 54 ++----- .../longline/ActivityLonglineServiceTopia.java | 17 +-- .../service/seine/ActivitySeineServiceTopia.java | 17 +-- 46 files changed, 508 insertions(+), 625 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.