From sletellier@users.labs.libre-entreprise.org Mon Jun 15 00:25:58 2026
From: sletellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r1984 - in
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: input	sensitivity
Date: Tue, 17 Mar 2009 16:12:00 +0100
Message-ID: <20090317151200.0E3CC461707@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4039026303746942999=="

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

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/MetierSeasonInf=
oSpeciesEditorUI.jaxx
Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInf=
oSpeciesUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHel=
per.java
Log:
Factor of MetierSeasonInfoSpecies is done

Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeaso=
nInfoSpeciesEditorUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonIn=
foSpeciesEditorUI.jaxx	                        (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonIn=
foSpeciesEditorUI.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, US=
A.
+ *##%*/
+
+/* *
+ * 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=C3=BB 2008) $
+ * by : $Author: sletellier $
+ */
+ -->
+
+<fr.ifremer.isisfish.ui.input.InputContentUI>
+
+    <!-- bean property -->
+    <fr.ifremer.isisfish.entities.MetierImpl id=3D'bean' javaBean=3D'null'/>
+
+    <fr.ifremer.isisfish.entities.MetierSeasonInfoImpl id=3D'metierInfo' jav=
aBean=3D'null'/>
+
+    <Boolean id=3D'metierSeasonSelected' javaBean=3D'false'/>
+
+    <Boolean id=3D'targetSpeciesSelected' javaBean=3D'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() !=3D null || evt.getNewValue() =3D=3D null) {
+            // remove previous binding on getBean()
+            //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldC=
ellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCel=
lLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("=
");
+        }
+        if (evt.getNewValue() !=3D null) {
+            // add binding on getBean()
+            //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCe=
llName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCell=
Land.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() !=3D -1);
+    }
+
+    @Override
+    public void mouseEntered(MouseEvent e) {
+    }
+
+    @Override
+    public void mouseExited(MouseEvent e) {
+    }
+});
+ public void refresh() {
+    getVerifier().addCurrentPanel(targetFactor);
+    if (getBean() !=3D null){
+        setTableTargetSpeciesModel();
+     }
+     else{
+        setTargetSpeciesModel();
+     }
+    setTargetSpeciesModel();
+    remove.setEnabled(false);
+    setAddButton();
+}
+protected void setTargetSpeciesModel(){
+   DefaultComboBoxModel fieldTargetSpeciesModel =3D new DefaultComboBoxModel=
();
+    java.util.List<Species> species =3D getRegion().getSpecies();
+    if (species !=3D 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 =3D new DefaultTableModel(){
+        @Override
+            public boolean isCellEditable(int row, int column) {
+                boolean result =3D false;
+                if (column > 0){
+                    result =3Dtrue;
+                }
+                return result;
+            }
+    };
+    if (getMetierInfo() !=3D null){
+        Collection<TargetSpecies> targetSpecies =3D ((MetierSeasonInfo)getMe=
tierInfo()).getSpeciesTargetSpecies();
+        if (targetSpecies !=3D null){
+            ArrayList <GenericCell> species =3D new ArrayList <GenericCell>(=
);
+            ArrayList <Equation> equations =3D new ArrayList <Equation>();
+            ArrayList <Boolean> primaryCatch =3D new ArrayList <Boolean>();
+            for (TargetSpecies t : targetSpecies){
+                Species s =3D t.getSpecies();
+                Equation e =3D t.getTargetFactorEquation();
+                Boolean b =3D 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.toAr=
ray());
+        }
+        tableTargetSpecies.setModel(model);
+        EquationTableEditor cellEditor =3D new EquationTableEditor();
+        tableTargetSpecies.getColumnModel().getColumn(1).setCellEditor(cellE=
ditor);
+    }
+}
+protected void add(){
+    Object species =3D ((GenericCell)fieldTargetSpecies.getSelectedItem()).g=
etValue();
+    if (getMetierInfo() !=3D null && species !=3D null){
+        getContextValue(InputAction.class).addTargetSpecies(
+                getBean(),
+                (MetierSeasonInfo)getMetierInfo(),
+                (Species)species,
+                targetFactor.getEditor().getText(),
+                fieldPrimaryCatch.isSelected());
+        setTableTargetSpeciesModel();
+    }
+}
+protected void remove(){
+    if (isMetierSeasonSelected()){
+        Object[] targetSpecies =3D getMetierInfo().getSpeciesTargetSpecies()=
.toArray();
+
+        Object o =3D targetSpecies[tableTargetSpecies.getSelectedRow()];
+        if (o !=3D null){
+            TargetSpecies ts =3D (TargetSpecies)o;
+            getAction().removeTargetSpecies(getMetierInfo(), ts);
+            setTableTargetSpeciesModel();
+        }
+    }
+}
+protected void targetSpeciesChanged(){
+    setTargetSpeciesSelected(fieldTargetSpecies.getSelectedItem() !=3D null);
+    setTableTargetSpeciesModel();
+    setAddButton();
+}
+protected void setAddButton(){
+    add.setEnabled(getMetierSeasonSelected() && getTargetSpeciesSelected());
+}
+    ]]></script>
+    <Table id=3D'body'>
+        <row>
+            <cell fill=3D'both' weightx=3D'1.0' weighty=3D'0.5'>
+                <Table>
+                    <row>
+                        <cell fill=3D'horizontal' anchor=3D'east'>
+                            <JLabel text=3D"isisfish.metierSeasonInfoSpecies=
.selectSpecies" enabled=3D'{isActif()}'/>
+                        </cell>
+                        <cell fill=3D'horizontal' weightx=3D'1.0'>
+                            <JComboBox id=3D"fieldTargetSpecies" onActionPer=
formed=3D'targetSpeciesChanged()' enabled=3D'{isActif()}'/>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell columns=3D'2' fill=3D'both' weightx=3D'1.0' we=
ighty=3D'1.0'>
+                            <InputOneEquationUI id=3D'targetFactor' construc=
torParams=3D'this'
+                                actif=3D'{isActif()}'
+                                lblText=3D'{_("isisfish.metierSeasonInfoSpec=
ies.targetFactor")}'
+                                bean=3D'{getBean()}'  nameEquation=3D'Target=
Factor'
+                                clazz=3D'{fr.ifremer.isisfish.equation.Targe=
tSpeciesTargetFactorEquation.class}'
+                                decorator=3D'boxed' _bean=3D'{MetierImpl.cla=
ss}' _method=3D'""'/>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell fill=3D'horizontal'>
+                               <JPanel/>
+                        </cell>
+                        <cell fill=3D'horizontal' weightx=3D'1.0'>
+                            <JCheckBox id=3D"fieldPrimaryCatch" text=3D"isis=
fish.metierSeasonInfoSpecies.mainSpecies" enabled=3D'{isActif()}'/>
+                        </cell>
+                    </row>
+                </Table>
+            </cell>
+        </row>
+        <row>
+            <cell fill=3D'both' weightx=3D'1.0' weighty=3D'0.5'>
+                <Table>
+                    <row>
+                        <cell columns=3D'2' fill=3D'horizontal' weightx=3D'1=
.0'>
+                            <JButton id=3D"add" text=3D"isisfish.common.add"=
 onActionPerformed=3D'add()' enabled=3D'{isActif()}'/>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell columns=3D'2' fill=3D'both' weightx=3D'1.0' we=
