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

Timestamp:

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

Author:

simon04

Message:

see #19251 - Java 8: use Stream

File:

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

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);
     }