gnue/gnuef/src GFForm.py GFParser.py GFTrigger.py

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/06/07 18:22:12

Modified files:
        gnuef/src      : GFForm.py GFParser.py GFTrigger.py 

Log message:
        Updated problem with GFTrigger reference

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFForm.py.diff?cvsroot=OldCVS&tr1=1.98&tr2=1.99&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFParser.py.diff?cvsroot=OldCVS&tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFTrigger.py.diff?cvsroot=OldCVS&tr1=1.28&tr2=1.29&r1=text&r2=text

Patches:
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.98 gnue/gnuef/src/GFForm.py:1.99
--- gnue/gnuef/src/GFForm.py:1.98       Thu Jun  7 09:58:15 2001
+++ gnue/gnuef/src/GFForm.py    Thu Jun  7 18:22:12 2001
@@ -41,7 +41,7 @@
 from GFError import DBError
 from GFTriggerError import *
 from GFLibrary import * 
-import GFParser, GFTrigger
+import GFParser
 import GFTrigger
 
 class GFForm(GFObj, GFEventAware):
@@ -105,7 +105,7 @@
     
     for block in self._blockList:
       try:
-        self._triggerns[block.name] = GFTriggerHelper( block )
+        self._triggerns[block.name] = GFTrigger.GFTriggerHelper( block )
       except AttributeError: pass
 
     for key in self._datasourceDictionary.keys():
Index: gnue/gnuef/src/GFParser.py
diff -u gnue/gnuef/src/GFParser.py:1.29 gnue/gnuef/src/GFParser.py:1.30
--- gnue/gnuef/src/GFParser.py:1.29     Thu Jun  7 09:58:15 2001
+++ gnue/gnuef/src/GFParser.py  Thu Jun  7 18:22:12 2001
@@ -32,7 +32,7 @@
 from gnue.common.GParser import *
 from gnue.common import GDataSource
 
-from GFTrigger import *
+import GFTrigger
 from GFObjects import *
 from GFForm import *
 import GFObjects
@@ -144,10 +144,12 @@
                                      'height':      (1, 0, int,  None), 
                                      'x':           (1, 0, int,  None), 
                                      'y':           (1, 0, int,  None)}, 1), 
-      'trigger':    (GFTrigger,    { 'id':          (0, 1, char, None), 
+      'trigger':    (GFTrigger.GFTrigger, 
+                                   { 'name':        (0, 1, char, None), 
+                                     'id':          (0, 0, char, None),  # 
DEPRECATED: Use name instead
                                      'type':        (0, 0, char, None), 
                                      'src':         (0, 0, char, None), 
-                                     'language':    (0, 0, char,'python')},0),
+                                     'language':    (0, 0, char,'python')} ,0),
       'options':    (GFObjects.GFOptions,    {                           }, 
1), 
       'option':     (GFOption,     { 'name':        (1, 0, char, None)}, 1), 
       'title':      (GFOption,     { 'name':        (0, 0, char, 'title')}, 
1), 
Index: gnue/gnuef/src/GFTrigger.py
diff -u gnue/gnuef/src/GFTrigger.py:1.28 gnue/gnuef/src/GFTrigger.py:1.29
--- gnue/gnuef/src/GFTrigger.py:1.28    Thu Jun  7 09:58:15 2001
+++ gnue/gnuef/src/GFTrigger.py Thu Jun  7 18:22:12 2001
@@ -83,7 +83,7 @@
 # Class used to implement triggers
 #
 class GFTrigger(GFEventAware, GObj):
-  def __init__(self, parent=None, type=None, id=None, src=None):
+  def __init__(self, parent=None, type=None, name=None, src=None):
     GFEventAware.__init__(self)
 
     GObj.__init__(self, parent)
@@ -94,12 +94,17 @@
     self._triggerns={}
     self.src = src
     self.type = type  
-    self.id = id
+    self.name = name
     if self.type: 
       buildObject()
 
   def buildObject (self): 
     self.type=string.upper(self.type)
+  
+    if hasattr(self, 'id'): 
+      if self.name == None: 
+        self.name = self.id
+      del self.__dict__['id']
 
     self.__call__ = self.dummyFunction
 
@@ -107,7 +112,7 @@
       if self._parent:
         self._parent.addTrigger( self.type, self )
     else:
-      self.getParentOfType('GFForm')._triggerDictionary[self.id] = self
+      self.findParentOfType('GFForm')._triggerDictionary[self.name] = self
 
     if self.src == None: 
       self.setFunction( self.getChildrenAsContent(), self.language )