Author: echatellier Date: 2015-06-09 08:25:37 +0000 (Tue, 09 Jun 2015) New Revision: 4251 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4251 Log: Fix UIs Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2015-06-09 08:20:12 UTC (rev 4250) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2015-06-09 08:25:37 UTC (rev 4251) @@ -28,7 +28,7 @@ <script><![CDATA[ protected void $afterCompleteSetup() { - hanlder.afterInit(); + handler.afterInit(); } ]]></script> <JMenuBar> Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2015-06-09 08:20:12 UTC (rev 4250) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2015-06-09 08:25:37 UTC (rev 4251) @@ -85,7 +85,7 @@ * Initialise la vue avec les liste des simulations disponible. */ public void afterInit() { - initSimulationList(resultUI); + initSimulationList(); // reference must stay allocated listener = new SimulationServiceListener() { @@ -110,10 +110,8 @@ /** * Reload simulation combo box model. - * - * @param resultUI resultUI */ - protected void initSimulationList(ResultUI resultUI) { + protected void initSimulationList() { List<String> value = SimulationStorage.getSimulationNames(); //resultUI.getSimulationComboBox().setEditable(false); @@ -124,10 +122,8 @@ /** * Open selected simulation item in new internal frame. - * - * @param resultUI resultUI */ - public void openNewSimulation(ResultUI resultUI) { + public void openNewSimulation() { String selected = (String)resultUI.getSimulationComboBox().getSelectedItem(); SimulationStorage simulation = SimulationStorage.getSimulation(selected); @@ -148,10 +144,8 @@ /** * Delete selected simulation. - * - * @param resultUI resultUI */ - public void deleteSimulation(ResultUI resultUI) { + public void deleteSimulation() { String selected = (String)resultUI.getSimulationComboBox().getSelectedItem(); SimulationStorage simulation = SimulationStorage.getSimulation(selected); try { @@ -159,15 +153,13 @@ } catch (StorageException ex) { throw new IsisFishRuntimeException("Can't delete simulation", ex); } - initSimulationList(resultUI); + initSimulationList(); } /** * Display simulation log. - * - * @param resultUI resultUI */ - public void showLog(ResultUI resultUI) { + public void showLog() { String selected = (String)resultUI.getSimulationComboBox().getSelectedItem(); try { SimulationLoggerUtil.showSimulationLogConsole(resultUI, selected); Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx 2015-06-09 08:20:12 UTC (rev 4250) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx 2015-06-09 08:25:37 UTC (rev 4251) @@ -43,15 +43,15 @@ </cell> <cell> <JButton id="openButton" text="isisfish.result.new.window" - onActionPerformed="handler.openNewSimulation(this)"/> + onActionPerformed="handler.openNewSimulation()"/> </cell> <cell> <JButton id="removeButton" text="isisfish.result.remove.simulation" - onActionPerformed="handler.deleteSimulation(this)"/> + onActionPerformed="handler.deleteSimulation()"/> </cell> <cell> <JButton id="logButton" text="isisfish.result.show.simulation.log" - onActionPerformed="handler.showLog(this)"/> + onActionPerformed="handler.showLog()"/> </cell> </row> </Table>