From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:31 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r2876 -
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
Date: Wed, 06 Jan 2010 11:15:52 +0100
Message-ID: <20100106101552.37D0616C08B@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2266387704554689977=="

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

Author: chatellier
Date: 2010-01-06 10:15:51 +0000 (Wed, 06 Jan 2010)
New Revision: 2876

Modified:
   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
Log:
Do not disable all selectivity UI (some parameters will be factor enable)

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-05 09:58:21 UTC (rev 2875)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEdi=
torUI.jaxx	2010-01-06 10:15:51 UTC (rev 2876)
@@ -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,10 +139,11 @@
                 <Table>
                     <row>
                         <cell fill=3D'horizontal' anchor=3D'east'>
-                            <JLabel text=3D"isisfish.selectivity.selectPopul=
ation" enabled=3D'{isActif()}'/>
+                            <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()}'/>
+                            <JComboBox id=3D"fieldSelectivityPopulation" onA=
ctionPerformed=3D'selectivityChanged()' enabled=3D'{isActif()}'
+                            decorator=3D'boxed' />
                         </cell>
                     </row>
                     <row>
@@ -150,7 +151,8 @@
                             <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}'/>
+                                clazz=3D'{fr.ifremer.isisfish.equation.Selec=
tivityEquation.class}'
+                                decorator=3D'boxed' />
                         </cell>
                     </row>
                 </Table>
@@ -161,19 +163,21 @@
                 <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'{isSelect=
ivityPopulationSelected()}'/>
+                            <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()}'/>
+                                <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'/>
+                            <JButton id=3D"removeSelectivityButton" text=3D"=
isisfish.common.remove" onActionPerformed=3D'removeSelectivity()'
+                            enabled=3D'false' decorator=3D'boxed' />
                         </cell>
                     </row>
                 </Table>

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-05 09:58:21 UTC (rev 2875)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.=
jaxx	2010-01-06 10:15:51 UTC (rev 2876)
@@ -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
@@ -51,7 +51,7 @@
                     <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()}'
-                                decorator=3D'boxed' _bean=3D'{GearImpl.class=
}' _method=3D'"PopulationSelectivity"'/>
+                                _bean=3D'{GearImpl.class}' _method=3D'"Popul=
ationSelectivity"'/>
                         </cell>
                     </row>
                 </Table>


--===============2266387704554689977==--