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

Timestamp:

2016-08-07T14:46:57+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - various fixes

File:

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

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

@@ -38 +38 @@
      * @since 6390
      */
-    private class UnclosedWaysCheck {
+    private static class UnclosedWaysCheck {
         /** The unique numeric code for this check */
         public final int code;
@@ -90 +90 @@
          * Returns the test error of the given way, if any.
          * @param w The way to check
+         * @param test parent test
          * @return The test error if the way is erroneous, {@code null} otherwise
          */
-        public final TestError getTestError(Way w) {
+        public final TestError getTestError(Way w, UnclosedWays test) {
             String value = w.get(key);
             if (isValueErroneous(value)) {
@@ -99 +100 @@
                 String etype = engMessage.contains("{0}") ? MessageFormat.format(engMessage, value) : engMessage;
                 // CHECKSTYLE.ON: SingleSpaceSeparator
-                return new TestError(UnclosedWays.this, Severity.WARNING, tr("Unclosed way"),
+                return new TestError(test, Severity.WARNING, tr("Unclosed way"),
                         type, etype, code, Arrays.asList(w),
                         // The important parts of an unclosed way are the first and
@@ -117 +118 @@
      * @since 6390
      */
-    private final class UnclosedWaysBooleanCheck extends UnclosedWaysCheck {
+    private static final class UnclosedWaysBooleanCheck extends UnclosedWaysCheck {
 
         /**
@@ -137 +138 @@
     }
 
-    private final UnclosedWaysCheck[] checks = {
+    private static final UnclosedWaysCheck[] checks = {
         // CHECKSTYLE.OFF: SingleSpaceSeparator
         new UnclosedWaysCheck(1101, "natural",   marktr("natural type {0}"),
@@ -183 +184 @@
 
         for (UnclosedWaysCheck c : checks) {
-            TestError error = c.getTestError(w);
+            TestError error = c.getTestError(w, this);
             if (error != null) {
                 errors.add(error);