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

23 Feb 2009

Author: sletellier
Date: 2009-02-23 23:14:43 +0000 (Mon, 23 Feb 2009)
New Revision: 1863

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx
   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/MetierSeasonInfoZoneUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.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/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/PopulationRecruitmentUI.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/SelectivityUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx
Log:
Debug final

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

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx	2009-02-23 15:42:34 UTC (rev 1862)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx	2009-02-23 23:14:43 UTC (rev 1863)
@@ -89,9 +89,11 @@
             @Override
             public boolean onMouseClicked() {
                 for (Cell c : cellMap.getSelectedCells()){
-                    if (!c.getTopiaId().equals(getBean().getTopiaId())){
-                        jaxx.runtime.swing.Utils.fillComboBox(fieldCell,getRegion().getCell(), c);
-                        return true;
+                    if (getBean() != null){
+                        if (!c.getTopiaId().equals(getBean().getTopiaId())){
+                            jaxx.runtime.swing.Utils.fillComboBox(fieldCell,getRegion().getCell(), c);
+                            return true;
+                        }
                     }
                 }
                 return true;

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx	2009-02-23 15:42:34 UTC (rev 1862)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx	2009-02-23 23:14:43 UTC (rev 1863)
@@ -150,7 +150,7 @@
                             <JLabel text="isisfish.effortDescription.fishingOperationDuration" enabled='{isActif()}'/>
                         </cell>
                         <cell fill='horizontal' weightx='1.0'>
-                            <JTextField id="fieldEffortDescriptionFishingOperationDuration" text='{getEffortDescription().getFishingOperationDuration() == null ? "" : getEffortDescription().getFishingOperationDuration().getHour()}' onKeyReleased='getEffortDescription().setFishingOperationDuration(new TimeUnit(Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText())))' enabled='{isActif()}'/>
+                            <JTextField id="fieldEffortDescriptionFishingOperationDuration" text='{getEffortDescription().getFishingOperationDuration() == null ? "" : getEffortDescription().getFishingOperationDuration().getHour()}' onKeyReleased='getEffortDescription().setFishingOperationDuration(new TimeUnit(3600 * Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText())))' enabled='{isActif()}'/>
                         </cell>
                     </row>
                     <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx	2009-02-23 15:42:34 UTC (rev 1862)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx	2009-02-23 23:14:43 UTC (rev 1863)
@@ -44,7 +44,8 @@
 import org.codelutin.topia.TopiaException;
 import jaxx.runtime.swing.navigation.NavigationTreeModel;
 import jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode;
-
+import fr.ifremer.isisfish.types.RangeOfValues;
+boolean init = false;
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getOldValue() != null || evt.getNewValue() == null) {
@@ -75,10 +76,18 @@
         values.add(value);
     if (getBean() != null){
         if (values != null){
-            jaxx.runtime.swing.Utils.fillComboBox(fieldGearParamType, values, getBean().getParameterName(), true);
+            init = true;
+            jaxx.runtime.swing.Utils.fillComboBox(fieldGearParamType, values, getBean().getPossibleValue() == null ? null : getBean().getPossibleValue().getType(), true);
+            init = false;
         }
     }
 }
+protected void paramChanged(){
+    if (fieldGearParamType.getSelectedItem() != null){
+        if (!init)
+            getBean().setPossibleValue(new RangeOfValues(fieldGearParamType.getSelectedItem().toString().concat("[" + fieldGearParamPossibleValue.getText() + "]")));
+    }
+}
     ]]>
     </script>
     <Table id='body'>
@@ -122,10 +131,10 @@
                             <JLabel text="isisfish.gear.rangeValues" enabled='{isActif()}'/>
                         </cell>
                         <cell fill='horizontal' weightx='0.5'>
-                            <JComboBox id="fieldGearParamType" onActionPerformed='getBean().setParameterName(fieldGearParamName.getSelectedText())' enabled='{isActif()}'/>
+                            <JComboBox id="fieldGearParamType" onActionPerformed='paramChanged()' enabled='{isActif()}'/>
                         </cell>
                         <cell fill='horizontal' weightx='0.5'>
-                            <JTextField id="fieldGearParamPossibleValue" text='{getBean().getPossibleValue() == null ? null : getBean().getPossibleValue().getValues()}' onKeyReleased='getBean().setStandardisationFactor(Double.parseDouble(fieldGearParamPossibleValue.getText()))' enabled='{isActif()}'/>
+                            <JTextField id="fieldGearParamPossibleValue" text='{getBean().getPossibleValue() == null ? "" : getBean().getPossibleValue().getValues()}' onKeyReleased='paramChanged()' enabled='{isActif()}'/>
                         </cell>
                     </row>
                     <row>

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-02-23 15:42:34 UTC (rev 1862)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx	2009-02-23 23:14:43 UTC (rev 1863)
@@ -50,6 +50,7 @@
 import java.lang.reflect.Method;
 import org.apache.commons.beanutils.MethodUtils;
 import org.codelutin.topia.persistence.TopiaEntity;
