[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue appserver/src/_featuretest/Objects.py comm...
|
From: |
Jason Cater |
|
Subject: |
gnue appserver/src/_featuretest/Objects.py comm... |
|
Date: |
Sat, 02 Nov 2002 01:02:02 -0500 |
CVSROOT: /home/cvs
Module name: gnue
Changes by: Jason Cater <address@hidden> 02/11/02 01:02:01
Modified files:
appserver/src/_featuretest: Objects.py
common/src : GRootObj.py
common/src/schema: Objects.py
forms/src : GFForm.py
integrator/src : GIObjects.py
navigator/src : GNObjects.py
reports/src : GRReport.py
Added files:
designer/src/projects: Objects.py Parser.py Project.py
__init__.py
Log message:
moved the dumpXML root call into GRootObj, so each tool doesn't have to
redefine dumpXML()
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/appserver/src/_featuretest/Objects.py.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/common/src/GRootObj.py.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/common/src/schema/Objects.py.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/projects/Objects.py?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/projects/Parser.py?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/projects/Project.py?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/projects/__init__.py?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFForm.py.diff?cvsroot=OldCVS&tr1=1.193&tr2=1.194&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/integrator/src/GIObjects.py.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/navigator/src/GNObjects.py.diff?cvsroot=OldCVS&tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/reports/src/GRReport.py.diff?cvsroot=OldCVS&tr1=1.24&tr2=1.25&r1=text&r2=text
Patches:
Index: gnue/appserver/src/_featuretest/Objects.py
diff -c gnue/appserver/src/_featuretest/Objects.py:1.2
gnue/appserver/src/_featuretest/Objects.py:1.3
*** gnue/appserver/src/_featuretest/Objects.py:1.2 Mon Sep 16 00:44:03 2002
--- gnue/appserver/src/_featuretest/Objects.py Sat Nov 2 01:02:01 2002
***************
*** 1,40 ****
! # GNU Enterprise Application Server -
#
# Copyright 2002 Free Software Foundation, Inc.
#
# This file is part of GNU Enterprise.
#
! # GNU Enterprise is free software; you can redistribute it
! # and/or modify it under the terms of the GNU General Public
! # License as published by the Free Software Foundation; either
# version 2, or (at your option) any later version.
#
! # GNU Enterprise is distributed in the hope that it will be
! # useful, but WITHOUT ANY WARRANTY; without even the implied
! # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
# PURPOSE. See the GNU General Public License for more details.
#
! # You should have received a copy of the GNU General Public
! # License along with program; see the file COPYING. If not,
! # write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
! # $Id: Objects.py,v 1.2 2002/09/16 04:44:03 baumannd Exp $
from gnue.common.GObjects import GObj
import GodlParser
class GodlObject(GObj):
pass
! class GodlSpec(GodlObject):
def __init__(self, parent=None):
GodlObject.__init__(self, parent, type='GodlSpec')
- def dumpXML(self, treeDump=1, gap=" "):
- return GodlObject.dumpXML(self,
- GodlParser.getXMLelements(), treeDump, gap, xmlnamespaces={})
-
class GodlDefinition(GodlObject):
def __init__(self, parent):
GodlObject.__init__(self, parent, type='GodlDefinition')
--- 1,38 ----
! # GNU Enterprise Application Server -
#
# Copyright 2002 Free Software Foundation, Inc.
#
# This file is part of GNU Enterprise.
#
! # GNU Enterprise is free software; you can redistribute it
! # and/or modify it under the terms of the GNU General Public
! # License as published by the Free Software Foundation; either
# version 2, or (at your option) any later version.
#
! # GNU Enterprise is distributed in the hope that it will be
! # useful, but WITHOUT ANY WARRANTY; without even the implied
! # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
# PURPOSE. See the GNU General Public License for more details.
#
! # You should have received a copy of the GNU General Public
! # License along with program; see the file COPYING. If not,
! # write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
! # $Id: Objects.py,v 1.3 2002/11/02 06:02:01 jcater Exp $
from gnue.common.GObjects import GObj
+ from gnue.common.GRootObj import GRootObj
import GodlParser
class GodlObject(GObj):
pass
! class GodlSpec(GRootObj, GodlObject):
def __init__(self, parent=None):
+ GRootObj.__init__(self, 'odlspec', GodlParser.getXMLelements)
GodlObject.__init__(self, parent, type='GodlSpec')
class GodlDefinition(GodlObject):
def __init__(self, parent):
GodlObject.__init__(self, parent, type='GodlDefinition')
Index: gnue/common/src/GRootObj.py
diff -c gnue/common/src/GRootObj.py:1.4 gnue/common/src/GRootObj.py:1.5
*** gnue/common/src/GRootObj.py:1.4 Sun Oct 20 14:55:49 2002
--- gnue/common/src/GRootObj.py Sat Nov 2 01:02:01 2002
***************
*** 31,50 ****
from gnue.common.GTrigger import GTriggerNamespace
#
# GRootObj
#
#
! class GRootObj:
! def __init__(self, rootName="root"):
self._triggerNamespaceTree = None
self._rname = rootName
!
# This will store any "global myVar" that the triggers execute.
self._globalRuntimeNamespace = {}
def initTriggerSystem(self):
self._triggerNamespaceTree = GTriggerNamespace(self,rootName=self._rname)
--- 31,56 ----
from gnue.common.GTrigger import GTriggerNamespace
+ from gnue.common.GObjects import GObj
#
# GRootObj
#
#
! class GRootObj(GObj):
! def __init__(self, rootName, xmlElementCallback):
self._triggerNamespaceTree = None
self._rname = rootName
! self.__xmlElementCallback = xmlElementCallback
!
# This will store any "global myVar" that the triggers execute.
self._globalRuntimeNamespace = {}
def initTriggerSystem(self):
self._triggerNamespaceTree = GTriggerNamespace(self,rootName=self._rname)
+
+ def dumpXML(self, treeDump=1, gap=" "):
+ return GObj.dumpXML(self, self.__xmlElementCallback(),
+ treeDump, gap, xmlnamespaces={})
Index: gnue/common/src/schema/Objects.py
diff -c gnue/common/src/schema/Objects.py:1.5
gnue/common/src/schema/Objects.py:1.6
*** gnue/common/src/schema/Objects.py:1.5 Wed Jul 24 11:23:36 2002
--- gnue/common/src/schema/Objects.py Sat Nov 2 01:02:01 2002
***************
*** 28,45 ****
#
from gnue.common.GObjects import GObj
import GSParser
class GSObject(GObj):
pass
! class GSSchema(GSObject):
def __init__(self, parent=None):
GSObject.__init__(self, parent, type='GSSchema')
-
- def dumpXML(self, treeDump=1, gap=" "):
- return GSObject.dumpXML(self,
- GSParser.getXMLelements(), treeDump, gap, xmlnamespaces={})
class GSTables(GSObject):
def __init__(self, parent):
--- 28,43 ----
#
from gnue.common.GObjects import GObj
+ from gnue.common.GRootObj import GRootObj
import GSParser
class GSObject(GObj):
pass
! class GSSchema(GRootObj, GSObject):
def __init__(self, parent=None):
+ GRootObj.__init__(self, 'schema', GSParser.getXMLelements)
GSObject.__init__(self, parent, type='GSSchema')
class GSTables(GSObject):
def __init__(self, parent):
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.193 gnue/forms/src/GFForm.py:1.194
*** gnue/forms/src/GFForm.py:1.193 Fri Nov 1 00:02:48 2002
--- gnue/forms/src/GFForm.py Sat Nov 2 01:02:01 2002
***************
*** 46,54 ****
# Defines which objects are "Tab Stops"
TabStops = ('GFEntry','GFButton')
! class GFForm(GFObj, GRootObj, events.EventAware):
def __init__(self, parent=None, app=None):
! GRootObj.__init__(self, 'form')
GFObj.__init__(self, parent)
self._type = "GFForm"
self._currentObject = [self]
--- 46,54 ----
# Defines which objects are "Tab Stops"
TabStops = ('GFEntry','GFButton')
! class GFForm(GRootObj, GFObj, events.EventAware):
def __init__(self, parent=None, app=None):
! GRootObj.__init__(self, 'form', GFParser.getXMLelements)
GFObj.__init__(self, parent)
self._type = "GFForm"
self._currentObject = [self]
***************
*** 701,710 ****
def toggleInsertMode(self):
self._insertMode = not self._insertMode
-
- def dumpXML(self, treeDump=1, gap=" "):
- return GObj.dumpXML(self, GFParser.getXMLelements(), treeDump, gap)
-
def triggerSetFocus(self,object):
# print _("If i was working then %s would now have focus") % object._object
--- 701,706 ----
Index: gnue/integrator/src/GIObjects.py
diff -c gnue/integrator/src/GIObjects.py:1.1
gnue/integrator/src/GIObjects.py:1.2
*** gnue/integrator/src/GIObjects.py:1.1 Wed Sep 18 20:17:57 2002
--- gnue/integrator/src/GIObjects.py Sat Nov 2 01:02:01 2002
***************
*** 28,34 ****
#
import sys, string, os, os.path
! from gnue.common import GObjects, GDebug, GConfig
from gnue.reports import GREngine,GRExceptions
import GIParser
--- 28,34 ----
#
import sys, string, os, os.path
! from gnue.common import GObjects, GDebug, GConfig, GRootObj
from gnue.reports import GREngine,GRExceptions
import GIParser
***************
*** 37,49 ****
pass
! class GIMappings(GIObject):
def __init__(self, parent=None):
GNObject.__init__(self, parent, type="GIMappings")
-
- def dumpXML(self, treeDump=1):
- return GNObject.dumpXML(self,GIParser.getXMLelements(), treeDump)
class GIMapping(GIObject):
--- 37,47 ----
pass
! class GIMappings(GRootObj, GIObject):
def __init__(self, parent=None):
+ GRootObj.GRootObj.__init__(self, 'mappings', GIParser.getXMLelements)
GNObject.__init__(self, parent, type="GIMappings")
class GIMapping(GIObject):
Index: gnue/navigator/src/GNObjects.py
diff -c gnue/navigator/src/GNObjects.py:1.12
gnue/navigator/src/GNObjects.py:1.13
*** gnue/navigator/src/GNObjects.py:1.12 Mon Jun 10 19:42:38 2002
--- gnue/navigator/src/GNObjects.py Sat Nov 2 01:02:01 2002
***************
*** 28,34 ****
#
import sys, string, os, os.path
! from gnue.common import GObjects, GDebug, GConfig
import GNParser
from gnue.reports import GREngine,GRExceptions
--- 28,34 ----
#
import sys, string, os, os.path
! from gnue.common import GObjects, GDebug, GConfig, GRootObj
import GNParser
from gnue.reports import GREngine,GRExceptions
***************
*** 37,45 ****
pass
! class GNProcesses(GNObject):
def __init__(self, parent=None):
GNObject.__init__(self, parent, type="GNProcesses")
self._clientHandlers = {
'form': self._runForm,
--- 37,46 ----
pass
! class GNProcesses(GRootObj.GRootObj, GNObject):
def __init__(self, parent=None):
+ GRootObj.GRootObj.__init__(self,'processes',GNParser.getXMLelements)
GNObject.__init__(self, parent, type="GNProcesses")
self._clientHandlers = {
'form': self._runForm,
***************
*** 49,58 ****
def setClientHandlers(self, handlers):
self._clientHandlers.update(handlers)
-
- def dumpXML(self, treeDump=1):
- return GNObject.dumpXML(self,GNParser.getXMLelements(), treeDump)
-
def _runForm(self, step):
formCommand = gConfigNav('RunFormCommand')
--- 50,55 ----
Index: gnue/reports/src/GRReport.py
diff -c gnue/reports/src/GRReport.py:1.24 gnue/reports/src/GRReport.py:1.25
*** gnue/reports/src/GRReport.py:1.24 Fri Nov 1 00:02:49 2002
--- gnue/reports/src/GRReport.py Sat Nov 2 01:02:01 2002
***************
*** 1,14 ****
#
# This file is part of GNU Enterprise.
#
! # GNU Enterprise is free software; you can redistribute it
# and/or modify it under the terms of the GNU General Public
! # License as published by the Free Software Foundation; either
# version 2, or (at your option) any later version.
#
# GNU Enterprise is distributed in the hope that it will be
! # useful, but WITHOUT ANY WARRANTY; without even the implied
! # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
# PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public
--- 1,14 ----
#
# This file is part of GNU Enterprise.
#
! # GNU Enterprise is free software; you can redistribute it
# and/or modify it under the terms of the GNU General Public
! # License as published by the Free Software Foundation; either
# version 2, or (at your option) any later version.
#
# GNU Enterprise is distributed in the hope that it will be
! # useful, but WITHOUT ANY WARRANTY; without even the implied
! # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
# PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public
***************
*** 43,53 ****
import GRExceptions
! class GRReport(GObj, GRootObj,GTriggerExtension):
def __init__(self, parent=None):
GTriggerExtension.__init__(self)
GObj.__init__(self, parent, type='GRReport')
- GRootObj.__init__(self, 'report')
self._connections = None # This will be set by GRParser.loadReport
self._inits = (self.initialize,self.postInit)
self._datasourceDictionary = {}
--- 43,53 ----
import GRExceptions
! class GRReport(GRootObj, GObj, GTriggerExtension):
def __init__(self, parent=None):
GTriggerExtension.__init__(self)
+ GRootObj.__init__(self, 'report', GRParser.getXMLelements)
GObj.__init__(self, parent, type='GRReport')
self._connections = None # This will be set by GRParser.loadReport
self._inits = (self.initialize,self.postInit)
self._datasourceDictionary = {}
***************
*** 75,85 ****
self._parameters = GRParameters.GRParameters(self)
# def startup(self):
# self.processTrigger('On-Startup')
-
-
- def dumpXML(self, treeDump=1, gap=" "):
- return GObj.dumpXML(self,
- GRParser.getXMLelements(), treeDump, gap, xmlnamespaces={})
#
--- 75,80 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue appserver/src/_featuretest/Objects.py comm...,
Jason Cater <=