Changeset 10001 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2016-03-17T01:50:12+01:00 (9 years ago)

Author:

Don-vip

Message:

sonar - Local variable and method parameter names should comply with a naming convention

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• Diff.java (modified) (8 diffs)
• ImageProvider.java (modified) (4 diffs)

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

@@ -177 +177 @@
         for (int c = 1;; ++c) {
             int d;          /* Active diagonal. */
-            boolean big_snake = false;
+            boolean bigSnake = false;
 
             /* Extend the top-down search by an edit step in each diagonal. */
@@ -204 +204 @@
                 }
                 if (x - oldx > SNAKE_LIMIT) {
-                    big_snake = true;
+                    bigSnake = true;
                 }
                 fd[fdiagoff + d] = x;
@@ -238 +238 @@
                 }
                 if (oldx - x > SNAKE_LIMIT) {
-                    big_snake = true;
+                    bigSnake = true;
                 }
                 bd[bdiagoff + d] = x;
@@ -255 +255 @@
        of changes, the algorithm is linear in the file size.  */
 
-            if (c > 200 && big_snake && heuristic) {
+            if (c > 200 && bigSnake && heuristic) {
                 int best = 0;
                 int bestpos = -1;
@@ -618 +618 @@
          */
         int[] equivCount() {
-            int[] equiv_count = new int[equivMax];
+            int[] equivCount = new int[equivMax];
             for (int i = 0; i < bufferedLines; ++i) {
-                ++equiv_count[equivs[i]];
-            }
-            return equiv_count;
+                ++equivCount[equivs[i]];
+            }
+            return equivCount;
         }
 
@@ -853 +853 @@
         void shift_boundaries(FileData f) {
             final boolean[] changed = changedFlag;
-            final boolean[] other_changed = f.changedFlag;
+            final boolean[] otherChanged = f.changedFlag;
             int i = 0;
             int j = 0;
-            int i_end = bufferedLines;
+            int iEnd = bufferedLines;
             int preceding = -1;
-            int other_preceding = -1;
+            int otherPreceding = -1;
 
             for (;;) {
-                int start, end, other_start;
+                int start, end, otherStart;
 
                 /* Scan forwards to find beginning of another run of changes.
                    Also keep track of the corresponding point in the other file.  */
 
-                while (i < i_end && !changed[1+i]) {
-                    while (other_changed[1+j++]) {
+                while (i < iEnd && !changed[1+i]) {
+                    while (otherChanged[1+j++]) {
                         /* Non-corresponding lines in the other file
                            will count as the preceding batch of changes.  */
-                        other_preceding = j;
+                        otherPreceding = j;
                     }
                     i++;
                 }
 
-                if (i == i_end) {
+                if (i == iEnd) {
                     break;
                 }
 
                 start = i;
-                other_start = j;
+                otherStart = j;
 
                 for (;;) {
                     /* Now find the end of this run of changes.  */
 
-                    while (i < i_end && changed[1+i]) {
+                    while (i < iEnd && changed[1+i]) {
                         i++;
                     }
@@ -899 +899 @@
                        Only because the previous run was shifted here.  */
 
-                    if (end != i_end && equivs[start] == equivs[end] && !other_changed[1+j]
-                         && !((preceding >= 0 && start == preceding) || (other_preceding >= 0 && other_start == other_preceding))) {
+                    if (end != iEnd && equivs[start] == equivs[end] && !otherChanged[1+j]
+                         && !((preceding >= 0 && start == preceding) || (otherPreceding >= 0 && otherStart == otherPreceding))) {
                         changed[1+end++] = true;
                         changed[1+start++] = false;
@@ -914 +914 @@
 
                 preceding = i;
-                other_preceding = j;
+                otherPreceding = j;
             }
         }

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

@@ -753 +753 @@
                 extensions = new String[] {".png", ".svg"};
             }
-            final int ARCHIVE = 0, LOCAL = 1;
-            for (int place : new Integer[] {ARCHIVE, LOCAL}) {
+            final int typeArchive = 0;
+            final int typeLocal = 1;
+            for (int place : new Integer[] {typeArchive, typeLocal}) {
                 for (String ext : extensions) {
 
@@ -777 +778 @@
 
                     switch (place) {
-                    case ARCHIVE:
+                    case typeArchive:
                         if (archive != null) {
                             ir = getIfAvailableZip(fullName, archive, inArchiveDir, type);
@@ -786 +787 @@
                         }
                         break;
-                    case LOCAL:
+                    case typeLocal:
                         // getImageUrl() does a ton of "stat()" calls and gets expensive
                         // and redundant when you have a whole ton of objects. So,
@@ -924 +925 @@
                 }
             } else {
-                final String fn_md5 = Utils.md5Hex(fn);
-                url = b + fn_md5.substring(0, 1) + '/' + fn_md5.substring(0, 2) + "/" + fn;
+                final String fnMD5 = Utils.md5Hex(fn);
+                url = b + fnMD5.substring(0, 1) + '/' + fnMD5.substring(0, 2) + "/" + fn;
             }
             result = getIfAvailableHttp(url, type);