From e49459fd8b4d713c35650243aa1bf7824256c72a Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Thu, 4 Nov 2021 00:21:57 +0100 Subject: [PATCH] UIDefaultsLoader: do not add properties with empty values to UI defaults (value was an empty string) --- .../src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java | 2 +- .../src/test/java/com/formdev/flatlaf/TestUIDefaultsLoader.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java index f020a708..9e9f0c58 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java @@ -355,7 +355,7 @@ class UIDefaultsLoader value = value.trim(); // null - if( value.equals( "null" ) ) { + if( value.equals( "null" ) || value.isEmpty() ) { resultValueType[0] = ValueType.NULL; return null; } diff --git a/flatlaf-core/src/test/java/com/formdev/flatlaf/TestUIDefaultsLoader.java b/flatlaf-core/src/test/java/com/formdev/flatlaf/TestUIDefaultsLoader.java index 5e965b57..34f6986d 100644 --- a/flatlaf-core/src/test/java/com/formdev/flatlaf/TestUIDefaultsLoader.java +++ b/flatlaf-core/src/test/java/com/formdev/flatlaf/TestUIDefaultsLoader.java @@ -79,7 +79,6 @@ public class TestUIDefaultsLoader void parseFonts() { // style UIManager.put( "defaultFont", new Font( Font.DIALOG, Font.PLAIN, 10 ) ); - assertFontEquals( Font.DIALOG, Font.PLAIN, 10, "" ); assertFontEquals( Font.DIALOG, Font.PLAIN, 10, "normal" ); assertFontEquals( Font.DIALOG, Font.BOLD, 10, "bold" ); assertFontEquals( Font.DIALOG, Font.ITALIC, 10, "italic" );