From cb71334ccc16217f2235c062f09e4682c2608839 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Wed, 4 Jun 2014 14:26:04 +0200 Subject: [PATCH] fix NPE on linux --- .../intellij/ide/ui/laf/darcula/ui/DarculaTextFieldUI.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextFieldUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextFieldUI.java index 6d5bb3b40c43..5381ff9f1275 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextFieldUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaTextFieldUI.java @@ -96,10 +96,11 @@ public class DarculaTextFieldUI extends BasicTextFieldUI { } protected void showSearchPopup() { - final Object value = getComponent().getClientProperty("JTextField.Search.FindPopup"); + final JTextComponent component = getComponent(); + final Object value = component == null ? null : component.getClientProperty("JTextField.Search.FindPopup"); if (value instanceof JPopupMenu) { final JPopupMenu popup = (JPopupMenu)value; - popup.show(getComponent(), getSearchIconCoord().x, getComponent().getHeight()); + popup.show(component, getSearchIconCoord().x, component.getHeight()); } }