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

branch develop-3.x updated (bc7ca65 -> db95b7f)
by codelutin.com scm 28 Apr '15

28 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch develop-3.x in repository tutti. See http://git.codelutin.com/tutti.git from bc7ca65 fix NPe sur une caracteristique de type qualitative (fixes #7023) new db95b7f [jgitflow-maven-plugin]updating poms for 3.13.12-SNAPSHOT development 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 db95b7f677fd1f6824892bcb2c71ce70dc433645 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 28 14:28:46 2015 +0000 [jgitflow-maven-plugin]updating poms for 3.13.12-SNAPSHOT development 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 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (a616426 -> fa09976)
by codelutin.com scm 28 Apr '15

28 Apr '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 a616426 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new fa09976 fix NPe sur une caracteristique de type qualitative (fixes #7023) 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 fa09976727db0aa382d6f4622c5fa1784ec01693 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 28 16:19:29 2015 +0200 fix NPe sur une caracteristique de type qualitative (fixes #7023) Summary of changes: .../persistence/service/FishingOperationPersistenceServiceImpl.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-3.x updated (bc4610d -> bc7ca65)
by codelutin.com scm 28 Apr '15

28 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch develop-3.x in repository tutti. See http://git.codelutin.com/tutti.git discards bc4610d fix NPe sur une caracteristique de type qualitative (refs #7023) new bc7ca65 fix NPe sur une caracteristique de type qualitative (fixes #7023) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (bc4610d) \ N -- N -- N refs/heads/develop-3.x (bc7ca65) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. 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 bc7ca656225c9bff7f833cf5debff420470d8611 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 28 16:19:29 2015 +0200 fix NPe sur une caracteristique de type qualitative (fixes #7023) Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop-3.x updated (d8e3c0e -> bc4610d)
by codelutin.com scm 28 Apr '15

28 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch develop-3.x in repository tutti. See http://git.codelutin.com/tutti.git from d8e3c0e [jgitflow-maven-plugin]Updating develop poms back to pre merge state new bc4610d fix NPe sur une caracteristique de type qualitative (refs #7023) 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 bc4610d5e00f0bd8c6e9fe9c39887e26f16faea9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 28 16:19:29 2015 +0200 fix NPe sur une caracteristique de type qualitative (refs #7023) Summary of changes: .../persistence/service/FishingOperationPersistenceServiceImpl.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 (5eb7a22 -> a616426)
by codelutin.com scm 28 Apr '15

