gnue/common/src GObjects.py GTrigger.py

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/01/30 10:23:56

Modified files:
        common/src     : GObjects.py GTrigger.py 

Log message:
        Trigger work being commited so jcater and I can discuss direction

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GObjects.py.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GTrigger.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnue/common/src/GObjects.py
diff -c gnue/common/src/GObjects.py:1.24 gnue/common/src/GObjects.py:1.25
*** gnue/common/src/GObjects.py:1.24    Fri Jan 25 22:18:11 2002
--- gnue/common/src/GObjects.py Wed Jan 30 10:23:56 2002
***************
*** 46,59 ****
  import types
  from GParserHelpers import GContent
  import GTypecast
  
  #
  # Class GObj
  #
  # Base class for GNUe objects which can be represented as XML
  #
! class GObj:
    def __init__(self, parent=None, type='GObj'):
      self._type = type
      self._parent = parent
      self._children = []
--- 46,61 ----
  import types
  from GParserHelpers import GContent
  import GTypecast
+ from GTrigger import GTriggerCore
  
  #
  # Class GObj
  #
  # Base class for GNUe objects which can be represented as XML
  #
! class GObj(GTriggerCore):
    def __init__(self, parent=None, type='GObj'):
+     GTriggerCore.__init__(self)
      self._type = type
      self._parent = parent
      self._children = []
***************
*** 62,73 ****
      if parent :
        parent.addChild(self)
  
-     # Trigger namespace extensions
-     self._triggerGlobal = 0 
-     self._triggerTransparent = 0
-     self._triggerNamespace = {}
-     self._triggerProperties = {}
-     
    #
    # phaseInit
    #
--- 64,69 ----
Index: gnue/common/src/GTrigger.py
diff -c gnue/common/src/GTrigger.py:1.2 gnue/common/src/GTrigger.py:1.3
*** gnue/common/src/GTrigger.py:1.2     Mon Jan 28 19:57:15 2002
--- gnue/common/src/GTrigger.py Wed Jan 30 10:23:56 2002
***************
*** 35,40 ****
--- 35,53 ----
  from gnue.common import GConfig, GTypecast
  from xml.sax import saxutils
  
+ #
+ # GTriggerCore
+ #
+ # A base class inherited by GObj.  It's only purpose
+ # is to keep all the trigger code in one place instead
+ # of tacking some trigger code into GObj directly
+ #
+ class GTriggerCore:
+   def __init__(self):
+     self._triggerGlobal = 0
+     self._triggerTransparent = 0
+     self._triggerNamespace = {}
+     self._triggerProperties = {}
  
  
  #
***************
*** 43,56 ****
  #
  #
  
! class GTriggerObject:
    # This needs to be overwritten to fill in the values
    # of a specific GTriggerAttribute via it's _set function
    #
    def __setattr__(self, name, value):
      pass
      
- 
  class GTriggerFunction:
    def __init__(self, name, functionLink):
      self._name = name
--- 56,90 ----
  #
  #
  
! #
! # GTriggerNamespace
! #
! # Manager class for a namespace.  Passed a GObj based
! # tree at __init__ which it uses to construct a new
! # GTriggerObject based tree
! #
! class GTriggerNamespace(GObj):
!   def __init__(self,objectTree = None):
!     if objectTree:
!       self.walk(self.constructTriggerObjectTree)
!     else:
!       print "ERROR!"
! 
!   def constructTriggerObjectTree(self, object):
!     print object.name
! 
! #
! # GTriggerObject
! #
! # Inherrits GObj to gain it's parent/child system
! #
! class GTriggerObject(GObj):
    # This needs to be overwritten to fill in the values
    # of a specific GTriggerAttribute via it's _set function
    #
    def __setattr__(self, name, value):
      pass
      
  class GTriggerFunction:
    def __init__(self, name, functionLink):
      self._name = name