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 503cf669..396b4d97 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java @@ -198,13 +198,6 @@ class UIDefaultsLoader } } - Function propertiesGetter = key -> { - return properties.getProperty( key ); - }; - Function resolver = value -> { - return resolveValue( value, propertiesGetter ); - }; - // get (and remove) globals, which override all other defaults that end with same suffix HashMap globals = new HashMap<>(); Iterator> it = properties.entrySet().iterator(); @@ -228,6 +221,13 @@ class UIDefaultsLoader } } + Function propertiesGetter = key -> { + return properties.getProperty( key ); + }; + Function resolver = value -> { + return resolveValue( value, propertiesGetter ); + }; + // parse and add properties to UI defaults for( Map.Entry e : properties.entrySet() ) { String key = (String) e.getKey();