From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:47 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r3331 - in isis-fish/branches/3.3.1/src/main:
	java/fr/ifremer/isisfish/ui/sensitivity
	java/fr/ifremer/isisfish/ui/sensitivity/equation resources/i18n
Date: Mon, 16 May 2011 16:53:00 +0200
Message-ID: <20110516145301.04D3A2F19F@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5766941248049439692=="

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

Author: chatellier
Date: 2011-05-16 14:53:00 +0000 (Mon, 16 May 2011)
New Revision: 3331

Log:
Ajout du support des facteurs min/max et pourcentage pour les equations

Added:
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/=
equation/
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/=
equation/EquationDomainListModel.java
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/=
equation/EquationDomainRenderer.java
Modified:
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/=
EquationContinuousPanelUI.jaxx
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/=
SensitivityInputHandler.java
   isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properties
   isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properties

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensi=
tivity/EquationContinuousPanelUI.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/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity=
/EquationContinuousPanelUI.jaxx	2011-05-15 20:44:38 UTC (rev 3330)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity=
/EquationContinuousPanelUI.jaxx	2011-05-16 14:53:00 UTC (rev 3331)
@@ -5,7 +5,7 @@
   $Id$
   $HeadURL$
   %%
-  Copyright (C) 2009 - 2010 Ifremer, CodeLutin
+  Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric
   %%
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as
@@ -53,107 +53,49 @@
     <!-- bean property -->
     <fr.ifremer.isisfish.entities.Formule id=3D'formule' javaBean=3D'null'/>