+import org.codelutin.topia.TopiaContext;
 import fr.ifremer.isisfish.entities.EquationDAO;
 import fr.ifremer.isisfish.IsisFishDAOHelper;
 import jaxx.runtime.swing.Item;
@@ -78,6 +79,7 @@
         if (evt.getNewValue() != null) {
             // add binding on getBean()
             //jaxx.runtime.Util.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+            setComboModel();
         }
     }
 });
@@ -101,6 +103,7 @@
             }
         };
     }
+    setComboModel();
     editor.getCurrentEditor().addDocumentListener(listener);
 }
 public void init(String lblText, TopiaEntity bean, String name, String methodGet, String methodSet, Class c){
@@ -155,7 +158,14 @@
     editor.getCurrentEditor().addDocumentListener(listener);
  }
 protected void setComboModel(){
-    java.util.List<Formule> formules = getAction().getFormules(getVerifier().getIsisContext(), name);
+    TopiaContext isisContext = getVerifier().getIsisContext();
+    if (isisContext == null && getBean() !=  null){
+        isisContext = getBean().getTopiaContext();
+    }
+    java.util.List<Formule> formules = null;
+    if (name != null){
+        formules = getAction().getFormules(isisContext, name);
+    }
     if (formules != null){
         java.util.List<Item> items = new ArrayList<Item>();
         items.add(new Item("null", " ", null, false));

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-02-23 15:42:34 UTC (rev 1862)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java	2009-02-23 23:14:43 UTC (rev 1863)
@@ -154,9 +154,9 @@
             boolean doDelete;
             ArrayList<TopiaEntity> allWillBeRemoved = new ArrayList<TopiaEntity>();
             for (TopiaEntity te : currentEntities){
-                if (te.getComposite() != null){
-                    allWillBeRemoved.addAll(te.getComposite());
-                }
+//                if (te.getComposite() != null){
+//                    allWillBeRemoved.addAll(te.getComposite());
+//                }
                 allWillBeRemoved.add(te);
             }
             if (allWillBeRemoved.size() > 0) {

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-02-23 15:42:34 UTC (rev 1862)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx	2009-02-23 23:14:43 UTC (rev 1863)
@@ -217,16 +217,16 @@
             <JMenuItem text="isisfish.input.menu.importRenameRegion" onActionPerformed="importRegionAndRename()" accelerator="accNew"/>
             <JMenuItem text="isisfish.input.menu.importRegionV2" onActionPerformed="importV2Region()" accelerator="accNew"/>
              <JMenuItem text="isisfish.input.menu.importRegionSimulation" onActionPerformed="importRegionFromSimulation()" accelerator="accImportFromSimulation"/>
-            <JMenuItem text="isisfish.input.menu.exportRegion" onActionPerformed="exportRegion()" accelerator="accExport"/>
-            <JMenuItem text="isisfish.input.menu.copyRegion" onActionPerformed="copyRegion()" accelerator="accExport"/>
+            <JMenuItem text="isisfish.input.menu.exportRegion" enabled='{getRegion() != null}' onActionPerformed="exportRegion()" accelerator="accExport"/>
+            <JMenuItem text="isisfish.input.menu.copyRegion" enabled='{getRegion() != null}' onActionPerformed="copyRegion()" accelerator="accExport"/>
             <JSeparator/>
-            <JMenuItem name="miRemove" text="isisfish.input.menu.removeLocaly" onActionPerformed="removeRegion()" accelerator="accRemove"/>
+            <JMenuItem name="miRemove" text="isisfish.input.menu.removeLocaly" enabled='{getRegion() != null}' onActionPerformed="removeRegion()" accelerator="accRemove"/>
         </JMenu>
         <JMenu text="isisfish.input.menu.server">
-            <JMenuItem text="isisfish.input.menu.addRegion" onActionPerformed="commitRegionInCVS()" accelerator="accAdd"/>
-            <JMenuItem text="isisfish.input.menu.commit" onActionPerformed="commitRegionInCVS()" accelerator="accCommitVCS"/>
+            <JMenuItem text="isisfish.input.menu.addRegion" enabled='{getRegion() != null}' onActionPerformed="commitRegionInCVS()" accelerator="accAdd"/>
+            <JMenuItem text="isisfish.input.menu.commit" enabled='{getRegion() != null}' onActionPerformed="commitRegionInCVS()" accelerator="accCommitVCS"/>
             <JSeparator/>
-            <JMenuItem name="miRemove" text="isisfish.input.menu.removeLocalyRemotely" onActionPerformed="removeRegion()" accelerator="accRemove"/>
+            <JMenuItem name="miRemove" text="isisfish.input.menu.removeLocalyRemotely" enabled='{getRegion() != null}' onActionPerformed="removeRegion()" accelerator="accRemove"/>
         </JMenu>
         <!--JMenu text="isisfish.input.menu.help">
             <JMenuItem name="miAbout" text="isisfish.input.menu.about" onActionPerformed="about()" accelerator="accAbout"/>
@@ -246,13 +246,11 @@
                 <row>
                     <cell columns='2' fill='horizontal' weightx='1.0'>
                         <JComboBox  id="fieldCurrentRegion" model='{getFieldCurrentRegionModel()}' onItemStateChanged='regionChange()'/>
-                        <!--JComboBox  id="fieldCurrentRegion" model='{getFieldCurrentRegionModel()}' onActionPerformed='regionChange()'/-->
                     </cell>
                 </row>
             </Table>
             <JPanel id="treePanel" name="treePanel" layout='{new BorderLayout()}'>
                 <JScrollPane constraints='BorderLayout.CENTER'>
-                    <!--JTree id="tree" name="tree" model='{getTreeModel()}'/-->
                     <JTree id="navigation" rootVisible="true" selectionRow='0' model='{new DefaultTreeModel(null)}'/>
                 </JScrollPane>
             </JPanel>

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-02-23 15:42:34 UTC (rev 1862)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx	2009-02-23 23:14:43 UTC (rev 1863)
@@ -36,6 +36,8 @@
     <!-- bean property -->
     <fr.ifremer.isisfish.entities.MetierImpl id='bean' javaBean='null'/>
 
+    <Boolean id='metierSeasonSelected' javaBean='false'/>
+    <Boolean id='targetSpeciesSelected' javaBean='false'/>
 
     <script><![CDATA[
 import com.l2fprod.common.swing.renderer.BooleanCellRenderer;
@@ -70,6 +72,29 @@
     }
 });
 
+tableTargetSpecies.addMouseListener(new MouseListener() {
+
+    @Override
+    public void mouseClicked(MouseEvent e) {
+    }
+
+    @Override
+    public void mousePressed(MouseEvent e) {
+    }
+
+    @Override
+    public void mouseReleased(MouseEvent e) {
+        remove.setEnabled(tableTargetSpecies.getSelectedRow() != -1);
+    }
+
+    @Override
+    public void mouseEntered(MouseEvent e) {
+    }
+
+    @Override
+    public void mouseExited(MouseEvent e) {
+    }
+});
  public void refresh() {
     getVerifier().setSaveButton(save);
     getVerifier().setCancelButton(cancel);
@@ -86,7 +111,7 @@
         if (fieldTargetSpecies.getSelectedIndex() <= 0){
             setTargetSpeciesModel();
         }
-
+        setTableTargetSpeciesModel();
 // TODO : Equation selectionne
         targetFactor.init(_("isisfish.metierSeasonInfoSpecies.targetFactor"), null, "TargetFactor", null, null, fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation.class);
      }
@@ -95,6 +120,8 @@
         fieldMetierSeasonInfo.setModel(seasonModel);
         setTargetSpeciesModel();
      }
+    remove.setEnabled(false);
+    setAddButton();
 }
 protected void setSeasonModel(){
     DefaultComboBoxModel seasonModel = new DefaultComboBoxModel();
@@ -163,7 +190,7 @@
                 (Species)species,
                 targetFactor.getEditor().getText(),
                 fieldPrimaryCatch.isSelected());
