From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:11 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r2323 -
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
Date: Thu, 04 Jun 2009 18:29:09 +0200
Message-ID: <20090604162909.A97D7461A74@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6798857886407923262=="

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

Author: chatellier
Date: 2009-06-04 16:29:09 +0000 (Thu, 04 Jun 2009)
New Revision: 2323

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEdit=
orUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.j=
axx
Log:
Fix gear refresh UI

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabU=
I.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/GearTabUI.jaxx=
	2009-06-04 15:28:45 UTC (rev 2322)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx=
	2009-06-04 16:29:09 UTC (rev 2323)
@@ -1,7 +1,6 @@
 <!--
 /* *##%
- * Copyright (C) 2005
- *     Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin
+ * 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
@@ -17,64 +16,50 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US=
A.
  *##%*/
-
-/* *
- * IsisFish.java
- *
- * Created: 1 aout 2005 18:37:25 CEST
- *
- * @author Benjamin POUSSIN <poussin at codelutin.com>
- * @version $Revision: 1312 $
- *
- * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 ao=C3=BB 2008) $
- * by : $Author: sletellier $
- */
  -->
 <fr.ifremer.isisfish.ui.input.InputContentUI>
=20
     <!-- bean property -->
     <fr.ifremer.isisfish.entities.GearImpl id=3D'bean' javaBean=3D'null'/>
=20
-
-     <script><![CDATA[
-import fr.ifremer.isisfish.types.RangeOfValues;
+    <script><![CDATA[
 import fr.ifremer.isisfish.entities.Gear;
 import fr.ifremer.isisfish.entities.GearImpl;
-import fr.ifremer.isisfish.ui.WelcomePanelUI;
-import org.codelutin.topia.persistence.TopiaEntity;
-import org.codelutin.topia.TopiaException;
 import jaxx.runtime.swing.editor.NumberEditor;
-import jaxx.runtime.swing.navigation.NavigationTreeModel;
-import jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode;
=20
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getOldValue() !=3D null || evt.getNewValue() =3D=3D null) {
-            // remove previous binding on getBean()
-            //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldC=
ellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCel=
lLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("=
");
             fieldGearName.setText("");
             fieldGearEffortUnit.setText("");
-            fieldGearStandardisationFactor.setModelText("");
+            fieldGearStandardisationFactor.setText("");
             fieldGearParamName.setText("");
             fieldGearComment.setText("");
         }
         if (evt.getNewValue() !=3D null) {
-            // add binding on getBean()
-            //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCe=
llName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCell=
Land.selected", "fieldCellComment.text");
+
         }
     }
 });
+
 public void refresh() {
     getVerifier().setSaveButton(save);
     getVerifier().setCancelButton(cancel);
     getVerifier().setNewButton(create, "Gear");
     getVerifier().setDeleteButton(remove);
     Gear gear =3D getVerifier().getEntity(Gear.class);
+   =20
+    // add null before, for second to be considered as a changed event
+    // otherwize, setBean has no effect
+    setBean(null);
     setBean((GearImpl) gear);
+   =20
     getVerifier().addCurrentPanel(rangeOfValues);
-    if (getBean() !=3D null){
+   =20
+    /* chatellier commented since number editor is not working
+    if (getBean() !=3D null) {
         fieldGearStandardisationFactor.init();
-    }
+    }*/
 }
     ]]>
     </script>
@@ -104,13 +89,13 @@
                             <JLabel text=3D"isisfish.gear.standardisationFac=
tor" enabled=3D'{isActif()}'/>
                         </cell>
                         <cell columns=3D"2" fill=3D'horizontal' weightx=3D'1=
.0'>
-                            <NumberEditor id=3D'fieldGearStandardisationFact=
or' constructorParams=3D'this'
+                            <!--NumberEditor id=3D'fieldGearStandardisationF=
actor' constructorParams=3D'this'
                                           bean=3D'{getBean()}' property=3D's=
tandardisationFactor'
                                           enabled=3D'{isActif()}' decorator=
=3D'boxed' _bean=3D'{GearImpl.class}'
-                                          _method=3D'"StandardisationFactor"=
' useSign=3D'true'/>
-                            <!--JTextField id=3D"fieldGearStandardisationFac=
tor" text=3D'{getBean().getStandardisationFactor()}'
+                                          _method=3D'"StandardisationFactor"=
' useSign=3D'true'/-->
+                            <JTextField id=3D"fieldGearStandardisationFactor=
" text=3D'{getBean().getStandardisationFactor()}'
                             onKeyReleased=3D'getBean().setStandardisationFac=
tor(Double.parseDouble(fieldGearStandardisationFactor.getText()))'
-                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{GearImpl.class}' _method=3D'"StandardisationFactor"'/-->
+                            enabled=3D'{isActif()}' decorator=3D'boxed' _bea=
n=3D'{GearImpl.class}' _method=3D'"StandardisationFactor"'/>
                         </cell>
                     </row>
                     <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.j=
