[Isis-fish-commits] r2338 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input

8 Jun 2009

Author: chatellier
Date: 2009-06-08 15:34:02 +0000 (Mon, 08 Jun 2009)
New Revision: 2338

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx
Log:
Make refresh() to work.
Remove number editor.

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx
===================================================================

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx	2009-06-08 15:32:04 UTC (rev 2337)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx	2009-06-08 15:34:02 UTC (rev 2338)
@@ -29,6 +29,7 @@
 
 setButtonTitle(_("isisfish.input.continueVesselTypes"));
 setNextPath("$root/$vesselTypes");
+
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getOldValue() != null || evt.getNewValue() == null) {
@@ -49,6 +50,10 @@
 @Override
 public void refresh() {
     TripType tripType = (TripType)getVerifier().getEntity(TripType.class);
+    
+    // add null before, for second to be considered as a changed event
+    // otherwize, setBean has no effect
+    setBean(null);
     setBean((TripTypeImpl) tripType);
 }
 

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx	2009-06-08 15:32:04 UTC (rev 2337)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx	2009-06-08 15:34:02 UTC (rev 2338)
@@ -36,21 +36,17 @@
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getOldValue() != null || evt.getNewValue() == null) {
-            // remove previous binding on getBean()
-            //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
             fieldVesselTypeName.setText("");
-            fieldVesselTypeLength.setModelText("");
-            fieldVesselTypeSpeed.setModelText("");
+            fieldVesselTypeLength.setText("");
+            fieldVesselTypeSpeed.setText("");
             fieldVesselTypeMaxTripDuration.setText("");
-            fieldVesselTypeActivityRange.setModelText("");
-            fieldVesselTypeMinCrewSize.setModelText("");
-            fieldVesselTypeSpeed.setModelText("");
-            fieldVesselTypeUnitFuelCostOfTravel.setModelText("");
+            fieldVesselTypeActivityRange.setText("");
+            fieldVesselTypeMinCrewSize.setText("");
+            fieldVesselTypeSpeed.setText("");
+            fieldVesselTypeUnitFuelCostOfTravel.setText("");
             fieldVesselTypeComment.setText("");
         }
         if (evt.getNewValue() != null) {
-            // add binding on getBean()
-            //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
         }
     }
 });
@@ -58,16 +54,23 @@
 @Override
 public void refresh() {
     VesselType vesselType = getVerifier().getEntity(VesselType.class);
+    
+    // add null before, for second to be considered as a changed event
+    // otherwize, setBean has no effect
+    setBean(null);
     setBean((VesselTypeImpl) vesselType);
+
     if (getBean() != null) {
         setListModel();
+        
+        /* NumberEditor is not working
         fieldVesselTypeLength.init();
         fieldVesselTypeLength.init();
         fieldVesselTypeSpeed.init();
         fieldVesselTypeActivityRange.init();
         fieldVesselTypeMinCrewSize.init();
         fieldVesselTypeSpeed.init();
-        fieldVesselTypeUnitFuelCostOfTravel.init();
+        fieldVesselTypeUnitFuelCostOfTravel.init(); */
     }
 }
 
@@ -113,13 +116,13 @@
                             <JLabel text="isisfish.vesselType.length" enabled='{isActif()}'/>
                         </cell>
                         <cell fill='horizontal'  weightx='1.0'>
-                            <NumberEditor id='fieldVesselTypeLength' constructorParams='this'
+                            <!--NumberEditor id='fieldVesselTypeLength' constructorParams='this'
                                           bean='{getBean()}' property='length'
                                           enabled='{isActif()}' decorator='boxed' useSign='true'
-                                          _bean='{VesselTypeImpl.class}' _method='"Length"'/>
-                            <!--JTextField id="fieldVesselTypeLength" text='{getBean().getLength()}' enabled='{isActif()}'
+                                          _bean='{VesselTypeImpl.class}' _method='"Length"'/-->
+                            <JTextField id="fieldVesselTypeLength" text='{getBean().getLength()}' enabled='{isActif()}'
                             onKeyReleased='getBean().setLength(Integer.parseInt(fieldVesselTypeLength.getText()))'
-                            decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Length"'/-->
+                            decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Length"'/>
                         </cell>
                     </row>
                     <row>
@@ -127,13 +130,13 @@
                             <JLabel text="isisfish.vesselType.speed" enabled='{isActif()}'/>
                         </cell>
                         <cell fill='horizontal'  weightx='1.0'>
-                            <NumberEditor id='fieldVesselTypeSpeed' constructorParams='this'
+                            <!--NumberEditor id='fieldVesselTypeSpeed' constructorParams='this'
                                           bean='{getBean()}' property='speed' useSign='true'
                                           enabled='{isActif()}' decorator='boxed'
