Author: sletellier Date: 2009-02-02 13:30:13 +0000 (Mon, 02 Feb 2009) New Revision: 1768 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx Log: Correction des multi-fenetres. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx 2009-01-30 13:12:32 UTC (rev 1767) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx 2009-02-02 13:30:13 UTC (rev 1768) @@ -40,13 +40,13 @@ public void setInfoText(String s){ statusBar.getLabelStatus().setText(s); } - public void close() { + public void close(JFrame f) { if (getVerifier().allIsSaved()){ - exit(); + exit(f); } } - protected void exit(){ - IsisFish.quit(); + protected void exit(JFrame f){ + f.dispose(); } protected WelcomeSaveVerifier getVerifier(){ return getContextValue(WelcomeSaveVerifier.class); 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 2009-01-30 13:12:32 UTC (rev 1767) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-02-02 13:30:13 UTC (rev 1768) @@ -50,14 +50,14 @@ import fr.ifremer.isisfish.ui.input.InputSaveVerifier; java.util.Map <JFrame, WelcomePanelUI> allFrameOpened; - - setContextValue(new WelcomeSaveVerifier()); + WelcomeSaveVerifier verifier = new WelcomeSaveVerifier(); + setContextValue(verifier); allFrameOpened = new java.util.HashMap <JFrame, WelcomePanelUI> (); welcomePanelUI.setContent(new WelcomeTabUI(new JAXXInitialContext().add(getVerifier()))); protected void openFrame(Container c, String title){ JFrame f = new JFrame(); f.setLayout(new BorderLayout()); - WelcomePanelUI welcome = new WelcomePanelUI(new JAXXInitialContext().add(getContextValue(WelcomeSaveVerifier.class)).add(this)); + WelcomePanelUI welcome = new WelcomePanelUI(new JAXXInitialContext().add(verifier).add(this)); welcome.setContent(c); f.add(welcome, BorderLayout.CENTER); f.setTitle(title); @@ -72,7 +72,8 @@ @Override public void windowClosing(WindowEvent e) { - allFrameOpened.get((JFrame) e.getSource()).close(); + JFrame f = (JFrame) e.getSource(); + allFrameOpened.get(f).close(f); } @Override @@ -98,7 +99,7 @@ f.setVisible(true); } public void close() { - if (getVerifier().allIsSaved()){ + if (verifier.allIsSaved()){ exit(); } } @@ -158,7 +159,7 @@ <JMenu text="isisfish.welcome.menu.frame"> <JMenuItem text="isisfish.welcome.menu.simulation" onActionPerformed='openFrame(new SimulUI(new SimulAction()), _("isisfish.simulation.title"))'/> <JMenuItem text="isisfish.welcome.menu.result" onActionPerformed='openFrame(new ResultView(), _("isisfish.result.title"))'/> - <JMenuItem text="isisfish.welcome.menu.input" onActionPerformed='openFrame(new InputUI(new JAXXInitialContext().add(getContextValue(WelcomeSaveVerifier.class)).add(new InputAction()).add(new InputSaveVerifier())), _("isisfish.input.title"))'/> + <JMenuItem text="isisfish.welcome.menu.input" onActionPerformed='openFrame(new InputUI(new JAXXInitialContext().add(verifier).add(new InputAction()).add(new InputSaveVerifier()).add(this)), _("isisfish.input.title"))'/> <JMenuItem text="isisfish.welcome.menu.script" onActionPerformed='openFrame(new ScriptUI(), _("isisfish.script.title"))'/> <JSeparator/> <JMenuItem text="isisfish.welcome.menu.queue" onActionPerformed='openFrame(new QueueUI(), _("isisfish.queue.title"))'/>