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] r2329 -
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
Date: Fri, 05 Jun 2009 16:57:13 +0200
Message-ID: <20090605145713.6F15A461707@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1251457737973752214=="

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

Author: chatellier
Date: 2009-06-05 14:57:13 +0000 (Fri, 05 Jun 2009)
New Revision: 2329

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI=
.jaxx
Log:
Remove NumberEditor (again) Cancel is working

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryR=
egionUI.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/FisheryRegionU=
I.jaxx	2009-06-05 13:33:16 UTC (rev 2328)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionU=
I.jaxx	2009-06-05 14:57:13 UTC (rev 2329)
@@ -24,18 +24,16 @@
=20
     <script><![CDATA[
 import fr.ifremer.isisfish.entities.FisheryRegion;
+import fr.ifremer.isisfish.entities.FisheryRegionImpl;
 import com.bbn.openmap.gui.OMToolSet;
-import fr.ifremer.isisfish.map.CellSelectionLayer;
-import com.bbn.openmap.event.SelectMouseMode;
-import fr.ifremer.isisfish.entities.FisheryRegionImpl;
-import jaxx.runtime.swing.editor.NumberEditor;
=20
 protected OMToolSet toolSet =3D new OMToolSet();
-
 toolSet.setupListeners(cellMap);
 toolMap.add((Component)toolSet);
+
 setButtonTitle(_("isisfish.input.continueCells"));
 setNextPath("$root/$cells");
+
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getOldValue() !=3D null || evt.getNewValue() =3D=3D null) {
@@ -51,17 +49,22 @@
=20
 @Override
 public void refresh() {
+    FisheryRegion region =3D getVerifier().getEntity(FisheryRegion.class);
+
+    // add null before, for second to be considered as a changed event
+    // otherwize, setBean has no effect
     setBean(null);
-    FisheryRegion region =3D getVerifier().getEntity(FisheryRegion.class);
     setBean((FisheryRegionImpl)region);
-    if (region !=3D null){
+   =20
+    if (getBean() !=3D null) {
         setFieldMapfilesModel(getBean());
+        /* numberEditor is not working
         fieldLatMin.init();
         fieldLatMax.init();
         fieldLongMin.init();
         fieldLongMax.init();
         fieldCellLengthLatitude.init();
-        fieldCellLengthLongitude.init();
+        fieldCellLengthLongitude.init();*/
     }
 }
=20
@@ -71,44 +74,44 @@
     getVerifier().setCancelButton(cancel);
 }
=20
-protected void setFieldMapfilesModel(FisheryRegion region){
+protected void setFieldMapfilesModel(FisheryRegion region) {
     DefaultListModel model =3D new DefaultListModel();
     java.util.List<String> mapList =3D region.getMapFileList();
-    if (mapList !=3D null){
+    if (mapList !=3D null) {
         int cnt =3D 0;
-        for (String map : mapList){
+        for (String map : mapList) {
             model.add(cnt, map);
             cnt++;
         }
     }
     fieldMapfiles.setModel(model);
 }
-protected void mapFieldChanged(){
+protected void mapFieldChanged() {
     Object[] values =3D fieldMapfiles.getSelectedValues();
     java.util.List<String> valuesList =3D new ArrayList<String>();
-    if (values !=3D null){
+    if (values !=3D null) {
         for (Object o : values){
             valuesList.add((String)o);
         }
     }
     getBean().setMapFileList(valuesList);
 }
-protected void addMap(){
+protected void addMap() {
     getContextValue(InputAction.class).addMap(getBean());
 }
-protected void delMap(){
+protected void delMap() {
     getContextValue(InputAction.class).removeMap(getBean(), fieldMapfiles.ge=
tSelectedValues());
 }
-protected void cellFillChanged(){
+protected void cellFillChanged() {
 }
-protected void cellFile(){
+protected void cellFile() {
     getContextValue(InputAction.class).loadCellFile(fieldCellFile.getText());
 }
-protected void check(){
+protected void check() {
     getContextValue(InputAction.class).checkFisheryRegion(getBean());
     setInfoText(_("isisfish.message.check.region"));
 }
-protected void save(){
+protected void save() {
     setInfoText(_("isisfish.message.checking.cell"));
     getContextValue(InputAction.class).saveFisheryRegion(getBean());
     getVerifier().setEditable(false);
@@ -117,9 +120,7 @@
     setInfoText(_("isisfish.message.save.finished"));
     refresh();
 }
-        ]]>
-    </script>
-
+    ]]></script>
         <JPanel id=3D'body' layout=3D'{new BorderLayout()}'>
             <JSplitPane id=3D"FisheryRegionTab" name=3D"FisheryRegion" const=
raints=3D'BorderLayout.CENTER'
                          oneTouchExpandable=3D"true" dividerLocation=3D"200"=
 orientation=3D"HORIZONTAL">
@@ -146,9 +147,11 @@
                             <JLabel text=3D"isisfish.fisheryRegion.latitude.=
min"/>
                         </cell>
                         <cell columns=3D'2' fill=3D'horizontal' weightx=3D'1=
.0'>
-                            <NumberEditor id=3D'fieldLatMin' constructorPara=
ms=3D'this'
+                            <!-- NumberEditor id=3D'fieldLatMin' constructor=
Params=3D'this'
                                           bean=3D'{getBean()}' property=3D'm=
inLatitude'
-                                          decorator=3D'boxed' useSign=3D'tru=
e'/>
+                                          decorator=3D'boxed' useSign=3D'tru=
e'/-->
+                            <JTextField id=3D"fieldLatMin" text=3D'{getBean(=
).getMinLatitude()}' decorator=3D'boxed'
+                             onKeyReleased=3D'getBean().setMinLatitude(Float=
.parseFloat(fieldLatMin.getText()))'/>
                         </cell>
                     </row>
                     <row>
@@ -156,9 +159,11 @@
                             <JLabel text=3D"isisfish.fisheryRegion.latitude.=
max"/>
                         </cell>
                         <cell columns=3D'2' fill=3D'horizontal' weightx=3D'1=
.0'>
-                            <NumberEditor id=3D'fieldLatMax' constructorPara=
ms=3D'this'
+                            <!-- NumberEditor id=3D'fieldLatMax' constructor=
Params=3D'this'
                                           bean=3D'{getBean()}' property=3D'm=
axLatitude'
-                                          decorator=3D'boxed' useSign=3D'tru=
e'/>
+                                          decorator=3D'boxed' useSign=3D'tru=
e'/-->
+                            <JTextField id=3D"fieldLatMax" text=3D'{getBean(=
).getMaxLatitude()}' decorator=3D'boxed'
+                             onKeyReleased=3D'getBean().setMaxLatitude(Float=
.parseFloat(fieldLatMax.getText()))'/>
                         </cell>
                     </row>
                     <row>
@@ -166,9 +171,11 @@
                             <JLabel text=3D"isisfish.fisheryRegion.longitude=
.min"/>
                         </cell>
                         <cell columns=3D'2' fill=3D'horizontal' weightx=3D'1=
.0'>
-                            <NumberEditor id=3D'fieldLongMin' constructorPar=
ams=3D'this'
+                            <!-- NumberEditor id=3D'fieldLongMin' constructo=
rParams=3D'this'
                                           bean=3D'{getBean()}' property=3D'm=
inLongitude'
-                                          decorator=3D'boxed' useSign=3D'tru=
e'/>
+                                          decorator=3D'boxed' useSign=3D'tru=
e'/-->
+                            <JTextField id=3D"fieldLongMin" text=3D'{getBean=
().getMinLongitude()}' decorator=3D'boxed'
+                             onKeyReleased=3D'getBean().setMinLongitude(Floa=
t.parseFloat(fieldLongMin.getText()))'/>
                         </cell>
                     </row>
                     <row>
@@ -176,9 +183,11 @@
                             <JLabel text=3D"isisfish.fisheryRegion.longitude=
.max"/>
                         </cell>
                         <cell columns=3D'2' fill=3D'horizontal' weightx=3D'1=
.0'>
-                            <NumberEditor id=3D'fieldLongMax' constructorPar=
ams=3D'this'
+                            <!-- NumberEditor id=3D'fieldLongMax' constructo=
rParams=3D'this'
                                           bean=3D'{getBean()}' property=3D'm=
axLongitude'
-                                          decorator=3D'boxed' useSign=3D'tru=
e'/>
+                                          decorator=3D'boxed' useSign=3D'tru=
e'/-->
+                            <JTextField id=3D"fieldLongMax" text=3D'{getBean=
().getMaxLongitude()}' decorator=3D'boxed'
+                             onKeyReleased=3D'getBean().setMaxLongitude(Floa=
t.parseFloat(fieldLongMax.getText()))'/>
                         </cell>
                     </row>
                     <row>
