r1984 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: input sensitivity - Isis-fish-commits

17 Mar 2009

Author: sletellier
Date: 2009-03-17 15:11:59 +0000 (Tue, 17 Mar 2009)
New Revision: 1984

Added:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx
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/MetierUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java
Log:
Factor of MetierSeasonInfoSpecies is done

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

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx	                        (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx	2009-03-17 15:11:59 UTC (rev 1984)
@@ -0,0 +1,248 @@
+<!--
+/* *##%
+ * Copyright (C) 2005
+ *     Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *##%*/
+
+/* *
+ * IsisFish.java
+ *
+ * Created: 1 aout 2005 18:37:25 CEST
+ *
+ * @author Benjamin POUSSIN <poussin at codelutin.com>
+ * @version $Revision: 1312 $
+ *
+ * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $
+ * by : $Author: sletellier $
+ */
+ -->
+
+<fr.ifremer.isisfish.ui.input.InputContentUI>
+
+    <!-- bean property -->
+    <fr.ifremer.isisfish.entities.MetierImpl id='bean' javaBean='null'/>
+
+    <fr.ifremer.isisfish.entities.MetierSeasonInfoImpl id='metierInfo' javaBean='null'/>
+
+    <Boolean id='metierSeasonSelected' javaBean='false'/>
+
+    <Boolean id='targetSpeciesSelected' javaBean='false'/>
+
+    <script><![CDATA[
+import com.l2fprod.common.swing.renderer.BooleanCellRenderer;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import fr.ifremer.isisfish.entities.Equation;
+import fr.ifremer.isisfish.entities.Formule;
+import fr.ifremer.isisfish.entities.Metier;
+import fr.ifremer.isisfish.entities.MetierImpl;
+import fr.ifremer.isisfish.entities.MetierSeasonInfo;
+import fr.ifremer.isisfish.entities.MetierSeasonInfoImpl;
+import fr.ifremer.isisfish.entities.TargetSpecies;
+import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
+import fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor;
+import fr.ifremer.isisfish.ui.WelcomePanelUI;
+import org.codelutin.topia.persistence.TopiaEntity;
+import javax.swing.table.DefaultTableModel;
+import fr.ifremer.isisfish.entities.Species;
+import org.codelutin.topia.TopiaContext;
+import javax.swing.table.TableCellEditor;
+
+addPropertyChangeListener("bean", new PropertyChangeListener() {
+    public void propertyChange(PropertyChangeEvent evt) {
+        if (evt.getOldValue() != null || evt.getNewValue() == null) {
+            // remove previous binding on getBean()
+            //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
+        }
+        if (evt.getNewValue() != null) {
+            // add binding on getBean()
+            //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text")
+        }
+    }
+});
+
+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().addCurrentPanel(targetFactor);
+    if (getBean() != null){
+        setTableTargetSpeciesModel();
+     }
+     else{
+        setTargetSpeciesModel();
+     }
+    setTargetSpeciesModel();
+    remove.setEnabled(false);
+    setAddButton();
+}
+protected void setTargetSpeciesModel(){
+   DefaultComboBoxModel fieldTargetSpeciesModel = new DefaultComboBoxModel();
+    java.util.List<Species> species = getRegion().getSpecies();
+    if (species != null){
+        fieldTargetSpeciesModel.addElement(new GenericCell(" ", null, null));
+        for (Species s : species){
+            fieldTargetSpeciesModel.addElement(new GenericCell(s.getName(), s, Species.class));
+        }
+    }
+    fieldTargetSpecies.setModel(fieldTargetSpeciesModel);
+}
+protected void setTableTargetSpeciesModel(){
+    DefaultTableModel model = new DefaultTableModel(){
+        @Override
+            public boolean isCellEditable(int row, int column) {
+                boolean result = false;
+                if (column > 0){
+                    result =true;
+                }
+                return result;
+            }
+    };
+    if (getMetierInfo() != null){
+        Collection<TargetSpecies> targetSpecies = ((MetierSeasonInfo)getMetierInfo()).getSpeciesTargetSpecies();
+        if (targetSpecies != null){
+            ArrayList <GenericCell> species = new ArrayList <GenericCell>();
+            ArrayList <Equation> equations = new ArrayList <Equation>();
+            ArrayList <Boolean> primaryCatch = new ArrayList <Boolean>();
+            for (TargetSpecies t : targetSpecies){
+                Species s = t.getSpecies();
+                Equation e = t.getTargetFactorEquation();
+                Boolean b = t.getPrimaryCatch();
+                species.add(new GenericCell(s.getName(),s,Species.class));
+                equations.add(e);
+                primaryCatch.add(b);
+            }
+            model.addColumn("Species", species.toArray());
+            model.addColumn("Target factor", equations.toArray());
+            model.addColumn("Main species for the metier", primaryCatch.toArray());
+        }
+        tableTargetSpecies.setModel(model);
+        EquationTableEditor cellEditor = new EquationTableEditor();
+        tableTargetSpecies.getColumnModel().getColumn(1).setCellEditor(cellEditor);
+    }
+}
+protected void add(){
+    Object species = ((GenericCell)fieldTargetSpecies.getSelectedItem()).getValue();
+    if (getMetierInfo() != null && species != null){
+        getContextValue(InputAction.class).addTargetSpecies(
+                getBean(),
+                (MetierSeasonInfo)getMetierInfo(),
+                (Species)species,
+                targetFactor.getEditor().getText(),
+                fieldPrimaryCatch.isSelected());
+        setTableTargetSpeciesModel();
+    }
+}
+protected void remove(){
+    if (isMetierSeasonSelected()){
+        Object[] targetSpecies = getMetierInfo().getSpeciesTargetSpecies().toArray();
+
+        Object o = targetSpecies[tableTargetSpecies.getSelectedRow()];
+        if (o != null){
+            TargetSpecies ts = (TargetSpecies)o;
+            getAction().removeTargetSpecies(getMetierInfo(), ts);
+            setTableTargetSpeciesModel();
+        }
+    }
+}
+protected void targetSpeciesChanged(){
+    setTargetSpeciesSelected(fieldTargetSpecies.getSelectedItem() != null);
+    setTableTargetSpeciesModel();
+    setAddButton();
+}
+protected void setAddButton(){
+    add.setEnabled(getMetierSeasonSelected() && getTargetSpeciesSelected());
+}
+    ]]></script>
+    <Table id='body'>
+        <row>
+            <cell fill='both' weightx='1.0' weighty='0.5'>
+                <Table>
+                    <row>
+                        <cell fill='horizontal' anchor='east'>
+                            <JLabel text="isisfish.metierSeasonInfoSpecies.selectSpecies" enabled='{isActif()}'/>
+                        </cell>
+                        <cell fill='horizontal' weightx='1.0'>
+                            <JComboBox id="fieldTargetSpecies" onActionPerformed='targetSpeciesChanged()' enabled='{isActif()}'/>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell columns='2' fill='both' weightx='1.0' weighty='1.0'>
+                            <InputOneEquationUI id='targetFactor' constructorParams='this'
+                                actif='{isActif()}'
+                                lblText='{_("isisfish.metierSeasonInfoSpecies.targetFactor")}'
+                                bean='{getBean()}'  nameEquation='TargetFactor'
+                                clazz='{fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation.class}'
+                                decorator='boxed' _bean='{MetierImpl.class}' _method='""'/>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell fill='horizontal'>
+                               <JPanel/>
+                        </cell>
+                        <cell fill='horizontal' weightx='1.0'>
+                            <JCheckBox id="fieldPrimaryCatch" text="isisfish.metierSeasonInfoSpecies.mainSpecies" enabled='{isActif()}'/>
+                        </cell>
+                    </row>
+                </Table>
+            </cell>
+        </row>
+        <row>
+            <cell fill='both' weightx='1.0' weighty='0.5'>
+                <Table>
+                    <row>
+                        <cell columns='2' fill='horizontal' weightx='1.0'>
+                            <JButton id="add" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActif()}'/>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell columns='2' fill='both' weightx='1.0' weighty='1.0'>
+                            <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'>
+                                <JTable id="tableTargetSpecies" rowHeight='24' enabled='{isActif()}'/>
+                            </JScrollPane>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell columns='2' fill='horizontal' weightx='1.0'>
+                            <JButton id="remove" text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}'/>
+                        </cell>
+                    </row>
+                </Table>
+            </cell>
+        </row>
+    </Table>
+</fr.ifremer.isisfish.ui.input.InputContentUI>

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-03-17 14:39:41 UTC (rev 1983)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx	2009-03-17 15:11:59 UTC (rev 1984)
@@ -39,28 +39,15 @@
     <fr.ifremer.isisfish.entities.MetierSeasonInfoImpl id='metierInfo' javaBean='null'/>
 
     <Boolean id='metierSeasonSelected' javaBean='false'/>
