Index: trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java	(revision 16467)
+++ trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java	(revision 16468)
@@ -3,5 +3,4 @@
 
 import java.util.EventObject;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -452,16 +451,6 @@
             return;
         boolean changed = false;
-        for (Iterator<Command> it = commands.iterator(); it.hasNext();) {
-            if (it.next().getAffectedDataSet() == dataSet) {
-                it.remove();
-                changed = true;
-            }
-        }
-        for (Iterator<Command> it = redoCommands.iterator(); it.hasNext();) {
-            if (it.next().getAffectedDataSet() == dataSet) {
-                it.remove();
-                changed = true;
-            }
-        }
+        changed |= commands.removeIf(c -> c.getAffectedDataSet() == dataSet);
+        changed |= redoCommands.removeIf(c -> c.getAffectedDataSet() == dataSet);
         if (changed) {
             fireEvent(new CommandQueueCleanedEvent(this, dataSet));
Index: trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 16467)
+++ trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 16468)
@@ -10,5 +10,4 @@
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
@@ -820,15 +819,5 @@
             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);
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java	(revision 16467)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java	(revision 16468)
@@ -9,5 +9,4 @@
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 
@@ -239,12 +238,5 @@
         if (renderer == null) return;
         if (!isRegistered(renderer)) return;
-        Iterator<Descriptor> it = descriptors.iterator();
-        while (it.hasNext()) {
-            Descriptor d = it.next();
-            if (d.getRenderer().equals(renderer)) {
-                it.remove();
-                break;
-            }
-        }
+        descriptors.removeIf(d -> d.getRenderer().equals(renderer));
         if (activeRenderer != null && activeRenderer.equals(renderer)) {
             activateDefault();
Index: trunk/src/org/openstreetmap/josm/data/preferences/sources/MapPaintPrefHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/preferences/sources/MapPaintPrefHelper.java	(revision 16467)
+++ trunk/src/org/openstreetmap/josm/data/preferences/sources/MapPaintPrefHelper.java	(revision 16468)
@@ -74,8 +74,5 @@
 
         // XML style is not bundled anymore
-        list.stream()
-                .filter(se -> "resource://styles/standard/elemstyles.xml".equals(se.url))
-                .findFirst()
-                .ifPresent(list::remove);
+        list.removeIf(se -> "resource://styles/standard/elemstyles.xml".equals(se.url));
 
         return changed;
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java	(revision 16467)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java	(revision 16468)
@@ -108,11 +108,5 @@
     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,10 +193,5 @@
         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));
         }
     }
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 16467)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 16468)
@@ -21,5 +21,4 @@
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
@@ -323,11 +322,8 @@
 
         // remove empty values
-        final Iterator<String> it = tags.keySet().iterator();
-        while (it.hasNext()) {
-            final String v = tags.get(it.next());
-            if (v == null || v.isEmpty()) {
-                it.remove();
-            }
-        }
+        tags.keySet().removeIf(key -> {
+            final String v = tags.get(key);
+            return v == null || v.isEmpty();
+        });
 
         // ignore source/comment to keep current values from models ?
Index: trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java	(revision 16467)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java	(revision 16468)
@@ -1430,9 +1430,6 @@
                 }
                 readFile();
-                for (Iterator<ExtendedSourceEntry> it = sources.iterator(); it.hasNext();) {
-                    if ("xml".equals(it.next().styleType)) {
-                        Logging.debug("Removing XML source entry");
-                        it.remove();
-                    }
+                if (sources.removeIf(extendedSourceEntry -> "xml".equals(extendedSourceEntry.styleType))) {
+                    Logging.debug("Removing XML source entry");
                 }
             } catch (IOException e) {
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java	(revision 16467)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java	(revision 16468)
@@ -11,5 +11,4 @@
 import java.util.Comparator;
 import java.util.EnumSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -321,13 +320,5 @@
         if (name == null)
             return;
-        Iterator<TagModel> it = tags.iterator();
-        boolean changed = false;
-        while (it.hasNext()) {
-            TagModel tm = it.next();
-            if (tm.getName().equals(name)) {
-                changed = true;
-                it.remove();
-            }
-        }
+        boolean changed = tags.removeIf(tm -> tm.getName().equals(name));
         if (changed) {
             fireTableDataChanged();