Changeset 16438 in josm for trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java

Timestamp:

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

Author:

simon04

Message:

see #19251 - Java 8: use Stream

File:

• trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java

@@ -14 +14 @@
 import java.util.ServiceConfigurationError;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 import javax.swing.filechooser.FileFilter;
@@ -248 +249 @@
     public static List<ExtensionFileFilter> getImportExtensionFileFilters() {
         updateAllFormatsImporter();
-        List<ExtensionFileFilter> filters = new LinkedList<>();
-        for (FileImporter importer : importers) {
-            filters.add(importer.filter);
-        }
-        sort(filters);
-        return filters;
+        return importers.stream()
+                .map(importer -> importer.filter)
+                .sorted()
+                .collect(Collectors.toList());
     }
 
@@ -326 +325 @@
     public static void applyChoosableImportFileFilters(
             AbstractFileChooser fileChooser, String extension, Predicate<ExtensionFileFilter> additionalTypes) {
-        for (ExtensionFileFilter filter: getImportExtensionFileFilters()) {
-
-            if (additionalTypes.test(filter) || filter.acceptName("file."+extension)) {
-                fileChooser.addChoosableFileFilter(filter);
-            }
-        }
+        getImportExtensionFileFilters().stream()
+                .filter(filter -> additionalTypes.test(filter) || filter.acceptName("file."+extension))
+                .forEach(fileChooser::addChoosableFileFilter);
         fileChooser.setFileFilter(getDefaultImportExtensionFileFilter(extension));
     }