This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from ac9c4fd Livrable #8237 Merge branch 'feature/8237' into develop new 1189c34 Utilisation de l'unité adaptée new 24cdd12 Nettoyage code new 6f4a2d9 Correction des unités lors de la sauvegarde d'un lot (code en double en fait avec deux fois une conversion d'unité) new 5f78949 Revue du service de validation en utilisant plusieurs exceptions typées new 76a3dcb Revue de l'action d'élévation des poids en utilisant les exceptions typées new d009b59 Revue des arrondis et amélioration des messages d'erreur lors de l'élvation des poids new eeda20b correction de la comparaison des unités (See #8151) new 052b8db Revue de l'API des WeightUnits pour ne plus utiliser Weights (trop d'incertitude sur l'unité utilisée) new 0652ce9 Nettoyage sur le service de nettoyage de poids + dernière revue des exceptions du service d'élévation new aabaad2 Utilisation nouvelle API des poids new 16c957f Correction des mauvaises unités utilisés dans les écran «espèces» new 1d8372e Meilleure utilisation des unités dans les interfaces graphiques et revue des ComputableDataEditor new 8aa7a78 Livrable #8151 Merge branch 'feature/8151' into develop The 13 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 8aa7a78472aaf629ebb5055e8b9627894226d5e8 Merge: ac9c4fd 1d8372e Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 14 08:47:23 2016 +0200 Livrable #8151 Merge branch 'feature/8151' into develop commit 1d8372e00613df5b64cc99f21c9c6eeb27d1a33a Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 14 08:47:17 2016 +0200 Meilleure utilisation des unités dans les interfaces graphiques et revue des ComputableDataEditor commit 16c957fa9ebb87c8cb12588d1a2dc947e53916b4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 14 08:46:18 2016 +0200 Correction des mauvaises unités utilisés dans les écran «espèces» commit aabaad218482d762456aeb508ff60b3aeddc39ed Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 14 08:41:21 2016 +0200 Utilisation nouvelle API des poids commit 0652ce95303ad072ad0cc2d9516385587f313aae Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 14 08:40:58 2016 +0200 Nettoyage sur le service de nettoyage de poids + dernière revue des exceptions du service d'élévation commit 052b8db713f41679a76955c6cc2d5cc47cb81d8e Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Apr 14 08:37:53 2016 +0200 Revue de l'API des WeightUnits pour ne plus utiliser Weights (trop d'incertitude sur l'unité utilisée) commit eeda20b0fdc2df798d0707ca74db9b767c565cf1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 13 16:45:10 2016 +0200 correction de la comparaison des unités (See #8151) commit d009b59733c95f144899fcdd27d1f92a2be55370 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 13 16:14:30 2016 +0200 Revue des arrondis et amélioration des messages d'erreur lors de l'élvation des poids commit 76a3dcb83f44f9f01c902f796ff4966704a668bb Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 13 11:52:44 2016 +0200 Revue de l'action d'élévation des poids en utilisant les exceptions typées commit 5f78949897144b289f11804f468d3d0760e5baef Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 13 11:52:10 2016 +0200 Revue du service de validation en utilisant plusieurs exceptions typées commit 6f4a2d925f17a6670ccd524884d32ded62015c84 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 13 11:16:18 2016 +0200 Correction des unités lors de la sauvegarde d'un lot (code en double en fait avec deux fois une conversion d'unité) commit 24cdd122c0786a892735eaf6183b6745a44026cf Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 13 11:15:29 2016 +0200 Nettoyage code commit 1189c34477f082ad7d8ec9525b92907baa7b3979 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 18:23:03 2016 +0200 Utilisation de l'unité adaptée Summary of changes: .../java/fr/ifremer/tutti/type/WeightUnit.java | 77 ++- .../main/java/fr/ifremer/tutti/util/Weights.java | 127 ++--- .../service/TuttiValidationDataContextSupport.java | 6 +- .../catches/BenthosWeightComputingException.java | 121 +++++ .../catches/CatchWeightComputingException.java | 40 ++ .../MarineLitterWeightComputingException.java | 40 ++ .../catches/SpeciesWeightComputingException.java | 121 +++++ .../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 +- .../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 ++++---- .../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/SpeciesFrequencyRowModel.java | 11 +- .../frequency/SpeciesFrequencyTableModel.java | 4 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 2 +- .../species/frequency/SpeciesFrequencyUI.jcss | 1 - .../frequency/SpeciesFrequencyUIHandler.java | 4 +- .../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 ++-- 58 files changed, 1167 insertions(+), 1042 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>.