Author: chatellier Date: 2008-11-21 09:44:51 +0000 (Fri, 21 Nov 2008) New Revision: 1612 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx Log: Exit application on UI dispose Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2008-11-20 17:39:17 UTC (rev 1611) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2008-11-21 09:44:51 UTC (rev 1612) @@ -380,6 +380,8 @@ IsisTray.getInstance(); // lauch first UI (welcomeUI) WelcomeUI welcome = new WelcomeUI(); + // Set to exit on close + welcome.setDefaultCloseOperation(WelcomeUI.EXIT_ON_CLOSE); // add context welcome.setContextValue(new WelcomeAction()); welcome.setVisible(true); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2008-11-20 17:39:17 UTC (rev 1611) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2008-11-21 09:44:51 UTC (rev 1612) @@ -41,6 +41,7 @@ import fr.ifremer.isisfish.ui.script.ScriptUI; import fr.ifremer.isisfish.ui.simulator.SimulQueueUI; import fr.ifremer.isisfish.ui.simulator.SimulUI; + import fr.ifremer.isisfish.IsisFish; import javax.swing.JFrame; welcomePanelUI.setContent(new WelcomeTabUI()); protected void openFrame(Container c, String title){ @@ -55,6 +56,7 @@ } protected void close() { this.dispose(); + IsisFish.quit(); } protected void monitorUI() { new ApplicationMonitorUI();