Index: trunk/src/org/openstreetmap/josm/actions/ZoomToAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ZoomToAction.java	(revision 5309)
+++ trunk/src/org/openstreetmap/josm/actions/ZoomToAction.java	(revision 5310)
@@ -68,5 +68,5 @@
         int row = rows[0];
         OsmDataLayer layer = this.table.getLayer();
-        OsmPrimitive primitive = this.table.getPrimitiveToZoomTo(row, layer);
+        OsmPrimitive primitive = this.table.getPrimitiveInLayer(row, layer);
         if (layer != null && primitive != null) {
             layer.data.setSelected(primitive);
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/PairTable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/PairTable.java	(revision 5309)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/PairTable.java	(revision 5310)
@@ -24,6 +24,6 @@
 
     @Override
-    public OsmPrimitive getPrimitiveToZoomTo(int row, OsmDataLayer layer) {
-        OsmPrimitive result = super.getPrimitiveToZoomTo(row, layer);
+    public OsmPrimitive getPrimitiveInLayer(int row, OsmDataLayer layer) {
+        OsmPrimitive result = super.getPrimitiveInLayer(row, layer);
         if (model != null && result != null && layer != null && result.getDataSet() != layer.data) {
             result = model.getMyPrimitiveById(result);
Index: trunk/src/org/openstreetmap/josm/gui/widgets/OsmPrimitivesTable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/OsmPrimitivesTable.java	(revision 5309)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/OsmPrimitivesTable.java	(revision 5310)
@@ -71,6 +71,6 @@
         MapView.removeLayerChangeListener(zoomToAction);
     }
-    
-    public OsmPrimitive getPrimitiveToZoomTo(int row, OsmDataLayer layer) {
+        
+    public OsmPrimitive getPrimitiveInLayer(int row, OsmDataLayer layer) {
         return getOsmPrimitivesTableModel().getReferredPrimitive(row);
     }
@@ -99,5 +99,5 @@
             int row = rowAtPoint(e.getPoint());
             if (row < 0) return;
-            OsmPrimitive primitive = getOsmPrimitivesTableModel().getReferredPrimitive(row);
+            OsmPrimitive primitive = getPrimitiveInLayer(row, layer);
             if (layer != null && primitive != null) {
                 layer.data.setSelected(primitive.getPrimitiveId());
@@ -108,5 +108,5 @@
             int row = rowAtPoint(e.getPoint());
             if (row < 0) return;
-            OsmPrimitive primitive = getOsmPrimitivesTableModel().getReferredPrimitive(row);
+            OsmPrimitive primitive = getPrimitiveInLayer(row, layer);
             getSelectionModel().addSelectionInterval(row, row);
             if (layer != null && primitive != null) {