This is an automated email from the git hooks/post-receive script. New change to branch feature/6575 in repository tutti. See http://git.codelutin.com/tutti.git from 3cf2fbc start of #6575 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 new 249cea2 Merge branches 'develop' and 'feature/6575' of https://git.codelutin.com/tutti into feature/6575 new 47f83be add species code, name and vernacular name + catch comment 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 47f83beb685fddd9dfcd82fa5dc09cecb5ea82e1 Author: Kevin Morin <morin@codelutin.com> Date: Thu Feb 5 18:38:39 2015 +0100 add species code, name and vernacular name + catch comment commit 249cea2ed9bb3f8339abfef1feb3c2300486131c Merge: 3cf2fbc b6c955c Author: Kevin Morin <morin@codelutin.com> Date: Thu Feb 5 15:40:30 2015 +0100 Merge branches 'develop' and 'feature/6575' of https://git.codelutin.com/tutti into feature/6575 Summary of changes: README.txt | 33 +- pom.xml | 12 +- src/site/rst/dbversions.rst | 4 + src/update/tutti-application.properties | 2 +- .../tutti/persistence/TuttiPersistenceImpl.java | 31 +- .../persistence/entities/data/SpeciesBatchs.java | 20 + .../src/main/java/fr/ifremer/tutti/util/Jdbcs.java | 31 + .../ifremer/tutti/service/PdfGeneratorService.java | 1 + .../fr/ifremer/tutti/service/TuttiDataContext.java | 41 +- .../tutti/service/bigfin/BigfinDataRowModel.java | 138 ---- .../tutti/service/bigfin/BigfinImportContext.java | 357 ++++++++ .../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 | 231 ++++++ .../service/bigfin/csv/SpeciesOrSpeciesBatch.java | 42 + .../fr/ifremer/tutti/service/bigfin/signs/Sex.java | 109 +++ .../ifremer/tutti/service/bigfin/signs/Sign.java | 27 + .../ifremer/tutti/service/bigfin/signs/Size.java | 111 +++ .../tutti/service/bigfin/signs/VracHorsVrac.java | 92 +++ .../catches/ValidateCruiseOperationsService.java | 38 +- .../tutti/service/export/ExportCatchContext.java | 145 +++- .../ToConfirmReportBatchEntry.java} | 23 +- .../toconfirmreport/ToConfirmReportOperation.java | 2 +- .../toconfirmreport/ToConfirmReportService.java | 321 ++++++++ .../toconfirmreport/ToConfirmReportService.java | 125 --- .../resources/ftl/toConfirmSpeciesReport_fr.ftl | 87 +- .../resources/i18n/tutti-service_en_GB.properties | 5 + .../resources/i18n/tutti-service_fr_FR.properties | 9 +- .../tutti/ui/swing/updater/DeleteHelper.java | 27 + .../src/main/resources/update_runtime.bat | 5 +- .../src/main/resources/update_runtime.sh | 7 +- tutti-ui-swing/pom.xml | 67 ++ .../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 +- .../java/fr/ifremer/tutti/ui/swing/RunTutti.java | 7 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 45 +- .../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 | 2 +- .../ui/swing/action/UpdateApplicationAction.java | 2 +- .../tutti/ui/swing/action/UpdateReportAction.java | 2 +- .../operation/catches/EditCatchesUIHandler.java | 905 ++++++++++++--------- .../validation/ValidateCruiseUIHandler.java | 13 +- .../content/validation/ValidateCruiseUIModel.java | 3 +- .../ui/swing/update/module/DbModuleUpdater.java | 79 +- .../util/AbstractTuttiTabContainerUIHandler.java | 55 +- tutti-ui-swing/src/main/resources/EcranResume.svg | 112 ++- 68 files changed, 2804 insertions(+), 1470 deletions(-) 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 create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/csv/SpeciesOrSpeciesBatch.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/Sex.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/Sign.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/Size.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/VracHorsVrac.java copy tutti-service/src/main/java/fr/ifremer/tutti/service/export/{pdf/PdfExportBatchEntry.java => toconfirmreport/ToConfirmReportBatchEntry.java} (74%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{ => export}/toconfirmreport/ToConfirmReportOperation.java (95%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportService.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/toconfirmreport/ToConfirmReportService.java 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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.