-    
-    <Boolean id='targetSpeciesSelected' javaBean='false'/>
 
     <script><![CDATA[
-import com.l2fprod.common.swing.renderer.BooleanCellRenderer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import fr.ifremer.isisfish.entities.Equation;
-import fr.ifremer.isisfish.entities.Formule;
 import fr.ifremer.isisfish.entities.Metier;
 import fr.ifremer.isisfish.entities.MetierImpl;
 import fr.ifremer.isisfish.entities.MetierSeasonInfo;
 import fr.ifremer.isisfish.entities.MetierSeasonInfoImpl;
-import fr.ifremer.isisfish.entities.TargetSpecies;
 import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
-import fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor; 
-import fr.ifremer.isisfish.ui.WelcomePanelUI;
-import org.codelutin.topia.persistence.TopiaEntity;
-import javax.swing.table.DefaultTableModel;
-import fr.ifremer.isisfish.entities.Species;
-import org.codelutin.topia.TopiaContext;
-import javax.swing.table.TableCellEditor;
 
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
@@ -75,54 +62,20 @@
     }
 });
 
-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);
     Metier metier = getVerifier().getEntity(Metier.class);
     setBean((MetierImpl) metier);
-    getVerifier().addCurrentPanel(targetFactor);
+    getVerifier().addCurrentPanel(editor);
     if (getBean() != null){
-        if (fieldMetierSeasonInfo.getSelectedIndex() <= 0){
-            setSeasonModel();
-        }
-        else {
-            setTableTargetSpeciesModel();
-        }
-        if (fieldTargetSpecies.getSelectedIndex() <= 0){
-            setTargetSpeciesModel();
-        }
-        setTableTargetSpeciesModel();
+        setSeasonModel();
      }
      else{
         DefaultComboBoxModel seasonModel = new DefaultComboBoxModel();
         fieldMetierSeasonInfo.setModel(seasonModel);
-        setTargetSpeciesModel();
      }
