Changeset 14912 in josm for trunk/src/org/openstreetmap

Timestamp:

2019-03-21T08:58:02+01:00 (6 years ago)

Author:

GerdP

Message:

see #17469: add shortcut Shift+Minus for "Ignore for now" action

File:

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

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

@@ -31 +31 @@
 import org.openstreetmap.josm.actions.AbstractSelectAction;
 import org.openstreetmap.josm.actions.AutoScaleAction;
+import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.actions.ValidateAction;
 import org.openstreetmap.josm.actions.relation.EditRelationAction;
@@ -86 +87 @@
 
     /** The display tree */
-    public ValidatorTreePanel tree;
+    public final ValidatorTreePanel tree;
 
     /** The validate action */
@@ -117 +118 @@
                         KeyEvent.VK_V, Shortcut.ALT_SHIFT), 150, false, ValidatorPreference.class);
 
-        Action removeProblemAction = new AbstractAction() {
-            {
-                putValue(NAME, tr("Ignore for now"));
-                putValue(SHORT_DESCRIPTION, tr("Ignore and remove from tree."));
-                new ImageProvider("dialogs", "delete").getResource().attachImageIcon(this, true);
-            }
-
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                TestError error = getSelectedError();
-                error.setIgnored(true);
-                tree.resetErrors();
-            }
-        };
-
-        popupMenuHandler.addAction(MainApplication.getMenu().autoScaleActions.get("problem"));
-        popupMenuHandler.addAction(new EditRelationAction());
-        popupMenuHandler.addAction(removeProblemAction);
-
         tree = new ValidatorTreePanel();
         tree.addMouseListener(new MouseEventHandler());
         addTreeSelectionListener(new SelectionWatch());
         InputMapUtils.unassignCtrlShiftUpDown(tree, JComponent.WHEN_FOCUSED);
+
+        JosmAction ignoreForNowAction = new JosmAction(tr("Ignore for now"), "dialogs/delete",
+                tr("Ignore and remove from tree."), Shortcut.registerShortcut("tools:validate:ignore-for-now",
+                        tr("Ignore and remove from tree."), KeyEvent.VK_MINUS, Shortcut.SHIFT),
+                false, false) {
+
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                TestError error = getSelectedError();
+                if (error != null) {
+                    error.setIgnored(true);
+                    tree.resetErrors();
+                    invalidateValidatorLayers();
+                }
+            }
+        };
+
+        popupMenuHandler.addAction(MainApplication.getMenu().autoScaleActions.get("problem"));
+        popupMenuHandler.addAction(new EditRelationAction());
+        popupMenuHandler.addAction(ignoreForNowAction);
 
         List<SideButton> buttons = new LinkedList<>();