Changeset 9880 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2016-02-25T00:50:30+01:00 (8 years ago)

Author:

Don-vip

Message:

findbugs

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JoinNodeWayAction.java (modified) (1 diff)
• data/osm/NodePositionComparator.java (modified) (1 diff)
• gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (1 diff)
• gui/layer/gpx/ChooseTrackVisibilityAction.java (modified) (1 diff)

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

@@ -202 +202 @@
             double distanceFirst = firstPosition.distance(refPoint);
             double distanceSecond = secondPosition.distance(refPoint);
-            double difference =  distanceFirst - distanceSecond;
-
-            if (difference > 0.0) return 1;
-            if (difference < 0.0) return -1;
-            return 0;
+            return Double.compare(distanceFirst, distanceSecond);
         }
     }

trunk/src/org/openstreetmap/josm/data/osm/NodePositionComparator.java

@@ -20 +20 @@
             return 0;
 
-        double dLat = n1.getCoor().lat() - n2.getCoor().lat();
-        if (dLat > 0)
-            return 1;
-        if (dLat < 0)
-            return -1;
-        double dLon = n1.getCoor().lon() - n2.getCoor().lon();
-        if (dLon == 0)
-            return 0;
-        return dLon > 0 ? 1 : -1;
+        int dLat = Double.compare(n1.getCoor().lat(), n2.getCoor().lat());
+        return dLat != 0 ? dLat : Double.compare(n1.getCoor().lon(), n2.getCoor().lon());
     }
 }

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -1478 +1478 @@
 
         Pair<Timezone, Offset> splitOutTimezone() {
-            // In hours, rounded to two decimal places
-            double tz = (withoutDayOffset().getSeconds() * 100L / 3600.0) / 100.0;
+            // In hours
+            double tz = withoutDayOffset().getSeconds() / 3600.0;
 
             // Due to imprecise clocks we might get a "+3:28" timezone, which should obviously be 3:30 with

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

@@ -100 +100 @@
         @Override
         public int compare(TrackLength l0, TrackLength l1) {
-            if (l0.value < l1.value)
-                return -1;
-            else if (l0.value > l1.value)
-                return 1;
-            return 0;
+            return Double.compare(l0.value, l1.value);
         }
     }