mirror of
https://github.com/JFormDesigner/FlatLaf.git
synced 2025-12-08 15:00:54 +03:00
UIDefaultsLoader: moved some code to where it belongs (for previous commit)
This commit is contained in:
@@ -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
|
// get (and remove) globals, which override all other defaults that end with same suffix
|
||||||
HashMap<String, String> globals = new HashMap<>();
|
HashMap<String, String> globals = new HashMap<>();
|
||||||
Iterator<Entry<Object, Object>> it = properties.entrySet().iterator();
|
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
|
// parse and add properties to UI defaults
|
||||||
for( Map.Entry<Object, Object> e : properties.entrySet() ) {
|
for( Map.Entry<Object, Object> e : properties.entrySet() ) {
|
||||||
String key = (String) e.getKey();
|
String key = (String) e.getKey();
|
||||||
|
|||||||
Reference in New Issue
Block a user