Changeset 8913 in josm for trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java

Timestamp:

2015-10-19T23:30:55+02:00 (10 years ago)

Author:

simon04

Message:

fix #9115 - Offer to save session when closing editor with unsaved changes

File:

• trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java

@@ -64 +64 @@
     @Override
     public void actionPerformed(ActionEvent e) {
+        try {
+            saveSession();
+        } catch (CancelException ignore) {
+        }
+    }
+
+    /**
+     * Denotes that the user has cancelled the save process.
+     * @since 8913
+     */
+    public static class CancelException extends Exception {
+    }
+
+    /**
+     * Attempts to save the session.
+     * @throws CancelException when the user has cancelled the save process.
+     * @since 8913
+     */
+    public void saveSession() throws CancelException {
         if (!isEnabled()) {
             return;
@@ -70 +89 @@
         SessionSaveAsDialog dlg = new SessionSaveAsDialog();
         dlg.showDialog();
-        if (dlg.getValue() != 1) return;
+        if (dlg.getValue() != 1) {
+            throw new CancelException();
+        }
 
         boolean zipRequired = false;
@@ -93 +114 @@
         }
 
-        if (fc == null)
-            return;
+        if (fc == null) {
+            throw new CancelException();
+        }
 
         File file = fc.getSelectedFile();
@@ -116 +138 @@
         if (fn.indexOf('.') == -1) {
             file = new File(file.getPath() + (zip ? ".joz" : ".jos"));
-            if (!SaveActionBase.confirmOverwrite(file))
-                return;
+            if (!SaveActionBase.confirmOverwrite(file)) {
+                throw new CancelException();
+            }
         }