Changeset 14882 in josm

Timestamp:

2019-03-12T21:59:50+01:00 (5 years ago)

Author:

GerdP

Message:

code cleanup: move duplicated code to check ignore list and set ignored flag into new method in class TestError

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ValidateAction.java (modified) (1 diff)
• actions/upload/ValidateUploadHook.java (modified) (2 diffs)
• data/validation/TestError.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/ValidateAction.java

@@ -177 +177 @@
                 for (TestError error : errors) {
                     if (canceled) return;
-                    List<String> s = new ArrayList<>();
-                    s.add(error.getIgnoreState());
-                    s.add(error.getIgnoreGroup());
-                    s.add(error.getIgnoreSubGroup());
-                    for (String state : s) {
-                        if (state != null && OsmValidator.hasIgnoredError(state)) {
-                            error.setIgnored(true);
-                        }
-                    }
+                    error.updateIgnored();
                 }
             }

trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java

@@ -44 +44 @@
     /**
      * Validate the modified data before uploading
+     * @param apiDataSet contains primitives to be uploaded
+     * @return true if upload should continue, else false
      */
     @Override
@@ -77 +79 @@
 
         if (ValidatorPrefHelper.PREF_USE_IGNORE.get()) {
-            int nume = 0;
+            boolean allIgnored = true;
             for (TestError error : errors) {
-                List<String> s = new ArrayList<>();
-                s.add(error.getIgnoreState());
-                s.add(error.getIgnoreGroup());
-                s.add(error.getIgnoreSubGroup());
-                for (String state : s) {
-                    if (state != null && OsmValidator.hasIgnoredError(state)) {
-                        error.setIgnored(true);
-                    }
-                }
-                if (!error.isIgnored()) {
-                    ++nume;
+                if (!error.updateIgnored()) {
+                    allIgnored = false;
                 }
             }
-            if (nume == 0)
+            if (allIgnored)
                 return true;
         }

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

@@ -279 +279 @@
     public String getIgnoreState() {
         Collection<String> strings = new TreeSet<>();
-        StringBuilder ignorestring = new StringBuilder(getIgnoreSubGroup());
         for (OsmPrimitive o : primitives) {
             // ignore data not yet uploaded
@@ -294 +293 @@
             strings.add(type + '_' + o.getId());
         }
+        StringBuilder ignorestring = new StringBuilder(getIgnoreSubGroup());
         for (String o : strings) {
             ignorestring.append(':').append(o);
         }
         return ignorestring.toString();
+    }
+
+    /**
+     * Check if this error matches an entry in the ignore list and
+     * set the ignored flag if it is.
+     * @return the new ignored state
+     */
+    public boolean updateIgnored() {
+        setIgnored(calcIgnored());
+        return isIgnored();
+    }
+
+    private boolean calcIgnored() {
+        String state = getIgnoreGroup();
+        if (state != null && OsmValidator.hasIgnoredError(state))
+            return true;
+        state = getIgnoreSubGroup();
+        if (state != null && OsmValidator.hasIgnoredError(state))
+            return true;
+        state = getIgnoreState();
+        return state != null && OsmValidator.hasIgnoredError(state);
     }