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

branch develop updated (91e23a8 -> 10eeb53)
by codelutin.com scm 13 Feb '15

13 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 91e23a8 fixes #6646: Fenêtre de saisie de mot de passe qui disparaît new 10eeb53 fixes #6662: Supprimer toute référence à l'Ichtyomètre 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 10eeb53f0ea3c1ff3889b6b2a89bf5f20c37723f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Feb 13 11:16:53 2015 +0100 fixes #6662: Supprimer toute référence à l'Ichtyomètre Summary of changes: .../ichtyometer/10MF1_Firmware_ifremer_v1-60.eeprom | Bin 32768 -> 0 bytes tutti-ui-swing/src/main/ichtyometer/README.txt | 5 ++--- 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 tutti-ui-swing/src/main/ichtyometer/10MF1_Firmware_ifremer_v1-60.eeprom -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (70151a6 -> 91e23a8)
by codelutin.com scm 13 Feb '15

13 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 70151a6 fixes #6659 Plus de poids affichés dans le résumé suite à des changements de traits new 91e23a8 fixes #6646: Fenêtre de saisie de mot de passe qui disparaît 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 91e23a8293e8b5ce053e70094e16b9223222df14 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Feb 13 11:02:25 2015 +0100 fixes #6646: Fenêtre de saisie de mot de passe qui disparaît Summary of changes: .../main/java/fr/ifremer/tutti/ui/swing/action/AbstractTuttiAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (f091844 -> 70151a6)
by codelutin.com scm 13 Feb '15

13 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from f091844 fixes #6660: [CAPTURE] NPE à l'élévation des poids quand il n'y a pas d'espèces new 70151a6 fixes #6659 Plus de poids affichés dans le résumé suite à des changements de traits 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 70151a685dbe1b41eaf3cd50c3f2e2ad5a6d1b98 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Feb 13 10:52:48 2015 +0100 fixes #6659 Plus de poids affichés dans le résumé suite à des changements de traits Summary of changes: .../ui/swing/content/operation/catches/EditCatchesSvgHandler.java | 3 +++ 1 file changed, 3 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (7664aa1 -> f091844)
by codelutin.com scm 13 Feb '15

13 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 7664aa1 refs #6538 new f091844 fixes #6660: [CAPTURE] NPE à l'élévation des poids quand il n'y a pas d'espèces 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 f091844485ce315d8f324c9da29b8b3a45a25b5f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Feb 13 10:45:13 2015 +0100 fixes #6660: [CAPTURE] NPE à l'élévation des poids quand il n'y a pas d'espèces Summary of changes: .../fr/ifremer/tutti/service/catches/WeightComputingService.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (6741be4 -> 7664aa1)
by codelutin.com scm 12 Feb '15

12 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 6741be4 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 71dceba refs #6538 apurement du svg + correction de mise à jour du svg new 7664aa1 refs #6538 The 2 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 7664aa103801f85252dd3163f3d430983369cf36 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Feb 12 18:21:24 2015 +0100 refs #6538 commit 71dcebab70573e004c9d88d72f9d21fb18ee0aed Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Feb 12 17:58:54 2015 +0100 refs #6538 apurement du svg + correction de mise à jour du svg Summary of changes: .../operation/catches/EditCatchesSvgHandler.java | 33 ++- tutti-ui-swing/src/main/resources/EcranResume.svg | 310 ++++----------------- 2 files changed, 81 insertions(+), 262 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch release/3.13 deleted (was 526b4f0)
by codelutin.com scm 10 Feb '15

10 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch release/3.13 in repository tutti. See http://git.codelutin.com/tutti.git was 526b4f0 [jgitflow-maven-plugin]updating poms for branch'release/3.13' 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-3.13 created (now efbc4fa)
by codelutin.com scm 10 Feb '15

10 Feb '15

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-3.13 in repository tutti. See http://git.codelutin.com/tutti.git at efbc4fa (tag) tagging e7092d814afd93847aa0f869fae10d4ed4f285ad (commit) replaces tutti-3.12.1 tagged by Maven Release on Tue Feb 10 15:42:57 2015 +0000 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 3.13 ----------------------------------------------------------------------- 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/3.13 updated (6898c9a -> 526b4f0)
by codelutin.com scm 10 Feb '15

