Changeset 11397 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode

Timestamp:

2016-12-14T15:50:53+01:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S2259 - Null pointers should not be dereferenced

File:

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

trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

@@ -499 +499 @@
                     }
                 }
-            } else {
+            } else if (bestMovement != null) {
                 if (mode == Mode.extrude || mode == Mode.create_new) {
                     //nothing here
@@ -897 +897 @@
         // set neighboring segments
         Node prevNode = getPreviousNode(selectedSegment.lowerIndex);
-        EastNorth prevNodeEn = prevNode.getEastNorth();
-        dualAlignSegment1 = new ReferenceSegment(new EastNorth(
-            initialN1en.getX() - prevNodeEn.getX(),
-            initialN1en.getY() - prevNodeEn.getY()
-            ), initialN1en, prevNodeEn, false);
+        if (prevNode != null) {
+            EastNorth prevNodeEn = prevNode.getEastNorth();
+            dualAlignSegment1 = new ReferenceSegment(new EastNorth(
+                initialN1en.getX() - prevNodeEn.getX(),
+                initialN1en.getY() - prevNodeEn.getY()
+                ), initialN1en, prevNodeEn, false);
+        }
 
         Node nextNode = getNextNode(selectedSegment.lowerIndex + 1);
-        EastNorth nextNodeEn = nextNode.getEastNorth();
-        dualAlignSegment2 = new ReferenceSegment(new EastNorth(
-            initialN2en.getX() - nextNodeEn.getX(),
-            initialN2en.getY() - nextNodeEn.getY()
-            ), initialN2en, nextNodeEn, false);
+        if (nextNode != null) {
+            EastNorth nextNodeEn = nextNode.getEastNorth();
+            dualAlignSegment2 = new ReferenceSegment(new EastNorth(
+                initialN2en.getX() - nextNodeEn.getX(),
+                initialN2en.getY() - nextNodeEn.getY()
+                ), initialN2en, nextNodeEn, false);
+        }
     }