Changeset 18715 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

Timestamp:

2023-04-25T17:06:43+02:00 (3 years ago)

Author:

taylor.smock

Message:

Fix #22798: Convert dialog actions which extend AbstractAction to ones which extend JosmAction

This will allow users to bind shortcuts to actions they make frequently, such as
creating new relations.

File:

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

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

@@ -311 +311 @@
     }
 
-    protected class OnOffAction extends AbstractAction implements ListSelectionListener {
+    protected class OnOffAction extends JosmAction implements ListSelectionListener {
         /**
          * Constructs a new {@code OnOffAction}.
          */
         public OnOffAction() {
-            putValue(NAME, tr("On/Off"));
-            putValue(SHORT_DESCRIPTION, tr("Turn selected styles on or off"));
-            new ImageProvider("apply").getResource().attachImageIcon(this, true);
+            super(tr("On/Off"), "apply", tr("Turn selected styles on or off"),
+                    Shortcut.registerShortcut("map:paint:style:on_off", tr("Filter: Add"), KeyEvent.VK_UNDEFINED, Shortcut.NONE),
+                    false, false);
             updateEnabledState();
         }
 
+        @Override
         protected void updateEnabledState() {
             setEnabled(!cbWireframe.isSelected() && tblStyles.getSelectedRowCount() > 0);
@@ -342 +343 @@
      * The action to move down the currently selected entries in the list.
      */
-    protected class MoveUpDownAction extends AbstractAction implements ListSelectionListener {
+    protected class MoveUpDownAction extends JosmAction implements ListSelectionListener {
 
         private final int increment;
@@ -351 +352 @@
          */
         public MoveUpDownAction(boolean isDown) {
+            super(isDown ? tr("Down") : tr("Up"), "dialogs/" + (isDown ? "down" : "up"),
+                    isDown ? tr("Move the selected entry one row down.") : tr("Move the selected entry one row up."),
+                    isDown ? Shortcut.registerShortcut("map:paint:style:down", tr("Map Paint Styles: Move selected entry down"),
+                            KeyEvent.VK_UNDEFINED, Shortcut.NONE)
+                    : Shortcut.registerShortcut("map:paint:style:up", tr("Map Paint Styles: Move selected entry up"),
+                            KeyEvent.VK_UNDEFINED, Shortcut.NONE),
+                    false, false);
             increment = isDown ? 1 : -1;
-            putValue(NAME, isDown ? tr("Down") : tr("Up"));
-            new ImageProvider("dialogs", isDown ? "down" : "up").getResource().attachImageIcon(this, true);
-            putValue(SHORT_DESCRIPTION, isDown ? tr("Move the selected entry one row down.") : tr("Move the selected entry one row up."));
             updateEnabledState();
         }
 
+        @Override
         public void updateEnabledState() {
             int[] sel = tblStyles.getSelectedRows();