From sletellier@users.labs.libre-entreprise.org Mon Jun 15 00:25:50 2026
From: sletellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r1750 -
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
Date: Tue, 20 Jan 2009 18:54:50 +0100
Message-ID: <20090120175450.6C9EA461BCC@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3530507790503661983=="

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

Author: sletellier
Date: 2009-01-20 17:54:50 +0000 (Tue, 20 Jan 2009)
New Revision: 1750

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquatio=
nUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifi=
er.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInf=
oSpeciesUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCaptu=
rabilityUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroup=
UI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigra=
tionEmigrationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigra=
tionImmigrationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigra=
tionMigrationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigra=
tionUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeaso=
nsUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZones=
UI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMont=
hInfoUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.ja=
xx
Log:
UI actif work

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOne=
EquationUI.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
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquati=
onUI.jaxx	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquati=
onUI.jaxx	2009-01-20 17:54:50 UTC (rev 1750)
@@ -50,6 +50,7 @@
 import org.codelutin.topia.persistence.TopiaEntity;
 import fr.ifremer.isisfish.entities.EquationDAO;
 import fr.ifremer.isisfish.IsisFishDAOHelper;
+import jaxx.runtime.swing.Item;
=20
 protected Class clazz;
 protected TopiaEntity bean;
@@ -109,7 +110,15 @@
 protected void setComboModel(){
     java.util.List<Formule> formules =3D getAction().getFormules(getVerifier=
().getIsisContext(), name);
     if (formules !=3D null){
-        jaxx.runtime.swing.Utils.fillComboBox(combo,formules, selectedEquati=
on, "getName");
+        if (selectedEquation !=3D null){
+            java.util.List<Item> items =3D new ArrayList<Item>();
+            for (Formule f : formules) {
+                System.out.println(selectedEquation.getClass().getName());
+                boolean selected =3D f.equals(selectedEquation);
+                items.add(new Item(f.getName(), f.getName(), f, selected));
+            }
+            combo.setItems(items);
+        }
     }
 }
 protected void saveModel(){
@@ -133,14 +142,16 @@
     }
 }
 protected void setEditorText(){
-    editor.setText(getFormule().getContent());
+    if (getFormule() !=3D null){
+        editor.setText(getFormule().getContent());
+    }
 }
     ]]>
     </script>
     <Table id=3D'body'>
         <row>
             <cell fill=3D'horizontal' anchor=3D'east'>
-                <JLabel id=3D'lbl' text=3D'{getLblText()}'/>
+                <JLabel id=3D'lbl' text=3D'{getLblText()}' enabled=3D'{isAct=
if()}'/>
             </cell>
             <cell fill=3D'horizontal' weightx=3D'1.0'>
                 <JComboBox id=3D"combo" onActionPerformed=3D'setFormule((For=
mule)combo.getSelectedItem());setEquation(getFormule());setEditorText();' ena=
bled=3D'{isActif()}'/>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSav=
eVerifier.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
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerif=
ier.java	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerif=
ier.java	2009-01-20 17:54:50 UTC (rev 1750)
@@ -34,7 +34,7 @@
  *
  * @author letellier
  */
