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

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/gui/MainApplication.java (modified) (3 diffs)

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

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
-import java.awt.EventQueue;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -30 +29 @@
 import javax.swing.JPanel;
 import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.data.AutosaveTask;
 import org.openstreetmap.josm.data.Preferences;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -250 +248 @@
         }
 
-        if (AutosaveTask.PROP_AUTOSAVE_ENABLED.get()) {
-            AutosaveTask autosaveTask = new AutosaveTask();
-            List<File> unsavedLayerFiles = autosaveTask.getUnsavedLayersFiles();
-            if (!unsavedLayerFiles.isEmpty()) {
-                System.err.println("autosave debug: unsavedLayerFiles="+unsavedLayerFiles);
-                ExtendedDialog dialog = new ExtendedDialog(
-                        Main.parent,
-                        tr("Unsaved osm data"),
-                        new String[] {tr("Restore"), tr("Cancel"), tr("Discard")}
-                );
-                dialog.setContent(
-                        trn("JOSM found {0} unsaved osm data layer. ",
-                        "JOSM found {0} unsaved osm data layers. ", unsavedLayerFiles.size(), unsavedLayerFiles.size()) +
-                        tr("It looks like JOSM crashed last time. Do you like to restore the data?"));
-                dialog.setButtonIcons(new String[] {"ok", "cancel", "dialogs/remove"});
-                int selection = dialog.showDialog().getValue();
-                System.err.println("autosave debug: user selection="+selection);
-                if (selection == 1) {
-                    for (OsmDataLayer layer: autosaveTask.getUnsavedLayers()) {
-                        Main.main.addLayer(layer);
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                if (AutosaveTask.PROP_AUTOSAVE_ENABLED.get()) {
+                    AutosaveTask autosaveTask = new AutosaveTask();
+                    List<File> unsavedLayerFiles = autosaveTask.getUnsavedLayersFiles();
+                    if (!unsavedLayerFiles.isEmpty()) {
+                        System.err.println("autosave debug: unsavedLayerFiles="+unsavedLayerFiles);
+                        ExtendedDialog dialog = new ExtendedDialog(
+                                Main.parent,
+                                tr("Unsaved osm data"),
+                                new String[] {tr("Restore"), tr("Cancel"), tr("Discard")}
+                        );
+                        dialog.setContent(
+                                trn("JOSM found {0} unsaved osm data layer. ",
+                                "JOSM found {0} unsaved osm data layers. ", unsavedLayerFiles.size(), unsavedLayerFiles.size()) +
+                                tr("It looks like JOSM crashed last time. Do you like to restore the data?"));
+                        dialog.setButtonIcons(new String[] {"ok", "cancel", "dialogs/remove"});
+                        int selection = dialog.showDialog().getValue();
+                        System.err.println("autosave debug: user selection="+selection);
+                        if (selection == 1) {
+                            autosaveTask.recoverUnsavedLayers();
+                        } else if (selection == 3) {
+                            System.err.println("autosave debug: discard autosaved layers");
+                            autosaveTask.dicardUnsavedLayers();
+                            System.err.println("autosave debug: discard autosaved layers [DONE]");
+                        }
                     }
-                    AutoScaleAction.autoScale("data");
-                } else if (selection == 3) {
-                    System.err.println("autosave debug: discard autosaved layers");
-                    autosaveTask.dicardUnsavedLayers();
-                    System.err.println("autosave debug: discard autosaved layers [DONE]");
+                    autosaveTask.schedule();
                 }
-            }
-            autosaveTask.schedule();
-        }
-
-
-        EventQueue.invokeLater(new Runnable() {
-            public void run() {
+                
                 main.postConstructorProcessCmdLine(args);
             }