From b3c76c21b4db6b47ae238b617a9929c8917fbcf4 Mon Sep 17 00:00:00 2001
From: Karl Tauber <karl@jformdesigner.com>
Date: Sat, 12 Sep 2020 18:38:35 +0200
Subject: [PATCH] UIDefaultsLoader: moved some code to where it belongs (for
 previous commit)

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