Changeset 14828 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

Timestamp:

2019-03-03T10:52:10+01:00 (6 years ago)

Author:

GerdP

Message:

fix #17268: There should be a method to clear ignored errors

patch clear_ignored_errors_v32.patch by taylor.smock adapted to r14827

File:

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

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

@@ -65 +65 @@
 import org.openstreetmap.josm.tools.InputMapUtils;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
+import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.xml.sax.SAXException;
@@ -87 +88 @@
     /** The ignore button */
     private final SideButton ignoreButton;
+    /** The reset ignorelist button */
+    private final SideButton ignorelistManagement;
     /** The select button */
     private final SideButton selectButton;
@@ -160 +163 @@
             ignoreButton.setEnabled(false);
             buttons.add(ignoreButton);
+
+            ignorelistManagement = new SideButton(new AbstractAction() {
+                {
+                    putValue(NAME, tr("Manage Ignore"));
+                    putValue(SHORT_DESCRIPTION, tr("Manage the ignore list"));
+                    new ImageProvider("dialogs", "fix").getResource().attachImageIcon(this, true);
+                }
+
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    new ValidatorListManagementDialog("Ignore");
+                }
+            });
+            buttons.add(ignorelistManagement);
         } else {
             ignoreButton = null;
-        }
+            ignorelistManagement = null;
+        }
+
         createLayout(tree, true, buttons);
     }
@@ -169 +188 @@
      * The action to lookup the selection in the error tree.
      */
-     class LookupAction extends AbstractAction implements DataSelectionListener {
+    class LookupAction extends AbstractAction implements DataSelectionListener {
 
         LookupAction() {
@@ -274 +293 @@
             if (depth <= 1) {
                 if (!(mainNodeInfo instanceof TestError)) {
-                    Set<String> state = new HashSet<>();
+                    Set<Pair<String, String>> state = new HashSet<>();
                     // ask if the whole set should be ignored
                     if (asked == JOptionPane.DEFAULT_OPTION) {
@@ -286 +305 @@
                             err.setIgnored(true);
                             changed.set(true);
-                            state.add(depth == 1 ? err.getIgnoreSubGroup() : err.getIgnoreGroup());
+                            state.add(new Pair<>(node.getDepth() == 1 ? err.getIgnoreSubGroup() : err.getIgnoreGroup(), err.getMessage()));
                         }, processedNodes);
-                        for (String s : state) {
-                            OsmValidator.addIgnoredError(s);
+                        for (Pair<String, String> s : state) {
+                            OsmValidator.addIgnoredError(s.a, s.b);
                         }
                         continue;
@@ -300 +319 @@
                     String state = error.getIgnoreState();
                     if (state != null) {
-                        OsmValidator.addIgnoredError(state);
+                        OsmValidator.addIgnoredError(state, error.getMessage());
                     }
                     changed.set(true);
@@ -317 +336 @@
      * Sets the selection of the map to the current selected items.
      */
-    @SuppressWarnings("unchecked")
     private void setSelectedItems() {
         DataSet ds = MainApplication.getLayerManager().getActiveDataSet();