@@ -191,9 +200,11 @@
                             <JLabel text=3D"isisfish.fisheryRegion.latitude"=
/>
                         </cell>
                         <cell columns=3D'2' fill=3D'horizontal' weightx=3D'1=
.0'>
-                            <NumberEditor id=3D'fieldCellLengthLatitude' con=
structorParams=3D'this'
+                            <!-- NumberEditor id=3D'fieldCellLengthLatitude'=
 constructorParams=3D'this'
                                           bean=3D'{getBean()}' property=3D'c=
ellLengthLatitude'
-                                          decorator=3D'boxed' useSign=3D'tru=
e'/>
+                                          decorator=3D'boxed' useSign=3D'tru=
e'/-->
+                            <JTextField id=3D"fieldCellLengthLatitude" text=
=3D'{getBean().getCellLengthLatitude()}' decorator=3D'boxed'
+                             onKeyReleased=3D'getBean().setCellLengthLatitud=
e(Float.parseFloat(fieldCellLengthLatitude.getText()))'/>
                         </cell>
                     </row>
                     <row>
@@ -201,9 +212,11 @@
                             <JLabel text=3D"isisfish.fisheryRegion.longitude=
"/>
                         </cell>
                         <cell columns=3D'2' fill=3D'horizontal' weightx=3D'1=
