Changeset 4753 in josm for trunk/src/org/openstreetmap

Timestamp:

2011-12-30T20:24:38+01:00 (13 years ago)

Author:

jttt

Message:

Run in EDT

File:

• trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java

@@ -18 +18 @@
 import javax.swing.JPopupMenu;
 import javax.swing.KeyStroke;
+import javax.swing.SwingUtilities;
 import javax.swing.event.PopupMenuEvent;
 import javax.swing.event.PopupMenuListener;
@@ -131 +132 @@
 
     private void showLayersPopup(final MyAction action) {
-        JPopupMenu layers = new JPopupMenu();
-
-        JMenuItem lbTitle = new JMenuItem((String) action.action.getValue(Action.SHORT_DESCRIPTION));
-        lbTitle.setEnabled(false);
-        JPanel pnTitle = new JPanel();
-        pnTitle.add(lbTitle);
-        layers.add(pnTitle);
-
-        char repeatKey = (char) action.shortcut.getKeyCode();
-        boolean repeatKeyUsed = false;
-
-
-        for (final MultikeyInfo info: action.action.getMultikeyCombinations()) {
-
-            if (info.getShortcut() == repeatKey) {
-                repeatKeyUsed = true;
+        SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                JPopupMenu layers = new JPopupMenu();
+
+                JMenuItem lbTitle = new JMenuItem((String) action.action.getValue(Action.SHORT_DESCRIPTION));
+                lbTitle.setEnabled(false);
+                JPanel pnTitle = new JPanel();
+                pnTitle.add(lbTitle);
+                layers.add(pnTitle);
+
+                char repeatKey = (char) action.shortcut.getKeyCode();
+                boolean repeatKeyUsed = false;
+
+
+                for (final MultikeyInfo info: action.action.getMultikeyCombinations()) {
+
+                    if (info.getShortcut() == repeatKey) {
+                        repeatKeyUsed = true;
+                    }
+
+                    JMenuItem item = new JMenuItem(formatMenuText(action.shortcut, String.valueOf(info.getShortcut()), info.getDescription()));
+                    item.setMnemonic(info.getShortcut());
+                    item.addActionListener(new ActionListener() {
+                        @Override
+                        public void actionPerformed(ActionEvent e) {
+                            action.action.executeMultikeyAction(info.getIndex(), false);
+                        }
+                    });
+                    layers.add(item);
+                }
+
+                if (!repeatKeyUsed) {
+                    MultikeyInfo lastLayer = action.action.getLastMultikeyAction();
+                    if (lastLayer != null) {
+                        JMenuItem repeateItem = new JMenuItem(formatMenuText(action.shortcut,
+                                KeyEvent.getKeyText(action.shortcut.getKeyCode()),
+                                "Repeat " + lastLayer.getDescription()));
+                        repeateItem.setMnemonic(action.shortcut.getKeyCode());
+                        repeateItem.addActionListener(new ActionListener() {
+                            @Override
+                            public void actionPerformed(ActionEvent e) {
+                                action.action.executeMultikeyAction(-1, true);
+                            }
+                        });
+                        layers.add(repeateItem);
+                    }
+                }
+                layers.addPopupMenuListener(new PopupMenuListener() {
+
+                    @Override
+                    public void popupMenuWillBecomeVisible(PopupMenuEvent e) {}
+
+                    @Override
+                    public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+                        Main.map.statusLine.resetHelpText(STATUS_BAR_ID);
+                    }
+
+                    @Override
+                    public void popupMenuCanceled(PopupMenuEvent e) {}
+                });
+
+                layers.show(Main.parent, Integer.MAX_VALUE, Integer.MAX_VALUE);
+                layers.setLocation(Main.parent.getX() + Main.parent.getWidth() - layers.getWidth(), Main.parent.getY() + Main.parent.getHeight() - layers.getHeight());
             }
-
-            JMenuItem item = new JMenuItem(formatMenuText(action.shortcut, String.valueOf(info.getShortcut()), info.getDescription()));
-            item.setMnemonic(info.getShortcut());
-            item.addActionListener(new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    action.action.executeMultikeyAction(info.getIndex(), false);
-                }
-            });
-            layers.add(item);
-        }
-
-        if (!repeatKeyUsed) {
-            MultikeyInfo lastLayer = action.action.getLastMultikeyAction();
-            if (lastLayer != null) {
-                JMenuItem repeateItem = new JMenuItem(formatMenuText(action.shortcut,
-                        KeyEvent.getKeyText(action.shortcut.getKeyCode()),
-                        "Repeat " + lastLayer.getDescription()));
-                repeateItem.setMnemonic(action.shortcut.getKeyCode());
-                repeateItem.addActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        action.action.executeMultikeyAction(-1, true);
-                    }
-                });
-                layers.add(repeateItem);
-            }
-        }
-        layers.addPopupMenuListener(new PopupMenuListener() {
-
-            @Override
-            public void popupMenuWillBecomeVisible(PopupMenuEvent e) {}
-
-            @Override
-            public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
-                Main.map.statusLine.resetHelpText(STATUS_BAR_ID);
-            }
-
-            @Override
-            public void popupMenuCanceled(PopupMenuEvent e) {}
         });
-
-        layers.show(Main.parent, Integer.MAX_VALUE, Integer.MAX_VALUE);
-        layers.setLocation(Main.parent.getX() + Main.parent.getWidth() - layers.getWidth(), Main.parent.getY() + Main.parent.getHeight() - layers.getHeight());
     }