Changeset 8346 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java

Timestamp:

2015-05-11T13:34:53+02:00 (11 years ago)

Author:

Don-vip

Message:

squid:S00116 - Field names should comply with a naming convention

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java

@@ -137 +137 @@
     private Set<MyWaySegment> ways;
     private QuadBuckets<Node> endnodes; // nodes at end of way
-    private QuadBuckets<Node> endnodes_highway; // nodes at end of way
+    private QuadBuckets<Node> endnodesHighway; // nodes at end of way
     private QuadBuckets<Node> middlenodes; // nodes in middle of way
     private Set<Node> othernodes; // nodes appearing at least twice
@@ -159 +159 @@
         ways = new HashSet<>();
         endnodes = new QuadBuckets<>();
-        endnodes_highway = new QuadBuckets<>();
+        endnodesHighway = new QuadBuckets<>();
         middlenodes = new QuadBuckets<>();
         othernodes = new HashSet<>();
@@ -176 +176 @@
                 }
                 for (Node en : s.nearbyNodes(mindist)) {
-                    if (en == null || !s.highway || !endnodes_highway.contains(en)) {
+                    if (en == null || !s.highway || !endnodesHighway.contains(en)) {
                         continue;
                     }
@@ -209 +209 @@
                     continue;
                 }
-                if (endnodes_highway.contains(en) && !s.highway && !s.w.concernsArea()) {
+                if (endnodesHighway.contains(en) && !s.highway && !s.w.concernsArea()) {
                     map.put(en, s.w);
                 } else if (endnodes.contains(en) && !s.w.concernsArea()) {
@@ -278 +278 @@
         ways = null;
         endnodes = null;
-        endnodes_highway = null;
+        endnodesHighway = null;
         middlenodes = null;
         othernodes = null;
@@ -389 +389 @@
             nearbyNodeCache = null;
             List<LatLon> bounds = this.getBounds(dist);
-            List<Node> found_nodes = endnodes_highway.search(new BBox(bounds.get(0), bounds.get(1)));
+            List<Node> found_nodes = endnodesHighway.search(new BBox(bounds.get(0), bounds.get(1)));
             found_nodes.addAll(endnodes.search(new BBox(bounds.get(0), bounds.get(1))));
 
@@ -448 +448 @@
             QuadBuckets<Node> set = endnodes;
             if (w.hasKey("highway") || w.hasKey("railway")) {
-                set = endnodes_highway;
+                set = endnodesHighway;
             }
             addNode(w.firstNode(), set);
@@ -458 +458 @@
         boolean m = middlenodes.contains(n);
         boolean e = endnodes.contains(n);
-        boolean eh = endnodes_highway.contains(n);
+        boolean eh = endnodesHighway.contains(n);
         boolean o = othernodes.contains(n);
         if (!m && !e && !o && !eh) {
@@ -467 +467 @@
                 endnodes.remove(n);
             } else if (eh) {
-                endnodes_highway.remove(n);
+                endnodesHighway.remove(n);
             } else {
                 middlenodes.remove(n);