r1750 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input - Isis-fish-commits

20 Jan 2009

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/InputOneEquationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.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/MetierSeasonInfoSpeciesUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.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/StrategyOneMonthInfoUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx
Log:
UI actif work

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx
===================================================================

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.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;
 
 protected Class clazz;
 protected TopiaEntity bean;
@@ -109,7 +110,15 @@
 protected void setComboModel(){
     java.util.List<Formule> formules = getAction().getFormules(getVerifier().getIsisContext(), name);
     if (formules != null){
-        jaxx.runtime.swing.Utils.fillComboBox(combo,formules, selectedEquation, "getName");
+        if (selectedEquation != null){
+            java.util.List<Item> items = new ArrayList<Item>();
+            for (Formule f : formules) {
+                System.out.println(selectedEquation.getClass().getName());
+                boolean selected = 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() != null){
+        editor.setText(getFormule().getContent());
+    }
 }
     ]]>
     </script>
     <Table id='body'>
         <row>
             <cell fill='horizontal' anchor='east'>
-                <JLabel id='lbl' text='{getLblText()}'/>
+                <JLabel id='lbl' text='{getLblText()}' enabled='{isActif()}'/>
             </cell>
             <cell fill='horizontal' weightx='1.0'>
                 <JComboBox id="combo" onActionPerformed='setFormule((Formule)combo.getSelectedItem());setEquation(getFormule());setEditorText();' enabled='{isActif()}'/>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.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 = null;
     protected JButton currentDeleteButton = null;
     protected JButton currentSaveButton = null;
@@ -92,6 +92,7 @@
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
+    @Override
     public int checkEdit() {
         int responce = 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 != 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 = inputUI;
     }
+
 }

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx	2009-01-20 17:54:50 UTC (rev 1750)
@@ -76,7 +76,7 @@
 import fr.ifremer.isisfish.entities.FisheryRegion;
 import fr.ifremer.isisfish.datastore.RegionStorage;
 
-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 = getRegion().getName();
     if (getRegion() != null){
+        String regionName = getRegion().getName();
         setContextValue(getRegion());
         NavigationTreeModel model = InputNavigationTreeSelectionAdapter.getTreeModel(regionName, getRegion());
         navigation.setSelectionModel(navigationSelectionModel);

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

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.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.getMatrix());
+            if (getBean() != null){
+                getBean().setCapturability(fieldPopulationCapturability.getMatrix());
+            }
         }
     });
 }

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx	2009-01-20 17:54:50 UTC (rev 1750)
@@ -73,8 +73,10 @@
     getVerifier().setCancelButton(cancel);
     Population population = (Population)getVerifier().getEntity(Population.class);
     setBean((PopulationImpl) population);
-    jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationGroupPopulationGroup,getBean().getPopulationGroup(), null);
     getVerifier().addCurrentEntity(getPopulationGroup());
+    if (getBean() != null){
+        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationGroupPopulationGroup,getBean().getPopulationGroup(), null);
+    }
 }
     ]]>
     </script>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx	2009-01-20 17:54:50 UTC (rev 1750)
@@ -74,7 +74,7 @@
         Population population = (Population)getVerifier().getEntity(Population.class);
         setBean((PopulationImpl) population);
 
-         setFieldPopulationMigrationMigrationGroupChooserModel();
+        setFieldPopulationMigrationMigrationGroupChooserModel();
         setFieldPopulationMigrationMigrationDepartureZoneChooserModel();
         populationMigrationEmigrationTable.addMatrixListener(new MatrixPanelListener() {
 
@@ -85,10 +85,14 @@
         });
     }
     protected void setFieldPopulationMigrationMigrationGroupChooserModel(){
-        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationEmigrationGroupChooser,getBean().getPopulationGroup(), null);
+        if (getBean() != null){
+            jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationEmigrationGroupChooser,getBean().getPopulationGroup(), null);
+        }
     }
     protected void setFieldPopulationMigrationMigrationDepartureZoneChooserModel(){
-        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationEmigrationDepartureZoneChooser,getBean().getPopulationZone(), null);
+        if (getBean() != null){
+            jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationEmigrationDepartureZoneChooser,getBean().getPopulationZone(), null);
+        }
     }
     protected void add(){
         getContextValue(InputAction.class).addEmigration(

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.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 MatrixPanelListener() {
 
         @Override
@@ -83,12 +82,19 @@
             popInfo.setImmigrationMatrix(populationMigrationImmigrationTable.getMatrix());
         }
     });
