From c3f90a1823b2284f58a7e0b28ecfe323e6deb25f Mon Sep 17 00:00:00 2001 From: Nick Davis Date: Thu, 4 Feb 2016 16:53:57 -0500 Subject: [PATCH] try to fix NullPointerException due to null getfont(). --- .../autopsy/keywordsearch/DropdownListSearchPanel.form | 6 ++---- .../autopsy/keywordsearch/DropdownListSearchPanel.java | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownListSearchPanel.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownListSearchPanel.form index 0e884ac7f3..1f61e9255c 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownListSearchPanel.form +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownListSearchPanel.form @@ -60,10 +60,8 @@ - - - - + + diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownListSearchPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownListSearchPanel.java index 577703b2a0..d794acb1dc 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownListSearchPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownListSearchPanel.java @@ -200,7 +200,7 @@ class DropdownListSearchPanel extends KeywordSearchPanel { setFont(getFont().deriveFont(getFont().getStyle() & ~java.awt.Font.BOLD, 11)); - jSplitPane1.setFont(jSplitPane1.getFont().deriveFont(jSplitPane1.getFont().getStyle() & ~java.awt.Font.BOLD, 11)); + jSplitPane1.setFont(leftPane.getFont()); leftPane.setFont(leftPane.getFont().deriveFont(leftPane.getFont().getStyle() & ~java.awt.Font.BOLD, 11)); leftPane.setMinimumSize(new java.awt.Dimension(150, 23));