Changeset 8384 in josm for trunk/src/org/openstreetmap/josm/gui/layer/gpx

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

Files:

• DateFilterPanel.java (modified) (1 diff)
• GpxDrawHelper.java (modified) (2 diffs)

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

@@ -48 +48 @@
         final Date startTime, endTime;
         Date[] bounds = layer.data.getMinMaxTimeForAllTracks();
-        startTime = (bounds==null) ? new GregorianCalendar(2000, 1, 1).getTime():bounds[0];
-        endTime = (bounds==null) ? new Date() : bounds[1];
+        startTime = (bounds.length == 0) ? new GregorianCalendar(2000, 1, 1).getTime():bounds[0];
+        endTime = (bounds.length == 0) ? new Date() : bounds[1];
 
         dateFrom.setDate(startTime);

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

@@ -280 +280 @@
         if (colored == ColorMode.TIME) {
             Date[] bounds = data.getMinMaxTimeForAllTracks();
-            if (bounds!=null) {
+            if (bounds.length >= 2) {
                 minval = bounds[0].getTime()/1000.0;
                 maxval = bounds[1].getTime()/1000.0;
             } else {
-                minval = 0; maxval=now;
+                minval = 0;
+                maxval = now;
             }
             dateScale.setRange(minval, maxval);
@@ -457 +458 @@
                     g.setColor(customColoringTransparent);
                     // hdop cirles
-                    int hdopp = mv.getPoint(new LatLon(trkPnt.getCoor().lat(), trkPnt.getCoor().lon() + 2*6*hdop*360/40000000)).x - screen.x;
+                    int hdopp = mv.getPoint(new LatLon(
+                            trkPnt.getCoor().lat(),
+                            trkPnt.getCoor().lon() + 2*6*hdop*360/40000000d)).x - screen.x;
                     g.drawArc(screen.x-hdopp/2, screen.y-hdopp/2, hdopp, hdopp, 0, 360);
                 }