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

[tutti] branch develop updated (284fe2f -> 3b08c72)
by codelutin.com scm Sept. 23, 2014

Sept. 23, 2014

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 284fe2f fixes #5411 [CAPTURE] Import BIGFIN new 3b08c72 fixes #5805: [ERGO] dans l'écran de configuration pour le choix des unités de poids : écrire kg et g en minucules 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 3b08c7232c51e6dfe803b5357c2bca74da63cbbc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Sep 23 17:32:13 2014 +0200 fixes #5805: [ERGO] dans l'écran de configuration pour le choix des unités de poids : écrire kg et g en minucules Summary of changes: .../swing/content/config/TuttiConfigUIHandler.java | 58 +++++++++++++++++++++- 1 file changed, 56 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

[tutti] branch feature/importBigfin updated (483e0de -> 24822a3)
by codelutin.com scm Sept. 23, 2014

Sept. 23, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/importBigfin in repository tutti. See http://git.codelutin.com/tutti.git from 483e0de refs #5411 [CAPTURE] Import BIGFIN adds 938dd4e fixes #5715: [IMPORT] psion message d'erreur qui bloque l'import d'un fichier qui passait sans problème avant adds 216ab87 fixes #5719: [TECHNIQUE] Changer l'url de mises à jour des livrables : seule la valeur par défaut est modifiée adds d3a0103 fixes #5720: [CAPTURE] dans tableau espèce, clic droit ... adds 270a5b4 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 18a6ca2 [jgitflow-maven-plugin]updating poms for branch '3.7.1' with snapshot versions adds 4c02253 [jgitflow-maven-plugin]updating poms for branch'release/3.7.1' with non-snapshot versions adds e956af5 optimize dependencies adds f1f6671 Merge branch 'release/3.7.1' adds b9ee912 Merge branch 'master' into develop adds 58c36f6 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 266df68 fixes #5725: [TECHNIQUE] Fichier de configuration - Mise à jour de la 3.7 au lieu de la 3.7.1 adds 19d2a4c fixes #5729: [PROTOCOLE] erreur creation protocole adds 837e161 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 76af615 [jgitflow-maven-plugin]updating poms for branch '3.7.2' with snapshot versions adds 034ca45 [jgitflow-maven-plugin]updating poms for branch'release/3.7.2' with non-snapshot versions adds 121d594 Merge branch 'release/3.7.2' adds edc4144 Merge branch 'master' into develop adds 2f7ebe2 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 941e73e fixes #5749: [IMPORT] import psion ne passe pas si on renseigne le champ heure en face de date de début adds 156cb7c fixes #5748: [IMPORT] le message d'erreur sur import psion est a corriger adds 7a4bd15 fixes #5754: [EXPORT GENERIQUE] le benthos ne commence plus à 1001 mais à 1 dans la table catch/Num_Ordre_V_HV_H2 adds d1cdb0f fixes #5733 [TRAIT] à la création d'un trait, activer le champ "trait valide" fixes #5740 [CAPTURE] mieux gérer poids total et poids non trié adds 1837edc this should not have been commited adds 1712338 refs #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations adds 489d26b refs #5139 adds 8211d0d fixes #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations adds 300ee13 fixes #5728 [CONFIG] Erreur lors de l'enregistrement d'un changement de navire dans la configuration adds a09a9e3 updates jaxx, nuiton-utils and nuiton-config adds 6627017 fixes #5785: [TECHNIQUE] Revoir la documentation des mises à jour + Mise à jour des fichiers par version adds 2c0d6d8 fixes #5785: [TECHNIQUE] Revoir la documentation des mises à jour + Mise à jour des fichiers par version adds db29ac1 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds e66b6c8 [jgitflow-maven-plugin]updating poms for branch '3.7.3' with snapshot versions adds ac55e81 fix release headers adds b69873e [jgitflow-maven-plugin]updating poms for branch'release/3.7.3' with non-snapshot versions adds e6e7c4e Merge branch 'release/3.7.3' adds ebe5ef0 Merge branch 'master' into develop adds e17cba0 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 17c4da0 fix gitignore adds fe0fa0d change the test data directory adds 4c4dde9 updates libraries adds 7f31831 refs-80 #5784: [SYNCHRO] Gérer les changements d'id dans les transcodages de taxon adds 77f7b60 fixes #5790: [TECHNIQUE] Ajout d'une option pour voir la structure des lots dans les logs adds 02fb1cb fixes #5790: [TECHNIQUE] Ajout d'une option pour voir la structure des lots dans les logs adds 49c3cff clean code adds 8d6645d fix developer ids + use codelutinpom stable and jaxx snapshot adds f92b560 use adagio 3.6.3 adds 3262b45 back to last stable of jaxx adds ed5fd45 fixes #5791: [EXPORT] export pupitri, le ticket #5735 n'a pas corrigé le problème en 3.7.3 adds 6a9cacb fixes #5786: [CAPTURE] disfonctionnements dans saisie des poids et nombres dans l'écran mensuration en 3.7.3 adds 4ab3ac4 fixes #5803: [AIDE] le lien https://doc.codelutin.com/tutti/tutti-ui-swing derrière Aide/Site est inaccessible adds 0783eb2 fixes #5800: [CAPTURE] bug création espèce VRAC HVRAC quand modification de la catégorisation dans le tableau adds 2bb5f05 update db version adds d1b2b52 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 9767c1f [jgitflow-maven-plugin]updating poms for branch '3.7.4' with snapshot versions adds 0d2f4e4 [jgitflow-maven-plugin]updating poms for branch'release/3.7.4' with non-snapshot versions adds b335414 Merge branch 'release/3.7.4' 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 new fabfbef Merge remote-tracking branch 'origin/develop' into feature/importBigfin 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 new b22829b Merge remote-tracking branch 'origin/develop' into feature/importBigfin new 24822a3 fixes #5411 [CAPTURE] Import BIGFIN 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 24822a38625bbccb83298b406e5e9b145d8788ab Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Sep 23 14:24:39 2014 +0200 fixes #5411 [CAPTURE] Import BIGFIN commit b22829bb036c78fd6f92a597ca82a3ff9dd13d2e Merge: fabfbef d7c0335 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Sep 22 17:25:52 2014 +0200 Merge remote-tracking branch 'origin/develop' into feature/importBigfin commit fabfbef0a0cd9685928109692f26aeb3d68613ad Merge: 483e0de 3513ff5 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Sep 22 15:19:01 2014 +0200 Merge remote-tracking branch 'origin/develop' into feature/importBigfin Conflicts: tutti-persistence/src/main/java/fr/ifremer/adagio/core/dao/referential/pmfm/QualitativeValueId2.java tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties Summary of changes: .gitignore | 3 +- README.txt | 12 +- pom.xml | 64 ++- src/site/rst/dbversions.rst | 2 + src/site/rst/update.rst.vm | 47 +- src/update/tutti-application-dev.properties | 66 --- src/update/tutti-application.properties | 4 - .../core/dao/referential/pmfm/MatrixId2.java | 195 ------- .../core/dao/referential/pmfm/ObjectTypeCode2.java | 274 --------- .../adagio/core/dao/referential/pmfm/PmfmId2.java | 621 +++++---------------- .../dao/referential/pmfm/QualitativeValueId2.java | 251 --------- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 101 +--- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 9 +- .../tutti/persistence/TuttiPersistenceImpl.java | 6 +- .../persistence/TuttiPersistenceNoDbImpl.java | 6 +- .../tutti/persistence/entities/TuttiEntities.java | 3 +- .../entities/protocol/TuttiProtocols.java | 19 +- .../AccidentalBatchPersistenceServiceImpl.java | 7 +- .../service/AttachmentPersistenceService.java | 8 +- .../service/AttachmentPersistenceServiceImpl.java | 8 +- .../service/CatchBatchPersistenceServiceImpl.java | 9 +- .../service/CruisePersistenceServiceImpl.java | 17 +- .../FishingOperationPersistenceServiceImpl.java | 77 ++- ...dualObservationBatchPersistenceServiceImpl.java | 4 +- .../service/ReferentialPersistenceServiceImpl.java | 45 +- .../service/util/BatchPersistenceHelper.java | 70 +-- .../persistence/service/util/BatchTreeHelper.java | 74 +-- .../service/util/MeasurementPersistenceHelper.java | 8 +- .../service/util/SamplePersistenceHelper.java | 4 +- .../tutti/persistence/test/DatabaseResource.java | 95 ++-- .../main/java/fr/ifremer/tutti/util/DateTimes.java | 70 +++ ...ervice.technical.sanity.task.DatabaseSanityTask | 2 - ...ro.specific.ReferentialSynchroSpecificTableTask | 2 - .../i18n/tutti-persistence_en_GB.properties | 49 +- .../i18n/tutti-persistence_fr_FR.properties | 51 +- .../resources/tutti-db-enumerations.properties | 13 +- .../src/main/xmi/tutti-persistence.zargo | Bin 56716 -> 56700 bytes .../config/TuttiPersistenceConfigTest.java | 2 +- .../AttachmentPersistenceServiceWriteTest.java | 12 +- .../BenthosBatchPersistenceServiceReadTest.java | 4 +- .../BenthosBatchPersistenceServiceWriteTest.java | 20 +- .../SpeciesBatchPersistenceServiceReadTest.java | 4 +- .../SpeciesBatchPersistenceServiceWriteTest.java | 20 +- .../resources/tutti-test-read-dbEmpty.properties | 27 - .../src/test/resources/tutti-test-read.properties | 27 - .../ifremer/tutti/service/PersistenceService.java | 8 +- .../tutti/service/bigfin/BigfinDataRowModel.java | 7 +- .../tutti/service/bigfin/BigfinImportResult.java | 30 +- .../tutti/service/bigfin/BigfinImportService.java | 95 ++-- .../fr/ifremer/tutti/service/bigfin/Signs.java | 19 +- .../service/catches/WeightComputingService.java | 5 +- ...rvice.java => WeightComputingService.java.orig} | 11 +- .../catches/multipost/MultiPostExportService.java | 14 +- .../catches/multipost/MultiPostImportService.java | 16 +- .../service/export/generic/CatchExportModel.java | 43 +- .../service/export/generic/OperationExportRow.java | 4 +- .../service/psionimport/PsionImportModel.java | 42 +- .../service/psionimport/PsionImportService.java | 42 +- .../pupitri/PupitriImportExportService.java | 10 +- .../fr/ifremer/tutti/service/pupitri/Signs.java | 17 +- .../ifremer/tutti/service/pupitri/SpeciesRow.java | 42 +- .../resources/i18n/tutti-service_en_GB.properties | 6 + .../resources/i18n/tutti-service_fr_FR.properties | 14 +- .../ifremer/tutti/service/ServiceDbResource.java | 27 +- .../service/bigfin/BigfinImportServiceTest.java | 152 ++--- .../generic/TuttiExportServiceAno5804Test.java | 82 +++ .../export/generic/TuttiExportServiceTest.java | 10 +- .../psionimport/PsionImportServiceTest.java | 4 +- .../test/resources/bigfin/importbigfin-errors.csv | 4 + .../test/resources/bigfin/importbigfin-invalid.csv | 31 - .../test/resources/bigfin/importbigfin-valid.csv | 65 ++- .../resources/bigfin/importbigfin-warnings.csv | 5 + tutti-service/src/test/resources/log4j.properties | 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 | 4 + .../src/main/filtered-resources/tutti.config | 3 +- tutti-ui-swing/src/main/help/fr/dbMapping.html | 4 +- .../ui/swing/TuttiApplicationUpdaterCallBack.java | 17 + .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 12 + .../tutti/ui/swing/action/AbstractTuttiAction.java | 17 + .../tutti/ui/swing/action/ImportBigfinAction.java | 6 +- .../tutti/ui/swing/action/ImportPupitriAction.java | 4 +- .../ui/swing/action/NewFishingOperationAction.java | 1 + .../ui/swing/action/RenameBenthosBatchAction.java | 8 +- .../ui/swing/action/RenameSpeciesBatchAction.java | 8 +- .../ui/swing/action/SelectOtherBenthosAction.java | 4 +- .../ui/swing/action/SelectOtherSpeciesAction.java | 3 +- .../action/SelectSpeciesForBenthosBatchAction.java | 3 +- ...SpeciesForIndividualObservationBatchAction.java | 3 +- .../action/SelectSpeciesForSpeciesBatchAction.java | 3 +- .../category/EditSampleCategoryModelUIModel.java | 4 +- .../swing/content/config/TuttiConfigUIHandler.java | 9 +- .../ui/swing/content/cruise/EditCruiseUIModel.java | 6 +- .../operation/EditFishingOperationUIHandler.java | 25 +- .../operation/EditFishingOperationUIModel.java | 6 +- .../operation/catches/EditCatchesUIModel.java | 15 +- .../operation/catches/SampleCategoryAble.java | 2 + .../catches/SampleCategoryColumnIdentifier.java | 7 + .../accidental/AccidentalBatchRowModel.java | 6 +- .../create/CreateAccidentalBatchUIHandler.java | 18 +- .../catches/benthos/BenthosBatchRowModel.java | 23 +- .../catches/benthos/BenthosBatchTableModel.java | 16 +- .../catches/benthos/BenthosBatchUIHandler.java | 34 +- .../create/CreateBenthosBatchUIHandler.java | 12 - .../frequency/BenthosFrequencyCellComponent.java | 1 + .../frequency/BenthosFrequencyRowModel.java | 5 + .../benthos/frequency/BenthosFrequencyUI.css | 14 +- .../benthos/frequency/BenthosFrequencyUI.jaxx | 5 +- .../frequency/BenthosFrequencyUIHandler.java | 5 +- .../benthos/frequency/BenthosFrequencyUIModel.java | 83 ++- .../IndividualObservationBatchRowModel.java | 6 +- .../CreateIndividualObservationBatchUIHandler.java | 19 +- .../marinelitter/MarineLitterBatchRowModel.java | 6 +- .../create/CreateMarineLitterBatchUIHandler.java | 19 +- .../catches/species/SpeciesBatchRowModel.java | 25 +- .../catches/species/SpeciesBatchTableModel.java | 16 +- .../catches/species/SpeciesBatchUIHandler.java | 33 +- .../create/CreateSpeciesBatchUIHandler.java | 12 - .../frequency/SpeciesFrequencyCellComponent.java | 1 + .../frequency/SpeciesFrequencyRowModel.java | 7 +- .../species/frequency/SpeciesFrequencyUI.css | 14 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 5 +- .../frequency/SpeciesFrequencyUIHandler.java | 31 +- .../species/frequency/SpeciesFrequencyUIModel.java | 83 ++- .../content/protocol/EditProtocolUIHandler.java | 4 +- .../util/attachment/AttachmentModelAware.java | 4 +- .../swing/util/editor/TuttiLocationTableCell.java | 4 +- .../ui/swing/util/editor/VesselTableCell.java | 4 +- .../ui/swing/util/species/SelectSpeciesUI.jaxx | 5 +- .../swing/util/species/SelectSpeciesUIHandler.java | 18 +- .../BenthosFrequencyUIModel-error-validation.xml | 11 + ...BenthosFrequencyUIModel-warning-validation.xml} | 9 +- .../SpeciesFrequencyUIModel-error-validation.xml | 11 + ...SpeciesFrequencyUIModel-warning-validation.xml} | 9 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 7 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 13 +- 138 files changed, 1456 insertions(+), 2611 deletions(-) delete mode 100644 src/update/tutti-application-dev.properties delete mode 100644 tutti-persistence/src/main/java/fr/ifremer/adagio/core/dao/referential/pmfm/MatrixId2.java delete mode 100644 tutti-persistence/src/main/java/fr/ifremer/adagio/core/dao/referential/pmfm/ObjectTypeCode2.java delete mode 100644 tutti-persistence/src/main/java/fr/ifremer/adagio/core/dao/referential/pmfm/QualitativeValueId2.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/util/DateTimes.java delete mode 100644 tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.adagio.core.service.technical.sanity.task.DatabaseSanityTask delete mode 100644 tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.adagio.core.service.technical.synchro.specific.ReferentialSynchroSpecificTableTask 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 copy tutti-service/src/main/java/fr/ifremer/tutti/service/catches/{WeightComputingService.java => WeightComputingService.java.orig} (98%) 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 delete mode 100644 tutti-service/src/test/resources/bigfin/importbigfin-invalid.csv create mode 100644 tutti-service/src/test/resources/bigfin/importbigfin-warnings.csv 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/resources/fr/ifremer/tutti/ui/swing/content/{cruise/EditCruiseUIModel-edit-warning-validation.xml => operation/catches/benthos/frequency/BenthosFrequencyUIModel-warning-validation.xml} (84%) copy tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/{cruise/EditCruiseUIModel-edit-warning-validation.xml => operation/catches/species/frequency/SpeciesFrequencyUIModel-warning-validation.xml} (84%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

