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

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -553 +553 @@
         LatLon ll2 = getLatLon(width / 2 + 50, height / 2);
         if (ll1.isValid() && ll2.isValid() && b.contains(ll1) && b.contains(ll2)) {
-            double d_m = ll1.greatCircleDistance(ll2);
-            double d_en = 100 * scale;
-            double scaleMin = 0.01 * d_en / d_m / 100;
+            double dm = ll1.greatCircleDistance(ll2);
+            double den = 100 * scale;
+            double scaleMin = 0.01 * den / dm / 100;
             if (!Double.isInfinite(scaleMin) && newScale < scaleMin) {
                 newScale = scaleMin;
@@ -1026 +1026 @@
                     }
 
-                    Point2D A = getPoint2D(lastN);
-                    Point2D B = getPoint2D(n);
-                    double c = A.distanceSq(B);
-                    double a = p.distanceSq(B);
-                    double b = p.distanceSq(A);
+                    Point2D pA = getPoint2D(lastN);
+                    Point2D pB = getPoint2D(n);
+                    double c = pA.distanceSq(pB);
+                    double a = p.distanceSq(pB);
+                    double b = p.distanceSq(pA);
 
                     /* perpendicular distance squared
@@ -1142 +1142 @@
      * @param p the point for which to search the nearest segment.
      * @param predicate the returned object has to fulfill certain properties.
-     * @param use_selected whether selected way segments should be preferred.
+     * @param useSelected whether selected way segments should be preferred.
      * @param preferredRefs - prefer segments related to these primitives, may be null
      *
@@ -1153 +1153 @@
      */
     public final WaySegment getNearestWaySegment(Point p, Predicate<OsmPrimitive> predicate,
-            boolean use_selected,  Collection<OsmPrimitive> preferredRefs) {
+            boolean useSelected,  Collection<OsmPrimitive> preferredRefs) {
         WaySegment wayseg = null, ntsel = null, ntref = null;
         if (preferredRefs != null && preferredRefs.isEmpty()) preferredRefs = null;
@@ -1185 +1185 @@
             }
         }
-        if (ntsel != null && use_selected)
+        if (ntsel != null && useSelected)
             return ntsel;
         if (ntref != null)
@@ -1352 +1352 @@
      * @param p The point on screen.
      * @param predicate the returned object has to fulfill certain properties.
-     * @param use_selected whether to prefer primitives that are currently selected or referred by selected primitives
+     * @param useSelected whether to prefer primitives that are currently selected or referred by selected primitives
      *
      * @return A primitive within snap-distance to point p,
@@ -1359 +1359 @@
      * @see #getNearestWay(Point, Predicate)
      */
-    public final OsmPrimitive getNearestNodeOrWay(Point p, Predicate<OsmPrimitive> predicate, boolean use_selected) {
+    public final OsmPrimitive getNearestNodeOrWay(Point p, Predicate<OsmPrimitive> predicate, boolean useSelected) {
         Collection<OsmPrimitive> sel;
         DataSet ds = getCurrentDataSet();
-        if (use_selected && ds != null) {
+        if (useSelected && ds != null) {
             sel = ds.getSelected();
         } else {
             sel = null;
         }
-        OsmPrimitive osm = getNearestNode(p, predicate, use_selected, sel);
-
-        if (isPrecedenceNode((Node) osm, p, use_selected)) return osm;
+        OsmPrimitive osm = getNearestNode(p, predicate, useSelected, sel);
+
+        if (isPrecedenceNode((Node) osm, p, useSelected)) return osm;
         WaySegment ws;
-        if (use_selected) {
-            ws = getNearestWaySegment(p, predicate, use_selected, sel);
+        if (useSelected) {
+            ws = getNearestWaySegment(p, predicate, useSelected, sel);
         } else {
-            ws = getNearestWaySegment(p, predicate, use_selected);
+            ws = getNearestWaySegment(p, predicate, useSelected);
         }
         if (ws == null) return osm;
 
-        if ((ws.way.isSelected() && use_selected) || osm == null) {
+        if ((ws.way.isSelected() && useSelected) || osm == null) {
             // either (no _selected_ nearest node found, if desired) or no nearest node was found
             osm = ws.way;