-public class InputSaveVerifier implements JAXXAction {
+public class InputSaveVerifier implements JAXXAction, fr.ifremer.isisfish.ui=
.SaveVerfier {
     protected JButton currentNewButton =3D null;
     protected JButton currentDeleteButton =3D null;
     protected JButton currentSaveButton =3D null;
@@ -92,6 +92,7 @@
         throw new UnsupportedOperationException("Not supported yet.");
     }
=20
+    @Override
     public int checkEdit() {
         int responce =3D JOptionPane.NO_OPTION;
         if (editable) {
@@ -287,8 +288,8 @@
     protected void refreshAll(){
         for (InputContentUI panel : currentPanels){
             panel.refresh();
+            panel.setActif(editable);
         }
-        setPanelsActifs();
     }
     public void addCurrentEntity(TopiaEntity currentEntity) {
         if (currentEntity !=3D null){
@@ -318,8 +319,8 @@
         for (InputContentUI ui : panels){
             this.currentPanels.add(ui);
             ui.refresh();
+            ui.setActif(editable);
         }
-        setPanelsActifs();
     }
     public void removeAllPanels(){
         currentPanels.clear();
@@ -422,4 +423,5 @@
     void setRootPanel(InputUI inputUI) {
         this.rootUI =3D inputUI;
     }
+
 }

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.=
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
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx	2=
009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx	2=
009-01-20 17:54:50 UTC (rev 1750)
@@ -76,7 +76,7 @@
 import fr.ifremer.isisfish.entities.FisheryRegion;
 import fr.ifremer.isisfish.datastore.RegionStorage;
=20
-getContextValue(WelcomeSaveVerifier.class).setInputVerifier(getVerifier());
+getContextValue(WelcomeSaveVerifier.class).addSaveVerifier(getVerifier());
 protected FisheryRegion getRegion(){
     return getContextValue(FisheryRegion.class);
 }
@@ -111,8 +111,8 @@
     getAction().loadRegion(this, name);
 }
 protected void setTreeModel(){
-    String regionName =3D getRegion().getName();
     if (getRegion() !=3D null){
+        String regionName =3D getRegion().getName();
         setContextValue(getRegion());
         NavigationTreeModel model =3D InputNavigationTreeSelectionAdapter.ge=
tTreeModel(regionName, getRegion());
         navigation.setSelectionModel(navigationSelectionModel);

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSe=
asonInfoSpeciesUI.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
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonIn=
foSpeciesUI.jaxx	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonIn=
foSpeciesUI.jaxx	2009-01-20 17:54:50 UTC (rev 1750)
@@ -61,6 +61,7 @@
     getVerifier().setCancelButton(cancel);
     Metier metier =3D (Metier)getVerifier().getEntity(Metier.class);
     setBean((MetierImpl) metier);
+    getVerifier().addCurrentPanel(targetFactor);
     if (getBean() !=3D null){
         if (fieldMetierSeasonInfo.getSelectedIndex() <=3D 0){
             setSeasonModel();
@@ -73,8 +74,7 @@
         }
=20
 // TODO : Equation selectionne
-        targetFactor.init(_("isisfish.metierSeasonInfoSpecies.targetFactor")=
, null, "", "TargetSpeciesTargetFactorEquation", fr.ifremer.isisfish.equation=
.TargetSpeciesTargetFactorEquation.class);
-        getVerifier().addCurrentPanel(targetFactor);
+        targetFactor.init(_("isisfish.metierSeasonInfoSpecies.targetFactor")=
, null, "TargetFactor", "TargetSpeciesTargetFactorEquation", fr.ifremer.isisf=
ish.equation.TargetSpeciesTargetFactorEquation.class);
      }
      else{
         DefaultComboBoxModel seasonModel =3D new DefaultComboBoxModel();
@@ -165,7 +165,7 @@
                 <Table>
                     <row>
                         <cell fill=3D'horizontal' anchor=3D'east'>
-                            <JLabel text=3D"isisfish.metierSeasonInfoSpecies=
.selectSeason"/>
+                            <JLabel text=3D"isisfish.metierSeasonInfoSpecies=
.selectSeason" enabled=3D'{isActif()}'/>
                         </cell>
                         <cell fill=3D'horizontal' weightx=3D'1.0'>
                             <JComboBox id=3D"fieldMetierSeasonInfo" onAction=
Performed=3D'metierSeasonChanged()' enabled=3D'{isActif()}'/>
@@ -173,7 +173,7 @@
                     </row>
                     <row>
                         <cell fill=3D'horizontal' anchor=3D'east'>
-                            <JLabel text=3D"isisfish.metierSeasonInfoSpecies=
.selectSpecies"/>
+                            <JLabel text=3D"isisfish.metierSeasonInfoSpecies=
.selectSpecies" enabled=3D'{isActif()}'/>
                         </cell>
                         <cell fill=3D'horizontal' weightx=3D'1.0'>
                             <JComboBox id=3D"fieldTargetSpecies" enabled=3D'=
{isActif()}'/>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onCapturabilityUI.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
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapt=
urabilityUI.jaxx	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapt=
urabilityUI.jaxx	2009-01-20 17:54:50 UTC (rev 1750)
@@ -66,7 +66,9 @@
     fieldPopulationCapturability.addMatrixListener(new MatrixPanelListener()=
 {
         @Override
         public void matrixChanged(MatrixPanelEvent arg0) {
-            getBean().setCapturability(fieldPopulationCapturability.getMatri=
x());
+            if (getBean() !=3D null){
+                getBean().setCapturability(fieldPopulationCapturability.getM=
atrix());
+            }
         }
     });
 }

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onGroupUI.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
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGrou=
pUI.jaxx	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGrou=
pUI.jaxx	2009-01-20 17:54:50 UTC (rev 1750)
@@ -73,8 +73,10 @@
     getVerifier().setCancelButton(cancel);
     Population population =3D (Population)getVerifier().getEntity(Population=
.class);
     setBean((PopulationImpl) population);
-    jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationGroupPopulationGrou=
p,getBean().getPopulationGroup(), null);
     getVerifier().addCurrentEntity(getPopulationGroup());
+    if (getBean() !=3D null){
+        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationGroupPopulation=
Group,getBean().getPopulationGroup(), null);
+    }
 }
     ]]>
     </script>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onMigrationEmigrationUI.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
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigr=
ationEmigrationUI.jaxx	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigr=
ationEmigrationUI.jaxx	2009-01-20 17:54:50 UTC (rev 1750)
@@ -74,7 +74,7 @@
         Population population =3D (Population)getVerifier().getEntity(Popula=
tion.class);
         setBean((PopulationImpl) population);