=20
+    <Boolean id=3D"selectedDomain" javaBean=3D"false" />
+    <Boolean id=3D"percentageTypeDomain" javaBean=3D"false" />
+
     <script><![CDATA[
-protected String[] columnNames =3D {
-    _("isisfish.sensitivity.equation.variable.name"),
-    _("isisfish.sensitivity.equation.variable.value"),
-    _("isisfish.sensitivity.equation.variable.coefficient"),
-    _("isisfish.sensitivity.equation.variable.action")};
+
 protected List<EquationContinuousDomain> domains =3D new ArrayList<EquationC=
ontinuousDomain>();
-protected List<JButton> actions =3D new ArrayList<JButton>();
=20
 public List<EquationContinuousDomain> getDomains() {
     return domains;
 }
=20
-public void setDomains(List<EquationContinuousDomain> newDomains) {
-    domains.clear();
-    for (EquationContinuousDomain d : newDomains) {
-        addDomain(d);
-    }
-}
-
-public void addDomain(EquationContinuousDomain domain) {
-    newButton();
+protected void addDomain(EquationContinuousDomain domain) {
     domains.add(domain);
+    // fire data change
+    variablesListModel.setDomains(domains);
 }
=20
-protected AbstractTableModel getTableModel() {
-    AbstractTableModel model =3D new AbstractTableModel() {
-        @Override
-        public int getRowCount() {
-            return domains.size();
-        }
-
-        @Override
-        public int getColumnCount() {
-            return columnNames.length;
-        }
-
-        @Override
-        public boolean isCellEditable(int rowIndex, int columnIndex) {
-            return true;
-        }
-       =20
-        @Override
-        public Object getValueAt(int rowIndex, int columnIndex) {
-            if (columnIndex =3D=3D 0) {
-                return domains.get(rowIndex).getVariableName();
-            } else if (columnIndex =3D=3D 1) {
-                return domains.get(rowIndex).getReferenceValue();
-            } else if (columnIndex =3D=3D 2) {
-                Double result =3D domains.get(rowIndex).getCoefficient() * 1=
00;
-                return result;
-            } else if (columnIndex =3D=3D 3) {
-                return _("isisfish.sensitivity.validDiscretNumber");
-            }
-            return null;
-        }
-
-        @Override
-        public void setValueAt(Object aValue, int rowIndex, int columnIndex)=
 {
-            if (String.class.isInstance(aValue)) {
-                if (!((String)aValue).equals("")) {
-                    if (columnIndex =3D=3D 0){
-                        domains.get(rowIndex).setVariableName((String)aValue=
);
-                    } else if (columnIndex =3D=3D 1) {
-                        domains.get(rowIndex).setReferenceValue(Double.parse=
Double((String)aValue));
-                    } else if (columnIndex =3D=3D 2) {
-                        domains.get(rowIndex).setCoefficient(Double.parseDou=
ble((String)aValue) / 100);
-                    }
-                }
-            }
-        }
-
-        @Override
-        public String getColumnName(int col) {
-            return columnNames[col].toString();
-        }
-
-    };
-    return model;
-}
-
-protected void newButton() {
-    JButton result =3D new JButton();
-    result.setText(_("isisfish.sensitivity.validDiscretNumber"));
-    actions.add(result);
-    result.addActionListener(new ActionListener() {
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            JButton source =3D (JButton)e.getSource();
-            int i =3D actions.indexOf(source);
-            valid(i);
-        }
-    });
-}
-
-protected JButton getActionButton(int i) {
-    return actions.get(i);
-}
-
-protected void valid(int i) {
-    String variableName =3D domains.get(i).getVariableName();
+/**
+ * Valid selected domain.
+ */
+protected void validSelectedDomain() {
+    // fill selected
+    EquationContinuousDomain selectedDomain =3D (EquationContinuousDomain)va=
riablesList.getSelectedValue();
+    selectedDomain.setVariableName(variableNameField.getText().trim());
+    if (isPercentageTypeDomain()) {
+        selectedDomain.setMinBound(null); // important
+        selectedDomain.setMaxBound(null); // important
+        selectedDomain.setReferenceValue(Double.parseDouble(referenceValueFi=
eld.getText()));
+        selectedDomain.setCoefficient(Double.parseDouble(coefficientField.ge=
tText()) / 100);
+    } else {
+        selectedDomain.setMinBound(Double.parseDouble(minBoundField.getText(=
)));=20
+        selectedDomain.setMaxBound(Double.parseDouble(maxBoundField.getText(=
)));
+        selectedDomain.setReferenceValue(null); // important
+        selectedDomain.setCoefficient(null); // important
+    }
+   =20
+   =20
+    // parse equation content to replace
+    // double xxx =3D 4.0;
+    // by
+    // double xxx =3D context.getValueAndCompute("myfactorname.xxx", 4.0)
+    // if xxx is the variable name to replace
+    String variableName =3D selectedDomain.getVariableName();
     String[] lines =3D editor.getEditor().getText().split("\n");
     String result =3D "";
     for (String line : lines) {
@@ -166,78 +108,77 @@
         result +=3D line + "\n";
     }
     editor.getEditor().setText(result);
+   =20
+    // fire data change
+    variablesListModel.setDomains(domains);
 }
=20
-protected void setTable() {
-    params.setModel(getTableModel());
-    params.getColumnModel().getColumn(3).setCellEditor(new TableCellEditor()=
 {
+protected void addNewVariable() {
+    EquationContinuousDomain domain =3D new EquationContinuousDomain();
+    domain.setVariableName("X");
+    addDomain(domain);
+   =20
+    // auto select
+    variablesList.setSelectedValue(domain, true);
+}
=20
-        @Override
-        public Component getTableCellEditorComponent(JTable table, Object va=
lue, boolean isSelected, int row, int column) {
-            return getActionButton(row);
+protected void displaySelectedDomain() {
+    EquationContinuousDomain selectedDomain =3D (EquationContinuousDomain)va=
riablesList.getSelectedValue();
+    if (selectedDomain !=3D null) {
+        setSelectedDomain(true);
+        variableNameField.setText(selectedDomain.getVariableName());
+        setPercentageTypeDomain(selectedDomain.getCoefficient() !=3D null);
+        if (selectedDomain.getCoefficient() !=3D null) {
+            coefficientField.setText(String.valueOf(selectedDomain.getCoeffi=
cient() * 100));
+        } else {
+            coefficientField.setText("");
         }
-
-        @Override
-        public Object getCellEditorValue() {
-            return null;
+        if (selectedDomain.getReferenceValue() !=3D null) {
+            referenceValueField.setText(selectedDomain.getReferenceValue().t=
oString());
+        } else {
+            referenceValueField.setText("");
         }
-
-        @Override
-        public boolean isCellEditable(EventObject anEvent) {
-            return true;
+        if (selectedDomain.getOriginalMinBound() !=3D null) {
+            minBoundField.setText(selectedDomain.getOriginalMinBound().toStr=
ing());
+        } else {
+            minBoundField.setText("");
         }
-
-        @Override
-        public boolean shouldSelectCell(EventObject anEvent) {
-            return true;
+        if (selectedDomain.getOriginalMaxBound() !=3D null) {
+            maxBoundField.setText(selectedDomain.getOriginalMaxBound().toStr=
ing());
+        } else {
+            maxBoundField.setText("");
         }
-
-        @Override
-        public boolean stopCellEditing() {
-            return true;
-        }
-
-        @Override
-        public void cancelCellEditing() {
-        }
-
-        @Override
-        public void addCellEditorListener(CellEditorListener l) {
-        }
-
-        @Override
-        public void removeCellEditorListener(CellEditorListener l) {
-        }
-    });
+    } else {
+        setSelectedDomain(false);
+    }
 }
-protected void addNewVariable() {
-    EquationContinuousDomain domain =3D new EquationContinuousDomain();
-    // fixe NPE in table model renderer
-    domain.setCoefficient(1.0);
-    domains.add(domain);
-    newButton();
-    setTable();
-}
=20
-protected void removeVariable() {
-    int selectedRow =3D params.getSelectedRow();
-    domains.remove(selectedRow);
-    actions.remove(selectedRow);
-    setTable();
+protected void removeSelectedVariable() {
+    int selectedIndex =3D variablesList.getSelectedIndex();
+    domains.remove(selectedIndex);
+   =20
+    // fire data change
+    variablesListModel.setDomains(domains);
 }
=20
 @Override
 public boolean isFactorValid() {
     boolean valid =3D true;
=20
-    for (EquationContinuousDomain domain : domains) {
-        if (domain.getReferenceValue() =3D=3D null
-                || domain.getCoefficient() =3D=3D null
-                || domain.getCoefficient() > 100
-                || domain.getCoefficient() <=3D 0
-                || domain.getVariableName() =3D=3D null) {
-            valid =3D false;
+    try {
+        for (EquationContinuousDomain domain : domains) {
+            if (StringUtils.isBlank(domain.getVariableName())) {
+                valid =3D false;
+            }
+            else if (domain.getCoefficient() =3D=3D null) {
+                valid =3D domain.getOriginalMinBound() !=3D null && domain.g=
etOriginalMaxBound() !=3D null;
+            }
+            else {
+                valid =3D domain.getReferenceValue() !=3D null;
+            }
         }
+    } catch (NumberFormatException ex) {
+        valid =3D false;
     }
    =20
     return valid;
@@ -246,23 +187,112 @@
     <JPanel id=3D'content'>
         <Table constraints=3D'BorderLayout.CENTER'>
             <row>
-                <cell fill=3D'both' columns=3D'2' weightx=3D'1' weighty=3D'1=
'>
+                <cell fill=3D'both' weightx=3D'1' weighty=3D'1'>
                     <JScrollPane preferredSize=3D"{new Dimension(200, 150)}">
-                        <JTable id=3D'params' visible=3D'{isContinuePossible=
()}' model=3D'{getTableModel()}'
-                            enabled=3D'{isContinueSelected()}' />
-                        <ListSelectionModel initializer=3D"params.getSelecti=
onModel()"
-                            onValueChanged=3D"remove.setEnabled(params.getSe=
lectedRow() !=3D -1)" />
+                        <fr.ifremer.isisfish.ui.sensitivity.equation.Equatio=
nDomainListModel
+                            id=3D"variablesListModel" constructorParams=3D"d=
omains" />
+                        <JList id=3D"variablesList" model=3D"{variablesListM=
odel}"
+                            cellRenderer=3D"{new fr.ifremer.isisfish.ui.sens=
itivity.equation.EquationDomainRenderer()}"/>
+                        <ListSelectionModel initializer=3D"variablesList.get=
SelectionModel()"
+                            onValueChanged=3D"displaySelectedDomain();setSel=
ectedDomain(variablesList.getSelectedIndex() !=3D -1)" />
                     </JScrollPane>
                 </cell>
+                <cell fill=3D'both' weightx=3D'1' weighty=3D'1'>
+                    <Table>
+                        <row>
+                            <cell>
+                                <JLabel text=3D"isisfish.sensitivity.equatio=
n.variablename" enabled=3D'{isSelectedDomain()}' />
+                            </cell>
+                            <cell fill=3D"horizontal">
+                                <JTextField id=3D"variableNameField" enabled=
=3D'{isSelectedDomain()}'/>
+                            </cell>
+                        </row>
+                        <row>
+                            <cell fill=3D"horizontal" columns=3D"2">
+                                <JRadioButton id=3D"percentageTypeButton" te=
xt=3D"isisfish.sensitivity.continuouspercentagetype"
+                                    onActionPerformed=3D"setPercentageTypeDo=
main(percentageTypeButton.isSelected())"
+                                    selected=3D"{isPercentageTypeDomain()}"
+                                    enabled=3D'{isSelectedDomain()}'/>
+                            </cell>
+                        </row>
+                        <row>
+                            <cell fill=3D"both" weightx=3D'1' weighty=3D'1' =
columns=3D"2">
+                                <Table border=3D'{BorderFactory.createTitled=
Border("")}'>
+                                    <row>
+                                        <cell fill=3D'horizontal'>
+                                            <JLabel text=3D'isisfish.sensiti=
vity.referencevalue' visible=3D'{isContinuePossible()}'
+                                                enabled=3D'{isSelectedDomain=
() &amp;&amp; isPercentageTypeDomain()}'/>
+                                        </cell>
+                                        <cell fill=3D'horizontal' weightx=3D=
'0.5'>
+                                            <JTextField id=3D'referenceValue=
Field' visible=3D'{isContinuePossible()}'=20
+                                                enabled=3D'{isSelectedDomain=
() &amp;&amp; isPercentageTypeDomain()}'/>
+                                        </cell>
+                                    </row>
+                                    <row>
+                                        <cell fill=3D'horizontal'>
+                                            <JLabel text=3D'isisfish.sensiti=
vity.coefficient' visible=3D'{isContinuePossible()}'
+                                                enabled=3D'{isSelectedDomain=
() &amp;&amp; isPercentageTypeDomain()}'/>
+                                        </cell>
+                                        <cell fill=3D'horizontal' weightx=3D=
'0.5'>
+                                            <JTextField id=3D'coefficientFie=
ld' visible=3D'{isContinuePossible()}'
+                                                enabled=3D'{isSelectedDomain=
() &amp;&amp; isPercentageTypeDomain()}'/>
+                                        </cell>
+                                    </row>
+                                </Table>
+                            </cell>
+                        </row>
+                        <row>
+                            <cell fill=3D"horizontal" columns=3D"2">
+                                <JRadioButton id=3D"minMaxButton" text=3D"is=
isfish.sensitivity.continuousminmaxtype"
+                                    onActionPerformed=3D"setPercentageTypeDo=
main(!minMaxButton.isSelected())"
+                                    selected=3D"{!isPercentageTypeDomain()}"
+                                    enabled=3D'{isSelectedDomain() &amp;&amp=
; isContinueSelected()}'/>
+                            </cell>
+                        </row>
+                        <row>
+                            <cell fill=3D"both" weightx=3D'1' weighty=3D'1' =
columns=3D"2">
+                                <Table border=3D'{BorderFactory.createTitled=
Border("")}'>
+                                    <row>
+                                        <cell fill=3D'horizontal'>
+                                            <JLabel text=3D'isisfish.sensiti=
vity.firstValue' visible=3D'{isContinuePossible()}'
+                                                enabled=3D'{isSelectedDomain=
() &amp;&amp; !isPercentageTypeDomain()}'/>
+                                        </cell>
+                                        <cell fill=3D'horizontal' weightx=3D=
'0.5'>
+                                            <JTextField id=3D'minBoundField'=
 visible=3D'{isContinuePossible()}'
