This is an automated email from the git hooks/post-receive script. New commit to branch feature/6417 in repository tutti. See http://git.codelutin.com/tutti.git commit d82a3d36f8583608c711a9a55e23b579d6d63a98 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Jan 9 07:56:44 2015 +0100 ne pas faire d'appel a la persistence avant la fin de l'ouverture a la base --- .../fr/ifremer/tutti/ui/swing/action/ExportDbAction.java | 15 +++++++++++++-- .../fr/ifremer/tutti/ui/swing/action/OpenDbAction.java | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportDbAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportDbAction.java index bdaa8f2..88c41ed 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportDbAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportDbAction.java @@ -48,6 +48,8 @@ public class ExportDbAction extends AbstractMainUITuttiAction { public static final int TOTAL_STEP = 3; + protected boolean noUI; + protected File file; public static final DateFormat df = new SimpleDateFormat("yyy-MM-dd"); @@ -60,6 +62,10 @@ public class ExportDbAction extends AbstractMainUITuttiAction { this.file = file; } + public void setNoUI(boolean noUI) { + this.noUI = noUI; + } + @Override public boolean prepareAction() throws Exception { file = null; @@ -122,7 +128,12 @@ public class ExportDbAction extends AbstractMainUITuttiAction { super.postSuccessAction(); sendMessage(t("tutti.flash.info.db.exported", file)); - // make sure title is reloaded - getUI().getHandler().changeTitle(); + if (!noUI) { + + // make sure title is reloaded + getUI().getHandler().changeTitle(); + + } + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java index 12fa530..fed3dea 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java @@ -278,6 +278,7 @@ public class OpenDbAction extends AbstractChangeScreenAction { getActionFactory().createUIAction(getHandler(), ExportDbAction.class); backupAction.getLogicAction().setProgressionModel(getProgressionModel()); backupAction.getLogicAction().setFile(file); + backupAction.getLogicAction().setNoUI(true); getActionEngine().runInternalAction(backupAction.getLogicAction()); // ------------------------------------------------------------------ // -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.