Changeset 15350 in josm for trunk

Timestamp:

2019-09-14T17:03:53+02:00 (5 years ago)

Author:

Don-vip

Message:

see #18116 - findbugs - RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE

File:

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

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

@@ -21 +21 @@
 
 import org.openstreetmap.josm.actions.downloadtasks.DownloadTaskList;
-import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -91 +90 @@
             DataSet ds = MainApplication.getLayerManager().getEditDataSet();
             if (ds != null) {
-                Collection<Bounds> existing = ds.getDataSourceBounds();
-                if (existing != null) {
-                    double p = LatLon.MAX_SERVER_PRECISION;
-                    LatLon min = new LatLon(bounds.getY()+p, bounds.getX()+p);
-                    LatLon max = new LatLon(bounds.getY()+bounds.getHeight()-p, bounds.getX()+bounds.getWidth()-p);
-                    if (existing.stream().anyMatch(current -> (current.contains(min) && current.contains(max)))) {
-                        return; // skip this one, already downloaded
-                    }
+                double p = LatLon.MAX_SERVER_PRECISION;
+                LatLon min = new LatLon(bounds.getY()+p, bounds.getX()+p);
+                LatLon max = new LatLon(bounds.getY()+bounds.getHeight()-p, bounds.getX()+bounds.getWidth()-p);
+                if (ds.getDataSourceBounds().stream().anyMatch(current -> (current.contains(min) && current.contains(max)))) {
+                    return; // skip this one, already downloaded
                 }
             }