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

branch support/3.13.x updated (ad684b7 -> 4ee0529)
by codelutin.com scm 15 Apr '15

15 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git from ad684b7 fixes #6947: [CONF] Incohérence IHM + Erreur java si trie des colonnes dans Fichier/Configuration Merge branch 'feature/6947' into support/3.13.x new 1f5e000 refs #6908 Deplacement a la main d'une arborescence si pas possible de manière atomique new 4ee0529 fixes #6908: [TECH] perte dossier Tutti dans la mise à jour vers 3.13.6 Merge branch 'feature/6908' into support/3.13.x 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 4ee05296aaa5ef3b5de2c6fd062cfafb6871898c Merge: ad684b7 1f5e000 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 15 08:37:07 2015 +0200 fixes #6908: [TECH] perte dossier Tutti dans la mise à jour vers 3.13.6 Merge branch 'feature/6908' into support/3.13.x commit 1f5e000ddffbed86df421b6ebf5cc4f38f2f0a1f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 15 08:33:40 2015 +0200 refs #6908 Deplacement a la main d'une arborescence si pas possible de manière atomique Summary of changes: tutti-ui-swing-updater/pom.xml | 7 ++ .../ifremer/tutti/ui/swing/updater/MoveHelper.java | 97 ++++++++++++++++++++++ .../fr/ifremer/tutti/ui/swing/updater/Updater.java | 17 +++- .../ui/swing/updater/UpdaterFileSystemPathes.java | 27 +++++- .../tutti/ui/swing/updater/MoveHelperTest.java | 28 +++++++ 5 files changed, 171 insertions(+), 5 deletions(-) create mode 100644 tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/MoveHelper.java create mode 100644 tutti-ui-swing-updater/src/test/java/fr/ifremer/tutti/ui/swing/updater/MoveHelperTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (02f1bb0 -> e0fee6c)
by codelutin.com scm 15 Apr '15

15 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 02f1bb0 refs #6947 desactiver le tri sur les lignes des tableaux dans la configuration new 1b99298 refs #6935 déplacement atomique d'un module à installer, sinon tentative copie, puis message si vraiment pas possible new 2bd9d0a refs #6935 debut de correction new d81eb0a refs #6942 renommage de la colone en Lot_A_Confirmer new fdb99b4 refs #6935 Deplacement a la main d'une arborescence si pas possible de manière atomique new e0fee6c fixes #6935: Erreur mise à jour de 3.13.7 vers 4.0RC1 Merge branch 'feature/6935' into develop 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 e0fee6c2ae3a295c6a2fd1394680bc783df94897 Merge: 02f1bb0 fdb99b4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 15 08:33:45 2015 +0200 fixes #6935: Erreur mise à jour de 3.13.7 vers 4.0RC1 Merge branch 'feature/6935' into develop commit fdb99b4c1d2bf35fcd2d2c034e98c607e10d931f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 15 08:33:40 2015 +0200 refs #6935 Deplacement a la main d'une arborescence si pas possible de manière atomique commit d81eb0a29800e844f737d3e31f867bc51d4ff3e0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 14 12:15:34 2015 +0200 refs #6942 renommage de la colone en Lot_A_Confirmer commit 2bd9d0adb2db2bf0fe342fe74166d526886919db Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 14 12:13:48 2015 +0200 refs #6935 debut de correction commit 1b99298c1df313abdc859bbb3328376d6c7c5153 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Apr 13 16:29:13 2015 +0200 refs #6935 déplacement atomique d'un module à installer, sinon tentative copie, puis message si vraiment pas possible Summary of changes: tutti-ui-swing-updater/pom.xml | 7 ++ .../ifremer/tutti/ui/swing/updater/MoveHelper.java | 97 ++++++++++++++++++++++ .../fr/ifremer/tutti/ui/swing/updater/Updater.java | 31 +++++-- .../ui/swing/updater/UpdaterFileSystemPathes.java | 27 +++++- .../tutti/ui/swing/updater/MoveHelperTest.java | 28 +++++++ 5 files changed, 181 insertions(+), 9 deletions(-) create mode 100644 tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/MoveHelper.java create mode 100644 tutti-ui-swing-updater/src/test/java/fr/ifremer/tutti/ui/swing/updater/MoveHelperTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch support/3.13.x updated (fe5e508b -> ad684b7)
by codelutin.com scm 14 Apr '15

14 Apr '15

