Changeset 4518 in josm

Timestamp:

Oct 15, 2011 6:21:54 PM (20 months ago)

Author:

simon04

Message:

fix #5781 - display mnemonics of {add,edit,delete} of properties dialog

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -65 +65 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
@@ -1016 +1017 @@
     }
 
-    class DeleteAction extends AbstractAction implements ListSelectionListener {
+    class DeleteAction extends JosmAction implements ListSelectionListener {
+
+        public DeleteAction() {
+            super(tr("Delete"), "dialogs/delete", tr("Delete the selected key in all objects"),
+                    Shortcut.registerShortcut("properties:delete", tr("Delete Properties"), KeyEvent.VK_D,
+                    Shortcut.GROUP_MNEMONIC), false);
+            updateEnabledState();
+        }
 
         protected void deleteProperty(int row){
@@ -1069 +1077 @@
         }
 
-        public DeleteAction() {
-            putValue(NAME, tr("Delete"));
-            putValue(SHORT_DESCRIPTION, tr("Delete the selected key in all objects"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
-            Shortcut s = Shortcut.registerShortcut("properties:delete", tr("Delete Properties"), KeyEvent.VK_D,
-                    Shortcut.GROUP_MNEMONIC);
-            putValue(MNEMONIC_KEY, (int) KeyEvent.getKeyText(s.getAssignedKey()).charAt(0));
-            updateEnabledState();
-        }
-
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (propertyTable.getSelectedRowCount() >0 ) {
@@ -1089 +1088 @@
         }
 
+        @Override
         protected void updateEnabledState() {
             setEnabled(
@@ -1096 +1096 @@
         }
 
+        @Override
         public void valueChanged(ListSelectionEvent e) {
             updateEnabledState();
@@ -1101 +1102 @@
     }
 
-    class AddAction extends AbstractAction {
+    class AddAction extends JosmAction {
         public AddAction() {
-            putValue(NAME, tr("Add"));
-            putValue(SHORT_DESCRIPTION, tr("Add a new key/value pair to all objects"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs", "add"));
-            Shortcut s = Shortcut.registerShortcut("properties:add", tr("Add Property"), KeyEvent.VK_A,
-                    Shortcut.GROUP_MNEMONIC);
-            putValue(MNEMONIC_KEY, (int) KeyEvent.getKeyText(s.getAssignedKey()).charAt(0));
-        }
-
+            super(tr("Add"), "dialogs/add", tr("Add a new key/value pair to all objects"),
+                    Shortcut.registerShortcut("properties:add", tr("Add Property"), KeyEvent.VK_A,
+                    Shortcut.GROUP_MNEMONIC), false);
+        }
+
+        @Override
         public void actionPerformed(ActionEvent e) {
             add();
@@ -1116 +1115 @@
     }
 
-    class EditAction extends AbstractAction implements ListSelectionListener {
+    class EditAction extends JosmAction implements ListSelectionListener {
         public EditAction() {
-            putValue(NAME, tr("Edit"));
-            putValue(SHORT_DESCRIPTION, tr("Edit the value of the selected key for all objects"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit"));
-            Shortcut s = Shortcut.registerShortcut("properties:edit", tr("Edit Properties"), KeyEvent.VK_S,
-                    Shortcut.GROUP_MNEMONIC);
-            putValue(MNEMONIC_KEY, (int) KeyEvent.getKeyText(s.getAssignedKey()).charAt(0));
+            super(tr("Edit"), "dialogs/edit", tr("Edit the value of the selected key for all objects"),
+                    Shortcut.registerShortcut("properties:edit", tr("Edit Properties"), KeyEvent.VK_S,
+                    Shortcut.GROUP_MNEMONIC), false);
             updateEnabledState();
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (!isEnabled())
@@ -1139 +1136 @@
         }
 
+        @Override
         protected void updateEnabledState() {
             setEnabled(
@@ -1146 +1144 @@
         }
 
+        @Override
         public void valueChanged(ListSelectionEvent e) {
             updateEnabledState();