From de14910d4adfb08851904fffb07196c8ecf18098 Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Mon, 26 Mar 2012 14:12:36 +0400 Subject: [PATCH] NPE on startup (license screen doesn't have application initialized yet) --- .../src/com/intellij/ui/NonFocusableCheckBox.java | 2 +- .../platform-api/src/com/intellij/util/ui/DialogUtil.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/platform-api/src/com/intellij/ui/NonFocusableCheckBox.java b/platform/platform-api/src/com/intellij/ui/NonFocusableCheckBox.java index cd0bea52063d..34d40667e010 100644 --- a/platform/platform-api/src/com/intellij/ui/NonFocusableCheckBox.java +++ b/platform/platform-api/src/com/intellij/ui/NonFocusableCheckBox.java @@ -34,7 +34,7 @@ public class NonFocusableCheckBox extends JCheckBox { } private void initFocusability() { - if (!UISettings.getInstance().DISABLE_MNEMONICS_IN_CONTROLS) { // Or that won't be keyboard accessible at all + if (!UISettings.getShadowInstance().DISABLE_MNEMONICS_IN_CONTROLS) { // Or that won't be keyboard accessible at all setFocusable(false); } } diff --git a/platform/platform-api/src/com/intellij/util/ui/DialogUtil.java b/platform/platform-api/src/com/intellij/util/ui/DialogUtil.java index ea7670d384b2..27f0ac706660 100644 --- a/platform/platform-api/src/com/intellij/util/ui/DialogUtil.java +++ b/platform/platform-api/src/com/intellij/util/ui/DialogUtil.java @@ -53,7 +53,7 @@ public class DialogUtil{ } if (mnemonic != '\0') { button.setText(realText.toString()); - if (UISettings.getInstance().DISABLE_MNEMONICS_IN_CONTROLS) { + if (UISettings.getShadowInstance().DISABLE_MNEMONICS_IN_CONTROLS) { button.setMnemonic(0); button.setDisplayedMnemonicIndex(-1); button.setFocusable(true); @@ -93,7 +93,7 @@ public class DialogUtil{ } if (mnemonic != '\0') { label.setText(realText.toString()); - if (UISettings.getInstance().DISABLE_MNEMONICS_IN_CONTROLS) { + if (UISettings.getShadowInstance().DISABLE_MNEMONICS_IN_CONTROLS) { label.setDisplayedMnemonic(0); label.setDisplayedMnemonicIndex(-1); }