Changeset 5310 in josm for trunk/src/org/openstreetmap

Timestamp:

2012-06-30T20:14:38+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7750 - Conflict dialog: Really selects id:0 primitives without zooming

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ZoomToAction.java (modified) (1 diff)
• gui/conflict/pair/PairTable.java (modified) (1 diff)
• gui/widgets/OsmPrimitivesTable.java (modified) (3 diffs)

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

@@ -68 +68 @@
         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);

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

@@ -24 +24 @@
 
     @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);

trunk/src/org/openstreetmap/josm/gui/widgets/OsmPrimitivesTable.java

@@ -71 +71 @@
         MapView.removeLayerChangeListener(zoomToAction);
     }
-    
-    public OsmPrimitive getPrimitiveToZoomTo(int row, OsmDataLayer layer) {
+        
+    public OsmPrimitive getPrimitiveInLayer(int row, OsmDataLayer layer) {
         return getOsmPrimitivesTableModel().getReferredPrimitive(row);
     }
@@ -99 +99 @@
             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 +108 @@
             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) {