Changeset 10315 in josm for trunk/src/org

Timestamp:

2016-06-02T02:22:40+02:00 (8 years ago)

Author:

Don-vip

Message:

findbugs, code optimization/cleanup

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadOsmTask.java (modified) (1 diff)
• io/OsmServerLocationReader.java (modified) (2 diffs)
• tools/Utils.java (modified) (3 diffs)

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

@@ -218 +218 @@
         protected int getNumDataLayers() {
             if (!Main.isDisplayingMapView()) return 0;
-            int count = 0;
-            Collection<Layer> layers = Main.map.mapView.getAllLayers();
-            for (Layer layer : layers) {
-                if (layer instanceof OsmDataLayer) {
-                    count++;
-                }
-            }
-            return count;
+            return Utils.filteredCollection(Main.map.mapView.getAllLayers(), OsmDataLayer.class).size();
         }
 

trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java

@@ -6 +6 @@
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
@@ -178 +178 @@
             in = getInputStream(url, progressMonitor.createSubTaskMonitor(1, true));
             if (in == null) {
-                return new ArrayList<>();
+                return Collections.emptyList();
             }
             progressMonitor.subTask(tr("Downloading OSM notes..."));

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -395 +395 @@
             return Arrays.copyOf(array, array.length);
         }
-        return null;
+        return array;
     }
 
@@ -408 +408 @@
             return Arrays.copyOf(array, array.length);
         }
-        return null;
+        return array;
     }
 
@@ -421 +421 @@
             return Arrays.copyOf(array, array.length);
         }
-        return null;
+        return array;
     }