From echatellier@users.forge.codelutin.com Tue Jun  9 08:25:39 2015
From: echatellier@users.forge.codelutin.com
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r4251 - in
	branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui:
	. result
Date: Tue, 09 Jun 2015 08:25:39 +0000
Message-ID: <20150609082539.8E0495C92AF@goh.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2155695366039899069=="

--===============2155695366039899069==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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/is=
isfish/ui/WelcomeUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 @@
=20
     <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/is=
isfish/ui/result/ResultHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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();
=20
         // reference must stay allocated
         listener =3D new SimulationServiceListener() {
@@ -110,10 +110,8 @@
=20
     /**
      * Reload simulation combo box model.
-     *=20
-     * @param resultUI resultUI
      */
-    protected void initSimulationList(ResultUI resultUI) {
+    protected void initSimulationList() {
         List<String> value =3D SimulationStorage.getSimulationNames();
        =20
         //resultUI.getSimulationComboBox().setEditable(false);
@@ -124,10 +122,8 @@
=20
     /**
      * Open selected simulation item in new internal frame.
-     *=20
-     * @param resultUI resultUI
      */
-    public void openNewSimulation(ResultUI resultUI) {
+    public void openNewSimulation() {
         String selected =3D (String)resultUI.getSimulationComboBox().getSele=
ctedItem();
         SimulationStorage simulation =3D SimulationStorage.getSimulation(sel=
ected);
=20
@@ -148,10 +144,8 @@
=20
     /**
      * Delete selected simulation.
-     *=20
-     * @param resultUI resultUI
      */
-    public void deleteSimulation(ResultUI resultUI) {
+    public void deleteSimulation() {
         String selected =3D (String)resultUI.getSimulationComboBox().getSele=
ctedItem();
         SimulationStorage simulation =3D SimulationStorage.getSimulation(sel=
ected);
         try {
@@ -159,15 +153,13 @@
         } catch (StorageException ex) {
             throw new IsisFishRuntimeException("Can't delete simulation", ex=
);
         }
-        initSimulationList(resultUI);
+        initSimulationList();
     }
=20
     /**
      * Display simulation log.
-     *=20
-     * @param resultUI resultUI
      */
-    public void showLog(ResultUI resultUI) {
+    public void showLog() {
         String selected =3D (String)resultUI.getSimulationComboBox().getSele=
ctedItem();
         try {
             SimulationLoggerUtil.showSimulationLogConsole(resultUI, selected=
);

Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/is=
isfish/ui/result/ResultUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=3D"openButton" text=3D"isisfish.result.new.windo=
w"
-                    onActionPerformed=3D"handler.openNewSimulation(this)"/>
+                    onActionPerformed=3D"handler.openNewSimulation()"/>
             </cell>
             <cell>
                 <JButton id=3D"removeButton" text=3D"isisfish.result.remove.=
simulation"
-                    onActionPerformed=3D"handler.deleteSimulation(this)"/>
+                    onActionPerformed=3D"handler.deleteSimulation()"/>
              </cell>
             <cell>
                 <JButton id=3D"logButton" text=3D"isisfish.result.show.simul=
ation.log"
-                    onActionPerformed=3D"handler.showLog(this)"/>
+                    onActionPerformed=3D"handler.showLog()"/>
             </cell>
         </row>
     </Table>


--===============2155695366039899069==--