-        refresh();
+        setTableTargetSpeciesModel();
     }
 }
 protected void remove(){
@@ -176,13 +203,22 @@
         if (o != null){
             TargetSpecies ts = (TargetSpecies)o;
             getAction().removeTargetSpecies(m, ts);
-            refresh();
+            setTableTargetSpeciesModel();
         }
     }
 }
 protected void metierSeasonChanged(){
-    setTableTargetSpeciesModel();
+    setMetierSeasonSelected(fieldMetierSeasonInfo.getSelectedItem() != null);
+    setTargetSpeciesModel();
+    setAddButton();
 }
+protected void targetSpeciesChanged(){
+    setTargetSpeciesSelected(fieldTargetSpecies.getSelectedItem() != null);
+    setAddButton();
+}
+protected void setAddButton(){
+    add.setEnabled(getMetierSeasonSelected() && getTargetSpeciesSelected());
+}
     ]]></script>
     <Table id='body'>
         <row>
@@ -201,7 +237,7 @@
                             <JLabel text="isisfish.metierSeasonInfoSpecies.selectSpecies" enabled='{isActif()}'/>
                         </cell>
                         <cell fill='horizontal' weightx='1.0'>
-                            <JComboBox id="fieldTargetSpecies" enabled='{isActif()}'/>
+                            <JComboBox id="fieldTargetSpecies" onActionPerformed='targetSpeciesChanged()' enabled='{isActif()}'/>
                         </cell>
                     </row>
                     <row>
