[brailleblaster] push by francois...@xxxxxxxxx - Refine the Close and Dispose events to keep the view open until the sa... on 2012-07-27 22:05 GMT

  • From: brailleblaster@xxxxxxxxxxxxxx
  • To: brailleblaster@xxxxxxxxxxxxx
  • Date: Fri, 27 Jul 2012 22:05:23 +0000

Revision: 1e88e91d34db
Author:   francois.ouellette01@xxxxxxxxx
Date:     Fri Jul 27 15:04:35 2012
Log: Refine the Close and Dispose events to keep the view open until the save is done by the user.
http://code.google.com/p/brailleblaster/source/detail?r=1e88e91d34db

Modified:
 /src/main/org/brailleblaster/wordprocessor/DocumentManager.java

=======================================
--- /src/main/org/brailleblaster/wordprocessor/DocumentManager.java Fri Jul 27 13:58:44 2012 +++ /src/main/org/brailleblaster/wordprocessor/DocumentManager.java Fri Jul 27 15:04:35 2012
@@ -148,7 +148,6 @@
     LocaleHandler lh = new LocaleHandler();
     StringBuilder brailleLine = new StringBuilder (8192);
     StringBuilder daisyLine = new StringBuilder (8192);
-

     /**
      * Constructor that sets things up for a new document.
@@ -181,19 +180,19 @@

         documentWindow.addListener(SWT.Close, new Listener(){
             public void handleEvent(Event event) {
-//            setReturn(WP.DocumentClosed);
+  //          setReturn(WP.DocumentClosed);
//this way clicking close box is equivalent to the 'close' item on the menu
-
-                setReturn(WP.BBClosed);
+              setReturn(WP.BBClosed);
             }
         });

         documentWindow.addListener (SWT.Dispose, new Listener () {
             public void handleEvent (Event event) {
-                handleShutdown(event);
+                  handleShutdown(event);
             }
         });

+
         Monitor primary = display.getPrimaryMonitor ();
                Rectangle bounds = primary.getBounds ();
                Rectangle rect = documentWindow.getBounds ();
@@ -299,8 +298,6 @@
      * Handle application shutdown signal from OS;
      */
     void handleShutdown (Event event) {
-
-/**  Save is handled in finish() method
        if (daisyHasChanged) {
                        YesNoChoice ync = new 
YesNoChoice(lh.localValue("hasChanged") );
                if (ync.result == SWT.YES) {
@@ -309,23 +306,13 @@
                        daisyHasChanged = false;
                }
        }
-**/
-       System.out.println ("handleShutdown " + documentNumber );
-        event.doit = true;
+    event.doit = true;
     }

     /**
      * Clean up before closing the document.
      */
     void finish() {
-       if (daisyHasChanged || brailleHasChanged) { //FO
-                       YesNoChoice ync = new 
YesNoChoice(lh.localValue("hasChanged") );
-               if (ync.result == SWT.YES) {
-                       fileSave();
-               } else {
-                       daisyHasChanged = false;
-               }
-       }
         documentWindow.dispose();
         finished = true;
     }

Other related posts:

  • » [brailleblaster] push by francois...@xxxxxxxxx - Refine the Close and Dispose events to keep the view open until the sa... on 2012-07-27 22:05 GMT - brailleblaster