Changeset 4852 in josm

Timestamp:

2012-01-22T20:56:24+01:00 (12 years ago)

Author:

bastiK

Message:

fixed #6252 - Phantom "unsaved" layers in 4021, 4032

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/AutosaveTask.java (modified) (1 diff)
• io/OsmExporter.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/AutosaveTask.java

@@ -167 +167 @@
             if (file != null) {
                 info.backupFiles.add(file);
-                new OsmExporter().exportData(file, info.layer);
+                new OsmExporter().exportData(file, info.layer, true /* no backup with appended ~ */);
             }
         }

trunk/src/org/openstreetmap/josm/io/OsmExporter.java

@@ -41 +41 @@
     @Override
     public void exportData(File file, Layer layer) throws IOException {
+        exportData(file, layer, false);
+    }
+
+    public void exportData(File file, Layer layer, boolean noBackup) throws IOException {
         if (layer instanceof OsmDataLayer) {
-            save(file, (OsmDataLayer) layer);
+            save(file, (OsmDataLayer) layer, noBackup);
         } else
             throw new IllegalArgumentException(MessageFormat.format("Expected instance of OsmDataLayer. Got ''{0}''.", layer
@@ -52 +56 @@
     }
 
-    private void save(File file, OsmDataLayer layer) {
+    private void save(File file, OsmDataLayer layer, boolean noBackup) {
         File tmpFile = null;
         try {
@@ -79 +83 @@
             }
             // FIXME - how to close?
-            if (!Main.pref.getBoolean("save.keepbackup", false) && (tmpFile != null)) {
-                tmpFile.delete();
+            if (noBackup || !Main.pref.getBoolean("save.keepbackup", false)) {
+                if (tmpFile != null) {
+                    tmpFile.delete();
+                }
             }
             layer.onPostSaveToFile();