Changeset 1084 in josm for trunk/src/org/openstreetmap/josm/actions/JosmAction.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/actions/JosmAction.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/actions/JosmAction.java

@@ -12 +12 @@
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.ShortCut;
+import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -26 +26 @@
 
         @Deprecated
-        public KeyStroke shortCut;
-        protected ShortCut sc;
+        public KeyStroke shortcut;
+        protected Shortcut sc;
 
-        public ShortCut getShortCut() {
+        public Shortcut getShortcut() {
                 if (sc == null) {
-                        sc = ShortCut.registerShortCut("core:none", "No Shortcut", 0, ShortCut.GROUP_NONE);
+                        sc = Shortcut.registerShortcut("core:none", "No Shortcut", 0, Shortcut.GROUP_NONE);
                         sc.setAutomatic(); // as this shortcut is shared by all action that don't want to have a shortcut,
                                            // we shouldn't allow the user to change it...
@@ -39 +39 @@
 
         @Deprecated
-        public JosmAction(String name, String iconName, String tooltip, int shortCut, int modifier, boolean register) {
+        public JosmAction(String name, String iconName, String tooltip, int shortcut, int modifier, boolean register) {
                 super(name, iconName == null ? null : ImageProvider.get(iconName));
                 setHelpId();
-                if (shortCut != 0) {
-                        int group = ShortCut.GROUP_LAYER; //GROUP_NONE;
+                if (shortcut != 0) {
+                        int group = Shortcut.GROUP_LAYER; //GROUP_NONE;
                         if (((modifier & InputEvent.CTRL_MASK) != 0) || ((modifier & InputEvent.CTRL_DOWN_MASK) != 0)) {
-                                group = ShortCut.GROUP_MENU;
+                                group = Shortcut.GROUP_MENU;
                         } else if (modifier == 0) {
-                                group = ShortCut.GROUP_EDIT;
+                                group = Shortcut.GROUP_EDIT;
                         }
-                        sc = ShortCut.registerShortCut("auto:"+name, name, shortCut, group);
-                        this.shortCut = sc.getKeyStroke();
+                        sc = Shortcut.registerShortcut("auto:"+name, name, shortcut, group);
+                        this.shortcut = sc.getKeyStroke();
                         Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(sc.getKeyStroke(), name);
                         Main.contentPane.getActionMap().put(name, this);
@@ -69 +69 @@
          * tooltip - a longer description of the action that will be displayed in the tooltip. Please note
          *           that html is not supported for menu action on some platforms
-         * shortCut - a ready-created shortcut object or null if you don't want a shortcut. But you always
+         * shortcut - a ready-created shortcut object or null if you don't want a shortcut. But you always
          *            do want a shortcut, remember you can alway register it with group=none, so you
          *            won't be assigned a shurtcut unless the user configures one. If you pass null here,
@@ -75 +75 @@
          * register - register this action for the toolbar preferences?
          */
-        public JosmAction(String name, String iconName, String tooltip, ShortCut shortCut, boolean register) {
+        public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register) {
                 super(name, iconName == null ? null : ImageProvider.get(iconName));
                 setHelpId();
-                sc = shortCut;
+                sc = shortcut;
                 if (sc != null) {
-                        this.shortCut = sc.getKeyStroke();
+                        this.shortcut = sc.getKeyStroke();
                         Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(sc.getKeyStroke(), name);
                         Main.contentPane.getActionMap().put(name, this);
@@ -91 +91 @@
 
         public void destroy() {
-                if (shortCut != null) {
+                if (shortcut != null) {
                         Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).remove(sc.getKeyStroke());
                         Main.contentPane.getActionMap().remove(sc.getKeyStroke());