gnue common/src/GObjects.py common/src/schema/G...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/11/04 01:02:00

Modified files:
        common/src     : GObjects.py 
        common/src/schema: GSParser.py 
        forms/src/GFObjects: GFEntry.py 
        forms/src/uidrivers/wx: UIdriver.py 
        navigator/src  : GNParser.py 

Log message:
        * Misc cleanup

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/common/src/GObjects.py.diff?cvsroot=OldCVS&tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/common/src/schema/GSParser.py.diff?cvsroot=OldCVS&tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFObjects/GFEntry.py.diff?cvsroot=OldCVS&tr1=1.75&tr2=1.76&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?cvsroot=OldCVS&tr1=1.201&tr2=1.202&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/navigator/src/GNParser.py.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: gnue/common/src/GObjects.py
diff -c gnue/common/src/GObjects.py:1.40 gnue/common/src/GObjects.py:1.41
*** gnue/common/src/GObjects.py:1.40    Thu Oct 31 21:40:53 2002
--- gnue/common/src/GObjects.py Mon Nov  4 01:01:59 2002
***************
*** 78,83 ****
--- 78,99 ----
        self._phaseInit(phase)
  
    def _phaseInit(self,phase):
+ 
+ ## TODO: Below is a call-less recursive version of
+ ## TODO: phaseInit.  Needs to be profiled both ways.
+ ##    object = self
+ ##    stack = [self]
+ ##    while stack:
+ ##      object = stack.pop()
+ ##      for child in object._children:
+ ##        stack.insert(0,child)
+ ##      try:
+ ##        init = object._inits[phase]
+ ##      except IndexError:
+ ##        init = None
+ ##      if init:
+ ##        init()
+ 
      if (len(self._inits) > phase) and self._inits[phase]:
        GDebug.printMesg(6,"%s: Init Phase %s" % (self._type, phase+1))
        self._inits[phase]()
Index: gnue/common/src/schema/GSParser.py
diff -c gnue/common/src/schema/GSParser.py:1.7 
gnue/common/src/schema/GSParser.py:1.8
*** gnue/common/src/schema/GSParser.py:1.7      Mon Jul 29 13:12:51 2002
--- gnue/common/src/schema/GSParser.py  Mon Nov  4 01:02:00 2002
***************
*** 91,96 ****
--- 91,97 ----
  
        'table':    {
           'BaseClass': Objects.GSTable,
+          'Importable': 1,
           'Attributes': {
              'name': {
                 'Required': 1,
***************
*** 102,112 ****
--- 103,115 ----
  
        'fields':  {
           'BaseClass': Objects.GSFields,
+          'Importable': 1,
           'SingleInstance': 1,
           'ParentTags':  ('table',) },
  
        'field':   {
           'BaseClass': Objects.GSField,
+          'Importable': 1,
           'Attributes': {
              'name':          {
                 'Required': 1,
Index: gnue/forms/src/GFObjects/GFEntry.py
diff -c gnue/forms/src/GFObjects/GFEntry.py:1.75 
gnue/forms/src/GFObjects/GFEntry.py:1.76
*** gnue/forms/src/GFObjects/GFEntry.py:1.75    Mon Nov  4 00:05:20 2002
--- gnue/forms/src/GFObjects/GFEntry.py Mon Nov  4 01:02:00 2002
***************
*** 332,336 ****
    def resetForeignKey(self):
      self._allowedValues = None
      self.allowedValues()
!     
!     
--- 332,336 ----
    def resetForeignKey(self):
      self._allowedValues = None
      self.allowedValues()
! 
! 
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.201 
gnue/forms/src/uidrivers/wx/UIdriver.py:1.202
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.201       Thu Oct 31 17:58:37 2002
--- gnue/forms/src/uidrivers/wx/UIdriver.py     Mon Nov  4 01:02:00 2002
***************
*** 636,645 ****
      # Check if foreign key changed
      object = _IdToGFObj[widget.GetId()]
      try:
!       if object.style == "dropdown"and \
!           not object._allowedValues == widget.__origAllowedValues:
!         widget.__origAllowedValues = object._allowedValues
!         for value in object._allowedValuesDescr: 
            widget.Append(value)
      except AttributeError:
        pass
--- 636,646 ----
      # Check if foreign key changed
      object = _IdToGFObj[widget.GetId()]
      try:
!       if object.style == "dropdown" and \
!           not object._allowedValues == widget._origAllowedValues:
!         widget._origAllowedValues = object._allowedValues
!         widget.Clear()
!         for value in object._allowedValuesDescr:
            widget.Append(value)
      except AttributeError:
        pass
***************
*** 840,845 ****
--- 841,848 ----
        newWidget = wxComboBox(event.container, -1, "",defaultPoint,
                                wxSize(self.itemWidth,self.itemHeight),
                               choices, wxCB_DROPDOWN,) # |wxWANTS_CHARS,)
+       newWidget._origAllowedValues = object._allowedValues
+ 
        newWidget.SetValue("")
        EVT_COMBOBOX(newWidget, newWidget.GetId(), self.comboHandler)
  
Index: gnue/navigator/src/GNParser.py
diff -c gnue/navigator/src/GNParser.py:1.5 gnue/navigator/src/GNParser.py:1.6
*** gnue/navigator/src/GNParser.py:1.5  Thu Jun  6 18:08:00 2002
--- gnue/navigator/src/GNParser.py      Mon Nov  4 01:02:00 2002
***************
*** 1,6 ****
  #
- # Copyright 2002 Free Software Foundation
- #
  # This file is part of GNU Enterprise.
  #
  # GNU Enterprise is free software; you can redistribute it
--- 1,4 ----
***************
*** 18,28 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
  # FILE:
  # GNParser.py
  #
  # DESCRIPTION:
! # Class that contains a sax based xml processor for GNUE forms
  #
  # NOTES:
  #
--- 16,28 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
+ # Copyright 2002 Free Software Foundation
+ #
  # FILE:
  # GNParser.py
  #
  # DESCRIPTION:
! # Class that contains a sax based xml processor for GNUe Nav
  #
  # NOTES:
  #