Changeset 16468 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.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/gui/dialogs/relation/RelationDialogManager.java (modified) (2 diffs)

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

@@ -108 +108 @@
     public void updateContext(OsmDataLayer layer, Relation relation, RelationEditor editor) {
         // lookup the entry for editor and remove it
-        for (Iterator<Entry<DialogContext, RelationEditor>> it = openDialogs.entrySet().iterator(); it.hasNext();) {
-            Entry<DialogContext, RelationEditor> entry = it.next();
-            if (Objects.equals(entry.getValue(), editor)) {
-                it.remove();
-                break;
-            }
-        }
+        openDialogs.values().removeIf(i -> Objects.equals(i, editor));
         // don't add a window listener. Editor is already known to the relation dialog manager
         openDialogs.put(new DialogContext(layer, relation), editor);
@@ -199 +193 @@
         if (w instanceof RelationEditor) {
             RelationEditor editor = (RelationEditor) w;
-            for (Iterator<Entry<DialogContext, RelationEditor>> it = openDialogs.entrySet().iterator(); it.hasNext();) {
-                if (editor.equals(it.next().getValue())) {
-                    it.remove();
-                    break;
-                }
-            }
+            openDialogs.values().removeIf(i -> Objects.equals(i, editor));
         }
     }