Changeset 10181 in josm

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AutoScaleAction.java (modified) (1 diff)
• actions/JumpToAction.java (modified) (1 diff)
• actions/UnGlueAction.java (modified) (1 diff)
• actions/mapmode/DrawAction.java (modified) (2 diffs)
• data/Preferences.java (modified) (1 diff)
• data/cache/JCSCachedTileLoaderJob.java (modified) (3 diffs)
• data/coor/LatLon.java (modified) (1 diff)
• data/coor/QuadTiling.java (modified) (1 diff)
• data/imagery/TemplatedWMSTileSource.java (modified) (1 diff)
• data/osm/visitor/paint/AbstractMapRenderer.java (modified) (1 diff)
• data/osm/visitor/paint/LineClip.java (modified) (1 diff)
• data/osm/visitor/paint/StyledMapRenderer.java (modified) (4 diffs)
• data/osm/visitor/paint/WireframeMapRenderer.java (modified) (1 diff)
• data/projection/CustomProjection.java (modified) (1 diff)
• data/validation/PaintVisitor.java (modified) (1 diff)
• gui/NavigatableComponent.java (modified) (1 diff)
• gui/layer/Layer.java (modified) (1 diff)
• gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (1 diff)
• gui/layer/gpx/GpxDrawHelper.java (modified) (1 diff)
• gui/widgets/UrlLabel.java (modified) (1 diff)
• io/CachedFile.java (modified) (1 diff)
• io/MessageNotifier.java (modified) (1 diff)
• io/OsmServerWriter.java (modified) (1 diff)

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);

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -99 +99 @@
     };
 
