Changeset 10192 in josm

Timestamp:

2016-05-11T20:42:43+02:00 (8 years ago)

Author:

Don-vip

Message:

see #12774 - robustness/cleanup in session loading

File:

• trunk/src/org/openstreetmap/josm/actions/SessionLoadAction.java (modified) (2 diffs)

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

@@ -52 +52 @@
                 Arrays.asList(SessionImporter.FILE_FILTER, FileFilterAllFiles.getInstance()),
                 SessionImporter.FILE_FILTER, JFileChooser.FILES_ONLY, "lastDirectory");
-        if (fc == null) return;
+        if (fc == null)
+            return;
         File file = fc.getSelectedFile();
         boolean zip = Utils.hasExtension(file, "joz");
@@ -114 +115 @@
                 @Override
                 public void run() {
-                    if (canceled) return;
-                    if (!layers.isEmpty()) {
-                        Layer firstLayer = layers.get(0);
-                        boolean noMap = Main.map == null;
-                        if (noMap) {
-                            Main.main.createMapFrame(firstLayer, viewport);
-                        }
-                        for (Layer l : layers) {
-                            if (canceled) return;
-                            Main.main.addLayer(l, (ViewportData) null);
-                        }
-                        if (active != null) {
-                            Main.map.mapView.setActiveLayer(active);
-                        }
-                        if (noMap) {
-                            Main.map.setVisible(true);
-                        }
-                    }
-                    for (Runnable task : postLoadTasks) {
-                        if (canceled) return;
-                        if (task == null) {
-                            continue;
-                        }
-                        task.run();
-                    }
+                    if (canceled)
+                        return;
+                    addLayers();
+                    runPostLoadTasks();
                 }
             });
+        }
+
+        private void addLayers() {
+            if (layers != null && !layers.isEmpty()) {
+                Layer firstLayer = layers.get(0);
+                boolean noMap = Main.map == null;
+                if (noMap) {
+                    Main.main.createMapFrame(firstLayer, viewport);
+                }
+                for (Layer l : layers) {
+                    if (canceled)
+                        return;
+                    Main.main.addLayer(l, (ViewportData) null);
+                }
+                if (active != null) {
+                    Main.map.mapView.setActiveLayer(active);
+                }
+                if (noMap) {
+                    Main.map.setVisible(true);
+                }
+            }
+        }
+
+        private void runPostLoadTasks() {
+            for (Runnable task : postLoadTasks) {
+                if (canceled)
+                    return;
+                if (task == null) {
+                    continue;
+                }
+                task.run();
+            }
         }