.0'>
-                            <NumberEditor id=3D'fieldCellLengthLongitude' co=
nstructorParams=3D'this'
+                            <!-- NumberEditor id=3D'fieldCellLengthLongitude=
' constructorParams=3D'this'
                                           bean=3D'{getBean()}' property=3D'c=
ellLengthLongitude'
-                                          decorator=3D'boxed' useSign=3D'tru=
e'/>
+                                          decorator=3D'boxed' useSign=3D'tru=
e'/-->
+                            <JTextField id=3D"fieldCellLengthLongitude" text=
=3D'{getBean().getCellLengthLongitude()}' decorator=3D'boxed'
+                             onKeyReleased=3D'getBean().setCellLengthLongitu=
de(Float.parseFloat(fieldCellLengthLongitude.getText()))'/>
                         </cell>
                     </row>
                     <row>
@@ -275,10 +288,12 @@
                             <JButton id=3D'check' text=3D"isisfish.common.ch=
eck" onActionPerformed=3D'check()' decorator=3D'boxed'/>
                         </cell>
                     </row>
-               </Table>
+                </Table>
                 <JPanel id=3D'map' layout=3D'{new BorderLayout()}'>
-                    <fr.ifremer.isisfish.map.OpenMapToolPanel id=3D'toolMap'=
 javaBean=3D'new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints=3D'B=
orderLayout.NORTH' decorator=3D'boxed'/>
-                    <fr.ifremer.isisfish.map.IsisMapBean id=3D'cellMap' sele=
ctionMode=3D"0" javaBean=3D'new fr.ifremer.isisfish.map.IsisMapBean()' fisher=
yRegion=3D'{getBean()}' constraints=3D'BorderLayout.CENTER' decorator=3D'boxe=
d'/>
+                    <fr.ifremer.isisfish.map.OpenMapToolPanel id=3D'toolMap'=
 javaBean=3D'new fr.ifremer.isisfish.map.OpenMapToolPanel()'
+                    constraints=3D'BorderLayout.NORTH' decorator=3D'boxed'/>
+                    <fr.ifremer.isisfish.map.IsisMapBean id=3D'cellMap' sele=
ctionMode=3D"0" javaBean=3D'new fr.ifremer.isisfish.map.IsisMapBean()'
+                    fisheryRegion=3D'{getBean()}' constraints=3D'BorderLayou=
t.CENTER' decorator=3D'boxed'/>
                 </JPanel>
             </JSplitPane>
         </JPanel>


--===============1251457737973752214==--