Changeset 16468 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

Timestamp:

2020-05-20T22:51:46+02:00 (4 years ago)

Author:

simon04

Message:

Java 8: use Collection.removeIf

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -10 +10 @@
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
@@ -820 +819 @@
             for (Relation relation : getRelations()) {
                 List<RelationMember> members = relation.getMembers();
-
-                Iterator<RelationMember> it = members.iterator();
-                boolean removed = false;
-                while (it.hasNext()) {
-                    RelationMember member = it.next();
-                    if (member.getMember().equals(primitive)) {
-                        it.remove();
-                        removed = true;
-                    }
-                }
-
+                boolean removed = members.removeIf(member -> member.getMember().equals(primitive));
                 if (removed) {
                     relation.setMembers(members);