Changeset 16438 in josm for trunk/src/org/openstreetmap/josm/gui/util

Timestamp:

2020-05-17T14:18:22+02:00 (4 years ago)

Author:

simon04

Message:

see #19251 - Java 8: use Stream

Location:

trunk/src/org/openstreetmap/josm/gui/util

Files:

• GuiHelper.java (modified) (2 diffs)
• StayOpenPopupMenu.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java

@@ -33 +33 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.FutureTask;
+import java.util.stream.Stream;
 
 import javax.swing.GrayFilter;
@@ -640 +641 @@
             Collection<String> fonts = Arrays.asList(
                     GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames());
-            for (String f : new String[]{"Khmer UI", "DaunPenh", "MoolBoran"}) {
-                if (fonts.contains(f)) {
-                    setUIFont(f);
-                    break;
-                }
-            }
+            Stream.of("Khmer UI", "DaunPenh", "MoolBoran")
+                    .filter(fonts::contains)
+                    .findFirst()
+                    .ifPresent(GuiHelper::setUIFont);
         }
     }

trunk/src/org/openstreetmap/josm/gui/util/StayOpenPopupMenu.java

@@ -56 +56 @@
                 Field tableField = appContextClass.getDeclaredField("table");
                 ReflectionUtils.setObjectsAccessible(tableField);
-                Object mouseGrabber = null;
-                for (Entry<?, ?> e : ((Map<?, ?>)
-                        tableField.get(appContextClass.getMethod("getAppContext").invoke(appContextClass))).entrySet()) {
-                    if (MOUSE_GRABBER_KEY.equals(Objects.toString(e.getKey()))) {
-                        mouseGrabber = e.getValue();
-                        break;
-                    }
-                }
+                Object mouseGrabber = ((Map<?, ?>) tableField.get(appContextClass.getMethod("getAppContext").invoke(appContextClass)))
+                        .entrySet().stream()
+                        .filter(e -> MOUSE_GRABBER_KEY.equals(Objects.toString(e.getKey())))
+                        .map(Entry::getValue)
+                        .findFirst().orElse(null);
                 final ChangeListener changeListener = (ChangeListener) mouseGrabber;
                 final AWTEventListener awtEventListener = (AWTEventListener) mouseGrabber;