Author: chatellier Date: 2011-04-26 09:09:50 +0000 (Tue, 26 Apr 2011) New Revision: 3283 Log: Restaure main fame position and dimensions Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-04-22 08:37:26 UTC (rev 3282) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-04-26 09:09:50 UTC (rev 3283) @@ -66,6 +66,7 @@ import org.nuiton.util.FileUtil; import org.nuiton.util.Version; import org.nuiton.util.converter.LocaleConverter; +import org.nuiton.widget.SwingSession; import fr.ifremer.isisfish.cron.CronService; import fr.ifremer.isisfish.datastore.AnalysePlanStorage; @@ -620,18 +621,27 @@ } } }); - + // migration must be done in UI envirronement and // must nerver be done in caparmor // TODO set it here for now, ui is not displayed on caparmor //doNuitonMigration(); - + // init simulater manager SimulationService.getService(); // init IsisTray IsisTray.getInstance(); + //initRSyntaxJavaSupport(config); + + // configure swing session + // can't be in config ? getUserConfigDirectory() not static + File isisConfigDirectory = new File(config.getUserConfigDirectory(), "isis-fish"); + isisConfigDirectory.mkdirs(); + File sessionFile = new File(isisConfigDirectory, "session.xml"); + final SwingSession session = new SwingSession(sessionFile, true); + // lauch first UI (welcomeUI) WelcomeUI welcome = new WelcomeUI(); // Set to exit on close @@ -642,6 +652,12 @@ WelcomeUI ui = (WelcomeUI)e.getSource(); ui.getHandler().close(ui); } + + @Override + public void windowClosed(WindowEvent e) { + session.save(); + quit(); + } }); try { @@ -654,7 +670,10 @@ log.error("Can't set frame icon", ex); } } + + // show main isis window welcome.setLocationRelativeTo(null); + session.add(welcome); welcome.setVisible(true); } else { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2011-04-22 08:37:26 UTC (rev 3282) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2011-04-26 09:09:50 UTC (rev 3283) @@ -187,7 +187,7 @@ */ public void close(WelcomeUI welcomeUI) { if (verifier.allIsSaved()) { - exit(welcomeUI); + welcomeUI.dispose(); } } @@ -195,15 +195,6 @@ * * @param welcomeUI parent ui */ - public void exit(WelcomeUI welcomeUI) { - welcomeUI.dispose(); - IsisFish.quit(); - } - - /** - * - * @param welcomeUI parent ui - */ public void updateVCS(WelcomeUI welcomeUI) { // FIXME a reimplanter // thread:Welcome.updateVCS()