-    remove.setEnabled(false);
-    setAddButton();
+
 }
 protected void setSeasonModel(){
     DefaultComboBoxModel seasonModel = new DefaultComboBoxModel();
@@ -135,95 +88,14 @@
     }
     fieldMetierSeasonInfo.setModel(seasonModel);
 }
-protected void setTargetSpeciesModel(){
-   DefaultComboBoxModel fieldTargetSpeciesModel = new DefaultComboBoxModel();
-    java.util.List<Species> species = getRegion().getSpecies();
-    if (species != null){
-        fieldTargetSpeciesModel.addElement(new GenericCell(" ", null, null));
-        for (Species s : species){
-            fieldTargetSpeciesModel.addElement(new GenericCell(s.getName(), s, Species.class));
-        }
-    }
-    fieldTargetSpecies.setModel(fieldTargetSpeciesModel);
-}
-protected void setTableTargetSpeciesModel(){
-    DefaultTableModel model = new DefaultTableModel(){
-        @Override
-            public boolean isCellEditable(int row, int column) {
-                boolean result = false;
-                if (column > 0){
-                    result =true;
-                }
-                return result;
-            }
-    };
-    Object season = ((GenericCell)fieldMetierSeasonInfo.getSelectedItem()).getValue();
-    if (season != null){
-        Collection<TargetSpecies> targetSpecies = ((MetierSeasonInfo)season).getSpeciesTargetSpecies();
-        if (targetSpecies != null){
-            ArrayList <GenericCell> species = new ArrayList <GenericCell>();
-            ArrayList <Equation> equations = new ArrayList <Equation>();
-            ArrayList <Boolean> primaryCatch = new ArrayList <Boolean>();
-            for (TargetSpecies t : targetSpecies){
-                Species s = t.getSpecies();
-                Equation e = t.getTargetFactorEquation();
-                Boolean b = t.getPrimaryCatch();
-                species.add(new GenericCell(s.getName(),s,Species.class));
-                equations.add(e);
-                primaryCatch.add(b);
-            }
-            model.addColumn("Species", species.toArray());
-            model.addColumn("Target factor", equations.toArray());
-            model.addColumn("Main species for the metier", primaryCatch.toArray());
-        }
-        tableTargetSpecies.setModel(model);
-        EquationTableEditor cellEditor = new EquationTableEditor();
-        tableTargetSpecies.getColumnModel().getColumn(1).setCellEditor(cellEditor);
-    }
-}
-protected void add(){
-    Object season = ((GenericCell)fieldMetierSeasonInfo.getSelectedItem()).getValue();
-    Object species = ((GenericCell)fieldTargetSpecies.getSelectedItem()).getValue();
-    if (season != null && species != null){
-        getContextValue(InputAction.class).addTargetSpecies(
-                getBean(),
-                (MetierSeasonInfo)season,
-                (Species)species,
-                targetFactor.getEditor().getText(),
-                fieldPrimaryCatch.isSelected());
-        setTableTargetSpeciesModel();
-    }
-}
-protected void remove(){
-    if (isMetierSeasonSelected()){
-        Object[] targetSpecies = getMetierInfo().getSpeciesTargetSpecies().toArray();
-
-        Object o = targetSpecies[tableTargetSpecies.getSelectedRow()];
-        if (o != null){
-            TargetSpecies ts = (TargetSpecies)o;
-            getAction().removeTargetSpecies(getMetierInfo(), ts);
-            setTableTargetSpeciesModel();
-        }
-    }
-}
 protected void metierSeasonChanged(){
     setMetierSeasonSelected(fieldMetierSeasonInfo.getSelectedItem() != null);
     if (isMetierSeasonSelected()){
         setMetierInfo((MetierSeasonInfoImpl)((GenericCell)fieldMetierSeasonInfo.getSelectedItem()).getValue());
         getVerifier().addCurrentEntity(getMetierInfo());
     }
-    setTargetSpeciesModel();
-    setTableTargetSpeciesModel();
-    setAddButton();
+    editor.refresh();
 }
