Changeset 8384 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2015-05-17T15:52:24+02:00 (10 years ago)

Author:

Don-vip

Message:

squid:S1244 - Floating point numbers should not be tested for equality

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• AudioPlayer.java (modified) (1 diff)
• GeoPropertyIndex.java (modified) (1 diff)
• Geometry.java (modified) (3 diffs)
• ImageProvider.java (modified) (2 diffs)
• Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java

@@ -277 +277 @@
                             if (playingUrl != command.url() ||
                                     stateChange != State.PAUSED ||
-                                    offset != 0.0)
+                                    Double.doubleToRawLongBits(offset) != 0)
                             {
                                 if (audioInputStream != null) {

trunk/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java

@@ -164 +164 @@
         boolean isInside(LatLon ll) {
             return bbox.getTopLeftLon() <= ll.lon() &&
-                    (ll.lon() < bbox.getBottomRightLon() || (ll.lon() == 180.0 && bbox.getBottomRightLon() == 180.0)) &&
+                    (ll.lon() < bbox.getBottomRightLon() ||
+                            (Utils.equalsEpsilon(ll.lon(), 180.0) && Utils.equalsEpsilon(bbox.getBottomRightLon(), 180.0))) &&
                     bbox.getBottomRightLat() <= ll.lat() &&
-                    (ll.lat() < bbox.getTopLeftLat() || (ll.lat() == 90.0 && bbox.getTopLeftLat() == 90.0));
+                    (ll.lat() < bbox.getTopLeftLat() ||
+                            (Utils.equalsEpsilon(ll.lat(), 90.0) && Utils.equalsEpsilon(bbox.getTopLeftLat(), 90.0)));
         }
 

trunk/src/org/openstreetmap/josm/tools/Geometry.java

@@ -352 +352 @@
         // Solve the equations
         double det = a1 * b2 - a2 * b1;
-        if (det == 0)
+        if (Double.doubleToRawLongBits(det) == 0)
             return null; // Lines are parallel
 
@@ -387 +387 @@
         double ldy = p2.getY() - p1.getY();
 
-        if (ldx == 0 && ldy == 0) //segment zero length
+        //segment zero length
+        if (Double.doubleToRawLongBits(ldx) == 0 && Double.doubleToRawLongBits(ldy) == 0)
             return p1;
 
@@ -829 +830 @@
             b[i] = pt1.north() - pt2.north();
             double d = Math.sqrt(a[i]*a[i] + b[i]*b[i]);
-            if(d == 0) return null;
+            if (Double.doubleToRawLongBits(d) == 0) return null;
             a[i] /= d;
             b[i] /= d;

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -1180 +1180 @@
         // convert rotatedAngle to an integer value from 0 to 360
         Long originalAngle = Math.round(rotatedAngle % 360);
-        if (rotatedAngle != 0 && originalAngle == 0) {
+        if (Double.doubleToRawLongBits(rotatedAngle) != 0 && originalAngle == 0) {
             originalAngle = 360L;
         }
@@ -1197 +1197 @@
                 // convert originalAngle to a value from 0 to 90
                 double angle = originalAngle % 90;
-                if (originalAngle != 0.0 && angle == 0.0) {
+                if (originalAngle != 0 && Double.doubleToRawLongBits(angle) == 0) {
                     angle = 90.0;
                 }

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -973 +973 @@
         // Is it less than 1 minute ?
         if (elapsedTime < MILLIS_OF_MINUTE) {
-            return String.format("%.1f %s", elapsedTime / (float) MILLIS_OF_SECOND, tr("s"));
+            return String.format("%.1d %s", elapsedTime / (double) MILLIS_OF_SECOND, tr("s"));
         }
         // Is it less than 1 hour ?