This is an automated email from the git hooks/post-receive script. New change to branch support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git from fe5e508b set version to snapshots new 8a80d7d refs #6947 desactiver le tri sur les lignes des tableaux dans la configuration new ad684b7 fixes #6947: [CONF] Incohérence IHM + Erreur java si trie des colonnes dans Fichier/Configuration Merge branch 'feature/6947' into support/3.13.x 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 ad684b753f5bfc4b884a2fb55fdcfa4661ff4bdd Merge: fe5e508b 8a80d7d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 14 19:51:41 2015 +0200 fixes #6947: [CONF] Incohérence IHM + Erreur java si trie des colonnes dans Fichier/Configuration Merge branch 'feature/6947' into support/3.13.x commit 8a80d7dd65799c590a6768fb99e31932c020a339 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 14 19:51:18 2015 +0200 refs #6947 desactiver le tri sur les lignes des tableaux dans la configuration Summary of changes: .../tutti/ui/swing/content/config/TuttiConfigUIHandler.java | 11 +++++++++++ 1 file changed, 11 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (bc11306 -> 02f1bb0)
by codelutin.com scm 14 Apr '15

14 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 bc11306 fixes #6941: [IMPORT GENERIQUE] perte des poids sous échantillons Merge branch 'feature/6959' into develop new 02f1bb0 refs #6947 desactiver le tri sur les lignes des tableaux dans la configuration 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 02f1bb0672ec67cd140226eb1eddd5d0a1b1d638 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 14 19:51:18 2015 +0200 refs #6947 desactiver le tri sur les lignes des tableaux dans la configuration Summary of changes: .../tutti/ui/swing/content/config/TuttiConfigUIHandler.java | 11 +++++++++++ 1 file changed, 11 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (877fac9 -> bc11306)
by codelutin.com scm 14 Apr '15

14 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 877fac9 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 5111388 refs #6958 On ne supprime jamais le nombre sur un lot (le fait qu'il soit calculé veut juste dire que ce n'est pas une mensuration) new 73fb2a6 fixes #6958: [IMPORT GENERIQUE] Non import du nombre sur un lot Merge branch 'feature/6958' into develop new fa42d9b refs #6959 calculer le numéro d'ordre à l'import des lots new 5bd47d9 refs #6941 Sauvegarde du poids de sous-échantillon new bc11306 fixes #6941: [IMPORT GENERIQUE] perte des poids sous échantillons Merge branch 'feature/6959' into develop 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 bc11306cdd27cf7249695590911fef765a91aafc Merge: 73fb2a6 5bd47d9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 14 19:32:06 2015 +0200 fixes #6941: [IMPORT GENERIQUE] perte des poids sous échantillons Merge branch 'feature/6959' into develop commit 5bd47d984de0279bf98e7834fb48f06680bf678d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 14 19:32:01 2015 +0200 refs #6941 Sauvegarde du poids de sous-échantillon commit fa42d9bcb075322daa4c51bd36ab8242e023285a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 14 19:12:54 2015 +0200 refs #6959 calculer le numéro d'ordre à l'import des lots commit 73fb2a65fa5556a7e24347b931b1a074d245549e Merge: 877fac9 5111388 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 14 19:12:00 2015 +0200 fixes #6958: [IMPORT GENERIQUE] Non import du nombre sur un lot Merge branch 'feature/6958' into develop commit 511138811a33bc985c17c3e60eac3b0c98b6d7a8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 14 19:11:37 2015 +0200 refs #6958 On ne supprime jamais le nombre sur un lot (le fait qu'il soit calculé veut juste dire que ce n'est pas une mensuration) Summary of changes: .../service/genericformat/consumer/CsvConsumerForCatch.java | 10 +--------- .../service/genericformat/importactions/ImportCatchAction.java | 8 ++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch develop updated (07e5ff5 -> 877fac9)
by codelutin.com scm 14 Apr '15

14 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 07e5ff5 [jgitflow-maven-plugin]updating poms for 4.0-RC3-SNAPSHOT development new 5bce408 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new d1af030 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC2' with non-snapshot versions new 6cca7a9 Merge branch 'release/4.0-RC2' new 2b463bb Merge branch 'master' into develop new 877fac9 [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 877fac95655f6fdb07fd48b88eecb017a0c35002 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 14 13:45:51 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 2b463bbc6723c0736a82509f3923dcee35c0f74f Merge: 5bce408 6cca7a9 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 14 13:45:50 2015 +0000 Merge branch 'master' into develop commit 5bce408bc0823ca0d7258df000c8517f3c5293ab Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 14 13:45:50 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 6cca7a9fcd1a10de979289dd32258396ced405bd Merge: ec86284 d1af030 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 14 13:45:43 2015 +0000 Merge branch 'release/4.0-RC2' commit d1af030004e5a9c1aca246af063219b4f41c55cf Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Apr 14 13:39:34 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC2' 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

branch release/4.0-RC2 deleted (was d1af030)
by codelutin.com scm 14 Apr '15

14 Apr '15

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 was d1af030 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC2' 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

annotated tag tutti-4.0-RC2 created (now 5590949)
by codelutin.com scm 14 Apr '15

14 Apr '15

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 14 Apr '15

14 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 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 14 Apr '15

14 Apr '15

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