Changeset 16452 in josm

Timestamp:

2020-05-17T18:25:00+02:00 (4 years ago)

Author:

simon04

Message:

see #19251 - Java 8: use Stream

File:

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

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

@@ -9 +9 @@
 import java.util.Comparator;
 import java.util.LinkedHashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
@@ -134 +133 @@
     private final String defaultExtension;
 
-    protected static void sort(List<ExtensionFileFilter> filters) {
-        filters.sort(new Comparator<ExtensionFileFilter>() {
-                private AllFormatsImporter all = new AllFormatsImporter();
-                @Override
-                public int compare(ExtensionFileFilter o1, ExtensionFileFilter o2) {
-                    if (o1.getDescription().equals(all.filter.getDescription())) return 1;
-                    if (o2.getDescription().equals(all.filter.getDescription())) return -1;
-                    return o1.getDescription().compareTo(o2.getDescription());
-                }
-            }
-        );
+    protected static Comparator<ExtensionFileFilter> comparator() {
+        AllFormatsImporter all = new AllFormatsImporter();
+        return (o1, o2) -> {
+            if (o1.getDescription().equals(all.filter.getDescription())) return 1;
+            if (o2.getDescription().equals(all.filter.getDescription())) return -1;
+            return o1.getDescription().compareTo(o2.getDescription());
+        };
     }
 
@@ -251 +246 @@
         return importers.stream()
                 .map(importer -> importer.filter)
-                .sorted()
+                .sorted(comparator())
                 .collect(Collectors.toList());
     }
@@ -264 +259 @@
      */
     public static List<ExtensionFileFilter> getExportExtensionFileFilters() {
-        List<ExtensionFileFilter> filters = new LinkedList<>();
-        for (FileExporter exporter : exporters) {
-            if (filters.contains(exporter.filter) || !exporter.isEnabled()) {
-                continue;
-            }
-            filters.add(exporter.filter);
-        }
-        sort(filters);
-        return filters;
+        return exporters.stream()
+                .filter(FileExporter::isEnabled)
+                .map(exporter -> exporter.filter)
+                .distinct()
+                .sorted(comparator())
+                .collect(Collectors.toList());
     }
 
@@ -284 +276 @@
     public static ExtensionFileFilter getDefaultImportExtensionFileFilter(String extension) {
         if (extension == null) return new AllFormatsImporter().filter;
-        for (FileImporter importer : importers) {
-            if (extension.equals(importer.filter.getDefaultExtension()))
-                return importer.filter;
-        }
-        return new AllFormatsImporter().filter;
+        return importers.stream()
+                .filter(importer -> extension.equals(importer.filter.getDefaultExtension()))
+                .findFirst().map(importer -> importer.filter)
+                .orElseGet(() -> new AllFormatsImporter().filter);
     }