Changeset 10181 in josm for trunk/src/org/openstreetmap/josm/gui/layer

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/gui/layer

Files:

• Layer.java (modified) (1 diff)
• geoimage/CorrelateGpxWithImages.java (modified) (1 diff)
• gpx/GpxDrawHelper.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/Layer.java

@@ -169 +169 @@
     public void hookUpMapView() {
         // calculate total memory needed for all layers
-        long memoryBytesRequired = 50 * 1024 * 1024; // assumed minimum JOSM memory footprint
+        long memoryBytesRequired = 50L * 1024L * 1024L; // assumed minimum JOSM memory footprint
         if (Main.map != null && Main.map.mapView != null) {
             for (Layer layer: Main.map.mapView.getAllLayers()) {

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -925 +925 @@
                     lblTimezone.setText(tr("Timezone: {0}", timezone.formatTimezone()));
                     lblMinutes.setText(tr("Minutes: {0}", sldMinutes.getValue()));
-                    lblSeconds.setText(tr("Seconds: {0}", Offset.milliseconds(100 * sldSeconds.getValue()).formatOffset()));
+                    lblSeconds.setText(tr("Seconds: {0}", Offset.milliseconds(100L * sldSeconds.getValue()).formatOffset()));
 
                     delta = Offset.milliseconds(100 * sldSeconds.getValue()

trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java

@@ -419 +419 @@
                             || screen.y < oldA.y - delta || screen.y > oldA.y + delta)) {
                         g.setColor(trkPnt.customColoring);
-                        double t = Math.atan2(screen.y - old.y, screen.x - old.x) + Math.PI;
+                        double t = Math.atan2((double) screen.y - old.y, (double) screen.x - old.x) + Math.PI;
                         g.drawLine(screen.x, screen.y, (int) (screen.x + 10 * Math.cos(t - PHI)),
                                 (int) (screen.y + 10 * Math.sin(t - PHI)));