From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:14 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r2398 - in isis-fish/trunk/src/main:
	java/fr/ifremer/isisfish/ui/input
	java/fr/ifremer/isisfish/ui/input/setofvessels resources/i18n
Date: Wed, 17 Jun 2009 15:00:13 +0200
Message-ID: <20090617130013.8EF37461CC4@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6296313454001295225=="

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

Author: chatellier
Date: 2009-06-17 13:00:12 +0000 (Wed, 17 Jun 2009)
New Revision: 2398

Added:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescripti=
onParametersUI.jaxx
   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/setofvessels/
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/Ef=
fortDescriptionListModel.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/Ef=
fortDescriptionListRenderer.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/Me=
tierListModel.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/Me=
tierListRenderer.java
Removed:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTab=
sUI.jaxx
Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescripti=
onUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.=
jaxx
   isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties
   isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties
Log:
#1891 : UI de flottille/m?\195?\169tiers pratiqu?\195?\169s

Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescr=
iptionParametersUI.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/EffortDescript=
ionParametersUI.jaxx	                        (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescript=
ionParametersUI.jaxx	2009-06-17 13:00:12 UTC (rev 2398)
@@ -0,0 +1,284 @@
+<!--
+/* *##%
+ * Copyright (C) 2005 - 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.
+ *##%*/
+ -->
+<fr.ifremer.isisfish.ui.input.InputContentUI>
+
+    <!-- bean property -->
+    <fr.ifremer.isisfish.entities.SetOfVesselsImpl id=3D'bean' javaBean=3D'n=
ull'/>
+    <fr.ifremer.isisfish.entities.EffortDescriptionImpl id=3D'effortDescript=
ion' javaBean=3D'null'/>
+
+    <script><![CDATA[
+import java.util.ArrayList;
+import fr.ifremer.isisfish.entities.EffortDescription;
+import fr.ifremer.isisfish.entities.EffortDescriptionImpl;
+import fr.ifremer.isisfish.entities.SetOfVesselsImpl;
+import fr.ifremer.isisfish.entities.SetOfVessels;
+import fr.ifremer.isisfish.types.TimeUnit;
+import fr.ifremer.isisfish.ui.input.setofvessels.EffortDescriptionListModel;
+import fr.ifremer.isisfish.ui.input.setofvessels.EffortDescriptionListRender=
er;
+
+addPropertyChangeListener("effortDescription", new PropertyChangeListener() {
+    public void propertyChange(PropertyChangeEvent evt) {
+        if (evt.getOldValue() !=3D null || evt.getNewValue() =3D=3D null) {
+            fieldEffortDescriptionFishingOperation.setText("");
+            fieldEffortDescriptionFishingOperationDuration.setText("");
+            fieldEffortDescriptionGearsNumberPerOperation.setText("");
+            fieldEffortDescriptionCrewSize.setText("");
+            fieldEffortDescriptionUnitCostOfFishing.setText("");
+            fieldEffortDescriptionFixedCrewSalary.setText("");
+            fieldEffortDescriptionCrewFoodCost.setText("");
+            fieldEffortDescriptionCrewShareRate.setText("");
+            fieldEffortDescriptionRepairAndMaintenanceGearCost.setText("");
+            fieldEffortDescriptionLandingCosts.setText("");
+            fieldEffortDescriptionOtherRunningCost.setText("");
+        }
+        if (evt.getNewValue() !=3D null) {
+
+        }
+    }
+});
+
+ at Override
+public void refresh() {
+    SetOfVessels setOfVessels =3D getVerifier().getEntity(SetOfVessels.class=
);
+
+    // twice event for jaxx bindings detection
+    setBean(null);
+    setBean((SetOfVesselsImpl) setOfVessels);
+
+    EffortDescriptionListModel model =3D (EffortDescriptionListModel)fieldEf=
fortDescriptionEffortDescriptionList.getModel();
+    if (getBean() !=3D null) {
+        java.util.List<EffortDescription> effortDescriptions =3D new ArrayLi=
st<EffortDescription>(getBean().getPossibleMetiers());
+        model.setEffortDescriptions(effortDescriptions);
+    }
+    else {
+        model.setEffortDescriptions(null);
+    }
+}
+
+ at Override
+public void setActionButtons() {
+    getVerifier().setSaveButton(save);
+    getVerifier().setCancelButton(cancel);
+}
+
+protected void effortDescriptionSelectionChanged() {
+    EffortDescriptionImpl selectedEffort =3D (EffortDescriptionImpl)fieldEff=
ortDescriptionEffortDescriptionList.getSelectedValue();
+    setEffortDescription(selectedEffort);
+
+    if (getEffortDescription() !=3D null) {
+        getVerifier().addCurrentEntity(getEffortDescription());
+       =20
+        /* NumberEditor is not working
+        fieldEffortDescriptionFishingOperation.init();
+        fieldEffortDescriptionGearsNumberPerOperation.init();
+        fieldEffortDescriptionCrewSize.init();
+        fieldEffortDescriptionUnitCostOfFishing.init();
+        fieldEffortDescriptionFixedCrewSalary.init();
+        fieldEffortDescriptionCrewFoodCost.init();
+        fieldEffortDescriptionCrewShareRate.init();
+        fieldEffortDescriptionRepairAndMaintenanceGearCost.init();
+        fieldEffortDescriptionLandingCosts.init();
+        fieldEffortDescriptionOtherRunningCost.init();*/
+    }
+}
+    ]]>
+    </script>
+    <Table>
+        <row>
+            <cell rows=3D'3' fill=3D'both' weightx=3D'0.4' weighty=3D'1.0'>
+                <JScrollPane>
+                    <JList id=3D"fieldEffortDescriptionEffortDescriptionList=
" selectionMode=3D"{javax.swing.ListSelectionModel.SINGLE_SELECTION}"
+                        onValueChanged=3D'effortDescriptionSelectionChanged(=
)'
+                        model=3D'{new EffortDescriptionListModel()}' cellRen=
derer=3D'{new EffortDescriptionListRenderer()}'
+                        enabled=3D'{isActif()}' decorator=3D'boxed' />
+                </JScrollPane>
+            </cell>
+            <cell columns=3D'2' fill=3D'both' weightx=3D'1.0'>
+                <Table border=3D'{BorderFactory.createTitledBorder(_("isisfi=
sh.effortDescription.effortTitle"))}'>
+                    <row>
+                        <cell anchor=3D'east'>
+                            <JLabel text=3D"isisfish.effortDescription.fishi=
ngOperation" enabled=3D'{isActif()}'/>
+                        </cell>
+                        <cell fill=3D'horizontal' weightx=3D'1.0'>
+                            <!--NumberEditor id=3D'fieldEffortDescriptionFis=
hingOperation' constructorParams=3D'this'
+                                          bean=3D'{getEffortDescription()}' =
property=3D'fishingOperation'
+                                          enabled=3D'{isActif()}' decorator=
=3D'boxed' useSign=3D'true'
+                                          _bean=3D'{EffortDescriptionImpl.cl=
ass}' _method=3D'"FishingOperation"'/-->
+                            <JFormattedTextField id=3D"fieldEffortDescriptio=
nFishingOperation" text=3D'{getEffortDescription().getFishingOperation()}'
+                            onKeyReleased=3D'getEffortDescription().setFishi=
ngOperation(Integer.parseInt(fieldEffortDescriptionFishingOperation.getText()=
))'
+                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{EffortDescriptionImpl.class}' _method=3D'"FishingOperation"'/>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell anchor=3D'east'>
+                            <JLabel text=3D"isisfish.effortDescription.fishi=
ngOperationDuration" enabled=3D'{isActif()}'/>
+                        </cell>
+                        <cell fill=3D'horizontal' weightx=3D'1.0'>
+                            <JTextField id=3D"fieldEffortDescriptionFishingO=
perationDuration"
+                            text=3D'{getEffortDescription().getFishingOperat=
ionDuration() =3D=3D null ? "" : getEffortDescription().getFishingOperationDu=
ration().getHour()}'
+                            toolTipText=3D"isisfish.effortDescription.fishin=
gOperationDuration.tooltip" onKeyReleased=3D'getEffortDescription().setFishin=
gOperationDuration(new TimeUnit(3600 * Double.parseDouble(fieldEffortDescript=
ionFishingOperationDuration.getText())))'
+                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{EffortDescriptionImpl.class}' _method=3D'"FishingOperationDuration"'/>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell anchor=3D'east'>
+                            <JLabel text=3D"isisfish.effortDescription.gears=
NumberPerOperation" enabled=3D'{isActif()}'/>
+                        </cell>
+                        <cell fill=3D'horizontal' weightx=3D'1.0'>
+                            <!--NumberEditor id=3D'fieldEffortDescriptionGea=
rsNumberPerOperation' constructorParams=3D'this'
+                                          bean=3D'{getEffortDescription()}' =
property=3D'gearsNumberPerOperation'
+                                          enabled=3D'{isActif()}' decorator=
=3D'boxed' useSign=3D'true'
+                                          _bean=3D'{EffortDescriptionImpl.cl=
ass}' _method=3D'"GearsNumberPerOperation"'/-->
+                            <JTextField id=3D"fieldEffortDescriptionGearsNum=
berPerOperation" text=3D'{getEffortDescription().getGearsNumberPerOperation()=
}'
+                            onKeyReleased=3D'getEffortDescription().setGears=
NumberPerOperation(Integer.parseInt(fieldEffortDescriptionGearsNumberPerOpera=
tion.getText()))'
+                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{EffortDescriptionImpl.class}' _method=3D'"GearsNumberPerOperation"'/>
+                        </cell>
+                    </row>
+                 </Table>
+             </cell>
+         </row>
+         <row>
+            <cell columns=3D'2' fill=3D'both' weighty=3D'1.0'>
+                 <Table anchor=3D'north' fill=3D'both' weighty=3D'1.0' borde=
r=3D'{BorderFactory.createTitledBorder(_("isisfish.effortDescription.economic=
Title"))}'>
+                    <row>
+                        <cell anchor=3D'east' fill=3D'none' weighty=3D'0.0'>
+                            <JLabel text=3D"isisfish.effortDescription.crewS=
ize" enabled=3D'{isActif()}'/>
+                        </cell>
+                        <cell fill=3D'horizontal' weightx=3D'1.0' weighty=3D=
'0.0'>
+                            <!--NumberEditor id=3D'fieldEffortDescriptionCre=
wSize' constructorParams=3D'this'
+                                          bean=3D'{getEffortDescription()}' =
property=3D'crewSize'
+                                          enabled=3D'{isActif()}' decorator=
=3D'boxed' useSign=3D'true'
+                                          _bean=3D'{EffortDescriptionImpl.cl=
ass}' _method=3D'"CrewSize"'/-->
+                            <JTextField id=3D"fieldEffortDescriptionCrewSize=
" text=3D'{getEffortDescription().getCrewSize()}'
+                            onKeyReleased=3D'getEffortDescription().setCrewS=
ize(Integer.parseInt(fieldEffortDescriptionCrewSize.getText()))'
+                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{EffortDescriptionImpl.class}' _method=3D'"CrewSize"'/>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell anchor=3D'east' fill=3D'none' weighty=3D'0.0'>
+                            <JLabel text=3D"isisfish.effortDescription.unitC=
ostOfFishing" enabled=3D'{isActif()}'/>
+                        </cell>
+                        <cell fill=3D'horizontal' weightx=3D'1.0' weighty=3D=
'0.0'>
+                            <!--NumberEditor id=3D'fieldEffortDescriptionUni=
tCostOfFishing' constructorParams=3D'this'
+                                          bean=3D'{getEffortDescription()}' =
property=3D'unitCostOfFishing'
+                                          enabled=3D'{isActif()}' decorator=
=3D'boxed' useSign=3D'true'
+                                          _bean=3D'{EffortDescriptionImpl.cl=
ass}' _method=3D'"UnitCostOfFishing"'/-->
+                            <JTextField id=3D"fieldEffortDescriptionUnitCost=
OfFishing" text=3D'{getEffortDescription().getUnitCostOfFishing()}'
+                            onKeyReleased=3D'getEffortDescription().setUnitC=
ostOfFishing(Double.parseDouble(fieldEffortDescriptionUnitCostOfFishing.getTe=
xt()))'
+                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{EffortDescriptionImpl.class}' _method=3D'"UnitCostOfFishing"'/>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell anchor=3D'east' fill=3D'none' weighty=3D'0.0'>
+                            <JLabel text=3D"isisfish.effortDescription.fixed=
CrewSalary" enabled=3D'{isActif()}'/>
+                        </cell>
+                        <cell fill=3D'horizontal' weightx=3D'1.0' weighty=3D=
'0.0'>
+                            <!--NumberEditor id=3D'fieldEffortDescriptionFix=
edCrewSalary' constructorParams=3D'this'
+                                          bean=3D'{getEffortDescription()}' =
property=3D'fixedCrewSalary'
+                                          enabled=3D'{isActif()}' decorator=
=3D'boxed' useSign=3D'true'
+                                          _bean=3D'{EffortDescriptionImpl.cl=
ass}' _method=3D'"FixedCrewSalary"'/-->
+                            <JTextField id=3D"fieldEffortDescriptionFixedCre=
wSalary" text=3D'{getEffortDescription().getFixedCrewSalary()}'
+                            onKeyReleased=3D'getEffortDescription().setFixed=
CrewSalary(Double.parseDouble(fieldEffortDescriptionFixedCrewSalary.getText()=
))'
+                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{EffortDescriptionImpl.class}' _method=3D'"FixedCrewSalary"'/>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell anchor=3D'east' fill=3D'none' weighty=3D'0.0'>
+                            <JLabel text=3D"isisfish.effortDescription.crewF=
oodCost" enabled=3D'{isActif()}'/>
+                        </cell>
+                        <cell fill=3D'horizontal' weightx=3D'1.0' weighty=3D=
'0.0'>
+                            <!--NumberEditor id=3D'fieldEffortDescriptionCre=
wFoodCost' constructorParams=3D'this'
+                                          bean=3D'{getEffortDescription()}' =
property=3D'crewFoodCost'
+                                          enabled=3D'{isActif()}' decorator=
=3D'boxed' useSign=3D'true'
+                                          _bean=3D'{EffortDescriptionImpl.cl=
ass}' _method=3D'"CrewFoodCost"'/-->
+                            <JTextField id=3D"fieldEffortDescriptionCrewFood=
Cost" text=3D'{getEffortDescription().getCrewFoodCost()}'
+                            onKeyReleased=3D'getEffortDescription().setCrewF=
oodCost(Double.parseDouble(fieldEffortDescriptionCrewFoodCost.getText()))'
+                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{EffortDescriptionImpl.class}' _method=3D'"CrewFoodCost"'/>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell anchor=3D'east' fill=3D'none' weighty=3D'0.0'>
+                            <JLabel text=3D"isisfish.effortDescription.crewS=
hareRate" enabled=3D'{isActif()}'/>
+                        </cell>
+                        <cell fill=3D'horizontal' weightx=3D'1.0' weighty=3D=
'0.0'>
+                            <!--NumberEditor id=3D'fieldEffortDescriptionCre=
wShareRate' constructorParams=3D'this'
+                                          bean=3D'{getEffortDescription()}' =
property=3D'crewShareRate'
+                                          enabled=3D'{isActif()}' decorator=
=3D'boxed' useSign=3D'true'
+                                          _bean=3D'{EffortDescriptionImpl.cl=
ass}' _method=3D'"CrewShareRate"'/-->
+                            <JTextField id=3D"fieldEffortDescriptionCrewShar=
eRate" text=3D'{getEffortDescription().getCrewShareRate()}'
+                            onKeyReleased=3D'getEffortDescription().setCrewS=
hareRate(Double.parseDouble(fieldEffortDescriptionCrewShareRate.getText()))'
+                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{EffortDescriptionImpl.class}' _method=3D'"CrewShareRate"'/>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell anchor=3D'east' fill=3D'none' weighty=3D'0.0'>
+                            <JLabel text=3D"isisfish.effortDescription.repai=
rAndMaintenanceGearCost" enabled=3D'{isActif()}'/>
+                        </cell>
+                        <cell fill=3D'horizontal' weightx=3D'1.0' weighty=3D=
'0.0'>
+                            <!--NumberEditor id=3D'fieldEffortDescriptionRep=
airAndMaintenanceGearCost' constructorParams=3D'this'
+                                          bean=3D'{getEffortDescription()}' =
property=3D'repairAndMaintenanceGearCost'
+                                          enabled=3D'{isActif()}' decorator=
=3D'boxed' _bean=3D'{EffortDescriptionImpl.class}'
+                                          _method=3D'"RepairAndMaintenanceGe=
arCost"' useSign=3D'true'/-->
+                            <JTextField id=3D"fieldEffortDescriptionRepairAn=
dMaintenanceGearCost" text=3D'{getEffortDescription().getRepairAndMaintenance=
GearCost()}'
+                            onKeyReleased=3D'getEffortDescription().setRepai=
rAndMaintenanceGearCost(Double.parseDouble(fieldEffortDescriptionRepairAndMai=
ntenanceGearCost.getText()))'
+                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{EffortDescriptionImpl.class}' _method=3D'"RepairAndMaintenanceGearCost"=
'/>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell anchor=3D'east' fill=3D'none' weighty=3D'0.0'>
+                            <JLabel text=3D"isisfish.effortDescription.landi=
ngCosts" enabled=3D'{isActif()}'/>
+                        </cell>
+                        <cell fill=3D'horizontal' weightx=3D'1.0' weighty=3D=
'0.0'>
+                            <!--NumberEditor id=3D'fieldEffortDescriptionLan=
dingCosts' constructorParams=3D'this'
+                                          bean=3D'{getEffortDescription()}' =
property=3D'landingCosts'
+                                          enabled=3D'{isActif()}' decorator=
=3D'boxed' useSign=3D'true'
+                                          _bean=3D'{EffortDescriptionImpl.cl=
ass}' _method=3D'"LandingCosts"'/-->
+                            <JTextField id=3D"fieldEffortDescriptionLandingC=
osts" text=3D'{getEffortDescription().getLandingCosts()}'
+                            onKeyReleased=3D'getEffortDescription().setLandi=
ngCosts(Double.parseDouble(fieldEffortDescriptionLandingCosts.getText()))'
+                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{EffortDescriptionImpl.class}' _method=3D'"LandingCosts"'/>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell anchor=3D'northeast' fill=3D'none' weighty=3D'=
1.0'>
+                            <JLabel text=3D"isisfish.effortDescription.other=
RunningCost" enabled=3D'{isActif()}'/>
+                        </cell>
+                        <cell anchor=3D'north' fill=3D'horizontal' weightx=
=3D'1.0' weighty=3D'1.0'>
+                            <!--NumberEditor id=3D'fieldEffortDescriptionOth=
erRunningCost' constructorParams=3D'this'
+                                          bean=3D'{getEffortDescription()}' =
property=3D'otherRunningCost'
+                                          enabled=3D'{isActif()}' decorator=
=3D'boxed' useSign=3D'true'
+                                          _bean=3D'{EffortDescriptionImpl.cl=
ass}' _method=3D'"OtherRunningCost"'/-->
+                            <JTextField id=3D"fieldEffortDescriptionOtherRun=
ningCost" text=3D'{getEffortDescription().getOtherRunningCost()}'
+                            onKeyReleased=3D'getEffortDescription().setOther=
RunningCost(Double.parseDouble(fieldEffortDescriptionOtherRunningCost.getText=
()))'
+                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{EffortDescriptionImpl.class}' _method=3D'"OtherRunningCost"'/>
+                        </cell>
+                    </row>
+                </Table>
+            </cell>
+        </row>
+        <row>
+            <cell fill=3D'horizontal' weightx=3D'0.3'>
+                <JButton id=3D'save' decorator=3D'boxed'/>
+            </cell>
+            <cell fill=3D'horizontal' weightx=3D'0.3'>
+                <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/EffortDe=
scriptionUI.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/EffortDescript=
ionUI.jaxx	2009-06-17 08:47:48 UTC (rev 2397)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescript=
ionUI.jaxx	2009-06-17 13:00:12 UTC (rev 2398)
@@ -22,70 +22,42 @@
     <!-- bean property -->
     <fr.ifremer.isisfish.entities.SetOfVesselsImpl id=3D'bean' javaBean=3D'n=