axx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/GearUI.jaxx	20=
09-06-04 15:28:45 UTC (rev 2322)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx	20=
09-06-04 16:29:09 UTC (rev 2323)
@@ -23,7 +23,6 @@
 import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener;
=20
 // constructor code
-getVerifier().addCurrentPanel(this);
 setButtonTitle(_("isisfish.input.continueMetiers"));
 setNextPath("$root/$metiers");
=20
@@ -39,8 +38,12 @@
     ]]></script>
     <JPanel id=3D'body' layout=3D'{new BorderLayout()}'>
         <JTabbedPane constraints=3D'BorderLayout.CENTER' id=3D"gearTab" name=
=3D"Gear">
-            <tab title=3D'{_("isisfish.gear.title")}'><GearTabUI id=3D"gearT=
abUI" constructorParams=3D'this'/></tab>
-            <tab title=3D'{_("isisfish.selectivity.title")}'><SelectivityUI =
id=3D"selectivityUI" constructorParams=3D'this'/></tab>
+            <tab title=3D'{_("isisfish.gear.title")}'>
+                <GearTabUI id=3D"gearTabUI" constructorParams=3D'this'/>
+            </tab>
+            <tab title=3D'{_("isisfish.selectivity.title")}'>
+                <SelectivityUI id=3D"selectivityUI" constructorParams=3D'thi=
s'/>
+            </tab>
         </JTabbedPane>
     </JPanel>
 </fr.ifremer.isisfish.ui.input.InputContentUI>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Selectiv=
ityEditorUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEdi=
torUI.jaxx	2009-06-04 15:28:45 UTC (rev 2322)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEdi=
torUI.jaxx	2009-06-04 16:29:09 UTC (rev 2323)
@@ -15,7 +15,8 @@
  * 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>
=20
     <!-- bean property -->
@@ -26,13 +27,15 @@
     <Boolean id=3D'selectivityPopulationSelected' javaBean=3D'false'/>
=20
     <script><![CDATA[
+import javax.swing.table.DefaultTableModel;
+import fr.ifremer.isisfish.entities.Equation;
+import fr.ifremer.isisfish.entities.Gear;
+import fr.ifremer.isisfish.entities.GearImpl;
 import fr.ifremer.isisfish.entities.Population;
 import fr.ifremer.isisfish.entities.PopulationImpl;
+import fr.ifremer.isisfish.entities.Selectivity;
 import fr.ifremer.isisfish.entities.Species;
 import fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor;
-import javax.swing.table.DefaultTableModel;
-import fr.ifremer.isisfish.entities.Selectivity;
-import fr.ifremer.isisfish.entities.Equation;
 import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
=20
 // TODO why it's commented ? to remove ?
@@ -49,38 +52,29 @@
     }
 });
=20
-selectivityTable.addMouseListener(new MouseListener() {
-
+selectivityTable.addMouseListener(new MouseAdapter() {
     @Override
-    public void mouseClicked(MouseEvent e) {
-    }
-
-    @Override
-    public void mousePressed(MouseEvent e) {
-    }
-
-    @Override
     public void mouseReleased(MouseEvent e) {
-        remove.setEnabled(selectivityTable.getSelectedRow() !=3D -1);
+        removeSelectivityButton.setEnabled(selectivityTable.getSelectedRow()=
 !=3D -1);
     }
-
-    @Override
-    public void mouseEntered(MouseEvent e) {
-    }
-
-    @Override
-    public void mouseExited(MouseEvent e) {
-    }
 });
=20
 public void refresh() {
+
+    Gear gear =3D (Gear)getVerifier().getEntity(Gear.class);
+
+    // add null before, for second to be considered as a changed event
+    // otherwize, setBean has no effect
+    setBean(null);
+    setBean((GearImpl) gear);
+
     if (getBean() !=3D null) {
         setSelectivityTableModel();
         fieldSelectivityPopulation.setModel(getSelectivityPopulationModel());
     }
     getVerifier().addCurrentPanel(selectivityEquation);
=20
-    remove.setEnabled(false);
+    removeSelectivityButton.setEnabled(false);
 }
=20
 protected void setSelectivityTableModel() {
@@ -89,7 +83,7 @@
         public boolean isCellEditable(int row, int column) {
             boolean result =3D false;
             if (column > 0) {
-                result =3Dtrue;
+                result =3D true;
             }
             return result;
         }
@@ -106,22 +100,25 @@
             equations.add(equation);
         }
     }
-    model.addColumn("Population", populations.toArray());
-    model.addColumn("Equation", equations.toArray());
+    model.addColumn(_("isisfish.common.population"), populations.toArray());
+    model.addColumn(_("isisfish.common.equation"), equations.toArray());
=20
     selectivityTable.setModel(model);
     EquationTableEditor cellEditor =3D new EquationTableEditor();
     selectivityTable.getColumnModel().getColumn(1).setCellEditor(cellEditor);
 }
