Changeset 8384 in josm for trunk/src/org/openstreetmap/josm/tools
- Timestamp:
- 2015-05-17T15:52:24+02:00 (10 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/tools
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java
r8126 r8384 277 277 if (playingUrl != command.url() || 278 278 stateChange != State.PAUSED || 279 offset != 0.0)279 Double.doubleToRawLongBits(offset) != 0) 280 280 { 281 281 if (audioInputStream != null) { -
trunk/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java
r7596 r8384 164 164 boolean isInside(LatLon ll) { 165 165 return bbox.getTopLeftLon() <= ll.lon() && 166 (ll.lon() < bbox.getBottomRightLon() || (ll.lon() == 180.0 && bbox.getBottomRightLon() == 180.0)) && 166 (ll.lon() < bbox.getBottomRightLon() || 167 (Utils.equalsEpsilon(ll.lon(), 180.0) && Utils.equalsEpsilon(bbox.getBottomRightLon(), 180.0))) && 167 168 bbox.getBottomRightLat() <= ll.lat() && 168 (ll.lat() < bbox.getTopLeftLat() || (ll.lat() == 90.0 && bbox.getTopLeftLat() == 90.0)); 169 (ll.lat() < bbox.getTopLeftLat() || 170 (Utils.equalsEpsilon(ll.lat(), 90.0) && Utils.equalsEpsilon(bbox.getTopLeftLat(), 90.0))); 169 171 } 170 172 -
trunk/src/org/openstreetmap/josm/tools/Geometry.java
r8345 r8384 352 352 // Solve the equations 353 353 double det = a1 * b2 - a2 * b1; 354 if ( det== 0)354 if (Double.doubleToRawLongBits(det) == 0) 355 355 return null; // Lines are parallel 356 356 … … 387 387 double ldy = p2.getY() - p1.getY(); 388 388 389 if (ldx == 0 && ldy == 0) //segment zero length 389 //segment zero length 390 if (Double.doubleToRawLongBits(ldx) == 0 && Double.doubleToRawLongBits(ldy) == 0) 390 391 return p1; 391 392 … … 829 830 b[i] = pt1.north() - pt2.north(); 830 831 double d = Math.sqrt(a[i]*a[i] + b[i]*b[i]); 831 if (d== 0) return null;832 if (Double.doubleToRawLongBits(d) == 0) return null; 832 833 a[i] /= d; 833 834 b[i] /= d; -
trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
r8324 r8384 1180 1180 // convert rotatedAngle to an integer value from 0 to 360 1181 1181 Long originalAngle = Math.round(rotatedAngle % 360); 1182 if (rotatedAngle != 0 && originalAngle == 0) { 1182 if (Double.doubleToRawLongBits(rotatedAngle) != 0 && originalAngle == 0) { 1183 1183 originalAngle = 360L; 1184 1184 } … … 1197 1197 // convert originalAngle to a value from 0 to 90 1198 1198 double angle = originalAngle % 90; 1199 if (originalAngle != 0 .0 && angle == 0.0) {1199 if (originalAngle != 0 && Double.doubleToRawLongBits(angle) == 0) { 1200 1200 angle = 90.0; 1201 1201 } -
trunk/src/org/openstreetmap/josm/tools/Utils.java
r8376 r8384 973 973 // Is it less than 1 minute ? 974 974 if (elapsedTime < MILLIS_OF_MINUTE) { 975 return String.format("%.1 f%s", elapsedTime / (float) MILLIS_OF_SECOND, tr("s"));975 return String.format("%.1d %s", elapsedTime / (double) MILLIS_OF_SECOND, tr("s")); 976 976 } 977 977 // Is it less than 1 hour ?
Note:
See TracChangeset
for help on using the changeset viewer.