Changeset 30662 in osm for applications/editors/josm/plugins/imagery-xml-bounds/src

Timestamp:

2014-09-21T20:16:12+02:00 (10 years ago)

Author:

donvip

Message:

[josm_imagery-xml-bounds] fix #10535 - IllegalStateException when selecting multipolygons

File:

• applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ComputeBoundsAction.java (modified) (1 diff)

applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ComputeBoundsAction.java

@@ -87 +87 @@
                 // Remove closed ways already inside a selected multipolygon
                 for (Iterator<Way> it = closedWays.iterator(); it.hasNext(); ) {
-                        Way way = it.next();
-                        for (Relation mp : multipolygons) {
-                                for (RelationMember mb : mp.getMembers()) {
-                                        if (mb.getMember().equals(way)) {
-                                                it.remove();
-                                        }
-                                }
-                        }
+                        processIterator(it);
                 }
                 // Enable the action if at least one area is found
                 setEnabled(!multipolygons.isEmpty() || !closedWays.isEmpty());
         }
+
+    private void processIterator(Iterator<Way> it) {
+        Way way = it.next();
+        for (Relation mp : multipolygons) {
+                for (RelationMember mb : mp.getMembers()) {
+                        if (mb.getMember().equals(way)) {
+                                it.remove();
+                                return;
+                        }
+                }
+        }
+    }
 
         public final String getXml() {