This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git 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 .../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(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.