From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:33 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r2936 -
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
Date: Fri, 22 Jan 2010 16:38:16 +0100
Message-ID: <20100122153816.5047A2FACE3@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8331481116828023714=="

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

Author: chatellier
Date: 2010-01-22 15:38:16 +0000 (Fri, 22 Jan 2010)
New Revision: 2936

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquatio=
nUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInf=
oSpeciesEditorUI.jaxx
   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/PopulationBasic=
sUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquat=
ionUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigra=
tionEmigrationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigra=
tionEquationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecru=
itmentUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZones=
UI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEdit=
orUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.j=
axx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBas=
icsUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.j=
axx
Log:
Simplify input one equation ui. Use less parameters based on conventions.

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOne=
EquationUI.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/InputOneEquati=
onUI.jaxx	2010-01-22 15:37:21 UTC (rev 2935)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquati=
onUI.jaxx	2010-01-22 15:38:16 UTC (rev 2936)
@@ -1,6 +1,6 @@
 <!--
 /* *##%
- * Copyright (C) 2005 - 2009
+ * Copyright (C) 2005 - 2010
  *     Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin
  *
  * This program is free software; you can redistribute it and/or
@@ -18,34 +18,38 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US=
A.
  *##%*/
  -->
-
 <fr.ifremer.isisfish.ui.input.InputContentUI>
=20
-    <!-- bean property -->
-    <fr.ifremer.isisfish.entities.Formule id=3D'formule' javaBean=3D'null'/>
-    <String id=3D'lblText' javaBean=3D'null'/>
+    <!-- Equation name (just for display purpose, not mandatory) -->
+    <String id=3D'text' javaBean=3D'null'/>
+    <!-- Bean containing equation -->
     <org.nuiton.topia.persistence.TopiaEntity id=3D'bean' javaBean=3D'null'/>
+    <!-- Bean property used to access equation -->
+    <String id=3D'beanProperty' javaBean=3D'null'/>
+    <!-- Used to get documentation in opened editor (not mandatory) -->
     <Class id=3D'clazz' javaBean=3D'null'/>
-    <String id=3D'methodGet' javaBean=3D'null'/>
-    <String id=3D'methodSet' javaBean=3D'null'/>
-    <String id=3D'nameEquation' javaBean=3D'null'/>
+
+    <!-- Bean property -->
+    <fr.ifremer.isisfish.entities.Formule id=3D'formule' javaBean=3D'null'/>
+    <!-- Equation name used to auto select formule in combo box -->
+    <String id=3D'formuleCategory' javaBean=3D'null'/>
+    <!-- Selected equation -->
     <fr.ifremer.isisfish.entities.Equation id=3D'selectedEquation' javaBean=
=3D'null'/>
=20
     <script><![CDATA[
+import java.lang.reflect.Method;
+import java.io.File;
 import fr.ifremer.isisfish.entities.Formule;
 import fr.ifremer.isisfish.entities.Equation;
 import fr.ifremer.isisfish.ui.input.formule.FormuleComboModel;
-import java.lang.reflect.Method;
+import org.apache.commons.lang.StringUtils;
 import org.nuiton.topia.TopiaContext;
-import jaxx.runtime.swing.Item;
=20
 protected DocumentListener listener =3D null;
=20
 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");
             formuleComboBox.setModel(new DefaultComboBoxModel());
             try {
                 editor.open(org.nuiton.util.FileUtil.getTempFile("", ".java"=
));
@@ -56,10 +60,6 @@
             }
         }
         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");
-            //setComboModel();
-           =20
             // chatellier 20090526 : force refresh in bean change ?
             refresh();
         }
@@ -88,12 +88,19 @@
     setComboModel();
     editor.getCurrentEditor().addDocumentListener(listener);
 }