@@ -225,7 +261,7 @@
                 <Table>
                     <row>
                         <cell columns='2' fill='horizontal' weightx='1.0'>
-                            <JButton id="buttonMetierSpeciesAddTargetSpecies" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActif()}'/>
+                            <JButton id="add" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActif()}'/>
                         </cell>
                     </row>
                     <row>
@@ -237,7 +273,7 @@
                     </row>
                     <row>
                         <cell columns='2' fill='horizontal' weightx='1.0'>
-                            <JButton id="buttonMetierSpeciesRemoveTargetSpecies" text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}'/>
+                            <JButton id="remove" text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}'/>
                         </cell>
                     </row>
                     <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx	2009-02-23 15:42:34 UTC (rev 1862)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx	2009-02-23 23:14:43 UTC (rev 1863)
@@ -183,6 +183,13 @@
         }
         getMetierSeasonInfo().setZone(zones);
     }
+    protected void seasonChanged(){
+        setMetierSeasonInfo((MetierSeasonInfoImpl)fieldMetierSeasonChoice.getSelectedItem());
+        getVerifier().addCurrentEntity(getMetierSeasonInfo());
+        setMetierSeasonInfoNotNull(getMetierSeasonInfo() != null);
+        setSeason();
+        setMetierZone();
+    }
     ]]></script>
     <Table id='body'>
         <row>
@@ -194,7 +201,7 @@
                         </cell>
                         <cell fill='horizontal' weightx='1.0'>
                             <JComboBox id="fieldMetierSeasonChoice"
-                            onActionPerformed='setMetierSeasonInfo((MetierSeasonInfoImpl)fieldMetierSeasonChoice.getSelectedItem());getVerifier().addCurrentEntity(getMetierSeasonInfo());setMetierSeasonInfoNotNull(getMetierSeasonInfo() != null);setSeason();setMetierZone();'
+                            onActionPerformed='seasonChanged()'
                             enabled='{isActif()}'/>
                         </cell>
                     </row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx	2009-02-23 15:42:34 UTC (rev 1862)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx	2009-02-23 23:14:43 UTC (rev 1863)
@@ -59,6 +59,7 @@
             fieldPopulationBasicsNbClasses.setText("");
             fieldPopulationBasicsComment.setText("");
             fieldPopulationBasicsMatureClass.setSelectedItem(null);
+            tableAgeLength.setModel(new DefaultTableModel());
             growthEquation.init(_("isisfish.populationBasics.growth"), null, "Growth", "Growth", "EquationGrowth", fr.ifremer.isisfish.equation.PopulationGrowth.class);
             growthReverseEquation.init(_("isisfish.populationBasics.growthReverse"), null, "GrowthReverse", "GrowthReverse", "EquationGrowthReverse", fr.ifremer.isisfish.equation.PopulationGrowthReverse.class);
         }
@@ -127,12 +128,6 @@
         tableAgeLength.setModel(model);
     }
 }
-protected String getSizePopulationGroup(){
-    if (getBean() != null){
-        return String.valueOf(getBean().sizePopulationGroup());
-    }
-    return "";
-}
 protected void create(){
     Species species = getAction().getSpeciesByTopiaId(getVerifier().getIsisContext(), getVerifier().getCurrentNode().getParent().getNavigationPath());
     if (species == null){
@@ -174,7 +169,7 @@
                                         <JLabel text="isisfish.populationBasics.numberGroup" enabled='{isActif()}'/>
                                     </cell>
                                     <cell fill='horizontal' weightx='0.5'>
-                                        <JTextField id="fieldPopulationBasicsNbClasses" text='{getSizePopulationGroup()}' editable="false" enabled='{isActif()}'/>
+                                        <JTextField id="fieldPopulationBasicsNbClasses" text='{getBean() == null ? "" : getBean().sizePopulationGroup()}' editable="false" enabled='{isActif()}'/>
                                     </cell>
                                     <cell fill='horizontal' weightx='0.5'>
                                         <JButton id="buttonPopulationBasicsCreateClasses" text="isisfish.populationBasics.recreateClasses" onActionPerformed='createClasses()' 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-02-23 15:42:34 UTC (rev 1862)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx	2009-02-23 23:14:43 UTC (rev 1863)
@@ -43,6 +43,18 @@
 import org.codelutin.math.matrix.gui.MatrixPanelEvent;
 import org.codelutin.math.matrix.gui.MatrixPanelListener;
 
+MatrixPanelListener listener = new MatrixPanelListener() {
+
+    @Override
+    public void matrixChanged(MatrixPanelEvent arg0) {
+        if (getBean() != null){
+            if (fieldPopulationCapturability.getMatrix() != null){
+                getBean().setCapturability(fieldPopulationCapturability.getMatrix());
+            }
+        }
+    }
+};
+
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getOldValue() != null || evt.getNewValue() == null) {
@@ -58,21 +70,18 @@
     }
 });
 
