Changeset 16436 in josm for trunk/src/org/openstreetmap/josm/spi/preferences/AbstractPreferences.java

Timestamp:

2020-05-17T12:08:17+02:00 (6 years ago)

Author:

simon04

Message:

see #19251 - Java 8: use Stream

File:

• trunk/src/org/openstreetmap/josm/spi/preferences/AbstractPreferences.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/spi/preferences/AbstractPreferences.java

@@ -7 +7 @@
 import java.util.Map.Entry;
 import java.util.TreeMap;
+import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.tools.Logging;
@@ -158 +159 @@
      */
     public Map<String, String> getAllPrefix(String prefix) {
-        final Map<String, String> all = new TreeMap<>();
-        for (final Entry<String, Setting<?>> e : getAllSettings().entrySet()) {
-            if (e.getKey().startsWith(prefix) && (e.getValue() instanceof StringSetting)) {
-                all.put(e.getKey(), ((StringSetting) e.getValue()).getValue());
-            }
-        }
-        return all;
+        return getAllSettings().entrySet().stream()
+                .filter(e -> e.getKey().startsWith(prefix) && (e.getValue() instanceof StringSetting))
+                .collect(Collectors.toMap(Entry::getKey, e -> ((StringSetting) e.getValue()).getValue(), (a, b) -> b, TreeMap::new));
     }
 
@@ -173 +170 @@
      */
     public List<String> getAllPrefixCollectionKeys(String prefix) {
-        final List<String> all = new LinkedList<>();
-        for (Entry<String, Setting<?>> entry : getAllSettings().entrySet()) {
-            if (entry.getKey().startsWith(prefix) && entry.getValue() instanceof ListSetting) {
-                all.add(entry.getKey());
-            }
-        }
-        return all;
+        return getAllSettings().entrySet().stream()
+                .filter(entry -> entry.getKey().startsWith(prefix) && entry.getValue() instanceof ListSetting)
+                .map(Entry::getKey)
+                .collect(Collectors.toCollection(LinkedList::new));
     }
 }