Changeset 8384 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java

Timestamp:

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

Author:

Don-vip

Message:

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

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java

@@ -11 +11 @@
 import org.openstreetmap.josm.data.osm.Storage;
 import org.openstreetmap.josm.tools.Pair;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -164 +165 @@
             ++i;
         }
-        if (bd.get(i) == lower) {
+        if (Utils.equalsEpsilon(bd.get(i), lower)) {
             if (upper > bd.get(i+1))
                 throw new RangeViolatedError();
@@ -170 +171 @@
                 throw new AssertionError("the new range must be within a subrange that has no data");
 
-            if (bd.get(i+1) == upper) {
+            if (Utils.equalsEpsilon(bd.get(i+1), upper)) {
                 //  --|-------|--------|--
                 //   i-1      i       i+1
@@ -212 +213 @@
         if (bd.size() != data.size() + 1) throw new AssertionError();
         if (bd.get(0) != 0) throw new AssertionError();
-        if (bd.get(bd.size() - 1) != Double.POSITIVE_INFINITY) throw new AssertionError();
+        if (!Utils.equalsEpsilon(bd.get(bd.size() - 1), Double.POSITIVE_INFINITY)) throw new AssertionError();
         for (int i=0; i<data.size() - 1; ++i) {
             if (bd.get(i) >= bd.get(i + 1)) throw new AssertionError();