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

Timestamp:

2016-06-01T23:17:40+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S1854 - Dead stores should be removed

Location:

trunk/src/org/openstreetmap/josm/actions/mapmode

Files:

• DrawAction.java (modified) (1 diff)
• ExtrudeAction.java (modified) (1 diff)
• SelectAction.java (modified) (1 diff)

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

@@ -398 +398 @@
 
         boolean newNode = false;
-        Node n = null;
-
-        n = Main.map.mapView.getNearestNode(mousePos, OsmPrimitive.isSelectablePredicate);
+        Node n = Main.map.mapView.getNearestNode(mousePos, OsmPrimitive.isSelectablePredicate);
         if (ctrl) {
             Iterator<Way> it = getCurrentDataSet().getSelectedWays().iterator();

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

@@ -684 +684 @@
             wnew.addNode(insertionPoint, n2New);
             wayWasModified = true;
-            insertionPoint++;
             cmds.add(new AddCommand(n2New));
             changedNodes.add(n2New);

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

@@ -1196 +1196 @@
                 Pair<Node, Node> vnp = null, wnp = new Pair<>(null, null);
 
-                Way w = null;
                 for (WaySegment ws : mv.getNearestWaySegments(p, mv.isSelectablePredicate)) {
-                    w = ws.way;
+                    Way w = ws.way;
 
                     wnp.a = w.getNode(ws.lowerIndex);