Changeset 8904 in josm for trunk/src

Timestamp:

2015-10-19T00:46:00+02:00 (9 years ago)

Author:

Don-vip

Message:

Add first unit tests for download tasks

File:

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

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java

@@ -146 +146 @@
             if (layer == null) return null;
             if (newLayer || mergeLayer == null) {
-                Main.main.addLayer(layer);
+                if (Main.main != null) {
+                    Main.main.addLayer(layer);
+                }
                 return layer;
             } else {
                 mergeLayer.mergeFrom(layer);
-                Main.map.repaint();
+                if (Main.map != null) {
+                    Main.map.repaint();
+                }
                 return mergeLayer;
             }
@@ -179 +183 @@
         }
 
-        @Override protected void cancel() {
+        @Override
+        protected void cancel() {
             setCanceled(true);
             if (reader != null) {