-protected void targetSpeciesChanged(){
-    setTargetSpeciesSelected(fieldTargetSpecies.getSelectedItem() != null);
-    setTableTargetSpeciesModel();
-    setAddButton();
-}
-protected void setAddButton(){
-    add.setEnabled(getMetierSeasonSelected() && getTargetSpeciesSelected());
-}
     ]]></script>
     <Table id='body'>
         <row>
@@ -238,54 +110,18 @@
                         </cell>
                     </row>
                     <row>
-                        <cell fill='horizontal' anchor='east'>
-                            <JLabel text="isisfish.metierSeasonInfoSpecies.selectSpecies" enabled='{isActif()}'/>
-                        </cell>
-                        <cell fill='horizontal' weightx='1.0'>
-                            <JComboBox id="fieldTargetSpecies" onActionPerformed='targetSpeciesChanged()' enabled='{isActif()}'/>
-                        </cell>
-                    </row>
-                    <row>
                         <cell columns='2' fill='both' weightx='1.0' weighty='1.0'>
-                            <InputOneEquationUI id='targetFactor' constructorParams='this'
-                                lblText='{_("isisfish.metierSeasonInfoSpecies.targetFactor")}'
-                                bean='{getBean()}'  nameEquation='TargetFactor'
-                                clazz='{fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation.class}'
-                                decorator='boxed' _bean='{MetierImpl.class}' _method='""'/>
+                            <MetierSeasonInfoSpeciesEditorUI id='editor' constructorParams='this' bean='{getBean()}' metierInfo='{getMetierInfo()}' metierSeasonSelected='{getMetierSeasonSelected()}' actif='{isActif()}'
+                              decorator='boxed' _bean='{MetierSeasonInfoImpl.class}' _method='"SpeciesTargetSpecies"'/>
                         </cell>
                     </row>