=20
-protected void add() {
+protected void addSelectivity() {
     getAction().addSelectivity((Population)getPopulation(), selectivityEquat=
ion.getEditor().getText(), getBean());
     setSelectivityTableModel();
 }
=20
-protected void remove() {
-    getAction().removeSelectivity(getBean(), (Selectivity) getBean().getPopu=
lationSelectivity((Population) selectivityTable.getValueAt(selectivityTable.g=
etSelectedRow(), 0)));
+protected void removeSelectivity() {
+    Population selectedPopulation =3D (Population)selectivityTable.getValueA=
t(selectivityTable.getSelectedRow(), 0);
+    Selectivity selectedSelectivity =3D (Selectivity)getBean().getPopulation=
Selectivity(selectedPopulation);
+    getAction().removeSelectivity(getBean(), selectedSelectivity);
     setSelectivityTableModel();
+    removeSelectivityButton.setEnabled(false);
 }
=20
 protected DefaultComboBoxModel getSelectivityPopulationModel() {
@@ -130,8 +127,8 @@
     if (species !=3D null) {
         selectivityPopulationModel.addElement(new GenericCell(" ", null, nul=
l));
         for (Species s : species) {
-            if (s.getPopulation() !=3D null){
-                for (Population p : s.getPopulation()){
+            if (s.getPopulation() !=3D null) {
+                for (Population p : s.getPopulation()) {
                     selectivityPopulationModel.addElement(new GenericCell(p.=
getName(), p, Population.class));
                 }
             }
@@ -143,7 +140,7 @@
 protected void selectivityChanged() {
     setSelectivityPopulationSelected(fieldSelectivityPopulation.getSelectedI=
tem() !=3D null);
     setPopulation((PopulationImpl) ((GenericCell) fieldSelectivityPopulation=
.getSelectedItem()).getValue());
-    add.setEnabled(isSelectivityPopulationSelected());
+    addSelectivityButton.setEnabled(isSelectivityPopulationSelected());
 }
     ]]></script>
     <Table id=3D'body'>
@@ -162,7 +159,7 @@
                         <cell columns=3D'2' fill=3D'both' weightx=3D'1.0' we=
ighty=3D'1.0'>
                             <InputOneEquationUI id=3D'selectivityEquation' c=
onstructorParams=3D'this'
                                 lblText=3D'{_("isisfish.selectivity.equation=
")}'
-                                bean=3D'{getBean()}'  nameEquation=3D'Select=
ivity' actif=3D'{isActif()}'
+                                bean=3D'{getBean()}' nameEquation=3D'Selecti=
vity' actif=3D'{isActif()}'
                                 clazz=3D'{fr.ifremer.isisfish.equation.Selec=
tivityEquation.class}'/>
                         </cell>
                     </row>
@@ -174,7 +171,7 @@
                 <Table>
                     <row>
                         <cell columns=3D'2' fill=3D'horizontal'  weightx=3D'=
1.0'>
-                            <JButton id=3D"add" text=3D"isisfish.common.add"=
 onActionPerformed=3D'add()' enabled=3D'{isActif()}'/>
+                            <JButton id=3D"addSelectivityButton" text=3D"isi=
sfish.common.add" onActionPerformed=3D'addSelectivity()' enabled=3D'{isActif(=
)}'/>
                         </cell>
                     </row>
                     <row>
@@ -186,7 +183,7 @@
                     </row>
                     <row>
                         <cell columns=3D'2' fill=3D'horizontal' weightx=3D'1=
.0'>
-                            <JButton id=3D"remove" text=3D"isisfish.common.r=
emove" onActionPerformed=3D'remove()' enabled=3D'{isActif()}'/>
+                            <JButton id=3D"removeSelectivityButton" text=3D"=
isisfish.common.remove" onActionPerformed=3D'removeSelectivity()' enabled=3D'=
{isActif()}'/>
                         </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	2009-06-04 15:28:45 UTC (rev 2322)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.=
jaxx	2009-06-04 16:29:09 UTC (rev 2323)
@@ -25,27 +25,18 @@
 import fr.ifremer.isisfish.entities.Gear;
 import fr.ifremer.isisfish.entities.GearImpl;
=20
-// TODO why it's commented ? to remove ?
-addPropertyChangeListener("bean", new PropertyChangeListener() {
-    public void propertyChange(PropertyChangeEvent evt) {
-        if (evt.getOldValue() !=3D null || evt.getNewValue() =3D=3D null) {
-            // remove previous binding on getBean()
-            //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldC=
ellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCel=
lLand.selected", "fieldCellComment.text");
-        }
-        if (evt.getNewValue() !=3D null) {
-            // add binding on getBean()
-            //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCe=
llName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCell=
Land.selected", "fieldCellComment.text");
-        }
-    }
-});
-
 // refresh
-public void refresh(){
+public void refresh() {
     getVerifier().setSaveButton(save);
     getVerifier().setCancelButton(cancel);
-    setBean(null);
+   =20
     Gear gear =3D (Gear)getVerifier().getEntity(Gear.class);
+   =20
+    // add null before, for second to be considered as a changed event
+    // otherwize, setBean has no effect
+    setBean(null);
     setBean((GearImpl) gear);
+   =20
     getVerifier().addCurrentPanel(editor);
 }
     ]]></script>


--===============6798857886407923262==--