Changeset 1373 in josm for trunk

Timestamp:

2009-02-07T22:03:47+01:00 (16 years ago)

Author:

stoecker

Message:

fixed #1425. modified patch by xeen

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (3 diffs)
• actions/SaveActionBase.java (modified) (3 diffs)
• gui/ExtendedDialog.java (added)

trunk/src/org/openstreetmap/josm/Main.java

@@ -30 +30 @@
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
+import org.openstreetmap.josm.actions.SaveAction;
 import org.openstreetmap.josm.actions.search.SearchAction;
 import org.openstreetmap.josm.data.Bounds;
@@ -37 +38 @@
 import org.openstreetmap.josm.data.projection.Epsg4326;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.GettingStarted;
 import org.openstreetmap.josm.gui.MainMenu;
@@ -340 +342 @@
             }
             if (modified) {
-                final String msg = uploadedModified ? "\n"+tr("Hint: Some changes came from uploading new data to the server.") : "";
-                final int answer = JOptionPane.showConfirmDialog(
-                        parent, tr("There are unsaved changes. Discard the changes and continue?")+msg,
-                        tr("Unsaved Changes"), JOptionPane.YES_NO_OPTION);
-                if (answer != JOptionPane.YES_OPTION)
+                final String msg = uploadedModified ? "\n"
+                +tr("Hint: Some changes came from uploading new data to the server.") : "";
+                int result = new ExtendedDialog(parent, tr("Unsaved Changes"),
+                new javax.swing.JLabel(tr("There are unsaved changes. Discard the changes and continue?")+msg),
+                new String[] {tr("Save and Exit"), tr("Discard and Exit"), tr("Cancel")},
+                new String[] {"save.png", "exit.png", "cancel.png"}).getValue(); 
+
+                // Save before exiting
+                if(result == 1) {
+                    Boolean savefailed = false;
+                    for (final Layer l : map.mapView.getAllLayers()) {
+                        if (l instanceof OsmDataLayer && ((OsmDataLayer)l).isModified()) {
+                            SaveAction save = new SaveAction(l);
+                            if(!save.doSave())
+                                savefailed = true;
+                        }
+                    }
+                    return savefailed;
+                }
+                else if(result != 2) // Cancel exiting unless the 2nd button was clicked
                     return true;
             }

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

@@ -34 +34 @@
 
     public void actionPerformed(ActionEvent e) {
+        doSave();
+    }
+
+    public Boolean doSave() {
         Layer layer = this.layer;
         if (layer == null && Main.map != null && (Main.map.mapView.getActiveLayer() instanceof OsmDataLayer
@@ -42 +46 @@
 
         if (!checkSaveConditions(layer))
-            return;
+            return false;
 
 
         File file = getFile(layer);
         if (file == null)
-            return;
+            return false;
 
         save(file, layer);
@@ -54 +58 @@
         layer.associatedFile = file;
         Main.parent.repaint();
+        return true;
     }