Changeset 4869 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/BuildingInBuilding.java

Timestamp:

2012-01-24T21:52:43+01:00 (12 years ago)

Author:

jttt

Message:

Use final were appropriate

File:

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

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

@@ -24 +24 @@
 public class BuildingInBuilding extends Test {
 
-    protected static int BUILDING_INSIDE_BUILDING = 2001;
+    protected static final int BUILDING_INSIDE_BUILDING = 2001;
     protected List<OsmPrimitive> primitivesToCheck = new LinkedList<OsmPrimitive>();
     protected QuadBuckets<Way> index = new QuadBuckets<Way>();
@@ -57 +57 @@
         // Check that all nodes of w are in polygon
         for (Node n : w.getNodes()) {
-            if (!isInPolygon(n, polygon)) {
+            if (!isInPolygon(n, polygon))
                 return false;
-            }
         }
         // All nodes can be inside polygon and still, w outside:
@@ -73 +72 @@
         for (int i=1; i<w.getNodesCount(); i++) {
             LatLon center = w.getNode(i).getCoor().getCenter(w.getNode(i-1).getCoor());
-            if (center != null && !isInPolygon(new Node(center), polygon)) {
+            if (center != null && !isInPolygon(new Node(center), polygon))
                 return false;
-            }
         }
         return true;
@@ -86 +84 @@
                 @Override
                 public boolean evaluate(Way object) {
-                    if (p.equals(object)) {
+                    if (p.equals(object))
                         return false;
-                    } else if (p instanceof Node) {
+                    else if (p instanceof Node)
                         return isInPolygon((Node) p, object.getNodes()) || object.getNodes().contains(p);
-                    } else if (p instanceof Way) {
+                    else if (p instanceof Way)
                         return isInPolygon((Way) p, object.getNodes()) && !isInInnerWay((Way)p, object);
-                    } else {
+                    else
                         return false;
-                    }
                 }
             });
@@ -103 +100 @@
         }
     }
-    
+
     private boolean isInInnerWay(Way w, Way outer) {
         for (OsmPrimitive r : outer.getReferrers()) {
@@ -113 +110 @@
                         if (isInPolygon(inner, outer.getNodes())) {
                             // If the tested way is inside this inner, outer is a false positive
-                            if (isInPolygon(w, inner.getNodes())) {
+                            if (isInPolygon(w, inner.getNodes()))
                                 return true;
-                            }
                         }
                     }