This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 3f32dfd [jgitflow-maven-plugin]merging 'release/4.5-rc-3' into 'master' adds 8477246 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 272d651 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 76a7d22 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 6d1d0ff Moins utiliser les Optional + fix generic issue adds 97ef38f Correction du test de validation (See #8237) adds ac9c4fd Livrable #8237 Merge branch 'feature/8237' into develop adds 1189c34 Utilisation de l'unité adaptée adds 24cdd12 Nettoyage code adds 6f4a2d9 Correction des unités lors de la sauvegarde d'un lot (code en double en fait avec deux fois une conversion d'unité) adds 5f78949 Revue du service de validation en utilisant plusieurs exceptions typées adds 76a3dcb Revue de l'action d'élévation des poids en utilisant les exceptions typées adds d009b59 Revue des arrondis et amélioration des messages d'erreur lors de l'élvation des poids adds eeda20b correction de la comparaison des unités (See #8151) adds 052b8db Revue de l'API des WeightUnits pour ne plus utiliser Weights (trop d'incertitude sur l'unité utilisée) adds 0652ce9 Nettoyage sur le service de nettoyage de poids + dernière revue des exceptions du service d'élévation adds aabaad2 Utilisation nouvelle API des poids adds 16c957f Correction des mauvaises unités utilisés dans les écran «espèces» adds 1d8372e Meilleure utilisation des unités dans les interfaces graphiques et revue des ComputableDataEditor adds 8aa7a78 Livrable #8151 Merge branch 'feature/8151' into develop adds 46170b9 [jgitflow-maven-plugin]updating poms for 4.5-rc-4 branch with snapshot versions adds c580f5b Add missing license headers adds 5ac14a1 [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-4' with non-snapshot versions adds 517e6bc [jgitflow-maven-plugin]merging 'release/4.5-rc-4' into 'master' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/type/WeightUnit.java | 77 ++- .../main/java/fr/ifremer/tutti/util/Weights.java | 127 ++--- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../service/TuttiValidationDataContextSupport.java | 6 +- .../catches/BenthosWeightComputingException.java | 145 ++++++ .../catches/CatchWeightComputingException.java | 64 +++ .../MarineLitterWeightComputingException.java | 64 +++ .../catches/SpeciesWeightComputingException.java | 145 ++++++ .../catches/TuttiWeightComputingException.java | 20 +- .../service/catches/WeightCleaningService.java | 294 +++++------ .../service/catches/WeightComputingService.java | 556 ++++++++++----------- .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 3 +- .../toconfirmreport/ToConfirmReportService.java | 5 +- .../consumer/CsvConsumerForCatch.java | 4 +- .../producer/CsvProducerForCatch.java | 5 +- .../service/psionimport/PsionImportModel.java | 10 +- .../tutti/service/pupitri/PupitriImportResult.java | 2 +- .../service/pupitri/PupitriImportService.java | 4 +- .../data/SpeciesBatch-edit-error-validation.xml | 6 +- .../SpeciesBatch-validate-fatal-validation.xml | 2 +- .../resources/i18n/tutti-service_en_GB.properties | 5 + .../resources/i18n/tutti-service_fr_FR.properties | 35 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../fr/ifremer/tutti/ui/swing/content/Common.jcss | 3 + .../operation/catches/EditCatchesSvgHandler.java | 5 +- .../operation/catches/EditCatchesUIHandler.java | 4 +- .../operation/catches/EditCatchesUIModel.java | 13 +- .../catches/actions/ComputeBatchWeightsAction.java | 221 ++++---- .../IndividualObservationBatchRowModel.java | 5 - .../catches/marinelitter/MarineLitterBatchUI.jaxx | 2 +- .../catches/marinelitter/MarineLitterBatchUI.jcss | 1 - .../marinelitter/MarineLitterBatchUIHandler.java | 40 +- .../marinelitter/MarineLitterBatchUIModel.java | 15 +- .../create/CreateMarineLitterBatchUI.jaxx | 2 +- .../create/CreateMarineLitterBatchUI.jcss | 1 - .../create/CreateMarineLitterBatchUIHandler.java | 5 +- .../create/CreateMarineLitterBatchUIModel.java | 12 +- .../catches/species/BenthosBatchUISupportImpl.java | 17 - .../catches/species/SpeciesBatchUISupportImpl.java | 7 - .../species/SpeciesOrBenthosBatchUISupport.java | 7 +- .../species/create/CreateSpeciesBatchUI.jaxx | 6 +- .../species/create/CreateSpeciesBatchUI.jcss | 3 - .../create/CreateSpeciesBatchUIHandler.java | 49 +- .../species/create/CreateSpeciesBatchUIModel.java | 8 +- .../catches/species/edit/SpeciesBatchUI.jaxx | 12 +- .../catches/species/edit/SpeciesBatchUI.jcss | 6 - .../species/edit/SpeciesBatchUIHandler.java | 49 +- .../frequency/IndividualObservationUICache.java | 19 +- .../frequency/SpeciesFrequencyRowModel.java | 11 +- .../frequency/SpeciesFrequencyTableModel.java | 4 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 2 +- .../species/frequency/SpeciesFrequencyUI.jcss | 1 - .../frequency/SpeciesFrequencyUIHandler.java | 14 +- .../species/frequency/SpeciesFrequencyUIModel.java | 6 +- .../catches/species/split/SplitSpeciesBatchUI.jaxx | 4 +- .../catches/species/split/SplitSpeciesBatchUI.jcss | 2 - .../species/split/SplitSpeciesBatchUIHandler.java | 4 +- .../species/split/SplitSpeciesBatchUIModel.java | 14 +- .../ui/swing/util/AbstractTuttiUIHandler.java | 54 +- .../util/computable/ComputableDataEditor.jaxx | 3 +- .../computable/ComputableDataEditorHandler.java | 26 +- .../util/computable/ComputableDataTableCell.java | 103 ++-- .../SpeciesFrequencyUIModel-error-validation.xml | 2 +- 68 files changed, 1285 insertions(+), 1070 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/catches/BenthosWeightComputingException.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/catches/CatchWeightComputingException.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/catches/MarineLitterWeightComputingException.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/catches/SpeciesWeightComputingException.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.