From echatellier@users.forge.codelutin.com Wed Jun 10 08:16:43 2015
From: echatellier@users.forge.codelutin.com
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r4254 -
	branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/ui
Date: Wed, 10 Jun 2015 08:16:43 +0000
Message-ID: <20150610081643.769D25C9D87@goh.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2526536677907120521=="

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

Author: echatellier
Date: 2015-06-10 08:16:42 +0000 (Wed, 10 Jun 2015)
New Revision: 4254

Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4254

Log:
Fix NPE

Modified:
   branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/=
ui/SimulationHandler.java
   branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/=
ui/SimulationUI.jaxx

Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/is=
isfish/ui/SimulationHandler.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/SimulationHandler.java	2015-06-09 13:55:33 UTC (rev 4253)
+++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish=
/ui/SimulationHandler.java	2015-06-10 08:16:42 UTC (rev 4254)
@@ -25,6 +25,8 @@
=20
 import static org.nuiton.i18n.I18n.t;
=20
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -60,7 +62,19 @@
     protected SimulationParameter getParameters() {
         return simulationUI.getContextValue(SimulationParameter.class);
     }
+   =20
+    public void afterInit() {
+        simulationUI.addPropertyChangeListener(SimulationUI.PROPERTY_REGION_=
STORAGE, new PropertyChangeListener() {
+            public void propertyChange(PropertyChangeEvent evt) {
+                simulationUI.regionStorageChanged();
+            }
+        });
=20
+        // FIXME c'est un hack qu'il faudrait supprimer
+        // c'est utilis=C3=A9 =C3=A0 l'arrache par certaines interfaces pour=
 mettre =C3=A0 jour l'arbre de facteur
+        simulationUI.setContextValue(simulationUI, "SimulationUI");
+    }
+
     /**
      * Open user dialog to selected a parameter file.
      * Reload it, and call {@link SimulationUI#refresh()}.

Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/is=
isfish/ui/SimulationUI.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/SimulationUI.jaxx	2015-06-09 13:55:33 UTC (rev 4253)
+++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish=
/ui/SimulationUI.jaxx	2015-06-10 08:16:42 UTC (rev 4254)
@@ -26,23 +26,12 @@
=20
   <SimulationHandler id=3D"handler" constructorParams=3D"this" />
=20
-  <import>
-    java.beans.PropertyChangeEvent
-    java.beans.PropertyChangeListener
-    javax.swing.JFileChooser
-    java.io.File
-  </import>
-
   <fr.ifremer.isisfish.datastore.RegionStorage id=3D"regionStorage" javaBean=
=3D"null" />
=20
   <script><![CDATA[
=20
     protected void $afterCompleteSetup() {
-        addPropertyChangeListener(PROPERTY_REGION_STORAGE, new PropertyChang=
eListener() {
-            public void propertyChange(PropertyChangeEvent evt) {
-                regionStorageChanged();
-            }
-        });
+        handler.afterInit();
     }
=20
     /**


--===============2526536677907120521==--