Ticket #17268: clear_ignored_errors_v4.patch

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

@@ -6 +6 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
+import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Enumeration;
@@ -63 +66 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.InputMapUtils;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.xml.sax.SAXException;
 
@@ -85 +89 @@
     private final SideButton fixButton;
     /** The ignore button */
     private final SideButton ignoreButton;
+    /** The reset ignorelist button */
+    private final SideButton resetignorelistButton;
     /** The select button */
     private final SideButton selectButton;
     /** The lookup button */
@@ -177 +183 @@
         } else {
             ignoreButton = null;
         }
+
+        resetignorelistButton = new SideButton(new AbstractAction() {
+            int reset = 0;
+            {
+                toggle();
+            }
+
+            public void toggle() {
+                if (OsmValidator.getIgnoredErrors().size() > 0) {
+                    putValue(NAME, tr("Clear Ignore"));
+                    putValue(SHORT_DESCRIPTION, tr("Clear ignore list"));
+                    new ImageProvider("dialogs", "fix").getResource().attachImageIcon(this, true);
+                    reset = 1;
+                    this.setEnabled(true);
+                } else {
+                    File ignoredErrors = new File(OsmValidator.getValidatorDir());
+                    ignoredErrors = new File(ignoredErrors.getAbsolutePath() + File.separator + "ignorederrors.bak");
+                    if (ignoredErrors.isFile()) {
+                        putValue(NAME, tr("Restore Ignore"));
+                        putValue(SHORT_DESCRIPTION, tr("Restore ignore list"));
+                        new ImageProvider("copy").getResource().attachImageIcon(this, true);
+                        reset = 2;
+                        this.setEnabled(true);
+                    } else if (OsmValidator.getIgnoredErrors().size() > 0) {
+                        putValue(NAME, tr("Save Ignore"));
+                        putValue(SHORT_DESCRIPTION, tr("Save ignore list"));
+                        new ImageProvider("save").getResource().attachImageIcon(this, true);
+                        reset = 3;
+                        this.setEnabled(true);
+                    } else {
+                        putValue(NAME, tr("Ignore list modification"));
+                        putValue(SHORT_DESCRIPTION, tr("Clear/Restore/Save the ignore list, depending upon various conditions"));
+                        new ImageProvider("dialogs", "validator").getResource().attachImageIcon(this, true);
+                    }
+                }
+            }
+
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                if (reset == 1) {
+                    resetErrorList();
+                } else if (reset == 2) {
+                    restoreErrorList();
+                } else if (reset == 3 && OsmValidator.getIgnoredErrors().size() > 0) {
+                    OsmValidator.saveIgnoredErrors();
+                } else if (reset == 0) {
+                    // Do nothing
+                }
+                toggle();
+            }
+        });
+        buttons.add(resetignorelistButton);
         createLayout(tree, true, buttons);
     }
 
@@ -285 +343 @@
     }
 
     /**
+     * Reset the error list by deleting ignorederrors
+     */
+    public void resetErrorList() {
+        OsmValidator.saveIgnoredErrors();
+        File ignoredErrors = new File(OsmValidator.getValidatorDir(), "ignorederrors");
+        if (!ignoredErrors.isFile()) return;
+        File ignoredErrorsBak = new File(ignoredErrors.getAbsolutePath() + ".bak");
+        try {
+            Files.move(ignoredErrors.toPath(), ignoredErrorsBak.toPath(), StandardCopyOption.REPLACE_EXISTING);
+        } catch (IOException e) {
+            ignoredErrors.delete();
+        }
+        OsmValidator.initialize();
+        tree.resetErrors();
+    }
+
+    /**
+     * Restore the error list by copying ignorederrors.bak to ignorederrors
+     */
+    public void restoreErrorList() {
+        OsmValidator.saveIgnoredErrors();
+        File ignoredErrors = new File(OsmValidator.getValidatorDir(), "ignorederrors");
+        File ignoredErrorsBak = new File(ignoredErrors.getAbsolutePath() + ".bak");
+        if (!ignoredErrors.isFile() || !ignoredErrorsBak.isFile()) return;
+        File ignoredErrorsBak2 = new File(ignoredErrorsBak.getAbsolutePath() + "2");
+        try {
+            Files.move(ignoredErrors.toPath(),
+                    ignoredErrorsBak2.toPath(),
+                    StandardCopyOption.REPLACE_EXISTING);
+            if (ignoredErrorsBak.isFile()) {
+                Files.move(ignoredErrorsBak.toPath(),
+                        ignoredErrors.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            }
+            Files.move(ignoredErrorsBak2.toPath(),
+                    ignoredErrorsBak.toPath(), StandardCopyOption.REPLACE_EXISTING);
+        } catch (IOException e) {
+            Logging.debug(e);
+        }
+        OsmValidator.initialize();
+        tree.resetErrors();
+    }
+
+    /**
      * Sets the selection of the map to the current selected items.
      */
     @SuppressWarnings("unchecked")

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

@@ -241 +241 @@
     }
 
     /**
+     * Get the list of all ignored errors
+     * @return The <code>Collection&ltString&gt</code> of errors that are ignored
+     */
+    public static Collection<String> getIgnoredErrors() {
+        return ignoredErrors;
+    }
+
+    /**
      * Saves the names of the ignored errors to a file
      */
     public static void saveIgnoredErrors() {