-                    <row>
-                        <cell fill='horizontal'>
-                               <JPanel/>
-                        </cell>
-                        <cell fill='horizontal' weightx='1.0'>
-                            <JCheckBox id="fieldPrimaryCatch" text="isisfish.metierSeasonInfoSpecies.mainSpecies" enabled='{isActif()}'/>
-                        </cell>
-                    </row>
                 </Table>
             </cell>
         </row>
         <row>
-            <cell fill='both' weightx='1.0' weighty='0.5'>
+            <cell fill='horizontal' weightx='1.0'>
                 <Table>
                     <row>
-                        <cell columns='2' fill='horizontal' weightx='1.0'>
-                            <JButton id="add" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActif()}'/>
-                        </cell>
-                    </row>
-                    <row>
-                        <cell columns='2' fill='both' weightx='1.0' weighty='1.0'>
-                            <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'>
-                                <JTable id="tableTargetSpecies" rowHeight='24' enabled='{isActif()}'/>
-                            </JScrollPane>
-                        </cell>
-                    </row>
-                    <row>
-                        <cell columns='2' fill='horizontal' weightx='1.0'>
-                            <JButton id="remove" text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}'/>
-                        </cell>
-                    </row>
-                    <row>
                         <cell fill='horizontal' weightx='0.5'>
                             <JButton id='save'/>
                         </cell>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx	2009-03-17 14:39:41 UTC (rev 1983)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx	2009-03-17 15:11:59 UTC (rev 1984)
@@ -59,7 +59,7 @@
         <JTabbedPane id="metierTab" name="Metier" constraints='BorderLayout.CENTER' >
             <tab  title='{_("isisfish.metier.title")}'><MetierTabUI id="metierTabUI" constructorParams='this'/></tab>
             <tab title='{_("isisfish.metierSeasonInfoZone.title")}'><MetierSeasonInfoZoneUI id="metierSeasonInfoUI" constructorParams='this'/></tab>
-            <tab title='{_("isisfish.metierSeasonInfoSpecies.title")}'><MetierSeasonInfoSpeciesUI id="metierSeasonSpeciesUI" constructorParams='this'  decorator='boxed' _bean='{MetierSeasonInfoImpl.class}' _method='"SpeciesTargetSpecies"'/></tab>
+            <tab title='{_("isisfish.metierSeasonInfoSpecies.title")}'><MetierSeasonInfoSpeciesUI id="metierSeasonSpeciesUI" constructorParams='this'/></tab>
         </JTabbedPane>
     </JPanel>
 </fr.ifremer.isisfish.ui.input.InputContentUI>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java	2009-03-17 14:39:41 UTC (rev 1983)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java	2009-03-17 15:11:59 UTC (rev 1984)
@@ -19,11 +19,14 @@
 package fr.ifremer.isisfish.ui.sensitivity;
 
 import fr.ifremer.isisfish.entities.Formule;
+import fr.ifremer.isisfish.entities.TargetSpecies;
 import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain;
 import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain;
 import fr.ifremer.isisfish.types.Month;
 import fr.ifremer.isisfish.ui.input.InputAction;
 import fr.ifremer.isisfish.ui.input.InputOneEquationUI;
