gnue/reports/src/base/layout GRLayout.py GRLayo...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/01/02 10:43:13

Modified files:
        reports/src/base/layout: GRLayout.py GRLayoutElement.py 

Log message:
        moved the init stuff to prepare

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/base/layout/GRLayout.py.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/base/layout/GRLayoutElement.py.diff?tr1=1.53&tr2=1.54&r1=text&r2=text

Patches:
Index: gnue/reports/src/base/layout/GRLayout.py
diff -c gnue/reports/src/base/layout/GRLayout.py:1.53 
gnue/reports/src/base/layout/GRLayout.py:1.54
*** gnue/reports/src/base/layout/GRLayout.py:1.53       Wed Jan  1 21:36:52 2003
--- gnue/reports/src/base/layout/GRLayout.py    Thu Jan  2 10:43:13 2003
***************
*** 102,107 ****
--- 102,109 ----
    def __prepare(self, object):
      if isinstance(object, GRLayoutElement):
  
+       object.prepare()
+ 
        # This all looks confusing, but basically it simply figures out
        # what section a field or summary actually pulls from and also
        # makes sure a section, field, or summary isn't trying to use
Index: gnue/reports/src/base/layout/GRLayoutElement.py
diff -c gnue/reports/src/base/layout/GRLayoutElement.py:1.53 
gnue/reports/src/base/layout/GRLayoutElement.py:1.54
*** gnue/reports/src/base/layout/GRLayoutElement.py:1.53        Wed Jan  1 
21:36:52 2003
--- gnue/reports/src/base/layout/GRLayoutElement.py     Thu Jan  2 10:43:13 2003
***************
*** 48,54 ****
      self.name = None
      self._source = None
      self._mymapper = None
-     self._inits = [self.primaryInit]
  
    # Called if section contains data
    def process(self, dest, *args, **parms):
--- 48,53 ----
***************
*** 71,77 ****
    def _process(self, dest, mapper, isfirst, islast, firstSection, 
nextSection):
      return nextSection
  
!   def primaryInit(self):
      if hasattr(self,'source') and self.source is not None:
        self._source = self.source
      else:
--- 70,76 ----
    def _process(self, dest, mapper, isfirst, islast, firstSection, 
nextSection):
      return nextSection
  
!   def prepare(self):
      if hasattr(self,'source') and self.source is not None:
        self._source = self.source
      else:
***************
*** 84,87 ****
--- 83,87 ----
        # Avoid any overhead if this element doesn't
        # contain namespace-qualified attributes
        self.process = self._process
+     return GObj._buildObject(self)