Changeset 7921 in josm for trunk/src/org

Timestamp:

2015-01-03T15:37:32+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #10921 - NPE

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SelectByInternalPointAction.java (modified) (4 diffs)
• gui/SelectionManager.java (modified) (1 diff)

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

@@ -5 +5 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.TreeMap;
 
@@ -10 +11 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.BBox;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -30 +32 @@
      */
     public static Collection<OsmPrimitive> getSurroundingObjects(EastNorth internalPoint) {
+        final DataSet ds = getCurrentDataSet();
+        if (ds == null) {
+            return Collections.emptySet();
+        }
         final Node n = new Node(internalPoint);
         final TreeMap<Double, OsmPrimitive> found = new TreeMap<>();
-        for (Way w : getCurrentDataSet().getWays()) {
+        for (Way w : ds.getWays()) {
             if (w.isUsable() && w.isClosed()) {
                 if (Geometry.nodeInsidePolygon(n, w.getNodes())) {
@@ -39 +45 @@
             }
         }
-        for (Relation r : getCurrentDataSet().getRelations()) {
+        for (Relation r : ds.getRelations()) {
             if (r.isUsable() && r.isMultipolygon()) {
                 if (Geometry.isNodeInsideMultiPolygon(n, r, null)) {

trunk/src/org/openstreetmap/josm/gui/SelectionManager.java

@@ -151 +151 @@
     @Override
     public void mousePressed(MouseEvent e) {
-        if (e.getButton() == MouseEvent.BUTTON1 && e.getClickCount() > 1) {
+        if (e.getButton() == MouseEvent.BUTTON1 && e.getClickCount() > 1 && Main.main.getCurrentDataSet() != null) {
             SelectByInternalPointAction.performSelection(Main.map.mapView.getEastNorth(e.getX(), e.getY()),
                     (e.getModifiersEx() & MouseEvent.SHIFT_DOWN_MASK) > 0,