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 396b4d97..adc6e177 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java @@ -211,14 +211,17 @@ class UIDefaultsLoader } // override UI defaults with globals - for( Object okey : defaults.keySet() ) { - if( okey instanceof String && ((String)okey).contains( "." ) ) { - String key = (String) okey; - String globalKey = key.substring( key.lastIndexOf( '.' ) + 1 ); - String globalValue = globals.get( globalKey ); - if( globalValue != null && !properties.containsKey( key ) ) - properties.put( key, globalValue ); - } + for( Object key : defaults.keySet() ) { + int dot; + if( !(key instanceof String) || + properties.containsKey( key ) || + (dot = ((String)key).lastIndexOf( '.' )) < 0 ) + continue; + + String globalKey = ((String)key).substring( dot + 1 ); + String globalValue = globals.get( globalKey ); + if( globalValue != null ) + properties.put( key, globalValue ); } Function propertiesGetter = key -> {