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 f88c42c32bf75b434e8b3ecc28819ef27018c356 Merge: df70644 6e60cfc Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 2 10:18:59 2016 +0100 [PS] Saisie des échantillons de cible : modification de la gestion des types de taille (Fixes #8390) Merge branch 'feature/8390' into develop .../src/main/resources/log4j.properties | 2 +- .../src/main/resources/observe-log4j.properties | 2 +- .../swing/decoration/DecoratorService.java | 4 +- ...zeMeasureTypeDto-ui-create-error-validation.xml | 0 ...MeasureTypeDto-ui-create-warning-validation.xml | 0 ...zeMeasureTypeDto-ui-update-error-validation.xml | 0 ...MeasureTypeDto-ui-update-warning-validation.xml | 0 ...htMeasureTypeDto-ui-create-error-validation.xml | 0 ...MeasureTypeDto-ui-create-warning-validation.xml | 0 ...htMeasureTypeDto-ui-update-error-validation.xml | 0 ...MeasureTypeDto-ui-update-warning-validation.xml | 0 .../TargetLengthDto-ui-update-error-validation.xml | 18 ++++++ .../application-swing-validation_en_GB.properties | 3 + .../application-swing-validation_es_ES.properties | 3 + .../application-swing-validation_fr_FR.properties | 3 + .../validation/BeanValidatorDetectorTest.java | 4 +- .../swing/ui/actions/ShowConfigAction.java | 4 +- .../ref/impl/{longline => }/SizeMeasureTypeUI.jaxx | 8 +-- .../{longline => }/SizeMeasureTypeUIModel.java | 4 +- .../impl/{longline => }/WeightMeasureTypeUI.jaxx | 8 +-- .../{longline => }/WeightMeasureTypeUIModel.java | 4 +- .../impl/longline/CatchLonglineUIHandler.java | 4 +- .../impl/longline/SizeMeasuresTableModel.java | 2 +- .../impl/longline/WeightMeasuresTableModel.java | 2 +- .../content/table/impl/seine/TargetSampleUI.jaxx | 30 ++++------ .../content/table/impl/seine/TargetSampleUI.jcss | 24 ++++++-- .../table/impl/seine/TargetSampleUIHandler.java | 40 +++++++++++-- .../table/impl/seine/TargetSampleUIModel.java | 11 ++-- .../i18n/application-swing_en_GB.properties | 5 +- .../i18n/application-swing_es_ES.properties | 5 +- .../i18n/application-swing_fr_FR.properties | 5 +- .../DataSourceMigrationForVersion_5_1.java | 63 +++++++++++++++++++++ .../resources/db/3.5/traduction_attributes.csv | 2 +- .../V5_1_08_evol_8390_measure_type-H2.sql | 19 +++++++ .../V5_1_08_evol_8390_measure_type-PG.sql | 18 ++++++ entities/src/main/xmi/observe-common.zargo | Bin 37331 -> 37986 bytes entities/src/main/xmi/observe-longline.zargo | Bin 93635 -> 93649 bytes entities/src/main/xmi/observe-seine.zargo | Bin 83500 -> 85633 bytes .../observe/services/dto/AbstractReference.java | 2 +- .../ReferentialReferenceSetDefinitions.java | 4 +- .../request/ReferenceSetRequestDefinitions.java | 7 ++- .../dto/referential/ReferentialHelper.java | 8 +-- .../dto/referential/SizeMeasureTypeHelper.java | 58 +++++++++++++++++++ .../src/main/xmi/observe-services-dto-common.zargo | Bin 41934 -> 42563 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 67604 -> 67880 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59419 -> 59655 bytes services-dto/src/main/xmi/observe-services-dto.ini | 5 +- .../actions/validate/ValidateServiceRestTest.java | 4 +- .../SizeMeasureType-service-error-validation.xml | 0 .../SizeMeasureType-service-warning-validation.xml | 0 .../WeightMeasureType-service-error-validation.xml | 0 ...eightMeasureType-service-warning-validation.xml | 0 .../TargetLength-service-error-validation.xml | 17 ++++++ .../services-topia-validation_en_GB.properties | 3 + .../services-topia-validation_es_ES.properties | 3 + .../services-topia-validation_fr_FR.properties | 3 + .../validation/BeanValidatorDetectorTest.java | 4 +- .../topia/binder/BinderEngineInitializer.java | 8 +-- .../topia/binder/data/SizeMeasureBinder.java | 4 +- .../topia/binder/data/TargetLengthBinder.java | 6 +- .../topia/binder/data/WeightMeasureBinder.java | 4 +- .../binder/referential/SizeMeasureTypeBinder.java | 4 +- .../referential/WeightMeasureTypeBinder.java | 4 +- .../services/topia/binder/BinderEngineTest.java | 4 +- .../actions/validate/ValidateServiceTopiaTest.java | 4 +- .../src/main/filters/observe-reports.properties | 16 +++--- 66 files changed, 361 insertions(+), 108 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.