From f578b7c7df6472f68b7c748e60797408135223e5 Mon Sep 17 00:00:00 2001 From: anna Date: Mon, 7 Feb 2011 18:24:13 +0100 Subject: [PATCH] n mnemonic should not trigger no action without further checks (IDEA-65106) --- .../src/com/intellij/openapi/ui/DialogWrapper.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java index 105ef385b1dc..df1eef72205b 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java @@ -439,10 +439,11 @@ public abstract class DialogWrapper { final Object value = action.getValue(Action.MNEMONIC_KEY); if (value instanceof Integer) { final int mnemonic = ((Integer)value).intValue(); - if (mnemonic == 'Y') { + final Object name = action.getValue(Action.NAME); + if (mnemonic == 'Y' && "Yes".equals(name)) { myYesAction = action; } - else if (mnemonic == 'N') { + else if (mnemonic == 'N' && "No".equals(name)) { myNoAction = action; } button.setMnemonic(mnemonic); @@ -496,11 +497,11 @@ public abstract class DialogWrapper { plainText.append(ch); } button.setText(plainText.toString()); - - if (mnemonic == KeyEvent.VK_Y) { + final Object name = action.getValue(Action.NAME); + if (mnemonic == KeyEvent.VK_Y && "Yes".equals(name)) { myYesAction = action; } - else if (mnemonic == KeyEvent.VK_N) { + else if (mnemonic == KeyEvent.VK_N && "No".equals(name)) { myNoAction = action; }