+                                                enabled=3D'{isSelectedDomain=
() &amp;&amp; !isPercentageTypeDomain()}'/>
+                                        </cell>
+                                    </row>
+                                    <row>
+                                        <cell fill=3D'horizontal'>
+                                            <JLabel text=3D'isisfish.sensiti=
vity.lastValue' visible=3D'{isContinuePossible()}'
+                                                enabled=3D'{isSelectedDomain=
() &amp;&amp; !isPercentageTypeDomain()}'/>
+                                        </cell>
+                                        <cell fill=3D'horizontal' weightx=3D=
'0.5'>
+                                            <JTextField id=3D'maxBoundField'=
 visible=3D'{isContinuePossible()}'
+                                                enabled=3D'{isSelectedDomain=
() &amp;&amp; !isPercentageTypeDomain()}'/>
+                                        </cell>
+                                    </row>
+                                </Table>
+                            </cell>
+                        </row>
+                        <row>
+                            <cell fill=3D"horizontal" columns=3D"2">
+                                <JButton text=3D"isisfish.sensitivity.equati=
on.valid"
+                                    enabled=3D'{isSelectedDomain()}'
+                                    onActionPerformed=3D'validSelectedDomain=
()' />
+                            </cell>
+                        </row>
+                    </Table>
+                </cell>
             </row>
             <row>