10 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch release/3.13 in repository tutti. See http://git.codelutin.com/tutti.git from 6898c9a fixes #6630 (ajout d'une nouvelle couleur pour les macro-déchets + changement des libellés fixes #6636 Report des actions et suppression de l'ancien code adds 5ae8dbc prepare release 3.13 adds 526b4f0 [jgitflow-maven-plugin]updating poms for branch'release/3.13' 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 +- .../java/fr/ifremer/tutti/util/NumbersTest.java | 24 ++++++++++++++++++++++ tutti-service/pom.xml | 2 +- .../java/fr/ifremer/tutti/service/SpeciesMap.java | 24 ++++++++++++++++++++++ .../tutti/service/bigfin/BigfinImportContext.java | 24 ++++++++++++++++++++++ .../service/bigfin/csv/SpeciesOrSpeciesBatch.java | 24 ++++++++++++++++++++++ .../fr/ifremer/tutti/service/bigfin/signs/Sex.java | 24 ++++++++++++++++++++++ .../ifremer/tutti/service/bigfin/signs/Sign.java | 24 ++++++++++++++++++++++ .../ifremer/tutti/service/bigfin/signs/Size.java | 24 ++++++++++++++++++++++ .../tutti/service/bigfin/signs/VracHorsVrac.java | 24 ++++++++++++++++++++++ .../toconfirmreport/ToConfirmReportBean.java | 24 ++++++++++++++++++++++ .../ToConfirmReportFishingOperationBean.java | 24 ++++++++++++++++++++++ .../ToConfirmReportFishingOperationData.java | 24 ++++++++++++++++++++++ .../toconfirmreport/ToConfirmReportService.java | 24 ++++++++++++++++++++++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../operation/catches/EditCatchesSvgHandler.java | 24 ++++++++++++++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 22 files changed, 343 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 develop updated (6fb60b6 -> 6741be4)
by codelutin.com scm 10 Feb '15

