Changeset 6565 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair

Timestamp:

2013-12-29T21:46:27+01:00 (10 years ago)

Author:

simon04

Message:

fix #9484 - source in upload dialog: add knowledge, survey to selection, compute value from layers

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

@@ -889 +889 @@
     protected final <P extends OsmPrimitive> OsmDataLayer findLayerFor(P primitive) {
         if (primitive != null) {
-            List<OsmDataLayer> layers = Main.map.mapView.getLayersOfType(OsmDataLayer.class);
+            Iterable<OsmDataLayer> layers = Main.map.mapView.getLayersOfType(OsmDataLayer.class);
             // Find layer with same dataset
             for (OsmDataLayer layer : layers) {