-                <cell fill=3D'horizontal' weightx=3D'1'>
+                <cell fill=3D'horizontal'>
                     <JButton id=3D'add' text=3D'isisfish.common.add' visible=
=3D'{isContinuePossible()}'
                         enabled=3D'{isContinueSelected()}' onActionPerformed=
=3D'addNewVariable()'/>
                 </cell>
-                <cell fill=3D'horizontal' weightx=3D'1'>
+                <cell fill=3D'horizontal'>
                     <JButton id=3D'remove' text=3D'isisfish.common.remove' v=
isible=3D'{isContinuePossible()}'
-                        enabled=3D'false' onActionPerformed=3D'removeVariabl=
e()'/>
+                        enabled=3D'{isSelectedDomain()}' onActionPerformed=
=3D'removeSelectedVariable()'/>
                 </cell>
             </row>
             <row>

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensi=
tivity/SensitivityInputHandler.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/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity=
/SensitivityInputHandler.java	2011-05-15 20:44:38 UTC (rev 3330)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity=
/SensitivityInputHandler.java	2011-05-16 14:53:00 UTC (rev 3331)
@@ -682,7 +682,6 @@
        =20
                     EquationContinuousDomain equationDomain =3D (EquationCon=
tinuousDomain) domain;
                     ui.addDomain(equationDomain);
