Changeset 10179 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2016-05-11T02:44:10+02:00 (9 years ago)

Author:

Don-vip

Message:

sonar - squid:AssignmentInSubExpressionCheck - Assignments should not be made from within sub-expressions

Location:

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

Files:

• DrawAction.java (modified) (1 diff)
• SelectAction.java (modified) (3 diffs)

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

@@ -1665 +1665 @@
                 }
             }
-            return projected = new EastNorth(e0+l*pe, n0+l*pn);
+            projected = new EastNorth(e0+l*pe, n0+l*pn);
+            return projected;
         }
 

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

@@ -725 +725 @@
                 ((MoveCommand) c).applyVectorTo(currentEN);
             } else {
-                Main.main.undoRedo.add(
-                        c = new MoveCommand(selection, startEN, currentEN));
+                c = new MoveCommand(selection, startEN, currentEN);
+                Main.main.undoRedo.add(c);
             }
             for (Node n : affectedNodes) {
@@ -834 +834 @@
                 limit -= ((Way) osm).getNodes().size();
             }
-            if ((limit -= 1) < 0) {
+            if (--limit < 0) {
                 break;
             }
@@ -1200 +1200 @@
                     w = ws.way;
 
-                    Point2D p1 = mv.getPoint2D(wnp.a = w.getNode(ws.lowerIndex));
-                    Point2D p2 = mv.getPoint2D(wnp.b = w.getNode(ws.lowerIndex + 1));
+                    wnp.a = w.getNode(ws.lowerIndex);
+                    wnp.b = w.getNode(ws.lowerIndex + 1);
+                    Point2D p1 = mv.getPoint2D(wnp.a);
+                    Point2D p2 = mv.getPoint2D(wnp.b);
                     if (WireframeMapRenderer.isLargeSegment(p1, p2, virtualSpace)) {
                         Point2D pc = new Point2D.Double((p1.getX() + p2.getX()) / 2, (p1.getY() + p2.getY()) / 2);