[gnue] r8548 - trunk/gnue-common/src/logic

[reinhard]

Author: reinhard
Date: 2006-08-02 04:52:46 -0500 (Wed, 02 Aug 2006)
New Revision: 8548

Modified:
   trunk/gnue-common/src/logic/GTrigger.py
   trunk/gnue-common/src/logic/usercode.py
Log:
Moved finding of the root object from _buildObject to phaseInit, because the
parent of the parent is still wrong in _buildObject for children of imported
objects.


Modified: trunk/gnue-common/src/logic/GTrigger.py
===================================================================
--- trunk/gnue-common/src/logic/GTrigger.py     2006-08-01 13:53:35 UTC (rev 
8547)
+++ trunk/gnue-common/src/logic/GTrigger.py     2006-08-02 09:52:46 UTC (rev 
8548)
@@ -82,9 +82,7 @@
 
         UserCode.__init__(self, parent, 'GCTrigger')
 
-        self._inits = [self.__initialize]
 
-
     # -------------------------------------------------------------------------
     # Nice string representation
     # -------------------------------------------------------------------------
@@ -98,8 +96,10 @@
     # Phase 1 initialization
     # -------------------------------------------------------------------------
 
-    def __initialize(self):
+    def _initialize_(self):
 
+        UserCode._initialize_(self)
+
         if self.type != "NAMED":
             if self.getParent():
                 self.getParent().associateTrigger(self.type, self)

Modified: trunk/gnue-common/src/logic/usercode.py
===================================================================
--- trunk/gnue-common/src/logic/usercode.py     2006-08-01 13:53:35 UTC (rev 
8547)
+++ trunk/gnue-common/src/logic/usercode.py     2006-08-02 09:52:46 UTC (rev 
8548)
@@ -72,18 +72,21 @@
 
         self.__function = None
 
+        self._inits = [self._initialize_]
 
+
     # -------------------------------------------------------------------------
-    # Build object
+    # Phase 1 init
     # -------------------------------------------------------------------------
 
-    def _buildObject(self):
+    def _initialize_(self):
 
         # Find the next GRootObj. This can be, for example, either a <form> or
         # a <dialog> within a <form>. This must be done because every dialog
         # has its own global trigger namespace and its own trigger dictionary.
-        # This cannot be done in __init__ because for imported objects, the
-        # parent changes between __init__ and _buildObject.
+        # This cannot be done in __init__ or _buildObject, because for imported
+        # objects (or for their children), the parent changes between __init__
+        # and the phaseInit.
         parent = self.getParent()
         while not isinstance(parent, GRootObj.GRootObj) \
                 and parent.getParent() is not None:
@@ -186,26 +189,15 @@
                     'get': self.__trigger_get_enabled,
                     'set': self.__trigger_set_enabled}}
 
-        self._inits = [self.__initialize]
 
-
     # -------------------------------------------------------------------------
-    # Build object
-    # -------------------------------------------------------------------------
-
-    def _buildObject(self):
-
-        result = UserCode._buildObject(self)
-        self._root._actions[self.name] = self
-        return result
-
-
-    # -------------------------------------------------------------------------
     # Phase 1 initialization
     # -------------------------------------------------------------------------
 
-    def __initialize(self):
+    def _initialize_(self):
 
+        UserCode._initialize_(self)
+        self._root._actions[self.name] = self
         self.compile([])