ull'/>
=20
-    <fr.ifremer.isisfish.entities.EffortDescriptionImpl id=3D'effortDescript=
ion' javaBean=3D'null'/>
-
-     <script><![CDATA[
+    <script><![CDATA[
+import java.util.ArrayList;
 import fr.ifremer.isisfish.entities.EffortDescription;
 import fr.ifremer.isisfish.entities.EffortDescriptionImpl;
 import fr.ifremer.isisfish.entities.SetOfVesselsImpl;
 import fr.ifremer.isisfish.entities.SetOfVessels;
 import fr.ifremer.isisfish.entities.Metier;
-import fr.ifremer.isisfish.types.TimeUnit;
-import javax.swing.event.ListSelectionListener;
-import javax.swing.event.ListSelectionEvent;
-import jaxx.runtime.swing.Item;
+import fr.ifremer.isisfish.ui.input.setofvessels.MetierListModel;
+import fr.ifremer.isisfish.ui.input.setofvessels.MetierListRenderer;
+import fr.ifremer.isisfish.ui.input.setofvessels.EffortDescriptionListModel;
+import fr.ifremer.isisfish.ui.input.setofvessels.EffortDescriptionListRender=
er;
=20
-addPropertyChangeListener("effortDescription", new PropertyChangeListener() {
-    public void propertyChange(PropertyChangeEvent evt) {
-        if (evt.getOldValue() !=3D null || evt.getNewValue() =3D=3D null) {
-            fieldEffortDescriptionFishingOperation.setText("");
-            fieldEffortDescriptionFishingOperationDuration.setText("");
-            fieldEffortDescriptionGearsNumberPerOperation.setText("");
-            fieldEffortDescriptionCrewSize.setText("");
-            fieldEffortDescriptionUnitCostOfFishing.setText("");
-            fieldEffortDescriptionFixedCrewSalary.setText("");
-            fieldEffortDescriptionCrewFoodCost.setText("");
-            fieldEffortDescriptionCrewShareRate.setText("");
-            fieldEffortDescriptionRepairAndMaintenanceGearCost.setText("");
-            fieldEffortDescriptionLandingCosts.setText("");
-            fieldEffortDescriptionOtherRunningCost.setText("");
-        }
-        if (evt.getNewValue() !=3D null) {
+/**
+ * Get input action from context.
+ */
+protected InputAction getInputAction() {
+    return getContextValue(InputAction.class);
+}
=20
-        }
-    }
-});
-
-fieldEffortDescriptionMetierList.addListSelectionListener(new ListSelectionL=
istener() {
-    public void valueChanged(ListSelectionEvent e) {
-        // active le bouton seulement si l'interface est active
-        // dans le cas de sensitivity par exemple
-        if(isActif()) {
-            buttonEffortDescriptionAdd.setEnabled(fieldEffortDescriptionMeti=
erList.getSelectedIndex() !=3D -1);
-        }
-    }
-});
-
-fieldEffortDescriptionEffortDescriptionList.addListSelectionListener(new Lis=
tSelectionListener() {
-    public void valueChanged(ListSelectionEvent e) {
-        // active le bouton seulement si l'interface est active
-        // dans le cas de sensitivity par exemple
-        if(isActif()) {
-            removeEffortDescriptionButton.setEnabled(fieldEffortDescriptionE=
ffortDescriptionList.getSelectedIndex() !=3D -1);
-        }
-    }
-});
-
 @Override
 public void refresh() {
     SetOfVessels setOfVessels =3D getVerifier().getEntity(SetOfVessels.class=
);
+   =20
+    // twice event for jaxx bindings detection
+    setBean(null);
     setBean((SetOfVesselsImpl) setOfVessels);
-    if (getBean() !=3D null){
-        if (getRegion().getMetier() !=3D null) {
-            fieldEffortDescriptionMetierList.fillList(getRegion().getMetier(=
), (Object)null);
-        }
-        setEffortDescriptionEffortDescriptionList();
+   =20
+    // fill available metier list
+    MetierListModel metierModel =3D (MetierListModel)fieldEffortDescriptionM=
etierList.getModel();
+    if (getBean() !=3D null) {
+        metierModel.setMetiers(getRegion().getMetier());
     }
+    else {
+        metierModel.setMetiers(null);
+    }
+    setEffortDescriptionEffortDescriptionList();
 }
=20
 @Override
@@ -94,250 +66,88 @@
     getVerifier().setCancelButton(cancel);
 }
=20
+protected void onFieldEffortDescriptionMetierListValueChanged() {
+    // active le bouton seulement si l'interface est active
+    // dans le cas de sensitivity par exemple
+    if (isActif()) {
+        buttonEffortDescriptionAdd.setEnabled(fieldEffortDescriptionMetierLi=
st.getSelectedIndex() !=3D -1);
+    }
+}
+
+protected void onFieldEffortDescriptionEffortDescriptionListValueChanged() {
+    // active le bouton seulement si l'interface est active
+    // dans le cas de sensitivity par exemple
+    if (isActif()) {
+        removeEffortDescriptionButton.setEnabled(fieldEffortDescriptionEffor=
tDescriptionList.getSelectedIndex() !=3D -1);
+    }
+}
+
 protected void setEffortDescriptionEffortDescriptionList() {
-    if (getBean().getPossibleMetiers() !=3D null){
-        java.util.List<Item> items =3D new ArrayList<Item>();
-        for (EffortDescription e : getBean().getPossibleMetiers()){
-            items.add(new Item(e.toString(), e.getPossibleMetiers().getName(=
), e, false));
-        }
-        fieldEffortDescriptionEffortDescriptionList.setItems(items);
+    EffortDescriptionListModel model =3D (EffortDescriptionListModel)fieldEf=
fortDescriptionEffortDescriptionList.getModel();
+    if (getBean() !=3D null) {
+        java.util.List<EffortDescription> effortDescriptions =3D new ArrayLi=
st<EffortDescription>(getBean().getPossibleMetiers());
+        model.setEffortDescriptions(effortDescriptions);
     }
+    else {
+        model.setEffortDescriptions(null);
+    }
 }
-protected void addEffortDescription() {
-     Object value =3D fieldEffortDescriptionMetierList.getSelectedValue();
-     if (value !=3D null){
-         Metier m =3D (Metier)value;
-         getContextValue(InputAction.class).addEffortDescription(getBean(), =
m);
-         setEffortDescriptionEffortDescriptionList();
+
+protected void addEffortDescriptions() {
+     Object[] selectedValues =3D (Object[])fieldEffortDescriptionMetierList.=
getSelectedValues();
+     for (Object selectedValue : selectedValues) {
+        Metier selectedMetier =3D (Metier)selectedValue;
+        getInputAction().addEffortDescription(getBean(), selectedMetier);
      }
+     setEffortDescriptionEffortDescriptionList();
 }
-protected void removeEffortDescription() {
-     Object value =3D fieldEffortDescriptionEffortDescriptionList.getSelecte=
dValue();
-     if (value !=3D null) {
-        EffortDescription e =3D (EffortDescription)value;
-        getContextValue(InputAction.class).removeEffortDescription(getBean()=
, e);
-        setEffortDescriptionEffortDescriptionList();
+protected void removeEffortDescriptions() {
+     Object[] selectedValues =3D (Object[])fieldEffortDescriptionEffortDescr=
iptionList.getSelectedValues();
+     for (Object selectedValue : selectedValues) {
+        EffortDescription selectedEffortDescription =3D (EffortDescription)s=
electedValue;
+        getInputAction().removeEffortDescription(getBean(), selectedEffortDe=
scription);
      }
+     setEffortDescriptionEffortDescriptionList();
+     fieldEffortDescriptionEffortDescriptionList.clearSelection(); // bug se=
lected index still exists
 }
-protected void effortDescriptionChanged() {
-    EffortDescriptionImpl selectedEffort =3D (EffortDescriptionImpl)fieldEff=
ortDescriptionEffortDescriptionList.getSelectedValue();
-    setEffortDescription(selectedEffort);
-
-    if (getEffortDescription() !=3D null) {
-        getVerifier().addCurrentEntity(getEffortDescription());
-       =20
-        /* NumberEditor is not working
-        fieldEffortDescriptionFishingOperation.init();
-        fieldEffortDescriptionGearsNumberPerOperation.init();
-        fieldEffortDescriptionCrewSize.init();
-        fieldEffortDescriptionUnitCostOfFishing.init();
-        fieldEffortDescriptionFixedCrewSalary.init();
-        fieldEffortDescriptionCrewFoodCost.init();
-        fieldEffortDescriptionCrewShareRate.init();
-        fieldEffortDescriptionRepairAndMaintenanceGearCost.init();
-        fieldEffortDescriptionLandingCosts.init();
-        fieldEffortDescriptionOtherRunningCost.init();*/
-    }
-}
     ]]>
     </script>
-    <Table id=3D'body'>
+    <Table>
         <row>
             <cell columns=3D'2' fill=3D'both' weightx=3D'1.0' weighty=3D'1.0=
'>
                 <JScrollPane>
-                    <JList id=3D"fieldEffortDescriptionMetierList" selection=
Mode=3D"0" enabled=3D'{isActif()}' decorator=3D'boxed' />
+                    <JList id=3D"fieldEffortDescriptionMetierList" selection=
Mode=3D"{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}"
+                        model=3D'{new MetierListModel()}' cellRenderer=3D'{n=
ew MetierListRenderer()}'
+                        onValueChanged=3D'onFieldEffortDescriptionMetierList=
ValueChanged()' enabled=3D'{isActif()}' decorator=3D'boxed' />
                 </JScrollPane>
             </cell>
         </row>
         <row>
-            <cell fill=3D'both' weightx=3D'0.5'>
-                <Table>
-                    <row>
-                        <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <JButton id=3D"buttonEffortDescriptionAdd" text=
=3D"isisfish.common.add" onActionPerformed=3D'addEffortDescription()' enabled=
=3D'false'/>
-                        </cell>
-                    </row>
-                    <row>
-                        <cell fill=3D'both' weightx=3D'1.0' weighty=3D'1.0'>
-                            <JScrollPane>
-                                <JList id=3D"fieldEffortDescriptionEffortDes=
criptionList" selectionMode=3D"0" onValueChanged=3D'effortDescriptionChanged(=
)' enabled=3D'{isActif()}'/>
-                            </JScrollPane>
-                        </cell>
-                    </row>
-                </Table>
+            <cell fill=3D'horizontal' weightx=3D'0.5'>
+                <JButton id=3D"buttonEffortDescriptionAdd" text=3D"isisfish.=
common.add" onActionPerformed=3D'addEffortDescriptions()' enabled=3D'false'
+                    decorator=3D'boxed' />
             </cell>
-            <cell fill=3D'both' weightx=3D'0.5'>
-                <Table>
-                    <row>
-                        <cell anchor=3D'east'>
-                            <JLabel text=3D"isisfish.effortDescription.fishi=
ngOperation" enabled=3D'{isActif()}'/>
-                        </cell>
-                        <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <!--NumberEditor id=3D'fieldEffortDescriptionFis=
hingOperation' constructorParams=3D'this'
-                                          bean=3D'{getEffortDescription()}' =
property=3D'fishingOperation'
-                                          enabled=3D'{isActif()}' decorator=
=3D'boxed' useSign=3D'true'
-                                          _bean=3D'{EffortDescriptionImpl.cl=
ass}' _method=3D'"FishingOperation"'/-->
-                            <JFormattedTextField id=3D"fieldEffortDescriptio=
nFishingOperation" text=3D'{getEffortDescription().getFishingOperation()}'
-                            onKeyReleased=3D'getEffortDescription().setFishi=
ngOperation(Integer.parseInt(fieldEffortDescriptionFishingOperation.getText()=
))'
-                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{EffortDescriptionImpl.class}' _method=3D'"FishingOperation"'/>
-                        </cell>
-                    </row>
-                    <row>
-                        <cell anchor=3D'east'>
-                            <JLabel text=3D"isisfish.effortDescription.fishi=
ngOperationDuration" enabled=3D'{isActif()}'/>
-                        </cell>
-                        <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <JTextField id=3D"fieldEffortDescriptionFishingO=
perationDuration"
-                            text=3D'{getEffortDescription().getFishingOperat=
ionDuration() =3D=3D null ? "" : getEffortDescription().getFishingOperationDu=
ration().getHour()}'
-                            toolTipText=3D"in hour" onKeyReleased=3D'getEffo=
rtDescription().setFishingOperationDuration(new TimeUnit(3600 * Double.parseD=
ouble(fieldEffortDescriptionFishingOperationDuration.getText())))'
-                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{EffortDescriptionImpl.class}' _method=3D'"FishingOperationDuration"'/>
-                        </cell>
-                    </row>
-                    <row>
-                        <cell anchor=3D'east'>
-                            <JLabel text=3D"isisfish.effortDescription.gears=
NumberPerOperation" enabled=3D'{isActif()}'/>
-                        </cell>
-                        <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <!--NumberEditor id=3D'fieldEffortDescriptionGea=
rsNumberPerOperation' constructorParams=3D'this'
-                                          bean=3D'{getEffortDescription()}' =
property=3D'gearsNumberPerOperation'
-                                          enabled=3D'{isActif()}' decorator=
=3D'boxed' useSign=3D'true'
-                                          _bean=3D'{EffortDescriptionImpl.cl=
ass}' _method=3D'"GearsNumberPerOperation"'/-->
-                            <JTextField id=3D"fieldEffortDescriptionGearsNum=
berPerOperation" text=3D'{getEffortDescription().getGearsNumberPerOperation()=
}'
-                            onKeyReleased=3D'getEffortDescription().setGears=
NumberPerOperation(Integer.parseInt(fieldEffortDescriptionGearsNumberPerOpera=
tion.getText()))'
-                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{EffortDescriptionImpl.class}' _method=3D'"GearsNumberPerOperation"'/>
-                        </cell>
-                    </row>
-                    <row>
-                        <cell anchor=3D'east'>
-                            <JLabel text=3D"isisfish.effortDescription.crewS=
ize" enabled=3D'{isActif()}'/>
-                        </cell>
-                        <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <!--NumberEditor id=3D'fieldEffortDescriptionCre=
wSize' constructorParams=3D'this'
-                                          bean=3D'{getEffortDescription()}' =
property=3D'crewSize'
-                                          enabled=3D'{isActif()}' decorator=
=3D'boxed' useSign=3D'true'
-                                          _bean=3D'{EffortDescriptionImpl.cl=
ass}' _method=3D'"CrewSize"'/-->
-                            <JTextField id=3D"fieldEffortDescriptionCrewSize=
" text=3D'{getEffortDescription().getCrewSize()}'
-                            onKeyReleased=3D'getEffortDescription().setCrewS=
ize(Integer.parseInt(fieldEffortDescriptionCrewSize.getText()))'
-                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{EffortDescriptionImpl.class}' _method=3D'"CrewSize"'/>
-                        </cell>
-                    </row>
-                    <row>
-                        <cell anchor=3D'east'>
-                            <JLabel text=3D"isisfish.effortDescription.unitC=
ostOfFishing" enabled=3D'{isActif()}'/>
-                        </cell>
-                        <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <!--NumberEditor id=3D'fieldEffortDescriptionUni=
tCostOfFishing' constructorParams=3D'this'
-                                          bean=3D'{getEffortDescription()}' =
property=3D'unitCostOfFishing'
-                                          enabled=3D'{isActif()}' decorator=
=3D'boxed' useSign=3D'true'
-                                          _bean=3D'{EffortDescriptionImpl.cl=
ass}' _method=3D'"UnitCostOfFishing"'/-->
-                            <JTextField id=3D"fieldEffortDescriptionUnitCost=
OfFishing" text=3D'{getEffortDescription().getUnitCostOfFishing()}'
-                            onKeyReleased=3D'getEffortDescription().setUnitC=
ostOfFishing(Double.parseDouble(fieldEffortDescriptionUnitCostOfFishing.getTe=
xt()))'
-                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{EffortDescriptionImpl.class}' _method=3D'"UnitCostOfFishing"'/>
-                        </cell>
-                    </row>
-                    <row>
-                        <cell anchor=3D'east'>
-                            <JLabel text=3D"isisfish.effortDescription.fixed=
CrewSalary" enabled=3D'{isActif()}'/>
-                        </cell>
-                        <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <!--NumberEditor id=3D'fieldEffortDescriptionFix=
edCrewSalary' constructorParams=3D'this'
-                                          bean=3D'{getEffortDescription()}' =
property=3D'fixedCrewSalary'
-                                          enabled=3D'{isActif()}' decorator=
=3D'boxed' useSign=3D'true'
-                                          _bean=3D'{EffortDescriptionImpl.cl=
ass}' _method=3D'"FixedCrewSalary"'/-->
-                            <JTextField id=3D"fieldEffortDescriptionFixedCre=
wSalary" text=3D'{getEffortDescription().getFixedCrewSalary()}'
-                            onKeyReleased=3D'getEffortDescription().setFixed=
CrewSalary(Double.parseDouble(fieldEffortDescriptionFixedCrewSalary.getText()=
))'
-                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{EffortDescriptionImpl.class}' _method=3D'"FixedCrewSalary"'/>
-                        </cell>
-                    </row>
-                    <row>
-                        <cell anchor=3D'east'>
-                            <JLabel text=3D"isisfish.effortDescription.crewF=
oodCost" enabled=3D'{isActif()}'/>
-                        </cell>
-                        <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <!--NumberEditor id=3D'fieldEffortDescriptionCre=
wFoodCost' constructorParams=3D'this'
-                                          bean=3D'{getEffortDescription()}' =
property=3D'crewFoodCost'
-                                          enabled=3D'{isActif()}' decorator=
=3D'boxed' useSign=3D'true'
-                                          _bean=3D'{EffortDescriptionImpl.cl=
ass}' _method=3D'"CrewFoodCost"'/-->
-                            <JTextField id=3D"fieldEffortDescriptionCrewFood=
Cost" text=3D'{getEffortDescription().getCrewFoodCost()}'
-                            onKeyReleased=3D'getEffortDescription().setCrewF=
oodCost(Double.parseDouble(fieldEffortDescriptionCrewFoodCost.getText()))'
-                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{EffortDescriptionImpl.class}' _method=3D'"CrewFoodCost"'/>
-                        </cell>
-                    </row>
-                    <row>
-                        <cell anchor=3D'east'>
-                            <JLabel text=3D"isisfish.effortDescription.crewS=
hareRate" enabled=3D'{isActif()}'/>
-                        </cell>
-                        <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <!--NumberEditor id=3D'fieldEffortDescriptionCre=
wShareRate' constructorParams=3D'this'
-                                          bean=3D'{getEffortDescription()}' =
property=3D'crewShareRate'
-                                          enabled=3D'{isActif()}' decorator=
=3D'boxed' useSign=3D'true'
-                                          _bean=3D'{EffortDescriptionImpl.cl=
ass}' _method=3D'"CrewShareRate"'/-->
-                            <JTextField id=3D"fieldEffortDescriptionCrewShar=
eRate" text=3D'{getEffortDescription().getCrewShareRate()}'
-                            onKeyReleased=3D'getEffortDescription().setCrewS=
hareRate(Double.parseDouble(fieldEffortDescriptionCrewShareRate.getText()))'
-                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{EffortDescriptionImpl.class}' _method=3D'"CrewShareRate"'/>
-                        </cell>
-                    </row>
-                    <row>
-                        <cell anchor=3D'east'>
-                            <JLabel text=3D"isisfish.effortDescription.repai=
rAndMaintenanceGearCost" enabled=3D'{isActif()}'/>
-                        </cell>
-                        <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <!--NumberEditor id=3D'fieldEffortDescriptionRep=
airAndMaintenanceGearCost' constructorParams=3D'this'
-                                          bean=3D'{getEffortDescription()}' =
property=3D'repairAndMaintenanceGearCost'
-                                          enabled=3D'{isActif()}' decorator=
=3D'boxed' _bean=3D'{EffortDescriptionImpl.class}'
-                                          _method=3D'"RepairAndMaintenanceGe=
arCost"' useSign=3D'true'/-->
-                            <JTextField id=3D"fieldEffortDescriptionRepairAn=
dMaintenanceGearCost" text=3D'{getEffortDescription().getRepairAndMaintenance=
GearCost()}'
-                            onKeyReleased=3D'getEffortDescription().setRepai=
rAndMaintenanceGearCost(Double.parseDouble(fieldEffortDescriptionRepairAndMai=
ntenanceGearCost.getText()))'
-                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{EffortDescriptionImpl.class}' _method=3D'"RepairAndMaintenanceGearCost"=
'/>
-                        </cell>
-                    </row>
-                    <row>
-                        <cell anchor=3D'east'>
-                            <JLabel text=3D"isisfish.effortDescription.landi=
ngCosts" enabled=3D'{isActif()}'/>
-                        </cell>
-                        <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <!--NumberEditor id=3D'fieldEffortDescriptionLan=
dingCosts' constructorParams=3D'this'
-                                          bean=3D'{getEffortDescription()}' =
property=3D'landingCosts'
-                                          enabled=3D'{isActif()}' decorator=
=3D'boxed' useSign=3D'true'
-                                          _bean=3D'{EffortDescriptionImpl.cl=
ass}' _method=3D'"LandingCosts"'/-->
-                            <JTextField id=3D"fieldEffortDescriptionLandingC=
osts" text=3D'{getEffortDescription().getLandingCosts()}'
-                            onKeyReleased=3D'getEffortDescription().setLandi=
ngCosts(Double.parseDouble(fieldEffortDescriptionLandingCosts.getText()))'
-                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{EffortDescriptionImpl.class}' _method=3D'"LandingCosts"'/>
-                        </cell>
-                    </row>
-                    <row>
-                        <cell anchor=3D'east'>
-                            <JLabel text=3D"isisfish.effortDescription.other=
RunningCost" enabled=3D'{isActif()}'/>
-                        </cell>
-                        <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <!--NumberEditor id=3D'fieldEffortDescriptionOth=
erRunningCost' constructorParams=3D'this'
-                                          bean=3D'{getEffortDescription()}' =
property=3D'otherRunningCost'
-                                          enabled=3D'{isActif()}' decorator=
=3D'boxed' useSign=3D'true'
-                                          _bean=3D'{EffortDescriptionImpl.cl=
ass}' _method=3D'"OtherRunningCost"'/-->
-                            <JTextField id=3D"fieldEffortDescriptionOtherRun=
ningCost" text=3D'{getEffortDescription().getOtherRunningCost()}'
-                            onKeyReleased=3D'getEffortDescription().setOther=
RunningCost(Double.parseDouble(fieldEffortDescriptionOtherRunningCost.getText=
()))'
-                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{EffortDescriptionImpl.class}' _method=3D'"OtherRunningCost"'/>
-                        </cell>
-                    </row>
-                    <row>
-                        <cell columns=3D'2' fill=3D'horizontal' weightx=3D'1=
.0'>
-                            <Table>
-                                <row>
-                                    <cell fill=3D'horizontal' weightx=3D'0.3=
'>
-                                        <JButton id=3D'save' decorator=3D'bo=
xed'/>
-                                    </cell>
-                                    <cell fill=3D'horizontal' weightx=3D'0.3=
'>
-                                        <JButton id=3D'cancel' decorator=3D'=
boxed'/>
-                                    </cell>
-                                    <cell fill=3D'horizontal' weightx=3D'0.3=
'>
-                                        <JButton id=3D'removeEffortDescripti=
onButton' text=3D"isisfish.common.remove" onActionPerformed=3D'removeEffortDe=
scription()' enabled=3D'false' decorator=3D'boxed'/>
-                                    </cell>
-                                </row>
-                            </Table>
-                        </cell>
-                    </row>
-                </Table>
+            <cell fill=3D'horizontal' weightx=3D'0.5'>
+                <JButton id=3D'removeEffortDescriptionButton' text=3D"isisfi=
sh.common.remove" onActionPerformed=3D'removeEffortDescriptions()'
+                    enabled=3D'false' decorator=3D'boxed' />
             </cell>
         </row>
