Index: trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java	(revision 11514)
+++ trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java	(revision 11516)
@@ -227,5 +227,5 @@
                 return null; //nothing selected
             }
-            Layer selectedLayer = layers.get(index).getValue().iterator().next();
+            Layer selectedLayer = layers.get(index).getValue().get(0);
             return new WMTSDefaultLayer(selectedLayer.name, selectedLayer.tileMatrixSet.identifier);
         }
@@ -270,5 +270,5 @@
         // if there is only one layer name no point in asking
         if (grouppedLayers.size() == 1) {
-            Layer selectedLayer = grouppedLayers.iterator().next().getValue().iterator().next();
+            Layer selectedLayer = grouppedLayers.iterator().next().getValue().get(0);
             return new WMTSDefaultLayer(selectedLayer.name, selectedLayer.tileMatrixSet.identifier);
         }
Index: trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java	(revision 11514)
+++ trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java	(revision 11516)
@@ -115,5 +115,5 @@
         try {
             final List<NameFinder.SearchResult> results = NameFinder.queryNominatim(area);
-            final PrimitiveId osmId = results.iterator().next().getOsmId();
+            final PrimitiveId osmId = results.get(0).getOsmId();
             return String.format("area(%d)", osmId.getUniqueId() + idOffset.get(osmId.getType()));
         } catch (IOException | NoSuchElementException ex) {
Index: trunk/src/org/openstreetmap/josm/tools/Geometry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Geometry.java	(revision 11514)
+++ trunk/src/org/openstreetmap/josm/tools/Geometry.java	(revision 11516)
@@ -88,5 +88,5 @@
 
         OsmDataLayer layer = Main.getLayerManager().getEditLayer();
-        DataSet dataset = ways.iterator().next().getDataSet();
+        DataSet dataset = ways.get(0).getDataSet();
 
         //iterate over all way pairs and introduce the intersections