10 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 6fb60b6 [jgitflow-maven-plugin]updating poms for 3.14-SNAPSHOT development new fd3b9b7 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 5ae8dbc prepare release 3.13 new 526b4f0 [jgitflow-maven-plugin]updating poms for branch'release/3.13' with non-snapshot versions new e7092d8 Merge branch 'release/3.13' new 84cc016 Merge branch 'master' into develop new 6741be4 [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 6741be42795c5ff19539f2f8785b2299f025311c Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Feb 10 15:43:04 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 84cc0160a82bead731eb75c0ab6b10217178b78d Merge: fd3b9b7 e7092d8 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Feb 10 15:43:02 2015 +0000 Merge branch 'master' into develop commit fd3b9b7c3b233de9be6c4024fc27f37a61ebffba Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Feb 10 15:43:00 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit e7092d814afd93847aa0f869fae10d4ed4f285ad Merge: d6e6335 526b4f0 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Feb 10 15:42:56 2015 +0000 Merge branch 'release/3.13' commit 526b4f04cf44902bc7c462bade5b8272103a129d Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Feb 10 15:37:08 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.13' with non-snapshot versions commit 5ae8dbc90bcd30d8f1a926221c48f1f8b30afde6 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Feb 10 15:36:25 2015 +0000 prepare release 3.13 Summary of changes: .../java/fr/ifremer/tutti/util/NumbersTest.java | 24 ++++++++++++++++++++++ .../java/fr/ifremer/tutti/service/SpeciesMap.java | 24 ++++++++++++++++++++++ .../tutti/service/bigfin/BigfinImportContext.java | 24 ++++++++++++++++++++++ .../service/bigfin/csv/SpeciesOrSpeciesBatch.java | 24 ++++++++++++++++++++++ .../fr/ifremer/tutti/service/bigfin/signs/Sex.java | 24 ++++++++++++++++++++++ .../ifremer/tutti/service/bigfin/signs/Sign.java | 24 ++++++++++++++++++++++ .../ifremer/tutti/service/bigfin/signs/Size.java | 24 ++++++++++++++++++++++ .../tutti/service/bigfin/signs/VracHorsVrac.java | 24 ++++++++++++++++++++++ .../toconfirmreport/ToConfirmReportBean.java | 24 ++++++++++++++++++++++ .../ToConfirmReportFishingOperationBean.java | 24 ++++++++++++++++++++++ .../ToConfirmReportFishingOperationData.java | 24 ++++++++++++++++++++++ .../toconfirmreport/ToConfirmReportService.java | 24 ++++++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../operation/catches/EditCatchesSvgHandler.java | 24 ++++++++++++++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 16 files changed, 337 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch master updated (d6e6335 -> e7092d8)
by codelutin.com scm 10 Feb '15

10 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See http://git.codelutin.com/tutti.git from d6e6335 Merge branch 'release/3.12.1' adds 0ffc98b [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds c935aeb Merge branch 'master' into develop adds 495860a [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 50855f2 refs #6575 ajout des poids tremie et carrousel + ratio vrac trié / vrac total adds 44525ee amélioration du démarrage de l'application adds c4ec765 chargement en lazy du modèle de catégorisation adds 8a187b4 do not remove sample category model reference, just dirty it adds 865dbb3 add delete on exit hook adds 98f931c always work on a copy of db to avoid windows locks on files adds f2665e3 fixes #6541 adds 84422d2 add new shutdown methods adds 892651f add new method to close persistence service adds 3f51fe4 add new shutdown methods adds 5c1d9d4 delete db files adds dfe6838 rename exit code adds e44d941 fixes #6601 adds c75959c amélioration des propriétés du launcher adds a9f657f transmission des paramètres aux scripts de lancement adds a186a74 fix launcher properties adds fc265ad use last launcher version adds 1cdf969 fix bash script adds 68f7958 fix launcher archive configuration adds 28d9da7 fix NPE (refs #6538) adds 43e6198 fixes #6594: [REFERENTIEL] Pb de mise à jour (utilisation adagio 3.8.3.1) adds e33b29e use codelutinpom wagon-m-p version adds 740d00d introduction de classes différentes pour les différentes types de signes adds d321712 deplacement du code csv dabs un paquetage dédié + nettoyage code adds 412db54 ajout d'une méthode pour retrouver tous les lots d'un lot racine adds f9c70c9 deplacement du code csv dabs un paquetage dédié + nettoyage code adds 11bae16 introduction d'un objet context de l'import adds f11ac3a suppression des vieux signes adds 8e2435c réusinage du code d'import et prise en compte du nouveau mode d'import (en indiquant le lot plutot que l'espèce carégorisée) adds 714ca74 fixes #6471 adds 3d46837 fixes #6588: [VALIDATION] ordre des traits : proposer d'ordonner les trait par date/heure ou n° station ou n° trait (les traits sont ordonnés par date / heure) adds 4f3c7cf refs 6544: [TECH] Permettre que les mises à jour fonctionnent depuis la version 3.7 adds 2a27fc2 update db versions adds 61db5d8 i18n adds 856e849 fixes #6610: [TECH] Mauvaise fermeture des bases adds 45fd868 refs #6538 chargement du svg à chaque fois qu'on revient sur l'onglet adds b6c955c refs #6538 better handle erors adds 34486ea fix NPE adds c1f5ca1 refs #6538 ajout des couleurs + mise en page adds 3cf2fbc start of #6575 adds 249cea2 Merge branches 'develop' and 'feature/6575' of https://git.codelutin.com/tutti into feature/6575 adds 47f83be add species code, name and vernacular name + catch comment adds e039703 Merge branch 'develop' of https://git.codelutin.com/tutti into feature/6575 adds fe84276 ajout des catégories adds 0a01441 mise en page du pdf adds e62a6b5 fixes #6575 [ERGO] créer un rapport "espèces à confirmer" adds e15f6f2 ajustement (test refs) couleur du texte du svg adds c4a0d7d refs #6544 faire fonctionner les mise à jour runtime sous windows adds 8e96729 add nice method to get surveycode or refTaxCode adds 220d58c add at last an objet to load nicely all code of a species adds 34ff86b code review on refs #6575 (Use objects please) adds 54a5618 fixes #6626: [CAPTURE] écran résumé activer saisie par entrée adds 1570b71 fixes #6631 adds 41993fd fixes #6635 adds eeb11ba fixes #6636 adds afcb41b Merge branch 'develop' of https://git.codelutin.com/tutti into develop adds 82ef39c fixes #6628 adds f5a96d2 add method to round float in int adds 59d71e5 fixes #6629 adds d6462e1 refs #6471 adds 8ff602d ajout d'une couleur dans la configuration pour les macro-decehts dans l'écran de résumé des captures adds afa891c fixes #6630 (ajout d'une nouvelle couleur pour les macro-déchets + changement des libellés fixes #6636 Report des actions et suppression de l'ancien code adds 6898c9a fixes #6630 (ajout d'une nouvelle couleur pour les macro-déchets + changement des libellés fixes #6636 Report des actions et suppression de l'ancien code adds 5ae8dbc prepare release 3.13 adds 526b4f0 [jgitflow-maven-plugin]updating poms for branch'release/3.13' with non-snapshot versions adds e7092d8 Merge branch 'release/3.13' No new revisions were added by this update. Summary of changes: README.txt | 33 +- pom.xml | 14 +- src/site/rst/dbversions.rst | 4 + src/update/tutti-application.properties | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 16 + .../fr/ifremer/tutti/TuttiConfigurationOption.java | 32 + .../tutti/persistence/TuttiPersistenceImpl.java | 92 ++- .../persistence/TuttiPersistenceNoDbImpl.java | 10 + .../persistence/entities/data/SpeciesBatchs.java | 20 + .../entities/protocol/TuttiProtocols.java | 33 + .../persistence/entities/referential/Speciess.java | 11 + .../service/BenthosBatchPersistenceService.java | 10 + .../BenthosBatchPersistenceServiceImpl.java | 24 + .../service/SpeciesBatchPersistenceService.java | 10 + .../SpeciesBatchPersistenceServiceImpl.java | 24 + .../src/main/java/fr/ifremer/tutti/util/Jdbcs.java | 31 + .../main/java/fr/ifremer/tutti/util/Numbers.java | 10 + .../i18n/tutti-persistence_en_GB.properties | 4 + .../i18n/tutti-persistence_fr_FR.properties | 6 +- .../java/fr/ifremer/tutti/util/NumbersTest.java | 50 ++ tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PdfGeneratorService.java | 1 + .../ifremer/tutti/service/PersistenceService.java | 10 + .../java/fr/ifremer/tutti/service/SpeciesMap.java | 147 ++++ .../fr/ifremer/tutti/service/TuttiDataContext.java | 41 +- .../tutti/service/bigfin/BigfinDataRowModel.java | 138 ---- .../tutti/service/bigfin/BigfinImportContext.java | 381 ++++++++++ .../tutti/service/bigfin/BigfinImportService.java | 366 +++++----- .../fr/ifremer/tutti/service/bigfin/Signs.java | 216 ------ .../service/bigfin/{ => csv}/BigfinDataRow.java | 75 +- .../service/bigfin/csv/BigfinDataRowModel.java | 233 +++++++ .../csv/SpeciesOrSpeciesBatch.java} | 46 +- .../{pupitri/Signs.java => bigfin/signs/Sex.java} | 119 ++-- .../ifremer/tutti/service/bigfin/signs/Sign.java | 33 +- .../{pupitri/Signs.java => bigfin/signs/Size.java} | 117 ++-- .../tutti/service/bigfin/signs/VracHorsVrac.java | 116 +++ .../catches/ValidateCruiseOperationsService.java | 38 +- .../service/catches/WeightComputingService.java | 15 +- .../tutti/service/export/ExportCatchContext.java | 40 +- .../ToConfirmReportBatchEntryBean.java | 88 +++ .../toconfirmreport/ToConfirmReportBean.java | 79 +++ .../ToConfirmReportFishingOperationBean.java | 84 +++ .../ToConfirmReportFishingOperationData.java | 141 ++++ .../toconfirmreport/ToConfirmReportService.java | 221 ++++++ .../resources/ftl/toConfirmSpeciesReport_fr.ftl | 189 +++++ .../resources/i18n/tutti-service_en_GB.properties | 11 + .../resources/i18n/tutti-service_fr_FR.properties | 13 +- tutti-ui-swing-updater/pom.xml | 2 +- .../tutti/ui/swing/updater/DeleteHelper.java | 27 + .../fr/ifremer/tutti/ui/swing/updater/Updater.java | 14 +- .../src/main/resources/update_runtime.bat | 29 +- .../src/main/resources/update_runtime.sh | 21 +- tutti-ui-swing/pom.xml | 69 +- .../src/main/assembly/full-linux-component.xml | 2 +- .../src/main/assembly/full-shared-component.xml | 45 +- .../src/main/assembly/full-windows-component.xml | 3 +- .../{full-windows-component.xml => launcher.xml} | 61 +- .../main/assembly/{full => launcher}/README.txt | 0 .../{full => launcher}/linux/tutti-sanity.sh | 2 +- .../assembly/{full => launcher}/linux/tutti.sh | 2 +- .../{full => launcher}/windows/tutti-sanity.bat | 0 .../assembly/{full => launcher}/windows/tutti.bat | 0 .../src/main/assembly/report/version.appup | 1 - tutti-ui-swing/src/main/assembly/standalone.xml | 39 +- .../main/assembly/standalone/launcher.properties | 9 +- .../src/main/assembly/standalone/linux/launch.sh | 8 +- .../main/assembly/standalone/windows/launch.bat | 7 +- .../src/main/filtered-resources/log4j.properties | 5 +- .../filtered-resources/tutti-help-fr.properties | 5 +- .../java/fr/ifremer/tutti/ui/swing/RunTutti.java | 7 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 48 +- .../ui/swing/action/CloseApplicationAction.java | 4 +- .../tutti/ui/swing/action/CloseDbAction.java | 5 +- .../ui/swing/action/ExportAndCleanDbAction.java | 21 +- .../tutti/ui/swing/action/ExportDbAction.java | 6 +- .../tutti/ui/swing/action/ImportDbAction.java | 6 +- .../tutti/ui/swing/action/OpenDbAction.java | 6 +- .../tutti/ui/swing/action/ReimportDbAction.java | 9 +- .../tutti/ui/swing/action/ReinstallDbAction.java | 9 +- .../tutti/ui/swing/action/ReloadTuttiAction.java | 2 +- .../action/SaveSampleCategoryModelAction.java | 2 +- ... => SpeciesToConfirmReportForCruiseAction.java} | 47 +- .../ui/swing/action/UpdateApplicationAction.java | 2 +- .../tutti/ui/swing/action/UpdateReportAction.java | 2 +- .../swing/content/config/TuttiConfigUIHandler.java | 12 + .../tutti/ui/swing/content/home/SelectCruiseUI.css | 10 +- .../ui/swing/content/home/SelectCruiseUI.jaxx | 1 + .../operation/catches/EditCatchesSvgHandler.java | 774 +++++++++++++++++++++ .../content/operation/catches/EditCatchesUI.css | 241 ------- .../content/operation/catches/EditCatchesUI.jaxx | 200 +----- .../operation/catches/EditCatchesUIHandler.java | 634 ++--------------- .../replace/AbstractReplaceTemporaryUIModel.java | 2 +- .../validation/ValidateCruiseUIHandler.java | 13 +- .../content/validation/ValidateCruiseUIModel.java | 3 +- .../ui/swing/update/module/DbModuleUpdater.java | 79 ++- .../util/AbstractTuttiTabContainerUIHandler.java | 55 +- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 21 +- .../tutti/ui/swing/util/catches/EnterWeightUI.jaxx | 6 +- .../swing/util/catches/EnterWeightUIHandler.java | 72 +- tutti-ui-swing/src/main/resources/EcranResume.svg | 318 +++++---- .../resources/i18n/tutti-ui-swing_en_GB.properties | 9 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 13 +- 104 files changed, 4080 insertions(+), 2310 deletions(-) create mode 100644 tutti-persistence/src/test/java/fr/ifremer/tutti/util/NumbersTest.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/SpeciesMap.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinDataRowModel.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportContext.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/Signs.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/{ => csv}/BigfinDataRow.java (60%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/csv/BigfinDataRowModel.java copy tutti-service/src/main/java/fr/ifremer/tutti/service/{export/generic/SpeciesExportRow.java => bigfin/csv/SpeciesOrSpeciesBatch.java} (52%) copy tutti-service/src/main/java/fr/ifremer/tutti/service/{pupitri/Signs.java => bigfin/signs/Sex.java} (53%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/ApplicationUpdateException.java => tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/Sign.java (54%) copy tutti-service/src/main/java/fr/ifremer/tutti/service/{pupitri/Signs.java => bigfin/signs/Size.java} (53%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/VracHorsVrac.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportBatchEntryBean.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportBean.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportFishingOperationBean.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportFishingOperationData.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportService.java create mode 100644 tutti-service/src/main/resources/ftl/toConfirmSpeciesReport_fr.ftl copy tutti-ui-swing/src/main/assembly/{full-windows-component.xml => launcher.xml} (52%) rename tutti-ui-swing/src/main/assembly/{full => launcher}/README.txt (100%) rename tutti-ui-swing/src/main/assembly/{full => launcher}/linux/tutti-sanity.sh (77%) rename tutti-ui-swing/src/main/assembly/{full => launcher}/linux/tutti.sh (83%) rename tutti-ui-swing/src/main/assembly/{full => launcher}/windows/tutti-sanity.bat (100%) rename tutti-ui-swing/src/main/assembly/{full => launcher}/windows/tutti.bat (100%) delete mode 100644 tutti-ui-swing/src/main/assembly/report/version.appup copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/{SendCruiseReportAction.java => SpeciesToConfirmReportForCruiseAction.java} (60%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0