Changeset 14091 in josm for trunk/src

Timestamp:

2018-08-05T20:11:27+02:00 (6 years ago)

Author:

Don-vip

Message:

tools update: awaitility 3.1.2, equalsverifier 2.5.1, jmockit 1.41, reflections 0.9.11, error_prone 2.3.1, proguard 6.0.3, pmd 6.6.0, spotbugs 3.1.6

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/coor/LatLon.java (modified) (1 diff)
• data/projection/proj/AzimuthalEquidistant.java (modified) (1 diff)
• tools/WindowsShortcut.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -234 +234 @@
         // 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;

trunk/src/org/openstreetmap/josm/data/projection/proj/AzimuthalEquidistant.java

@@ -214 +214 @@
         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);
             }

trunk/src/org/openstreetmap/josm/tools/WindowsShortcut.java

@@ -44 +44 @@
      */
     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 +126 @@
     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;
     }