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

Timestamp:

2016-05-11T04:44:00+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S2184 - Math operands should be cast before assignment

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AutoScaleAction.java (modified) (1 diff)
• JumpToAction.java (modified) (1 diff)
• UnGlueAction.java (modified) (1 diff)
• mapmode/DrawAction.java (modified) (2 diffs)

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

@@ -287 +287 @@
         case "download":
 
-            if (lastZoomTime > 0 && System.currentTimeMillis() - lastZoomTime > Main.pref.getLong("zoom.bounds.reset.time", 10*1000)) {
+            if (lastZoomTime > 0 && System.currentTimeMillis() - lastZoomTime > Main.pref.getLong("zoom.bounds.reset.time", 10L*1000L)) {
                 lastZoomTime = -1;
             }

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

@@ -187 +187 @@
 
             // 10 000 000 = 10 000 * 1000 = World * (km -> m)
-            zm.setText(Double.toString(Math.round(10000000 * Math.pow(2, (-1) * zoomLvl))));
+            zm.setText(Double.toString(Math.round(10000000d * Math.pow(2d, (-1d) * zoomLvl))));
         }
     }

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

@@ -562 +562 @@
     private static void execCommands(List<Command> cmds, List<Node> newNodes) {
         Main.main.undoRedo.add(new SequenceCommand(/* for correct i18n of plural forms - see #9110 */
-                trn("Dupe into {0} node", "Dupe into {0} nodes", newNodes.size() + 1, newNodes.size() + 1), cmds));
+                trn("Dupe into {0} node", "Dupe into {0} nodes", newNodes.size() + 1L, newNodes.size() + 1L), cmds));
         // select one of the new nodes
         getCurrentDataSet().setSelected(newNodes.get(0));

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

@@ -1142 +1142 @@
         Point p2 = mv.getPoint(currentMouseEastNorth);
 
-        double t = Math.atan2(p2.y-p1.y, p2.x-p1.x) + Math.PI;
+        double t = Math.atan2((double) p2.y - p1.y, (double) p2.x - p1.x) + Math.PI;
 
         b.moveTo(p1.x, p1.y);
@@ -1483 +1483 @@
                 if (absoluteFix) {
                     b.moveTo(p2.x, p2.y);
-                    b.lineTo(2*p1.x-p2.x, 2*p1.y-p2.y); // bi-directional line
+                    b.lineTo(2f*p1.x-p2.x, 2f*p1.y-p2.y); // bi-directional line
                 } else {
                     b.moveTo(p2.x, p2.y);