ighty=3D'1.0'>
+                            <JScrollPane minimumSize=3D'{new Dimension(0,0)}=
' preferredSize=3D'{new Dimension(0,0)}'>
+                                <JTable id=3D"tableTargetSpecies" rowHeight=
=3D'24' enabled=3D'{isActif()}'/>
+                            </JScrollPane>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell columns=3D'2' fill=3D'horizontal' weightx=3D'1=
.0'>
+                            <JButton id=3D"remove" text=3D"isisfish.common.r=
emove" onActionPerformed=3D'remove()' enabled=3D'{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/MetierSe=
asonInfoSpeciesUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonIn=
foSpeciesUI.jaxx	2009-03-17 14:39:41 UTC (rev 1983)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonIn=
foSpeciesUI.jaxx	2009-03-17 15:11:59 UTC (rev 1984)
@@ -39,28 +39,15 @@
     <fr.ifremer.isisfish.entities.MetierSeasonInfoImpl id=3D'metierInfo' jav=
aBean=3D'null'/>
=20
     <Boolean id=3D'metierSeasonSelected' javaBean=3D'false'/>
-   =20
-    <Boolean id=3D'targetSpeciesSelected' javaBean=3D'false'/>
=20
     <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;=20
-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;
=20
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
@@ -75,54 +62,20 @@
     }
 });
