Changeset 16438 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.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/actions/mapmode/DrawAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -604 +604 @@
                 // Don't allow creation of self-overlapping ways
                 if (way != null) {
-                    int nodeCount = 0;
-                    for (Node p : way.getNodes()) {
-                        if (p.equals(n0)) {
-                            nodeCount++;
-                        }
-                    }
+                    long nodeCount = way.getNodes().stream().filter(p -> p.equals(n0)).count();
                     if (nodeCount > 1) {
                         way = null;
@@ -1320 +1315 @@
         if (ds != null && !ds.getSelectedWays().isEmpty() && !wayIsFinished && !alt) {
             Way w = ds.getSelectedWays().iterator().next();
-            for (Node m : w.getNodes()) {
-                if (m.equals(mouseOnExistingNode) || mouseOnExistingWays.contains(w)) {
-                    rv.append(' ').append(tr("Finish drawing."));
-                    break;
-                }
+            if (w.getNodes().stream().anyMatch(m -> m.equals(mouseOnExistingNode) || mouseOnExistingWays.contains(w))) {
+                rv.append(' ').append(tr("Finish drawing."));
             }
         }