[tutti] branch develop updated (d7c0335 -> 284fe2f)
by codelutin.com scm Sept. 23, 2014

Sept. 23, 2014

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 d7c0335 fixes #5825: [CAPTURE] préciser intitulé d'une fenêtre new fb11091 refs #5411 [CAPTURE] Import BIGFIN new 3c37b63 refs #5411 [CAPTURE] Import BIGFIN new aa70ff2 refs #5411 [CAPTURE] Import BIGFIN new a930c6c refs #5411 [CAPTURE] Import BIGFIN new c5d1675 refs #5411 [CAPTURE] Import BIGFIN new 284fe2f fixes #5411 [CAPTURE] Import BIGFIN 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 284fe2f9f7c18f1132637954af7d9c45a719ec21 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Sep 23 14:24:39 2014 +0200 fixes #5411 [CAPTURE] Import BIGFIN commit c5d1675e20130d1ad8801477519a9eacb3611506 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Sep 9 07:57:22 2014 +0200 refs #5411 [CAPTURE] Import BIGFIN commit a930c6ccc85ba6d2dc3e2ece744905dc93ccbc4d Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Sep 5 18:44:29 2014 +0200 refs #5411 [CAPTURE] Import BIGFIN commit aa70ff22c2bd546e6528342281b170fb306c130b Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Sep 3 17:49:38 2014 +0200 refs #5411 [CAPTURE] Import BIGFIN commit 3c37b63abcce24f64a581dce47a4655fbdc35efc Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Sep 3 16:55:06 2014 +0200 refs #5411 [CAPTURE] Import BIGFIN commit fb11091ee74cb62e4f74ec971653ae23545bb173 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Sep 3 13:27:07 2014 +0200 refs #5411 [CAPTURE] Import BIGFIN Summary of changes: .../persistence/entities/data/SpeciesBatchs.java | 21 + .../i18n/tutti-persistence_en_GB.properties | 24 + .../i18n/tutti-persistence_fr_FR.properties | 24 + .../fr/ifremer/tutti/service/TuttiCsvUtil.java | 4 + .../tutti/service/bigfin/BigfinDataRow.java | 106 ++++ .../tutti/service/bigfin/BigfinDataRowModel.java | 130 +++++ .../BigfinImportResult.java} | 44 +- .../tutti/service/bigfin/BigfinImportService.java | 611 +++++++++++++++++++++ .../tutti/service/{pupitri => bigfin}/Signs.java | 103 +++- .../resources/i18n/tutti-service_en_GB.properties | 15 + .../resources/i18n/tutti-service_fr_FR.properties | 10 + .../service/bigfin/BigfinImportServiceTest.java | 237 ++++++++ .../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 - .../filtered-resources/tutti-help-fr.properties | 26 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 7 +- ...ortPsionAction.java => ImportBigfinAction.java} | 68 ++- .../tutti/ui/swing/action/ImportPsionAction.java | 6 +- .../operation/catches/species/SpeciesBatchUI.css | 9 + .../operation/catches/species/SpeciesBatchUI.jaxx | 1 + .../catches/species/SpeciesBatchUIHandler.java | 11 +- .../species/split/SplitSpeciesBatchUIHandler.java | 8 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 14 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 11 + ...-casino-import.png => action-bigfin-import.png} | Bin 27 files changed, 1426 insertions(+), 110 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesBatchs.java 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/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%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/{ImportPsionAction.java => ImportBigfinAction.java} (62%) 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(a)codelutin.com>.

