From 5fc31a77084e4f271eb9bf490f61ec87769ebdf8 Mon Sep 17 00:00:00 2001 From: argius Date: Mon, 2 Dec 2013 21:42:30 +0900 Subject: [PATCH] Fix #32187: anyActionPerformed -> getActionForKeyStroke(ks).actionPerformed --- src/net/argius/stew/ui/window/DatabaseInfoTree.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/net/argius/stew/ui/window/DatabaseInfoTree.java b/src/net/argius/stew/ui/window/DatabaseInfoTree.java index 6f6c4db..7189470 100644 --- a/src/net/argius/stew/ui/window/DatabaseInfoTree.java +++ b/src/net/argius/stew/ui/window/DatabaseInfoTree.java @@ -12,7 +12,6 @@ import static net.argius.stew.ui.window.AnyActionKey.copy; import static net.argius.stew.ui.window.AnyActionKey.refresh; import static net.argius.stew.ui.window.DatabaseInfoTree.ActionKey.*; import static net.argius.stew.ui.window.WindowOutputProcessor.showInformationMessageDialog; - import java.awt.*; import java.awt.event.*; import java.io.*; @@ -20,11 +19,9 @@ import java.sql.*; import java.util.*; import java.util.Map.Entry; import java.util.List; - import javax.swing.*; import javax.swing.event.*; import javax.swing.tree.*; - import net.argius.stew.*; /** @@ -79,7 +76,18 @@ final class DatabaseInfoTree extends JTree implements AnyActionListener, TextSea @Override public void anyActionPerformed(AnyActionEvent ev) { log.atEnter("anyActionPerformed", ev); - if (ev.isAnyOf(copySimpleName)) { + if (ev.isAnyOf(copy)) { + Object src = ev.getSource(); + if (src != null && src instanceof JMenuItem) { + KeyStroke k = ((JMenuItem)src).getAccelerator(); + if (k != null) { + ActionListener action = getActionForKeyStroke(k); + if (action != null) { + action.actionPerformed(new ActionEvent(this, 1001, "")); + } + } + } + } else if (ev.isAnyOf(copySimpleName)) { copySimpleName(); } else if (ev.isAnyOf(copyFullName)) { copyFullName(); -- 2.11.0