=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() !=3D -1);
-    }
-
-    @Override
-    public void mouseEntered(MouseEvent e) {
-    }
-
-    @Override
-    public void mouseExited(MouseEvent e) {
-    }
-});
  public void refresh() {
     getVerifier().setSaveButton(save);
     getVerifier().setCancelButton(cancel);
     Metier metier =3D getVerifier().getEntity(Metier.class);
     setBean((MetierImpl) metier);
-    getVerifier().addCurrentPanel(targetFactor);
+    getVerifier().addCurrentPanel(editor);
     if (getBean() !=3D null){
-        if (fieldMetierSeasonInfo.getSelectedIndex() <=3D 0){
-            setSeasonModel();
-        }
-        else {
-            setTableTargetSpeciesModel();
-        }
-        if (fieldTargetSpecies.getSelectedIndex() <=3D 0){
-            setTargetSpeciesModel();
-        }
-        setTableTargetSpeciesModel();
+        setSeasonModel();
      }
      else{
         DefaultComboBoxModel seasonModel =3D new DefaultComboBoxModel();
         fieldMetierSeasonInfo.setModel(seasonModel);
-        setTargetSpeciesModel();
      }
-    remove.setEnabled(false);
-    setAddButton();
+
 }
 protected void setSeasonModel(){
     DefaultComboBoxModel seasonModel =3D new DefaultComboBoxModel();
@@ -135,95 +88,14 @@
     }
     fieldMetierSeasonInfo.setModel(seasonModel);
 }
-protected void setTargetSpeciesModel(){
-   DefaultComboBoxModel fieldTargetSpeciesModel =3D new DefaultComboBoxModel=
();
-    java.util.List<Species> species =3D getRegion().getSpecies();
-    if (species !=3D 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 =3D new DefaultTableModel(){
-        @Override
-            public boolean isCellEditable(int row, int column) {
-                boolean result =3D false;
-                if (column > 0){
-                    result =3Dtrue;
-                }
-                return result;
-            }
-    };
-    Object season =3D ((GenericCell)fieldMetierSeasonInfo.getSelectedItem())=
.getValue();
-    if (season !=3D null){
-        Collection<TargetSpecies> targetSpecies =3D ((MetierSeasonInfo)seaso=
n).getSpeciesTargetSpecies();
-        if (targetSpecies !=3D null){
-            ArrayList <GenericCell> species =3D new ArrayList <GenericCell>(=
);
-            ArrayList <Equation> equations =3D new ArrayList <Equation>();
-            ArrayList <Boolean> primaryCatch =3D new ArrayList <Boolean>();
-            for (TargetSpecies t : targetSpecies){
-                Species s =3D t.getSpecies();
-                Equation e =3D t.getTargetFactorEquation();
-                Boolean b =3D 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.toAr=
ray());
-        }
-        tableTargetSpecies.setModel(model);
-        EquationTableEditor cellEditor =3D new EquationTableEditor();
-        tableTargetSpecies.getColumnModel().getColumn(1).setCellEditor(cellE=
ditor);
-    }
-}
-protected void add(){
-    Object season =3D ((GenericCell)fieldMetierSeasonInfo.getSelectedItem())=
.getValue();
-    Object species =3D ((GenericCell)fieldTargetSpecies.getSelectedItem()).g=
etValue();
-    if (season !=3D null && species !=3D null){
-        getContextValue(InputAction.class).addTargetSpecies(
-                getBean(),
-                (MetierSeasonInfo)season,
-                (Species)species,
-                targetFactor.getEditor().getText(),
-                fieldPrimaryCatch.isSelected());
-        setTableTargetSpeciesModel();
-    }
-}
-protected void remove(){
-    if (isMetierSeasonSelected()){
-        Object[] targetSpecies =3D getMetierInfo().getSpeciesTargetSpecies()=
.toArray();
-
-        Object o =3D targetSpecies[tableTargetSpecies.getSelectedRow()];
-        if (o !=3D null){
-            TargetSpecies ts =3D (TargetSpecies)o;
-            getAction().removeTargetSpecies(getMetierInfo(), ts);
-            setTableTargetSpeciesModel();
-        }
-    }
-}
 protected void metierSeasonChanged(){
     setMetierSeasonSelected(fieldMetierSeasonInfo.getSelectedItem() !=3D nul=
l);
     if (isMetierSeasonSelected()){
         setMetierInfo((MetierSeasonInfoImpl)((GenericCell)fieldMetierSeasonI=
nfo.getSelectedItem()).getValue());
         getVerifier().addCurrentEntity(getMetierInfo());
     }
-    setTargetSpeciesModel();
-    setTableTargetSpeciesModel();
-    setAddButton();
+    editor.refresh();
 }
-protected void targetSpeciesChanged(){
-    setTargetSpeciesSelected(fieldTargetSpecies.getSelectedItem() !=3D null);
-    setTableTargetSpeciesModel();
-    setAddButton();
-}
-protected void setAddButton(){
-    add.setEnabled(getMetierSeasonSelected() && getTargetSpeciesSelected());
-}
     ]]></script>
     <Table id=3D'body'>
         <row>
