Changeset 16061 in josm for trunk

Timestamp:

2020-03-07T23:45:20+01:00 (4 years ago)

Author:

simon04

Message:

SubclassFilteredCollection: use spliteratorUnknownSize() to avoid expensive call to size()

File:

• trunk/src/org/openstreetmap/josm/tools/SubclassFilteredCollection.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/SubclassFilteredCollection.java

@@ -7 +7 @@
 import java.util.NoSuchElementException;
 import java.util.Objects;
+import java.util.Spliterator;
+import java.util.Spliterators;
 import java.util.function.Predicate;
 
@@ -87 +89 @@
 
     @Override
+    public Spliterator<T> spliterator() {
+        return Spliterators.spliteratorUnknownSize(iterator(), 0);
+    }
+
+    @Override
     public int size() {
         if (size == -1) {
             size = 0;
-            Iterator<T> it = iterator();
-            while (it.hasNext()) {
-                size++;
-                it.next();
-            }
+            forEach(t -> size++);
         }
         return size;