-                    ui.setTable();
        =20
                     result =3D ui;
                 } catch (Exception ex) {
@@ -922,6 +921,11 @@
                 // Save equation
                 bean.update();
                 topiaContext.commitTransaction();
+               =20
+                List<EquationContinuousDomain> domains =3D equationPanel.get=
Domains();
+                for (EquationContinuousDomain domain : domains) {
+                    action.addContinuousEquationFactor(name, comment, path, =
domain, exist);
+                }
             } catch (Exception ex) {
                 if (log.isErrorEnabled()) {
                     log.error("Can't call method : ", ex);

Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitiv=
ity/equation/EquationDomainListModel.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/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity=
/equation/EquationDomainListModel.java	                        (rev 0)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity=
/equation/EquationDomainListModel.java	2011-05-16 14:53:00 UTC (rev 3331)
@@ -0,0 +1,92 @@
+/*
+ * #%L
+ * IsisFish
+ *=20
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2011 Ifremer, CodeLutin, Chatellier Eric
+ * %%
+ * 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=20
+ * License, or (at your option) any later version.
+ *=20
+ * 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.
+ *=20
+ * You should have received a copy of the GNU General Public=20
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/gpl-2.0.html>.
+ * #L%
+ */
+
+package fr.ifremer.isisfish.ui.sensitivity.equation;
+
+import java.util.List;
+
+import javax.swing.DefaultListModel;
+
+import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDo=
main;
+
+/**
+ * Model pour la liste des {@link EquationContinuousDomain}.
+ *=20
+ * Pas de selection par defaut.
+ *
+ * @author chatellier
+ * @version $Revision$
+ *=20
+ * Last update : $Date$
+ * By : $Author$
+ */
+public class EquationDomainListModel extends DefaultListModel {
+
+    /** serialVersionUID. */
+    private static final long serialVersionUID =3D 2281927104735245489L;
+
+    /** EquationContinuousDomain list */
+    protected List<EquationContinuousDomain> domains;
+
+    /**
+     * Constructor with domains list.
+     *=20
+     * @param domains domains list
+     */
+    public EquationDomainListModel(List<EquationContinuousDomain> domains) {
+        this.domains =3D domains;
+    }
+
+    /**
+     * Change data list and fire data change event.
+     *=20
+     * @param domains new data list
+     */
+    public void setDomains(List<EquationContinuousDomain> domains) {
+        this.domains =3D domains;
+        fireContentsChanged(this, 0, domains.size());
+    }
+
+    /*
+     * @see javax.swing.ListModel#getElementAt(int)
+     */
+    @Override
+    public Object getElementAt(int index) {
+        return domains.get(index);
+    }
+
+    /*
+     * @see javax.swing.ListModel#getSize()
+     */
+    @Override
+    public int getSize() {
+        int size =3D 0;
+
+        if (domains !=3D null) {
+            size =3D domains.size();
+        }
+        return size;
+    }
+}


Property changes on: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfi=
sh/ui/sensitivity/equation/EquationDomainListModel.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL

Added: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitiv=
ity/equation/EquationDomainRenderer.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/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity=
/equation/EquationDomainRenderer.java	                        (rev 0)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity=
/equation/EquationDomainRenderer.java	2011-05-16 14:53:00 UTC (rev 3331)
@@ -0,0 +1,60 @@
+/*
+ * #%L
+ *=20
+ *=20
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2011 Codelutin, Chatellier Eric
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as=20
+ * published by the Free Software Foundation, either version 3 of the=20
+ * License, or (at your option) any later version.
+ *=20
+ * 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 Lesser Public License for more details.
+ *=20
+ * You should have received a copy of the GNU General Lesser Public=20
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-3.0.html>.
+ * #L%
+ */
+
+package fr.ifremer.isisfish.ui.sensitivity.equation;
+
+import java.awt.Component;
+
+import javax.swing.JList;
+
+import org.jdesktop.swingx.renderer.DefaultListRenderer;
+
+import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDo=
main;
+
+/**
+ * Renderer for equation factor variables list.
+ * Renderer as variable name string.
+ *=20
+ * @author chatellier
+ * @version $Revision$
+ *=20
+ * Last update : $Date$
+ * By : $Author$
+ */
+public class EquationDomainRenderer extends DefaultListRenderer {
+
+    /** serialVersionUID. */
+    private static final long serialVersionUID =3D -8210763862382993163L;
+
+    @Override
+    public Component getListCellRendererComponent(JList list, Object value,
+            int index, boolean isSelected, boolean cellHasFocus) {
+       =20
+        EquationContinuousDomain domain =3D (EquationContinuousDomain)value;
+        String stringValue =3D domain.getVariableName();
+        return super.getListCellRendererComponent(list, stringValue, index, =
isSelected, cellHasFocus);
+    }
+
+}


Property changes on: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfi=
sh/ui/sensitivity/equation/EquationDomainRenderer.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL

Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.pr=
operties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properti=
es	2011-05-15 20:44:38 UTC (rev 3330)
+++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_en_GB.properti=
es	2011-05-16 14:53:00 UTC (rev 3331)
@@ -910,11 +910,13 @@
 isisfish.sensitivity.discret=3DDiscret factor
 isisfish.sensitivity.discretevaluelabel=3DValue %d
 isisfish.sensitivity.displaysecondpass=3DDisplay results
+isisfish.sensitivity.equation.valid=3DValid variable
 isisfish.sensitivity.equation.variable.action=3DAction
 isisfish.sensitivity.equation.variable.coefficient=3DCoef. (in %)
 isisfish.sensitivity.equation.variable.name=3DName
 isisfish.sensitivity.equation.variable.operator=3DOperator
 isisfish.sensitivity.equation.variable.value=3DValue
+isisfish.sensitivity.equation.variablename=3DVaraible name \:
 isisfish.sensitivity.export=3DExport
 isisfish.sensitivity.factor=3DFactor
 isisfish.sensitivity.factor.notvalid=3DFactor not valid \!

Modified: isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.pr=
operties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properti=
es	2011-05-15 20:44:38 UTC (rev 3330)
+++ isis-fish/branches/3.3.1/src/main/resources/i18n/isis-fish_fr_FR.properti=
es	2011-05-16 14:53:00 UTC (rev 3331)
@@ -910,11 +910,13 @@
 isisfish.sensitivity.discret=3DFacteur discret
 isisfish.sensitivity.discretevaluelabel=3DValeur %d
 isisfish.sensitivity.displaysecondpass=3DAfficher les r=C3=A9sultats
+isisfish.sensitivity.equation.valid=3DValider la variable
 isisfish.sensitivity.equation.variable.action=3DAction
 isisfish.sensitivity.equation.variable.coefficient=3DCoef (en %)
 isisfish.sensitivity.equation.variable.name=3DNom
 isisfish.sensitivity.equation.variable.operator=3DOp=C3=A9rateur
 isisfish.sensitivity.equation.variable.value=3DValeur
+isisfish.sensitivity.equation.variablename=3DVariable name \:
 isisfish.sensitivity.export=3DExport
 isisfish.sensitivity.factor=3DFacteur
 isisfish.sensitivity.factor.notvalid=3DFacteur non valide \!


--===============5766941248049439692==--