+        <row>
+            <cell columns=3D'2' fill=3D'both' weightx=3D'1.0' weighty=3D'1.0=
'>
+                <JScrollPane>
+                    <JList id=3D"fieldEffortDescriptionEffortDescriptionList=
" selectionMode=3D"{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTIO=
N}"
+                        model=3D'{new EffortDescriptionListModel()}' cellRen=
derer=3D'{new EffortDescriptionListRenderer()}'
+                        onValueChanged=3D'onFieldEffortDescriptionEffortDesc=
riptionListValueChanged()' enabled=3D'{isActif()}' decorator=3D'boxed' />
+                </JScrollPane>
+            </cell>
+        </row>
+        <row>
+            <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>

Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesse=
lsBasicsUI.jaxx (from rev 2393, isis-fish/trunk/src/main/java/fr/ifremer/isis=
fish/ui/input/SetOfVesselsTabsUI.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	                        (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBa=
sicsUI.jaxx	2009-06-17 13:00:12 UTC (rev 2398)
@@ -0,0 +1,183 @@
+<!--
+/* *##%
+ * Copyright (C) 2005 - 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.
+ *##%*/
+ -->
+
+<fr.ifremer.isisfish.ui.input.InputContentUI>
+
+    <!-- bean property -->
+    <fr.ifremer.isisfish.entities.SetOfVesselsImpl id=3D'bean' javaBean=3D'n=
ull'/>
+
+     <script><![CDATA[
+
+import org.codelutin.topia.TopiaException;
+import fr.ifremer.isisfish.entities.Port;
+import fr.ifremer.isisfish.entities.Equation;
+import fr.ifremer.isisfish.entities.VesselType;
+import fr.ifremer.isisfish.entities.Formule;
+import fr.ifremer.isisfish.entities.SetOfVessels;
+import jaxx.runtime.swing.editor.NumberEditor;
+import fr.ifremer.isisfish.entities.SetOfVesselsImpl;
+
+boolean init =3D false;
+
+ at Override
+public void refresh() {
+    SetOfVessels setOfVessels =3D (SetOfVessels)getVerifier().getEntity(SetO=
fVessels.class);
+
+    // add null before, for second to be considered as a changed event
+    // otherwize, setBean has no effect
+    setBean(null);
+    setBean((SetOfVesselsImpl) setOfVessels);
+
+    if (getBean() !=3D null) {
+        init =3D true;
+        jaxx.runtime.SwingUtil.fillComboBox(fieldSetOfVesselsPort,getRegion(=
).getPort(), getBean().getPort(), true);
+        jaxx.runtime.SwingUtil.fillComboBox(fieldSetOfVesselsVesselType,getR=
egion().getVesselType(), getBean().getVesselType(), true);
+        init=3Dfalse;
+        getVerifier().addCurrentPanel(technicalEfficiency);
+       =20
+        // NumberEditor is not working
+        //fieldSetOfVesselsNumberOfVessels.init();
+        //fieldSetOfVesselsFixedCosts.init();
+    }
+}
+
+ at Override
+public void setActionButtons() {
+    getVerifier().setSaveButton(save);
+    getVerifier().setCancelButton(cancel);
+    getVerifier().setNewButton(create, "SetOfVessels");
+    getVerifier().setDeleteButton(remove);
+}
+
+protected void portChanged() {
+    if (!init) {
+        getBean().setPort((Port)fieldSetOfVesselsPort.getSelectedItem());
+    }
+}
+protected void vesselTypeChanged() {
+    if (!init) {
+        getBean().setVesselType((VesselType)fieldSetOfVesselsVesselType.getS=
electedItem());
+    }
+}
+    ]]>
+    </script>
+    <Table id=3D'body'>
+        <row>
+            <cell fill=3D'both' weightx=3D'1.0' weighty=3D'1.0'>
+                <Table>
+                    <row>
+                        <cell anchor=3D'east'>
+                            <JLabel text=3D"isisfish.setOfVessels.name" enab=
led=3D'{isActif()}'/>
+                        </cell>
+                        <cell fill=3D'horizontal' weightx=3D'1.0'>
+                            <JTextField id=3D"fieldSetOfVesselsName" text=3D=
'{getBean().getName()}' onKeyReleased=3D'getBean().setName(fieldSetOfVesselsN=
ame.getText())' enabled=3D'{isActif()}' decorator=3D'boxed'/>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell anchor=3D'east'>
+                            <JLabel text=3D"isisfish.common.port" enabled=3D=
'{isActif()}'/>
+                        </cell>
+                        <cell fill=3D'horizontal' weightx=3D'1.0'>
+                            <JComboBox id=3D"fieldSetOfVesselsPort" onAction=
Performed=3D'portChanged()' enabled=3D'{isActif()}' decorator=3D'boxed'/>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell anchor=3D'east'>
+                            <JLabel text=3D"isisfish.setOfVessels.vesselType=
" enabled=3D'{isActif()}'/>
+                        </cell>
+                        <cell fill=3D'horizontal' weightx=3D'1.0'>
+                            <JComboBox id=3D"fieldSetOfVesselsVesselType" on=
ActionPerformed=3D'vesselTypeChanged()' enabled=3D'{isActif()}' decorator=3D'=
boxed'/>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell anchor=3D'east'>
+                            <JLabel text=3D"isisfish.setOfVessels.numberOfVe=
ssels" enabled=3D'{isActif()}'/>
+                        </cell>
+                        <cell fill=3D'horizontal' weightx=3D'1.0'>
+                            <!--NumberEditor id=3D'fieldSetOfVesselsNumberOf=
Vessels' constructorParams=3D'this'
+                                          bean=3D'{getBean()}' property=3D'n=
umberOfVessels'
+                                          enabled=3D'{isActif()}' decorator=
=3D'boxed' useSign=3D'true'
+                                          _bean=3D'{SetOfVesselsImpl.class}'=
 _method=3D'"NumberOfVessels"'/-->
+                            <JTextField id=3D"fieldSetOfVesselsNumberOfVesse=
ls" text=3D'{getBean().getNumberOfVessels()}'
+                            onKeyReleased=3D'getBean().setNumberOfVessels(In=
teger.parseInt(fieldSetOfVesselsNumberOfVessels.getText()))'
+                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{SetOfVesselsImpl.class}' _method=3D'"NumberOfVessels"'/>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell anchor=3D'east'>
+                            <JLabel text=3D"isisfish.setOfVessels.fixedCosts=
" enabled=3D'{isActif()}'/>
+                        </cell>
+                        <cell fill=3D'horizontal' weightx=3D'1.0'>
+                            <!--NumberEditor id=3D'fieldSetOfVesselsFixedCos=
ts' constructorParams=3D'this'
+                                          bean=3D'{getBean()}' property=3D'f=
ixedCosts'
+                                          enabled=3D'{isActif()}' decorator=
=3D'boxed' useSign=3D'true'
+                                          _bean=3D'{SetOfVesselsImpl.class}'=
 _method=3D'"FixedCosts"'/-->
