From a97076ead58e9bff37a6c11e734764b4d280237f Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Thu, 11 Nov 2021 12:30:10 +0100 Subject: [PATCH] ComboBox: fix NPE in CellPaddingBorder.install() (issue #408) (cherry picked from commit d48b98f58235081aad8a0a34cd7c277430c31278) --- CHANGELOG.md | 2 ++ .../src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31d67472..75479a88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ FlatLaf Change Log - ComboBox (not editable): Fixed background painted outside of border if round edges are enabled (client property `JComponent.roundRect` is `true`). (similar to issue #382; regression since fixing #330 in FlatLaf 1.4) +- ComboBox: Fixed `NullPointerException`, which may occur under special + circumstances. (issue #408) - Table: Do not select text in cell editor when it gets focus (when `JTable.surrendersFocusOnKeystroke` is `true`) and `TextComponent.selectAllOnFocusPolicy` is `once` (the default) or `always`. diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java index 759744b4..d6fef81f 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java @@ -835,7 +835,7 @@ public class FlatComboBoxUI // remember old border and replace it rendererBorder = jc.getBorder(); - rendererComponent.setBorder( this ); + jc.setBorder( this ); } /**