Changeset 6246 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks

Timestamp:

2013-09-22T18:36:07+02:00 (11 years ago)

Author:

Don-vip

Message:

Sonar/FindBugs - various bugfixes / violation fixes

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (modified) (1 diff)

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

@@ -161 +161 @@
             boolean merge = Main.pref.getBoolean("download.gps.mergeWithLocal", false);
             Layer active = Main.map.mapView.getActiveLayer();
-            if (active != null && active instanceof GpxLayer && (merge || ((GpxLayer)active).data.fromServer))
+            if (active instanceof GpxLayer && (merge || ((GpxLayer)active).data.fromServer))
                 return (GpxLayer) active;
             for (GpxLayer l : Main.map.mapView.getLayersOfType(GpxLayer.class)) {