Changeset 16438 in josm for trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

Timestamp:

2020-05-17T14:18:22+02:00 (4 years ago)

Author:

simon04

Message:

see #19251 - Java 8: use Stream

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -32 +32 @@
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
@@ -38 +39 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.swing.AbstractAction;
@@ -52 +55 @@
 import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.UndoRedoHandler;
@@ -826 +828 @@
 
     private static boolean containsOnlyGpxTags(Tagged t) {
-        for (String key : t.getKeys().keySet()) {
-            if (!GpxConstants.WPT_KEYS.contains(key) && !key.startsWith(GpxConstants.GPX_PREFIX)) {
-                return false;
-            }
-        }
-        return true;
+        return t.getKeys().keySet().stream()
+                .allMatch(key -> GpxConstants.WPT_KEYS.contains(key) || key.startsWith(GpxConstants.GPX_PREFIX));
     }
 
@@ -890 +888 @@
         addStringIfPresent(wpt, n, GpxConstants.GPX_SRC, "source", "source:position");
 
-        Collection<GpxLink> links = new ArrayList<>();
-        for (String key : new String[]{"link", "url", "website", "contact:website"}) {
-            String value = gpxVal(n, key);
-            if (value != null) {
-                links.add(new GpxLink(value));
-            }
-        }
+        Collection<GpxLink> links = Stream.of("link", "url", "website", "contact:website")
+                .map(key -> gpxVal(n, key))
+                .filter(Objects::nonNull)
+                .map(GpxLink::new)
+                .collect(Collectors.toList());
         wpt.put(GpxConstants.META_LINKS, links);
 
@@ -968 +964 @@
 
     private static void addStringIfPresent(WayPoint wpt, OsmPrimitive p, String gpxKey, String... osmKeys) {
-        List<String> possibleKeys = new ArrayList<>(Arrays.asList(osmKeys));
-        possibleKeys.add(0, gpxKey);
-        for (String key : possibleKeys) {
-            String value = gpxVal(p, key);
-            // Sanity checks
-            if (value != null && (!GpxConstants.PT_FIX.equals(gpxKey) || GpxConstants.FIX_VALUES.contains(value))) {
-                wpt.put(gpxKey, value);
-                break;
-            }
-        }
+        Stream.concat(Stream.of(gpxKey), Arrays.stream(osmKeys))
+                .map(key -> gpxVal(p, key))
+                // Sanity checks
+                .filter(value -> value != null && (!GpxConstants.PT_FIX.equals(gpxKey) || GpxConstants.FIX_VALUES.contains(value)))
+                .findFirst()
+                .ifPresent(value -> wpt.put(gpxKey, value));
     }
 
@@ -1029 +1021 @@
             return true;
 
-        boolean layerBoundsPoint = false;
-        for (DataSource src : this.data.getDataSources()) {
-            if (src.bounds.contains(coor)) {
-                layerBoundsPoint = true;
-                break;
-            }
-        }
-        return layerBoundsPoint;
+        return this.data.getDataSources().stream()
+                .anyMatch(src -> src.bounds.contains(coor));
     }
 
@@ -1229 +1215 @@
      */
     private boolean isDataSetEmpty() {
-        if (data != null) {
-            for (OsmPrimitive osm : data.allNonDeletedPrimitives()) {
-                if (!osm.isDeleted() || !osm.isNewOrUndeleted())
-                    return false;
-            }
-        }
-        return true;
+        return data == null || data.allNonDeletedPrimitives().stream()
+                .allMatch(osm -> osm.isDeleted() && osm.isNewOrUndeleted());
     }