Changeset 10001 in josm for trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

Timestamp:

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

Author:

Don-vip

Message:

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

File:

• trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -605 +605 @@
             }
 
-            int i_c = 0, i_r = 0;
+            int ic = 0;
+            int ir = 0;
             List<RelationMember> relationMembers = r.getMembers();
             for (RelationMember rm: relationMembers) {
@@ -666 +667 @@
                         Boolean backwards = null;
                         int k = 1;
-                        while (i_r - k >= 0 || i_r + k < relationMembers.size()) {
-                            if ((i_r - k >= 0) && relationMembers.get(i_r - k).isWay()) {
-                                Way w = relationMembers.get(i_r - k).getWay();
+                        while (ir - k >= 0 || ir + k < relationMembers.size()) {
+                            if ((ir - k >= 0) && relationMembers.get(ir - k).isWay()) {
+                                Way w = relationMembers.get(ir - k).getWay();
                                 if ((w.lastNode() == way.firstNode()) || w.firstNode() == way.firstNode()) {
                                     backwards = Boolean.FALSE;
@@ -676 +677 @@
                                 break;
                             }
-                            if ((i_r + k < relationMembers.size()) && relationMembers.get(i_r + k).isWay()) {
-                                Way w = relationMembers.get(i_r + k).getWay();
+                            if ((ir + k < relationMembers.size()) && relationMembers.get(ir + k).isWay()) {
+                                Way w = relationMembers.get(ir + k).getWay();
                                 if ((w.lastNode() == way.firstNode()) || w.firstNode() == way.firstNode()) {
                                     backwards = Boolean.TRUE;
@@ -688 +689 @@
                         }
 
-                        int j = i_c;
+                        int j = ic;
                         final List<Way> waysToAddBefore = newWays.subList(0, indexOfWayToKeep);
                         for (Way wayToAdd : waysToAddBefore) {
@@ -694 +695 @@
                             j++;
                             if (Boolean.TRUE.equals(backwards)) {
-                                c.addMember(i_c + 1, em);
+                                c.addMember(ic + 1, em);
                             } else {
                                 c.addMember(j - 1, em);
@@ -704 +705 @@
                             j++;
                             if (Boolean.TRUE.equals(backwards)) {
-                                c.addMember(i_c, em);
+                                c.addMember(ic, em);
                             } else {
                                 c.addMember(j, em);
                             }
                         }
-                        i_c = j;
+                        ic = j;
                     }
                 }
-                i_c++;
-                i_r++;
+                ic++;
+                ir++;
             }