Changeset 15717 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/properties/AbstractCopyAction.java

Timestamp:

2020-01-18T14:14:01+01:00 (4 years ago)

Author:

simon04

Message:

Java 8: use Collectors.joining

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/AbstractCopyAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/AbstractCopyAction.java

@@ -3 +3 @@
 
 import java.awt.event.ActionEvent;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Objects;
-import java.util.Set;
-import java.util.TreeSet;
 import java.util.function.IntFunction;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 import javax.swing.AbstractAction;
@@ -15 +15 @@
 import org.openstreetmap.josm.data.osm.Tagged;
 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -44 +43 @@
     public void actionPerformed(ActionEvent ae) {
         int[] rows = tagTable.getSelectedRows();
-        Set<String> values = new TreeSet<>();
         Collection<? extends Tagged> sel = objectSupplier.get();
         if (rows.length == 0 || sel == null || sel.isEmpty()) return;
 
-        for (int row: rows) {
-            String key = keySupplier.apply(row);
-            for (Tagged p : sel) {
-                Collection<String> s = getString(p, key);
-                if (s != null) {
-                    values.addAll(s);
-                }
-            }
-        }
+        final String values = Arrays.stream(rows)
+                .mapToObj(keySupplier)
+                .flatMap(key -> sel.stream().map(p -> getString(p, key)))
+                .filter(Objects::nonNull)
+                .flatMap(Collection::stream)
+                .sorted()
+                .collect(Collectors.joining("\n"));
         if (!values.isEmpty()) {
-            ClipboardUtils.copyString(Utils.join("\n", values));
+            ClipboardUtils.copyString(values);
         }
     }