Ticket #19053: 19053.5.patch

src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -234 +234 @@
             } catch (SecurityException e) {
                 Logging.log(Logging.LEVEL_ERROR, "Unable to load ignored errors", e);
             }
-            // see #19053: remove invalid entry
-            ignoredErrors.remove("3000");
+            // see #19053:
+            String legacyEntry = ignoredErrors.remove("3000");
+            if (legacyEntry != null) {
+                if (!legacyEntry.isEmpty()) {
+                    addIgnoredError("3000_" + legacyEntry, legacyEntry);
+                }
+                saveIgnoredErrors();
+            }
+
         }
     }
 

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

@@ -338 +338 @@
      * @return The ignore sub group
      */
     public String getIgnoreSubGroup() {
+        if (code == 3000) {
+            // see #19053
+            return "3000_" + (description == null ? descriptionEn : description);
+        }
         String ignorestring = getIgnoreGroup();
         if (descriptionEn != null) {
             ignorestring += '_' + descriptionEn;
@@ -351 +355 @@
      * @see TestError#getIgnoreSubGroup()
      */
     public String getIgnoreGroup() {
+        if (code == 3000) {
+            // see #19053
+            return "3000_" + getMessage();
+        }
         return Integer.toString(code);
     }
 
@@ -524 +532 @@
     public String toString() {
         return "TestError [tester=" + tester + ", code=" + code + ", message=" + message + ']';
     }
+
 }

src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

@@ -410 +410 @@
 
         lastSelectedNode = node;
         if (node != null) {
-            final Set<String> codes = new HashSet<>();
             ValidatorTreePanel.visitTestErrors(node, error -> {
-                codes.add(error.getIgnoreSubGroup()); // see #19053
                 error.setSelected(true);
 
                 hasFixes.set(hasFixes.get() || error.isFixable());
@@ -424 +422 @@
             });
             selectAction.setEnabled(true);
             if (ignoreAction != null) {
-                ignoreAction.setEnabled(!(node.getUserObject() instanceof Severity) && codes.size() <= 1);
+                ignoreAction.setEnabled(!(node.getUserObject() instanceof Severity));
             }
         }