+
 public void refresh(){
     getVerifier().setSaveButton(save);
     getVerifier().setCancelButton(cancel);
     Population population = getVerifier().getEntity(Population.class);
     setBean((PopulationImpl) population);
-    fieldPopulationCapturability.addMatrixListener(new MatrixPanelListener() {
-        @Override
-        public void matrixChanged(MatrixPanelEvent arg0) {
-            if (getBean() != null){
-                if (fieldPopulationCapturability.getMatrix() != null){
-                    getBean().setCapturability(fieldPopulationCapturability.getMatrix());
-                }
-            }
-        }
-    });
+    if (getBean() != null){
+         if (getBean().getCapturability() != null){
+            fieldPopulationCapturability.setMatrix(getBean().getCapturability().copy());
+         }
+    }
+    fieldPopulationCapturability.addMatrixListener(listener);
 }
     ]]>
     </script>

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-02-23 15:42:34 UTC (rev 1862)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx	2009-02-23 23:14:43 UTC (rev 1863)
@@ -133,7 +133,7 @@
                 <JLabel text="isisfish.populationGroup.age" enabled='{isPopGroupNotNull()}'/>
             </cell>
             <cell columns='2' fill='horizontal' weightx='1.0'>
-                <JTextField id="fieldPopulationGroupAge" text='{getPopulationGroup().getAge()}' enabled='{isPopGroupNotNull()}'/>
+                <JTextField id="fieldPopulationGroupAge" text='{getPopulationGroup().getAge()}' onKeyReleased='getPopulationGroup().setAge(Double.parseDouble(fieldPopulationGroupAge.getText()))' enabled='{isPopGroupNotNull()}'/>
             </cell>
         </row>
         <row>

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-02-23 15:42:34 UTC (rev 1862)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx	2009-02-23 23:14:43 UTC (rev 1863)
@@ -144,21 +144,21 @@
       getPopInfo().setImmigrationMatrix(mat);
       remove.setEnabled(false);
 }
-    protected void groupChanged(){
-        setGPopSelected(fieldPopulationMigrationImmigrationGroupChooser.getSelectedItem() != null);
-        setAddButton();
-    }
-    protected void coefChanged(){
-        setCoefNonVide(!fieldPopulationMigrationImmigrationCoefficient.getText().equals(""));
-        setAddButton();
-    }
-    protected void zoneChanged(){
-        setZoneDepartSelected(fieldPopulationMigrationImmigrationArrivalZoneChooser.getSelectedItem() != null);
-        setAddButton();
-    }
-    protected void setAddButton(){
-        add.setEnabled(getGPopSelected() && getZoneDepartSelected() && getCoefNonVide());
-    }
+protected void groupChanged(){
+    setGPopSelected(fieldPopulationMigrationImmigrationGroupChooser.getSelectedItem() != null);
+    setAddButton();
+}
+protected void coefChanged(){
+    setCoefNonVide(!fieldPopulationMigrationImmigrationCoefficient.getText().equals(""));
+    setAddButton();
+}
+protected void zoneChanged(){
+    setZoneDepartSelected(fieldPopulationMigrationImmigrationArrivalZoneChooser.getSelectedItem() != null);
+    setAddButton();
+}
+protected void setAddButton(){
+    add.setEnabled(getGPopSelected() && getZoneDepartSelected() && getCoefNonVide());
+}
     ]]>
     </script>
     <Table id='body'>

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-02-23 15:42:34 UTC (rev 1862)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx	2009-02-23 23:14:43 UTC (rev 1863)
@@ -95,16 +95,15 @@
     public void mouseExited(MouseEvent e) {
     }
 });
+MatrixPanelListener listener = new MatrixPanelListener() {
 
-populationMigrationMigrationTable.addMatrixListener(new MatrixPanelListener() {
-
     @Override
     public void matrixChanged(MatrixPanelEvent arg0) {
         if (getPopInfo() != null){
             getPopInfo().setMigrationMatrix(populationMigrationMigrationTable.getMatrix());
         }
     }
-});
+};
 
 public void init(PopulationSeasonInfo pi){
      setPopInfo((PopulationSeasonInfoImpl)pi);
@@ -117,6 +116,8 @@
     setFieldPopulationMigrationMigrationDepartureZoneChooserModel();
     setFieldPopulationMigrationMigrationArrivalZoneChooserModel();
 
+    populationMigrationMigrationTable.addMatrixListener(listener);
+
     remove.setEnabled(false);
     setAddButton();
 }

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx	2009-02-23 15:42:34 UTC (rev 1862)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx	2009-02-23 23:14:43 UTC (rev 1863)
@@ -41,6 +41,8 @@
 import fr.ifremer.isisfish.entities.Formule;
 import fr.ifremer.isisfish.entities.Population;
 import fr.ifremer.isisfish.entities.PopulationImpl;
