Changeset 16450 in josm

Timestamp:

2020-05-17T18:01:01+02:00 (4 years ago)

Author:

simon04

Message:

see #19252 - Java 8: use Stream

Now including the previously missing filter(Objects::nonNull)

File:

• trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java

@@ -36 +36 @@
 import java.util.ListIterator;
 import java.util.Map;
+import java.util.Objects;
 
 import javax.swing.UIManager;
@@ -777 +778 @@
         } else if (root instanceof Split) {
             Split split = (Split) root;
-            for (Node child : split.getChildren()) {
-                if (child.getBounds().contains(x, y))
-                    return dividerAt(child, x, y);
-            }
+            return split.getChildren().stream()
+                    .filter(child -> child.getBounds().contains(x, y))
+                    .map(child -> dividerAt(child, x, y))
+                    .filter(Objects::nonNull)
+                    .findFirst().orElse(null);
         }
         return null;