angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-12 23:07:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

UIDefaultsLoader: removed support for deprecated variable prefix '@@'

Browse Source
This commit is contained in:
Karl Tauber
2020-05-02 16:20:17 +02:00
parent 38eb914420
commit 099dd87241
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,8 +63,6 @@ class UIDefaultsLoader
private static final String TYPE_PREFIX = "{"; private static final String TYPE_PREFIX = "{";
private static final String TYPE_PREFIX_END = "}"; private static final String TYPE_PREFIX_END = "}";
private static final String VARIABLE_PREFIX = "@"; private static final String VARIABLE_PREFIX = "@";
@Deprecated
private static final String REF_PREFIX = VARIABLE_PREFIX + "@";
private static final String PROPERTY_PREFIX = "$"; private static final String PROPERTY_PREFIX = "$";
private static final String OPTIONAL_PREFIX = "?"; private static final String OPTIONAL_PREFIX = "?";
private static final String GLOBAL_PREFIX = "*."; private static final String GLOBAL_PREFIX = "*.";
@@ -213,12 +211,6 @@ class UIDefaultsLoader
else if( !value.startsWith( VARIABLE_PREFIX ) ) else if( !value.startsWith( VARIABLE_PREFIX ) )
return value; return value;
// for compatibility
if( value.startsWith( REF_PREFIX ) ) {
FlatLaf.LOG.log( Level.WARNING, "FlatLaf: Usage of '@@' in .properties files is deprecated. Use '$' instead." );
value = value.substring( REF_PREFIX.length() );
}
boolean optional = false; boolean optional = false;
if( value.startsWith( OPTIONAL_PREFIX ) ) { if( value.startsWith( OPTIONAL_PREFIX ) ) {
value = value.substring( OPTIONAL_PREFIX.length() ); value = value.substring( OPTIONAL_PREFIX.length() );