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

[reinhard]

Author: reinhard
Date: 2006-12-12 07:32:21 -0600 (Tue, 12 Dec 2006)
New Revision: 9134

Modified:
   trunk/gnue-forms/src/input/displayHandlers/Checkbox.py
   trunk/gnue-forms/src/input/displayHandlers/Component.py
   trunk/gnue-forms/src/input/displayHandlers/Cursor.py
   trunk/gnue-forms/src/input/displayHandlers/DateTime.py
   trunk/gnue-forms/src/input/displayHandlers/Dropdown.py
   trunk/gnue-forms/src/input/displayHandlers/Image.py
   trunk/gnue-forms/src/input/displayHandlers/Listbox.py
   trunk/gnue-forms/src/input/displayHandlers/Numeric.py
   trunk/gnue-forms/src/input/displayHandlers/Password.py
   trunk/gnue-forms/src/input/displayHandlers/Text.py
Log:
Removed some redundant code.


Modified: trunk/gnue-forms/src/input/displayHandlers/Checkbox.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Checkbox.py      2006-12-12 
13:16:18 UTC (rev 9133)
+++ trunk/gnue-forms/src/input/displayHandlers/Checkbox.py      2006-12-12 
13:32:21 UTC (rev 9134)
@@ -44,7 +44,8 @@
     self.trueValues =  ('Y', 'y', 'T', 't', '1', 'x', 'X', self.trueValue)
     self.falseValues = ('N', 'n', 'F', 'f', '0', '', ' ', self.falseValue)
 