=20
-         setFieldPopulationMigrationMigrationGroupChooserModel();
+        setFieldPopulationMigrationMigrationGroupChooserModel();
         setFieldPopulationMigrationMigrationDepartureZoneChooserModel();
         populationMigrationEmigrationTable.addMatrixListener(new MatrixPanel=
Listener() {
=20
@@ -85,10 +85,14 @@
         });
     }
     protected void setFieldPopulationMigrationMigrationGroupChooserModel(){
-        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationEmigra=
tionGroupChooser,getBean().getPopulationGroup(), null);
+        if (getBean() !=3D null){
+            jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationEm=
igrationGroupChooser,getBean().getPopulationGroup(), null);
+        }
     }
     protected void setFieldPopulationMigrationMigrationDepartureZoneChooserM=
odel(){
-        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationEmigra=
tionDepartureZoneChooser,getBean().getPopulationZone(), null);
+        if (getBean() !=3D null){
+            jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationEm=
igrationDepartureZoneChooser,getBean().getPopulationZone(), null);
+        }
     }
     protected void add(){
         getContextValue(InputAction.class).addEmigration(

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onMigrationImmigrationUI.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
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigr=
ationImmigrationUI.jaxx	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigr=
ationImmigrationUI.jaxx	2009-01-20 17:54:50 UTC (rev 1750)
@@ -75,7 +75,6 @@
     setBean((PopulationImpl) population);
     setFieldPopulationMigrationMigrationGroupChooserModel();
     setFieldPopulationMigrationMigrationArrivalZoneChooserModel();
-    populationMigrationImmigrationTable.setMatrix(popInfo.getMigrationMatrix=
());
     populationMigrationImmigrationTable.addMatrixListener(new MatrixPanelLis=
tener() {
=20
         @Override
@@ -83,12 +82,19 @@
             popInfo.setImmigrationMatrix(populationMigrationImmigrationTable=
.getMatrix());
         }
     });
+    if (popInfo !=3D null){
+        populationMigrationImmigrationTable.setMatrix(popInfo.getMigrationMa=
trix());
+    }
 }
 protected void setFieldPopulationMigrationMigrationGroupChooserModel(){
-    jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigratio=
nArrivalZoneChooser,getBean().getPopulationGroup(), null);
+    if (getBean() !=3D null){
+        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigr=
ationArrivalZoneChooser,getBean().getPopulationGroup(), null);
+    }
 }
 protected void setFieldPopulationMigrationMigrationArrivalZoneChooserModel(){
-    jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigratio=
nArrivalZoneChooser,getBean().getPopulationZone(), null);
+    if (getBean() !=3D null){
+        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigr=
ationArrivalZoneChooser,getBean().getPopulationZone(), null);
+    }
 }
 protected void add(){
     getContextValue(InputAction.class).addImmigration(popInfo,

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onMigrationMigrationUI.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
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigr=
ationMigrationUI.jaxx	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigr=
ationMigrationUI.jaxx	2009-01-20 17:54:50 UTC (rev 1750)
@@ -77,7 +77,6 @@
     setFieldPopulationMigrationMigrationGroupChooserModel();
     setFieldPopulationMigrationMigrationDepartureZoneChooserModel();
     setFieldPopulationMigrationMigrationArrivalZoneChooserModel();
-    populationMigrationMigrationTable.setMatrix(popInfo.getMigrationMatrix()=
);
     populationMigrationMigrationTable.addMatrixListener(new MatrixPanelListe=
ner() {
=20
         @Override
@@ -85,15 +84,24 @@
             popInfo.setMigrationMatrix(populationMigrationMigrationTable.get=
Matrix());
         }
     });
+    if (popInfo !=3D null){
+        populationMigrationMigrationTable.setMatrix(popInfo.getMigrationMatr=
ix());
+    }
 }
 protected void setFieldPopulationMigrationMigrationGroupChooserModel(){
-    jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationG=
roupChooser,getBean().getPopulationGroup(), null);
+    if (getBean() !=3D null){
+        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrat=
ionGroupChooser,getBean().getPopulationGroup(), null);
+    }
 }
 protected void setFieldPopulationMigrationMigrationDepartureZoneChooserModel=
