- Tutti-commits - mailman.cloud.codelutin.com

branch feature/8245 created (now 278f703)
by codelutin.com scm 15 Apr '16

15 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8245 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 278f703 En avant la musique... création de modèles et controleurs... This branch includes the following new commits: new 1d6b0ed Mauvais flow, c'est pas faute de l'avoir dit pleins de fois... new 1a78521 Ajout d'une classe pour gérer les unités new 138580c Correction de l'apgorithme de comparaision de poids new 278f703 En avant la musique... création de modèles et controleurs... The 4 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 278f70357eabf2563a71be3f617ab0c95efcf6ab Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 15 09:52:50 2016 +0200 En avant la musique... création de modèles et controleurs... commit 138580c9b2f7462a3f4f22f15802586ab8e2026b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 15 09:46:35 2016 +0200 Correction de l'apgorithme de comparaision de poids commit 1a78521fce03c26f899a8c3bbb68eb8602864070 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 15 09:46:20 2016 +0200 Ajout d'une classe pour gérer les unités commit 1d6b0ed3ab81dbf4b22e88500ee709cdece07d80 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 14 17:33:49 2016 +0200 Mauvais flow, c'est pas faute de l'avoir dit pleins de fois... -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch develop updated (57a0d4e -> 2aad139)
by codelutin.com scm 14 Apr '16

14 Apr '16

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 57a0d4e [jgitflow-maven-plugin]Updating develop poms back to pre merge state new fa6a082 Ajout de logs new 1cde50e Sur l'écran d'édition pas de validateur à enregistrer new 2aad139 Quand on quitte un écran, on nettoye les validateurs The 3 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 2aad139d58f1d1f0af30e740c40a7ee5dea56c39 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 14 11:19:00 2016 +0200 Quand on quitte un écran, on nettoye les validateurs commit 1cde50ec5686609c3c128f97c12f628a35b3dda1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 14 11:18:35 2016 +0200 Sur l'écran d'édition pas de validateur à enregistrer commit fa6a08202d8b5448abcb0bedb661318c0ff49fb4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 14 11:18:06 2016 +0200 Ajout de logs Summary of changes: .../ifremer/tutti/ui/swing/content/MainUIHandler.java | 6 ++++++ .../species/EditSpeciesBatchPanelUIHandler.java | 19 +++++++++---------- .../species/create/CreateSpeciesBatchUIHandler.java | 2 ++ .../catches/species/edit/SpeciesBatchUIHandler.java | 1 + .../species/frequency/SpeciesFrequencyUIHandler.java | 1 + .../species/split/SplitSpeciesBatchUIHandler.java | 2 ++ 6 files changed, 21 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch release/4.5-rc-4 deleted (was 5ac14a1)
by codelutin.com scm 14 Apr '16

