This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git 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é --- .../main/java/org/chorem/lima/ui/importexport/ImportExport.java | 6 ++++-- .../src/main/java/org/chorem/lima/ui/opening/BackupPanel.jaxx | 1 + .../main/java/org/chorem/lima/ui/opening/BackupPanelHandler.java | 3 ++- .../main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java | 8 ++++++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java b/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java index da8cbd9..fb3f64b 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java @@ -155,8 +155,9 @@ public class ImportExport { * @param exportPath file path for import/export file, if null a dialog will ask for it * @param verbose if true a dialog show result */ - public void importExport(final ImportExportEnum importExportChoice, String exportPath, URL importUrl, boolean verbose) { + public boolean importExport(final ImportExportEnum importExportChoice, String exportPath, URL importUrl, boolean verbose) { final Charset defaultCharset = Charsets.UTF_8; + boolean done = false; if (StringUtils.isBlank(exportPath) && importUrl == null) { exportPath = chooseFile(importExportChoice.getImportMode(), importExportChoice); if (exportPath != null) { // if null ==> cancel import/export @@ -174,8 +175,9 @@ public class ImportExport { } if (StringUtils.isNotBlank(exportPath) || importUrl != null) { processImportExport(verbose, importExportChoice, defaultCharset, exportPath, importUrl); + done = true; } - + return done; } public void resetInitialAccountabilityLayoutsImport() { diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/opening/BackupPanel.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/opening/BackupPanel.jaxx index 4b978b1..70fa74c 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/opening/BackupPanel.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/opening/BackupPanel.jaxx @@ -22,6 +22,7 @@ <JPanel> <BackupPanelHandler id="handler" javaBean="new BackupPanelHandler(this)"/> + <Boolean id="done" javaBean="false"/> <Table> <row> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/opening/BackupPanelHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/opening/BackupPanelHandler.java index 6bfc2a7..792bb80 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/opening/BackupPanelHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/opening/BackupPanelHandler.java @@ -36,6 +36,7 @@ public class BackupPanelHandler { public void importBackup() { ImportExport importExport = new ImportExport(view); - importExport.importExport(ImportExportEnum.CSV_ALL_IMPORT, null, null, true); + boolean done = importExport.importExport(ImportExportEnum.CSV_ALL_IMPORT, null, null, true); + view.setDone(done); } } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java index c827846..d3b58a0 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/opening/OpeningViewHandler.java @@ -145,6 +145,11 @@ public class OpeningViewHandler { step++; break; case 1: + // backup was done, exit first start config + if (backupPanel.getDone()) { + view.dispose(); + break; + } view.getPrevious().setEnabled(true); //refresh UI view.getBackupIcon().setBorder(noBorder); @@ -204,6 +209,9 @@ public class OpeningViewHandler { } view.dispose(); break; + default: + view.dispose(); + break; } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.