Changeset 3378 in josm for trunk/src/org/openstreetmap/josm/gui/MainApplication.java

Timestamp:

20.07.2010 08:54:22 (22 months ago)

Author:

jttt

Message:

Fix #2662 Auto-save

File:

• trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -25 +25 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.AutosaveTask;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -59 +61 @@
         mainFrame.addWindowListener(new WindowAdapter(){
             @Override public void windowClosing(final WindowEvent arg0) {
-                if (!Main.saveUnsavedModifications())
-                    return;
-                Main.saveGuiGeometry();
-                System.exit(0);
+                Main.exitJosm(true);
             }
         });
@@ -240 +239 @@
         }
 
+        AutosaveTask autosaveTask = new AutosaveTask();
+        List<OsmDataLayer> unsavedLayers = autosaveTask.getUnsavedLayers();
+        if (!unsavedLayers.isEmpty()) {
+            ExtendedDialog dialog = new ExtendedDialog(
+                    Main.parent,
+                    tr("Unsaved osm data"),
+                    new String[] {tr("Restore"), tr("Cancel")}
+            );
+            dialog.setContent(tr("JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last time. Do you want to restore data?",
+                    unsavedLayers.size()));
+            dialog.setButtonIcons(new String[] {"ok.png", "cancel.png"});
+            dialog.showDialog();
+            if (dialog.getValue() == 1) {
+                for (OsmDataLayer layer: unsavedLayers) {
+                    Main.main.addLayer(layer);
+                }
+            }
+
+
+        }
+        autosaveTask.schedule();
+
+
         EventQueue.invokeLater(new Runnable() {
             public void run() {