+import org.codelutin.math.matrix.gui.MatrixPanelEvent;
+import org.codelutin.math.matrix.gui.MatrixPanelListener;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -60,6 +62,17 @@
     }
 });
 
+MatrixPanelListener listener = new MatrixPanelListener() {
+    @Override
+    public void matrixChanged(MatrixPanelEvent arg0) {
+        if (getBean() != null){
+            if (fieldPopulationRecruitmentDistribution.getMatrix() != null){
+                getBean().setRecruitmentDistribution(fieldPopulationRecruitmentDistribution.getMatrix());
+            }
+        }
+    }
+};
+
 public void refresh() {
     getVerifier().setSaveButton(save);
     getVerifier().setCancelButton(cancel);
@@ -68,6 +81,11 @@
 
     reproductionEquation.init(_("isisfish.populationRecruitment.reproductionEquation"), getBean(), "Reproduction", "ReproductionEquation", "EquationReproductionEquation", fr.ifremer.isisfish.equation.PopulationReproductionEquation.class);
     getVerifier().addCurrentPanel(reproductionEquation);
+
+    if(getBean() != null && getBean().getRecruitmentDistribution() != null){
+        fieldPopulationRecruitmentDistribution.setMatrix(getBean().getRecruitmentDistribution().copy());
+    }
+    fieldPopulationRecruitmentDistribution.addMatrixListener(listener);
 }
     ]]>
     </script>
@@ -93,7 +111,7 @@
                             <JLabel text="isisfish.populationRecruitment.recruitmentDistribution" enabled='{isActif()}'/>
                         </cell>
                         <cell fill='both' weightx='1.0'>
-                            <JTable/>
+                            <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationRecruitmentDistribution' matrix='{getBean().getRecruitmentDistribution() == null ? null : getBean().getRecruitmentDistribution().copy()}' enabled='{isActif()}'/>
                         </cell>
                     </row>
                     <row>

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-02-23 15:42:34 UTC (rev 1862)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx	2009-02-23 23:14:43 UTC (rev 1863)
@@ -50,6 +50,7 @@
 import fr.ifremer.isisfish.ui.widget.IntervalPanel;
 
 protected IntervalPanel ip = new IntervalPanel();
+protected Interval interval = new Interval();
 fieldPopulationSeasonInterval.add(ip, BorderLayout.CENTER);
 ip.addPropertyChangeListener("first", new PropertyChangeListener() {
 
@@ -117,13 +118,20 @@
     getVerifier().setDeleteButton(remove, false);
     Population population = getVerifier().getEntity(Population.class);
     setBean((PopulationImpl) population);
+
     // Model instanciation
-
-    Interval interval = new Interval();
     interval.setMin(0);
     interval.setMax(11);
     interval.setFirst(0);
     interval.setLast(2);
+
+    setInterval();
+
+    ip.setLabelRenderer(Month.MONTH);
+    ip.setModel(interval);
+    setCombo();
+}
+protected void setInterval(){
     if(getPopulationSeasonInfo() != null){
         try {
             log.debug("************** Interval ************");
@@ -148,8 +156,6 @@
             // Only trace the error and go on.
         }
     }
-    ip.setLabelRenderer(Month.MONTH);
-    ip.setModel(interval);
 }
 protected void setCombo(){
     if (getBean() != null){
@@ -161,6 +167,12 @@
        getPopulationSeasonInfo().setGroupChange(fieldPopulationSeasonGroupChange.isSelected());
     }
 }
+protected void seasonChanged(){
+    setPopulationSeasonInfo((PopulationSeasonInfoImpl)fieldPopulationSeasonInfoChooser.getSelectedItem());
+    getVerifier().addCurrentEntity(getPopulationSeasonInfo());
+    setPopSeasonInfoNotNull(getPopulationSeasonInfo() != null);
+    setInterval();
+}
     ]]>
     </script>
     <Table id='body'>
@@ -173,7 +185,7 @@
                         </cell>
                         <cell fill='horizontal' weightx='1.0'>
                             <JComboBox id="fieldPopulationSeasonInfoChooser"
