Ticket #20167: NTV2GridShiftFile.patch

src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java

@@ -164 +164 @@
     /**
      * Create a tree of Sub Grids by adding each Sub Grid to its parent (where
      * it has one), and returning an array of the top level Sub Grids
-     * @param subGrid an array of all Sub Grids
+     * @param subGrids an array of all Sub Grids
      * @return an array of top level Sub Grids with lower level Sub Grids set.
      */
-    private static NTV2SubGrid[] createSubGridTree(NTV2SubGrid... subGrid) {
+    private static NTV2SubGrid[] createSubGridTree(NTV2SubGrid... subGrids) {
         int topLevelCount = 0;
         Map<String, List<NTV2SubGrid>> subGridMap = new HashMap<>();
-        for (int i = 0; i < subGrid.length; i++) {
-            if ("NONE".equalsIgnoreCase(subGrid[i].getParentSubGridName())) {
+        for (NTV2SubGrid subGrid : subGrids) {
+            if ("NONE".equalsIgnoreCase(subGrid.getParentSubGridName())) {
                 topLevelCount++;
             }
-            subGridMap.put(subGrid[i].getSubGridName(), new ArrayList<NTV2SubGrid>());
+            subGridMap.put(subGrid.getSubGridName(), new ArrayList<>());
         }
         NTV2SubGrid[] topLevelSubGrid = new NTV2SubGrid[topLevelCount];
         topLevelCount = 0;
-        for (int i = 0; i < subGrid.length; i++) {
-            if ("NONE".equalsIgnoreCase(subGrid[i].getParentSubGridName())) {
-                topLevelSubGrid[topLevelCount++] = subGrid[i];
+        for (NTV2SubGrid subGrid : subGrids) {
+            if ("NONE".equalsIgnoreCase(subGrid.getParentSubGridName())) {
+                topLevelSubGrid[topLevelCount++] = subGrid;
             } else {
-                List<NTV2SubGrid> parent = subGridMap.get(subGrid[i].getParentSubGridName());
-                parent.add(subGrid[i]);
+                List<NTV2SubGrid> parent = subGridMap.get(subGrid.getParentSubGridName());
+                parent.add(subGrid);
             }
         }
         NTV2SubGrid[] nullArray = new NTV2SubGrid[0];
-        for (int i = 0; i < subGrid.length; i++) {
-            List<NTV2SubGrid> subSubGrids = subGridMap.get(subGrid[i].getSubGridName());
+        for (NTV2SubGrid subGrid : subGrids) {
+            List<NTV2SubGrid> subSubGrids = subGridMap.get(subGrid.getSubGridName());
             if (!subSubGrids.isEmpty()) {
                 NTV2SubGrid[] subGridArray = subSubGrids.toArray(nullArray);
-                subGrid[i].setSubGridArray(subGridArray);
+                subGrid.setSubGridArray(subGridArray);
             }
         }
         return topLevelSubGrid;
@@ -262 +262 @@
      */
     private static NTV2SubGrid getSubGrid(NTV2SubGrid[] topLevelSubGrid, double lon, double lat) {
         NTV2SubGrid sub = null;
-        for (int i = 0; i < topLevelSubGrid.length; i++) {
-            sub = topLevelSubGrid[i].getSubGridForCoord(lon, lat);
+        for (NTV2SubGrid topLevel : topLevelSubGrid) {
+            sub = topLevel.getSubGridForCoord(lon, lat);
             if (sub != null) {
                 break;
             }