Changeset 14858 in josm

Timestamp:

2019-03-09T16:12:40+01:00 (6 years ago)

Author:

GerdP

Message:

see #17345: disable ignore button only when the top level (severity) entry is selected
This partly reverts r14825 as it also caused problems with other tests which create different description texts depending on the object(s).

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (modified) (3 diffs)

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

@@ -50 +50 @@
 import org.openstreetmap.josm.data.preferences.sources.ValidatorPrefHelper;
 import org.openstreetmap.josm.data.validation.OsmValidator;
+import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.data.validation.ValidatorVisitor;
@@ -298 +299 @@
             Object mainNodeInfo = node.getUserObject();
             final int depth = node.getDepth();
-            if (depth <= 1) {
-                if (!(mainNodeInfo instanceof TestError)) {
-                    Set<Pair<String, String>> state = new HashSet<>();
-                    // ask if the whole set should be ignored
-                    if (asked == JOptionPane.DEFAULT_OPTION) {
-                        String[] a = new String[] {tr("Whole group"), tr("Single elements"), tr("Nothing")};
-                        asked = JOptionPane.showOptionDialog(MainApplication.getMainFrame(), tr("Ignore whole group or individual elements?"),
-                                tr("Ignoring elements"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, null,
-                                a, a[1]);
+            if (!(mainNodeInfo instanceof TestError)) {
+                Set<Pair<String, String>> state = new HashSet<>();
+                // ask if the whole set should be ignored
+                if (asked == JOptionPane.DEFAULT_OPTION) {
+                    String[] a = new String[] {tr("Whole group"), tr("Single elements"), tr("Nothing")};
+                    asked = JOptionPane.showOptionDialog(MainApplication.getMainFrame(), tr("Ignore whole group or individual elements?"),
+                            tr("Ignoring elements"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, null,
+                            a, a[1]);
+                }
+                if (asked == JOptionPane.YES_NO_OPTION) {
+                    ValidatorTreePanel.visitTestErrors(node, err -> {
+                        err.setIgnored(true);
+                        changed.set(true);
+                        state.add(new Pair<>(depth == 1 ? err.getIgnoreSubGroup() : err.getIgnoreGroup(), err.getMessage()));
+                    }, processedNodes);
+                    for (Pair<String, String> s : state) {
+                        OsmValidator.addIgnoredError(s.a, s.b);
                     }
-                    if (asked == JOptionPane.YES_NO_OPTION) {
-                        ValidatorTreePanel.visitTestErrors(node, err -> {
-                            err.setIgnored(true);
-                            changed.set(true);
-                            state.add(new Pair<>(node.getDepth() == 1 ? err.getIgnoreSubGroup() : err.getIgnoreGroup(), err.getMessage()));
-                        }, processedNodes);
-                        for (Pair<String, String> s : state) {
-                            OsmValidator.addIgnoredError(s.a, s.b);
-                        }
-                        continue;
-                    } else if (asked == JOptionPane.CANCEL_OPTION || asked == JOptionPane.CLOSED_OPTION) {
-                        continue;
-                    }
-                }
-
-                ValidatorTreePanel.visitTestErrors(node, error -> {
-                    String state = error.getIgnoreState();
-                    if (state != null) {
-                        OsmValidator.addIgnoredError(state, error.getMessage());
-                    }
-                    changed.set(true);
-                    error.setIgnored(true);
-                }, processedNodes);
-            }
+                    continue;
+                } else if (asked == JOptionPane.CANCEL_OPTION || asked == JOptionPane.CLOSED_OPTION) {
+                    continue;
+                }
+            }
+
+            ValidatorTreePanel.visitTestErrors(node, error -> {
+                String state = error.getIgnoreState();
+                if (state != null) {
+                    OsmValidator.addIgnoredError(state, error.getMessage());
+                }
+                changed.set(true);
+                error.setIgnored(true);
+            }, processedNodes);
         }
         if (changed.get()) {
@@ -402 +401 @@
             selectAction.setEnabled(true);
             if (ignoreAction != null) {
-                ignoreAction.setEnabled(node.getDepth() <= 1);
+                ignoreAction.setEnabled(!(node.getUserObject() instanceof Severity));
             }
         }