+                            <JTextField id=3D"fieldSetOfVesselsFixedCosts" t=
ext=3D'{getBean().getFixedCosts()}'
+                            onKeyReleased=3D'getBean().setFixedCosts(Double.=
parseDouble(fieldSetOfVesselsFixedCosts.getText()))'
+                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{SetOfVesselsImpl.class}' _method=3D'"FixedCosts"'/>
+                        </cell>
+                    </row>
+                    <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'
+                                clazz=3D'{fr.ifremer.isisfish.equation.SoVTe=
chnicalEfficiencyEquation.class}'
+                                decorator=3D'boxed' _bean=3D'{SetOfVesselsIm=
pl.class}' _method=3D'"TechnicalEfficiencyEquation"'/>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell anchor=3D'east'>
+                            <JLabel text=3D"isisfish.setOfVessels.comments" =
enabled=3D'{isActif()}'/>
+                        </cell>
+                        <cell fill=3D'both' weightx=3D'1.0' weighty=3D'0.3'>
+                            <JScrollPane>
+                                <JTextArea id=3D"fieldSetOfVesselsComment" t=
ext=3D'{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}'
+                                onKeyReleased=3D'getBean().setComment(fieldS=
etOfVesselsComment.getText())' enabled=3D'{isActif()}' decorator=3D'boxed'/>
+                            </JScrollPane>
+                        </cell>
+                    </row>
+                </Table>
+            </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' decorator=3D'boxed'/>
+                        </cell>
+                        <cell fill=3D'horizontal' weightx=3D'1.0'>
+                            <JButton id=3D'cancel' decorator=3D'boxed'/>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell fill=3D'horizontal' weightx=3D'1.0'>
+                            <JButton id=3D'create' decorator=3D'boxed'/>
+                        </cell>
+                        <cell fill=3D'horizontal' weightx=3D'1.0'>
+                            <JButton id=3D'remove' decorator=3D'boxed'/>
+                        </cell>
+                    </row>
+                </Table>
+            </cell>
+        </row>
+    </Table>
+</fr.ifremer.isisfish.ui.input.InputContentUI>

Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVess=
elsTabsUI.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/SetOfVesselsTa=
bsUI.jaxx	2009-06-17 08:47:48 UTC (rev 2397)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTa=
bsUI.jaxx	2009-06-17 13:00:12 UTC (rev 2398)
@@ -1,183 +0,0 @@
-<!--
-/* *##%
- * Copyright (C) 2005 - 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.
- *##%*/
- -->
-
-<fr.ifremer.isisfish.ui.input.InputContentUI>
-
-    <!-- bean property -->
-    <fr.ifremer.isisfish.entities.SetOfVesselsImpl id=3D'bean' javaBean=3D'n=
ull'/>
-
-     <script><![CDATA[
-
-import org.codelutin.topia.TopiaException;
-import fr.ifremer.isisfish.entities.Port;
-import fr.ifremer.isisfish.entities.Equation;
-import fr.ifremer.isisfish.entities.VesselType;
-import fr.ifremer.isisfish.entities.Formule;
-import fr.ifremer.isisfish.entities.SetOfVessels;
-import jaxx.runtime.swing.editor.NumberEditor;
-import fr.ifremer.isisfish.entities.SetOfVesselsImpl;
-
-boolean init =3D false;
-
- at Override
-public void refresh() {
-    SetOfVessels setOfVessels =3D (SetOfVessels)getVerifier().getEntity(SetO=
fVessels.class);
-
-    // add null before, for second to be considered as a changed event
-    // otherwize, setBean has no effect
-    setBean(null);
-    setBean((SetOfVesselsImpl) setOfVessels);
-
-    if (getBean() !=3D null) {
-        init =3D true;
-        jaxx.runtime.SwingUtil.fillComboBox(fieldSetOfVesselsPort,getRegion(=
).getPort(), getBean().getPort(), true);
-        jaxx.runtime.SwingUtil.fillComboBox(fieldSetOfVesselsVesselType,getR=
egion().getVesselType(), getBean().getVesselType(), true);
-        init=3Dfalse;
-        getVerifier().addCurrentPanel(technicalEfficiency);
-       =20
-        // NumberEditor is not working
-        //fieldSetOfVesselsNumberOfVessels.init();
-        //fieldSetOfVesselsFixedCosts.init();
-    }
-}
-
- at Override
-public void setActionButtons() {
-    getVerifier().setSaveButton(save);
-    getVerifier().setCancelButton(cancel);
-    getVerifier().setNewButton(create, "SetOfVessels");
-    getVerifier().setDeleteButton(remove);
-}
-
-protected void portChanged() {
-    if (!init) {
-        getBean().setPort((Port)fieldSetOfVesselsPort.getSelectedItem());
-    }
-}
-protected void vesselTypeChanged() {
-    if (!init) {
-        getBean().setVesselType((VesselType)fieldSetOfVesselsVesselType.getS=
electedItem());
-    }
-}
-    ]]>
-    </script>
-    <Table id=3D'body'>
-        <row>
-            <cell fill=3D'both' weightx=3D'1.0' weighty=3D'1.0'>
-                <Table>
-                    <row>
-                        <cell anchor=3D'east'>
-                            <JLabel text=3D"isisfish.setOfVessels.name" enab=
led=3D'{isActif()}'/>
-                        </cell>
-                        <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <JTextField id=3D"fieldSetOfVesselsName" text=3D=
'{getBean().getName()}' onKeyReleased=3D'getBean().setName(fieldSetOfVesselsN=
ame.getText())' enabled=3D'{isActif()}' decorator=3D'boxed'/>
-                        </cell>
-                    </row>
-                    <row>
-                        <cell anchor=3D'east'>
-                            <JLabel text=3D"isisfish.common.port" enabled=3D=
'{isActif()}'/>
-                        </cell>
-                        <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <JComboBox id=3D"fieldSetOfVesselsPort" onAction=
Performed=3D'portChanged()' enabled=3D'{isActif()}' decorator=3D'boxed'/>
-                        </cell>
-                    </row>
-                    <row>
-                        <cell anchor=3D'east'>
-                            <JLabel text=3D"isisfish.setOfVessels.vesselType=
" enabled=3D'{isActif()}'/>
-                        </cell>
-                        <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <JComboBox id=3D"fieldSetOfVesselsVesselType" on=
ActionPerformed=3D'vesselTypeChanged()' enabled=3D'{isActif()}' decorator=3D'=
boxed'/>
-                        </cell>
-                    </row>
-                    <row>
-                        <cell anchor=3D'east'>
-                            <JLabel text=3D"isisfish.setOfVessels.numberOfVe=
ssels" enabled=3D'{isActif()}'/>
-                        </cell>
-                        <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <!--NumberEditor id=3D'fieldSetOfVesselsNumberOf=
Vessels' constructorParams=3D'this'
-                                          bean=3D'{getBean()}' property=3D'n=
umberOfVessels'
-                                          enabled=3D'{isActif()}' decorator=
=3D'boxed' useSign=3D'true'
-                                          _bean=3D'{SetOfVesselsImpl.class}'=
 _method=3D'"NumberOfVessels"'/-->
