Changeset 3671 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java

Timestamp:

2010-11-25T09:45:38+01:00 (13 years ago)

Author:

bastiK

Message:

adapt coding style (to some degree); there shouldn't be any semantic changes in this commit

File:

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

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

@@ -27 +27 @@
 public class UnclosedWays extends Test {
     /** The already detected errors */
-    Bag<Way, Way> _errorWays;
+    protected Bag<Way, Way> errorWays;
 
     /**
@@ -39 +39 @@
     public void startTest(ProgressMonitor monitor) {
         super.startTest(monitor);
-        _errorWays = new Bag<Way, Way>();
+        errorWays = new Bag<Way, Way>();
     }
 
     @Override
     public void endTest() {
-        _errorWays = null;
+        errorWays = null;
         super.endTest();
     }
@@ -74 +74 @@
 
         test = w.get("natural");
-        if (test != null && !"coastline".equals(test) && !"cliff".equals(test))
+        if (test != null && !"coastline".equals(test) && !"cliff".equals(test)) {
             set(1101, marktr("natural type {0}"), test);
+        }
         test = w.get("landuse");
-        if (test != null)
+        if (test != null) {
             set(1102, marktr("landuse type {0}"), test);
+        }
         test = w.get("amenities");
-        if (test != null)
+        if (test != null) {
             set(1103, marktr("amenities type {0}"), test);
+        }
         test = w.get("sport");
-        if (test != null && !test.equals("water_slide"))
+        if (test != null && !test.equals("water_slide")) {
             set(1104, marktr("sport type {0}"), test);
+        }
         test = w.get("tourism");
-        if (test != null)
+        if (test != null) {
             set(1105, marktr("tourism type {0}"), test);
+        }
         test = w.get("shop");
-        if (test != null)
+        if (test != null) {
             set(1106, marktr("shop type {0}"), test);
+        }
         test = w.get("leisure");
-        if (test != null)
+        if (test != null) {
             set(1107, marktr("leisure type {0}"), test);
+        }
         test = w.get("waterway");
-        if (test != null && test.equals("riverbank"))
+        if (test != null && test.equals("riverbank")) {
             set(1108, marktr("waterway type {0}"), test);
+        }
         Boolean btest = OsmUtils.getOsmBoolean(w.get("building"));
-        if (btest != null && btest)
+        if (btest != null && btest) {
             set(1120, marktr("building"));
+        }
         btest = OsmUtils.getOsmBoolean(w.get("area"));
-        if (btest != null && btest)
+        if (btest != null && btest) {
             set(1130, marktr("area"));
+        }
 
         if (type != null && !w.isClosed()) {
@@ -123 +133 @@
             errors.add(new TestError(this, Severity.WARNING, tr("Unclosed way"),
                             type, etype, mode, primitives, highlight));
-            _errorWays.add(w, w);
+            errorWays.add(w, w);
         }
     }