-    BaseCursor.__init__(self, entry, eventHandler, subEventHandler)
+    BaseCursor.__init__(self, entry, eventHandler, subEventHandler,
+            displayMask, inputMask)
 
     # My events...
     self.subEventHandler.registerEventListeners( {
@@ -119,11 +120,9 @@
   def beginEdit(self):
 
     self.editing = self.field.isEditable()
-
     self.work = self.__sanitize_value(self.field.get_value())
     self.display = self.work
     self.modified = False
-
     self._cursor = 0
 
 

Modified: trunk/gnue-forms/src/input/displayHandlers/Component.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Component.py     2006-12-12 
13:16:18 UTC (rev 9133)
+++ trunk/gnue-forms/src/input/displayHandlers/Component.py     2006-12-12 
13:32:21 UTC (rev 9134)
@@ -30,9 +30,6 @@
 from gnue.forms.input.displayHandlers.Cursor import BaseCursor
 
 class Component(BaseCursor):
-  def __init__(self, entry, eventHandler, subEventHandler):
-    BaseCursor.__init__(self, entry, eventHandler, subEventHandler)
-
   def build_display(self, value, editing):
         if self.entry.type.lower() == 'url':
             return value

Modified: trunk/gnue-forms/src/input/displayHandlers/Cursor.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Cursor.py        2006-12-12 
13:16:18 UTC (rev 9133)
+++ trunk/gnue-forms/src/input/displayHandlers/Cursor.py        2006-12-12 
13:32:21 UTC (rev 9134)
@@ -60,7 +60,8 @@
   inherit from this one.
   """
 
-  def __init__(self, entry, eventHandler, subEventHandler):
+  def __init__(self, entry, eventHandler, subEventHandler, displayMask,
+               inputMask):
     """
     Constructor
 

Modified: trunk/gnue-forms/src/input/displayHandlers/DateTime.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/DateTime.py      2006-12-12 
13:16:18 UTC (rev 9133)
+++ trunk/gnue-forms/src/input/displayHandlers/DateTime.py      2006-12-12 
13:32:21 UTC (rev 9134)
@@ -51,7 +51,8 @@
   """
   def __init__(self, entry, eventHandler, subEventHandler, displayMask,
                inputMask):
-    BaseCursor.__init__(self, entry, eventHandler, subEventHandler)
+    BaseCursor.__init__(self, entry, eventHandler, subEventHandler,
+            displayMask, inputMask)
     self.__displayMask = displayMask
     self.__inputMask = inputMask
 

Modified: trunk/gnue-forms/src/input/displayHandlers/Dropdown.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Dropdown.py      2006-12-12 
13:16:18 UTC (rev 9133)
+++ trunk/gnue-forms/src/input/displayHandlers/Dropdown.py      2006-12-12 
13:32:21 UTC (rev 9134)
@@ -38,7 +38,8 @@
   def __init__(self, entry, eventHandler, subEventHandler, displayMask,
                inputMask):
 
-    BaseCursor.__init__(self, entry, eventHandler, subEventHandler)
+    BaseCursor.__init__(self, entry, eventHandler, subEventHandler,
+            displayMask, inputMask)
 
     # My events...
     self.subEventHandler.registerEventListeners( {
@@ -47,16 +48,3 @@
 
   def _comboDropped(self, event):
     self.beginEdit()
-
-  def beginEdit(self):
-
-    if self.editing == True and self.modified == False:
-      return
-
-    self.editing = self.field.isEditable()
-    self.modified = False
-    self.work = self.field.get_value() or u""
-    self.display = self.build_display(self.work, True)
-    self._cursor = len(self.display)
-    self.setSelectionArea(0, self._cursor)
-    self.generateRefreshEvent()

Modified: trunk/gnue-forms/src/input/displayHandlers/Image.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Image.py 2006-12-12 13:16:18 UTC 
(rev 9133)
+++ trunk/gnue-forms/src/input/displayHandlers/Image.py 2006-12-12 13:32:21 UTC 
(rev 9134)
@@ -41,17 +41,6 @@
   """
   Display handler responsible for handling image style entries.
   """
-  def __init__(self, entry, eventHandler, subEventHandler):
-    """
-    Constructor
-    
-    @param entry: The GFImage instance associated with this handler
-    @param eventHandler: The 
-    @param subEventHandler: The event handler this display helper will 
-                            user to register it's listeners.
-    """
-    BaseCursor.__init__(self, entry, eventHandler, subEventHandler)
-
   def build_display(self, value, editing):
     """
     Opens and returns a PIL Image for the requested url

Modified: trunk/gnue-forms/src/input/displayHandlers/Listbox.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Listbox.py       2006-12-12 
13:16:18 UTC (rev 9133)
+++ trunk/gnue-forms/src/input/displayHandlers/Listbox.py       2006-12-12 
13:32:21 UTC (rev 9134)
@@ -33,25 +33,4 @@
 # Handler for Listbox types
 #
 class Listbox(BaseCursor):
-
-  def __init__(self, entry, eventHandler, subEventHandler, displayMask,
-               inputMask):
-
-    BaseCursor.__init__(self, entry, eventHandler, subEventHandler)
-
-    # My events...
-    self.subEventHandler.registerEventListeners( {
-           'requestREPLACEVALUE' : self._replaceText } )
-
-
-  def beginEdit(self):
-    self.editing = self.field.isEditable()
-    self.modified = False
-    self.work = self.field.get_value()
-    display = self.build_display(self.work, True)
-    self._cursor = len(self.display)
-
-  def _replaceText(self, event):
-    self._selection1 = 0
-    self._selection2 = len(self.display)
-    self._addText(event)
+    pass

Modified: trunk/gnue-forms/src/input/displayHandlers/Numeric.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Numeric.py       2006-12-12 
13:16:18 UTC (rev 9133)
+++ trunk/gnue-forms/src/input/displayHandlers/Numeric.py       2006-12-12 
13:32:21 UTC (rev 9134)
@@ -35,11 +35,7 @@
   """
   Class to handle the display and entry of numeric fields.
   """
-  def __init__(self, entry, eventHandler, subEventHandler, displayMask,
-               inputMask):
-    BaseCursor.__init__(self, entry, eventHandler, subEventHandler)
 
-
   def parse_display(self, display):
     if not len(display):
         return None

Modified: trunk/gnue-forms/src/input/displayHandlers/Password.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Password.py      2006-12-12 
13:16:18 UTC (rev 9133)
+++ trunk/gnue-forms/src/input/displayHandlers/Password.py      2006-12-12 
13:32:21 UTC (rev 9134)
@@ -37,29 +37,7 @@
   have been displayed with *s.  Also disables cut and paste functionality
   as a security percaution.
   """  
-  def __init__(self, entry, eventHandler, subEventHandler, displayMask,
-               inputMask):
-    """
-    Class initializer.
-    """
-    BaseCursor.__init__(self, entry, eventHandler, subEventHandler)
 
-  def beginEdit(self):
-    """
-    Notifies the handler that it will be doing edits.
-    
-    Serves the same function as the method in FieldDisplayHandler
-    except for the initial display value?
-    """
-    self.editing = self.field.isEditable()
-    self.modified = False
-    self.work = self.field.get_value() or u""
-    self.display = self.build_display(self.work, True)
-    self.cursor = len(self.display)
-    self.setSelectionArea(0, self.cursor)
-    self.generateRefreshEvent()
-
-
   def build_display(self, value, editing):
     """
     Builds a string that represents what should be 
@@ -67,7 +45,7 @@
 
     For password entry fields this is simply a string of *s
     """
-    if value == None:
+    if value is None:
       return ""
     else:
       return "*" * len(str(value))

Modified: trunk/gnue-forms/src/input/displayHandlers/Text.py
===================================================================
--- trunk/gnue-forms/src/input/displayHandlers/Text.py  2006-12-12 13:16:18 UTC 
(rev 9133)
+++ trunk/gnue-forms/src/input/displayHandlers/Text.py  2006-12-12 13:32:21 UTC 
(rev 9134)
@@ -30,11 +30,4 @@
 from gnue.forms.input.displayHandlers.Cursor import BaseCursor
 
 class Text(BaseCursor):
-  """
-  Basic string display handler.
-  
-  Deals the standard text data.
-  """
-  def __init__(self, entry, eventHandler, subEventHandler, displayMask,
-               inputMask):
-    BaseCursor.__init__(self, entry, eventHandler, subEventHandler)
+    pass