+    if (popInfo != null){
+        populationMigrationImmigrationTable.setMatrix(popInfo.getMigrationMatrix());
+    }
 }
 protected void setFieldPopulationMigrationMigrationGroupChooserModel(){
-    jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigrationArrivalZoneChooser,getBean().getPopulationGroup(), null);
+    if (getBean() != null){
+        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigrationArrivalZoneChooser,getBean().getPopulationGroup(), null);
+    }
 }
 protected void setFieldPopulationMigrationMigrationArrivalZoneChooserModel(){
-    jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigrationArrivalZoneChooser,getBean().getPopulationZone(), null);
+    if (getBean() != null){
+        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigrationArrivalZoneChooser,getBean().getPopulationZone(), null);
+    }
 }
 protected void add(){
     getContextValue(InputAction.class).addImmigration(popInfo,

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx	2009-01-20 17:54:50 UTC (rev 1750)
@@ -77,7 +77,6 @@
     setFieldPopulationMigrationMigrationGroupChooserModel();
     setFieldPopulationMigrationMigrationDepartureZoneChooserModel();
     setFieldPopulationMigrationMigrationArrivalZoneChooserModel();
-    populationMigrationMigrationTable.setMatrix(popInfo.getMigrationMatrix());
     populationMigrationMigrationTable.addMatrixListener(new MatrixPanelListener() {
 
         @Override
@@ -85,15 +84,24 @@
             popInfo.setMigrationMatrix(populationMigrationMigrationTable.getMatrix());
         }
     });
+    if (popInfo != null){
+        populationMigrationMigrationTable.setMatrix(popInfo.getMigrationMatrix());
+    }
 }
 protected void setFieldPopulationMigrationMigrationGroupChooserModel(){
-    jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationGroup(), null);
+    if (getBean() != null){
+        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationGroup(), null);
+    }
 }
 protected void setFieldPopulationMigrationMigrationDepartureZoneChooserModel(){
-    jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationZone(), null);
+    if (getBean() != null){
+        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationZone(), null);
+    }
 }
 protected void setFieldPopulationMigrationMigrationArrivalZoneChooserModel(){
-    jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationZone(), null);
+    if (getBean() != null){
+        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationZone(), null);
+    }
 }
 protected void add(){
     getAction().addMigration(popInfo,

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx	2009-01-20 17:54:50 UTC (rev 1750)
@@ -65,7 +65,9 @@
     getVerifier().addCurrentPanel(populationMigrationEquationUI, populationMigrationMigrationUI, populationMigrationImmigrationUI, populationMigrationEmigrationUI);
     Population population = (Population)getVerifier().getEntity(Population.class);
     setBean((PopulationImpl) population);
-    setFieldPopulationMigrationSeasonChooserModel();
+    if (getBean() != null){
+        setFieldPopulationMigrationSeasonChooserModel();
+    }
     PopulationSeasonInfo selected = getPopulationSeasonInfo();
     if (selected != null){
         fieldUseEquationMigration.setSelected(selected.getUseEquationMigration());

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx	2009-01-20 17:54:50 UTC (rev 1750)
@@ -90,7 +90,9 @@
     getVerifier().setDeleteButton(remove);
     Population population = (Population)getVerifier().getEntity(Population.class);
     setBean((PopulationImpl) population);
-    jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationSeasonInfoChooser,getBean().getPopulationSeasonInfo(), null);
+    if (getBean() != null){
+        jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationSeasonInfoChooser,getBean().getPopulationSeasonInfo(), null);
+    }
     // Model instanciation
 
     Interval interval = new Interval();

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx	2009-01-20 17:54:50 UTC (rev 1750)
@@ -82,18 +82,26 @@
     getBean().setMappingZoneReproZoneRecru(fieldPopulationMappingZoneReproZoneRecru.getMatrix());
 }
 protected void setFieldPopulationMappingZoneReproZoneRecru(){
-    if (getBean().getMappingZoneReproZoneRecru() != null){
-        fieldPopulationMappingZoneReproZoneRecru.setMatrix(getBean().getMappingZoneReproZoneRecru().copy());
+    if (getBean() != null){
+        if (getBean().getMappingZoneReproZoneRecru() != null){
+            fieldPopulationMappingZoneReproZoneRecru.setMatrix(getBean().getMappingZoneReproZoneRecru().copy());
+        }
     }
 }
 protected void setPopulationZonesPresenceModel(){
-    setModel(getBean().getPopulationZone(), populationZonesPresence);
+    if (getBean() != null){
+        setModel(getBean().getPopulationZone(), populationZonesPresence);
+    }
 }
 protected void setFieldPopulationZonesReproductionModel(){
-    setModel(getBean().getReproductionZone(), fieldPopulationZonesReproduction);
+    if (getBean() != null){
+        setModel(getBean().getReproductionZone(), fieldPopulationZonesReproduction);
+    }
 }
 protected void setFieldPopulationZonesRecruitmentModel(){
-    setModel(getBean().getRecruitmentZone(), fieldPopulationZonesRecruitment);
+    if (getBean() != null){
+        setModel(getBean().getRecruitmentZone(), fieldPopulationZonesRecruitment);
+    }
 }
 protected void setModel(java.util.List<Zone> selected, JAXXList componant){
     DefaultListModel model = new DefaultListModel();

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

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx
===================================================================
--- 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 = (Species)getVerifier().getEntity(Species.class);
     setBean((SpeciesImpl) species);
-    setNextPath("$root/$species/" + getBean().getTopiaId() + "/$populations");
+    if (getBean() != null){
+        setNextPath("$root/$species/" + getBean().getTopiaId() + "/$populations");
+    }
 }
     ]]>
     </script>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx	2009-01-20 17:53:42 UTC (rev 1749)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx	2009-01-20 17:54:50 UTC (rev 1750)
@@ -78,8 +78,12 @@
 public void refresh() {
     Strategy strategy = (Strategy)getVerifier().getEntity(Strategy.class);
     setBean((StrategyImpl) strategy);
-    setStrategyMonthInfo((StrategyMonthInfoImpl)getBean().getStrategyMonthInfo(month));
-    jaxx.runtime.swing.Utils.fillComboBox(fieldStrategyMonthInfoTripType,getRegion().getTripType(), getStrategyMonthInfo().getTripType());
+    if (getBean() != null){
+        setStrategyMonthInfo((StrategyMonthInfoImpl)getBean().getStrategyMonthInfo(month));
+    }
+    if (getStrategyMonthInfo() != null){
+        jaxx.runtime.swing.Utils.fillComboBox(fieldStrategyMonthInfoTripType,getRegion().getTripType(), getStrategyMonthInfo().getTripType());
+    }
 }
 public void init(Month m){
     month = m;

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

    

r1750 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input

sletellier＠users.labs.libre-entreprise.org

tags

participants (1)