Changeset 3252 in josm for trunk/src/org/openstreetmap/josm/Main.java

Timestamp:

15.05.2010 18:59:10 (2 years ago)

Author:

jttt

Message:

Fix #2234: Translation can cause JosmActions to illegally handle shortcuts

File:

• trunk/src/org/openstreetmap/josm/Main.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -27 +27 @@
 import java.util.regex.Pattern;
 
+import javax.swing.Action;
+import javax.swing.InputMap;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.KeyStroke;
 import javax.swing.UIManager;
 
@@ -198 +201 @@
         isOpenjdk = System.getProperty("java.vm.name").toUpperCase().indexOf("OPENJDK") != -1;
         platform.startupHook();
-        contentPane.add(panel, BorderLayout.CENTER);
+        contentPanePrivate.add(panel, BorderLayout.CENTER);
         panel.add(gettingStarted, BorderLayout.CENTER);
         menu = new MainMenu();
@@ -205 +208 @@
 
         // creating toolbar
-        contentPane.add(toolbar.control, BorderLayout.NORTH);
-
-        contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
-        .put(Shortcut.registerShortcut("system:help", tr("Help"),
-                KeyEvent.VK_F1, Shortcut.GROUP_DIRECT).getKeyStroke(), "Help");
-        contentPane.getActionMap().put("Help", menu.help);
+        contentPanePrivate.add(toolbar.control, BorderLayout.NORTH);
+
+        registerActionShortcut(menu.help, Shortcut.registerShortcut("system:help", tr("Help"),
+                KeyEvent.VK_F1, Shortcut.GROUP_DIRECT));
 
         TaggingPresetPreference.initialize();
@@ -218 +219 @@
 
         toolbar.control.updateUI();
-        contentPane.updateUI();
+        contentPanePrivate.updateUI();
     }
 
@@ -226 +227 @@
     public final void addLayer(final Layer layer) {
         if (map == null) {
-            final MapFrame mapFrame = new MapFrame();
+            final MapFrame mapFrame = new MapFrame(contentPanePrivate);
             setMapFrame(mapFrame);
             mapFrame.selectMapMode((MapMode)mapFrame.getDefaultButtonAction());
@@ -281 +282 @@
     }
 
-    /**
-     * Use this to register shortcuts to
-     */
-    public static final JPanel contentPane = new JPanel(new BorderLayout());
+    protected static JPanel contentPanePrivate = new JPanel(new BorderLayout());
+
+    /**
+     * @deprecated If you just need to register shortcut for action, use registerActionShortcut instead of accessing InputMap directly
+     */
+    @Deprecated
+    public static final JPanel contentPane = contentPanePrivate;
+
+    public static void registerActionShortcut(Action action, Shortcut shortcut) {
+        registerActionShortcut(action, shortcut.getKeyStroke());
+    }
+
+    public static void registerActionShortcut(Action action, KeyStroke keyStroke) {
+        if (keyStroke == null)
+            return;
+
+        InputMap inputMap = contentPanePrivate.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
+        Object existing = inputMap.get(keyStroke);
+        if (existing != null && !existing.equals(action)) {
+            System.out.println(String.format("Keystroke is already assigned to %s, will be overridden by %s", existing, action));
+        }
+        inputMap.put(keyStroke, action);
+
+        contentPanePrivate.getActionMap().put(action, action);
+    }
+
+    public static void unregisterActionShortcut(Shortcut shortcut) {
+        contentPanePrivate.getInputMap().remove(shortcut.getKeyStroke());
+    }
 
     ///////////////////////////////////////////////////////////////////////////
@@ -324 +350 @@
             }
             toolbar = new ToolbarPreferences();
-            contentPane.updateUI();
+            contentPanePrivate.updateUI();
             panel.updateUI();
         } catch (final Exception e) {