This is an automated email from the git hooks/post-receive script. New change to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git from a7e4627 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new c7bb6a0 refs #1375 [ISO] refactoring new 0dd526f refs #1314 [ISO] renommage de méthode new 8c15145 refs #1314 mise à jour du mavenpom new 2253fd3 refs #1375 [ISO] refactoring new 125f89c refs #1375 [ISO] refactoring new e8e306e Merge branch 'feature/1375-Ne_pas_interrompre_export' into develop new 4bf39e3 refs #1377 [ISO] refactoring, réorganisation de l'enum new 54b56bf refs #1377 affichage correcte du retour du résultat d'un import new 7b5f455 refs #1377 Ajout d'un nom de fichier par défaut pour les fichiers exportés new 20e7ab2 refs #1377 Lors d'une restauration de backup au premier démarrage, ne pas poursuivre l'initialisation du projet qui vient d'âtre restauré new 35044bc refs #1377 la méthode générant le nom du fichier est autonome new 948ebc0 Merge branch 'feature/1377-Amélioration_import_export_tous' into develop new d0115dd refs #1376 mise à jour version Jdom The 13 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 d0115ddaed75f2fb7aaa01e2fe2bdfc2edb6e25c Author: David Cossé <cosse@codelutin.com> Date: Wed Jan 18 13:37:28 2017 +0100 refs #1376 mise à jour version Jdom commit 948ebc04f6534814b687bf5ad5a53f6dd669281b Merge: e8e306e 35044bc Author: David Cossé <cosse@codelutin.com> Date: Fri Dec 23 16:32:21 2016 +0100 Merge branch 'feature/1377-Amélioration_import_export_tous' into develop commit 35044bc2f521a551db882d2cf1d1201913a1258c Author: David Cossé <cosse@codelutin.com> Date: Fri Dec 23 16:29:35 2016 +0100 refs #1377 la méthode générant le nom du fichier est autonome commit 20e7ab2ca265500901a486f88b095f4fc3af1f8a Author: David Cossé <cosse@codelutin.com> Date: Fri Dec 23 16:06:51 2016 +0100 refs #1377 Lors d'une restauration de backup au premier démarrage, ne pas poursuivre l'initialisation du projet qui vient d'âtre restauré commit 7b5f4552796c255b900227b679a0ecfd31283931 Author: David Cossé <cosse@codelutin.com> Date: Fri Dec 23 16:03:55 2016 +0100 refs #1377 Ajout d'un nom de fichier par défaut pour les fichiers exportés commit 54b56bfccb5ffb89255365f39727250baeb8b2f3 Author: David Cossé <cosse@codelutin.com> Date: Fri Dec 23 15:58:51 2016 +0100 refs #1377 affichage correcte du retour du résultat d'un import commit 4bf39e3061d0842f975123b50f1a1f125a950428 Author: David Cossé <cosse@codelutin.com> Date: Fri Dec 23 15:56:15 2016 +0100 refs #1377 [ISO] refactoring, réorganisation de l'enum commit e8e306e9774ddd0fc19b2602c3d0192e2f411218 Merge: a7e4627 125f89c Author: David Cossé <cosse@codelutin.com> Date: Fri Dec 23 15:42:21 2016 +0100 Merge branch 'feature/1375-Ne_pas_interrompre_export' into develop commit 125f89cd600a957ecf7344fe8175e594297ca859 Author: David Cossé <cosse@codelutin.com> Date: Fri Dec 23 15:19:00 2016 +0100 refs #1375 [ISO] refactoring commit 2253fd31a0518f09f86453ab9ee49e833a1dd356 Author: David Cossé <cosse@codelutin.com> Date: Fri Dec 23 15:06:56 2016 +0100 refs #1375 [ISO] refactoring commit 8c15145492a0e6bfff76e576f29ea143759e5d91 Author: David Cossé <cosse@codelutin.com> Date: Fri Dec 23 15:02:28 2016 +0100 refs #1314 mise à jour du mavenpom commit 0dd526f3afb3de583f0a75653bd9bb48ad7c257f Author: David Cossé <cosse@codelutin.com> Date: Fri Dec 23 14:50:58 2016 +0100 refs #1314 [ISO] renommage de méthode commit c7bb6a0b8cbaab1d5494e84b0975518726e0f0c5 Author: David Cossé <cosse@codelutin.com> Date: Fri Dec 23 14:41:10 2016 +0100 refs #1375 [ISO] refactoring Summary of changes: .../chorem/lima/business/api/ExportService.java | 2 +- .../chorem/lima/business/api/ImportService.java | 2 +- .../lima/business/ejb/ExportServiceImpl.java | 157 +++++++++------------ .../lima/business/ejb/ImportServiceImpl.java | 2 +- .../lima/business/ImportExportServiceTest.java | 14 +- .../org/chorem/lima/enums/ImportExportEnum.java | 6 +- .../chorem/lima/ui/importexport/ImportExport.java | 126 +++++++++++------ .../org/chorem/lima/ui/opening/BackupPanel.jaxx | 1 + .../chorem/lima/ui/opening/BackupPanelHandler.java | 3 +- .../chorem/lima/ui/opening/OpeningViewHandler.java | 8 ++ .../resources/i18n/lima-swing_en_GB.properties | 16 ++- .../resources/i18n/lima-swing_fr_FR.properties | 16 ++- pom.xml | 5 +- 13 files changed, 196 insertions(+), 162 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.