Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java	(revision 16452)
+++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java	(revision 16453)
@@ -117,6 +117,7 @@
                         Date timestamp = p.getReferrers().stream()
                                 .filter(ref -> !ref.isTimestampEmpty())
+                                .findFirst()
                                 .map(AbstractPrimitive::getTimestamp)
-                                .findFirst().orElse(null);
+                                .orElse(null);
                         toLoad.put(p, timestamp);
                     }
Index: trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java	(revision 16452)
+++ trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java	(revision 16453)
@@ -457,6 +457,7 @@
             return relation.keySet().stream()
                     .filter(m -> m.endsWith(nameTag))
+                    .findFirst()
                     .map(relation::get)
-                    .findFirst().orElse(null);
+                    .orElse(null);
         } else if (nameTag.startsWith("?") && OsmUtils.isTrue(relation.get(nameTag.substring(1)))) {
             return tr(nameTag.substring(1));
Index: trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java	(revision 16452)
+++ trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java	(revision 16453)
@@ -765,5 +765,5 @@
                 mv = osm.get(key);
                 if (!caseSensitive && mv == null) {
-                    mv = osm.keySet().stream().filter(key::equalsIgnoreCase).map(osm::get).findFirst().orElse(null);
+                    mv = osm.keySet().stream().filter(key::equalsIgnoreCase).findFirst().map(osm::get).orElse(null);
                 }
             }
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java	(revision 16452)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java	(revision 16453)
@@ -301,6 +301,7 @@
         return rbStrategy.entrySet().stream()
                 .filter(e -> e.getValue().isSelected())
+                .findFirst()
                 .map(Entry::getKey)
-                .findFirst().orElse(null);
+                .orElse(null);
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java	(revision 16452)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java	(revision 16453)
@@ -372,6 +372,7 @@
                     .filter(i -> i.memberExpression != null && i.memberExpression.match(osm))
                     .filter(i -> i.types == null || i.types.isEmpty() || i.types.contains(TaggingPresetType.forPrimitive(osm)))
+                    .findFirst()
                     .map(i -> i.key)
-                    .findFirst().orElse(null);
+                    .orElse(null);
         }
         return null;
Index: trunk/src/org/openstreetmap/josm/gui/util/StayOpenPopupMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/util/StayOpenPopupMenu.java	(revision 16452)
+++ trunk/src/org/openstreetmap/josm/gui/util/StayOpenPopupMenu.java	(revision 16453)
@@ -59,6 +59,7 @@
                         .entrySet().stream()
                         .filter(e -> MOUSE_GRABBER_KEY.equals(Objects.toString(e.getKey())))
+                        .findFirst()
                         .map(Entry::getValue)
-                        .findFirst().orElse(null);
+                        .orElse(null);
                 final ChangeListener changeListener = (ChangeListener) mouseGrabber;
                 final AWTEventListener awtEventListener = (AWTEventListener) mouseGrabber;
Index: trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java	(revision 16452)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/JosmComboBox.java	(revision 16453)
@@ -159,6 +159,7 @@
                 .mapToObj(i -> getUI().getAccessibleChild(this, i))
                 .filter(child -> child instanceof ComboPopup)
+                .findFirst()
                 .map(child -> ((ComboPopup) child).getList())
-                .findFirst().orElse(null);
+                .orElse(null);
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java	(revision 16452)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java	(revision 16453)
@@ -36,5 +36,4 @@
 import java.util.ListIterator;
 import java.util.Map;
-import java.util.Objects;
 
 import javax.swing.UIManager;
@@ -780,7 +779,7 @@
             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;