Index: /trunk/.classpath =================================================================== --- /trunk/.classpath (revision 14090) +++ /trunk/.classpath (revision 14091) @@ -23,5 +23,5 @@ - + @@ -68,10 +68,10 @@ - + - + @@ -108,5 +108,5 @@ - + Index: /trunk/netbeans/nbproject/project.properties =================================================================== --- /trunk/netbeans/nbproject/project.properties (revision 14090) +++ /trunk/netbeans/nbproject/project.properties (revision 14091) @@ -38,5 +38,5 @@ file.reference.core-src=../src file.reference.debug-1.0.jar=../test/lib/fest/debug-1.0.jar -file.reference.equalsverifier-2.4.4.jar=../test/lib/equalsverifier-2.4.4.jar +file.reference.equalsverifier-2.5.1.jar=../test/lib/equalsverifier-2.5.1.jar file.reference.fest-assert-1.0.jar=../test/lib/fest/fest-assert-1.0.jar file.reference.fest-reflect-1.1.jar=../test/lib/fest/fest-reflect-1.1.jar @@ -49,4 +49,5 @@ file.reference.jcip-annotations-1.0.jar=../test/lib/fest/jcip-annotations-1.0.jar file.reference.jfcunit.jar=../test/lib/jfcunit.jar +file.reference.jmockit-1.41.jar=../test/lib/jmockit-1.41.jar file.reference.junit-4.12.jar=../test/lib/junit/junit-4.12.jar file.reference.MRJToolkitStubs-1.0.jar=../test/lib/fest/MRJToolkitStubs-1.0.jar @@ -58,6 +59,6 @@ file.reference.unitils-core-3.4.6.jar=../test/lib/unitils-core/unitils-core-3.4.6.jar file.reference.system-rules-1.16.1.jar=../test/lib/system-rules-1.16.1.jar -file.reference.wiremock-standalone-2.15.0.jar=../test/lib/wiremock-standalone-2.15.0.jar -file.reference.awaitility-3.1.0.jar=../test/lib/awaitility-3.1.0.jar +file.reference.wiremock-standalone-2.18.0.jar=../test/lib/wiremock-standalone-2.18.0.jar +file.reference.awaitility-3.1.2.jar=../test/lib/awaitility-3.1.2.jar includes=**/*.java jar.compress=false @@ -75,6 +76,7 @@ ${build.classes.dir}:\ ${file.reference.junit-4.12.jar}:\ + ${file.reference.jmockit-1.41.jar}:\ ${file.reference.jfcunit.jar}:\ - ${file.reference.equalsverifier-2.4.4.jar}:\ + ${file.reference.equalsverifier-2.5.1.jar}:\ ${file.reference.hamcrest-core-1.3.jar}:\ ${file.reference.MRJToolkitStubs-1.0.jar}:\ @@ -87,5 +89,5 @@ ${file.reference.guava-21.0.jar}:\ ${file.reference.javassist-3.21.0-GA.jar}:\ - ${file.reference.reflections-0.9.10.jar}:\ + ${file.reference.reflections-0.9.11.jar}:\ ${file.reference.commons-collections-3.2.2.jar}:\ ${file.reference.commons-lang-2.6.jar}:\ @@ -94,6 +96,6 @@ ${file.reference.unitils-core-3.4.6.jar}:\ ${file.reference.system-rules-1.16.1.jar}:\ - ${file.reference.wiremock-standalone-2.15.0.jar}:\ - ${file.reference.awaitility-3.1.0.jar}:\ + ${file.reference.wiremock-standalone-2.18.0.jar}:\ + ${file.reference.awaitility-3.1.2.jar}:\ ${file.reference.spotbugs.jar}:\ ${file.reference.commons-testing-2.1.0.jar} Index: /trunk/src/org/openstreetmap/josm/data/coor/LatLon.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (revision 14090) +++ /trunk/src/org/openstreetmap/josm/data/coor/LatLon.java (revision 14091) @@ -234,5 +234,5 @@ // rounding errors could make the argument of asin greater than 1 // (This should almost never happen.) - if (java.lang.Double.isNaN(d)) { + if (Double.isNaN(d)) { Logging.error("NaN in greatCircleDistance"); d = PI * WGS84.a; Index: /trunk/src/org/openstreetmap/josm/data/projection/proj/AzimuthalEquidistant.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/projection/proj/AzimuthalEquidistant.java (revision 14090) +++ /trunk/src/org/openstreetmap/josm/data/projection/proj/AzimuthalEquidistant.java (revision 14091) @@ -214,31 +214,31 @@ double lambda = 0; double phi = 0; - double c_rh = Math.hypot(x, y); - if (c_rh > Math.PI) { - if (c_rh - EPS10 > Math.PI) { + double cRh = Math.hypot(x, y); + if (cRh > Math.PI) { + if (cRh - EPS10 > Math.PI) { throw new JosmRuntimeException("TOLERANCE_ERROR"); } - } else if (c_rh < EPS10) { + } else if (cRh < EPS10) { phi = latitudeOfOrigin; lambda = 0.; } else { if (mode == Mode.OBLIQUE || mode == Mode.EQUATORIAL) { - double sinc = Math.sin(c_rh); - double cosc = Math.cos(c_rh); + double sinc = Math.sin(cRh); + double cosc = Math.cos(cRh); if (mode == Mode.EQUATORIAL) { - phi = aasin(y * sinc / c_rh); + phi = aasin(y * sinc / cRh); x *= sinc; - y = cosc * c_rh; + y = cosc * cRh; } else { // Oblique - phi = aasin(cosc * sinph0 + y * sinc * cosph0 / c_rh); - y = (cosc - sinph0 * Math.sin(phi)) * c_rh; + phi = aasin(cosc * sinph0 + y * sinc * cosph0 / cRh); + y = (cosc - sinph0 * Math.sin(phi)) * cRh; x *= sinc * cosph0; } lambda = (y == 0) ? 0 : Math.atan2(x, y); } else if (mode == Mode.NORTH_POLAR) { - phi = HALF_PI - c_rh; + phi = HALF_PI - cRh; lambda = Math.atan2(x, -y); } else { // South Polar - phi = c_rh - HALF_PI; + phi = cRh - HALF_PI; lambda = Math.atan2(x, y); } Index: /trunk/src/org/openstreetmap/josm/tools/WindowsShortcut.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/WindowsShortcut.java (revision 14090) +++ /trunk/src/org/openstreetmap/josm/tools/WindowsShortcut.java (revision 14091) @@ -44,10 +44,10 @@ */ public static boolean isPotentialValidLink(File file) throws IOException { - final int minimum_length = 0x64; + final int minimumLength = 0x64; boolean isPotentiallyValid = false; try (InputStream fis = Files.newInputStream(file.toPath())) { isPotentiallyValid = file.isFile() && file.getName().toLowerCase(Locale.ENGLISH).endsWith(".lnk") - && fis.available() >= minimum_length + && fis.available() >= minimumLength && isMagicPresent(getBytes(fis, 32)); } @@ -126,6 +126,6 @@ private static boolean isMagicPresent(byte[] link) { final int magic = 0x0000004C; - final int magic_offset = 0x00; - return link.length >= 32 && bytesToDword(link, magic_offset) == magic; + final int magicOffset = 0x00; + return link.length >= 32 && bytesToDword(link, magicOffset) == magic; }