Author: tchemit Date: 2013-11-21 10:18:40 +0100 (Thu, 21 Nov 2013) New Revision: 1368 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1368 Log: fix #3841: [TECH] Am?\195?\169lioration du d?\195?\169marrage de l'application (redirige vers la home) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportDbAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportDbAction.java 2013-11-21 08:52:45 UTC (rev 1367) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportDbAction.java 2013-11-21 09:18:40 UTC (rev 1368) @@ -32,6 +32,7 @@ import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.content.AbstractMainUITuttiAction; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; +import fr.ifremer.tutti.ui.swing.content.SelectCruiseAction; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; import org.apache.commons.logging.Log; @@ -156,7 +157,7 @@ try { getContext().setDbExist(true); getContext().setDbLoaded(true); - getHandler().reloadPersistenceService(); + handler.reloadPersistenceService(); } catch (Exception e) { if (log.isErrorEnabled()) { @@ -164,7 +165,7 @@ } // no more db getContext().setDbLoaded(false); - getHandler().reloadPersistenceService(); + handler.reloadPersistenceService(); // could not load db throw new TuttiBusinessException(_("tutti.dbManager.action.importdb.couldNotOpen"), e); @@ -177,7 +178,7 @@ progressionModel.increments(_("tutti.importDb.step.checkSchemaVersion")); TuttiPersistence persistenceService = - getHandler().getPersistenceService(); + handler.getPersistenceService(); dbVersion = persistenceService.getDbVersion(); @@ -215,7 +216,7 @@ message, _("tutti.dbManager.action.upgradeDb.schema.to.update.message.help")); int i = JOptionPane.showConfirmDialog( - getHandler().getTopestUI(), + handler.getTopestUI(), htmlMessage, _("tutti.dbManager.title.schema.toupdate"), JOptionPane.OK_CANCEL_OPTION, @@ -243,7 +244,7 @@ message, _("tutti.dbManager.action.upgradeDb.schema.too.high.help")); int i = JOptionPane.showConfirmDialog( - getHandler().getTopestUI(), + handler.getTopestUI(), htmlMessage, _("tutti.dbManager.title.schema.toupdate"), JOptionPane.OK_CANCEL_OPTION, @@ -264,7 +265,7 @@ // ------------------------------------------------------------------ // progressionModel.increments(_("tutti.importDb.step.closeDb")); - TuttiActionHelper.runInternalAction(getHandler(), CloseDbAction.class); + TuttiActionHelper.runInternalAction(handler, CloseDbAction.class); return; } @@ -283,7 +284,7 @@ progressionModel.increments(message); sendMessage(message); - getHandler().getPersistenceService().updateSchema(); + handler.getPersistenceService().updateSchema(); sendMessage(_("tutti.flash.info.db.schema.updated", dbVersion, applicationVersion)); } @@ -301,6 +302,12 @@ log.debug("Check db context"); } getContext().checkDbContext(); + + // ------------------------------------------------------------------ // + // --- change screen // + // ------------------------------------------------------------------ // + + TuttiActionHelper.runInternalAction(handler, SelectCruiseAction.class); } @Override