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@codelutin.com>.