gnue/forms/src GFClient.py GFInstance.py

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 03/03/31 21:38:11

Modified files:
        forms/src      : GFClient.py GFInstance.py 

Log message:
        fix startup error handling

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFClient.py.diff?tr1=1.67&tr2=1.68&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.103&tr2=1.104&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFClient.py
diff -c gnue/forms/src/GFClient.py:1.67 gnue/forms/src/GFClient.py:1.68
*** gnue/forms/src/GFClient.py:1.67     Thu Mar  6 14:45:28 2003
--- gnue/forms/src/GFClient.py  Mon Mar 31 21:38:11 2003
***************
*** 96,102 ****
          else:
            self.handleStartupError(_("Unable to load any valid UI drivers.  
Aborting."))
  
!     if hasattr(self._ui,'handleStartupError'):
        self.handleStartupError = self._ui.handleStartupError
  
  ##    if hasattr(self._ui,'handleUncaughtException'):
--- 96,102 ----
          else:
            self.handleStartupError(_("Unable to load any valid UI drivers.  
Aborting."))
  
!     if hasattr(self._ui,'handleStartupError') and not 
self.OPTIONS['debug_level']:
        self.handleStartupError = self._ui.handleStartupError
  
  ##    if hasattr(self._ui,'handleUncaughtException'):
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.103 gnue/forms/src/GFInstance.py:1.104
*** gnue/forms/src/GFInstance.py:1.103  Mon Mar 24 21:05:08 2003
--- gnue/forms/src/GFInstance.py        Mon Mar 31 21:38:11 2003
***************
*** 253,261 ****
      #
      # Initialize all the forms loaded into memory
      #
!     for dialog in self._formsDictionary.keys():
!       object = self._formsDictionary[dialog]
!       object.phaseInit()
  
      #
      # Construct an instance of the UI driver 
--- 253,277 ----
      #
      # Initialize all the forms loaded into memory
      #
!     try:
!       for dialog in self._formsDictionary.keys():
!         object = self._formsDictionary[dialog]
!         object.phaseInit()
! 
!     except GConnections.Error, mesg:
!       self.manager.handleStartupError(mesg)
! 
!     except GDataObjects.ConnectError, mesg:
!       self.manager.handleStartupError(
!         _("Unable to login to datasource.\n\n       %s") %mesg)
! 
!     except GDataObjects.ConnectionError, mesg:
!       self.manager.handleStartupError(
!         _("Error while communicating with datasource.\n\n       %s") %mesg)
! 
!     except GDataObjects.Error, mesg:
!       self.manager.handleStartupError(mesg)
! 
  
      #
      # Construct an instance of the UI driver 
***************
*** 307,328 ****
    def buildForm(self,formName='__main__'):
      form = self._formsDictionary[formName]
      
!     try:
!       self._uiinstance.buildForm(form, formName)
! 
!     except GConnections.Error, mesg:
!       self.handleStartupError(mesg)
! 
!     except GDataObjects.ConnectError, mesg:
!       self.handleStartupError(
!         _("Unable to login to datasource.\n\n       %s") %mesg)
! 
!     except GDataObjects.ConnectionError, mesg:
!       self.handleStartupError(
!         _("Error while communicating with datasource.\n\n       %s") %mesg)
! 
!     except GDataObjects.Error, mesg:
!       self.handleStartupError(mesg)
                                              
    #
    #
--- 323,329 ----
    def buildForm(self,formName='__main__'):
      form = self._formsDictionary[formName]
      
!     self._uiinstance.buildForm(form, formName)
                                              
    #
    #