From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:25 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r2723 - in
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input: . metier
Date: Mon, 02 Nov 2009 15:06:07 +0100
Message-ID: <20091102140607.95FC416C00E@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6619222109128401229=="

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

Author: chatellier
Date: 2009-11-02 14:06:07 +0000 (Mon, 02 Nov 2009)
New Revision: 2723

Added:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSe=
asonInfoTargetSpeciesTableModel.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/SpeciesC=
omboModel.java
Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInf=
oSpeciesEditorUI.jaxx
Log:
Use species combo model.

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSe=
asonInfoSpeciesEditorUI.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	2009-11-02 10:11:36 UTC (rev 2722)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonIn=
foSpeciesEditorUI.jaxx	2009-11-02 14:06:07 UTC (rev 2723)
@@ -29,17 +29,12 @@
=20
     <script><![CDATA[
 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.Species;
 import fr.ifremer.isisfish.entities.TargetSpecies;
-import fr.ifremer.isisfish.ui.input.metier.MetierSeasonInfoTargetSpeciesMode=
l;
-import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
+import fr.ifremer.isisfish.ui.input.metier.MetierSeasonInfoTargetSpeciesTabl=
eModel;
+import fr.ifremer.isisfish.ui.input.metier.SpeciesComboModel;
 import fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor;
-import javax.swing.table.DefaultTableModel;
-import fr.ifremer.isisfish.entities.Species;
=20
 tableTargetSpecies.addMouseListener(new MouseAdapter() {
     @Override
@@ -72,14 +67,8 @@
 }
=20
 protected void setTargetSpeciesModel() {
-    DefaultComboBoxModel fieldTargetSpeciesModel =3D new DefaultComboBoxMode=
l();
     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));
-        }
-    }
+    SpeciesComboModel fieldTargetSpeciesModel =3D new SpeciesComboModel(spec=
ies);
     fieldTargetSpecies.setModel(fieldTargetSpeciesModel);
 }
=20
@@ -98,7 +87,7 @@
         }
        =20
         // set table model
-        MetierSeasonInfoTargetSpeciesModel model =3D new MetierSeasonInfoTar=
getSpeciesModel(targetSpecies);
+        MetierSeasonInfoTargetSpeciesTableModel model =3D new MetierSeasonIn=
foTargetSpeciesTableModel(targetSpecies);
         tableTargetSpecies.setModel(model);
         tableTargetSpecies.setDefaultRenderer(Equation.class, model);
         tableTargetSpecies.setDefaultEditor(Equation.class, new EquationTabl=
eEditor());
@@ -106,15 +95,14 @@
 }
