Changeset 16436 in josm for trunk/src/org/openstreetmap/josm/spi

Timestamp:

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

Author:

simon04

Message:

see #19251 - Java 8: use Stream

Location:

trunk/src/org/openstreetmap/josm/spi/preferences

Files:

• AbstractPreferences.java (modified) (3 diffs)
• ListListSetting.java (modified) (3 diffs)
• MapListSetting.java (modified) (2 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));
     }
 }

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

@@ -4 +4 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
+
+import org.openstreetmap.josm.tools.StreamUtils;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -29 +32 @@
     public static ListListSetting create(Collection<Collection<String>> value) {
         if (value != null) {
-            List<List<String>> valueList = new ArrayList<>(value.size());
-            for (Collection<String> lst : value) {
-                valueList.add(new ArrayList<>(lst));
-            }
+            List<List<String>> valueList = value.stream()
+                    .map(ArrayList::new)
+                    .collect(Collectors.toList());
             return new ListListSetting(valueList);
         }
@@ -43 +45 @@
             return new ListListSetting(null);
 
-        List<List<String>> copy = new ArrayList<>(value.size());
-        for (Collection<String> lst : value) {
-            List<String> lstCopy = new ArrayList<>(lst);
-            copy.add(Collections.unmodifiableList(lstCopy));
-        }
-        return new ListListSetting(Collections.unmodifiableList(copy));
+        List<List<String>> copy = value.stream()
+                .map(Utils::toUnmodifiableList)
+                .collect(StreamUtils.toUnmodifiableList());
+        return new ListListSetting(copy);
     }
 

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

@@ -2 +2 @@
 package org.openstreetmap.josm.spi.preferences;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.SortedMap;
+
+import org.openstreetmap.josm.tools.StreamUtils;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -28 +29 @@
         if (value == null)
             return new MapListSetting(null);
-        List<Map<String, String>> copy = new ArrayList<>(value.size());
-        for (Map<String, String> map : value) {
-            Map<String, String> mapCopy = new LinkedHashMap<>(map);
-            copy.add(Collections.unmodifiableMap(mapCopy));
-        }
-        return new MapListSetting(Collections.unmodifiableList(copy));
+        List<Map<String, String>> copy = value.stream()
+                .map(LinkedHashMap::new)
+                .map(Utils::toUnmodifiableMap)
+                .collect(StreamUtils.toUnmodifiableList());
+        return new MapListSetting(copy);
     }