(){
-    jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationG=
roupChooser,getBean().getPopulationZone(), null);
+    if (getBean() !=3D null){
+        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrat=
ionGroupChooser,getBean().getPopulationZone(), null);
+    }
 }
 protected void setFieldPopulationMigrationMigrationArrivalZoneChooserModel(){
-    jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationG=
roupChooser,getBean().getPopulationZone(), null);
+    if (getBean() !=3D null){
+        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrat=
ionGroupChooser,getBean().getPopulationZone(), null);
+    }
 }
 protected void add(){
     getAction().addMigration(popInfo,

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onMigrationUI.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
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigr=
ationUI.jaxx	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigr=
ationUI.jaxx	2009-01-20 17:54:50 UTC (rev 1750)
@@ -65,7 +65,9 @@
     getVerifier().addCurrentPanel(populationMigrationEquationUI, populationM=
igrationMigrationUI, populationMigrationImmigrationUI, populationMigrationEmi=
grationUI);
     Population population =3D (Population)getVerifier().getEntity(Population=
.class);
     setBean((PopulationImpl) population);
-    setFieldPopulationMigrationSeasonChooserModel();
+    if (getBean() !=3D null){
+        setFieldPopulationMigrationSeasonChooserModel();
+    }
     PopulationSeasonInfo selected =3D getPopulationSeasonInfo();
     if (selected !=3D null){
         fieldUseEquationMigration.setSelected(selected.getUseEquationMigrati=
on());

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onSeasonsUI.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
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeas=
onsUI.jaxx	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeas=
onsUI.jaxx	2009-01-20 17:54:50 UTC (rev 1750)
@@ -90,7 +90,9 @@
     getVerifier().setDeleteButton(remove);
     Population population =3D (Population)getVerifier().getEntity(Population=
.class);
     setBean((PopulationImpl) population);
-    jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationSeasonInfoChooser,g=
etBean().getPopulationSeasonInfo(), null);
+    if (getBean() !=3D null){
+        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationSeasonInfoChoos=
er,getBean().getPopulationSeasonInfo(), null);
+    }
     // Model instanciation
=20
     Interval interval =3D new Interval();

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onZonesUI.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
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZone=
sUI.jaxx	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZone=
sUI.jaxx	2009-01-20 17:54:50 UTC (rev 1750)
@@ -82,18 +82,26 @@
     getBean().setMappingZoneReproZoneRecru(fieldPopulationMappingZoneReproZo=
neRecru.getMatrix());
 }
 protected void setFieldPopulationMappingZoneReproZoneRecru(){
-    if (getBean().getMappingZoneReproZoneRecru() !=3D null){
-        fieldPopulationMappingZoneReproZoneRecru.setMatrix(getBean().getMapp=
ingZoneReproZoneRecru().copy());
+    if (getBean() !=3D null){
+        if (getBean().getMappingZoneReproZoneRecru() !=3D null){
+            fieldPopulationMappingZoneReproZoneRecru.setMatrix(getBean().get=
MappingZoneReproZoneRecru().copy());
+        }
     }
 }
 protected void setPopulationZonesPresenceModel(){
-    setModel(getBean().getPopulationZone(), populationZonesPresence);
+    if (getBean() !=3D null){
+        setModel(getBean().getPopulationZone(), populationZonesPresence);
+    }
 }
 protected void setFieldPopulationZonesReproductionModel(){
-    setModel(getBean().getReproductionZone(), fieldPopulationZonesReproducti=
on);
+    if (getBean() !=3D null){
+        setModel(getBean().getReproductionZone(), fieldPopulationZonesReprod=
uction);
+    }
 }
 protected void setFieldPopulationZonesRecruitmentModel(){
-    setModel(getBean().getRecruitmentZone(), fieldPopulationZonesRecruitment=
);
+    if (getBean() !=3D null){
+        setModel(getBean().getRecruitmentZone(), fieldPopulationZonesRecruit=
ment);
+    }
 }
 protected void setModel(java.util.List<Zone> selected, JAXXList componant){
     DefaultListModel model =3D new DefaultListModel();

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.j=
axx
=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
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx	20=
09-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx	20=
09-01-20 17:54:50 UTC (rev 1750)
@@ -81,7 +81,6 @@
     getVerifier().setDeleteButton(remove);
     Port port =3D (Port)getVerifier().getEntity(Port.class);
     setBean((PortImpl) port);
-    jaxx.runtime.swing.Utils.fillList(portCell, getRegion().getCell(), getBe=
an().getCell());
     portMap.setFisheryRegion(getRegion());
     if(mapListener =3D=3D null){
         portMap.setSelectionMode(CellSelectionLayer.SINGLE_SELECTION);
@@ -91,6 +90,9 @@
         setMapListener();
     }
     refreshMap();
+    if (getBean() !=3D null){
+        jaxx.runtime.swing.Utils.fillList(portCell, getRegion().getCell(), g=
etBean().getCell());
+    }
 }
 protected void refreshMap(){
     java.util.List<Cell> cells =3D new ArrayList<Cell>();
@@ -141,7 +143,7 @@
                         <row>
                             <cell columns=3D'2' fill=3D'both' weighty=3D'0.7=
' weightx=3D'1.0'>
                                 <JScrollPane>
-                                    <JList id=3D"portCell" selectionMode=3D"=
0" onMouseClicked=3D'getBean().setCell((Cell)portCell.getSelectedValue())' en=
abled=3D'{isActif()}'/>
+                                    <JList id=3D"portCell" selectionMode=3D"=
0" onMouseClicked=3D'getBean().setCell((Cell)portCell.getSelectedValue());ref=
reshMap();' enabled=3D'{isActif()}'/>
                                 </JScrollPane>
                             </cell>
                         </row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesU=
I.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
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx=
	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx=
	2009-01-20 17:54:50 UTC (rev 1750)
@@ -69,7 +69,9 @@
     getVerifier().setDeleteButton(delete);
     Species species =3D (Species)getVerifier().getEntity(Species.class);
     setBean((SpeciesImpl) species);
-    setNextPath("$root/$species/" + getBean().getTopiaId() + "/$populations"=
);
+    if (getBean() !=3D null){
+        setNextPath("$root/$species/" + getBean().getTopiaId() + "/$populati=
ons");
+    }
 }
     ]]>
     </script>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Strategy=