+import fr.ifremer.isisfish.ui.input.InputSaveVerifier;
+import fr.ifremer.isisfish.ui.input.MetierSeasonInfoSpeciesEditorUI;
 import fr.ifremer.isisfish.ui.input.PopulationMigrationEmigrationUI;
 import fr.ifremer.isisfish.ui.input.PopulationMigrationImmigrationUI;
 import fr.ifremer.isisfish.ui.input.PopulationMigrationMigrationUI;
@@ -47,6 +50,7 @@
 import org.codelutin.topia.persistence.TopiaEntity;
 import fr.ifremer.isisfish.ui.input.RangeOfValuesUI;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -120,6 +124,17 @@
                 result = ipResult;
             } else if (result instanceof RangeOfValuesUI){
                 result = new JTextField("");
+            } else if (result instanceof MetierSeasonInfoSpeciesEditorUI){
+                MetierSeasonInfoSpeciesEditorUI origine = (MetierSeasonInfoSpeciesEditorUI)c;
+                MetierSeasonInfoSpeciesEditorUI ui = new MetierSeasonInfoSpeciesEditorUI(new JAXXInitialContext().add(new InputAction()).add(origine.getRegion()).add(new InputSaveVerifier()));
+                ui.setBean(origine.getBean());
+                if (origine.getMetierInfo() != null){
+                    ui.setMetierInfo(origine.getMetierInfo());
+                    ui.setMetierSeasonSelected(true);
+                    ui.setActif(true);
+                }
+                ui.refresh();
+                result = ui;
             } else if (result instanceof PopulationZonesEditorUI){
                 PopulationZonesEditorUI origine = (PopulationZonesEditorUI)c;
                 PopulationZonesEditorUI ui = new PopulationZonesEditorUI(new JAXXInitialContext().add(new InputAction()).add(origine.getRegion()));
@@ -285,6 +300,18 @@
                 ipResult.setLabelRenderer(Month.MONTH);
                 ipResult.setModel(ip.getModel().clone());
                 result = ipResult;
+            } else if (result instanceof MetierSeasonInfoSpeciesEditorUI){
+                MetierSeasonInfoSpeciesEditorUI origine = (MetierSeasonInfoSpeciesEditorUI)c;
+                MetierSeasonInfoSpeciesEditorUI ui = new MetierSeasonInfoSpeciesEditorUI(new JAXXInitialContext().add(new InputAction()).add(origine.getRegion()).add(new InputSaveVerifier()));
+                ui.setBean(origine.getBean());
+                if (origine.getMetierInfo() != null){
+                    ui.setMetierInfo(origine.getMetierInfo());
+                    ui.getMetierInfo().setSpeciesTargetSpecies((Collection<TargetSpecies>)value);
+                    ui.setMetierSeasonSelected(true);
+                    ui.setActif(true);
+                }
+                ui.refresh();
+                result = ui;
             } else if (result instanceof PopulationZonesEditorUI){
                 PopulationZonesEditorUI origine = (PopulationZonesEditorUI)c;
                 PopulationZonesEditorUI ui = new PopulationZonesEditorUI(new JAXXInitialContext().add(new InputAction()).add(origine.getRegion()));
@@ -356,6 +383,12 @@
     } else if (c instanceof IntervalPanel){
 //                ((IntervalPanel) result).setModel((BeanUtils.getProperty(e, fieldName)));
 
+    } else if (c instanceof MetierSeasonInfoSpeciesEditorUI){
+        result = ((MetierSeasonInfoSpeciesEditorUI)c).getMetierInfo().getSpeciesTargetSpecies();
+
+    } else if (result instanceof PopulationZonesEditorUI){
+        result = ((PopulationZonesEditorUI)c).getFieldPopulationMappingZoneReproZoneRecru().getMatrix();
+        
     } else if (c instanceof RangeOfValuesUI){
 
     } else if (c instanceof PopulationMigrationMigrationUI){

    

r1984 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: input sensitivity

sletellier＠users.labs.libre-entreprise.org

tags

participants (1)