From 2f876d553fe11a7f60ed230537c648c2f1eb5bbd Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Wed, 26 Aug 2020 12:16:11 +0200 Subject: [PATCH] List and Table: fixed possible NPE in unusual cases --- .../src/main/java/com/formdev/flatlaf/ui/FlatListUI.java | 3 +++ .../src/main/java/com/formdev/flatlaf/ui/FlatTableUI.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatListUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatListUI.java index d4e7b369..d639ecb3 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatListUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatListUI.java @@ -126,6 +126,9 @@ public class FlatListUI * or the application has to be changed to extend a FlatLaf renderer. */ private void toggleSelectionColors() { + if( list == null ) + return; + if( FlatUIUtils.isPermanentFocusOwner( list ) ) { if( list.getSelectionBackground() == selectionInactiveBackground ) list.setSelectionBackground( selectionBackground ); diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableUI.java index 3f171417..51aff9ca 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableUI.java @@ -188,6 +188,9 @@ public class FlatTableUI * or the application has to be changed to extend a FlatLaf renderer. */ private void toggleSelectionColors() { + if( table == null ) + return; + if( FlatUIUtils.isPermanentFocusOwner( table ) ) { if( table.getSelectionBackground() == selectionInactiveBackground ) table.setSelectionBackground( selectionBackground );