+
+/**
+ * Get equation on entity.
+ */
 protected Equation getEquation() {
     Equation result =3D null;
     try {
-        if (bean !=3D null && methodGet !=3D null){
-            Method m =3D bean.getClass().getMethod("get" + methodGet, null);
-            result =3D (Equation) m.invoke(bean, (Object[])null);
+        // can be null in some uis
+        // content is managed by caller, can do anythings here
+        if (bean !=3D null && beanProperty !=3D null) {
+            String localBeanProperty =3D StringUtils.capitalize(beanProperty=
);
+            Method m =3D bean.getClass().getMethod("get" + localBeanProperty=
, null);
+            result =3D (Equation)m.invoke(bean);
         }
     } catch (Exception e) {
         if (log.isErrorEnabled()) {
@@ -102,30 +109,53 @@
     }
     return result;
 }
-protected void setEquation(){
+
+/**
+ * Call setXXXContent on topia entity (convention).
+ */
+protected void setEquation() {
     try {
-        if (bean !=3D null && methodSet !=3D null) {
-            Method m =3D bean.getClass().getMethod("set" + methodSet, String=
.class);
+        // can be null in some uis
+        // content is managed by caller, can do anythings here
+        if (bean !=3D null && beanProperty !=3D null) {
+            if (log.isDebugEnabled()) {
+                log.debug("Saving equation content (" + bean.getClass().getS=
impleName() +
+                    "#" + beanProperty + ")");
+            }
+            String localBeanProperty =3D StringUtils.capitalize(beanProperty=
);
+            Method m =3D bean.getClass().getMethod("set" + localBeanProperty=
 + "Content", String.class);
             m.invoke(bean, editor.getText());
         }
+        else {
+            if (log.isDebugEnabled()) {
+                log.debug("No bean property defined, skipping content saving=
");
+            }
+        }
     } catch (Exception e) {
         if (log.isErrorEnabled()) {
-            log.error("Can't set equation", e);
+            log.error("Can't set equation content", e);
         }
     }
 }
=20
 @Override
-public void refresh(){
+public void refresh() {
+
+    // TODO binding don't work
+    if (getText() =3D=3D null) {
+        setText(_("isisfish.common.equation"));   =20
+    }
+
     editor.getCurrentEditor().removeDocumentListener(listener);
     try {
-        editor.open(org.nuiton.util.FileUtil.getTempFile("", ".java"));
+        File equationContentFile =3D org.nuiton.util.FileUtil.getTempFile(""=
, ".java");
+        editor.open(equationContentFile);
     } catch (IOException ex) {
         if (log.isErrorEnabled()) {
             log.error("Can't refresh editor", ex);
         }
     }
-    if (nameEquation !=3D null){
+    if (formuleCategory !=3D null) {
         // chatellier 20090526 (change to get combo selected on this equatio=
n)
         selectedEquation =3D getEquation();
         setComboModel();
@@ -134,7 +164,7 @@
     }
     editor.getCurrentEditor().addDocumentListener(listener);
 }
-=20
+
 @Override
 public void setActionButtons() {
=20
@@ -144,8 +174,8 @@
     if (getBean() !=3D  null){
         TopiaContext isisContext =3D getBean().getTopiaContext();
         java.util.List<Formule> formules =3D null;
-        if (nameEquation !=3D null) {
-            formules =3D getAction().getFormules(isisContext, nameEquation);
+        if (formuleCategory !=3D null) {
+            formules =3D getAction().getFormules(isisContext, formuleCategor=
y);
             FormuleComboModel formulesModel =3D new FormuleComboModel(formul=
es);
             formuleComboBox.setModel(formulesModel);
             // fix default selection
@@ -154,17 +184,21 @@
     }
 }
 protected void saveModel() {
-    getContextValue(InputAction.class).saveAsModel(nameEquation, "Java", edi=
tor.getText());
+    getContextValue(InputAction.class).saveAsModel(formuleCategory, "Java", =
editor.getText());
     setComboModel();
     setInfoText(_("isisfish.message.saveModel.finished"));
 }
+
+/**
+ * Open external editor, with equation documentation.
+ */
 protected void openEditor() {
     Formule e =3D (Formule)formuleComboBox.getSelectedItem();
     if (e !=3D null) {
-        getContextValue(InputAction.class).openEditor(e.getCategory(), e.get=
Name(),  clazz, e.getContent(), editor);
+        getContextValue(InputAction.class).openEditor(e.getCategory(), e.get=
Name(), clazz, e.getContent(), editor);
     }
     else {
-        getContextValue(InputAction.class).openEditor(nameEquation, "new", c=
lazz, editor.getText(), editor);
+        getContextValue(InputAction.class).openEditor(formuleCategory, "new"=
, clazz, editor.getText(), editor);
     }
 }
 protected void setEditorText() {
@@ -182,6 +216,9 @@
     }
 }
=20
+/**
+ * New formule selected, replace content.
+ */
 protected void formuleChanged() {
     Formule selectedFormule =3D (Formule)formuleComboBox.getSelectedItem();
     setFormule(selectedFormule);
@@ -192,7 +229,7 @@
     <Table>
         <row>
             <cell fill=3D'horizontal' anchor=3D'east'>
-                <JLabel id=3D'lbl' text=3D'{getLblText()}' enabled=3D'{isAct=
if()}'/>
+                <JLabel text=3D'{getText()}' enabled=3D'{isActif()}'/>
             </cell>
             <cell fill=3D'horizontal' weightx=3D'1.0'>
                 <JComboBox id=3D"formuleComboBox" onActionPerformed=3D'formu=
leChanged()' enabled=3D'{isActif()}'
@@ -204,12 +241,12 @@
                 <Table>
                     <row>
                         <cell fill=3D'horizontal'>
-                            <JButton text=3D"isisfish.common.saveModel" onAc=
tionPerformed=3D'saveModel()' enabled=3D'{isActif()}'/>
+                            <JButton text=3D"isisfish.common.saveModel" onAc=
tionPerformed=3D'saveModel()' enabled=3D'{isActif() &amp;&amp; formuleCategor=
y !=3D null}'/>
                         </cell>
                     </row>
                     <row>
                         <cell fill=3D'horizontal'>
-                            <JButton text=3D"isisfish.common.openEditor" onA=
ctionPerformed=3D'openEditor()' enabled=3D'{isActif()}'/>
+                            <JButton text=3D"isisfish.common.openEditor" onA=
ctionPerformed=3D'openEditor()' enabled=3D'{isActif() &amp;&amp; clazz !=3D n=
ull &amp;&amp; formuleCategory !=3D null}'/>
                         </cell>
                     </row>
                     <row>

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	2010-01-22 15:37:21 UTC (rev 2935)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonIn=
foSpeciesEditorUI.jaxx	2010-01-22 15:38:16 UTC (rev 2936)
@@ -1,6 +1,6 @@
 <!--
 /* *##%
- * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
+ * Copyright (C) 2005 - 2010 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
@@ -139,18 +139,20 @@
                 <Table>
                     <row>
                         <cell fill=3D'horizontal' anchor=3D'east'>
-                            <JLabel text=3D"isisfish.metierSeasonInfoSpecies=
.selectSpecies" enabled=3D'{isMetierSeasonSelected()}'/>
+                            <JLabel text=3D"isisfish.metierSeasonInfoSpecies=
.selectSpecies"
+                                enabled=3D'{isMetierSeasonSelected()}' decor=
ator=3D'boxed'/>
                         </cell>
                         <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <JComboBox id=3D"fieldTargetSpecies" onActionPer=
formed=3D'targetSpeciesChanged()' enabled=3D'{isMetierSeasonSelected()}'/>
+                            <JComboBox id=3D"fieldTargetSpecies" onActionPer=
formed=3D'targetSpeciesChanged()'
+                                enabled=3D'{isMetierSeasonSelected()}' decor=
ator=3D'boxed'/>
                         </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'{isTargetSpeciesSelected()}'
-                                lblText=3D'{_("isisfish.metierSeasonInfoSpec=
ies.targetFactor")}'
-                                bean=3D'{getBean()}' nameEquation=3D'TargetF=
actor'
+                                text=3D'isisfish.metierSeasonInfoSpecies.tar=
getFactor'
+                                bean=3D'{getBean()}' formuleCategory=3D'Targ=
etFactor'
                                 clazz=3D'{fr.ifremer.isisfish.equation.Targe=
tSpeciesTargetFactorEquation.class}'
                                 decorator=3D'boxed' _bean=3D'{MetierImpl.cla=
ss}' _method=3D'""'/>
                         </cell>
@@ -160,7 +162,8 @@
                                <JPanel/>
                         </cell>
                         <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <JCheckBox id=3D"fieldPrimaryCatch" text=3D"isis=
fish.metierSeasonInfoSpecies.mainSpecies" enabled=3D'{isTargetSpeciesSelected=
()}'/>
+                            <JCheckBox id=3D"fieldPrimaryCatch" text=3D"isis=
fish.metierSeasonInfoSpecies.mainSpecies"
+                                enabled=3D'{isTargetSpeciesSelected()}' deco=
rator=3D'boxed'/>
                         </cell>
                     </row>
                 </Table>
@@ -171,19 +174,21 @@
                 <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'{isMetierSeasonSelected()}'/>
+                            <JButton id=3D"add" text=3D"isisfish.common.add"=
 onActionPerformed=3D'add()'
+                                enabled=3D'{isMetierSeasonSelected()}' decor=
ator=3D'boxed'/>
                         </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'{isMetierSeasonSelected()}'/>
+                                <JTable id=3D"tableTargetSpecies" rowHeight=
=3D'24' enabled=3D'{isMetierSeasonSelected()}' decorator=3D'boxed'/>
                             </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'false'/>
+                            <JButton id=3D"remove" text=3D"isisfish.common.r=
emove"
+                                onActionPerformed=3D'remove()' enabled=3D'fa=
lse' decorator=3D'boxed'/>
                         </cell>
                     </row>
                 </Table>

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	2010-01-22 15:37:21 UTC (rev 2935)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonIn=
foSpeciesUI.jaxx	2010-01-22 15:38:16 UTC (rev 2936)
@@ -1,6 +1,6 @@
 <!--
 /* *##%
- * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
+ * Copyright (C) 2005 - 2010 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
@@ -81,9 +81,9 @@
     metierSeasonInfoSpeciesEditor.refresh();
 }
     ]]></script>
-    <Table id=3D'body'>
+    <Table>
         <row>
-            <cell fill=3D'both' weightx=3D'1.0' weighty=3D'0.5'>
+            <cell columns=3D"2" fill=3D'both' weightx=3D'1.0' weighty=3D'0.5=
'>
                 <Table>
                     <row>
                         <cell fill=3D'horizontal' anchor=3D'east'>
@@ -98,7 +98,7 @@
                         <cell columns=3D'2' fill=3D'both' weightx=3D'1.0' we=
ighty=3D'1.0'>
                             <MetierSeasonInfoSpeciesEditorUI id=3D'metierSea=
sonInfoSpeciesEditor' constructorParams=3D'this'
                               bean=3D'{getBean()}' metierSeasonInfo=3D'{getM=
etierSeasonInfo()}' metierSeasonSelected=3D'{isMetierSeasonInfoSelected()}'
-                              actif=3D'{isActif()}' decorator=3D'boxed'
+                              actif=3D'{isActif()}'
                               _bean=3D'{MetierSeasonInfoImpl.class}' _method=
=3D'"SpeciesTargetSpecies"'/>
                         </cell>
                     </row>
@@ -106,18 +106,12 @@
             </cell>
         </row>
         <row>
-            <cell fill=3D'horizontal' weightx=3D'1.0'>
-                <Table>
-                    <row>
-                        <cell fill=3D'horizontal' weightx=3D'0.5'>
-                            <JButton id=3D'save'/>
-                        </cell>
-                        <cell fill=3D'horizontal' weightx=3D'0.5'>
-                            <JButton id=3D'cancel'/>
-                        </cell>
-                    </row>
-                </Table>
+            <cell fill=3D'horizontal' weightx=3D'0.5'>
+                <JButton id=3D'save' decorator=3D'boxed'/>
             </cell>
+            <cell fill=3D'horizontal' weightx=3D'0.5'>
+                <JButton id=3D'cancel' decorator=3D'boxed'/>
+            </cell>
         </row>
     </Table>
 </fr.ifremer.isisfish.ui.input.InputContentUI>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onBasicsUI.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/PopulationBasi=
csUI.jaxx	2010-01-22 15:37:21 UTC (rev 2935)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasi=
csUI.jaxx	2010-01-22 15:38:16 UTC (rev 2936)
@@ -1,6 +1,6 @@
 <!--
 /* *##%
- * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
+ * Copyright (C) 2005 - 2010 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
@@ -193,8 +193,8 @@
                                 <row>
                                     <cell columns=3D'3' fill=3D'both' weight=
x=3D'1.0' weighty=3D'1.0'>
                                         <InputOneEquationUI id=3D'growthEqua=
tion' constructorParams=3D'this'
-                                        lblText=3D'{_("isisfish.populationBa=
sics.growth")}' actif=3D'{isActif()}'
-                                        bean=3D'{getBean()}' nameEquation=3D=
'Growth' methodGet=3D'Growth' methodSet=3D'EquationGrowth'
+                                        text=3D'isisfish.populationBasics.gr=
owth' actif=3D'{isActif()}'
+                                        bean=3D'{getBean()}' beanProperty=3D=
'growth' formuleCategory=3D'Growth'=20
                                         clazz=3D'{fr.ifremer.isisfish.equati=
on.PopulationGrowth.class}'
                                         decorator=3D'boxed' _bean=3D'{Popula=
tionImpl.class}' _method=3D'"Growth"'/>
                                     </cell>
@@ -202,8 +202,8 @@
                                 <row>
                                     <cell columns=3D'3' fill=3D'both' weight=
x=3D'1.0' weighty=3D'1.0'>
                                         <InputOneEquationUI id=3D'growthReve=
rseEquation' constructorParams=3D'this'
-                                        lblText=3D'{_("isisfish.populationBa=
sics.growthReverse")}' actif=3D'{isActif()}'
-                                        bean=3D'{getBean()}' nameEquation=3D=
'GrowthReverse' methodGet=3D'GrowthReverse' methodSet=3D'EquationGrowthRevers=
e'
+                                        text=3D'isisfish.populationBasics.gr=
owthReverse' actif=3D'{isActif()}'
+                                        bean=3D'{getBean()}' formuleCategory=
=3D'GrowthReverse' beanProperty=3D'GrowthReverse'
                                         clazz=3D'{fr.ifremer.isisfish.equati=
on.PopulationGrowthReverse.class}'
                                         decorator=3D'boxed' _bean=3D'{Popula=
tionImpl.class}' _method=3D'"GrowthReverse"'/>
                                     </cell>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onEquationUI.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/PopulationEqua=
tionUI.jaxx	2010-01-22 15:37:21 UTC (rev 2935)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEqua=
tionUI.jaxx	2010-01-22 15:38:16 UTC (rev 2936)
@@ -1,6 +1,6 @@
 <!--
 /* *##%
- * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
+ * Copyright (C) 2005 - 2010 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
@@ -49,38 +49,38 @@
     </script>
     <Table id=3D'body'>
         <row>
-            <cell columns=3D'2' fill=3D'both' weightx=3D'0.5'  weighty=3D'0.=
3'>
+            <cell columns=3D'2' fill=3D'both' weightx=3D'0.5' weighty=3D'0.3=
'>
                 <InputOneEquationUI id=3D'naturalDeathRate' constructorParam=
s=3D'this'
-                    lblText=3D'{_("isisfish.populationEquation.naturalDeathR=
ate")}'
-                    bean=3D'{getBean()}'  nameEquation=3D'NaturalDeathRate' =
methodGet=3D'NaturalDeathRate' methodSet=3D'EquationNaturalDeathRate'
+                    text=3D'isisfish.populationEquation.naturalDeathRate'
+                    bean=3D'{getBean()}' formuleCategory=3D'NaturalDeathRate=
' beanProperty=3D'NaturalDeathRate'
                     clazz=3D'{fr.ifremer.isisfish.equation.PopulationNatural=
DeathRate.class}'
                     decorator=3D'boxed' _bean=3D'{PopulationImpl.class}' _me=
thod=3D'"NaturalDeathRate"'/>
             </cell>
         </row>
         <row>
-            <cell columns=3D'2' fill=3D'both' weightx=3D'1.0'  weighty=3D'0.=
3'>
+            <cell columns=3D'2' fill=3D'both' weightx=3D'1.0' weighty=3D'0.3=
'>
                 <InputOneEquationUI id=3D'meanWeight' constructorParams=3D't=
his'
-                    lblText=3D'{_("isisfish.populationEquation.meanWeight")}'
-                    bean=3D'{getBean()}'  nameEquation=3D'MeanWeight' method=
Get=3D'MeanWeight' methodSet=3D'EquationMeanWeight'
+                    text=3D'isisfish.populationEquation.meanWeight'
+                    bean=3D'{getBean()}' formuleCategory=3D'MeanWeight' bean=
Property=3D'MeanWeight'
                     clazz=3D'{fr.ifremer.isisfish.equation.PopulationMeanWei=
ght.class}'
                     decorator=3D'boxed' _bean=3D'{PopulationImpl.class}' _me=
thod=3D'"MeanWeight"'/>
             </cell>
         </row>
         <row>
-            <cell columns=3D'2' fill=3D'both' weightx=3D'1.0'  weighty=3D'0.=
3'>
+            <cell columns=3D'2' fill=3D'both' weightx=3D'1.0' weighty=3D'0.3=
'>
                 <InputOneEquationUI id=3D'price' constructorParams=3D'this'
-                    lblText=3D'{_("isisfish.populationEquation.price")}'
-                    bean=3D'{getBean()}'  nameEquation=3D'Price' methodGet=
=3D'Price' methodSet=3D'EquationPrice'
+                    text=3D'isisfish.populationEquation.price'
+                    bean=3D'{getBean()}' formuleCategory=3D'Price' beanPrope=
rty=3D'Price'
                     clazz=3D'{fr.ifremer.isisfish.equation.PopulationPrice.c=
lass}'
                     decorator=3D'boxed' _bean=3D'{PopulationImpl.class}' _me=
thod=3D'"Price"'/>
             </cell>
         </row>
         <row>
             <cell fill=3D'horizontal' weightx=3D'0.5'>
-                <JButton id=3D'save'/>
+                <JButton id=3D'save' decorator=3D'boxed'/>
             </cell>
              <cell fill=3D'horizontal' weightx=3D'0.5'>
-                <JButton id=3D'cancel'/>
+                <JButton id=3D'cancel' decorator=3D'boxed'/>
             </cell>
         </row>
     </Table>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onMigrationEmigrationUI.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/PopulationMigr=
ationEmigrationUI.jaxx	2010-01-22 15:37:21 UTC (rev 2935)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigr=
ationEmigrationUI.jaxx	2010-01-22 15:38:16 UTC (rev 2936)
@@ -188,7 +188,7 @@
         </row>
         <row columns=3D'4'>
             <cell fill=3D'both' weightx=3D'1.0' weighty=3D'1.0'>
-                <org.nuiton.math.matrix.gui.MatrixPanelEditor id =3D'populat=
ionMigrationEmigrationTable'
+                <org.nuiton.math.matrix.gui.MatrixPanelEditor id=3D'populati=
onMigrationEmigrationTable'
                 linearModel=3D"true" enabled=3D'{isActif()}'
                 onMatrixChanged=3D"populationMigrationEmigrationMatrixChange=
d(event)" />
             </cell>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onMigrationEquationUI.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/PopulationMigr=
ationEquationUI.jaxx	2010-01-22 15:37:21 UTC (rev 2935)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigr=
ationEquationUI.jaxx	2010-01-22 15:38:16 UTC (rev 2936)
@@ -1,6 +1,6 @@
 <!--
 /* *##%
- * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
+ * Copyright (C) 2005 - 2010 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
@@ -50,8 +50,8 @@
         <row>
             <cell fill=3D'both' weightx=3D'1.0' weighty=3D'1.0'>
                 <InputOneEquationUI id=3D'migrationEquation' constructorPara=
ms=3D'this'
-                    lblText=3D'{_("isisfish.common.migration")}' actif=3D'{i=
sActif()}'
-                    bean=3D'{getPopInfo()}' nameEquation=3D'Migration' metho=
dGet=3D'MigrationEquation' methodSet=3D'MigrationEquationAsString'
+                    text=3D'isisfish.common.migration' actif=3D'{isActif()}'
+                    bean=3D'{getPopInfo()}' formuleCategory=3D'Migration' be=
anProperty=3D'MigrationEquation'
                     clazz=3D'{fr.ifremer.isisfish.equation.MigrationEquation=
.class}'
                     decorator=3D'boxed' _bean=3D'{PopulationSeasonInfoImpl.c=
lass}' _method=3D'"MigrationEquation"'/>
             </cell>
@@ -59,8 +59,8 @@
         <row>
             <cell fill=3D'both' weightx=3D'1.0' weighty=3D'1.0'>
                 <InputOneEquationUI id=3D'emigrationEquation' constructorPar=
ams=3D'this'
-                    lblText=3D'{_("isisfish.common.emigration")}' actif=3D'{=
isActif()}'
-                    bean=3D'{getPopInfo()}' nameEquation=3D'Emigration' meth=
odGet=3D'EmigrationEquation' methodSet=3D'EmigrationEquationAsString'
+                    text=3D'isisfish.common.emigration' actif=3D'{isActif()}'
+                    bean=3D'{getPopInfo()}' formuleCategory=3D'Emigration' b=
eanProperty=3D'EmigrationEquation'
                     clazz=3D'{fr.ifremer.isisfish.equation.EmigrationEquatio=
n.class}'
                     decorator=3D'boxed' _bean=3D'{PopulationSeasonInfoImpl.c=
lass}' _method=3D'"EmigrationEquation"'/>
             </cell>
@@ -68,8 +68,8 @@
         <row>
             <cell fill=3D'both' weightx=3D'1.0' weighty=3D'1.0'>
                 <InputOneEquationUI id=3D'immigrationEquation' constructorPa=
rams=3D'this'
-                    lblText=3D'{_("isisfish.common.immigration")}' actif=3D'=
{isActif()}'
-                    bean=3D'{getPopInfo()}' nameEquation=3D'Immigration' met=
hodGet=3D'ImmigrationEquation' methodSet=3D'ImmigrationEquationAsString'
+                    text=3D'isisfish.common.immigration' actif=3D'{isActif()=
}'
+                    bean=3D'{getPopInfo()}' formuleCategory=3D'Immigration' =
beanProperty=3D'ImmigrationEquation'
                     clazz=3D'{fr.ifremer.isisfish.equation.ImmigrationEquati=
on.class}'
                     decorator=3D'boxed' _bean=3D'{PopulationSeasonInfoImpl.c=
lass}' _method=3D'"ImmigrationEquation"'/>
             </cell>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onRecruitmentUI.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/PopulationRecr=
uitmentUI.jaxx	2010-01-22 15:37:21 UTC (rev 2935)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecr=
uitmentUI.jaxx	2010-01-22 15:38:16 UTC (rev 2936)
@@ -86,8 +86,8 @@
                     <row>
                         <cell columns=3D'2' fill=3D'both' weightx=3D'1.0' we=
ighty=3D'0.5'>
                             <InputOneEquationUI id=3D'reproductionEquation' =
constructorParams=3D'this'
-                                lblText=3D'{_("isisfish.populationRecruitmen=
t.reproductionEquation")}'
-                                bean=3D'{getBean()}'  nameEquation=3D'Reprod=
uction' methodGet=3D'ReproductionEquation' methodSet=3D'EquationReproductionE=
quation'
+                                text=3D'isisfish.populationRecruitment.repro=
ductionEquation'
+                                bean=3D'{getBean()}' formuleCategory=3D'Repr=
oduction' beanProperty=3D'ReproductionEquation'
                                 clazz=3D'{fr.ifremer.isisfish.equation.Popul=
ationReproductionEquation.class}'
                                 decorator=3D'boxed' _bean=3D'{PopulationImpl=
.class}' _method=3D'"ReproductionEquation"'/>
                         </cell>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onZonesUI.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/PopulationZone=
sUI.jaxx	2010-01-22 15:37:21 UTC (rev 2935)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZone=
sUI.jaxx	2010-01-22 15:38:16 UTC (rev 2936)
@@ -47,25 +47,21 @@
 }
     ]]>
     </script>
-    <Table id=3D'body'>
+    <Table>
         <row>
-            <cell fill=3D'both' weightx=3D'1.0' weighty=3D'1'>
-                <PopulationZonesEditorUI id=3D'popZones' constructorParams=
=3D'this' bean=3D'{getBean()}' actif=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{PopulationImpl.class}' _method=3D'"MappingZoneReproZoneRecru"'/>
+            <cell columns=3D"2" fill=3D'both' weightx=3D'1.0' weighty=3D'1'>
+                <PopulationZonesEditorUI id=3D'popZones' constructorParams=
=3D'this'
+                    bean=3D'{getBean()}' actif=3D'{isActif()}' decorator=3D'=
boxed'
+                    _bean=3D'{PopulationImpl.class}' _method=3D'"MappingZone=
ReproZoneRecru"'/>
             </cell>
         </row>
         <row>
-            <cell fill=3D'horizontal' weightx=3D'1.0'>
-                <Table>
-                    <row>
-                        <cell fill=3D'horizontal' weightx=3D'0.5'>
-                            <JButton id=3D'save'/>
-                        </cell>
-                        <cell fill=3D'horizontal' weightx=3D'0.5'>
-                            <JButton id=3D'cancel'/>
-                        </cell>
-                    </row>
-                </Table>
+            <cell fill=3D'horizontal' weightx=3D'0.5'>
+                <JButton id=3D'save' decorator=3D'boxed'/>
             </cell>
+            <cell fill=3D'horizontal' weightx=3D'0.5'>
+                <JButton id=3D'cancel' decorator=3D'boxed'/>
+            </cell>
         </row>
     </Table>
 </fr.ifremer.isisfish.ui.input.InputContentUI>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Selectiv=
ityEditorUI.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/SelectivityEdi=
torUI.jaxx	2010-01-22 15:37:21 UTC (rev 2935)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEdi=
torUI.jaxx	2010-01-22 15:38:16 UTC (rev 2936)
@@ -133,55 +133,43 @@
     addSelectivityButton.setEnabled(isSelectivityPopulationSelected());
 }
     ]]></script>
-    <Table id=3D'body'>
+    <Table>
         <row>
-            <cell fill=3D'both' weightx=3D'1.0' weighty=3D'1.0'>
-                <Table>
-                    <row>
-                        <cell fill=3D'horizontal' anchor=3D'east'>
-                            <JLabel text=3D"isisfish.selectivity.selectPopul=
ation" enabled=3D'{isActif()}' decorator=3D'boxed' />
-                        </cell>
-                        <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <JComboBox id=3D"fieldSelectivityPopulation" onA=
ctionPerformed=3D'selectivityChanged()' enabled=3D'{isActif()}'
-                            decorator=3D'boxed' />
-                        </cell>
-                    </row>
-                    <row>
-                        <cell columns=3D'2' fill=3D'both' weightx=3D'1.0' we=
ighty=3D'1.0'>
-                            <InputOneEquationUI id=3D'selectivityEquation' c=
onstructorParams=3D'this'
-                                lblText=3D'{_("isisfish.selectivity.equation=
")}'
-                                bean=3D'{getBean()}' nameEquation=3D'Selecti=
vity' actif=3D'{isSelectivityPopulationSelected()}'
-                                clazz=3D'{fr.ifremer.isisfish.equation.Selec=
tivityEquation.class}'
-                                decorator=3D'boxed' />
-                        </cell>
-                    </row>
-                </Table>
+            <cell fill=3D'horizontal' anchor=3D'east'>
+                <JLabel text=3D"isisfish.selectivity.selectPopulation" enabl=
ed=3D'{isActif()}' decorator=3D'boxed' />
             </cell>
+            <cell fill=3D'horizontal' weightx=3D'1.0'>
+                <JComboBox id=3D"fieldSelectivityPopulation" onActionPerform=
ed=3D'selectivityChanged()' enabled=3D'{isActif()}'
+                decorator=3D'boxed' />
+            </cell>
         </row>
         <row>
-            <cell fill=3D'both' weightx=3D'1.0' weighty=3D'1.0'>
-                <Table>
-                    <row>
-                        <cell columns=3D'2' fill=3D'horizontal'  weightx=3D'=
1.0'>
-                            <JButton id=3D"addSelectivityButton" text=3D"isi=
sfish.common.add" onActionPerformed=3D'addSelectivity()'
-                            enabled=3D'{isSelectivityPopulationSelected()}' =
decorator=3D'boxed' />
-                        </cell>
-                    </row>
-                    <row>
-                        <cell columns=3D'2' fill=3D'both'  weightx=3D'1.0' w=
eighty=3D'1.0'>
-                            <JScrollPane>
-                                <JTable id=3D"selectivityTable" rowHeight=3D=
'24' enabled=3D'{isActif()}' decorator=3D'boxed' />
-                            </JScrollPane>
-                        </cell>
-                    </row>
-                    <row>
-                        <cell columns=3D'2' fill=3D'horizontal' weightx=3D'1=
.0'>
-                            <JButton id=3D"removeSelectivityButton" text=3D"=
isisfish.common.remove" onActionPerformed=3D'removeSelectivity()'
-                            enabled=3D'false' decorator=3D'boxed' />
-                        </cell>
-                    </row>
-                </Table>
+            <cell columns=3D'2' fill=3D'both' weightx=3D'1.0' weighty=3D'1.0=
' insets=3D"0">
+                <InputOneEquationUI id=3D'selectivityEquation' constructorPa=
rams=3D'this'
+                    text=3D'isisfish.selectivity.equation'
+                    bean=3D'{getBean()}' formuleCategory=3D'Selectivity' act=
if=3D'{isSelectivityPopulationSelected()}'
+                    clazz=3D'{fr.ifremer.isisfish.equation.SelectivityEquati=
on.class}'
+                    decorator=3D'boxed' />
             </cell>
         </row>
+        <row>
+            <cell columns=3D'2' fill=3D'horizontal' weightx=3D'1.0'>
+                <JButton id=3D"addSelectivityButton" text=3D"isisfish.common=
.add" onActionPerformed=3D'addSelectivity()'
+                enabled=3D'{isSelectivityPopulationSelected()}' decorator=3D=
'boxed' />
+            </cell>
+        </row>
+        <row>
+            <cell columns=3D'2' fill=3D'both' weightx=3D'1.0' weighty=3D'1.0=
'>
+                <JScrollPane>
+                    <JTable id=3D"selectivityTable" rowHeight=3D'24' enabled=
=3D'{isActif()}' decorator=3D'boxed' />
+                </JScrollPane>
+            </cell>
+        </row>
+        <row>
+            <cell columns=3D'2' fill=3D'horizontal' weightx=3D'1.0'>
+                <JButton id=3D"removeSelectivityButton" text=3D"isisfish.com=
mon.remove" onActionPerformed=3D'removeSelectivity()'
+                enabled=3D'false' decorator=3D'boxed' />
+            </cell>
+        </row>
     </Table>
 </fr.ifremer.isisfish.ui.input.InputContentUI>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Selectiv=
ityUI.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/SelectivityUI.=
jaxx	2010-01-22 15:37:21 UTC (rev 2935)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.=
jaxx	2010-01-22 15:38:16 UTC (rev 2936)
@@ -42,34 +42,21 @@
     getVerifier().setSaveButton(save);
     getVerifier().setCancelButton(cancel);
 }
-
     ]]></script>
-    <Table id=3D'body'>
+    <Table>
         <row>
-            <cell fill=3D'both' weightx=3D'1.0' weighty=3D'1.0'>
-                <Table>
-                    <row>
-                        <cell columns=3D'2' fill=3D'both' weightx=3D'1.0' we=
ighty=3D'1.0'>
-                            <SelectivityEditorUI id=3D'editor' constructorPa=
rams=3D'this' bean=3D'{getBean()}'
-                                _bean=3D'{GearImpl.class}' _method=3D'"Popul=
ationSelectivity"'/>
-                        </cell>
-                    </row>
-                </Table>
+            <cell columns=3D"2" fill=3D'both' weightx=3D'1.0' weighty=3D'1.0=
'>
+                <SelectivityEditorUI id=3D'editor' constructorParams=3D'this=
' bean=3D'{getBean()}'
+                    _bean=3D'{GearImpl.class}' _method=3D'"PopulationSelecti=
vity"'/>
             </cell>
         </row>
         <row>
             <cell fill=3D'horizontal' weightx=3D'1.0'>
-                <Table>
-                    <row>
-                        <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <JButton id=3D'save'/>
-                        </cell>
-                        <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <JButton id=3D'cancel'/>
-                        </cell>
-                    </row>
-                </Table>
+                <JButton id=3D'save' decorator=3D'boxed'/>
             </cell>
+            <cell fill=3D'horizontal' weightx=3D'1.0'>
+                <JButton id=3D'cancel' decorator=3D'boxed'/>
+            </cell>
         </row>
     </Table>
 </fr.ifremer.isisfish.ui.input.InputContentUI>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVes=
selsBasicsUI.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/SetOfVesselsBa=
sicsUI.jaxx	2010-01-22 15:37:21 UTC (rev 2935)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBa=
sicsUI.jaxx	2010-01-22 15:38:16 UTC (rev 2936)
@@ -1,6 +1,6 @@
 <!--
 /* *##%
- * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
+ * Copyright (C) 2005 - 2010 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
@@ -137,8 +137,8 @@
                     <row>
                         <cell columns=3D'2' fill=3D'both' weightx=3D'1.0' we=
ighty=3D'0.3'>
                             <InputOneEquationUI id=3D'technicalEfficiency' c=
onstructorParams=3D'this'
-                                lblText=3D'{_("isisfish.setOfVessels.technic=
alEfficiency")}'
-                                bean=3D'{getBean()}' nameEquation=3D'Technic=
alEfficiency' methodGet=3D'TechnicalEfficiencyEquation' methodSet=3D'Equation=
TechnicalEfficiency'
+                                text=3D'isisfish.setOfVessels.technicalEffic=
iency'
+                                bean=3D'{getBean()}' formuleCategory=3D'Tech=
nicalEfficiency' beanProperty=3D'TechnicalEfficiencyEquation'
                                 clazz=3D'{fr.ifremer.isisfish.equation.SoVTe=
chnicalEfficiencyEquation.class}'
                                 decorator=3D'boxed' _bean=3D'{SetOfVesselsIm=
pl.class}' _method=3D'"TechnicalEfficiencyEquation"'/>
                         </cell>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Strategy=
TabUI.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/StrategyTabUI.=
jaxx	2010-01-22 15:37:21 UTC (rev 2935)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.=
jaxx	2010-01-22 15:38:16 UTC (rev 2936)
@@ -1,6 +1,6 @@
 <!--
 /* *##%
- * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
+ * Copyright (C) 2005 - 2010 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
@@ -134,8 +134,8 @@
                     <row>
                         <cell columns=3D"2" fill=3D'both' weightx=3D'1.0' we=
ighty=3D'0.5'>
                             <InputOneEquationUI id=3D"strategyInactivity" co=
nstructorParams=3D'this'
-                                lblText=3D'{_("isisfish.strategy.inactivity"=
)}'=20
-                                bean=3D'{getBean()}' nameEquation=3D'Inactiv=
ity' methodGet=3D'InactivityEquation' methodSet=3D'EquationInactivity'
+                                text=3D'isisfish.strategy.inactivity'=20
+                                bean=3D'{getBean()}' formuleCategory=3D'Inac=
tivity' beanProperty=3D'InactivityEquation'
                                 clazz=3D'{fr.ifremer.isisfish.equation.Strat=
egyInactivityEquation.class}'
                                 decorator=3D'boxed' _bean=3D'{StrategyImpl.c=
lass}' _method=3D'"Inactivity"'/> <!-- bindings not work well actif=3D'{getBe=
an().getInactivityEquationUsed()}' -->
                         </cell>


--===============8331481116828023714==--