=20
 protected void add() {
-    Object species =3D ((GenericCell)fieldTargetSpecies.getSelectedItem()).g=
etValue();
-    if (getMetierSeasonInfo() !=3D null && species !=3D null) {
+    Species selectedSpecies =3D (Species)fieldTargetSpecies.getSelectedItem(=
);
+    if (getMetierSeasonInfo() !=3D null && selectedSpecies !=3D null) {
         // il n'y en a pas a la creaion de la base
         //Formule selectedFormule =3D (Formule)targetFactor.getFormuleComboB=
ox().getSelectedItem();
         getContextValue(InputAction.class).addTargetSpecies(
                 getBean(),
                 getMetierSeasonInfo(),
-                (Species)species,
-                /* selectedFormule.getName(), */
+                selectedSpecies,
                 targetFactor.getEditor().getText(),
                 fieldPrimaryCatch.isSelected());
         setTableTargetSpeciesModel();

Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/Met=
ierSeasonInfoTargetSpeciesTableModel.java (from rev 2668, isis-fish/trunk/src=
/main/java/fr/ifremer/isisfish/ui/input/metier/MetierSeasonInfoTargetSpeciesM=
odel.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierS=
easonInfoTargetSpeciesTableModel.java	                        (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/MetierS=
easonInfoTargetSpeciesTableModel.java	2009-11-02 14:06:07 UTC (rev 2723)
@@ -0,0 +1,239 @@
+/* *##%
+ * Copyright (C) 2009 Ifremer, Code Lutin
+ *
+ * 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.
+ *##%*/
+
+package fr.ifremer.isisfish.ui.input.metier;
+
+import static org.nuiton.i18n.I18n._;
+
+import java.awt.Component;
+import java.util.List;
+
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JTable;
+import javax.swing.table.AbstractTableModel;
+import javax.swing.table.TableCellRenderer;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import fr.ifremer.isisfish.entities.Equation;
+import fr.ifremer.isisfish.entities.MetierSeasonInfo;
+import fr.ifremer.isisfish.entities.TargetSpecies;
+
+/**
+ * Table model for {@link MetierSeasonInfo}#{@link TargetSpecies}.
+ *=20
+ * Columns :
+ * <li>target species name</li>
+ * <li>target species equation</li>
+ * <li>target species primaryCatch</li>
+ *
+ * @author chatellier
+ * @version $Revision$
+ *=20
+ * Last update : $Date$
+ * By : $Author$
+ */
+public class MetierSeasonInfoTargetSpeciesTableModel extends AbstractTableMo=
del implements TableCellRenderer {
+
+    /** Log. */
+    private static Log log =3D LogFactory.getLog(MetierSeasonInfoTargetSpeci=
esTableModel.class);
+   =20
+    /** serialVersionUID. */
+    private static final long serialVersionUID =3D 3169786638868209920L;
+
+    /** Columns names. */
+    public final static String[] COLUMN_NAMES =3D {
+            _("isisfish.metierSeasonInfoSpecies.species"),
+            _("isisfish.metierSeasonInfoSpecies.targetFactor"),
+            _("isisfish.metierSeasonInfoSpecies.mainSpecies") };
+
+    protected List<TargetSpecies> targetSpeciesList;
+
+    /**
+     * Empty constructor.
+     */
+    public MetierSeasonInfoTargetSpeciesTableModel() {
+        this(null);
+    }
+
+    /**
+     * Constructor with data.
+     * =20
+     * @param targetSpeciesList initial target species
+     */
+    public MetierSeasonInfoTargetSpeciesTableModel(
+            List<TargetSpecies> targetSpeciesList) {
+        super();
+        this.targetSpeciesList =3D targetSpeciesList;
+    }
+
+    /**
+     * Set target species list.
+     *=20
+     * @param targetSpeciesList the targetSpecies to set
+     */
+    public void setTargetSpecies(List<TargetSpecies> targetSpeciesList) {
+        this.targetSpeciesList =3D targetSpeciesList;
+    }
+
+    /*
+     * @see javax.swing.table.TableModel#getColumnCount()
+     */
+    @Override
+    public int getColumnCount() {
+        return COLUMN_NAMES.length;
+    }
+
+    /*
+     * @see javax.swing.table.TableModel#getRowCount()
+     */
+    @Override
+    public int getRowCount() {
+        int rows =3D 0;
+        if (targetSpeciesList !=3D null) {
+            rows =3D targetSpeciesList.size();
+        }
+        return rows;
+    }
+
+    /*
+     * @see javax.swing.table.TableModel#getValueAt(int, int)
+     */
+    @Override
+    public Object getValueAt(int rowIndex, int columnIndex) {
+
+        Object result =3D null;
+
+        TargetSpecies targetSpecies =3D targetSpeciesList.get(rowIndex);
+        switch (columnIndex) {
+        case 0:
+            result =3D targetSpecies.getSpecies().getName();
+            break;
+        case 1:
+            result =3D targetSpecies.getTargetFactorEquation();
+            break;
+        case 2:
+            result =3D targetSpecies.getPrimaryCatch();
+            break;
+        default:
+            throw new IndexOutOfBoundsException("No such column " + columnIn=
dex);
+        }
+
+        return result;
+    }
+
+    /*
+     * @see javax.swing.table.TableModel#getColumnClass(int)
+     */
+    @Override
+    public Class<?> getColumnClass(int columnIndex) {
+
+        Class<?> result =3D null;
+       =20
+        switch (columnIndex) {
+        case 0:
+            result =3D String.class;
+            break;
+        case 1:
+            result =3D Equation.class;
+            break;
+        case 2:
+            result =3D Boolean.class;
+            break;
+        default:
+            throw new IndexOutOfBoundsException("No such column " + columnIn=
dex);
+        }
+       =20
+        return result;
+    }
+
+    /*
+     * @see javax.swing.table.TableModel#getColumnName(int)
+     */
+    @Override
+    public String getColumnName(int columnIndex) {
+        return COLUMN_NAMES[columnIndex];
+    }
+
+    /*
+     * @see javax.swing.table.TableModel#isCellEditable(int, int)
+     */
+    @Override
+    public boolean isCellEditable(int rowIndex, int columnIndex) {
+        return columnIndex > 0;
+    }
+
+    /*
+     * @see javax.swing.table.TableModel#setValueAt(java.lang.Object, int, i=
nt)
+     */
+    @Override
+    public void setValueAt(Object value, int rowIndex, int columnIndex) {
+       =20
+        if (log.isDebugEnabled()) {
+            log.debug("Cell edition (column " + columnIndex + ") =3D " + val=
ue);
+        }
+       =20
+        TargetSpecies targetSpecies =3D targetSpeciesList.get(rowIndex);
+        switch (columnIndex) {
+        case 1:
+            Equation eq =3D (Equation)value;
+            // two events for event to be fired
+            targetSpecies.setTargetFactorEquation(null);
+            targetSpecies.setTargetFactorEquation(eq);
+            break;
+        case 2:
+            Boolean bValue =3D (Boolean)value;
+            targetSpecies.setPrimaryCatch(bValue);
+            break;
+        default:
+            throw new IndexOutOfBoundsException("Can't edit column " + colum=
nIndex);
+        }
+
+    }
+
+    /*
+     * @see javax.swing.table.TableCellRenderer#getTableCellRendererComponen=
t(javax.swing.JTable, java.lang.Object, boolean, boolean, int, int)
+     */
+    @Override
+    public Component getTableCellRendererComponent(JTable table, Object valu=
e,
+            boolean isSelected, boolean hasFocus, int row, int column) {
+
+        Component c =3D null;
+        switch (column) {
+        case 0:
+            c =3D new JLabel(value.toString());
+            break;
+        case 1:
+            Equation equation =3D (Equation)value;
+            c =3D new JButton(equation.getName() + "(" + equation.getCategor=
y() + ")");
+            break;
+        case 2:
+            Boolean bValue =3D (Boolean)value;
+            c =3D new JCheckBox();
+            ((JCheckBox)c).setSelected(bValue);
+            break;
+        default:
+            throw new IndexOutOfBoundsException("No such column " + column);
+        }
+        return c;
+    }
+
+}

Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/Spec=
iesComboModel.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/Species=
ComboModel.java	                        (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/metier/Species=
ComboModel.java	2009-11-02 14:06:07 UTC (rev 2723)
@@ -0,0 +1,104 @@
+/* *##%
+ * Copyright (C) 2009 Code Lutin
+ *
+ * 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.
+ *##%*/
+
+package fr.ifremer.isisfish.ui.input.metier;
+
+import java.util.List;
+
+import javax.swing.DefaultComboBoxModel;
+
+import fr.ifremer.isisfish.entities.Species;
+
+/**
+ * Model pour la liste des {@link Species}.
+ *=20
+ * Pas de selection par defaut.
+ *
+ * @author chatellier
+ * @version $Revision$
+ *=20
+ * Last update : $Date$
+ * By : $Author: chatellier $
+ */
+public class SpeciesComboModel extends DefaultComboBoxModel {
+
+    /** serialVersionUID. */
+    private static final long serialVersionUID =3D 6171850179969290032L;
+
+    /** PopulationSeasonInfo list */
+    protected List<Species> speciesList;
+
+    /**
+     * Empty constructor.
+     */
+    public SpeciesComboModel() {
+        this(null);
+    }
+
+    /**
+     * Constructor with species list.
+     *=20
+     * @param speciesList species list
+     */
+    public SpeciesComboModel(List<Species> speciesList) {
+        super();
+        setPopulationSeasonInfos(speciesList);
+    }
+
+    /**
+     * Get species list.
+     *=20
+     * @return species list
+     */
+    public List<Species> getPopulationSeasonInfos() {
+        return speciesList;
+    }
+
+    /**
+     * Set species list.
+     *=20
+     * @param speciesList species list
+     */
+    public void setPopulationSeasonInfos(List<Species> speciesList) {
+        this.speciesList =3D speciesList;
+       =20
+        // clear selection
+        setSelectedItem(null);
+    }
+
+    /*
+     * @see javax.swing.ListModel#getElementAt(int)
+     */
+    @Override
+    public Object getElementAt(int index) {
+        return speciesList.get(index);
+    }
+
+    /*
+     * @see javax.swing.ListModel#getSize()
+     */
+    @Override
+    public int getSize() {
+        int size =3D 0;
+
+        if (speciesList !=3D null) {
+            size =3D speciesList.size();
+        }
+        return size;
+    }
+}


Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/inp=
ut/metier/SpeciesComboModel.java
___________________________________________________________________
Added: svn:keywords
   + "Author Date Id Revision HeadURL"


--===============6619222109128401229==--