1 6

[tutti] branch develop updated (4b13a17 -> d7c0335)
by codelutin.com scm Sept. 22, 2014

Sept. 22, 2014

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 4b13a17 fix test new d7c0335 fixes #5825: [CAPTURE] préciser intitulé d'une fenê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 d7c03356755f7e73caf2effd9a4d0b640db66824 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Sep 22 16:06:46 2014 +0200 fixes #5825: [CAPTURE] préciser intitulé d'une fenêtre Summary of changes: .../tutti/ui/swing/action/SelectSpeciesForBenthosBatchAction.java | 2 +- .../tutti/ui/swing/action/SelectSpeciesForSpeciesBatchAction.java | 2 +- tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties | 2 ++ tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

[tutti] branch develop updated (aba5af6 -> 4b13a17)
by codelutin.com scm Sept. 22, 2014

Sept. 22, 2014

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 aba5af6 fixes #5804: [EXPORT] erreur export générique à analyser new 4b13a17 fix test 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 4b13a17ef99c5af2c98b076e1cfebf18a84e4686 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Sep 22 15:54:19 2014 +0200 fix test Summary of changes: .../tutti/service/export/generic/TuttiExportServiceTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

[tutti] branch develop updated (3513ff5 -> aba5af6)
by codelutin.com scm Sept. 22, 2014

