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

[reinhard]

Author: reinhard
Date: 2006-04-19 07:10:43 -0500 (Wed, 19 Apr 2006)
New Revision: 8431

Modified:
   trunk/gnue-common/src/logic/GTrigger.py
   trunk/gnue-common/src/logic/GTriggerCore.py
Log:
Clean up variable use, nice repr() for xml objects.


Modified: trunk/gnue-common/src/logic/GTrigger.py
===================================================================
--- trunk/gnue-common/src/logic/GTrigger.py     2006-04-19 11:50:43 UTC (rev 
8430)
+++ trunk/gnue-common/src/logic/GTrigger.py     2006-04-19 12:10:43 UTC (rev 
8431)
@@ -280,7 +280,7 @@
         if self.__triggers.has_key(key):
             for function in self.__triggers[key]:
                 try:
-                    return function(self = self._namespace_object)
+                    return function(self = self.get_namespace_object)
                 except language.AbortRequest:
                     if not ignoreAbort:
                         raise

Modified: trunk/gnue-common/src/logic/GTriggerCore.py
===================================================================
--- trunk/gnue-common/src/logic/GTriggerCore.py 2006-04-19 11:50:43 UTC (rev 
8430)
+++ trunk/gnue-common/src/logic/GTriggerCore.py 2006-04-19 12:10:43 UTC (rev 
8431)
@@ -83,10 +83,32 @@
         self._triggerFunctions = {}
         self._triggerProperties = {}
 
-        self._namespace_object = None
+        self.__namespace_name = '<uninitialized object>'
+        self.__namespace_object = None
 
 
     # -------------------------------------------------------------------------
+    # Nice string representation
+    # -------------------------------------------------------------------------
+
+    def __repr__(self):
+
+        return self.__namespace_name
+
+
+    # -------------------------------------------------------------------------
+    # Get the namespace object belonging to this XML object
+    # -------------------------------------------------------------------------
+
+    def get_namespace_object(self):
+        """
+        Return the namespace object that mirrors this object in the
+        action/trigger namespace.
+        """
+        return self.__namespace_object
+
+
+    # -------------------------------------------------------------------------
     # Construct a namespace object tree for an XML object tree
     # -------------------------------------------------------------------------
 
@@ -133,8 +155,9 @@
             self.__add_children(self._children, namespace_object,
                     global_namespace, namespace_name)
 
-        # Remember the namespace object
-        self._namespace_object = namespace_object
+        # Remember the namespace name and the namespace object
+        self.__namespace_name = namespace_name
+        self.__namespace_object = namespace_object
 
         # Add the namespace object to global namespace if the xml object
         # requests it and the object has a name