[gnue] r9113 - trunk/gnue-forms/src/input/displayHandlers

[reinhard]

Author: reinhard
Date: 2006-12-04 12:05:55 -0600 (Mon, 04 Dec 2006)
New Revision: 9113

Modified:
   trunk/gnue-forms/src/input/displayHandlers/Checkbox.py
   trunk/gnue-forms/src/input/displayHandlers/Cursor.py
   trunk/gnue-forms/src/input/displayHandlers/Dropdown.py
   trunk/gnue-forms/src/input/displayHandlers/Listbox.py
   trunk/gnue-forms/src/input/displayHandlers/Password.py
Log:
Try to get rid of displayHandler.value


Modified: trunk/gnue-forms/src/input/displayHandlers/Checkbox.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Checkbox.py      2006-12-04 
17:45:33 UTC (rev 9112)
+++ trunk/gnue-forms/src/input/displayHandlers/Checkbox.py      2006-12-04 
18:05:55 UTC (rev 9113)
@@ -134,10 +134,10 @@
     self.editing = self.field.isEditable()
     self.modified = False
 
-    self.setValue(self.field.getValue())
+    value = self.field.getValue()
+    self.setValue(value)
+    self.work = value
 
-    self.work = self.value
-
     self._buildDisplay()
 
     self._cursor = 0

Modified: trunk/gnue-forms/src/input/displayHandlers/Cursor.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Cursor.py        2006-12-04 
17:45:33 UTC (rev 9112)
+++ trunk/gnue-forms/src/input/displayHandlers/Cursor.py        2006-12-04 
18:05:55 UTC (rev 9113)
@@ -677,9 +677,6 @@
       self.display = self._buildDisplayHelper(self.value, False)
 
 
-  def _buildValue(self):
-      self.value = self.parse_display(self.work)
-
     # -------------------------------------------------------------------------
     # Parse the display string
     # -------------------------------------------------------------------------
@@ -717,5 +714,6 @@
 
   def __updateFieldValue(self):
 
-      self._buildValue()
-      self.field.set_value(self.work)
+      value = self.parse_display(self.work)
+      self.value = value
+      self.field.set_value(value)

Modified: trunk/gnue-forms/src/input/displayHandlers/Dropdown.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Dropdown.py      2006-12-04 
17:45:33 UTC (rev 9112)
+++ trunk/gnue-forms/src/input/displayHandlers/Dropdown.py      2006-12-04 
18:05:55 UTC (rev 9113)
@@ -61,14 +61,15 @@
     self.modified = False
 
     # TODO: Replace with formatter
-    self.setValue(self.field.getValue())
+    value = self.field.getValue()
+    self.setValue(value)
 
-    if self.value is None:
+    if value is None:
       self.work = ""
     else:
         if self.field._allowedValues \
-                and "%s" % self.value in self.field._allowedValues:
-            self.work = self.field._allowedValues ["%s" % self.value]
+                and "%s" % value in self.field._allowedValues:
+            self.work = self.field._allowedValues ["%s" % value]
         else:
             self.work = ""
 

Modified: trunk/gnue-forms/src/input/displayHandlers/Listbox.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Listbox.py       2006-12-04 
17:45:33 UTC (rev 9112)
+++ trunk/gnue-forms/src/input/displayHandlers/Listbox.py       2006-12-04 
18:05:55 UTC (rev 9113)
@@ -56,18 +56,19 @@
     self.modified = False
 
     # TODO: Replace with formatter
-    self.setValue(self.field.getValue())
+    value = self.field.getValue()
+    self.setValue(value)
 
-    if self.value == None:
+    if value == None:
       self.work = ""
     else:
       try:
-        self.work = self.field._allowedValues ["%s" % self.value]
+        self.work = self.field._allowedValues ["%s" % value]
       except KeyError:
         self.work = ""
         event.__error__ = True
         event.__errortext__ = u_("Invalid value '%s' for keyed pull-down "
-                                 "field") % self.value
+                                 "field") % value
 
     self._buildDisplay()
 

Modified: trunk/gnue-forms/src/input/displayHandlers/Password.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Password.py      2006-12-04 
17:45:33 UTC (rev 9112)
+++ trunk/gnue-forms/src/input/displayHandlers/Password.py      2006-12-04 
18:05:55 UTC (rev 9113)
@@ -55,8 +55,9 @@
     self.modified = False
 
     # TODO: Replace with formatter
-    self.setValue(self.field.getValue())
-    self.work = self.value
+    value = self.field.getValue()
+    self.setValue(value)
+    self.work = value
     self._buildDisplay()
 
     self.cursor = len(self.display)