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 4a38a2237880e4cfde839a607f7f91328fe61fc4 Merge: 18a9780 b9f1339 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Nov 7 08:06:50 2016 +0100 Gestion plus perfectionnée des calculs taille-poids (Fixes #8404) Merge branch 'feature/8404' into develop .../swing/decoration/DecoratorService.java | 11 +- .../decorators/LengthLengthParameterDecorator.java | 54 ++ .../application-swing-decoration_en_GB.properties | 5 +- .../application-swing-decoration_es_ES.properties | 3 + .../application-swing-decoration_fr_FR.properties | 3 + ...ngthParameterDto-ui-create-error-validation.xml | 108 ++++ ...hParameterDto-ui-create-warning-validation.xml} | 21 +- ...ngthParameterDto-ui-update-error-validation.xml | 72 +++ ...hParameterDto-ui-update-warning-validation.xml} | 23 - ...ightParameterDto-ui-create-error-validation.xml | 17 +- ...htParameterDto-ui-create-warning-validation.xml | 8 + ...nTargetLengthDto-ui-update-error-validation.xml | 17 + .../application-swing-validation_en_GB.properties | 16 + .../application-swing-validation_es_ES.properties | 16 + .../application-swing-validation_fr_FR.properties | 18 +- .../validation/BeanValidatorDetectorTest.java | 10 +- application-swing/pom.xml | 5 + .../src/main/filters/observe-ui.properties | 1 + ...rameterUI.jaxx => LengthLengthParameterUI.jaxx} | 139 +---- ...rameterUI.jcss => LengthLengthParameterUI.jcss} | 100 +-- .../ref/impl/LengthLengthParameterUIHandler.java | 102 ++++ ...odel.java => LengthLengthParameterUIModel.java} | 55 +- .../content/ref/impl/LengthWeightParameterUI.jaxx | 38 +- .../content/ref/impl/LengthWeightParameterUI.jcss | 17 + .../ref/impl/LengthWeightParameterUIModel.java | 3 + .../content/table/impl/seine/AbstractSampleUI.jcss | 49 ++ .../table/impl/seine/AbstractSampleUIHandler.java | 36 +- .../table/impl/seine/NonTargetSampleUI.jaxx | 37 +- .../table/impl/seine/NonTargetSampleUI.jcss | 25 - .../table/impl/seine/NonTargetSampleUIHandler.java | 72 ++- .../table/impl/seine/NonTargetSampleUIModel.java | 26 +- .../content/table/impl/seine/TargetSampleUI.jaxx | 4 +- .../content/table/impl/seine/TargetSampleUI.jcss | 45 -- .../table/impl/seine/TargetSampleUIHandler.java | 100 ++- .../table/impl/seine/TargetSampleUIModel.java | 20 +- .../i18n/application-swing_en_GB.properties | 9 + .../i18n/application-swing_es_ES.properties | 9 + .../i18n/application-swing_fr_FR.properties | 9 + application-web/pom.xml | 5 + .../DataSourceMigrationForVersion_5_1.java | 1 + .../V5_1_13_evol_7901_add_armateur_table-H2.sql | 2 +- .../V5_1_13_evol_7901_add_armateur_table-PG.sql | 2 +- .../V5_1_18_evol_8404_lengthLengthParameter-H2.sql | 14 + .../V5_1_18_evol_8404_lengthLengthParameter-PG.sql | 14 + .../java/fr/ird/observe/entities/Entities.java | 1 + .../observe/entities/LengthWeightComputable.java | 5 +- .../AbstractObserveMigrationCallBack.java | 2 +- .../entities/referentiel/FormulaHelper.java | 169 ++++++ .../entities/referentiel/FormulaSupportImpl.java | 88 +++ .../referentiel/LengthLengthParameterImpl.java | 55 ++ .../referentiel/LengthLengthParameterTopiaDao.java | 16 + .../referentiel/LengthLengthParameters.java | 21 + .../referentiel/LengthWeightParameterImpl.java | 110 +--- .../referentiel/LengthWeightParameters.java | 260 ++------ .../referentiel/LengthWeightParemeterHelper.java | 332 ---------- .../observe/entities/seine/NonTargetCatchImpl.java | 6 + entities/src/main/xmi/observe-common.zargo | Bin 42084 -> 45678 bytes entities/src/main/xmi/observe-seine.zargo | Bin 86910 -> 87124 bytes entities/src/main/xmi/observe.ini | 9 +- .../entities/referentiel/FormulaHelperTest.java | 27 + .../LengthWeightParemeterHelperTest.java | 48 -- pom.xml | 2 + services-dto-gson/LICENSE.txt | 674 +++++++++++++++++++++ services-dto-gson/README.md | 0 services-dto-gson/pom.xml | 69 +++ .../ird/observe/services/dto/gson/BlobAdapter.java | 0 .../observe/services/dto/gson/ClassAdapter.java | 0 .../ird/observe/services/dto/gson/DateAdapter.java | 0 .../ird/observe/services/dto/gson/FormAdapter.java | 0 .../services/dto/gson/ImmutableListAdapter.java | 0 .../services/dto/gson/ImmutableMapAdapter.java | 0 .../dto/gson/ImmutableMultimapAdapter.java | 0 .../services/dto/gson/ImmutableSetAdapter.java | 0 .../observe/services/dto/gson/IntegerAdapter.java | 0 .../services/dto/gson/ObserveDtoGsonSupplier.java | 0 .../dto/gson/ReferentialMultimapAdapter.java | 0 .../services/dto/gson/ReportVariableAdapter.java | 0 .../observe/services/dto/gson/VersionAdapter.java | 0 .../gson/reference/AbstractReferenceAdapter.java | 0 .../reference/AbstractReferenceSetAdapter.java | 0 .../dto/gson/reference/DataReferenceAdapter.java | 0 .../gson/reference/DataReferenceSetAdapter.java | 0 .../reference/ReferentialReferenceAdapter.java | 0 .../reference/ReferentialReferenceSetAdapter.java | 0 .../gson/reference/UnknownReferenceAdapter.java | 0 services-dto-reference/LICENSE.txt | 674 +++++++++++++++++++++ services-dto-reference/README.md | 0 services-dto-reference/pom.xml | 65 ++ .../dto/reference/DataReferenceSetDefinitions.java | 0 .../dto/reference/ReferenceBinderEngine.java | 0 .../reference/ReferenceBinderEngineSupplier.java | 0 .../dto/reference/ReferenceSetDefinition.java | 0 .../ReferentialReferenceSetDefinitions.java | 12 +- .../request/ReferenceSetRequestDefinition.java | 0 .../request/ReferenceSetRequestDefinitions.java | 11 +- .../request/ReferenceSetRequestKeyDefinition.java | 0 services-dto/pom.xml | 13 - .../services/dto/referential/FormulaHelper.java | 134 ++++ .../dto/referential/LengthLengthParameterDto.java | 48 ++ .../dto/referential/LengthWeightParameterDto.java | 48 ++ .../dto/referential/ReferentialHelper.java | 1 + .../dto/referential/SizeMeasureTypeHelper.java | 17 - .../src/main/xmi/observe-services-dto-common.zargo | Bin 46149 -> 48945 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 60743 -> 60919 bytes services-dto/src/main/xmi/observe-services-dto.ini | 12 +- services-rest/pom.xml | 11 + services-runner/pom.xml | 6 + services-topia-binder/pom.xml | 5 + .../topia/binder/BinderEngineInitializer.java | 17 +- .../services/topia/binder/BinderSupport.java | 10 + .../topia/binder/data/ActivityLonglineBinder.java | 4 +- .../topia/binder/data/ActivitySeineBinder.java | 4 +- .../topia/binder/data/NonTargetLengthBinder.java | 4 + .../topia/binder/data/TripLonglineBinder.java | 8 +- .../topia/binder/data/TripSeineBinder.java | 4 +- .../referential/LengthLengthParameterBinder.java | 92 +++ .../referential/LengthWeightParameterBinder.java | 2 + .../topia/binder/referential/SpeciesBinder.java | 4 +- .../topia/binder/BinderEngineMetadataTest.java | 4 +- ...gthLengthParameter-service-error-validation.xml | 87 +++ ...hLengthParameter-service-warning-validation.xml | 29 +- ...gthWeightParameter-service-error-validation.xml | 10 +- .../services-topia-validation_en_GB.properties | 7 + .../services-topia-validation_es_ES.properties | 7 + .../services-topia-validation_fr_FR.properties | 7 + .../validation/BeanValidatorDetectorTest.java | 4 +- services-topia/pom.xml | 11 + .../topia/service/LastUpdateDateServiceTopia.java | 2 +- .../consolidate/ConsolidateDataServiceTopia.java | 39 +- .../topia/entity/LengthWeightParemetersTest.java | 26 +- .../UnidirectionalSynchronizeReferentialTest.java | 4 + services/pom.xml | 9 + .../java/fr/ird/observe/test/ObserveFixtures.java | 3 +- .../resources/db/5.1/dataForTestLongline.sql.gz | Bin 1626691 -> 1626811 bytes .../main/resources/db/5.1/dataForTestSeine.sql.gz | Bin 455040 -> 455518 bytes test/src/main/resources/db/5.1/empty_h2.sql.gz | Bin 6193 -> 6302 bytes test/src/main/resources/db/5.1/empty_pg.sql.gz | Bin 6188 -> 6293 bytes test/src/main/resources/db/5.1/referentiel.sql.gz | Bin 181714 -> 182328 bytes 138 files changed, 3459 insertions(+), 1231 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.