-    private static final long MAX_AGE_DEFAULT_PREFERENCES = 60 * 60 * 24 * 50; // 50 days (in seconds)
+    private static final long MAX_AGE_DEFAULT_PREFERENCES = 60L * 60L * 24L * 50L; // 50 days (in seconds)
 
     /**

trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

@@ -26 +26 @@
 import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.Utils;
+
+import sun.net.www.protocol.http.HttpURLConnection;
 
 /**
@@ -340 +342 @@
             }
 
-
             attributes = parseHeaders(urlConn);
 
             for (int i = 0; i < 5; ++i) {
-                if (urlConn.getResponseCode() == 503) {
-                    Thread.sleep(5000+(new Random()).nextInt(5000));
+                if (urlConn.getResponseCode() == HttpURLConnection.HTTP_UNAVAILABLE) {
+                    Thread.sleep(5000L+(new Random()).nextInt(5000));
                     continue;
                 }
@@ -351 +352 @@
                 attributes.setResponseCode(urlConn.getResponseCode());
                 byte[] raw;
-                if (urlConn.getResponseCode() == 200) {
+                if (urlConn.getResponseCode() == HttpURLConnection.HTTP_OK) {
                     raw = Utils.readBytesFromStream(urlConn.getContent());
                 } else {

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -174 +174 @@
         if (cDms60.equals(sSeconds)) {
             sSeconds = cDms00;
-            sMinutes = cDmsMinuteFormatter.format(tMinutes+1);
+            sMinutes = cDmsMinuteFormatter.format(tMinutes+1L);
         }
         if ("60".equals(sMinutes)) {

trunk/src/org/openstreetmap/josm/data/coor/QuadTiling.java

@@ -25 +25 @@
         // The question is how far we move for each bit being set.
         // In the case of the top level, we move half of the world.
-        double xUnit = X_PARTS/2;
-        double yUnit = Y_PARTS/2;
-        long shift = (NR_LEVELS*2)-2;
+        double xUnit = X_PARTS/2d;
+        double yUnit = Y_PARTS/2d;
+        long shift = (NR_LEVELS*2L)-2L;
 
         double x = 0;

trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java

@@ -119 +119 @@
             // use well known scale set "GoogleCompatibile" from OGC WMTS spec to calculate number of tiles per zoom level
             // this makes the zoom levels "glued" to standard TMS zoom levels
-            degreesPerTile[zoom] = (SCALE_DENOMINATOR_ZOOM_LEVEL_1 / Math.pow(2, zoom - 1)) * crsScale;
+            degreesPerTile[zoom] = (SCALE_DENOMINATOR_ZOOM_LEVEL_1 / Math.pow(2d, zoom - 1d)) * crsScale;
             TileXY minTileIndex = eastNorthToTileXY(topLeft, zoom);
             tileXMin[zoom] = minTileIndex.getXIndex();

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java

@@ -221 +221 @@
                     int x = (p.x+lastP.x)/2;
                     int y = (p.y+lastP.y)/2;
-                    path.moveTo(x-virtualNodeSize, y);
-                    path.lineTo(x+virtualNodeSize, y);
-                    path.moveTo(x, y-virtualNodeSize);
-                    path.lineTo(x, y+virtualNodeSize);
+                    path.moveTo((float) x-virtualNodeSize, y);
+                    path.lineTo((float) x+virtualNodeSize, y);
+                    path.moveTo(x, (float) y-virtualNodeSize);
+                    path.lineTo(x, (float) y+virtualNodeSize);
                 }
                 lastP = p;

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/LineClip.java

@@ -39 +39 @@
         }
         return cohenSutherland(p1.x, p1.y, p2.x, p2.y, clipBounds.x, clipBounds.y,
-                clipBounds.x + clipBounds.width, clipBounds.y + clipBounds.height);
+                (long) clipBounds.x + clipBounds.width,
+                (long) clipBounds.y + clipBounds.height);
     }
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -144 +144 @@
             int dxNext = next.x - current.x;
             int dyNext = next.y - current.y;
-            double lenNext = Math.sqrt(dxNext*dxNext + dyNext*dyNext);
+            double lenNext = Math.sqrt((double) dxNext*dxNext + (double) dyNext*dyNext);
 
             if (lenNext == 0) {
@@ -814 +814 @@
                 final double segmentLength = thisP.distance(lastP);
 
-                final double dx = thisP.x - lastP.x;
-                final double dy = thisP.y - lastP.y;
+                final double dx = (double) thisP.x - lastP.x;
+                final double dy = (double) thisP.y - lastP.y;
 
                 // pos is the position from the beginning of the current segment
@@ -1263 +1263 @@
 
             if (lastPoint != null) {
-                dx = p.x - lastPoint.x;
-                dy = p.y - lastPoint.y;
+                dx = (long) p.x - lastPoint.x;
+                dy = (long) p.y - lastPoint.y;
                 double segmentLength = Math.sqrt(dx*dx + dy*dy);
                 if (segmentLength > 2*(rec.getWidth()+4)) {
@@ -1756 +1756 @@
         // Can be optimized if it turns out to be slow.
         for (int i = 1; i < poly.npoints; ++i) {
-            dx = poly.xpoints[i] - poly.xpoints[i-1];
-            dy = poly.ypoints[i] - poly.ypoints[i-1];
+            dx = (long) poly.xpoints[i] - poly.xpoints[i-1];
+            dy = (long) poly.ypoints[i] - poly.ypoints[i-1];
             segLen = Math.sqrt(dx*dx + dy*dy);
             if (totalLen > curLen + segLen) {

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java

@@ -432 +432 @@
                 final double sy = l * (p1.y - p2.y);
 
-                path.lineTo(p2.x + (int) Math.round(cosPHI * sx - sinPHI * sy), p2.y + (int) Math.round(sinPHI * sx + cosPHI * sy));
-                path.moveTo(p2.x + (int) Math.round(cosPHI * sx + sinPHI * sy), p2.y + (int) Math.round(-sinPHI * sx + cosPHI * sy));
+                path.lineTo(p2.x + (float) Math.round(cosPHI * sx - sinPHI * sy), p2.y + (float) Math.round(sinPHI * sx + cosPHI * sy));
+                path.moveTo(p2.x + (float) Math.round(cosPHI * sx + sinPHI * sy), p2.y + (float) Math.round(-sinPHI * sx + cosPHI * sy));
                 path.lineTo(p2.x, p2.y);
             }

trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java

@@ -249 +249 @@
                 if (zone == null || zone < 1 || zone > 60)
                     throw new ProjectionConfigurationException(tr("Expected integer value in range 1-60 for ''+zone=...'' parameter."));
-                this.lon0 = 6 * zone - 183;
+                this.lon0 = 6d * zone - 183d;
                 this.k0 = 0.9996;
                 this.x0 = 500000;

trunk/src/org/openstreetmap/josm/data/validation/PaintVisitor.java

@@ -141 +141 @@
     protected void drawSegment(Point p1, Point p2, Color color) {
 
-        double t = Math.atan2(p2.x - p1.x, p2.y - p1.y);
+        double t = Math.atan2((double) p2.x - p1.x, (double) p2.y - p1.y);
         double cosT = 5 * Math.cos(t);
         double sinT = 5 * Math.sin(t);

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -635 +635 @@
                         zoomTo(oldCenter.interpolate(finalNewCenter, (i+1) / frames));
                         try {
-                            Thread.sleep(1000 / fps);
+                            Thread.sleep(1000L / fps);
                         } catch (InterruptedException ex) {
                             Main.warn("InterruptedException in "+NavigatableComponent.class.getSimpleName()+" during smooth scrolling");

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)));

trunk/src/org/openstreetmap/josm/gui/widgets/UrlLabel.java

@@ -68 +68 @@
         setDescription(description);
         if (fontPlus != 0) {
-            setFont(getFont().deriveFont(0, getFont().getSize()+fontPlus));
+            setFont(getFont().deriveFont(0, (float) getFont().getSize()+fontPlus));
         }
         refresh();

trunk/src/org/openstreetmap/josm/io/CachedFile.java

@@ -76 +76 @@
 
     public static final long DEFAULT_MAXTIME = -1L;
-    public static final long DAYS = 24*60*60; // factor to get caching time in days
+    public static final long DAYS = 24L*60L*60L; // factor to get caching time in days
 
     private final Map<String, String> httpHeaders = new ConcurrentHashMap<>();

trunk/src/org/openstreetmap/josm/io/MessageNotifier.java

@@ -96 +96 @@
             Main.info(tr("{0} not available (offline mode)", tr("Message notifier")));
         } else if (!isRunning() && interval > 0 && isUserEnoughIdentified()) {
-            task = EXECUTOR.scheduleAtFixedRate(WORKER, 0, interval * 60, TimeUnit.SECONDS);
+            task = EXECUTOR.scheduleAtFixedRate(WORKER, 0, interval * 60L, TimeUnit.SECONDS);
             Main.info("Message notifier active (checks every "+interval+" minute"+(interval > 1 ? "s" : "")+')');
         }

trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java

@@ -68 +68 @@
         }
         double uploadsPerMs = (double) progress / elapsed;
-        double uploadsLeft = listSize - progress;
+        double uploadsLeft = (double) listSize - progress;
         long msLeft = (long) (uploadsLeft / uploadsPerMs);
         long minutesLeft = msLeft / MSECS_PER_MINUTE;