-                            <JTextField id=3D"fieldSetOfVesselsNumberOfVesse=
ls" text=3D'{getBean().getNumberOfVessels()}'
-                            onKeyReleased=3D'getBean().setNumberOfVessels(In=
teger.parseInt(fieldSetOfVesselsNumberOfVessels.getText()))'
-                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{SetOfVesselsImpl.class}' _method=3D'"NumberOfVessels"'/>
-                        </cell>
-                    </row>
-                    <row>
-                        <cell anchor=3D'east'>
-                            <JLabel text=3D"isisfish.setOfVessels.fixedCosts=
" enabled=3D'{isActif()}'/>
-                        </cell>
-                        <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <!--NumberEditor id=3D'fieldSetOfVesselsFixedCos=
ts' constructorParams=3D'this'
-                                          bean=3D'{getBean()}' property=3D'f=
ixedCosts'
-                                          enabled=3D'{isActif()}' decorator=
=3D'boxed' useSign=3D'true'
-                                          _bean=3D'{SetOfVesselsImpl.class}'=
 _method=3D'"FixedCosts"'/-->
-                            <JTextField id=3D"fieldSetOfVesselsFixedCosts" t=
ext=3D'{getBean().getFixedCosts()}'
-                            onKeyReleased=3D'getBean().setFixedCosts(Double.=
parseDouble(fieldSetOfVesselsFixedCosts.getText()))'
-                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{SetOfVesselsImpl.class}' _method=3D'"FixedCosts"'/>
-                        </cell>
-                    </row>
-                    <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'
-                                clazz=3D'{fr.ifremer.isisfish.equation.SoVTe=
chnicalEfficiencyEquation.class}'
-                                decorator=3D'boxed' _bean=3D'{SetOfVesselsIm=
pl.class}' _method=3D'"TechnicalEfficiencyEquation"'/>
-                        </cell>
-                    </row>
-                    <row>
-                        <cell anchor=3D'east'>
-                            <JLabel text=3D"isisfish.setOfVessels.comments" =
enabled=3D'{isActif()}'/>
-                        </cell>
-                        <cell fill=3D'both' weightx=3D'1.0' weighty=3D'0.3'>
-                            <JScrollPane>
-                                <JTextArea id=3D"fieldSetOfVesselsComment" t=
ext=3D'{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}'
-                                onKeyReleased=3D'getBean().setComment(fieldS=
etOfVesselsComment.getText())' enabled=3D'{isActif()}' decorator=3D'boxed'/>
-                            </JScrollPane>
-                        </cell>
-                    </row>
-                </Table>
-            </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' decorator=3D'boxed'/>
-                        </cell>
-                        <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <JButton id=3D'cancel' decorator=3D'boxed'/>
-                        </cell>
-                    </row>
-                    <row>
-                        <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <JButton id=3D'create' decorator=3D'boxed'/>
-                        </cell>
-                        <cell fill=3D'horizontal' weightx=3D'1.0'>
-                            <JButton id=3D'remove' decorator=3D'boxed'/>
-                        </cell>
-                    </row>
-                </Table>
-            </cell>
-        </row>
-    </Table>
-</fr.ifremer.isisfish.ui.input.InputContentUI>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVes=
selsUI.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/SetOfVesselsUI=
.jaxx	2009-06-17 08:47:48 UTC (rev 2397)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI=
.jaxx	2009-06-17 13:00:12 UTC (rev 2398)
@@ -31,7 +31,7 @@
     // (depends on sensitivity can't be done on constructor)
     installChangeListener(setOfVesselsTab);
