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

branch support/3.13.x updated (81ee16a -> a225896)
by codelutin.com scm 21 Apr '15

21 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 81ee16a set version to snapshots new 8a51e21 on reapplique les mises à jour de l'aide sans utiliser directement les fichiers de Vincent new a225896 fixes #6993: [AIDE] probleme d'affichage de l'aide en ligne, cf copie écran Merge branch 'feature/6993' 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 a225896392348d58636100f4dffe9f597e37a36e Merge: 81ee16a 8a51e21 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Apr 21 09:38:14 2015 +0200 fixes #6993: [AIDE] probleme d'affichage de l'aide en ligne, cf copie écran Merge branch 'feature/6993' into support/3.13.x commit 8a51e217222dc0f0ebc7435716b23c2f3f3a3fd0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Apr 19 18:16:18 2015 +0200 on reapplique les mises à jour de l'aide sans utiliser directement les fichiers de Vincent Summary of changes: 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 7286 -> 3192 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 8 files changed, 0 insertions(+), 0 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 (b863962 -> 3310b45)
by codelutin.com scm 21 Apr '15

21 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 b863962 fixes #6973: [IMPORT GENERIQUE] Le protocol n'est pas bien supprimé après une simple validation Merge branch 'feature/6973' into develop new 3310b45 on reapplique les mises à jour de l'aide sans utiliser directement les fichiers de Vincent 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 3310b45a5e5932ff98d14ff3558a27f8c8d4f565 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Apr 19 18:16:18 2015 +0200 on reapplique les mises à jour de l'aide sans utiliser directement les fichiers de Vincent Summary of changes: 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 8 files changed, 0 insertions(+), 0 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 (8f4f316 -> b863962)
by codelutin.com scm 18 Apr '15

18 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 8f4f316 fixes #6989: [IMPORT GENERIQUE] si on importe que le benthos il vide toutes les espèces Merge branch 'feature/6989' into develop new 68a81d5 refs #6990 sauvegarde a l'import / export de taxons temporaires des referenceTaxonIds (uniquement pour la partie format generique) new b2ea656 refs #6990 on conserve la map de translation des referenceTaxonId pour les taxons temporaires importes new b6e640f refs #6990 utilisation de la table de translation des referenceTaxonId lors de l'import du protocole new ed01b4f refs #6990 utilisation aussi de la translation via referenceTaxonId lors du reste de l'import new a87fc39 fixes #6990: [IMPORT GENERIQUE] Mauvaise gestion des espèces temporaires Merge branch 'feature/6990' into develop new e3a504b refs #6973 bien deselectionne le protocol avant sa suppression + supprimer ancien protocol, avant de repositionner un eventuel protocol selectionne avant import new e1e5ca2 refs #6973 Amélioration du code de nettoyage après import new b863962 fixes #6973: [IMPORT GENERIQUE] Le protocol n'est pas bien supprimé après une simple validation Merge branch 'feature/6973' into develop The 8 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 b8639625cfc23bd7b0cacb5b02c41ea80355c27e Merge: a87fc39 e1e5ca2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 18 10:19:58 2015 +0200 fixes #6973: [IMPORT GENERIQUE] Le protocol n'est pas bien supprimé après une simple validation Merge branch 'feature/6973' into develop commit e1e5ca2032255aafae5c62e3c6873d046d6db4a6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 18 10:19:56 2015 +0200 refs #6973 Amélioration du code de nettoyage après import commit e3a504b6aade8bb9944e14967152527036c502b3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 18 10:18:25 2015 +0200 refs #6973 bien deselectionne le protocol avant sa suppression + supprimer ancien protocol, avant de repositionner un eventuel protocol selectionne avant import commit a87fc399c8168606e19fed9ace4ab704fdb44912 Merge: 8f4f316 ed01b4f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 18 10:03:24 2015 +0200 fixes #6990: [IMPORT GENERIQUE] Mauvaise gestion des espèces temporaires Merge branch 'feature/6990' into develop commit ed01b4fb5bfdcd55efec872e7c27361fcddb513e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 18 10:03:05 2015 +0200 refs #6990 utilisation aussi de la translation via referenceTaxonId lors du reste de l'import commit b6e640f00cd446b298da0e42c9b89a5bd9a0293d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 18 08:45:01 2015 +0200 refs #6990 utilisation de la table de translation des referenceTaxonId lors de l'import du protocole commit b2ea656db75a1c727e0368d12fb36d3c4ace17a8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 18 08:44:18 2015 +0200 refs #6990 on conserve la map de translation des referenceTaxonId pour les taxons temporaires importes commit 68a81d58a9a969151edd02a1e1dd7f5635a1d698 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Apr 18 08:42:41 2015 +0200 refs #6990 sauvegarde a l'import / export de taxons temporaires des referenceTaxonIds (uniquement pour la partie format generique) Summary of changes: .../entities/protocol/TuttiProtocols.java | 10 ++-- .../tutti/service/csv/SpeciesParserFormatter.java | 22 ++++++--- .../genericformat/GenericFormatContextSupport.java | 10 ++-- .../genericformat/GenericFormatExportContext.java | 2 +- .../GenericFormatImportEntityParserFactory.java | 2 +- .../GenericFormatReferentialImportResult.java | 6 +-- ...enericFormatReferentialSpeciesImportResult.java | 53 ++++++++++++++++++++++ .../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 +- 16 files changed, 158 insertions(+), 49 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 8

