Changeset 12639 in josm for trunk/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java

Timestamp:

2017-08-25T01:37:31+02:00 (9 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate shortcut handling and mapframe listener methods in Main. Replacement: same methods in gui.MainApplication

File:

• trunk/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/widgets/DisableShortcutsOnFocusGainedTextField.java

@@ -17 +17 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -147 +148 @@
             KeyStroke ks = shortcut.getKeyStroke();
             if (hasToBeDisabled(ks)) {
-                Action action = Main.getRegisteredActionShortcut(shortcut);
+                Action action = MainApplication.getRegisteredActionShortcut(shortcut);
                 if (action != null) {
-                    Main.unregisterActionShortcut(action, shortcut);
+                    MainApplication.unregisterActionShortcut(action, shortcut);
                     unregisteredActionShortcuts.add(new Pair<>(action, shortcut));
                 }
@@ -182 +183 @@
     protected void restoreActionShortcuts() {
         for (Pair<Action, Shortcut> p : unregisteredActionShortcuts) {
-            Main.registerActionShortcut(p.a, p.b);
+            MainApplication.registerActionShortcut(p.a, p.b);
         }
         unregisteredActionShortcuts.clear();