Changeset 1648 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2009-06-07T10:10:06+02:00 (15 years ago)

Author:

stoecker

Message:

prevent overwriting of GPX files

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• DiskAccessAction.java (modified) (1 diff)
• SaveAction.java (modified) (2 diffs)

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

@@ -46 +46 @@
             File file = fc.getSelectedFile();
             if (file == null || (file.exists() && 1 !=
-                new ExtendedDialog(Main.parent, 
-                        tr("Overwrite"), 
+                new ExtendedDialog(Main.parent,
+                        tr("Overwrite"),
                         tr("File exists. Overwrite?"),
-                        new String[] {tr("Overwrite"), tr("Cancel")}, 
+                        new String[] {tr("Overwrite"), tr("Cancel")},
                         new String[] {"save_as.png", "cancel.png"}).getValue()))
                 return null;

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

@@ -7 +7 @@
 import java.io.File;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.GpxLayer;
+import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -28 +31 @@
     @Override public File getFile(Layer layer) {
         File f = layer.getAssociatedFile();
+        if(f != null && layer instanceof GpxLayer && f.exists() && 1 !=
+        new ExtendedDialog(Main.parent, tr("Overwrite"),
+        tr("File {0} exists. Overwrite?", f.getName()),
+        new String[] {tr("Overwrite"), tr("Cancel")},
+        new String[] {"save_as.png", "cancel.png"}).getValue())
+            f = null;
         return f == null ? openFileDialog(layer) : f;
     }