branch develop updated (c93db12 -> 8f4f316)
by codelutin.com scm 17 Apr '15

17 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 c93db12 fixes #6984: [ERGONOMIE] Problème sur l'écran de sélection des campagnes Merge branch 'feature/6984' into develop new 0a2a373 refs #6989 correction du test pour supprimer les lots especes ou benthos new 8f4f316 fixes #6989: [IMPORT GENERIQUE] si on importe que le benthos il vide toutes les espèces Merge branch 'feature/6989' 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 8f4f316e2a3a46ca61f09b6f1991e7e44305b8f2 Merge: c93db12 0a2a373 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 17 17:00:41 2015 +0200 fixes #6989: [IMPORT GENERIQUE] si on importe que le benthos il vide toutes les espèces Merge branch 'feature/6989' into develop commit 0a2a3734528cc060aa0257f1ac7be7585189fe81 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 17 17:00:37 2015 +0200 refs #6989 correction du test pour supprimer les lots especes ou benthos Summary of changes: .../importactions/ImportCatchAction.java | 37 ++++++++++++++-------- 1 file changed, 23 insertions(+), 14 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 (cf76282 -> c93db12)
by codelutin.com scm 16 Apr '15

16 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 cf76282 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 3b1a607 refs #6894 uniquement affichier la popup de la combo uniquement si la combo est encore visible new c93db12 fixes #6984: [ERGONOMIE] Problème sur l'écran de sélection des campagnes Merge branch 'feature/6984' 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 c93db126d62fd299bb2ffca0209ca71737daa0c7 Merge: cf76282 3b1a607 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 16 17:50:03 2015 +0200 fixes #6984: [ERGONOMIE] Problème sur l'écran de sélection des campagnes Merge branch 'feature/6984' into develop commit 3b1a607d52e87f0be44093c4534976c67fffa668 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 16 17:48:45 2015 +0200 refs #6894 uniquement affichier la popup de la combo uniquement si la combo est encore visible Summary of changes: .../tutti/ui/swing/util/actions/ShowComboBoxPopupActions.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (9f77610 -> cf76282)
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 9f77610 [jgitflow-maven-plugin]updating poms for 4.0-RC4-SNAPSHOT development new 31a054b [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 08c9baf add missing license headers new b3e3ae9 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC3' with non-snapshot versions new b987ea6 Merge branch 'release/4.0-RC3' new eb9214d Merge branch 'master' into develop new cf76282 [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 cf76282bdca9aab0438a8063ba1d379b1b6942d5 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Apr 15 14:06:14 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit eb9214d967bee99e561126079fbd41a032f9c426 Merge: 31a054b b987ea6 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Apr 15 14:06:10 2015 +0000 Merge branch 'master' into develop commit 31a054b3acbca586560572493563ed36a7d58df8 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Apr 15 14:06:08 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit b987ea6104dda1c69fd6760e839a2332e0a384c1 Merge: 6cca7a9 b3e3ae9 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Apr 15 14:06:02 2015 +0000 Merge branch 'release/4.0-RC3' commit b3e3ae96aab4f73d0704e949fc2f2dfddcfc11e6 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Apr 15 13:59:42 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC3' with non-snapshot versions commit 08c9bafc290fc43830547a3663a7e101b4ccd49a Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Apr 15 13:59:23 2015 +0000 add missing license headers Summary of changes: .../ifremer/tutti/ui/swing/updater/MoveHelper.java | 24 ++++++++++++++++++++++ .../tutti/ui/swing/updater/MoveHelperTest.java | 24 ++++++++++++++++++++++ 2 files changed, 48 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

annotated tag tutti-4.0-RC3 created (now c36efbd)
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 annotated tag tutti-4.0-RC3 in repository tutti. See http://git.codelutin.com/tutti.git at c36efbd (tag) tagging b987ea6104dda1c69fd6760e839a2332e0a384c1 (commit) replaces tutti-4.0-RC2 tagged by Maven Release on Wed Apr 15 14:06:04 2015 +0000 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.0-RC3 ----------------------------------------------------------------------- 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 release/4.0-RC3 deleted (was b3e3ae9)
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 release/4.0-RC3 in repository tutti. See http://git.codelutin.com/tutti.git was b3e3ae9 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC3' 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

branch release/4.0-RC3 updated (25fc279 -> b3e3ae9)
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 release/4.0-RC3 in repository tutti. See http://git.codelutin.com/tutti.git from 25fc279 fixes #6890: [EXPORT GENERIQUE] Export impossible si erreur d'élévation de poids Merge branch 'feature/6890' into develop adds 08c9baf add missing license headers adds b3e3ae9 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC3' 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 +- .../ifremer/tutti/ui/swing/updater/MoveHelper.java | 24 ++++++++++++++++++++++ .../tutti/ui/swing/updater/MoveHelperTest.java | 24 ++++++++++++++++++++++ tutti-ui-swing/pom.xml | 2 +- 9 files changed, 55 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch master updated (6cca7a9 -> b987ea6)
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 master in repository tutti. See http://git.codelutin.com/tutti.git from 6cca7a9 Merge branch 'release/4.0-RC2' adds 07e5ff5 [jgitflow-maven-plugin]updating poms for 4.0-RC3-SNAPSHOT development adds 5bce408 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 2b463bb Merge branch 'master' into develop adds 877fac9 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 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) adds 73fb2a6 fixes #6958: [IMPORT GENERIQUE] Non import du nombre sur un lot Merge branch 'feature/6958' into develop adds fa42d9b refs #6959 calculer le numéro d'ordre à l'import des lots adds 5bd47d9 refs #6941 Sauvegarde du poids de sous-échantillon adds bc11306 fixes #6941: [IMPORT GENERIQUE] perte des poids sous échantillons Merge branch 'feature/6959' into develop adds 02f1bb0 refs #6947 desactiver le tri sur les lignes des tableaux dans la configuration adds 1b99298 refs #6935 déplacement atomique d'un module à installer, sinon tentative copie, puis message si vraiment pas possible adds 2bd9d0a refs #6935 debut de correction adds d81eb0a refs #6942 renommage de la colone en Lot_A_Confirmer adds fdb99b4 refs #6935 Deplacement a la main d'une arborescence si pas possible de manière atomique adds e0fee6c fixes #6935: Erreur mise à jour de 3.13.7 vers 4.0RC1 Merge branch 'feature/6935' into develop adds c3cf060 refs #6890 Amélioration du message d'erreur adds 1ced07e refs #6890 Permettre l'export même si il y a des erreurs d'élévation de poids adds 25fc279 fixes #6890: [EXPORT GENERIQUE] Export impossible si erreur d'élévation de poids Merge branch 'feature/6890' into develop adds 08c9baf add missing license headers adds b3e3ae9 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC3' with non-snapshot versions adds b987ea6 Merge branch 'release/4.0-RC3' 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 +- .../consumer/CsvConsumerForCatch.java | 10 +- .../importactions/ImportCatchAction.java | 8 ++ .../producer/CsvProducerForCatch.java | 20 +++- tutti-ui-swing-updater/pom.xml | 9 +- .../ifremer/tutti/ui/swing/updater/MoveHelper.java | 121 +++++++++++++++++++++ .../fr/ifremer/tutti/ui/swing/updater/Updater.java | 31 ++++-- .../ui/swing/updater/UpdaterFileSystemPathes.java | 27 ++++- .../tutti/ui/swing/updater/MoveHelperTest.java | 35 +++--- tutti-ui-swing/pom.xml | 2 +- .../swing/content/config/TuttiConfigUIHandler.java | 11 ++ 15 files changed, 240 insertions(+), 44 deletions(-) create mode 100644 tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/MoveHelper.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/actions/ShowComboBoxPopupActions.java => tutti-ui-swing-updater/src/test/java/fr/ifremer/tutti/ui/swing/updater/MoveHelperTest.java (63%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0