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

Timestamp:

2016-03-17T01:50:12+01:00 (10 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/OrthogonalizeAction.java (modified) (6 diffs)

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

@@ -328 +328 @@
 
         // orthogonalize
-        final Direction[] HORIZONTAL = {Direction.RIGHT, Direction.LEFT};
-        final Direction[] VERTICAL = {Direction.UP, Direction.DOWN};
-        final Direction[][] ORIENTATIONS = {HORIZONTAL, VERTICAL};
-        for (Direction[] orientation : ORIENTATIONS) {
+        final Direction[] horizontal = {Direction.RIGHT, Direction.LEFT};
+        final Direction[] vertical = {Direction.UP, Direction.DOWN};
+        final Direction[][] orientations = {horizontal, vertical};
+        for (Direction[] orientation : orientations) {
             final Set<Node> s = new HashSet<>(allNodes);
-            int s_size = s.size();
-            for (int dummy = 0; dummy < s_size; ++dummy) {
+            int size = s.size();
+            for (int dummy = 0; dummy < size; ++dummy) {
                 if (s.isEmpty()) {
                     break;
                 }
-                final Node dummy_n = s.iterator().next();     // pick arbitrary element of s
-
-                final Set<Node> cs = new HashSet<>(); // will contain each node that can be reached from dummy_n
-                cs.add(dummy_n);                      // walking only on horizontal / vertical segments
+                final Node dummyN = s.iterator().next();     // pick arbitrary element of s
+
+                final Set<Node> cs = new HashSet<>(); // will contain each node that can be reached from dummyN
+                cs.add(dummyN);                      // walking only on horizontal / vertical segments
 
                 boolean somethingHappened = true;
@@ -364 +364 @@
                 }
 
-                final Map<Node, Double> nC = (orientation == HORIZONTAL) ? nY : nX;
+                final Map<Node, Double> nC = (orientation == horizontal) ? nY : nX;
 
                 double average = 0;
@@ -385 +385 @@
                 // both heading nodes collapsing to one point, we simply skip this segment string and
                 // don't touch the node coordinates.
-                if (orientation == VERTICAL && headingNodes.size() == 2 && cs.containsAll(headingNodes)) {
+                if (orientation == vertical && headingNodes.size() == 2 && cs.containsAll(headingNodes)) {
                     continue;
                 }
@@ -404 +404 @@
             final double dy = tmp.north() - n.getEastNorth().north();
             if (headingNodes.contains(n)) { // The heading nodes should not have changed
-                final double EPSILON = 1E-6;
-                if (Math.abs(dx) > Math.abs(EPSILON * tmp.east()) ||
-                        Math.abs(dy) > Math.abs(EPSILON * tmp.east()))
+                final double epsilon = 1E-6;
+                if (Math.abs(dx) > Math.abs(epsilon * tmp.east()) ||
+                        Math.abs(dy) > Math.abs(epsilon * tmp.east()))
                     throw new AssertionError();
             } else {
@@ -572 +572 @@
     private static int angleToDirectionChange(double a, double deltaMax) throws RejectedAngleException {
         a = standard_angle_mPI_to_PI(a);
-        double d0    = Math.abs(a);
-        double d90   = Math.abs(a - Math.PI / 2);
-        double d_m90 = Math.abs(a + Math.PI / 2);
+        double d0   = Math.abs(a);
+        double d90  = Math.abs(a - Math.PI / 2);
+        double dm90 = Math.abs(a + Math.PI / 2);
         int dirChange;
         if (d0 < deltaMax) {
@@ -580 +580 @@
         } else if (d90 < deltaMax) {
             dirChange =  1;
-        } else if (d_m90 < deltaMax) {
+        } else if (dm90 < deltaMax) {
             dirChange = -1;
         } else {