Changeset 8332 in josm for trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java

Timestamp:

2015-05-06T00:23:51+02:00 (9 years ago)

Author:

Don-vip

Message:

fix various issues:

• performance - inefficient use of keySet iterator instead of entrySet iterator
• squid:S2674: The value returned from a stream read should be checked
• remove unused imports
• improve javadoc

File:

• trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java

@@ -75 +75 @@
         byte[] b4 = new byte[4];
         byte[] b1 = new byte[1];
-        in.read(b8);
-        in.read(b8);
+        readBytes(in, b8);
+        readBytes(in, b8);
         subGridName = new String(b8, StandardCharsets.UTF_8).trim();
-        in.read(b8);
-        in.read(b8);
+        readBytes(in, b8);
+        readBytes(in, b8);
         parentSubGridName = new String(b8, StandardCharsets.UTF_8).trim();
-        in.read(b8);
-        in.read(b8);
+        readBytes(in, b8);
+        readBytes(in, b8);
         created = new String(b8, StandardCharsets.UTF_8);
-        in.read(b8);
-        in.read(b8);
+        readBytes(in, b8);
+        readBytes(in, b8);
         updated = new String(b8, StandardCharsets.UTF_8);
-        in.read(b8);
-        in.read(b8);
+        readBytes(in, b8);
+        readBytes(in, b8);
         minLat = NTV2Util.getDouble(b8, bigEndian);
-        in.read(b8);
-        in.read(b8);
+        readBytes(in, b8);
+        readBytes(in, b8);
         maxLat = NTV2Util.getDouble(b8, bigEndian);
-        in.read(b8);
-        in.read(b8);
+        readBytes(in, b8);
+        readBytes(in, b8);
         minLon = NTV2Util.getDouble(b8, bigEndian);
-        in.read(b8);
-        in.read(b8);
+        readBytes(in, b8);
+        readBytes(in, b8);
         maxLon = NTV2Util.getDouble(b8, bigEndian);
-        in.read(b8);
-        in.read(b8);
+        readBytes(in, b8);
+        readBytes(in, b8);
         latInterval = NTV2Util.getDouble(b8, bigEndian);
-        in.read(b8);
-        in.read(b8);
+        readBytes(in, b8);
+        readBytes(in, b8);
         lonInterval = NTV2Util.getDouble(b8, bigEndian);
         lonColumnCount = 1 + (int)((maxLon - minLon) / lonInterval);
         latRowCount = 1 + (int)((maxLat - minLat) / latInterval);
-        in.read(b8);
-        in.read(b8);
+        readBytes(in, b8);
+        readBytes(in, b8);
         nodeCount = NTV2Util.getInt(b8, bigEndian);
         if (nodeCount != lonColumnCount * latRowCount)
@@ -123 +123 @@
             // certain VM which are not able to read byte blocks when the resource file is
             // in a .jar file (Pieren)
-            in.read(b1); b4[0] = b1[0];
-            in.read(b1); b4[1] = b1[0];
-            in.read(b1); b4[2] = b1[0];
-            in.read(b1); b4[3] = b1[0];
+            readBytes(in, b1); b4[0] = b1[0];
+            readBytes(in, b1); b4[1] = b1[0];
+            readBytes(in, b1); b4[2] = b1[0];
+            readBytes(in, b1); b4[3] = b1[0];
             latShift[i] = NTV2Util.getFloat(b4, bigEndian);
-            in.read(b1); b4[0] = b1[0];
-            in.read(b1); b4[1] = b1[0];
-            in.read(b1); b4[2] = b1[0];
-            in.read(b1); b4[3] = b1[0];
+            readBytes(in, b1); b4[0] = b1[0];
+            readBytes(in, b1); b4[1] = b1[0];
+            readBytes(in, b1); b4[2] = b1[0];
+            readBytes(in, b1); b4[3] = b1[0];
             lonShift[i] = NTV2Util.getFloat(b4, bigEndian);
-            in.read(b1); b4[0] = b1[0];
-            in.read(b1); b4[1] = b1[0];
-            in.read(b1); b4[2] = b1[0];
-            in.read(b1); b4[3] = b1[0];
+            readBytes(in, b1); b4[0] = b1[0];
+            readBytes(in, b1); b4[1] = b1[0];
+            readBytes(in, b1); b4[2] = b1[0];
+            readBytes(in, b1); b4[3] = b1[0];
             if (loadAccuracy) {
                 latAccuracy[i] = NTV2Util.getFloat(b4, bigEndian);
             }
-            in.read(b1); b4[0] = b1[0];
-            in.read(b1); b4[1] = b1[0];
-            in.read(b1); b4[2] = b1[0];
-            in.read(b1); b4[3] = b1[0];
+            readBytes(in, b1); b4[0] = b1[0];
+            readBytes(in, b1); b4[1] = b1[0];
+            readBytes(in, b1); b4[2] = b1[0];
+            readBytes(in, b1); b4[3] = b1[0];
             if (loadAccuracy) {
                 lonAccuracy[i] = NTV2Util.getFloat(b4, bigEndian);
             }
+        }
+    }
+
+    private void readBytes(InputStream in, byte[] b) throws IOException {
+        if (in.read(b) < b.length) {
+            Main.error("Failed to read expected amount of bytes ("+ b.length +") from stream");
         }
     }
@@ -194 +200 @@
      * Bi-Linear interpolation of four nearest node values as described in
      * 'GDAit Software Architecture Manual' produced by the <a
-     * href='http://www.sli.unimelb.edu.au/gda94'>Geomatics
-     * Department of the University of Melbourne</a>
+     * href='http://www.dtpli.vic.gov.au/property-and-land-titles/geodesy/geocentric-datum-of-australia-1994-gda94/gda94-useful-tools'>
+     * Geomatics Department of the University of Melbourne</a>
      * @param a value at the A node
      * @param b value at the B node
      * @param c value at the C node
      * @param d value at the D node
-     * @param X Longitude factor
-     * @param Y Latitude factor
+     * @param x Longitude factor
+     * @param y Latitude factor
      * @return interpolated value
      */
-    private final double interpolate(float a, float b, float c, float d, double X, double Y) {
-        return a + (((double)b - (double)a) * X) + (((double)c - (double)a) * Y) +
-        (((double)a + (double)d - b - c) * X * Y);
+    private final double interpolate(float a, float b, float c, float d, double x, double y) {
+        return a + (((double)b - (double)a) * x) + (((double)c - (double)a) * y) +
+        (((double)a + (double)d - b - c) * x * y);
     }
 
@@ -213 +219 @@
      * of the GridShiftFile. The algorithm is described in
      * 'GDAit Software Architecture Manual' produced by the <a
-     * href='http://www.sli.unimelb.edu.au/gda94'>Geomatics
-     * Department of the University of Melbourne</a>
+     * href='http://www.dtpli.vic.gov.au/property-and-land-titles/geodesy/geocentric-datum-of-australia-1994-gda94/gda94-useful-tools'>
+     * Geomatics Department of the University of Melbourne</a>
      * <p>This method is thread safe for both memory based and file based node data.
      * @param gs GridShift object containing the coordinate to shift and the shift values