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

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AlignInCircleAction.java (modified) (1 diff)
• AlignInLineAction.java (modified) (1 diff)
• JoinAreasAction.java (modified) (2 diffs)
• SelectByInternalPointAction.java (modified) (1 diff)
• audio/AudioPlayPauseAction.java (modified) (2 diffs)
• mapmode/DrawAction.java (modified) (1 diff)
• mapmode/PlayHeadDragMode.java (modified) (1 diff)

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

@@ -232 +232 @@
         // center. This method is ok as long as distances are short
         // relative to the distance from the N or S poles.
-        if (radius == 0) {
+        if (Double.doubleToRawLongBits(radius) == 0) {
             for (Node n : nodes) {
                 radius += distance(center, n.getEastNorth());

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

@@ -363 +363 @@
             b = xM - xB;
             double norm = Math.sqrt(a*a + b*b);
-            if (norm == 0)
+            if (Double.doubleToRawLongBits(norm) == 0)
                 // Nodes have same coordinates !
                 throw new InvalidSelection();

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

@@ -46 +46 @@
 import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -357 +358 @@
                 double candidateAngle = getAngle(headNode, candidatePrevNode, prevNode);
 
-                if(mostLeft == null || candidateAngle < angle || (candidateAngle == angle && !candidateComingToHead)) {
+                if(mostLeft == null || candidateAngle < angle || (Utils.equalsEpsilon(candidateAngle, angle) && !candidateComingToHead)) {
                     // Candidate is most left
                     mostLeft = candidateWay;

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

@@ -61 +61 @@
                     EastNorth en2 = Main.map.mapView.getProjection().latlon2eastNorth(bBox.getBottomRight());
                     double s = Math.abs((en1.east() - en2.east()) * (en1.north() - en2.north()));
-                    if (s == 0) s = 1e8;
+                    if (Double.doubleToRawLongBits(s) == 0) {
+                        s = 1e8;
+                    }
                     found.put(s, r);
                 }

trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java

@@ -14 +14 @@
 import org.openstreetmap.josm.tools.AudioPlayer;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -38 +39 @@
                 AudioPlayer.play(url);
             } else if (AudioPlayer.playing()){
-                if (AudioPlayer.speed() != 1.0)
+                if (!Utils.equalsEpsilon(AudioPlayer.speed(), 1.0))
                     AudioPlayer.play(url, AudioPlayer.position());
                 else

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

@@ -1005 +1005 @@
             // In practice this will probably only happen when a way has been duplicated
 
-            if (u == 0)
+            if (Double.doubleToRawLongBits(u) == 0)
                 return;
 

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

@@ -60 +60 @@
             dragging = true;
         }
-        if (p.distance(mousePos) == 0) return;
+        if (Double.doubleToRawLongBits(p.distance(mousePos)) == 0) return;
         playHeadMarker.drag(Main.map.mapView.getEastNorth(ev.getX(), ev.getY()));
         mousePos = p;