Changeset 14913 in josm for trunk/src

Timestamp:

2019-03-21T10:33:59+01:00 (6 years ago)

Author:

GerdP

Message:

fix findbugs: remove redundant null checks

File:

• trunk/src/org/openstreetmap/josm/data/validation/TestError.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/TestError.java

@@ -275 +275 @@
     /**
      * Returns the ignore state for this error.
-     * @return the ignore state for this error
+     * @return the ignore state for this error or null if any primitive is new
      */
     public String getIgnoreState() {
@@ -311 +311 @@
 
     private boolean calcIgnored() {
-        String state = getIgnoreGroup();
-        if (state != null && OsmValidator.hasIgnoredError(state))
+        if (OsmValidator.hasIgnoredError(getIgnoreGroup()))
             return true;
-        state = getIgnoreSubGroup();
-        if (state != null && OsmValidator.hasIgnoredError(state))
+        if (OsmValidator.hasIgnoredError(getIgnoreSubGroup()))
             return true;
-        state = getIgnoreState();
+        String state = getIgnoreState();
         return state != null && OsmValidator.hasIgnoredError(state);
     }