Changeset 16438 in josm for trunk/src/org/openstreetmap/josm/gui/MapFrame.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/gui/MapFrame.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/MapFrame.java

@@ -14 +14 @@
 import java.awt.event.KeyEvent;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -720 +721 @@
      *
      */
-    public <T> T getToggleDialog(Class<T> type) {
+    public <T extends ToggleDialog> T getToggleDialog(Class<T> type) {
         return dialogsPanel.getToggleDialog(type);
     }
@@ -767 +768 @@
      */
     public <T> T getTopPanel(Class<T> type) {
-        int n = leftPanel.getComponentCount();
-        for (int i = 0; i < n; i++) {
-            Component c = leftPanel.getComponent(i);
-            if (type.isInstance(c))
-                return type.cast(c);
-        }
-        return null;
+        return Arrays.stream(leftPanel.getComponents())
+                .filter(type::isInstance)
+                .findFirst().map(type::cast).orElse(null);
     }