Changeset 6336 in josm for trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java
- Timestamp:
- 2013-10-27T05:35:41+01:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java
r6147 r6336 207 207 if (!isEnabled()) return; 208 208 OsmPrimitive p = getPrimitiveToZoom(); 209 if (p!= null) { 210 getEditLayer().data.setSelected(p.getPrimitiveId()); 211 AutoScaleAction.autoScale("selection"); 209 if (p != null) { 210 OsmDataLayer editLayer = Main.main.getEditLayer(); 211 if (editLayer != null) { 212 editLayer.data.setSelected(p.getPrimitiveId()); 213 AutoScaleAction.autoScale("selection"); 214 } 212 215 } 213 216 } … … 218 221 } 219 222 220 protected OsmDataLayer getEditLayer() {221 try {222 return Main.map.mapView.getEditLayer();223 } catch(NullPointerException e) {224 return null;225 }226 }227 228 223 protected OsmPrimitive getPrimitiveToZoom() { 229 224 if (primitiveId == null) return null; 230 OsmPrimitive p = getEditLayer().data.getPrimitiveById(primitiveId); 225 OsmDataLayer editLayer = Main.main.getEditLayer(); 226 if (editLayer == null) return null; 227 OsmPrimitive p = editLayer.data.getPrimitiveById(primitiveId); 231 228 return p; 232 229 } 233 230 234 231 public void updateEnabledState() { 235 if ( getEditLayer() == null) {232 if (!Main.main.hasEditLayer()) { 236 233 setEnabled(false); 237 234 return;
Note:
See TracChangeset
for help on using the changeset viewer.