Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-06 22:10:54 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

UIDefaultsLoader: do not add properties with empty values to UI defaults (value was an empty string)

Browse Source
This commit is contained in:
Karl Tauber
2021-11-04 00:21:57 +01:00
parent 52f6e7fc32
commit e49459fd8b
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java
View File

@@ -355,7 +355,7 @@ class UIDefaultsLoader
value = value.trim(); value = value.trim();
// null // null
if( value.equals( "null" ) ) { if( value.equals( "null" ) || value.isEmpty() ) {
resultValueType[0] = ValueType.NULL; resultValueType[0] = ValueType.NULL;
return null; return null;
} }

1
flatlaf-core/src/test/java/com/formdev/flatlaf/TestUIDefaultsLoader.java
View File

@@ -79,7 +79,6 @@ public class TestUIDefaultsLoader
void parseFonts() { void parseFonts() {
// style // style
UIManager.put( "defaultFont", new Font( Font.DIALOG, Font.PLAIN, 10 ) ); 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.PLAIN, 10, "normal" );
assertFontEquals( Font.DIALOG, Font.BOLD, 10, "bold" ); assertFontEquals( Font.DIALOG, Font.BOLD, 10, "bold" );
assertFontEquals( Font.DIALOG, Font.ITALIC, 10, "italic" ); assertFontEquals( Font.DIALOG, Font.ITALIC, 10, "italic" );