=20
-    getVerifier().addCurrentPanel(setOfVesselsTabsUI, effortDescriptionUI);
+    getVerifier().addCurrentPanel(setOfVesselsBasicsUI, effortDescriptionUI,=
 effortParametersUI);
 }
=20
 @Override
@@ -41,13 +41,16 @@
 }
     ]]></script>
     <JPanel layout=3D'{new BorderLayout()}'>
-        <JTabbedPane id=3D"setOfVesselsTab" name=3D"SetOfVessels" constraint=
s=3D'BorderLayout.CENTER'>
+        <JTabbedPane id=3D"setOfVesselsTab" constraints=3D'BorderLayout.CENT=
ER'>
             <tab title=3D'{_("isisfish.setOfVessels.title")}'>
-                <SetOfVesselsTabsUI id=3D'setOfVesselsTabsUI' constructorPar=
ams=3D'this'/>
+                <SetOfVesselsBasicsUI id=3D'setOfVesselsBasicsUI' constructo=
rParams=3D'this'/>
             </tab>
             <tab title=3D'{_("isisfish.effortDescription.title")}'>
                 <EffortDescriptionUI id=3D'effortDescriptionUI' constructorP=
arams=3D'this'/>
             </tab>
+            <tab title=3D'{_("isisfish.effortDescription.parametersTitle")}'>
+                <EffortDescriptionParametersUI id=3D'effortParametersUI' con=
structorParams=3D'this'/>
+            </tab>
         </JTabbedPane>
     </JPanel>
 </fr.ifremer.isisfish.ui.input.InputContentUI>

Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessel=
s/EffortDescriptionListModel.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/setofvessels/E=
ffortDescriptionListModel.java	                        (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/E=
ffortDescriptionListModel.java	2009-06-17 13:00:12 UTC (rev 2398)
@@ -0,0 +1,100 @@
+/* *##%
+ * 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.setofvessels;
+
+import java.util.List;
+
+import javax.swing.DefaultListModel;
+
+import fr.ifremer.isisfish.entities.EffortDescription;
+
+/**
+ * Model pour la liste des metiers de l'interface SetOfVessels.
+ *
+ * @author chatellier
+ * @version $Revision$
+ *=20
+ * Last update : $Date$
+ * By : $Author$
+ */
+public class EffortDescriptionListModel extends DefaultListModel {
+
+    /** serialVersionUID. */
+    private static final long serialVersionUID =3D -2715181950778932871L;
+   =20
+    /** Listes des EffortDescription */
+    protected List<EffortDescription> effortDescriptions;
+
+    /**
+     * Empty constructor.
+     */
+    public EffortDescriptionListModel() {
+        this(null);
+    }
+
+    /**
+     * Constructor with effortDescriptions list.
+     *=20
+     * @param effortDescriptions liste des effortDescriptions
+     */
+    public EffortDescriptionListModel(List<EffortDescription> effortDescript=
ions) {
+        super();
+        setEffortDescriptions(effortDescriptions);
+    }
+
+    /**
+     * Get effortDescriptions lists.
+     *=20
+     * @return the effortDescriptions
+     */
+    public List<EffortDescription> getEffortDescriptions() {
+        return effortDescriptions;
+    }
+
+    /**
+     * Set effortDescriptions list.
+     *=20
+     * @param effortDescriptions the effortDescriptions list to set
+     */
+    public void setEffortDescriptions(List<EffortDescription> effortDescript=
ions) {
+        this.effortDescriptions =3D effortDescriptions;
+        fireContentsChanged(this, 0, getSize());
+    }
+
+    /*
+     * @see javax.swing.ListModel#getElementAt(int)
+     */
+    @Override
+    public Object getElementAt(int index) {
+        return effortDescriptions.get(index);
+    }
+
+    /*
+     * @see javax.swing.ListModel#getSize()
+     */
+    @Override
+    public int getSize() {
+        int size =3D 0;
+
+        if (effortDescriptions !=3D null) {
+            size =3D effortDescriptions.size();
+        }
+        return size;
+    }
+}


Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/inp=
ut/setofvessels/EffortDescriptionListModel.java
___________________________________________________________________
Name: svn:keywords
   + Date Author Revision

Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessel=
s/EffortDescriptionListRenderer.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/setofvessels/E=
ffortDescriptionListRenderer.java	                        (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/E=
ffortDescriptionListRenderer.java	2009-06-17 13:00:12 UTC (rev 2398)
@@ -0,0 +1,60 @@
+/* *##%
+ * 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.setofvessels;
+
+import java.awt.Component;
+
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.JLabel;
+import javax.swing.JList;
+
+import fr.ifremer.isisfish.entities.EffortDescription;
+
+/**
+ * Renderer pour liste des {@link EffortDescription}.
+ *
+ * @author chatellier
+ * @version $Revision$
+ *=20
+ * Last update : $Date$
+ * By : $Author$
+ */
+public class EffortDescriptionListRenderer extends DefaultListCellRenderer {
+
+    /** serialVersionUID. */
+    private static final long serialVersionUID =3D 1113492654780402245L;
+
+    /*
+     * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.=
swing.JList, java.lang.Object, int, boolean, boolean)
+     */
+    @Override
+    public Component getListCellRendererComponent(JList list, Object value,
+            int index, boolean isSelected, boolean cellHasFocus) {
+
+        // this must be used to have alterned highlight rows and default
+        // selection color
+        JLabel c =3D (JLabel) super.getListCellRendererComponent(list, value,
+                index, isSelected, cellHasFocus);
+
+        EffortDescription effort =3D (EffortDescription) value;
+        c.setText(effort.getPossibleMetiers().getName());
+
+        return c;
+    }
+}


Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/inp=
ut/setofvessels/EffortDescriptionListRenderer.java
___________________________________________________________________
Name: svn:keywords
   + Date Author Revision

Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessel=
s/MetierListModel.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/setofvessels/M=
etierListModel.java	                        (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/M=
etierListModel.java	2009-06-17 13:00:12 UTC (rev 2398)
@@ -0,0 +1,100 @@
+/* *##%
+ * 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.setofvessels;
+
+import java.util.List;
+
+import javax.swing.DefaultListModel;
+
+import fr.ifremer.isisfish.entities.Metier;
+
+/**
+ * Model pour la liste des metiers de l'interface SetOfVessels.
+ *
+ * @author chatellier
+ * @version $Revision$
+ *=20
+ * Last update : $Date$
+ * By : $Author$
+ */
+public class MetierListModel extends DefaultListModel {
+
+    /** serialVersionUID. */
+    private static final long serialVersionUID =3D -2715181950778932871L;
+   =20
+    /** Listes des metiers */
+    protected List<Metier> metiers;
+
+    /**
+     * Empty constructor.
+     */
+    public MetierListModel() {
+        this(null);
+    }
+
+    /**
+     * Constructor with metiers list.
+     *=20
+     * @param metiers liste des metiers
+     */
+    public MetierListModel(List<Metier> metiers) {
+        super();
+        setMetiers(metiers);
+    }
+
+    /**
+     * Get metiers list.
+     *=20
+     * @return the metiers list
+     */
+    public List<Metier> getMetiers() {
+        return metiers;
+    }
+
+    /**
+     * Set metiers list.
+     *=20
+     * @param metiers the metiers list to set
+     */
+    public void setMetiers(List<Metier> metiers) {
+        this.metiers =3D metiers;
+        fireContentsChanged(this, 0, getSize());
+    }
+
+    /*
+     * @see javax.swing.ListModel#getElementAt(int)
+     */
+    @Override
+    public Object getElementAt(int index) {
+        return metiers.get(index);
+    }
+
+    /*
+     * @see javax.swing.ListModel#getSize()
+     */
+    @Override
+    public int getSize() {
+        int size =3D 0;
+
+        if (metiers !=3D null) {
+            size =3D metiers.size();
+        }
+        return size;
+    }
+}


Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/inp=
ut/setofvessels/MetierListModel.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Revision

Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessel=
s/MetierListRenderer.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/setofvessels/M=
etierListRenderer.java	                        (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/setofvessels/M=
etierListRenderer.java	2009-06-17 13:00:12 UTC (rev 2398)
@@ -0,0 +1,60 @@
+/* *##%
+ * 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.setofvessels;
+
+import java.awt.Component;
+
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.JLabel;
+import javax.swing.JList;
+
+import fr.ifremer.isisfish.entities.Metier;
+
+/**
+ * Renderer pour liste des metiers.
+ *
+ * @author chatellier
+ * @version $Revision$
+ *=20
+ * Last update : $Date$
+ * By : $Author$
+ */
+public class MetierListRenderer extends DefaultListCellRenderer {
+
+    /** serialVersionUID. */
+    private static final long serialVersionUID =3D 1113492654780402245L;
+
+    /*
+     * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.=
swing.JList, java.lang.Object, int, boolean, boolean)
+     */
+    @Override
+    public Component getListCellRendererComponent(JList list, Object value,
+            int index, boolean isSelected, boolean cellHasFocus) {
+
+        // this must be used to have alterned highlight rows and default
+        // selection color
+        JLabel c =3D (JLabel) super.getListCellRendererComponent(list, value,
+                index, isSelected, cellHasFocus);
+
+        Metier metier =3D (Metier) value;
+        c.setText(metier.getName());
+
+        return c;
+    }
+}


Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/inp=
ut/setofvessels/MetierListRenderer.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Revision

Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/resources/i18n/isis-fish-en_GB.properties	2009-0=
6-17 08:47:48 UTC (rev 2397)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties	2009-0=
6-17 13:00:12 UTC (rev 2398)
@@ -218,19 +218,23 @@
 isisfish.dataResult.scrolledwindow2=3DdefaultToolTip-fr.ifremer.resultat.Dat=
aResult.scrolledwindow2
 isisfish.dataResult.table2=3DdefaultToolTip-fr.ifremer.resultat.DataResult.t=
able2
 isisfish.date.toString=3D%1$s %2$s
-isisfish.effortDescription.crewFoodCost=3Disisfish.effortDescription.crewFoo=
dCost
-isisfish.effortDescription.crewShareRate=3Disisfish.effortDescription.crewSh=
areRate
-isisfish.effortDescription.crewSize=3Disisfish.effortDescription.crewSize
-isisfish.effortDescription.fishingOperation=3Disisfish.effortDescription.fis=
hingOperation
-isisfish.effortDescription.fishingOperationDuration=3Disisfish.effortDescrip=
tion.fishingOperationDuration
-isisfish.effortDescription.fixedCrewSalary=3Disisfish.effortDescription.fixe=
dCrewSalary
-isisfish.effortDescription.gearsNumberPerOperation=3Disisfish.effortDescript=
ion.gearsNumberPerOperation
-isisfish.effortDescription.landingCosts=3Disisfish.effortDescription.landing=
Costs
-isisfish.effortDescription.otherRunningCost=3Disisfish.effortDescription.oth=
erRunningCost
-isisfish.effortDescription.repairAndMaintenanceGearCost=3Disisfish.effortDes=
cription.repairAndMaintenanceGearCost
-isisfish.effortDescription.title=3Disisfish.effortDescription.title
+isisfish.effortDescription.crewFoodCost=3DCrew food cost
+isisfish.effortDescription.crewShareRate=3DCrew share rate
+isisfish.effortDescription.crewSize=3DCrew size
+isisfish.effortDescription.economicTitle=3D\u00C9conomiques parameters
+isisfish.effortDescription.effortTitle=3DFishing effort parameters
+isisfish.effortDescription.fishingOperation=3DFishing operation
+isisfish.effortDescription.fishingOperationDuration=3DFishing operation dura=
tion
+isisfish.effortDescription.fishingOperationDuration.tooltip=3DIn hours
+isisfish.effortDescription.fixedCrewSalary=3DFixed crew salary
+isisfish.effortDescription.gearsNumberPerOperation=3DGears number per operat=
ion
+isisfish.effortDescription.landingCosts=3DLanding costs
+isisfish.effortDescription.otherRunningCost=3DOther running cost
+isisfish.effortDescription.parametersTitle=3DM\u00E9tiers parameters
+isisfish.effortDescription.repairAndMaintenanceGearCost=3DRepair and mainten=
ance gear cost
+isisfish.effortDescription.title=3DPracticed metier
 isisfish.effortDescription.toString=3DEffortDescription for %1$s with %2$s
-isisfish.effortDescription.unitCostOfFishing=3Disisfish.effortDescription.un=
itCostOfFishing
+isisfish.effortDescription.unitCostOfFishing=3DFishing unit cost
 isisfish.equation.editor.title=3DEquation Editor
 isisfish.error.acceptable.population=3DNew value isn't acceptable value for =
this population
 isisfish.error.add.card=3DError while adding of result to the map.

Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/resources/i18n/isis-fish-fr_FR.properties	2009-0=
6-17 08:47:48 UTC (rev 2397)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties	2009-0=
6-17 13:00:12 UTC (rev 2398)
@@ -221,12 +221,16 @@
 isisfish.effortDescription.crewFoodCost=3DCo\u00FBt de l'alimentation pour l=
'\u00E9quipage
 isisfish.effortDescription.crewShareRate=3DTaux de partage de l'\u00E9quipage
 isisfish.effortDescription.crewSize=3DTaille de l'\u00E9quipage
+isisfish.effortDescription.economicTitle=3DParam\u00E8tres \u00E9conomiques
+isisfish.effortDescription.effortTitle=3DParam\u00E8tres d'effort de p\u00EA=
che
 isisfish.effortDescription.fishingOperation=3DOp\u00E9ration de p\u00EAche
 isisfish.effortDescription.fishingOperationDuration=3DDur\u00E9e de la p\u00=
EAche
+isisfish.effortDescription.fishingOperationDuration.tooltip=3DEn heures
 isisfish.effortDescription.fixedCrewSalary=3DSalaire d'\u00E9quipage fixe
 isisfish.effortDescription.gearsNumberPerOperation=3DNombre d'engins par op\=
u00E9ration
 isisfish.effortDescription.landingCosts=3DCo\u00FBts d'accastillage
 isisfish.effortDescription.otherRunningCost=3DAutres co\u00FBts
+isisfish.effortDescription.parametersTitle=3DParam\u00E8tres des m\u00E9tiers
 isisfish.effortDescription.repairAndMaintenanceGearCost=3DCo\u00FBts de main=
tenance
 isisfish.effortDescription.title=3DM\u00E9tiers pratiqu\u00E9s
 isisfish.effortDescription.toString=3DEffortDescription for %1$s with %2$s


--===============6296313454001295225==--