Author: tchemit Date: 2013-04-17 11:42:36 +0200 (Wed, 17 Apr 2013) New Revision: 813 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/813 Log: fixes #2312: [CONFIGURATION] je pr?\195?\169cise que le navire avec config "caroussel" est le Gwen Drez, il y a alors un bouton "Lancer" si c'est pour relancer Tutti ?\195?\167a ne marche pas Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java 2013-04-17 09:17:29 UTC (rev 812) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ReloadTuttiAction.java 2013-04-17 09:42:36 UTC (rev 813) @@ -44,11 +44,8 @@ @Override protected void doAction() throws Exception { - // Close the application - RunTutti.closeTutti(getHandler(), null); - - // Restart - RunTutti.startTutti(getContext(), true); + // Close the application, will exit and restart application + RunTutti.closeTutti(getHandler(), RunTutti.UPATE_EXIT_CODE); } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-04-17 09:17:29 UTC (rev 812) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-04-17 09:42:36 UTC (rev 813) @@ -34,6 +34,7 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; +import fr.ifremer.tutti.ui.swing.util.action.TuttiUIAction; import fr.ifremer.tutti.ui.swing.util.editor.TuttiLocationTableCell; import fr.ifremer.tutti.ui.swing.util.editor.VesselTableCell; import jaxx.runtime.SwingUtil; @@ -215,7 +216,9 @@ } protected void reloadApplication() { - TuttiActionHelper.runActionAndWait(this, ReloadTuttiAction.class); + ReloadTuttiAction action = TuttiActionHelper.createLogicAction(this, ReloadTuttiAction.class); + TuttiActionHelper.runAction(action); +// TuttiActionHelper.runActionAndWait(this, ReloadTuttiAction.class); } protected void reloadUI() {