28 Apr '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 5eb7a22 [jgitflow-maven-plugin]updating poms for 4.0-RC5-SNAPSHOT development new 3d96d02 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new a5c8891 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC4' with non-snapshot versions new 58bd046 add license header new 3998c48 Merge branch 'release/4.0-RC4' new 56834e2 Merge branch 'master' into develop new a616426 [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 a6164265568a9b350170c22c7b14a8cd74d29242 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 28 13:32:26 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 56834e29d3d8aa3f0ae91caf0de27c3f73b3f96e Merge: 3d96d02 3998c48 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 28 13:32:26 2015 +0000 Merge branch 'master' into develop commit 3d96d0232ebe22ced868538bb8903ef9773b27ac Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 28 13:32:25 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 3998c48913d06826b70a7d8f736dfbaf25ba581d Merge: b987ea6 58bd046 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 28 13:32:22 2015 +0000 Merge branch 'release/4.0-RC4' commit 58bd046b1486ef42cc97b1672dffc843a047f01f Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 28 13:32:06 2015 +0000 add license header commit a5c8891685453b361f65cab454791fb4d4ec0163 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 28 13:23:13 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC4' with non-snapshot versions Summary of changes: ...enericFormatReferentialSpeciesImportResult.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch release/4.0-RC4 deleted (was 58bd046)
by codelutin.com scm 28 Apr '15

28 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-RC4 in repository tutti. See http://git.codelutin.com/tutti.git was 58bd046 add license header 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

branch release/4.0-RC4 updated (bf4cbc8 -> 58bd046)
by codelutin.com scm 28 Apr '15

28 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-RC4 in repository tutti. See http://git.codelutin.com/tutti.git from bf4cbc8 correction du facteur d'elevation pour l'export generique (refs #7021) adds a5c8891 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC4' with non-snapshot versions adds 58bd046 add license header 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 +- ...enericFormatReferentialSpeciesImportResult.java | 24 ++++++++++++++++++++++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 8 files changed, 31 insertions(+), 7 deletions(-) -- 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.0-RC4 created (now 4a7e4ff)
by codelutin.com scm 28 Apr '15

28 Apr '15

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-4.0-RC4 in repository tutti. See http://git.codelutin.com/tutti.git at 4a7e4ff (tag) tagging 3998c48913d06826b70a7d8f736dfbaf25ba581d (commit) replaces tutti-4.0-RC3 tagged by Maven Release on Tue Apr 28 13:32:23 2015 +0000 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.0-RC4 ----------------------------------------------------------------------- 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 master updated (b987ea6 -> 3998c48)
by codelutin.com scm 28 Apr '15

28 Apr '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 b987ea6 Merge branch 'release/4.0-RC3' adds 9f77610 [jgitflow-maven-plugin]updating poms for 4.0-RC4-SNAPSHOT development adds 31a054b [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds eb9214d Merge branch 'master' into develop adds cf76282 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 3b1a607 refs #6894 uniquement affichier la popup de la combo uniquement si la combo est encore visible adds c93db12 fixes #6984: [ERGONOMIE] Problème sur l'écran de sélection des campagnes Merge branch 'feature/6984' into develop adds 0a2a373 refs #6989 correction du test pour supprimer les lots especes ou benthos adds 8f4f316 fixes #6989: [IMPORT GENERIQUE] si on importe que le benthos il vide toutes les espèces Merge branch 'feature/6989' into develop adds 68a81d5 refs #6990 sauvegarde a l'import / export de taxons temporaires des referenceTaxonIds (uniquement pour la partie format generique) adds b2ea656 refs #6990 on conserve la map de translation des referenceTaxonId pour les taxons temporaires importes adds b6e640f refs #6990 utilisation de la table de translation des referenceTaxonId lors de l'import du protocole adds ed01b4f refs #6990 utilisation aussi de la translation via referenceTaxonId lors du reste de l'import adds a87fc39 fixes #6990: [IMPORT GENERIQUE] Mauvaise gestion des espèces temporaires Merge branch 'feature/6990' into develop adds e3a504b refs #6973 bien deselectionne le protocol avant sa suppression + supprimer ancien protocol, avant de repositionner un eventuel protocol selectionne avant import adds e1e5ca2 refs #6973 Amélioration du code de nettoyage après import adds b863962 fixes #6973: [IMPORT GENERIQUE] Le protocol n'est pas bien supprimé après une simple validation Merge branch 'feature/6973' into develop adds 58f5e7e refs #6993 on reapplique les mises à jour de l'aide sans utiliser directement les fichiers de Vincent adds c8ac90c refs #6924 changement traduction adds 0c7254c refs #6916 le bouton de choix des synonymes d'espèce ne capture plus le focus adds cb1949a on ne modifie pas le modèle tant qu'on est dans le thread de l'action longue (refs #7020) adds 4d49203 correction du facteur d'elevation pour les export pdf et csv (refs #7021) adds bf4cbc8 correction du facteur d'elevation pour l'export generique (refs #7021) adds a5c8891 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC4' with non-snapshot versions adds 58bd046 add license header adds 3998c48 Merge branch 'release/4.0-RC4' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../entities/protocol/TuttiProtocols.java | 10 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../tutti/service/csv/SpeciesParserFormatter.java | 22 +- .../tutti/service/export/ExportCatchContext.java | 50 +-- .../genericformat/GenericFormatContextSupport.java | 10 +- .../genericformat/GenericFormatExportContext.java | 2 +- .../GenericFormatImportEntityParserFactory.java | 2 +- .../GenericFormatReferentialImportResult.java | 6 +- ...enericFormatReferentialSpeciesImportResult.java | 77 +++++ .../exportactions/CreateCatchBatchRowsAction.java | 13 +- .../importactions/ImportCatchAction.java | 37 ++- .../importactions/ImportProtocolAction.java | 6 +- .../ImportReferentialSpeciesAction.java | 10 +- .../importactions/RestoreAfterImportAction.java | 35 +- .../importactions/RestoreAfterValidateAction.java | 3 + .../ReferentialTemporarySpeciesService.java | 4 +- .../consumer/CsvConsumerForTemporarySpecies.java | 4 +- .../service/referential/csv/SpeciesModel.java | 22 +- .../tutti/service/referential/csv/SpeciesRow.java | 14 + .../producer/CsvProducerForTemporarySpecies.java | 4 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- tutti-ui-swing/src/main/help/fr/config.html | Bin 15560 -> 7634 bytes .../src/main/help/fr/editFishingOperation.html | Bin 135058 -> 59101 bytes tutti-ui-swing/src/main/help/fr/editProtocol.html | Bin 21122 -> 9585 bytes .../src/main/help/fr/editSampleCategory.html | Bin 7262 -> 3042 bytes tutti-ui-swing/src/main/help/fr/faq.html | Bin 29980 -> 15427 bytes .../main/help/fr/manageTemporaryReferential.html | Bin 10688 -> 4907 bytes tutti-ui-swing/src/main/help/fr/report.html | Bin 6128 -> 2066 bytes tutti-ui-swing/src/main/help/fr/selectCruise.html | Bin 16034 -> 6626 bytes .../catches/actions/ComputeBatchWeightsAction.java | 366 ++++++++++++++------- .../catches/benthos/BenthosBatchTableModel.java | 8 +- .../benthos/create/CreateBenthosBatchUI.css | 1 + .../create/CreateIndividualObservationBatchUI.css | 1 + .../catches/species/SpeciesBatchTableModel.java | 8 +- .../species/create/CreateSpeciesBatchUI.css | 1 + .../util/actions/ShowComboBoxPopupActions.java | 5 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 6 +- 42 files changed, 521 insertions(+), 220 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatReferentialSpeciesImportResult.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - Tutti 4.0-RC4 released
by codelutin.com Release Notification 28 Apr '15

28 Apr '15

The Tutti team is pleased to announce the tutti-4.0-RC4 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: https://tutti.codelutin.com Changes ------- Changes in this version include: Fixed Bugs: o [IMPORT GENERIQUE] Le protocol n'est pas bien supprimé après une simple validation Issue: 6973. Thanks to Vincent BADTS. Resolved by tchemit. o [ERGONOMIE] Problème sur l'écran de sélection des campagnes Issue: 6984. Thanks to Tony Chemit. Resolved by tchemit. o [IMPORT GENERIQUE] si on importe que le benthos il vide toutes les espèces Issue: 6989. Thanks to Vincent BADTS. Resolved by tchemit. o [IMPORT GENERIQUE] Mauvaise gestion des espèces temporaires Issue: 6990. Thanks to Vincent BADTS. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/tutti/files * tutti-ichtyometer-4.0-RC4-tools.zip - http://forge.codelutin.com/attachments/download/3176 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0