Changeset 16438 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/projection/PuwgProjectionChoice.java

Timestamp:

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

Author:

simon04

Message:

see #19251 - Java 8: use Stream

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/projection/PuwgProjectionChoice.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/projection/PuwgProjectionChoice.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.stream.IntStream;
 
 import org.openstreetmap.josm.tools.Utils;
@@ -57 +59 @@
     @Override
     public Collection<String> getPreferencesFromCode(String code) {
-        for (String code2 : CODES) {
-            if (code.equals(code2))
-                return Collections.singleton(code2);
-        }
-        return null;
+        return Arrays.stream(CODES).filter(code::equals).findFirst().map(Collections::singleton).orElse(null);
     }
 
@@ -71 +69 @@
     @Override
     protected int zoneToIndex(String zone) {
-        for (int i = 0; i < CODES.length; i++) {
-            if (zone.equals(CODES[i])) {
-                return i;
-            }
-        }
-        return defaultIndex;
+        return IntStream.range(0, CODES.length)
+                .filter(i -> zone.equals(CODES[i]))
+                .findFirst().orElse(defaultIndex);
     }
 }