Changeset 1084 in josm for trunk/src/org/openstreetmap/josm/gui/MainMenu.java

Timestamp:

2008-11-18T19:53:53+01:00 (15 years ago)

Author:

framm

Message:

• cosmetics: rename ShortCut to Shortcut, and shortCut to shortcut

File:

• trunk/src/org/openstreetmap/josm/gui/MainMenu.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -61 +61 @@
 import org.openstreetmap.josm.actions.ToggleGPXLinesAction;
 import org.openstreetmap.josm.data.DataSetChecker;
-import org.openstreetmap.josm.tools.ShortCut;
+import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -142 +142 @@
          */
         public static void add(JMenu menu, JosmAction action) {
-                if (!action.getShortCut().getAutomatic()) {
+                if (!action.getShortcut().getAutomatic()) {
                         JMenuItem menuitem = menu.add(action);
-                        KeyStroke ks = action.getShortCut().getKeyStroke();
+                        KeyStroke ks = action.getShortcut().getKeyStroke();
                         if (ks != null) {
                                 menuitem.setAccelerator(ks);
@@ -157 +157 @@
          */
         public void add(JMenu menu, int mnemonicKey, String shortName) {
-                ShortCut.registerShortCut("menu:"+shortName, tr("Menu: {0}", menu.getText()), mnemonicKey, ShortCut.GROUP_MNEMONIC).setMnemonic(menu);
+                Shortcut.registerShortcut("menu:"+shortName, tr("Menu: {0}", menu.getText()), mnemonicKey, Shortcut.GROUP_MNEMONIC).setMnemonic(menu);
                 add(menu);
         }
@@ -204 +204 @@
                 final JCheckBoxMenuItem wireframe = new JCheckBoxMenuItem(tr("Wireframe view"));
                 wireframe.setSelected(Main.pref.getBoolean("draw.wireframe", false));
-                wireframe.setAccelerator(ShortCut.registerShortCut("menu:view:wireframe", "Toggle Wireframe view", KeyEvent.VK_W, ShortCut.GROUP_MENU).getKeyStroke());
+                wireframe.setAccelerator(Shortcut.registerShortcut("menu:view:wireframe", "Toggle Wireframe view", KeyEvent.VK_W, Shortcut.GROUP_MENU).getKeyStroke());
                 wireframe.addActionListener(new ActionListener() {
                         public void actionPerformed(ActionEvent ev) {
@@ -253 +253 @@
                 helpMenu.add(check);
                 current = helpMenu.add(help); // why is help not a JosmAction?
-                current.setAccelerator(ShortCut.registerShortCut("system:help", tr("Help"), KeyEvent.VK_F1, ShortCut.GROUP_DIRECT).getKeyStroke());
+                current.setAccelerator(Shortcut.registerShortcut("system:help", tr("Help"), KeyEvent.VK_F1, Shortcut.GROUP_DIRECT).getKeyStroke());
                 add(helpMenu, about);
                 add(helpMenu, historyinfo);