OneMonthInfoUI.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
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMon=
thInfoUI.jaxx	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMon=
thInfoUI.jaxx	2009-01-20 17:54:50 UTC (rev 1750)
@@ -78,8 +78,12 @@
 public void refresh() {
     Strategy strategy =3D (Strategy)getVerifier().getEntity(Strategy.class);
     setBean((StrategyImpl) strategy);
-    setStrategyMonthInfo((StrategyMonthInfoImpl)getBean().getStrategyMonthIn=
fo(month));
-    jaxx.runtime.swing.Utils.fillComboBox(fieldStrategyMonthInfoTripType,get=
Region().getTripType(), getStrategyMonthInfo().getTripType());
+    if (getBean() !=3D null){
+        setStrategyMonthInfo((StrategyMonthInfoImpl)getBean().getStrategyMon=
thInfo(month));
+    }
+    if (getStrategyMonthInfo() !=3D null){
+        jaxx.runtime.swing.Utils.fillComboBox(fieldStrategyMonthInfoTripType=
,getRegion().getTripType(), getStrategyMonthInfo().getTripType());
+    }
 }
 public void init(Month m){
     month =3D m;

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTy=
peUI.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
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.j=
axx	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.j=
axx	2009-01-20 17:54:50 UTC (rev 1750)
@@ -72,7 +72,9 @@
     getVerifier().setDeleteButton(delete);
     VesselType vesselType =3D (VesselType)getVerifier().getEntity(VesselType=
.class);
     setBean((VesselTypeImpl) vesselType);
-    jaxx.runtime.swing.Utils.fillList(vesselTypeTripType, getRegion().getTri=
pType(), getBean().getTripType());
+    if (getBean() !=3D null){
+        jaxx.runtime.swing.Utils.fillList(vesselTypeTripType, getRegion().ge=
tTripType(), getBean().getTripType());
+    }
 }
 protected void tripTypeChanged(){
     Object[] values =3D vesselTypeTripType.getSelectedValues();


--===============3530507790503661983==--