gnue/designer/src/reports FilterSupport.py Inst...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/12/21 01:30:28

Modified files:
        designer/src/reports: FilterSupport.py Instance.py 
        designer/src/reports/Standard: FilterSupport.py 
Added files:
        designer/src/reports/Standard: Incubator.py 

Log message:
        added support for filter-specific incubators

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/reports/FilterSupport.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/reports/Instance.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/reports/Standard/Incubator.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/reports/Standard/FilterSupport.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnue/designer/src/reports/FilterSupport.py
diff -c gnue/designer/src/reports/FilterSupport.py:1.1 
gnue/designer/src/reports/FilterSupport.py:1.2
*** gnue/designer/src/reports/FilterSupport.py:1.1      Fri Dec 20 21:49:57 2002
--- gnue/designer/src/reports/FilterSupport.py  Sat Dec 21 01:30:28 2002
***************
*** 26,33 ****
--- 26,36 ----
  # NOTES:
  #
  
+ from Incubator import Incubator as _Incubator
+ 
  class FilterSupport:
    NAMESPACE = ""
+   INCUBATORCLASS = _Incubator
  
    def __init__(self, instance, report):
      self.instance = instance
Index: gnue/designer/src/reports/Instance.py
diff -c gnue/designer/src/reports/Instance.py:1.10 
gnue/designer/src/reports/Instance.py:1.11
*** gnue/designer/src/reports/Instance.py:1.10  Fri Dec 20 23:52:32 2002
--- gnue/designer/src/reports/Instance.py       Sat Dec 21 01:30:28 2002
***************
*** 29,35 ****
  
  from gnue.designer.reports import properties as reportsProperties
  from gnue.designer.base.Instance import BaseInstance
- from Incubator import Incubator
  import wizards
  
  # Tool support...
--- 29,34 ----
***************
*** 48,54 ****
  class Instance(BaseInstance):
  
    def __init__(self, app, *args, **params):
-     self.incubator = Incubator(self)
      self.properties = reportsProperties
  
      #self._tableMappings = {}
--- 47,52 ----
***************
*** 69,74 ****
--- 67,73 ----
        filtersupport = dyn_import('Default.FilterSupport')
  
      self.filter = filtersupport.FilterSupport(self, report)
+     self.incubator = self.filter.INCUBATOR(self)
  
      return report
  
***************
*** 82,88 ****
--- 81,90 ----
      GRLayout.GRLayout(report)._buildObject()
  
      from Standard.FilterSupport import FilterSupport
+ 
      self.filter = FilterSupport(self, report)
+     self.incubator = self.filter.INCUBATORCLASS(self)
+ 
      self.filter.initAsNew()
  
      report._buildObject()
***************
*** 94,100 ****
  
  
    def createTools(self):
- #    self.addTool('visualEditor',   _('Layout Editor'), LayoutEditor, 'F11')
      self.addTool('propertyEditor', _('Property Inspector'), PropertyEditor, 
'F10')
      self.addTool('treeEditor',     _('Object Navigator'), TreeView, 'F8')
      self.addTool('schemaViewer',   _('Schema Navigator'), SchemaViewer)
--- 96,101 ----
***************
*** 105,112 ****
      self.addToolSeparator()
      self.addTool('eventEditor',    _('Trigger Inspector'), EventEditor, 'F7')
      self.addTool('triggerEditor',  _('Code Editor'), TriggerEditor, 'F12')
!     
!     # Add filter-specific tools 
      self.filter.addTools()
  
  
--- 106,113 ----
      self.addToolSeparator()
      self.addTool('eventEditor',    _('Trigger Inspector'), EventEditor, 'F7')
      self.addTool('triggerEditor',  _('Code Editor'), TriggerEditor, 'F12')
! 
!     # Add filter-specific tools
      self.filter.addTools()
  
  
Index: gnue/designer/src/reports/Standard/FilterSupport.py
diff -c gnue/designer/src/reports/Standard/FilterSupport.py:1.1 
gnue/designer/src/reports/Standard/FilterSupport.py:1.2
*** gnue/designer/src/reports/Standard/FilterSupport.py:1.1     Fri Dec 20 
21:49:57 2002
--- gnue/designer/src/reports/Standard/FilterSupport.py Sat Dec 21 01:30:28 2002
***************
*** 28,37 ****
--- 28,39 ----
  
  from gnue.designer.reports.FilterSupport import FilterSupport as 
_BaseFilterSupport
  from GroupEditor import GroupEditor
+ from Incubator import Incubator as _Incubator
  
  class FilterSupport(_BaseFilterSupport):
  
    NAMESPACE = 'GNUe:Reports:Standard'
+   INCUBATORCLASS = _Incubator
  
    def init(self):
      # EventAware provided by ToolPanel