Changeset 16323 in josm for trunk/src/org/openstreetmap

Timestamp:

2020-04-17T20:50:41+02:00 (5 years ago)

Author:

simon04

Message:

Java 8: use Collectors.counting

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java

@@ -16 +16 @@
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.TreeMap;
+import java.util.stream.Collectors;
 
 import javax.swing.JPanel;
@@ -27 +29 @@
 import org.openstreetmap.josm.data.osm.OsmData;
 import org.openstreetmap.josm.data.osm.PrimitiveComparator;
+import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -187 +190 @@
         Count only tagged nodes (so empty way nodes don't inflate counts).
     */
-    protected static String buildListOfEditorsText(Iterable<? extends IPrimitive> primitives) {
-        final Map<String, Integer> editCountByUser = new TreeMap<>(Collator.getInstance(Locale.getDefault()));
-
-        // Count who edited each selected object
-        for (IPrimitive o : primitives) {
-            if (o.getUser() != null) {
-                String username = o.getUser().getName();
-                Integer oldCount = editCountByUser.get(username);
-                if (oldCount == null) {
-                    editCountByUser.put(username, 1);
-                } else {
-                    editCountByUser.put(username, oldCount + 1);
-                }
-            }
-        }
+    protected static String buildListOfEditorsText(Collection<? extends IPrimitive> primitives) {
+        final Map<String, Long> editCountByUser = primitives.stream()
+                .map(IPrimitive::getUser)
+                .filter(Objects::nonNull)
+                .collect(Collectors.groupingBy(
+                        User::getName,
+                        () -> new TreeMap<>(Collator.getInstance(Locale.getDefault())),
+                        Collectors.counting()));
 
         // Print the count in sorted order
@@ -208 +204 @@
                 editCountByUser.size(), editCountByUser.size()))
             .append("\n\n");
-        for (Map.Entry<String, Integer> entry : editCountByUser.entrySet()) {
-            final String username = entry.getKey();
-            final Integer editCount = entry.getValue();
-            s.append(String.format("%6d  %s", editCount, username)).append('\n');
-        }
+        editCountByUser.forEach((username, editCount) ->
+                s.append(String.format("%6d  %s", editCount, username)).append('\n'));
         return s.toString();
     }