Changeset 3679 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2010-11-29T08:24:10+01:00 (13 years ago)

Author:

bastiK

Message:

see #5559 - ExtendedDialog.showDialog() blocks when called in main thread, so move gui stuff to edt. This problem is highly system dependent (i could never reproduce it myself, but seems to be quite common)

File:

• trunk/src/org/openstreetmap/josm/data/AutosaveTask.java (modified) (5 diffs)

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

@@ -5 +5 @@
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -22 +20 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.OpenFileAction.OpenFileTask;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
@@ -32 +31 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
-import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.io.OsmExporter;
-import org.openstreetmap.josm.io.OsmReader;
-
+
+/**
+ * Saves data layers periodically so they can be recovered in case of a crash.
+ */
 public class AutosaveTask extends TimerTask implements LayerChangeListener, Listener {
 
@@ -55 +54 @@
         final Deque<File> backupFiles = new LinkedList<File>();
     }
-
-    //"data layer 1_20100711_1330"
 
     private final DataSetListenerAdapter datasetAdapter = new DataSetListenerAdapter(this);
@@ -261 +258 @@
     }
 
-    public List<OsmDataLayer> getUnsavedLayers() {
-        List<OsmDataLayer> result = new ArrayList<OsmDataLayer>();
-
-        for (File f: getUnsavedLayersFiles()) {
-            try {
-                DataSet ds = OsmReader.parseDataSet(new FileInputStream(f), NullProgressMonitor.INSTANCE);
-                String layerName = f.getName();
-                layerName = layerName.substring(0, layerName.lastIndexOf('.'));
-                result.add(new OsmDataLayer(ds, layerName, null));
-                moveToDeletedLayersFolder(f);
-            } catch (FileNotFoundException e) {
-                // Should not happen
-                System.err.println("File " + f.getAbsolutePath() + " not found");
-            } catch (IllegalDataException e) {
-                System.err.println(tr("Unable to read autosaved osm data ({0}) - {1}", f.getAbsoluteFile(), e.getMessage()));
-            }
-        }
-
-        return result;
+    public void recoverUnsavedLayers() {
+        List<File> files = getUnsavedLayersFiles();
+        final OpenFileTask openFileTsk = new OpenFileTask(files, null, tr("Restoring files"));
+        Main.worker.submit(openFileTsk);
+        Main.worker.submit(new Runnable() {
+            public void run() {
+                for (File f: openFileTsk.getSuccessfullyOpenedFiles()) {
+                    moveToDeletedLayersFolder(f);
+                }
+            }          
+        });
     }