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 b335414 Merge branch 'release/3.7.4' adds d1b2b52 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 19d132d Merge branch 'master' into develop adds 077ff7f [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 0301ce4 fixes #5806: [ERGO] des fautes de frappe à corriger adds f0066cb fixes #5809: [CAMPAGNE] corriger Eport en Export adds 3513ff5 fixes #5807: [TRAIT] si on décoche trait rectiligne, vider le champ distance de la valeur calculée quand on avait coché trait rectiligne adds aba5af6 fixes #5804: [EXPORT] erreur export générique à analyser adds 4b13a17 fix test adds d7c0335 fixes #5825: [CAPTURE] préciser intitulé d'une fenêtre adds fb11091 refs #5411 [CAPTURE] Import BIGFIN adds 3c37b63 refs #5411 [CAPTURE] Import BIGFIN adds aa70ff2 refs #5411 [CAPTURE] Import BIGFIN adds a930c6c refs #5411 [CAPTURE] Import BIGFIN adds c5d1675 refs #5411 [CAPTURE] Import BIGFIN adds 284fe2f fixes #5411 [CAPTURE] Import BIGFIN adds 3b08c72 fixes #5805: [ERGO] dans l'écran de configuration pour le choix des unités de poids : écrire kg et g en minucules adds 346548e fixes #5820: [MENSURATION] diminuer la taille de la touche Réinitialiser adds 03c7ed7 fixes #5824: [CAPTURE] préciser un libellé dans l'onglet résumé de la capture : poids total vrac trié adds fd1abed refs-80 #5827: Erreur à analyser adds cf08b37 fixes #5812 (show all messages in validation tree + move to a validation package) adds cf75b91 fixes #5843: [SYNCHRO] Mauvaise icone utilisé pour représenter l'état de synchronisation d'une campagne adds 8b4070b fix bad merge adds 3c7e6a9 refs #5821 [ERGO] dans tableau mensuration, avoir le focus dans une cellule après avoir appuyer sur la touche Entrée adds 3e8331f fixes #5853 [RAPPORT PDF] Erreur quand on a une espece qui n'est pas dans le protocole adds c143319 refs #5747 add key actions for operation caracteristics adds 55dafb4 Merge branch 'develop' of https://git.codelutin.com/tutti into develop adds fd13aac fixes #5854 [IMPORT PROTOCOL] Ajouter un contrôle à l'import des espèces ou du benthos adds 2f18a59 fixes #5850 [IMPORT PUPITRI] vérifier que l'import s'assure que le n° station ET la date des fichiers .tnk et .car soient en cohérence avec le trait dans Tutti adds 5b1da5a fixes #5865: Updates jaxx to 2.13 adds 8c079a8 [jgitflow-maven-plugin]updating poms for branch '3.7.5' with snapshot versions adds f2f2ab3 prepare release 3.7.5 adds af09d6f [jgitflow-maven-plugin]updating poms for branch'release/3.7.5' with non-snapshot versions adds 1bea001 Merge branch 'release/3.7.5' No new revisions were added by this update. Summary of changes: pom.xml | 4 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../Gears.java => data/SpeciesBatchs.java} | 33 +- .../tutti/persistence/test/DatabaseResource.java | 31 +- .../i18n/tutti-persistence_en_GB.properties | 24 + .../i18n/tutti-persistence_fr_FR.properties | 26 +- .../config/TuttiPersistenceConfigTest.java | 2 +- .../resources/tutti-test-read-dbEmpty.properties | 27 - .../src/test/resources/tutti-test-read.properties | 27 - tutti-service/pom.xml | 2 +- .../fr/ifremer/tutti/service/TuttiCsvUtil.java | 4 + .../tutti/service/bigfin/BigfinDataRow.java | 130 +++++ .../tutti/service/bigfin/BigfinDataRowModel.java | 154 +++++ .../BigfinImportResult.java} | 44 +- .../tutti/service/bigfin/BigfinImportService.java | 635 +++++++++++++++++++++ .../tutti/service/{pupitri => bigfin}/Signs.java | 103 +++- .../service/export/generic/CatchExportModel.java | 2 +- .../export/pdf/CatchesPdfExportService.java | 4 +- .../protocol/ProtocolImportExportService.java | 97 +++- .../tutti/service/pupitri/CarrouselRow.java | 14 +- .../tutti/service/pupitri/CarrouselRowModel.java | 5 +- .../fr/ifremer/tutti/service/pupitri/TrunkRow.java | 14 +- .../tutti/service/pupitri/TrunkRowModel.java | 5 +- .../resources/i18n/tutti-service_en_GB.properties | 15 + .../resources/i18n/tutti-service_fr_FR.properties | 10 + .../ifremer/tutti/service/ServiceDbResource.java | 27 +- .../service/bigfin/BigfinImportServiceTest.java | 213 +++++++ .../generic/TuttiExportServiceAno5804Test.java | 106 ++++ .../export/generic/TuttiExportServiceTest.java | 10 +- .../test/resources/bigfin/importbigfin-errors.csv | 4 + .../test/resources/bigfin/importbigfin-valid.csv | 36 ++ .../resources/bigfin/importbigfin-warnings.csv | 5 + .../{psion => bigfin}/protocol.tuttiProtocol | 1 - .../resources/tutti-test-read-dbCGFS.properties | 26 - .../resources/tutti-test-read-dbExport.properties | 26 - .../resources/tutti-test-read-dbMedits.properties | 25 - tutti-ui-swing/pom.xml | 2 +- .../filtered-resources/tutti-help-fr.properties | 3 +- tutti-ui-swing/src/main/help/fr/dbMapping.html | 4 +- .../java/fr/ifremer/tutti/ui/swing/RunTutti.java | 8 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 33 +- .../action/EditCruiseInValidationUIAction.java | 6 +- .../EditFishingOperationInValidationUIAction.java | 6 +- .../ExportCruiseValidationMessagesAction.java | 6 +- .../ExportOperationValidationMessagesAction.java | 6 +- ...ortPsionAction.java => ImportBigfinAction.java} | 68 ++- .../swing/action/ImportProtocolBenthosAction.java | 24 +- .../swing/action/ImportProtocolSpeciesAction.java | 24 +- .../tutti/ui/swing/action/ImportPsionAction.java | 6 +- .../action/SaveCruiseToReadyToSynchAction.java | 6 +- .../action/SelectSpeciesForBenthosBatchAction.java | 2 +- .../action/SelectSpeciesForSpeciesBatchAction.java | 2 +- .../tutti/ui/swing/action/ShowAboutAction.java | 2 +- .../ui/swing/action/ValidateCatchesAction.java | 4 +- .../tutti/ui/swing/content/MainUIHandler.java | 11 +- .../swing/content/config/TuttiConfigUIHandler.java | 58 +- .../operation/EditFishingOperationUIHandler.java | 25 +- .../benthos/frequency/BenthosFrequencyUI.jaxx | 12 +- .../operation/catches/species/SpeciesBatchUI.css | 9 + .../operation/catches/species/SpeciesBatchUI.jaxx | 1 + .../catches/species/SpeciesBatchUIHandler.java | 11 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 138 +++-- .../species/split/SplitSpeciesBatchUIHandler.java | 8 +- .../fishing/GearUseFeatureTabUIHandler.java | 7 + .../fishing/VesselUseFeatureTabUIHandler.java | 6 + .../{cruise => validation}/ValidateCruiseUI.css | 0 .../{cruise => validation}/ValidateCruiseUI.jaxx | 1 + .../ValidateCruiseUIHandler.java | 9 +- .../ValidateCruiseUIModel.java | 2 +- .../tree/CruiseTreeNode.java | 24 +- .../tree/MessageTreeNode.java | 16 +- .../tree/OperationTreeNode.java | 35 +- .../tree/TuttiMessageNodeSupport.java} | 36 +- .../tree/ValidationTreeCellRenderer.java | 12 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 24 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 27 +- ...-casino-import.png => action-bigfin-import.png} | Bin .../icons/action-cruise-ready-to-sync.png | Bin 328 -> 465 bytes .../main/resources/icons/action-cruise-waiting.png | Bin 465 -> 328 bytes 80 files changed, 2074 insertions(+), 505 deletions(-) copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/{referential/Gears.java => data/SpeciesBatchs.java} (58%) delete mode 100644 tutti-persistence/src/test/resources/tutti-test-read-dbEmpty.properties delete mode 100644 tutti-persistence/src/test/resources/tutti-test-read.properties create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinDataRow.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinDataRowModel.java copy tutti-service/src/main/java/fr/ifremer/tutti/service/{psionimport/PsionImportResult.java => bigfin/BigfinImportResult.java} (56%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java copy tutti-service/src/main/java/fr/ifremer/tutti/service/{pupitri => bigfin}/Signs.java (64%) create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportServiceTest.java create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceAno5804Test.java create mode 100644 tutti-service/src/test/resources/bigfin/importbigfin-errors.csv create mode 100644 tutti-service/src/test/resources/bigfin/importbigfin-valid.csv create mode 100644 tutti-service/src/test/resources/bigfin/importbigfin-warnings.csv copy tutti-service/src/test/resources/{psion => bigfin}/protocol.tuttiProtocol (99%) delete mode 100644 tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties delete mode 100644 tutti-service/src/test/resources/tutti-test-read-dbExport.properties delete mode 100644 tutti-service/src/test/resources/tutti-test-read-dbMedits.properties copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/{ImportPsionAction.java => ImportBigfinAction.java} (62%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{cruise => validation}/ValidateCruiseUI.css (100%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{cruise => validation}/ValidateCruiseUI.jaxx (97%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{cruise => validation}/ValidateCruiseUIHandler.java (97%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{cruise => validation}/ValidateCruiseUIModel.java (99%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{cruise => validation}/tree/CruiseTreeNode.java (82%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{cruise => validation}/tree/MessageTreeNode.java (79%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{cruise => validation}/tree/OperationTreeNode.java (81%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{cruise/tree/MessageTreeNode.java => validation/tree/TuttiMessageNodeSupport.java} (59%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{cruise => validation}/tree/ValidationTreeCellRenderer.java (86%) copy tutti-ui-swing/src/main/resources/icons/{action-casino-import.png => action-bigfin-import.png} (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.