14 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5-rc-4 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was 5ac14a1 [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-4' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

annotated tag tutti-4.5-rc-4 created (now ee37cf6)
by codelutin.com scm 14 Apr '16

14 Apr '16

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-4.5-rc-4 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at ee37cf6 (tag) tagging 517e6bcc89a751e91c8643f05ce5d6e217ac0325 (commit) replaces tutti-4.5-rc-3 tagged by Maven Release on Thu Apr 14 10:33:37 2016 +0200 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.5-rc-4 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch release/4.5-rc-4 updated (46170b9 -> 5ac14a1)
by codelutin.com scm 14 Apr '16

14 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5-rc-4 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 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 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../catches/BenthosWeightComputingException.java | 24 ++++++++++++++++++++++ .../catches/CatchWeightComputingException.java | 24 ++++++++++++++++++++++ .../MarineLitterWeightComputingException.java | 24 ++++++++++++++++++++++ .../catches/SpeciesWeightComputingException.java | 24 ++++++++++++++++++++++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 11 files changed, 103 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch master updated (3f32dfd -> 517e6bc)
by codelutin.com scm 14 Apr '16

14 Apr '16

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(a)codelutin.com>.

1 0

branch develop updated (8aa7a78 -> 57a0d4e)
by codelutin.com scm 14 Apr '16

14 Apr '16

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 8aa7a78 Livrable #8151 Merge branch 'feature/8151' into develop new 8524787 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 46170b9 [jgitflow-maven-plugin]updating poms for 4.5-rc-4 branch with snapshot versions new c580f5b Add missing license headers new 5ac14a1 [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-4' with non-snapshot versions new 517e6bc [jgitflow-maven-plugin]merging 'release/4.5-rc-4' into 'master' new 0b8733f [jgitflow-maven-plugin]merging 'master' into 'develop' new 57a0d4e [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 57a0d4e42ec3eda2816fc01f855e58959c422bee Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Apr 14 10:33:39 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 0b8733fa3245fa77a21c6db832397282233f863b Merge: 8524787 517e6bc Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Apr 14 10:33:39 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 85247878ec94d9210581fbc291fe3c681b775105 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Apr 14 10:33:38 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 517e6bcc89a751e91c8643f05ce5d6e217ac0325 Merge: 3f32dfd 5ac14a1 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Apr 14 10:33:36 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.5-rc-4' into 'master' commit 5ac14a1179ca6c8976812b856926aec5cfebc264 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Apr 14 10:31:01 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-4' with non-snapshot versions commit c580f5b1ca19a7983c6b289657ecd7dd3dab4cf0 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Apr 14 10:30:52 2016 +0200 Add missing license headers Summary of changes: .../catches/BenthosWeightComputingException.java | 24 ++++++++++++++++++++++ .../catches/CatchWeightComputingException.java | 24 ++++++++++++++++++++++ .../MarineLitterWeightComputingException.java | 24 ++++++++++++++++++++++ .../catches/SpeciesWeightComputingException.java | 24 ++++++++++++++++++++++ 4 files changed, 96 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

[ANN] - Tutti 4.5-rc-4 released
by codelutin.com Release Notification 14 Apr '16

14 Apr '16

The Tutti team is pleased to announce the tutti-4.5-rc-4 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: http://tutti.codelutin.com Changes ------- Changes in this version include: Fixed Bugs: o [OBSERVATIONS INDIVIDUELLES] problème arrondis Issue: 8151. Thanks to Vincent BADTS. Resolved by kmorin. o [OBSERVATIONS INDIVIDUELLES] on peut enregistrer en mode recopie tout alors que les lignes d'observations individuelles ne sont pas valides Issue: 8237. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: https://forge.codelutin.com/projects/tutti/files * tutti-ichtyometer-4.5-rc-4-tools.zip - https://forge.codelutin.com/attachments/download/3859 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

branch release/4.5-rc-4 created (now 46170b9)
by codelutin.com scm 14 Apr '16

14 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5-rc-4 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 46170b9 [jgitflow-maven-plugin]updating poms for 4.5-rc-4 branch with snapshot versions This branch includes the following new commits: new 46170b9 [jgitflow-maven-plugin]updating poms for 4.5-rc-4 branch with snapshot versions The 1 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 46170b9e00f49712c0c14defb5fcd57191e6919e Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Apr 14 10:26:30 2016 +0200 [jgitflow-maven-plugin]updating poms for 4.5-rc-4 branch with snapshot versions -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (ac9c4fd -> 8aa7a78)
by codelutin.com scm 14 Apr '16

14 Apr '16

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(a)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(a)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(a)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(a)codelutin.com> Date: Thu Apr 14 08:41:21 2016 +0200 Utilisation nouvelle API des poids commit 0652ce95303ad072ad0cc2d9516385587f313aae Author: Tony CHEMIT <chemit(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)codelutin.com> Date: Wed Apr 13 11:15:29 2016 +0200 Nettoyage code commit 1189c34477f082ad7d8ec9525b92907baa7b3979 Author: Tony CHEMIT <chemit(a)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(a)codelutin.com>.

1 13