@@ -238,54 +110,18 @@
                         </cell>
                     </row>
                     <row>
-                        <cell fill=3D'horizontal' anchor=3D'east'>
-                            <JLabel text=3D"isisfish.metierSeasonInfoSpecies=
.selectSpecies" enabled=3D'{isActif()}'/>
-                        </cell>
-                        <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <JComboBox id=3D"fieldTargetSpecies" onActionPer=
formed=3D'targetSpeciesChanged()' enabled=3D'{isActif()}'/>
-                        </cell>
-                    </row>
-                    <row>
                         <cell columns=3D'2' fill=3D'both' weightx=3D'1.0' we=
ighty=3D'1.0'>
-                            <InputOneEquationUI id=3D'targetFactor' construc=
torParams=3D'this'
-                                lblText=3D'{_("isisfish.metierSeasonInfoSpec=
ies.targetFactor")}'
-                                bean=3D'{getBean()}'  nameEquation=3D'Target=
Factor'
-                                clazz=3D'{fr.ifremer.isisfish.equation.Targe=
tSpeciesTargetFactorEquation.class}'
-                                decorator=3D'boxed' _bean=3D'{MetierImpl.cla=
ss}' _method=3D'""'/>
+                            <MetierSeasonInfoSpeciesEditorUI id=3D'editor' c=
onstructorParams=3D'this' bean=3D'{getBean()}' metierInfo=3D'{getMetierInfo()=
}' metierSeasonSelected=3D'{getMetierSeasonSelected()}' actif=3D'{isActif()}'
+                              decorator=3D'boxed' _bean=3D'{MetierSeasonInfo=
Impl.class}' _method=3D'"SpeciesTargetSpecies"'/>
                         </cell>
                     </row>
-                    <row>
-                        <cell fill=3D'horizontal'>
-                               <JPanel/>
-                        </cell>
-                        <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <JCheckBox id=3D"fieldPrimaryCatch" text=3D"isis=
fish.metierSeasonInfoSpecies.mainSpecies" enabled=3D'{isActif()}'/>
-                        </cell>
-                    </row>
                 </Table>
             </cell>
         </row>
         <row>
-            <cell fill=3D'both' weightx=3D'1.0' weighty=3D'0.5'>
+            <cell fill=3D'horizontal' weightx=3D'1.0'>
                 <Table>
                     <row>
-                        <cell columns=3D'2' fill=3D'horizontal' weightx=3D'1=
.0'>
-                            <JButton id=3D"add" text=3D"isisfish.common.add"=
 onActionPerformed=3D'add()' enabled=3D'{isActif()}'/>
-                        </cell>
-                    </row>
-                    <row>
-                        <cell columns=3D'2' fill=3D'both' weightx=3D'1.0' we=
ighty=3D'1.0'>
-                            <JScrollPane minimumSize=3D'{new Dimension(0,0)}=
' preferredSize=3D'{new Dimension(0,0)}'>
-                                <JTable id=3D"tableTargetSpecies" rowHeight=
=3D'24' enabled=3D'{isActif()}'/>
-                            </JScrollPane>
-                        </cell>
-                    </row>
-                    <row>
-                        <cell columns=3D'2' fill=3D'horizontal' weightx=3D'1=
.0'>
-                            <JButton id=3D"remove" text=3D"isisfish.common.r=
emove" onActionPerformed=3D'remove()' enabled=3D'{isActif()}'/>
-                        </cell>
-                    </row>
-                    <row>
                         <cell fill=3D'horizontal' weightx=3D'0.5'>
                             <JButton id=3D'save'/>
                         </cell>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI=
.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/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=3D"metierTab" name=3D"Metier" constraints=3D'BorderL=
ayout.CENTER' >
             <tab  title=3D'{_("isisfish.metier.title")}'><MetierTabUI id=3D"=
metierTabUI" constructorParams=3D'this'/></tab>
             <tab title=3D'{_("isisfish.metierSeasonInfoZone.title")}'><Metie=
