[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r7346 - in trunk: gnue-appserver/src gnue-appserver/src/language
|
From: |
johannes |
|
Subject: |
[gnue] r7346 - in trunk: gnue-appserver/src gnue-appserver/src/language gnue-common/src/datasources gnue-common/src/definitions gnue-designer/src/base gnue-designer/src/base/tools gnue-designer/src/forms gnue-designer/src/forms/LayoutEditor gnue-designer/src/navigator gnue-designer/src/reports gnue-designer/src/reports/Standard gnue-designer/src/schema gnue-forms/src gnue-forms/src/uidrivers/_base/widgets gnue-forms/src/uidrivers/gtk2 gnue-forms/src/uidrivers/gtk2/widgets gnue-integrator/src gnue-navigator/src gnue-reports/src/base gnue-reports/src/base/layout |
|
Date: |
Tue, 12 Apr 2005 04:15:06 -0500 (CDT) |
Author: johannes
Date: 2005-04-12 04:15:02 -0500 (Tue, 12 Apr 2005)
New Revision: 7346
Modified:
trunk/gnue-appserver/src/data.py
trunk/gnue-appserver/src/geasList.py
trunk/gnue-appserver/src/geasRpcServer.py
trunk/gnue-appserver/src/geasSession.py
trunk/gnue-appserver/src/language/ObjectList.py
trunk/gnue-common/src/datasources/GConditions.py
trunk/gnue-common/src/datasources/GDataSource.py
trunk/gnue-common/src/definitions/GObjects.py
trunk/gnue-common/src/definitions/GParser.py
trunk/gnue-common/src/definitions/GParserHelpers.py
trunk/gnue-designer/src/base/Incubator.py
trunk/gnue-designer/src/base/Instance.py
trunk/gnue-designer/src/base/UndoManager.py
trunk/gnue-designer/src/base/tools/DataSourceEditor.py
trunk/gnue-designer/src/base/tools/EventEditor.py
trunk/gnue-designer/src/base/tools/TriggerEditor.py
trunk/gnue-designer/src/forms/Instance.py
trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditor.py
trunk/gnue-designer/src/forms/LayoutEditor/Workspace.py
trunk/gnue-designer/src/forms/TreeView.py
trunk/gnue-designer/src/navigator/LayoutEditor.py
trunk/gnue-designer/src/reports/Standard/GroupEditor.py
trunk/gnue-designer/src/reports/TreeView.py
trunk/gnue-designer/src/schema/TableEditor.py
trunk/gnue-designer/src/schema/TreeView.py
trunk/gnue-forms/src/GFInstance.py
trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py
trunk/gnue-forms/src/uidrivers/gtk2/SplashScreen.py
trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py
trunk/gnue-forms/src/uidrivers/gtk2/common.py
trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
trunk/gnue-integrator/src/GIObjects.py
trunk/gnue-integrator/src/GISources.py
trunk/gnue-navigator/src/UIgtk2.py
trunk/gnue-navigator/src/UItext.py
trunk/gnue-navigator/src/UIweb.py
trunk/gnue-navigator/src/UIwin32.py
trunk/gnue-navigator/src/UIwx.py
trunk/gnue-reports/src/base/GRSortOptions.py
trunk/gnue-reports/src/base/GRSources.py
trunk/gnue-reports/src/base/layout/ContainerElement.py
trunk/gnue-reports/src/base/layout/GRLayout.py
trunk/gnue-reports/src/base/layout/GRLayoutElement.py
trunk/gnue-reports/src/base/layout/GRSection.py
Log:
Made ParserObj's _parent a private weakref and added accessors getParent (),
setParent ()
Modified: trunk/gnue-appserver/src/data.py
===================================================================
--- trunk/gnue-appserver/src/data.py 2005-04-12 08:54:42 UTC (rev 7345)
+++ trunk/gnue-appserver/src/data.py 2005-04-12 09:15:02 UTC (rev 7346)
@@ -717,16 +717,9 @@
datasource = _createDatasource (connections, database, content, order)
condition = GConditions.buildCondition (conditions)
- try:
- return datasource.createResultSet (condition)
+ return datasource.createResultSet (condition)
- finally:
- # If we have a condition, make sure to have all it's elements collectable
- # by the garbage collector
- if condition is not None:
- condition.breakReferences ()
-
# =============================================================================
# Session class
# =============================================================================
@@ -1052,7 +1045,7 @@
# This eliminates constraints which are currently NULL.
for (table, deps) in tables.items ():
if self.__constraints.has_key (table):
- for constraint in self.__constraints [table].keys ():
+ for constraint in self.__constraints [table]:
if constraint != table and tables.has_key (constraint):
deps.append (constraint)
Modified: trunk/gnue-appserver/src/geasList.py
===================================================================
--- trunk/gnue-appserver/src/geasList.py 2005-04-12 08:54:42 UTC (rev
7345)
+++ trunk/gnue-appserver/src/geasList.py 2005-04-12 09:15:02 UTC (rev
7346)
@@ -282,14 +282,11 @@
self.__recordset.close ()
self.__recordset = None
- self.__instances = []
- self.__unsorted = []
+ self.__instances = []
+ self.__unsorted = []
+ self.__condition = None
- if self.__condition is not None:
- self.__condition.breakReferences ()
- self.__condition = None
-
# ---------------------------------------------------------------------------
# Evaluate an exist condition for an instance
# ---------------------------------------------------------------------------
Modified: trunk/gnue-appserver/src/geasRpcServer.py
===================================================================
--- trunk/gnue-appserver/src/geasRpcServer.py 2005-04-12 08:54:42 UTC (rev
7345)
+++ trunk/gnue-appserver/src/geasRpcServer.py 2005-04-12 09:15:02 UTC (rev
7346)
@@ -40,7 +40,7 @@
from gnue.appserver import geasConfiguration
-_GC_DEBUG = False # Set this to True to activate garbage collection debugging
+_GC_DEBUG = True # Set this to True to activate garbage collection debugging
# =============================================================================
# RPC application class
Modified: trunk/gnue-appserver/src/geasSession.py
===================================================================
--- trunk/gnue-appserver/src/geasSession.py 2005-04-12 08:54:42 UTC (rev
7345)
+++ trunk/gnue-appserver/src/geasSession.py 2005-04-12 09:15:02 UTC (rev
7346)
@@ -706,8 +706,6 @@
else:
asTrees.append (tree)
- cTree.breakReferences ()
-
# now create the final trees
dbCond = None
asCond = None
Modified: trunk/gnue-appserver/src/language/ObjectList.py
===================================================================
--- trunk/gnue-appserver/src/language/ObjectList.py 2005-04-12 08:54:42 UTC
(rev 7345)
+++ trunk/gnue-appserver/src/language/ObjectList.py 2005-04-12 09:15:02 UTC
(rev 7346)
@@ -159,21 +159,18 @@
cTree = GConditions.buildCondition (conditions)
- try:
- # Replace all constant values represented by an Object instance with the
- # apropriate gnue_id
- for item in cTree.findChildrenOfType ('GCCConst', True, True):
- if isinstance (item.value, Object):
- item.value = item.value.gnue_id
+ # Replace all constant values represented by an Object instance with the
+ # apropriate gnue_id
+ for item in cTree.findChildrenOfType ('GCCConst', True, True):
+ if isinstance (item.value, Object):
+ item.value = item.value.gnue_id
- # Make sure all field names are fully qualified
- for item in cTree.findChildrenOfType ('GCCField', True, True):
- item.name = self.__session.qualifyMultiple (item.name)
+ # Make sure all field names are fully qualified
+ for item in cTree.findChildrenOfType ('GCCField', True, True):
+ item.name = self.__session.qualifyMultiple (item.name)
- return cTree.prefixNotation ()
+ return cTree.prefixNotation ()
- finally:
- cTree.breakReferences ()
# ---------------------------------------------------------------------------
Modified: trunk/gnue-common/src/datasources/GConditions.py
===================================================================
--- trunk/gnue-common/src/datasources/GConditions.py 2005-04-12 08:54:42 UTC
(rev 7345)
+++ trunk/gnue-common/src/datasources/GConditions.py 2005-04-12 09:15:02 UTC
(rev 7346)
@@ -267,21 +267,6 @@
element.buildFromList (subitem)
- # ---------------------------------------------------------------------------
- # Break up all top-down references
- # ---------------------------------------------------------------------------
-
- def breakReferences (self):
- """
- This function resolves the reference to the parent instance avoiding
- reference cycles.
- """
-
- self.setParent (None)
- for item in self._children:
- item.breakReferences ()
-
-
# =============================================================================
# Top level classes
# =============================================================================
Modified: trunk/gnue-common/src/datasources/GDataSource.py
===================================================================
--- trunk/gnue-common/src/datasources/GDataSource.py 2005-04-12 08:54:42 UTC
(rev 7345)
+++ trunk/gnue-common/src/datasources/GDataSource.py 2005-04-12 09:15:02 UTC
(rev 7346)
@@ -1025,30 +1025,25 @@
if len (parts) != 2:
raise ResourceNotFoundError, (element, elementName)
- (moduleName, className) = map (string.lower, parts)
- cond = ['and', ['eq', ['lower', ['field', 'gnue_name']],
+ (moduleName, className) = map (string.upper, parts)
+ cond = ['and', ['eq', ['upper', ['field', 'gnue_name']],
['const', className]],
- ['eq', ['lower', ['field', 'gnue_module.gnue_name']],
+ ['eq', ['upper', ['field', 'gnue_module.gnue_name']],
['const', moduleName]]]
mc = GConditions.buildConditionFromPrefix (cond)
- try:
- rs = dts.createResultSet (mc)
- if rs.firstRecord ():
- paramDict ['connection'] = connection
+ rs = dts.createResultSet (mc)
+ if rs.firstRecord ():
+ paramDict ['connection'] = connection
- res = rs.current.call ("gnue_%s" % element, paramDict)
+ res = rs.current.call ("gnue_%s" % element, paramDict)
- if debugFileName is not None:
- dfile = open (debugFileName, 'w')
- dfile.write (res.encode ('utf-8'))
- dfile.close ()
+ if debugFileName is not None:
+ dfile = open (debugFileName, 'w')
+ dfile.write (res.encode ('utf-8'))
+ dfile.close ()
- return cStringIO.StringIO (res.encode ('utf-8'))
+ return cStringIO.StringIO (res.encode ('utf-8'))
- else:
- raise ResourceNotFoundError, (element, elementName)
-
- finally:
- mc.breakReferences ()
-
+ else:
+ raise ResourceNotFoundError, (element, elementName)
Modified: trunk/gnue-common/src/definitions/GObjects.py
===================================================================
--- trunk/gnue-common/src/definitions/GObjects.py 2005-04-12 08:54:42 UTC
(rev 7345)
+++ trunk/gnue-common/src/definitions/GObjects.py 2005-04-12 09:15:02 UTC
(rev 7346)
@@ -402,7 +402,7 @@
if includeSelf:
parentObject = self
else:
- parentObject = self._parent
+ parentObject = self.getParent ()
while 1:
if parentObject == None:
@@ -411,10 +411,10 @@
return parentObject
# If passed a type of NONE it finds the top object in the tree
- if not type and not parentObject._parent:
+ if not type and not parentObject.getParent ():
return parentObject
- parentObject = parentObject._parent
+ parentObject = parentObject.getParent ()
def findChildOfType(self, type, includeSelf=1, allowAllChildren=0):
"""
@@ -517,9 +517,10 @@
if attr not in ('_buildObject','getClass') and attr[:2] != '__':
newObj.__dict__[attr] = value
- if self._parent:
- self._parent._children[self._parent._children.find(self)] = newObj
- return newObj._buildObject(self)
+ parent = self.getParent ()
+ if parent:
+ parent._children [parent._children.find (self)] = newObj
+ return newObj._buildObject (self)
# This should return a GObj-based class
Modified: trunk/gnue-common/src/definitions/GParser.py
===================================================================
--- trunk/gnue-common/src/definitions/GParser.py 2005-04-12 08:54:42 UTC
(rev 7345)
+++ trunk/gnue-common/src/definitions/GParser.py 2005-04-12 09:15:02 UTC
(rev 7346)
@@ -534,7 +534,7 @@
#
rv = self.__findImportItem(self, form, id)
if rv != None:
- rv._parent = self
+ rv.setParent (self)
rv._IMPORTED = 1
self._children.append(rv)
#
@@ -598,7 +598,7 @@
for child in form._children:
if isinstance(child,instanceType) and \
(importAll or child.name in importNames):
- child._parent = self
+ child.setParent (self)
child._IMPORTED = 1
self._children.append(child)
child._buildObject()
Modified: trunk/gnue-common/src/definitions/GParserHelpers.py
===================================================================
--- trunk/gnue-common/src/definitions/GParserHelpers.py 2005-04-12 08:54:42 UTC
(rev 7345)
+++ trunk/gnue-common/src/definitions/GParserHelpers.py 2005-04-12 09:15:02 UTC
(rev 7346)
@@ -29,6 +29,8 @@
# HISTORY:
#
+import weakref
+
from xml.sax import saxutils
from types import StringType
@@ -39,15 +41,17 @@
#
class ParserObj:
def __init__(self, parent=None, type='_NotSet_'):
- self._type = type
- self._parent = parent # The object that contains this object
- self._children = [] # The objects contained by this object
- self._attributes = {}
- self._inits = [] # functions called during phaseInit stage
- self._xmlnamespace = None # If the object is namespace-qualified, the
namespace
- self._xmlnamespaces = {} # If attributes are namespace-qualified, a map
+ self._type = type
+ self._children = [] # The objects contained by this object
+ self._attributes = {}
+ self._inits = [] # functions called during phaseInit stage
+ self._xmlnamespace = None # If the object is namespace-qualified,
+ # the namespace
+ self._xmlnamespaces = {} # If attributes are namespace-qualified, a map
+
+ self.setParent (parent)
if parent :
- parent.addChild(self)
+ parent.addChild (self)
# ---------------------------------------------------------------------------
@@ -62,7 +66,9 @@
free object trees.
"""
- self._parent = None
+ print "DEPRECIATED call of unlink ()"
+ return
+ self.setParent (None)
for child in self._children:
child.unlink ()
@@ -83,7 +89,10 @@
@rtype: any
"""
- return self._parent
+ if self.__parent is not None:
+ return self.__parent ()
+ else:
+ return None
# ---------------------------------------------------------------------------
@@ -97,7 +106,10 @@
@param newParent: instance to be set as parent
"""
- self._parent = newParent
+ if newParent is None:
+ self.__parent = None
+ else:
+ self.__parent = weakref.ref (newParent)
#
Modified: trunk/gnue-designer/src/base/Incubator.py
===================================================================
--- trunk/gnue-designer/src/base/Incubator.py 2005-04-12 08:54:42 UTC (rev
7345)
+++ trunk/gnue-designer/src/base/Incubator.py 2005-04-12 09:15:02 UTC (rev
7346)
@@ -37,7 +37,7 @@
## Reparent an object
##
def reparentObject(self, rootObject, object, newParent):
- if object._parent == newParent:
+ if object.getParent () == newParent:
return
# TODO
@@ -105,7 +105,7 @@
def deleteObject(self, rootObject, object, newCurrentObject=None,
firstRun=1):
if firstRun:
- newCurrentObject = parent = object._parent
+ newCurrentObject = parent = object.getParent ()
for child in object._children:
if not child._type == '_content_':
@@ -115,9 +115,9 @@
if firstRun:
o = parent
- while o._parent:
+ while o.getParent ():
o._buildObject()
- o = o._parent
+ o = o.getParent ()
if newCurrentObject:
self.instance.dispatchEvent('ObjectSelected',object=object,
originator=__name__)
Modified: trunk/gnue-designer/src/base/Instance.py
===================================================================
--- trunk/gnue-designer/src/base/Instance.py 2005-04-12 08:54:42 UTC (rev
7345)
+++ trunk/gnue-designer/src/base/Instance.py 2005-04-12 09:15:02 UTC (rev
7346)
@@ -460,8 +460,8 @@
object = event.object
# Delete the actual object from its parent
- object._parent._children.remove(object)
- ##object._parent._children.pop(object._parent._children.index(object))
+ object.getParent ()._children.remove(object)
+ ##object.getParent ()._children.pop(object.getParent
()._children.index(object))
self.makeDirty()
Modified: trunk/gnue-designer/src/base/UndoManager.py
===================================================================
--- trunk/gnue-designer/src/base/UndoManager.py 2005-04-12 08:54:42 UTC (rev
7345)
+++ trunk/gnue-designer/src/base/UndoManager.py 2005-04-12 09:15:02 UTC (rev
7346)
@@ -124,8 +124,8 @@
def __init__(self, manager, event):
self.event = event
if event.__event__ == 'ObjectDeleted':
- self.parentindex = event.object._parent._children.index(event.object)
- self.parent = id(event.object._parent)
+ self.parentindex = event.object.getParent
()._children.index(event.object)
+ self.parent = id(event.object.getParent ())
def reverse(self, manager):
orig = self.event
@@ -149,7 +149,7 @@
for key, val in object.__dict__.items():
if key[0] != '_' and type(val) != types.MethodType:
attrs[key] = val
- parent = manager.getCurrObject(object._parent)
+ parent = manager.getCurrObject(object.getParent ())
obj = object.__class__(parent)
obj.__dict__.update(attrs)
obj._buildObject()
@@ -157,8 +157,8 @@
# Move the child to its old, relative position
# in the parent's child list
- obj._parent._children.pop()
- obj._parent._children.insert(self.parentindex, obj)
+ obj.getParent ()._children.pop()
+ obj.getParent ()._children.insert(self.parentindex, obj)
# Notify our peeps...
manager.instance.dispatchEvent('ObjectCreated', originator=__name__,
Modified: trunk/gnue-designer/src/base/tools/DataSourceEditor.py
===================================================================
--- trunk/gnue-designer/src/base/tools/DataSourceEditor.py 2005-04-12
08:54:42 UTC (rev 7345)
+++ trunk/gnue-designer/src/base/tools/DataSourceEditor.py 2005-04-12
09:15:02 UTC (rev 7346)
@@ -473,7 +473,7 @@
for field in self.current._fieldFkReferences.keys():
for item in self.current._fieldFkReferences[field]:
addLine( self, "%s.%s" % (mastertable, field),
- "%s.%s" % (item._parent.name, item.name),
+ "%s.%s" % (item.getParent ().name, item.name),
_("Dropdown Entry") )
Modified: trunk/gnue-designer/src/base/tools/EventEditor.py
===================================================================
--- trunk/gnue-designer/src/base/tools/EventEditor.py 2005-04-12 08:54:42 UTC
(rev 7345)
+++ trunk/gnue-designer/src/base/tools/EventEditor.py 2005-04-12 09:15:02 UTC
(rev 7346)
@@ -299,7 +299,7 @@
def _generateName(self, object):
- parent = object._parent
+ parent = object.getParent ()
name = '%s.%s (%s-Level Trigger)' % (parent.name,
parent._validTriggers[object.type.upper()], parent._type[2:].capitalize())
return name
Modified: trunk/gnue-designer/src/base/tools/TriggerEditor.py
===================================================================
--- trunk/gnue-designer/src/base/tools/TriggerEditor.py 2005-04-12 08:54:42 UTC
(rev 7345)
+++ trunk/gnue-designer/src/base/tools/TriggerEditor.py 2005-04-12 09:15:02 UTC
(rev 7346)
@@ -102,7 +102,7 @@
originator = None)
if trigger.type.upper() != 'NAMED':
wxCallAfter(self.dispatchEvent,'ObjectSelected',
- object = trigger._parent,
+ object = trigger.getParent (),
originator = None)
self.editor.SetReadOnly(0)
@@ -197,10 +197,10 @@
if trigger.type.upper() == 'NAMED':
return trigger.name
else:
- parent = trigger._parent
+ parent = trigger.getParent ()
name = '%s.%s' % (parent.name,
parent._validTriggers[trigger.type.upper()])
try:
- name = parent._parent.name + '.' + name
+ name = parent.getParent ().name + '.' + name
except:
pass
return '('+name+')'
Modified: trunk/gnue-designer/src/forms/Instance.py
===================================================================
--- trunk/gnue-designer/src/forms/Instance.py 2005-04-12 08:54:42 UTC (rev
7345)
+++ trunk/gnue-designer/src/forms/Instance.py 2005-04-12 09:15:02 UTC (rev
7346)
@@ -134,9 +134,9 @@
if object._type == 'GFForm':
object._blockMap = {}
elif object._type == 'GFLogic':
- object._parent._logic = object
+ object.getParent ()._logic = object
elif object._type == 'GFLayout':
- object._parent._layout = object
+ object.getParent ()._layout = object
# Yes, you guessed it! More layout mgmt hackery...
object._xmlchildnamespaces = {'Char':'GNUe:Layout:Char'}
elif object._type == 'GFBlock':
@@ -150,7 +150,7 @@
object._block = self.rootObject._blockMap[object.block]
object._field = object._block._fieldMap[object.field]
elif isinstance(object, GFObjects.GFPage) and \
- object._parent == self.rootObject:
+ object.getParent () == self.rootObject:
self._pages.append(object)
object._popupMenu = ObjectMenu(self, object)
@@ -191,7 +191,7 @@
elif object._type == 'GFField':
del object.findParentOfType('GFBlock')._fieldMap[object.name]
elif isinstance(object, GFObjects.GFPage) and \
- object._parent == self.rootObject:
+ object.getParent () == self.rootObject:
del self._pages[object]
object._popupMenu = ObjectMenu(self, object)
Modified: trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditor.py
===================================================================
--- trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditor.py 2005-04-12
08:54:42 UTC (rev 7345)
+++ trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditor.py 2005-04-12
09:15:02 UTC (rev 7346)
@@ -726,8 +726,8 @@
if event.ShiftDown():
object = self._currentObject
if hasattr(object,'_widgetHandler') and not object._type == 'GFPage':
- i = object._parent._children.index(object)
- lst = object._parent._children[i:] + object._parent._children[:i]
+ i = object.getParent ()._children.index(object)
+ lst = object.getParent ()._children[i:] + object.getParent
()._children[:i]
else:
lst = self.page._children[:]
lst.reverse()
@@ -740,8 +740,8 @@
elif not event.ControlDown() and not event.AltDown():
object = self._currentObject
if hasattr(object,'_widgetHandler') and not object._type == 'GFPage':
- i = object._parent._children.index(object)
- lst = object._parent._children[i+1:] + object._parent._children[:i+1]
+ i = object.getParent ()._children.index(object)
+ lst = object.getParent ()._children[i+1:] + object.getParent
()._children[:i+1]
else:
lst = self.page._children[:]
for newobj in lst:
Modified: trunk/gnue-designer/src/forms/LayoutEditor/Workspace.py
===================================================================
--- trunk/gnue-designer/src/forms/LayoutEditor/Workspace.py 2005-04-12
08:54:42 UTC (rev 7345)
+++ trunk/gnue-designer/src/forms/LayoutEditor/Workspace.py 2005-04-12
09:15:02 UTC (rev 7346)
@@ -599,8 +599,8 @@
if event.ShiftDown():
object = self._currentObject
if hasattr(object,'_widgetHandler') and not object._type == 'GFPage':
- i = object._parent._children.index(object)
- lst = object._parent._children[i:] + object._parent._children[:i]
+ i = object.getParent ()._children.index(object)
+ lst = object.getParent ()._children[i:] + object.getParent
()._children[:i]
else:
lst = self.page._children[:]
lst.reverse()
@@ -613,8 +613,8 @@
elif not event.ControlDown() and not event.AltDown():
object = self._currentObject
if hasattr(object,'_widgetHandler') and not object._type == 'GFPage':
- i = object._parent._children.index(object)
- lst = object._parent._children[i+1:] + object._parent._children[:i+1]
+ i = object.getParent ()._children.index(object)
+ lst = object.getParent ()._children[i+1:] + object.getParent
()._children[:i+1]
else:
lst = self.page._children[:]
for newobj in lst:
Modified: trunk/gnue-designer/src/forms/TreeView.py
===================================================================
--- trunk/gnue-designer/src/forms/TreeView.py 2005-04-12 08:54:42 UTC (rev
7345)
+++ trunk/gnue-designer/src/forms/TreeView.py 2005-04-12 09:15:02 UTC (rev
7346)
@@ -84,34 +84,34 @@
if object != self.rootObject:
icon = 'properties'
if isinstance(object, GFObjects.GFOptions) and \
- object._parent == self.rootObject:
+ object.getParent () == self.rootObject:
object._treeItem = self.rootObject._treeItemFormProperties
icon = 'properties'
elif object._type in ('GFLogic','GFLayout') and \
- object._parent == self.rootObject:
+ object.getParent () == self.rootObject:
pass
else:
- parentTreeItem = object._parent._treeItem
+ parentTreeItem = object.getParent ()._treeItem
if isinstance(object, GTrigger.GTrigger) and \
object.type == 'NAMED':
parentTreeItem = self.rootObject._treeItemNamedTriggers
icon = 'trigger'
elif isinstance(object, GTrigger.GTrigger):
- if not hasattr(object._parent,'_treeItemTrigger'):
- object._parent._treeItemTrigger = \
- self.AppendItem(object._parent._treeItem, _("Events"))
+ if not hasattr(object.getParent (),'_treeItemTrigger'):
+ object.getParent ()._treeItemTrigger = \
+ self.AppendItem(object.getParent ()._treeItem, _("Events"))
#self.tree.SetItemImage(object._parent._treeItemTrigger,
treeIconMap['trigger'])
- parentTreeItem = object._parent._treeItemTrigger
+ parentTreeItem = object.getParent ()._treeItemTrigger
icon = 'trigger'
elif isinstance(object, GFObjects.GFDataSource) or \
isinstance(object, GDataSource.GConnection):
parentTreeItem = self.rootObject._treeItemDataSources
icon = 'datasource'
elif isinstance(object, GFObjects.GFPage) and \
- object._parent == self.rootObject:
+ object.getParent () == self.rootObject:
icon = 'page'
elif object._type in ('GFBlock',):
icon = 'block'
Modified: trunk/gnue-designer/src/navigator/LayoutEditor.py
===================================================================
--- trunk/gnue-designer/src/navigator/LayoutEditor.py 2005-04-12 08:54:42 UTC
(rev 7345)
+++ trunk/gnue-designer/src/navigator/LayoutEditor.py 2005-04-12 09:15:02 UTC
(rev 7346)
@@ -160,11 +160,11 @@
def inventoryObject(self, object):
if object._type == 'GNParameter':
return
- if object._parent != None:
+ if object.getParent () != None:
description = self.getName(object, 1)
- object._treeItem = self.AppendItem(object._parent._treeItem, description)
+ object._treeItem = self.AppendItem(object.getParent ()._treeItem,
description)
self.SetPyData(object._treeItem, object)
if object._type == 'GNProcess':
self.SetItemBold(object._treeItem,1)
Modified: trunk/gnue-designer/src/reports/Standard/GroupEditor.py
===================================================================
--- trunk/gnue-designer/src/reports/Standard/GroupEditor.py 2005-04-12
08:54:42 UTC (rev 7345)
+++ trunk/gnue-designer/src/reports/Standard/GroupEditor.py 2005-04-12
09:15:02 UTC (rev 7346)
@@ -193,7 +193,7 @@
def _generateName(self, object):
- parent = object._parent
+ parent = object.getParent ()
name = '%s.%s (%s-Level Trigger)' % (parent.name,
parent._validTriggers[object.type.upper()], parent._type[2:].capitalize())
return name
Modified: trunk/gnue-designer/src/reports/TreeView.py
===================================================================
--- trunk/gnue-designer/src/reports/TreeView.py 2005-04-12 08:54:42 UTC (rev
7345)
+++ trunk/gnue-designer/src/reports/TreeView.py 2005-04-12 09:15:02 UTC (rev
7346)
@@ -44,7 +44,7 @@
if object != self.rootObject:
# TODO: icons for reports wanted (btami)
icon = 'properties'
- parentTreeItem = object._parent._treeItem
+ parentTreeItem = object.getParent ()._treeItem
if isinstance(object, GRParameters.GRParameters):
icon = 'properties'
elif isinstance(object, GRSortOptions.GRSortOptions):
Modified: trunk/gnue-designer/src/schema/TableEditor.py
===================================================================
--- trunk/gnue-designer/src/schema/TableEditor.py 2005-04-12 08:54:42 UTC
(rev 7345)
+++ trunk/gnue-designer/src/schema/TableEditor.py 2005-04-12 09:15:02 UTC
(rev 7346)
@@ -191,7 +191,7 @@
def _generateName(self, object):
- parent = object._parent
+ parent = object.getParent ()
name = '%s.%s (%s-Level Trigger)' % (parent.name,
parent._validTriggers[object.type.upper()], parent._type[2:].capitalize())
return name
Modified: trunk/gnue-designer/src/schema/TreeView.py
===================================================================
--- trunk/gnue-designer/src/schema/TreeView.py 2005-04-12 08:54:42 UTC (rev
7345)
+++ trunk/gnue-designer/src/schema/TreeView.py 2005-04-12 09:15:02 UTC (rev
7346)
@@ -41,7 +41,7 @@
if object != self.rootObject:
icon = 'properties'
try:
- parentTreeItem = object._parent._treeItem
+ parentTreeItem = object.getParent ()._treeItem
except AttributeError:
parentTreeItem = None
# TODO:
Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py 2005-04-12 08:54:42 UTC (rev 7345)
+++ trunk/gnue-forms/src/GFInstance.py 2005-04-12 09:15:02 UTC (rev 7346)
@@ -291,7 +291,7 @@
for child in formTree._children [:]:
if isinstance (child, GFForm):
- child._parent = None
+ child.setParent (None)
self._formsDictionary [child.name] = child
formTree._children.remove (child)
Modified: trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py 2005-04-12
08:54:42 UTC (rev 7345)
+++ trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py 2005-04-12
09:15:02 UTC (rev 7346)
@@ -91,7 +91,7 @@
self._uiForm = self.findParentOfType('UIForm')
try:
- self._creationEvent.container = self._parent._containerToolkitWidget
+ self._creationEvent.container = self.getParent ()._containerToolkitWidget
except AttributeError:
Modified: trunk/gnue-forms/src/uidrivers/gtk2/SplashScreen.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/SplashScreen.py 2005-04-12 08:54:42 UTC
(rev 7345)
+++ trunk/gnue-forms/src/uidrivers/gtk2/SplashScreen.py 2005-04-12 09:15:02 UTC
(rev 7346)
@@ -29,6 +29,7 @@
import os.path
import gtk
+import gobject
from gnue.common.apps import GConfig
from gnue.forms import VERSION
@@ -86,7 +87,7 @@
#self.CenterOnScreen()
def Show(self):
- gtk.timeout_add(1500,lambda splash: splash.destroy(),self)
+ gobject.timeout_add(1500,lambda splash: splash.destroy(),self)
self.show_all()
self.show_now()
Modified: trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py 2005-04-12 08:54:42 UTC
(rev 7345)
+++ trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py 2005-04-12 09:15:02 UTC
(rev 7346)
@@ -34,6 +34,7 @@
pygtk.require ('2.0')
import gtk
+ import gobject
import pango
## check if we really imported gtk 2.0
@@ -114,7 +115,7 @@
if not self._disableSplash:
self.splash = UISplashScreen ()
self.splash.Show ()
- gtk.timeout_add (1500, lambda splash: splash.destroy (), self.splash)
+ gobject.timeout_add (1500, lambda splash: splash.destroy (), self.splash)
self.font = APPFONT
Modified: trunk/gnue-forms/src/uidrivers/gtk2/common.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/common.py 2005-04-12 08:54:42 UTC
(rev 7345)
+++ trunk/gnue-forms/src/uidrivers/gtk2/common.py 2005-04-12 09:15:02 UTC
(rev 7346)
@@ -87,6 +87,7 @@
eventHandler (action)
return True
else:
+ print "DROPPED:", keycode, isShift, isCtrl, isLock, isMod1
gDebug (4, "Key dropped!")
Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py 2005-04-12
08:54:42 UTC (rev 7345)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/entry.py 2005-04-12
09:15:02 UTC (rev 7346)
@@ -255,6 +255,8 @@
def setCursorPosition (self, position, index = 0):
widget = self.widgets [index]
+ print "setCursorPosition %r: %s" % (widget, position)
+
if self.__isCombo (widget):
entry = isinstance (widget, gtk.Combo) and widget.entry or widget.child
else:
@@ -278,6 +280,7 @@
# ---------------------------------------------------------------------------
def setSelectedArea (self, selection1, selection2, index = 0):
+ print "setSelectedArea", selection1, selection2
gDebug (6, "Set Selected Area %s/%s in %s [%s]" % \
(selection1, selection2, self, index))
Modified: trunk/gnue-integrator/src/GIObjects.py
===================================================================
--- trunk/gnue-integrator/src/GIObjects.py 2005-04-12 08:54:42 UTC (rev
7345)
+++ trunk/gnue-integrator/src/GIObjects.py 2005-04-12 09:15:02 UTC (rev
7346)
@@ -129,7 +129,7 @@
def triggerStoreRow(self, output):
# TODO: replace this code and the code in the main loop by one function
- if not hasattr(self._parent,'_testonly'):
+ if not hasattr(self.getParent (),'_testonly'):
self._outputRset.insertRecord ()
@@ -147,9 +147,9 @@
self._sourceFields=[]
self._destinationFields=[]
self._inputSource = \
-
self._parent._datasourceDictionary[string.lower(self.source)]
+ self.getParent
()._datasourceDictionary[string.lower(self.source)]
self._outputSource = \
-
self._parent._datasourceDictionary[string.lower(self.destination)]
+ self.getParent
()._datasourceDictionary[string.lower(self.destination)]
def addSourceField(self,name):
@@ -211,7 +211,7 @@
if not self.skipthisrow:
self.processTrigger('Post-Row')
- if not hasattr(self._parent,'_testonly'):
+ if not hasattr(self.getParent (),'_testonly'):
self._outputRset.insertRecord ()
for field in output.keys():
Modified: trunk/gnue-integrator/src/GISources.py
===================================================================
--- trunk/gnue-integrator/src/GISources.py 2005-04-12 08:54:42 UTC (rev
7345)
+++ trunk/gnue-integrator/src/GISources.py 2005-04-12 09:15:02 UTC (rev
7346)
@@ -63,7 +63,7 @@
def getDataSource(self, source):
- return self._parent._datasourceDictionary[string.lower(source)]
+ return self.getParent ()._datasourceDictionary[string.lower(source)]
class GIDataSource (GDataSource.GDataSource):
Modified: trunk/gnue-navigator/src/UIgtk2.py
===================================================================
--- trunk/gnue-navigator/src/UIgtk2.py 2005-04-12 08:54:42 UTC (rev 7345)
+++ trunk/gnue-navigator/src/UIgtk2.py 2005-04-12 09:15:02 UTC (rev 7346)
@@ -277,7 +277,8 @@
node = store.append (None, [gnObject.title, gnObject])
elif gnObject._type in ['GNStep', 'GNProcess']:
- node = store.append (gnObject._parent.__node, [gnObject.title, gnObject])
+ node = store.append (gnObject.getParent ().__node,
+ [gnObject.title, gnObject])
else:
return
Modified: trunk/gnue-navigator/src/UItext.py
===================================================================
--- trunk/gnue-navigator/src/UItext.py 2005-04-12 08:54:42 UTC (rev 7345)
+++ trunk/gnue-navigator/src/UItext.py 2005-04-12 09:15:02 UTC (rev 7346)
@@ -83,15 +83,15 @@
print
- if process._parent:
+ if process.getParent ():
- top = process._parent
- while top._parent:
- top = top._parent
+ top = process.getParent ()
+ while top.getParent ():
+ top = top.getParent ()
- if top != process._parent:
- print ' P: Back to %s'% process._parent.title
- self.selections['P'] = process._parent
+ if top != process.getParent ():
+ print ' P: Back to %s'% process.getParent ().title
+ self.selections['P'] = process.getParent ()
print " T: Back to Top"
self.selections['T'] = top
Modified: trunk/gnue-navigator/src/UIweb.py
===================================================================
--- trunk/gnue-navigator/src/UIweb.py 2005-04-12 08:54:42 UTC (rev 7345)
+++ trunk/gnue-navigator/src/UIweb.py 2005-04-12 09:15:02 UTC (rev 7346)
@@ -84,10 +84,10 @@
# if this is not the top branch
if process!=self.processes:
- url = '%s' % id(process._parent)
- html += self.getHtmlBack(url, process._parent.title, \
- process._parent._type)
- self.selections['%s' % id(process._parent)] = process._parent
+ url = '%s' % id(process.getParent ())
+ html += self.getHtmlBack(url, process.getParent ().title, \
+ process.getParent ()._type)
+ self.selections['%s' % id(process.getParent ())] = process.getParent ()
html += self.getHtmlFooter()
Modified: trunk/gnue-navigator/src/UIwin32.py
===================================================================
--- trunk/gnue-navigator/src/UIwin32.py 2005-04-12 08:54:42 UTC (rev 7345)
+++ trunk/gnue-navigator/src/UIwin32.py 2005-04-12 09:15:02 UTC (rev 7346)
@@ -247,7 +247,7 @@
if object._type == 'GNProcesses':
node = self.__addItem(None, object.title,1)
elif object._type in ('GNStep','GNProcess'):
- node = self.__addItem(object._parent.__node, object.title,2)
+ node = self.__addItem(object.getParent ().__node, object.title,2)
else:
return
Modified: trunk/gnue-navigator/src/UIwx.py
===================================================================
--- trunk/gnue-navigator/src/UIwx.py 2005-04-12 08:54:42 UTC (rev 7345)
+++ trunk/gnue-navigator/src/UIwx.py 2005-04-12 09:15:02 UTC (rev 7346)
@@ -130,7 +130,7 @@
if object._type == 'GNProcesses':
node =
self.tree.AddRoot(object.title.encode(gConfig('textEncoding'),'replace'))
elif object._type in ('GNStep','GNProcess'):
- node = self.tree.AppendItem(object._parent.__node,
object.title.encode(gConfig('textEncoding'),'replace'))
+ node = self.tree.AppendItem(object.getParent ().__node,
object.title.encode(gConfig('textEncoding'),'replace'))
else:
return
Modified: trunk/gnue-reports/src/base/GRSortOptions.py
===================================================================
--- trunk/gnue-reports/src/base/GRSortOptions.py 2005-04-12 08:54:42 UTC
(rev 7345)
+++ trunk/gnue-reports/src/base/GRSortOptions.py 2005-04-12 09:15:02 UTC
(rev 7346)
@@ -78,7 +78,7 @@
def _buildObject(self):
if self.default:
- self._parent._default = self.id
+ self.getParent ()._default = self.id
return GObj._buildObject(self)
Modified: trunk/gnue-reports/src/base/GRSources.py
===================================================================
--- trunk/gnue-reports/src/base/GRSources.py 2005-04-12 08:54:42 UTC (rev
7345)
+++ trunk/gnue-reports/src/base/GRSources.py 2005-04-12 09:15:02 UTC (rev
7346)
@@ -63,7 +63,7 @@
def getDataSource(self, source):
- return self._parent._datasourceDictionary[string.lower(source)]
+ return self.getParent ()._datasourceDictionary[string.lower(source)]
class GRDataSource (GDataSource.GDataSource):
Modified: trunk/gnue-reports/src/base/layout/ContainerElement.py
===================================================================
--- trunk/gnue-reports/src/base/layout/ContainerElement.py 2005-04-12
08:54:42 UTC (rev 7345)
+++ trunk/gnue-reports/src/base/layout/ContainerElement.py 2005-04-12
09:15:02 UTC (rev 7346)
@@ -101,7 +101,7 @@
# getAncestorWithSource()
#
def getAncestorWithSource(self, source):
- if self._parent._type == 'GRSection':
- return self._parent.getAncestorWithSource(source)
+ if self.getParent ()._type == 'GRSection':
+ return self.getParent ().getAncestorWithSource(source)
else:
return None
Modified: trunk/gnue-reports/src/base/layout/GRLayout.py
===================================================================
--- trunk/gnue-reports/src/base/layout/GRLayout.py 2005-04-12 08:54:42 UTC
(rev 7345)
+++ trunk/gnue-reports/src/base/layout/GRLayout.py 2005-04-12 09:15:02 UTC
(rev 7346)
@@ -72,7 +72,7 @@
"The layout section does not contain any instructions. What do I do?"
self._xmlchildnamespace = self._findNamespace()
- self._parent._namespace = self._xmlchildnamespace
+ self.getParent ()._namespace = self._xmlchildnamespace
# Find the xml namespace in use by any child passthru objects
@@ -144,7 +144,7 @@
if curr._name == sec:
section = curr
break
- curr = curr._parent.findParentOfType('GRSection')
+ curr = curr.getParent ().findParentOfType('GRSection')
if section == None:
raise GRExceptions.SourceOutOfScope, \
@@ -161,14 +161,14 @@
elif isinstance(object, GRSumm):
if object.section == None:
- s = object._parent.findParentOfType('GRSection')
+ s = object.getParent ().findParentOfType('GRSection')
else:
sec = string.lower(object.section)
s = self._mapper.sectionMap[sec]._object
if s == None:
raise GRExceptions.SourceOutOfScope, \
'Summary "%s" in section "%s" uses out-of-scope source "%s"' \
- % (object._field, object._parent.name, object._source)
+ % (object._field, object.getParent ().name, object._source)
object._section = s._name
object._mymapper = self._mapper.sectionMap[s._name]
Modified: trunk/gnue-reports/src/base/layout/GRLayoutElement.py
===================================================================
--- trunk/gnue-reports/src/base/layout/GRLayoutElement.py 2005-04-12
08:54:42 UTC (rev 7345)
+++ trunk/gnue-reports/src/base/layout/GRLayoutElement.py 2005-04-12
09:15:02 UTC (rev 7346)
@@ -84,7 +84,7 @@
self._source = self.source
else:
try:
- self._source = self._parent._source
+ self._source = self.getParent ()._source
except AttributeError:
self._source = None
Modified: trunk/gnue-reports/src/base/layout/GRSection.py
===================================================================
--- trunk/gnue-reports/src/base/layout/GRSection.py 2005-04-12 08:54:42 UTC
(rev 7345)
+++ trunk/gnue-reports/src/base/layout/GRSection.py 2005-04-12 09:15:02 UTC
(rev 7346)
@@ -56,7 +56,7 @@
self._name = string.lower(self.name)
# Keep track of "child" section names (for the firstRow stuff)
- psec = self._parent.findParentOfType('GRSection')
+ psec = self.getParent ().findParentOfType('GRSection')
if psec is not None:
psec._childSections = self._childSections[:]
psec._childSections.insert(0, self._name)
@@ -129,8 +129,8 @@
def getAncestorWithSource(self, source):
if self._source == source:
return self
- elif isinstance(self._parent, GRSection):
- return self._parent.getAncestorWithSource(source)
+ elif isinstance(self.getParent (), GRSection):
+ return self.getParent ().getAncestorWithSource(source)
else:
return None
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnue] r7346 - in trunk: gnue-appserver/src gnue-appserver/src/language gnue-common/src/datasources gnue-common/src/definitions gnue-designer/src/base gnue-designer/src/base/tools gnue-designer/src/forms gnue-designer/src/forms/LayoutEditor gnue-designer/src/navigator gnue-designer/src/reports gnue-designer/src/reports/Standard gnue-designer/src/schema gnue-forms/src gnue-forms/src/uidrivers/_base/widgets gnue-forms/src/uidrivers/gtk2 gnue-forms/src/uidrivers/gtk2/widgets gnue-integrator/src gnue-navigator/src gnue-reports/src/base gnue-reports/src/base/layout,
johannes <=