[gnue] r9184 - trunk/gnue-forms/src/GFObjects

[reinhard]

Author: reinhard
Date: 2006-12-21 03:28:49 -0600 (Thu, 21 Dec 2006)
New Revision: 9184

Modified:
   trunk/gnue-forms/src/GFObjects/GFBlock.py
   trunk/gnue-forms/src/GFObjects/GFField.py
Log:
Removed GFBlock._fieldList, initialize GFBlock._fieldMap more directly.


Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py   2006-12-21 08:38:03 UTC (rev 
9183)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py   2006-12-21 09:28:49 UTC (rev 
9184)
@@ -127,17 +127,13 @@
         # Flag set to True while a query is running.
         self.__in_query = False
 
-        # A list of all GFScrollbar objects bound to this block
+        # A list of all GFScrollbar objects bound to this block.
         self.__scrollbars = []
 
         # List of all entries bound to this block, populated by GFEntry's
         # initialize
         self._entryList = []            # FIXME: make private!
 
-        # List of all fields bound to this block, populated by GFField's
-        # initialize
-        self._fieldList = []            # FIXME: make private!
-
         # All fields of this block by name.
         self._fieldMap = {}             # FIXME: make private!
 
@@ -221,6 +217,10 @@
         if hasattr(self,'datasource'):
             self.datasource = self.datasource.lower()
 
+        # Build a list and a dictionary of all fields in this block
+        for field in self.findChildrenOfType('GFField', includeSelf=False):
+            self._fieldMap[field.name] = field
+
         return GFContainer._buildObject(self)
 
 
@@ -401,7 +401,7 @@
 
     def __fire_record_trigger(self, trigger):
         self.processTrigger(trigger)
-        for field in self._fieldList:
+        for field in self._fieldMap.itervalues():
             field.processTrigger(trigger)
 
 
@@ -585,7 +585,7 @@
         for block in maxList[:-1]:
 
             block.processTrigger('PRE-QUERY')
-            for field in block._fieldList:
+            for field in block._fieldMap.itervalues():
                 field.processTrigger('PRE-QUERY')
 
             c = block.__generate_conditional()
@@ -608,7 +608,7 @@
 
         for block in self._logic._blockList:
             block.processTrigger('POST-QUERY')
-            for field in block._fieldList:
+            for field in block._fieldMap.itervalues():
                 field.processTrigger('POST-QUERY')
 
     # -------------------------------------------------------------------------
@@ -1349,7 +1349,7 @@
 
     def __new_current_record(self):
 
-        for field in self._fieldList:
+        for field in self._fieldMap.itervalues():
             field._event_new_current_record()
 
 

Modified: trunk/gnue-forms/src/GFObjects/GFField.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFField.py   2006-12-21 08:38:03 UTC (rev 
9183)
+++ trunk/gnue-forms/src/GFObjects/GFField.py   2006-12-21 09:28:49 UTC (rev 
9184)
@@ -129,8 +129,6 @@
         GFObj.GFObj._phase_1_init_(self)
 
         self._block = self.findParentOfType ('GFBlock')
-        self._block._fieldMap [self.name] = self
-        self._block._fieldList.append (self)
 
         # Convert depreciated "typecast" attribute to new "type" attribute
         if hasattr(self, 'typecast'):