gnue/designer/src base/Incubator.py base/Object...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/06/04 16:00:52

Modified files:
        designer/src/base: Incubator.py ObjectList.py 
        designer/src/forms/LayoutEditor: DisplayDropTarget.py 

Log message:
        several minor bug fixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/Incubator.py.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/ObjectList.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/DisplayDropTarget.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: gnue/designer/src/base/Incubator.py
diff -c gnue/designer/src/base/Incubator.py:1.20 
gnue/designer/src/base/Incubator.py:1.21
*** gnue/designer/src/base/Incubator.py:1.20    Tue Apr  1 00:59:02 2003
--- gnue/designer/src/base/Incubator.py Wed Jun  4 16:00:52 2003
***************
*** 70,75 ****
--- 70,76 ----
        return 1
  
      o = objclass(parent)
+     GDebug.printMesg(10, 'Created %s' % o)
  
      # Add any GContent
      try:
***************
*** 95,101 ****
      o._buildObject()
      self.instance.dispatchEvent('ObjectCreated',object=o, originator=__name__)
      if select:
!       self.instance.dispatchEvent('ObjectSelected',object=object, 
originator=__name__)
      return o
  
    ##
--- 96,102 ----
      o._buildObject()
      self.instance.dispatchEvent('ObjectCreated',object=o, originator=__name__)
      if select:
!       self.instance.dispatchEvent('ObjectSelected',object=o, 
originator=__name__)
      return o
  
    ##
Index: gnue/designer/src/base/ObjectList.py
diff -c gnue/designer/src/base/ObjectList.py:1.3 
gnue/designer/src/base/ObjectList.py:1.4
*** gnue/designer/src/base/ObjectList.py:1.3    Mon Jun  2 20:21:11 2003
--- gnue/designer/src/base/ObjectList.py        Wed Jun  4 16:00:52 2003
***************
*** 37,43 ****
  class ObjectList:
    def __init__(self, instance, base, nameAttr, updateMethod=_dummy):
      self.base = base
-     print "Base=%s" % base
      self.name = nameAttr
      self.update = updateMethod
      self.objects = []
--- 37,42 ----
***************
*** 60,66 ****
  
    def __objectCreated (self, event):
      if isinstance(event.object, self.base):
!       self.objects.append(object)
        self.update()
  
    def __objectDeleted (self, event):
--- 59,65 ----
  
    def __objectCreated (self, event):
      if isinstance(event.object, self.base):
!       self.objects.append(event.object)
        self.update()
  
    def __objectDeleted (self, event):
***************
*** 73,79 ****
    def getDict(self):
      rs = {}
      for object in self.objects:
!       rs[object.__dict__[self.name]] = object
      return rs
  
    def getList(self):
--- 72,81 ----
    def getDict(self):
      rs = {}
      for object in self.objects:
!       try:
!         rs[object.__dict__[self.name]] = object
!       except KeyError:
!         pass
      return rs
  
    def getList(self):
***************
*** 81,86 ****
--- 83,89 ----
  
    def __getitem__(self, name):
  
+     # Name can either be the object's "name", or an index value
      try:
        name = name.lower()
      except AttributeError:
***************
*** 89,99 ****
  
      # Name reference
      for object in self.objects:
!       if object.__dict__[self.name].lower() == name:
!         return object
      raise KeyError
  
!   def __getslice(self, i, j):
      return self.objects[i:j]
  
    def __len__(self):
--- 92,105 ----
  
      # Name reference
      for object in self.objects:
!       try:
!         if object.__dict__[self.name].lower() == name:
!           return object
!       except KeyError:
!         pass
      raise KeyError
  
!   def __getslice__(self, i, j):
      return self.objects[i:j]
  
    def __len__(self):
Index: gnue/designer/src/forms/LayoutEditor/DisplayDropTarget.py
diff -c gnue/designer/src/forms/LayoutEditor/DisplayDropTarget.py:1.17 
gnue/designer/src/forms/LayoutEditor/DisplayDropTarget.py:1.18
*** gnue/designer/src/forms/LayoutEditor/DisplayDropTarget.py:1.17      Mon Jun 
 2 20:21:11 2003
--- gnue/designer/src/forms/LayoutEditor/DisplayDropTarget.py   Wed Jun  4 
16:00:52 2003
***************
*** 256,262 ****
                 datasource.table == table['name']:
                block = test
                break
!           except KeyError, AttributeError:
              pass
  
        if not block:
--- 256,262 ----
                 datasource.table == table['name']:
                block = test
                break
!           except (KeyError, AttributeError):
              pass
  
        if not block:
***************
*** 264,278 ****
              instance.rootObject,
              'datasource',
              instance.rootObject,
!             attributes={'name': instance.getUniqueName('dts'%params['name']),
!                         'connection':params['connection'],
!                         'table': params['name']})
          block = instance.incubator.createObject(
              instance.rootObject,
              'block',
              instance.rootObject._logic,
!             attributes={'name': instance.getUniqueName('blk'%params['name']),
!                         'datasource':datasource.name})
  
        page = self.editor.page
  
--- 264,280 ----
              instance.rootObject,
              'datasource',
              instance.rootObject,
!             attributes={'name': instance.getUniqueName('dts%s'%table['name']),
!                         'connection':table['connection'],
!                         'table': table['name']},
!             select=0)
          block = instance.incubator.createObject(
              instance.rootObject,
              'block',
              instance.rootObject._logic,
!             attributes={'name': instance.getUniqueName('blk%s'%table['name']),
!                         'datasource':datasource.name},
!             select=0)
  
        page = self.editor.page