Changeset 11339 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs

Timestamp:

2016-11-28T21:18:55+01:00 (7 years ago)

Author:

simon04

Message:

Loop can be replaced with Collection.removeIf()

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• properties/RecentTagCollection.java (modified) (1 diff)
• properties/TagEditHelper.java (modified) (2 diffs)
• relation/MemberTableModel.java (modified) (2 diffs)

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

@@ -64 +64 @@
     public void setTagsToIgnore(SearchCompiler.Match tagsToIgnore) {
         this.tagsToIgnore = tagsToIgnore;
-        final Iterator<Tag> it = recentTags.keySet().iterator();
-        while (it.hasNext()) {
-            if (tagsToIgnore.match(it.next())) {
-                it.remove();
-            }
-        }
+        recentTags.keySet().removeIf(tagsToIgnore::match);
     }
 

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

@@ -33 +33 @@
 import java.util.Comparator;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -687 +686 @@
 
             // remove the object's tag keys from the list
-            Iterator<AutoCompletionListItem> iter = keyList.iterator();
-            while (iter.hasNext()) {
-                AutoCompletionListItem item = iter.next();
-                if (containsDataKey(item.getValue())) {
-                    iter.remove();
-                }
-            }
+            keyList.removeIf(item -> containsDataKey(item.getValue()));
 
             keyList.sort(defaultACItemComparator);

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

@@ -9 +9 @@
 import java.util.EnumSet;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -349 +348 @@
         if (primitives == null)
             return;
-        Iterator<RelationMember> it = members.iterator();
-        while (it.hasNext()) {
-            RelationMember member = it.next();
-            if (primitives.contains(member.getMember())) {
-                it.remove();
-            }
-        }
+        members.removeIf(member -> primitives.contains(member.getMember()));
         fireTableDataChanged();
     }