Index: src/org/openstreetmap/josm/actions/FollowLineAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/FollowLineAction.java	(revision 6094)
+++ src/org/openstreetmap/josm/actions/FollowLineAction.java	(working copy)
@@ -84,9 +84,7 @@
         if (referrers.size() < 2) return; // There's nothing to follow
 
         Node newPoint = null;
-        Iterator<OsmPrimitive> i = referrers.iterator();
-        while (i.hasNext()) {
-            OsmPrimitive referrer = i.next();
+        for (OsmPrimitive referrer : referrers) {
             if (!referrer.getType().equals(OsmPrimitiveType.WAY)) { // Can't follow points or relations
                 continue;
             }
Index: src/org/openstreetmap/josm/command/DeleteCommand.java
===================================================================
--- src/org/openstreetmap/josm/command/DeleteCommand.java	(revision 6094)
+++ src/org/openstreetmap/josm/command/DeleteCommand.java	(working copy)
@@ -394,9 +394,7 @@
 
         // remove the objects from their parent relations
         //
-        Iterator<Relation> iterator = OsmPrimitive.getFilteredSet(OsmPrimitive.getReferrer(primitivesToDelete), Relation.class).iterator();
-        while (iterator.hasNext()) {
-            Relation cur = iterator.next();
+        for (Relation cur : OsmPrimitive.getFilteredSet(OsmPrimitive.getReferrer(primitivesToDelete), Relation.class)) {
             Relation rel = new Relation(cur);
             rel.removeMembersFor(primitivesToDelete);
             cmds.add(new ChangeCommand(cur, rel));
Index: src/org/openstreetmap/josm/data/conflict/ConflictCollection.java
===================================================================
--- src/org/openstreetmap/josm/data/conflict/ConflictCollection.java	(revision 6094)
+++ src/org/openstreetmap/josm/data/conflict/ConflictCollection.java	(working copy)
@@ -58,9 +58,8 @@
     }
 
     protected void fireConflictRemoved() {
-        Iterator<IConflictListener> it = listeners.iterator();
-        while(it.hasNext()) {
-            it.next().onConflictsRemoved(this);
+        for (IConflictListener listener : listeners) {
+            listener.onConflictsRemoved(this);
         }
     }
 
Index: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 6094)
+++ src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(working copy)
@@ -381,9 +381,8 @@
                     0,
                     getSize()
             );
-            Iterator<ListDataListener> it = listeners.iterator();
-            while(it.hasNext()) {
-                it.next().contentsChanged(evt);
+            for (ListDataListener listener : listeners) {
+                listener.contentsChanged(evt);
             }
         }
 
Index: src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java	(revision 6094)
+++ src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java	(working copy)
@@ -772,14 +772,12 @@
             if (primitives == null || primitives.isEmpty())
                 return primitives;
             ArrayList<OsmPrimitive> ret = new ArrayList<OsmPrimitive>();
-            Iterator<OsmPrimitive> it = primitives.iterator();
-            while(it.hasNext()) {
-                OsmPrimitive primitive = it.next();
+            for (OsmPrimitive primitive : primitives) {
                 if (primitive instanceof Relation && getRelation() != null && getRelation().equals(primitive)) {
                     warnOfCircularReferences(primitive);
                     continue;
                 }
-                if (isPotentialDuplicate(primitive))  {
+                if (isPotentialDuplicate(primitive)) {
                     if (confirmAddingPrimitive(primitive)) {
                         ret.add(primitive);
                     }
Index: src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 6094)
+++ src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(working copy)
@@ -451,9 +451,7 @@
         // Construct the list of loaded GPX tracks
         Collection<Layer> layerLst = Main.map.mapView.getAllLayers();
         GpxDataWrapper defaultItem = null;
-        Iterator<Layer> iterLayer = layerLst.iterator();
-        while (iterLayer.hasNext()) {
-            Layer cur = iterLayer.next();
+        for (Layer cur : layerLst) {
             if (cur instanceof GpxLayer) {
                 GpxLayer curGpx = (GpxLayer) cur;
                 GpxDataWrapper gdw = new GpxDataWrapper(curGpx.getName(), curGpx.data, curGpx.data.storageFile);