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

annotated tag tutti-4.0-RC2 created (now 5590949)
by codelutin.com scm April 14, 2015

April 14, 2015

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-4.0-RC2 in repository tutti. See http://git.codelutin.com/tutti.git at 5590949 (tag) tagging 6cca7a9fcd1a10de979289dd32258396ced405bd (commit) replaces tutti-4.0-RC1 tagged by Maven Release on Tue Apr 14 13:45:44 2015 +0000 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.0-RC2 ----------------------------------------------------------------------- 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 (ec86284 -> 6cca7a9)
by codelutin.com scm April 14, 2015

April 14, 2015

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 ec86284 Merge branch 'release/4.0-RC1' adds 7f00023 [jgitflow-maven-plugin]updating poms for 4.0-RC2-SNAPSHOT development adds 8e6ec7c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds e810999 Merge branch 'master' into develop adds 15dfa6a [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds d7d2b33 fix doc adds e868c4d refs #6930 pas de rendu en html sur les traits (trop couteux) adds 0d80815 fixes #6930: [IMPORT GENERIQUE] Mauvais affichage des données existantes Merge branch 'feature/6930' into develop adds daee920 refs #6936 Ajout d'une colonne par catégorie pour contenir son éventuel commentaire adds 9011822 fixes #6936: [IMPORT GENERIQUE] perte des commentaires à l'import Merge branch 'feature/6936' into develop adds 9b794b5 refs #6940 fix NPE when removing validation result adds 0fb90db refs #6904 forbids to replay import once it has be done (you need then to revalidate import) adds 6af7c27 fixes #6940: [IMPORT GENERIQUE] Interdire un réimport juste après l'import Merge branch 'feature/6940' into develop adds 8e02ae3 refs #6931 Ajout d'un garde-fou sur le timer d'affichage des actions popups adds d4fd93f fixes #6931: [TECH] erreur après avoir supprimé un protocole Merge branch 'feature/6931' into develop adds 42a1150 refs #6942 import-export du drapeau espèce à confirmer adds 17e4207 fixes #6942: [IMPORT GENERIQUE] perte des cases cochées Merge branch 'feature/6942' into develop adds 3557260 refs #6249 reniommage de la colonne en Lot_A_Confirmer adds 6eed9e0 refs #6956 Ajout de l'option dans la configuration adds 0da3fda arret de la validation si le nombre de lignes en erreur est trop grand adds 3dd567b fixes #6956: [IMPORT GENERIQUE] Ne pas valider les fichiers au dela d'un nombre d'erreurs configurable Merge branch 'feature/6956' into develop adds d1af030 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC2' with non-snapshot versions adds 6cca7a9 Merge branch 'release/4.0-RC2' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- src/site/rst/dbversions.rst | 2 ++ tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 5 +++ .../fr/ifremer/tutti/TuttiConfigurationOption.java | 7 ++++ .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../fr/ifremer/tutti/service/csv/CsvComsumer.java | 4 +-- .../genericformat/GenericFormatCsvFileResult.java | 17 +++++++++- .../GenericFormatImportConfiguration.java | 13 ++++++++ .../genericformat/GenericFormatImportRequest.java | 4 +++ .../consumer/CsvConsumerForCatch.java | 4 +++ .../service/genericformat/csv/CatchModel.java | 12 ++++--- .../tutti/service/genericformat/csv/CatchRow.java | 38 ++++++++-------------- .../genericformat/csv/ExportSampleCategory.java | 14 +++++++- .../importactions/ImportActionSupport.java | 13 ++++++++ .../ValidateAccidentalCatchAction.java | 11 ++++++- .../importactions/ValidateCatchAction.java | 11 ++++++- .../ValidateGearCaracteristicAction.java | 11 ++++++- .../ValidateIndividualObservationAction.java | 11 ++++++- .../importactions/ValidateMarineLitterAction.java | 11 ++++++- .../importactions/ValidateOperationAction.java | 11 ++++++- .../importactions/ValidateParameterAction.java | 11 ++++++- .../importactions/ValidateSurveyAction.java | 11 ++++++- .../producer/CsvProducerForCatch.java | 10 +++--- .../ftl/genericFormatValidateReport_fr.ftl | 3 ++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 8 +++-- .../swing/content/config/TuttiConfigUIHandler.java | 3 ++ .../genericformat/GenericFormatImportUI.css | 7 +++- .../genericformat/GenericFormatImportUI.jaxx | 30 ++++++++--------- .../genericformat/GenericFormatImportUIModel.java | 7 ++-- .../actions/GenericFormatValidateAction.java | 3 +- .../genericformat/tree/DataSelectTreeModel.java | 10 +++--- .../tree/ImportDataSelectTreeCellRenderer.java | 2 +- .../ui/swing/util/AbstractTuttiUIHandler.java | 8 ++++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 42 files changed, 249 insertions(+), 81 deletions(-) -- 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-RC2 updated (3dd567b -> d1af030)
by codelutin.com scm April 14, 2015

April 14, 2015

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-RC2 in repository tutti. See http://git.codelutin.com/tutti.git from 3dd567b fixes #6956: [IMPORT GENERIQUE] Ne pas valider les fichiers au dela d'un nombre d'erreurs configurable Merge branch 'feature/6956' into develop adds d1af030 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC2' 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 +- 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 0

[ANN] - Tutti 4.0-RC2 released
by codelutin.com Release Notification April 14, 2015

April 14, 2015

The Tutti team is pleased to announce the tutti-4.0-RC2 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: New features: o [IMPORT GENERIQUE] Interdire un réimport juste après l'import Issue: 6940. Thanks to Tony Chemit. Resolved by tchemit. o [IMPORT GENERIQUE] Ne pas valider les fichiers au dela d'un nombre d'erreurs configurable Issue: 6956. Thanks to Tony Chemit. Resolved by tchemit. Fixed Bugs: o [IMPORT GENERIQUE] Mauvais affichage des données existantes Issue: 6930. Thanks to Léo Kaufmann. Resolved by tchemit. o [TECH] erreur après avoir supprimé un protocole Issue: 6931. Thanks to Vincent BADTS. Resolved by tchemit. o [IMPORT GENERIQUE] perte des commentaires à l'import Issue: 6936. Thanks to Vincent BADTS. Resolved by tchemit. o [IMPORT GENERIQUE] perte des cases cochées Issue: 6942. 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-RC2-tools.zip - http://forge.codelutin.com/attachments/download/3095 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

branch release/4.0-RC2 created (now 3dd567b)
by codelutin.com scm April 14, 2015

April 14, 2015

This is an automated email from the git hooks/post-receive script. New change to branch release/4.0-RC2 in repository tutti. See http://git.codelutin.com/tutti.git at 3dd567b fixes #6956: [IMPORT GENERIQUE] Ne pas valider les fichiers au dela d'un nombre d'erreurs configurable Merge branch 'feature/6956' into develop 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 develop updated (3dd567b -> 07e5ff5)
by codelutin.com scm April 14, 2015

April 14, 2015

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 3dd567b fixes #6956: [IMPORT GENERIQUE] Ne pas valider les fichiers au dela d'un nombre d'erreurs configurable Merge branch 'feature/6956' into develop new 07e5ff5 [jgitflow-maven-plugin]updating poms for 4.0-RC3-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 07e5ff5ec810a2f6210bc36b482572389ce87a08 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 14 13:31:53 2015 +0000 [jgitflow-maven-plugin]updating poms for 4.0-RC3-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 (17e4207 -> 3dd567b)
by codelutin.com scm April 14, 2015

April 14, 2015

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 17e4207 fixes #6942: [IMPORT GENERIQUE] perte des cases cochées Merge branch 'feature/6942' into develop new 3557260 refs #6249 reniommage de la colonne en Lot_A_Confirmer new 6eed9e0 refs #6956 Ajout de l'option dans la configuration new 0da3fda arret de la validation si le nombre de lignes en erreur est trop grand new 3dd567b fixes #6956: [IMPORT GENERIQUE] Ne pas valider les fichiers au dela d'un nombre d'erreurs configurable Merge branch 'feature/6956' into develop The 4 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 3dd567ba497b74d0a634e5fd5126e93f391a3b4a Merge: 17e4207 0da3fda Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 14 15:23:41 2015 +0200 fixes #6956: [IMPORT GENERIQUE] Ne pas valider les fichiers au dela d'un nombre d'erreurs configurable Merge branch 'feature/6956' into develop commit 0da3fdade03312855120fc6084dce71fe62b7480 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 14 14:58:09 2015 +0200 arret de la validation si le nombre de lignes en erreur est trop grand commit 6eed9e0c453b86a968f2b7ae59ec6ed683c435d3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 14 14:57:44 2015 +0200 refs #6956 Ajout de l'option dans la configuration commit 3557260da0a0f51f1ac060db4db852e8ee98fade Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 14 14:56:04 2015 +0200 refs #6249 reniommage de la colonne en Lot_A_Confirmer Summary of changes: .../main/java/fr/ifremer/tutti/TuttiConfiguration.java | 5 +++++ .../java/fr/ifremer/tutti/TuttiConfigurationOption.java | 7 +++++++ .../resources/i18n/tutti-persistence_en_GB.properties | 1 + .../resources/i18n/tutti-persistence_fr_FR.properties | 1 + .../java/fr/ifremer/tutti/service/csv/CsvComsumer.java | 4 ++-- .../genericformat/GenericFormatCsvFileResult.java | 17 ++++++++++++++++- .../genericformat/GenericFormatImportConfiguration.java | 13 +++++++++++++ .../genericformat/GenericFormatImportRequest.java | 4 ++++ .../tutti/service/genericformat/csv/CatchModel.java | 4 ++-- .../importactions/ImportActionSupport.java | 13 +++++++++++++ .../importactions/ValidateAccidentalCatchAction.java | 11 ++++++++++- .../importactions/ValidateCatchAction.java | 11 ++++++++++- .../importactions/ValidateGearCaracteristicAction.java | 11 ++++++++++- .../ValidateIndividualObservationAction.java | 11 ++++++++++- .../importactions/ValidateMarineLitterAction.java | 11 ++++++++++- .../importactions/ValidateOperationAction.java | 11 ++++++++++- .../importactions/ValidateParameterAction.java | 11 ++++++++++- .../importactions/ValidateSurveyAction.java | 11 ++++++++++- .../resources/ftl/genericFormatValidateReport_fr.ftl | 3 +++ .../ui/swing/content/config/TuttiConfigUIHandler.java | 3 +++ .../genericformat/GenericFormatImportUIModel.java | 4 +++- .../actions/GenericFormatValidateAction.java | 3 ++- .../main/resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../main/resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 24 files changed, 157 insertions(+), 15 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch feature/migration_jaxx_3 created (now 8e74e9e)
by codelutin.com scm April 13, 2015

April 13, 2015

This is an automated email from the git hooks/post-receive script. New change to branch feature/migration_jaxx_3 in repository tutti. See http://git.codelutin.com/tutti.git at 8e74e9e utilisation jaxx 3.0 This branch includes the following new commits: new 8e74e9e utilisation jaxx 3.0 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 8e74e9e9d5ea53d052ed15de9eef511de2aff58e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 13 12:27:12 2015 +0200 utilisation jaxx 3.0 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (d4fd93f -> 17e4207)
by codelutin.com scm April 13, 2015

April 13, 2015

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 d4fd93f fixes #6931: [TECH] erreur après avoir supprimé un protocole Merge branch 'feature/6931' into develop new 42a1150 refs #6942 import-export du drapeau espèce à confirmer new 17e4207 fixes #6942: [IMPORT GENERIQUE] perte des cases cochées Merge branch 'feature/6942' into develop 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 17e42075a3d033f1e163b6f0cdbe01c66f4339ec Merge: d4fd93f 42a1150 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 13 15:58:38 2015 +0200 fixes #6942: [IMPORT GENERIQUE] perte des cases cochées Merge branch 'feature/6942' into develop commit 42a1150b4526d00dd619806a4c1630019fb99fac Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 13 15:58:35 2015 +0200 refs #6942 import-export du drapeau espèce à confirmer Summary of changes: .../genericformat/consumer/CsvConsumerForCatch.java | 2 ++ .../tutti/service/genericformat/csv/CatchModel.java | 2 ++ .../tutti/service/genericformat/csv/CatchRow.java | 18 +++++++++++++----- .../genericformat/producer/CsvProducerForCatch.java | 2 ++ 4 files changed, 19 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (6af7c27 -> d4fd93f)
by codelutin.com scm April 11, 2015

April 11, 2015

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 6af7c27 fixes #6940: [IMPORT GENERIQUE] Interdire un réimport juste après l'import Merge branch 'feature/6940' into develop new 8e02ae3 refs #6931 Ajout d'un garde-fou sur le timer d'affichage des actions popups new d4fd93f fixes #6931: [TECH] erreur après avoir supprimé un protocole Merge branch 'feature/6931' into develop 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 d4fd93fecae8abd1520f586a6b1278015a4f1dca Merge: 6af7c27 8e02ae3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 11 16:44:44 2015 +0200 fixes #6931: [TECH] erreur après avoir supprimé un protocole Merge branch 'feature/6931' into develop commit 8e02ae3793f36ee4131afd3e558266ab20900dc4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 11 16:44:40 2015 +0200 refs #6931 Ajout d'un garde-fou sur le timer d'affichage des actions popups Summary of changes: .../src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 8 ++++++-- .../fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java | 8 +++++++- 2 files changed, 13 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2