This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 5c1d9d4dc03d9d2d2afd55bb9331f2553dc83493 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Feb 2 19:03:09 2015 +0100 delete db files --- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 25 ++++++++++++++++++---- .../ui/swing/action/ExportAndCleanDbAction.java | 14 +++++------- .../tutti/ui/swing/action/ReimportDbAction.java | 6 ++++-- .../tutti/ui/swing/action/ReinstallDbAction.java | 5 ++++- 4 files changed, 34 insertions(+), 16 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java index 85da5a4..4ca08bb 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java @@ -54,6 +54,7 @@ import fr.ifremer.tutti.service.referential.ReferentialTemporaryVesselService; import fr.ifremer.tutti.service.referential.TuttiReferentialSynchronizeService; import fr.ifremer.tutti.service.report.ReportService; import fr.ifremer.tutti.ui.swing.content.MainUI; +import fr.ifremer.tutti.ui.swing.updater.DeleteHelper; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.UIMessageNotifier; import fr.ifremer.tutti.ui.swing.util.auth.AuthenticationInfo; @@ -78,7 +79,6 @@ import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.i18n.init.UserI18nInitializer; import org.nuiton.jaxx.application.ApplicationBusinessException; -import org.nuiton.jaxx.application.ApplicationConfiguration; import org.nuiton.jaxx.application.ApplicationIOUtil; import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.jaxx.application.listener.PropagatePropertyChangeListener; @@ -389,7 +389,7 @@ public class TuttiUIContext extends AbstractBean implements Closeable, UIMessage } @Override - public ApplicationConfiguration getConfiguration() { + public TuttiConfiguration getConfiguration() { return config; } @@ -1134,7 +1134,6 @@ public class TuttiUIContext extends AbstractBean implements Closeable, UIMessage public boolean checkUpdateApplicationReachable(boolean showErrorInPopup) { boolean result = true; - TuttiConfiguration config = getConfig(); String url = config.getUpdateApplicationUrl(); try { @@ -1159,7 +1158,6 @@ public class TuttiUIContext extends AbstractBean implements Closeable, UIMessage public boolean checkUpdateDataReachable(boolean showErrorInPopup) { boolean result = true; - TuttiConfiguration config = getConfig(); String url = config.getUpdateDataUrl(); try { @@ -1195,4 +1193,23 @@ public class TuttiUIContext extends AbstractBean implements Closeable, UIMessage } } + + public void deleteDbOnExit() { + + if (log.isInfoEnabled()) { + log.info("Delete db files on exit."); + } + + try { + + DeleteHelper.deleteDirectoryOnExit(config.getDbDirectory().toPath()); + DeleteHelper.deleteDirectoryOnExit(config.getCacheDirectory().toPath()); + DeleteHelper.deleteDirectoryOnExit(config.getDbAttachmentDirectory().toPath()); + + } catch (IOException e) { + throw new ApplicationTechnicalException("Could not mark db files to be deleted on exit.", e); + } + + } + } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java index 0ce92c7..473f70b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java @@ -103,19 +103,15 @@ public class ExportAndCleanDbAction extends AbstractMainUITuttiAction { getContext().clearDbContext(); // export db - - progressionModel.increments(1); - progressionModel.setMessage(t("tutti.exportDb.step.createArchive", file)); - + progressionModel.increments(t("tutti.exportDb.step.createArchive", file)); getContext().getPersistenceService().exportDb(file); - // clean files - - progressionModel.increments(1); - progressionModel.setMessage(t("tutti.exportDb.step.reloadApplication")); + // delete db files on exit + getContext().deleteDbOnExit(); // Close the application, will exit and restart application - RunTutti.closeTutti(getHandler(), RunTutti.DELETE_DB_EXIT_CODE); + progressionModel.increments(t("tutti.exportDb.step.reloadApplication")); + RunTutti.closeTutti(getHandler(), RunTutti.RESTART_EXIT_CODE); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java index a0989d5..bc5846c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java @@ -154,10 +154,12 @@ public class ReimportDbAction extends AbstractMainUITuttiAction { File startActionFile = getConfig().getStartActionFile(); ApplicationIOUtil.writeContent(startActionFile, actionContent, t("tutti.error.write.startActionFile", startActionFile)); + // delete db files on exit + getContext().deleteDbOnExit(); + // restart application progressionModel.increments(t("tutti.reimport.step.reloadApplication")); - - RunTutti.closeTutti(getHandler(), RunTutti.DELETE_DB_EXIT_CODE); + RunTutti.closeTutti(getHandler(), RunTutti.RESTART_EXIT_CODE); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java index f981399..1514577 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java @@ -133,9 +133,12 @@ public class ReinstallDbAction extends AbstractMainUITuttiAction { File startActionFile = getConfig().getStartActionFile(); ApplicationIOUtil.writeContent(startActionFile, actionContent, t("tutti.error.write.startActionFile", startActionFile)); + // delete db files on exit + getContext().deleteDbOnExit(); + // restart application progressionModel.increments(t("tutti.reinstallDb.step.reloadApplication")); + RunTutti.closeTutti(getHandler(), RunTutti.RESTART_EXIT_CODE); - RunTutti.closeTutti(getHandler(), RunTutti.DELETE_DB_EXIT_CODE); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.