Changeset 8870 in josm for trunk/src/org/openstreetmap/josm/data/projection

Timestamp:

2015-10-13T23:50:14+02:00 (9 years ago)

Author:

Don-vip

Message:

sonar - squid:S2325 - "private" methods that don't access instance data should be "static"

Location:

trunk/src/org/openstreetmap/josm/data/projection/datum

Files:

• NTV2GridShiftFile.java (modified) (2 diffs)
• NTV2SubGrid.java (modified) (2 diffs)

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

@@ -83 +83 @@
     private NTV2SubGrid lastSubGrid;
 
-    private void readBytes(InputStream in, byte[] b) throws IOException {
+    private static 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");
@@ -167 +167 @@
      * @return an array of top level Sub Grids with lower level Sub Grids set.
      */
-    private NTV2SubGrid[] createSubGridTree(NTV2SubGrid[] subGrid) {
+    private static NTV2SubGrid[] createSubGridTree(NTV2SubGrid[] subGrid) {
         int topLevelCount = 0;
         Map<String, List<NTV2SubGrid>> subGridMap = new HashMap<>();

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

@@ -149 +149 @@
     }
 
-    private void readBytes(InputStream in, byte[] b) throws IOException {
+    private static 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");
@@ -209 +209 @@
      * @return interpolated value
      */
-    private double interpolate(float a, float b, float c, float d, double x, double y) {
+    private static 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);