[gnue] r8685 - in trunk/gnue-forms/src: . GFObjects

[reinhard]

Author: reinhard
Date: 2006-09-14 05:06:08 -0500 (Thu, 14 Sep 2006)
New Revision: 8685

Modified:
   trunk/gnue-forms/src/GFForm.py
   trunk/gnue-forms/src/GFInstance.py
   trunk/gnue-forms/src/GFObjects/GFBlock.py
Log:
Changed GFForm.endEditing() to raise an exception rather than to return False
in case of errors.


Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py      2006-09-13 21:50:40 UTC (rev 8684)
+++ trunk/gnue-forms/src/GFForm.py      2006-09-14 10:06:08 UTC (rev 8685)
@@ -641,6 +641,7 @@
             status = 'QRY'
         else:
             status = {
+                    None:       '',
                     'empty':    'NEW',
                     'inserted': 'MOD',
                     'void':     'DEL',
@@ -1082,8 +1083,7 @@
         Enters the form into Query mode.
         """
 
-        if not self.endEditing():
-            return
+        self.endEditing()
 
         if self._currentBlock is not None:
             if self._currentBlock.autoCommit:
@@ -1114,8 +1114,7 @@
         Copies the Query, ie brings back conditions from the last query.
         """
 
-        if not self.endEditing():
-            return
+        self.endEditing()
 
         if self._currentBlock is not None:
             if self._currentBlock.autoCommit:
@@ -1146,7 +1145,7 @@
         Cancels Query mode.
         """
 
-        self.endEditing ()
+        self.endEditing()
 
         self.dispatchEvent('endENTERQUERY', _form=self)
 
@@ -1169,8 +1168,7 @@
         if self._currentBlock is None:
             return
 
-        if not self.endEditing():
-            return
+        self.endEditing()
 
         # Do a rollback on all connections so the query starts a new
         # transaction.
@@ -1210,8 +1208,7 @@
         Commit all pending changes.
         """
 
-        if not self.endEditing():
-            return
+        self.endEditing()
 
         try:
             # Do the actual work
@@ -1285,7 +1282,11 @@
         Roll back any uncommitted transaction.
         """
 
-        self.endEditing()
+        try:
+            self.endEditing()
+        except:
+            # Ignore errors, as we're discarding the changes anyway
+            pass
 
         # Call rollback only once per connection (if multiple blocks are
         # sharing the same connection)
@@ -1711,14 +1712,10 @@
         save it's value to the virtual form.
         @return: Boolean, True if succeeded, False if failed.
         """
-        try:
-            if isinstance(self._currentEntry, GFEntry):
-                self._currentEntry.endEdit()
-            return True
-        except errors.UserError, e:
-            self.alert_message(e.getMessage())
-            return False
+        if isinstance(self._currentEntry, GFEntry):
+            self._currentEntry.endEdit()
 
+
     # -------------------------------------------------------------------------
     # Start editing mode of the current entry
     # -------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py  2006-09-13 21:50:40 UTC (rev 8684)
+++ trunk/gnue-forms/src/GFInstance.py  2006-09-14 10:06:08 UTC (rev 8685)
@@ -441,12 +441,14 @@
     if event.data == event._form._currentEntry:
         return True
 
-    if not event._form.endEditing ():
+    try:
+      event._form.endEditing()
+    except:
       # Old focus entry has invalid value: beat the UI focus back, so we are
       # captured until the value is corrected.
       self.dispatchEvent ('gotoENTRY', object = event._form._currentEntry,
                          _form = event._form)
-      return False
+      raise
 
     if event.data._type in ['GFEntry', 'GFImage', 'GFButton']:
       if not event.data.is_navigable (event._form.getCurrentMode ()):
@@ -476,8 +478,7 @@
     @param event: The event currently being processed.
     """
 
-    if not event._form.endEditing ():
-      return
+    event._form.endEditing()
 
     origEntry = event._form._currentEntry
     event._form._currentEntry.processTrigger ('ON-NEXT-ENTRY',
@@ -507,8 +508,7 @@
     param event: The event that requested the previous entry.
     """
 
-    if not event._form.endEditing ():
-      return
+    event._form.endEditing()
 
     origEntry = event._form._currentEntry
     event._form._currentEntry.processTrigger ('ON-PREVIOUS-ENTRY',
@@ -535,10 +535,8 @@
     next data entry block
     """
 
-    if not event._form.endEditing ():
-      return
-
-    event._form.nextBlock ()
+    event._form.endEditing()
+    event._form.nextBlock()
     event._form.update_status()
 
 
@@ -552,10 +550,8 @@
     next data entry block
     """
 
-    if not event._form.endEditing ():
-      return
-
-    event._form.previousBlock ()
+    event._form.endEditing()
+    event._form.previousBlock()
     event._form.update_status()
 
 
@@ -568,15 +564,12 @@
     Called to make the form jump to the next page
     """
 
-    if not event._form.endEditing ():
-      return
-
+    event._form.endEditing()
     currentIndex = 
event._form._layout._pageList.index(event._form._currentPage)
     if currentIndex == len (event._form._layout._pageList) - 1:
       nextIndex = 0
     else:
       nextIndex = currentIndex + 1
-
     event._form.findAndChangeFocus (event._form._layout._pageList [nextIndex])
     event._form.update_status()
 
@@ -590,9 +583,7 @@
     Called to make the form jump to the previous page
     """
 
-    if not event._form.endEditing ():
-      return
-
+    event._form.endEditing()
     pageList = event._form._layout._pageList
     currentIndex = pageList.index (event._form._currentPage)
     event._form.findAndChangeFocus (pageList [currentIndex - 1])
@@ -607,9 +598,7 @@
     Jump to a specific page of the form
     """
 
-    if not event._form.endEditing ():
-      return
-
+    event._form.endEditing()
     newpage = event._form._layout._pageList [event.data]
     event._form.findAndChangeFocus (newpage)
     event._form.update_status()

Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py   2006-09-13 21:50:40 UTC (rev 
8684)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py   2006-09-14 10:06:08 UTC (rev 
8685)
@@ -561,7 +561,7 @@
         Return True if the block is pending any uncommited changes.
         """
 
-        return self._resultSet and self._resultSet.isPending()
+        return self._resultSet is not None and self._resultSet.isPending()
 
   # ---------------------------------------------------------------------------
 
@@ -574,7 +574,8 @@
         status other than empty.
         """
 
-        return self._resultSet.current.isEmpty()
+        return self._resultSet is None or self._resultSet.current is None \
+                or self._resultSet.current.isEmpty()
 
   # ---------------------------------------------------------------------------
 
@@ -612,8 +613,7 @@
         if self._resultSet.isFirstRecord():
             return
 
-        if not self._form.endEditing():
-            return
+        self._form.endEditing()
 
         self.__focus_out()
 
@@ -641,8 +641,7 @@
         if self._resultSet.isFirstRecord():
             return
 
-        if not self._form.endEditing():
-            return
+        self._form.endEditing()
 
         self.__focus_out()
 
@@ -675,8 +674,7 @@
                 self.new_record()
                 return
 
-        if not self._form.endEditing():
-            return
+        self._form.endEditing()
 
         self.__focus_out()
 
@@ -704,8 +702,7 @@
         if self._resultSet.isLastRecord():
             return
 
-        if not self._form.endEditing():
-            return
+        self._form.endEditing()
 
         self.__focus_out()
 
@@ -733,8 +730,7 @@
         if self.mode == 'query':
             return
 
-        if not self._form.endEditing():
-            return
+        self._form.endEditing()
 
         # If record_number is negative, move relative to last record
         if record_number < 0:
@@ -788,8 +784,7 @@
         if self.mode == 'query':
             return
 
-        if not self._form.endEditing():
-            return
+        self._form.endEditing()
 
         self.__focus_out()
 
@@ -819,8 +814,7 @@
         if self.mode == 'query':
             return
 
-        if not self._form.endEditing():
-            return
+        self._form.endEditing()
 
         self.__focus_out()