rSeasonInfoZoneUI id=3D"metierSeasonInfoUI" constructorParams=3D'this'/></tab>
-            <tab title=3D'{_("isisfish.metierSeasonInfoSpecies.title")}'><Me=
tierSeasonInfoSpeciesUI id=3D"metierSeasonSpeciesUI" constructorParams=3D'thi=
s'  decorator=3D'boxed' _bean=3D'{MetierSeasonInfoImpl.class}' _method=3D'"Sp=
eciesTargetSpecies"'/></tab>
+            <tab title=3D'{_("isisfish.metierSeasonInfoSpecies.title")}'><Me=
tierSeasonInfoSpeciesUI id=3D"metierSeasonSpeciesUI" constructorParams=3D'thi=
s'/></tab>
         </JTabbedPane>
     </JPanel>
 </fr.ifremer.isisfish.ui.input.InputContentUI>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Ed=
itorHelper.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHe=
lper.java	2009-03-17 14:39:41 UTC (rev 1983)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHe=
lper.java	2009-03-17 15:11:59 UTC (rev 1984)
@@ -19,11 +19,14 @@
 package fr.ifremer.isisfish.ui.sensitivity;
=20
 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.MatrixContinuousDoma=
in;
 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 =3D ipResult;
             } else if (result instanceof RangeOfValuesUI){
                 result =3D new JTextField("");
+            } else if (result instanceof MetierSeasonInfoSpeciesEditorUI){
+                MetierSeasonInfoSpeciesEditorUI origine =3D (MetierSeasonInf=
oSpeciesEditorUI)c;
+                MetierSeasonInfoSpeciesEditorUI ui =3D new MetierSeasonInfoS=
peciesEditorUI(new JAXXInitialContext().add(new InputAction()).add(origine.ge=
tRegion()).add(new InputSaveVerifier()));
+                ui.setBean(origine.getBean());
+                if (origine.getMetierInfo() !=3D null){
+                    ui.setMetierInfo(origine.getMetierInfo());
+                    ui.setMetierSeasonSelected(true);
+                    ui.setActif(true);
+                }
+                ui.refresh();
+                result =3D ui;
             } else if (result instanceof PopulationZonesEditorUI){
                 PopulationZonesEditorUI origine =3D (PopulationZonesEditorUI=
)c;
                 PopulationZonesEditorUI ui =3D new PopulationZonesEditorUI(n=
ew JAXXInitialContext().add(new InputAction()).add(origine.getRegion()));
@@ -285,6 +300,18 @@
                 ipResult.setLabelRenderer(Month.MONTH);
                 ipResult.setModel(ip.getModel().clone());
                 result =3D ipResult;
+            } else if (result instanceof MetierSeasonInfoSpeciesEditorUI){
+                MetierSeasonInfoSpeciesEditorUI origine =3D (MetierSeasonInf=
oSpeciesEditorUI)c;
+                MetierSeasonInfoSpeciesEditorUI ui =3D new MetierSeasonInfoS=
peciesEditorUI(new JAXXInitialContext().add(new InputAction()).add(origine.ge=
tRegion()).add(new InputSaveVerifier()));
+                ui.setBean(origine.getBean());
+                if (origine.getMetierInfo() !=3D null){
+                    ui.setMetierInfo(origine.getMetierInfo());
+                    ui.getMetierInfo().setSpeciesTargetSpecies((Collection<T=
argetSpecies>)value);
+                    ui.setMetierSeasonSelected(true);
+                    ui.setActif(true);
+                }
+                ui.refresh();
+                result =3D ui;
             } else if (result instanceof PopulationZonesEditorUI){
                 PopulationZonesEditorUI origine =3D (PopulationZonesEditorUI=
)c;
                 PopulationZonesEditorUI ui =3D new PopulationZonesEditorUI(n=
ew JAXXInitialContext().add(new InputAction()).add(origine.getRegion()));
@@ -356,6 +383,12 @@
     } else if (c instanceof IntervalPanel){
 //                ((IntervalPanel) result).setModel((BeanUtils.getProperty(e=
, fieldName)));
=20
+    } else if (c instanceof MetierSeasonInfoSpeciesEditorUI){
+        result =3D ((MetierSeasonInfoSpeciesEditorUI)c).getMetierInfo().getS=
peciesTargetSpecies();
+
+    } else if (result instanceof PopulationZonesEditorUI){
+        result =3D ((PopulationZonesEditorUI)c).getFieldPopulationMappingZon=
eReproZoneRecru().getMatrix();
+       =20
     } else if (c instanceof RangeOfValuesUI){
=20
     } else if (c instanceof PopulationMigrationMigrationUI){


--===============4039026303746942999==--