Changeset 16453 in josm for trunk/src/org/openstreetmap/josm/gui/widgets

Timestamp:

2020-05-17T19:53:25+02:00 (4 years ago)

Author:

simon04

Message:

see #19251, see #19252 - fix findFirst/map/orElse sequence

Location:

trunk/src/org/openstreetmap/josm/gui/widgets

Files:

• JosmComboBox.java (modified) (1 diff)
• MultiSplitLayout.java (modified) (2 diffs)

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

@@ -159 +159 @@
                 .mapToObj(i -> getUI().getAccessibleChild(this, i))
                 .filter(child -> child instanceof ComboPopup)
+                .findFirst()
                 .map(child -> ((ComboPopup) child).getList())
-                .findFirst().orElse(null);
+                .orElse(null);
     }
 

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;
@@ -780 +779 @@
             return split.getChildren().stream()
                     .filter(child -> child.getBounds().contains(x, y))
+                    .findFirst()
                     .map(child -> dividerAt(child, x, y))
-                    .filter(Objects::nonNull)
-                    .findFirst().orElse(null);
+                    .orElse(null);
         }
         return null;