-                                          _bean='{VesselTypeImpl.class}' _method='"Speed"'/>
-                            <!--JTextField id="fieldVesselTypeSpeed" text='{getBean().getSpeed()}' enabled='{isActif()}'
+                                          _bean='{VesselTypeImpl.class}' _method='"Speed"'/-->
+                            <JTextField id="fieldVesselTypeSpeed" text='{getBean().getSpeed()}' enabled='{isActif()}'
                             onKeyReleased='getBean().setSpeed(Double.parseDouble(fieldVesselTypeSpeed.getText()))'
-                            decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Speed"'/-->
+                            decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Speed"'/>
                         </cell>
                     </row>
                     <row>
@@ -151,13 +154,13 @@
                             <JLabel text="isisfish.vesselType.activityRange" enabled='{isActif()}'/>
                         </cell>
                         <cell fill='horizontal'  weightx='1.0'>
-                            <NumberEditor id='fieldVesselTypeActivityRange' constructorParams='this'
+                            <!--NumberEditor id='fieldVesselTypeActivityRange' constructorParams='this'
                                           bean='{getBean()}' property='activityRange'
                                           enabled='{isActif()}' decorator='boxed' useSign='true'
-                                          _bean='{VesselTypeImpl.class}' _method='"ActivityRange"'/>
-                            <!--JTextField id="fieldVesselTypeActivityRange" text='{getBean().getActivityRange()}' enabled='{isActif()}'
+                                          _bean='{VesselTypeImpl.class}' _method='"ActivityRange"'/-->
+                            <JTextField id="fieldVesselTypeActivityRange" text='{getBean().getActivityRange()}' enabled='{isActif()}'
                             onKeyReleased='getBean().setActivityRange(Double.parseDouble(fieldVesselTypeActivityRange.getText()))'
-                            decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"ActivityRange"'/-->
+                            decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"ActivityRange"'/>
                         </cell>
                     </row>
                     <row>
@@ -165,13 +168,13 @@
                             <JLabel text="isisfish.vesselType.miniCrew" enabled='{isActif()}'/>
                         </cell>
                         <cell fill='horizontal'  weightx='1.0'>
-                            <NumberEditor id='fieldVesselTypeMinCrewSize' constructorParams='this'
+                            <!--NumberEditor id='fieldVesselTypeMinCrewSize' constructorParams='this'
                                           bean='{getBean()}' property='minCrewSize' useSign='true'
                                           enabled='{isActif()}' decorator='boxed' _bean='{VesselTypeImpl.class}'
-                                          _method='"MinCrewSize"'/>
-                            <!--JTextField id="fieldVesselTypeMinCrewSize" text='{getBean().getMinCrewSize()}' enabled='{isActif()}'
+                                          _method='"MinCrewSize"'/-->
+                            <JTextField id="fieldVesselTypeMinCrewSize" text='{getBean().getMinCrewSize()}' enabled='{isActif()}'
                             onKeyReleased='getBean().setMinCrewSize(Integer.parseInt(fieldVesselTypeMinCrewSize.getText()))'
-                            decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"MinCrewSize"'/-->
+                            decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"MinCrewSize"'/>
                         </cell>
                     </row>
                     <row>
@@ -179,13 +182,13 @@
                             <JLabel text="isisfish.vesselType.fuelCost" enabled='{isActif()}'/>
                         </cell>
                         <cell fill='horizontal'  weightx='1.0'>
-                            <NumberEditor id='fieldVesselTypeUnitFuelCostOfTravel' constructorParams='this'
+                            <!--NumberEditor id='fieldVesselTypeUnitFuelCostOfTravel' constructorParams='this'
                                           bean='{getBean()}' property='unitFuelCostOfTravel'
                                           enabled='{isActif()}' decorator='boxed' useSign='true'
-                                          _bean='{VesselTypeImpl.class}' _method='"UnitFuelCostOfTravel"'/>
-                            <!--JTextField id="fieldVesselTypeUnitFuelCostOfTravel" text='{getBean().getUnitFuelCostOfTravel()}'
+                                          _bean='{VesselTypeImpl.class}' _method='"UnitFuelCostOfTravel"'/-->
+                            <JTextField id="fieldVesselTypeUnitFuelCostOfTravel" text='{getBean().getUnitFuelCostOfTravel()}'
                             onKeyReleased='getBean().setUnitFuelCostOfTravel(Double.parseDouble(fieldVesselTypeUnitFuelCostOfTravel.getText()))'
-                            enabled='{isActif()}' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"UnitFuelCostOfTravel"'/-->
+                            enabled='{isActif()}' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"UnitFuelCostOfTravel"'/>
                         </cell>
                     </row>
                     <row>

    

[Isis-fish-commits] r2338 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input

chatellier＠users.labs.libre-entreprise.org