Changeset 16445 in josm for trunk/src/org/openstreetmap/josm/data/osm/Way.java

Timestamp:

2020-05-17T17:02:28+02:00 (6 years ago)

Author:

simon04

Message:

see #19251 - Java 8: use Stream

File:

• trunk/src/org/openstreetmap/josm/data/osm/Way.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/osm/Way.java

@@ -11 +11 @@
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -120 +121 @@
      */
     public boolean containsNode(Node node) {
-        if (node == null) return false;
-
-        for (Node n : nodes) {
-            if (n.equals(node))
-                return true;
-        }
-        return false;
+        return node != null && Arrays.asList(nodes).contains(node);
     }
 
@@ -326 +321 @@
         if (!super.hasEqualSemanticAttributes(other, testInterestingTagsOnly))
             return false;
-        for (int i = 0; i < getNodesCount(); i++) {
-            if (!getNode(i).hasEqualSemanticAttributes(w.getNode(i)))
-                return false;
-        }
-        return true;
+        return IntStream.range(0, getNodesCount())
+                .allMatch(i -> getNode(i).hasEqualSemanticAttributes(w.getNode(i)));
     }
 
@@ -373 +365 @@
         try {
             boolean closed = isClosed() && selection.contains(lastNode());
-            List<Node> copy = new ArrayList<>();
-
-            for (Node n: nodes) {
-                if (!selection.contains(n)) {
-                    copy.add(n);
-                }
-            }
+            List<Node> copy = Arrays.stream(nodes)
+                    .filter(n -> !selection.contains(n))
+                    .collect(Collectors.toList());
 
             int i = copy.size();
@@ -524 +512 @@
         /* circular ways have only inner nodes, so return true for them! */
         if (n == nodes[0] && n == nodes[nodes.length-1]) return true;
-        for (int i = 1; i < nodes.length - 1; ++i) {
-            if (nodes[i] == n) return true;
-        }
-        return false;
+        return IntStream.range(1, nodes.length - 1)
+                .anyMatch(i -> nodes[i] == n);
     }