-                            onActionPerformed='setPopulationSeasonInfo((PopulationSeasonInfoImpl)fieldPopulationSeasonInfoChooser.getSelectedItem());getVerifier().addCurrentEntity(getPopulationSeasonInfo());setPopSeasonInfoNotNull(getPopulationSeasonInfo() != null);'
+                            onActionPerformed='seasonChanged()'
                             enabled='{isActif()}'/>
                         </cell>
                     </row>

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-02-23 15:42:34 UTC (rev 1862)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx	2009-02-23 23:14:43 UTC (rev 1863)
@@ -48,6 +48,14 @@
 import org.codelutin.math.matrix.gui.MatrixPanelEvent;
 import org.codelutin.math.matrix.gui.MatrixPanelListener;
 
+MatrixPanelListener listener = new MatrixPanelListener() {
+
+    @Override
+    public void matrixChanged(MatrixPanelEvent arg0) {
+        fieldPopulationMappingZoneReproZoneRecruChanged();
+    }
+};
+
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getOldValue() != null || evt.getNewValue() == null) {
@@ -69,14 +77,9 @@
     setPopulationZonesPresenceModel();
     setFieldPopulationZonesReproductionModel();
     setFieldPopulationZonesRecruitmentModel();
+    fieldPopulationMappingZoneReproZoneRecru.removeMatrixPanelListener(listener);
     setFieldPopulationMappingZoneReproZoneRecru();
-    fieldPopulationMappingZoneReproZoneRecru.addMatrixListener(new MatrixPanelListener() {
-
-        @Override
-        public void matrixChanged(MatrixPanelEvent arg0) {
-            fieldPopulationMappingZoneReproZoneRecruChanged();
-        }
-    });
+    fieldPopulationMappingZoneReproZoneRecru.addMatrixListener(listener);
 }
 protected void fieldPopulationMappingZoneReproZoneRecruChanged(){
     getBean().setMappingZoneReproZoneRecru(fieldPopulationMappingZoneReproZoneRecru.getMatrix());
@@ -135,12 +138,15 @@
 }
 protected void presenceChanged(){
     getBean().setPopulationZone(getSelectedValue(populationZonesPresence));
+    setFieldPopulationMappingZoneReproZoneRecru();
 }
 protected void reproductionChanged(){
     getBean().setReproductionZone(getSelectedValue(fieldPopulationZonesReproduction));
+    setFieldPopulationMappingZoneReproZoneRecru();
 }
 protected void recruitementChanged(){
     getBean().setRecruitmentZone(getSelectedValue(fieldPopulationZonesRecruitment));
+    setFieldPopulationMappingZoneReproZoneRecru();
 }
 protected java.util.List<Zone> getSelectedValue(JAXXList componant){
     Object[] selected = componant.getSelectedValues();

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx	2009-02-23 15:42:34 UTC (rev 1862)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx	2009-02-23 23:14:43 UTC (rev 1863)
@@ -35,6 +35,8 @@
     <!-- bean property -->
     <fr.ifremer.isisfish.entities.GearImpl id='bean' javaBean='null'/>
 
+    <Boolean id='selectivityPopulationSelected' javaBean='false'/>
+
     <script>
     <![CDATA[
 
@@ -70,6 +72,29 @@
     }
 });
 
+selectivityTable.addMouseListener(new MouseListener() {
+
+    @Override
+    public void mouseClicked(MouseEvent e) {
+    }
+
+    @Override
+    public void mousePressed(MouseEvent e) {
+    }
+
+    @Override
+    public void mouseReleased(MouseEvent e) {
+        remove.setEnabled(selectivityTable.getSelectedRow() != -1);
+    }
+
+    @Override
+    public void mouseEntered(MouseEvent e) {
+    }
+
+    @Override
+    public void mouseExited(MouseEvent e) {
+    }
+});
 public void refresh(){
     getVerifier().setSaveButton(save);
     getVerifier().setCancelButton(cancel);
@@ -84,7 +109,11 @@
 
 // TODO : Equation selection
     selectivityEquation.init(_("isisfish.selectivity.equation"), null, "Selectivity", null, null, fr.ifremer.isisfish.equation.SelectivityEquation.class);
+    
     getVerifier().addCurrentPanel(selectivityEquation);
+
+    remove.setEnabled(false);
+    setAddButton();
 }
 protected void setSelectivityTableModel(){
     DefaultTableModel model = new DefaultTableModel(){
@@ -130,12 +159,19 @@
 }
 protected void add(){
     getAction().addSelectivity((Population) ((GenericCell) fieldSelectivityPopulation.getSelectedItem()).getValue(), selectivityEquation.getEditor().getText(), getBean());
-    refresh();
+    setSelectivityTableModel();
 }
 protected void remove(){
     getAction().removeSelectivity(getBean(), (Selectivity) getBean().getPopulationSelectivity((Population) selectivityTable.getValueAt(selectivityTable.getSelectedRow(), 0)));
-    refresh();
+    setSelectivityTableModel();
 }
+protected void selectivityChanged(){
+    setSelectivityPopulationSelected(fieldSelectivityPopulation.getSelectedItem() != null);
+    setAddButton();
+}
+protected void setAddButton(){
+    add.setEnabled(getSelectivityPopulationSelected());
+}
     ]]>
     </script>
     <Table id='body'>
