svn commit: r17378 - trunk/src/argouml-app/src/org/argouml/ui/ProjectBrowser.java

Author: bobtarling
Date: 2009-10-07 08:46:54-0700
New Revision: 17378

Modified:
   trunk/src/argouml-app/src/org/argouml/ui/ProjectBrowser.java

Log:
We should also exit if the user selects 'no' to saving

Modified: trunk/src/argouml-app/src/org/argouml/ui/ProjectBrowser.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/ProjectBrowser.java?view=diff&pathrev=17378&r1=17377&r2=17378
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/ProjectBrowser.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/ui/ProjectBrowser.java	2009-10-07 08:46:54-0700
@@ -971,10 +971,6 @@
                 JOptionPane.showConfirmDialog(
                     this, t, t, JOptionPane.YES_NO_CANCEL_OPTION);
 
-            if (response == JOptionPane.CANCEL_OPTION
-                    || response == JOptionPane.CLOSED_OPTION) {
-                return;
-            }
             if (response == JOptionPane.YES_OPTION) {
                 // The trySave method results in the save taking place in another thread.
                 // If that completes without error the ProjectBrowser.exit() method will
@@ -983,12 +979,18 @@
                         && ProjectManager.getManager().getCurrentProject()
                                 .getURI() != null,
                                 false, true);
+                return;
+            } else if (response == JOptionPane.CANCEL_OPTION) {
+                return;
             }
-        } else {
-            exit();
         }
+        exit();
     }
     
+    
+    /**
+     * Exit the application saving the current user settings.
+     */
     public void exit() {
         saveScreenConfiguration();
         Configuration.save();

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2404566

To unsubscribe from this discussion, e-mail: [[email protected]].