Sept. 22, 2014

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 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 new aba5af6 fixes #5804: [EXPORT] erreur export générique à analyser 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 aba5af662463d1711dc879e541d9610cf3188037 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Sep 22 14:27:16 2014 +0200 fixes #5804: [EXPORT] erreur export générique à analyser Summary of changes: .../tutti/persistence/test/DatabaseResource.java | 31 +++++++- .../config/TuttiPersistenceConfigTest.java | 2 +- .../resources/tutti-test-read-dbEmpty.properties | 27 ------- .../src/test/resources/tutti-test-read.properties | 27 ------- .../service/export/generic/CatchExportModel.java | 2 +- .../ifremer/tutti/service/ServiceDbResource.java | 27 ++++++- .../generic/TuttiExportServiceAno5804Test.java | 82 ++++++++++++++++++++++ .../resources/tutti-test-read-dbCGFS.properties | 26 ------- .../resources/tutti-test-read-dbExport.properties | 26 ------- .../resources/tutti-test-read-dbMedits.properties | 25 ------- 10 files changed, 138 insertions(+), 137 deletions(-) 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/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceAno5804Test.java 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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

[tutti] branch develop updated (077ff7f -> 3513ff5)
by codelutin.com scm Sept. 16, 2014

Sept. 16, 2014

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 077ff7f [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 0301ce4 fixes #5806: [ERGO] des fautes de frappe à corriger new f0066cb fixes #5809: [CAMPAGNE] corriger Eport en Export new 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 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 3513ff503d4c9d1de1fc88731612a4f5029ffc98 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Sep 16 19:05:01 2014 +0200 fixes #5807: [TRAIT] si on décoche trait rectiligne, vider le champ distance de la valeur calculée quand on avait coché trait rectiligne commit f0066cbccc8415421e00a08cc15599b9ede965ad Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Sep 16 18:35:45 2014 +0200 fixes #5809: [CAMPAGNE] corriger Eport en Export commit 0301ce4c16d226f7c8a27b606bb0f44fc1991561 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Sep 16 18:34:18 2014 +0200 fixes #5806: [ERGO] des fautes de frappe à corriger Summary of changes: .../i18n/tutti-persistence_fr_FR.properties | 2 +- tutti-ui-swing/src/main/help/fr/dbMapping.html | 4 ++-- .../operation/EditFishingOperationUIHandler.java | 25 +++++++++++++++------- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 8 +++---- 4 files changed, 24 insertions(+), 15 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

[tutti] branch develop updated (2bb5f05 -> 077ff7f)
by codelutin.com scm Sept. 16, 2014

Sept. 16, 2014

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 2bb5f05 update db version new d1b2b52 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 9767c1f [jgitflow-maven-plugin]updating poms for branch '3.7.4' with snapshot versions new 0d2f4e4 [jgitflow-maven-plugin]updating poms for branch'release/3.7.4' with non-snapshot versions new b335414 Merge branch 'release/3.7.4' new 19d132d Merge branch 'master' into develop new 077ff7f [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 077ff7f531bcb8601fc6bb3131924f69f7eb6660 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Sep 16 09:04:40 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 19d132d9eca05e1244f5261df3b5a38790508cfc Merge: d1b2b52 b335414 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Sep 16 09:04:38 2014 +0200 Merge branch 'master' into develop commit d1b2b526c93246e3da2c1d77f63656bfc996532b Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Sep 16 09:04:38 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit b3354146dc8dfc3e57309052ddb4467ea81baf6a Merge: e6e7c4e 0d2f4e4 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Sep 16 09:04:36 2014 +0200 Merge branch 'release/3.7.4' commit 0d2f4e4f15dfcc82f76e838237ec83a4321f0531 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Sep 16 08:58:15 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.7.4' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

[tutti] branch release/3.7.4 deleted (was 0d2f4e4)
by codelutin.com scm Sept. 16, 2014

Sept. 16, 2014

This is an automated email from the git hooks/post-receive script. New change to branch release/3.7.4 in repository tutti. See http://git.codelutin.com/tutti.git was 0d2f4e4 [jgitflow-maven-plugin]updating poms for branch'release/3.7.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

[tutti] annotated tag tutti-3.7.4 created (now 9b130bb)
by codelutin.com scm Sept. 16, 2014

Sept. 16, 2014

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-3.7.4 in repository tutti. See http://git.codelutin.com/tutti.git at 9b130bb (tag) tagging b3354146dc8dfc3e57309052ddb4467ea81baf6a (commit) replaces tutti-3.7.3 tagged by Maven Release on Tue Sep 16 09:04:36 2014 +0200 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 3.7.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