@@ -147,7 +183,7 @@
                             <JLabel text="isisfish.selectivity.selectPopulation" enabled='{isActif()}'/>
                         </cell>
                         <cell fill='horizontal' weightx='1.0'>
-                            <JComboBox id="fieldSelectivityPopulation" enabled='{isActif()}'/>
+                            <JComboBox id="fieldSelectivityPopulation" onActionPerformed='selectivityChanged()' enabled='{isActif()}'/>
                         </cell>
                     </row>
                     <row>
@@ -163,7 +199,7 @@
                 <Table>
                     <row>
                         <cell columns='2' fill='horizontal'  weightx='1.0'>
-                            <JButton id="buttonAddSelectivity" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActif()}'/>
+                            <JButton id="add" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActif()}'/>
                         </cell>
                     </row>
                     <row>
@@ -175,7 +211,7 @@
                     </row>
                     <row>
                         <cell columns='2' fill='horizontal' weightx='1.0'>
-                            <JButton id="buttonSelectivityRemove" text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}'/>
+                            <JButton id="remove" text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}'/>
                         </cell>
                     </row>
                     <row>

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-02-23 15:42:34 UTC (rev 1862)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx	2009-02-23 23:14:43 UTC (rev 1863)
@@ -40,10 +40,9 @@
 import fr.ifremer.isisfish.entities.VesselType;
 import fr.ifremer.isisfish.entities.VesselTypeImpl;
 import fr.ifremer.isisfish.entities.TripType;
+import jaxx.runtime.swing.Item;
 import fr.ifremer.isisfish.types.TimeUnit;
 
-boolean init = false;
-
 setButtonTitle(_("isisfish.input.continueSetOfVessels"));
 setNextPath("$root/$setOfVessels");
 addPropertyChangeListener("bean", new PropertyChangeListener() {
@@ -75,20 +74,23 @@
     VesselType vesselType = getVerifier().getEntity(VesselType.class);
     setBean((VesselTypeImpl) vesselType);
     if (getBean() != null){
-        init = true;
-        vesselTypeTripType.fillList(getRegion().getTripType(), getBean().getTripType());
-        init = false;
+        setListModel();
     }
 }
+protected void setListModel(){
+    java.util.List<Item> items = new java.util.ArrayList<Item>();
+    for (TripType tt : getRegion().getTripType()){
+        items.add(new Item(tt.getTopiaId(), tt.getName(), tt, false));
+    }
+    vesselTypeTripType.setItems(items);
+    vesselTypeTripType.setSelectedValues(getBean().getTripType().toArray());
+}
 protected void tripTypeChanged(){
-    if (!init){
-        Object[] values = vesselTypeTripType.getSelectedValues();
-        Collection<TripType> tripTypes = new LinkedList<TripType>();
-        for (Object o : values){
-            tripTypes.add((TripType)o);
-        }
-        getBean().setTripType(tripTypes);
+    java.util.List<TripType> tripTypes = new java.util.ArrayList<TripType>();
+    for (Object o : vesselTypeTripType.getSelectedValues()){
+        tripTypes.add((TripType)o);
     }
+    getBean().setTripType(tripTypes);
 }
     ]]></script>
     <Table id='body' constraints='BorderLayout.CENTER'>
@@ -157,7 +159,7 @@
                         </cell>
                         <cell fill='both'  weightx='1.0' weighty='0.7'>
                             <JScrollPane>
-                                <JList id="vesselTypeTripType" onMouseClicked='tripTypeChanged()' enabled='{isActif()}'/>
+                                <JList id="vesselTypeTripType" selectedValues='{getBean().getTripType().toArray()}' onMouseClicked='tripTypeChanged()' enabled='{isActif()}'/>
                             </JScrollPane>
                         </cell>
                     </row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx	2009-02-23 15:42:34 UTC (rev 1862)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx	2009-02-23 23:14:43 UTC (rev 1863)
@@ -320,7 +320,7 @@
 
                         // ... pour pouvoir avoir la classe pour l'equation
                         double Lmax = pop.getLength(deltat, group);
-//                            pop.setMaxLength(Lmax);
+                        group.setMaxLength(Lmax);
                         Lmin = Lmax;
                     }
                 }

    

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

sletellier＠users.labs.libre-entreprise.org

tags

participants (1)