Changeset 5301 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2012-06-25T21:25:50+02:00 (13 years ago)

Author:

Don-vip

Message:

fix #4493, fix #7750 - conflict manager: select and zoom primitives with id:0

File:

• trunk/src/org/openstreetmap/josm/actions/ZoomToAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/ZoomToAction.java

@@ -10 +10 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.PrimitiveId;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.conflict.pair.nodes.NodeListTable;
@@ -67 +67 @@
             return;
         int row = rows[0];
-        PrimitiveId primitive = this.table.getOsmPrimitivesTableModel().getReferredPrimitive(row);
         OsmDataLayer layer = this.table.getLayer();
+        OsmPrimitive primitive = this.table.getPrimitiveToZoomTo(row, layer);
         if (layer != null && primitive != null) {
             layer.data.setSelected(primitive);