Changeset 11942 in josm for trunk

Timestamp:

2017-04-17T04:58:33+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - fb-contrib:PME_POOR_MANS_ENUM - Style - Simple field is used like an enum

File:

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

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

@@ -707 +707 @@
         protected List<CheckerElement> data = new ArrayList<>();
         private OsmPrimitiveType type;
-        private int code;
+        private TagCheckLevel level;
         protected Severity severity;
-        // CHECKSTYLE.OFF: SingleSpaceSeparator
-        protected static final int TAG_CHECK_ERROR = 1250;
-        protected static final int TAG_CHECK_WARN  = 1260;
-        protected static final int TAG_CHECK_INFO  = 1270;
-        // CHECKSTYLE.ON: SingleSpaceSeparator
+
+        private enum TagCheckLevel {
+            TAG_CHECK_ERROR(1250),
+            TAG_CHECK_WARN(1260),
+            TAG_CHECK_INFO(1270);
+
+            final int code;
+
+            TagCheckLevel(int code) {
+                this.code = code;
+            }
+        }
 
         protected static class CheckerElement {
@@ -809 +816 @@
             case "W":
                 severity = Severity.WARNING;
-                code = TAG_CHECK_WARN;
+                level = TagCheckLevel.TAG_CHECK_WARN;
                 break;
             case "E":
                 severity = Severity.ERROR;
-                code = TAG_CHECK_ERROR;
+                level = TagCheckLevel.TAG_CHECK_ERROR;
                 break;
             case "I":
                 severity = Severity.OTHER;
-                code = TAG_CHECK_INFO;
+                level = TagCheckLevel.TAG_CHECK_INFO;
                 break;
             default:
@@ -847 +854 @@
         }
 
+        /**
+         * Returns the error description.
+         * @return the error description
+         */
         public String getDescription() {
             return description;
         }
 
+        /**
+         * Returns the error severity.
+         * @return the error severity
+         */
         public Severity getSeverity() {
             return severity;
         }
 
+        /**
+         * Returns the error code.
+         * @return the error code
+         */
         public int getCode() {
             if (type == null)
-                return code;
-
-            return code + type.ordinal() + 1;
+                return level.code;
+
+            return level.code + type.ordinal() + 1;
         }
     }