Changeset 14825 in josm for trunk

Timestamp:

2019-03-03T10:19:49+01:00 (6 years ago)

Author:

GerdP

Message:

fix #17345: ValidatorDialog: Ignore button should be disabled sometimes

File:

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

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

@@ -245 +245 @@
 
             Object mainNodeInfo = node.getUserObject();
-            if (!(mainNodeInfo instanceof TestError)) {
-                Set<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(node.getDepth() == 1 ? err.getIgnoreSubGroup() : err.getIgnoreGroup());
-                    }, processedNodes);
-                    for (String s : state) {
-                        OsmValidator.addIgnoredError(s);
+            final int depth = node.getDepth();
+            if (depth <= 1) {
+                if (!(mainNodeInfo instanceof TestError)) {
+                    Set<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]);
                     }
-                    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);
-                }
-                changed.set(true);
-                error.setIgnored(true);
-            }, processedNodes);
+                    if (asked == JOptionPane.YES_NO_OPTION) {
+                        ValidatorTreePanel.visitTestErrors(node, err -> {
+                            err.setIgnored(true);
+                            changed.set(true);
+                            state.add(depth == 1 ? err.getIgnoreSubGroup() : err.getIgnoreGroup());
+                        }, processedNodes);
+                        for (String s : state) {
+                            OsmValidator.addIgnoredError(s);
+                        }
+                        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);
+                    }
+                    changed.set(true);
+                    error.setIgnored(true);
+                }, processedNodes);
+            }
         }
         if (changed.get()) {
@@ -348 +351 @@
             selectButton.setEnabled(true);
             if (ignoreButton != null) {
-                ignoreButton.setEnabled(true);
+                ignoreButton.setEnabled(node.getDepth() <= 1);
             }
         }