From bc443f47f1ae967e07d124c393395edeeb5ab9ae Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Fri, 5 Feb 2021 23:33:26 +0100 Subject: [PATCH] Theme Editor: fixed NPE (caused by no longer implemented base files support) --- .../flatlaf/themeeditor/FlatThemePropertiesSupport.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePropertiesSupport.java b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePropertiesSupport.java index 9fbf9e0d..163c6fa2 100644 --- a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePropertiesSupport.java +++ b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePropertiesSupport.java @@ -179,6 +179,9 @@ class FlatThemePropertiesSupport for( Object key : getProperties().keySet() ) allKeysCache.add( (String) key ); + if( baseFiles == null ) + return allKeysCache; + for( int i = 0; i < baseFiles.length; i++ ) { for( Object key : getBaseProperties( i ).keySet() ) allKeysCache.add( (String) key );