Ticket #8902: whiletoforeach.diff
File whiletoforeach.diff, 4.9 KB (added by , 11 years ago) |
---|
-
src/org/openstreetmap/josm/actions/FollowLineAction.java
84 84 if (referrers.size() < 2) return; // There's nothing to follow 85 85 86 86 Node newPoint = null; 87 Iterator<OsmPrimitive> i = referrers.iterator(); 88 while (i.hasNext()) { 89 OsmPrimitive referrer = i.next(); 87 for (OsmPrimitive referrer : referrers) { 90 88 if (!referrer.getType().equals(OsmPrimitiveType.WAY)) { // Can't follow points or relations 91 89 continue; 92 90 } -
src/org/openstreetmap/josm/command/DeleteCommand.java
394 394 395 395 // remove the objects from their parent relations 396 396 // 397 Iterator<Relation> iterator = OsmPrimitive.getFilteredSet(OsmPrimitive.getReferrer(primitivesToDelete), Relation.class).iterator(); 398 while (iterator.hasNext()) { 399 Relation cur = iterator.next(); 397 for (Relation cur : OsmPrimitive.getFilteredSet(OsmPrimitive.getReferrer(primitivesToDelete), Relation.class)) { 400 398 Relation rel = new Relation(cur); 401 399 rel.removeMembersFor(primitivesToDelete); 402 400 cmds.add(new ChangeCommand(cur, rel)); -
src/org/openstreetmap/josm/data/conflict/ConflictCollection.java
58 58 } 59 59 60 60 protected void fireConflictRemoved() { 61 Iterator<IConflictListener> it = listeners.iterator(); 62 while(it.hasNext()) { 63 it.next().onConflictsRemoved(this); 61 for (IConflictListener listener : listeners) { 62 listener.onConflictsRemoved(this); 64 63 } 65 64 } 66 65 -
src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
381 381 0, 382 382 getSize() 383 383 ); 384 Iterator<ListDataListener> it = listeners.iterator(); 385 while(it.hasNext()) { 386 it.next().contentsChanged(evt); 384 for (ListDataListener listener : listeners) { 385 listener.contentsChanged(evt); 387 386 } 388 387 } 389 388 -
src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
772 772 if (primitives == null || primitives.isEmpty()) 773 773 return primitives; 774 774 ArrayList<OsmPrimitive> ret = new ArrayList<OsmPrimitive>(); 775 Iterator<OsmPrimitive> it = primitives.iterator(); 776 while(it.hasNext()) { 777 OsmPrimitive primitive = it.next(); 775 for (OsmPrimitive primitive : primitives) { 778 776 if (primitive instanceof Relation && getRelation() != null && getRelation().equals(primitive)) { 779 777 warnOfCircularReferences(primitive); 780 778 continue; 781 779 } 782 if (isPotentialDuplicate(primitive)) 780 if (isPotentialDuplicate(primitive)) { 783 781 if (confirmAddingPrimitive(primitive)) { 784 782 ret.add(primitive); 785 783 } -
src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
451 451 // Construct the list of loaded GPX tracks 452 452 Collection<Layer> layerLst = Main.map.mapView.getAllLayers(); 453 453 GpxDataWrapper defaultItem = null; 454 Iterator<Layer> iterLayer = layerLst.iterator(); 455 while (iterLayer.hasNext()) { 456 Layer cur = iterLayer.next(); 454 for (Layer cur : layerLst) { 457 455 if (cur instanceof GpxLayer) { 458 456 GpxLayer curGpx = (GpxLayer) cur; 459 457 GpxDataWrapper gdw = new GpxDataWrapper(curGpx.getName(), curGpx.data, curGpx.data.storageFile);