Changeset 10001 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.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/mapmode/DrawAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -999 +999 @@
             Iterator<Pair<Node, Node>> i = segs.iterator();
             Pair<Node, Node> seg = i.next();
-            EastNorth A = seg.a.getEastNorth();
-            EastNorth B = seg.b.getEastNorth();
+            EastNorth pA = seg.a.getEastNorth();
+            EastNorth pB = seg.b.getEastNorth();
             seg = i.next();
-            EastNorth C = seg.a.getEastNorth();
-            EastNorth D = seg.b.getEastNorth();
-
-            double u = det(B.east() - A.east(), B.north() - A.north(), C.east() - D.east(), C.north() - D.north());
+            EastNorth pC = seg.a.getEastNorth();
+            EastNorth pD = seg.b.getEastNorth();
+
+            double u = det(pB.east() - pA.east(), pB.north() - pA.north(), pC.east() - pD.east(), pC.north() - pD.north());
 
             // Check for parallel segments and do nothing if they are
@@ -1017 +1017 @@
             // if the segment is scaled to lenght 1
 
-            double q = det(B.north() - C.north(), B.east() - C.east(), D.north() - C.north(), D.east() - C.east()) / u;
+            double q = det(pB.north() - pC.north(), pB.east() - pC.east(), pD.north() - pC.north(), pD.east() - pC.east()) / u;
             EastNorth intersection = new EastNorth(
-                    B.east() + q * (A.east() - B.east()),
-                    B.north() + q * (A.north() - B.north()));
+                    pB.east() + q * (pA.east() - pB.east()),
+                    pB.north() + q * (pA.north() - pB.north()));
 
 
@@ -1031 +1031 @@
             }
         default:
-            EastNorth P = n.getEastNorth();
+            EastNorth p = n.getEastNorth();
             seg = segs.iterator().next();
-            A = seg.a.getEastNorth();
-            B = seg.b.getEastNorth();
-            double a = P.distanceSq(B);
-            double b = P.distanceSq(A);
-            double c = A.distanceSq(B);
+            pA = seg.a.getEastNorth();
+            pB = seg.b.getEastNorth();
+            double a = p.distanceSq(pB);
+            double b = p.distanceSq(pA);
+            double c = pA.distanceSq(pB);
             q = (a - b + c) / (2*c);
-            n.setEastNorth(new EastNorth(B.east() + q * (A.east() - B.east()), B.north() + q * (A.north() - B.north())));
+            n.setEastNorth(new EastNorth(pB.east() + q * (pA.east() - pB.east()), pB.north() + q * (pA.north() - pB.north())));
         }
     }