Changeset 17524 in josm for trunk

Timestamp:

2021-02-22T13:59:25+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #20440 - don't create SubclassFilteredCollection just for counting instances in conflict dialog title

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/conflict/ConflictCollection.java (modified) (2 diffs)
• gui/dialogs/ConflictDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

@@ -11 +11 @@
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -344 +345 @@
     }
 
+    /**
+     * Returns the number of conflicts involving nodes.
+     * @return The number of conflicts involving nodes.
+     * @since 17524
+     */
+    public final long getNumberOfNodeConflicts() {
+        return getNumberOfConflicts(c -> c.getMy() instanceof Node);
+    }
+
+    /**
+     * Returns the number of conflicts involving nodes.
+     * @return The number of conflicts involving nodes.
+     * @since 17524
+     */
+    public final long getNumberOfWayConflicts() {
+        return getNumberOfConflicts(c -> c.getMy() instanceof Way);
+    }
+
+    /**
+     * Returns the number of conflicts involving nodes.
+     * @return The number of conflicts involving nodes.
+     * @since 17524
+     */
+    public final long getNumberOfRelationConflicts() {
+        return getNumberOfConflicts(c -> c.getMy() instanceof Relation);
+    }
+
+    private long getNumberOfConflicts(Predicate<Conflict<?>> predicate) {
+        return conflicts.isEmpty() ? 0 : conflicts.stream().filter(Objects::nonNull).filter(predicate).count();
+    }
+
     @Override
     public int hashCode() {

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

@@ -238 +238 @@
             setTitle(trn("Conflict: {0} unresolved", "Conflicts: {0} unresolved", conflictsCount, conflictsCount) +
                     " ("+tr("Rel.:{0} / Ways:{1} / Nodes:{2}",
-                            conflicts.getRelationConflicts().size(),
-                            conflicts.getWayConflicts().size(),
-                            conflicts.getNodeConflicts().size())+')');
+                            conflicts.getNumberOfRelationConflicts(),
+                            conflicts.getNumberOfWayConflicts(),
+                            conflicts.getNumberOfNodeConflicts())+')');
         } else {
             setTitle(tr("Conflict"));