Merge branch 'dev' of github.com:GravitLauncher/Launcher into dev

This commit is contained in:
Gravit 2020-06-05 08:27:18 +07:00
commit eca8cc2cbc
No known key found for this signature in database
GPG key ID: 061981E1E85D3216

View file

@ -19,10 +19,7 @@
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.SimpleFileVisitor; import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes; import java.nio.file.attribute.BasicFileAttributes;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.jar.Attributes; import java.util.jar.Attributes;
import java.util.jar.JarFile; import java.util.jar.JarFile;
@ -148,7 +145,7 @@ public void addClassFieldsToProperties(Map<String, Object> propertyMap, String p
for (Field field : fields) { for (Field field : fields) {
if ((field.getModifiers() & Modifier.STATIC) != 0) continue; if ((field.getModifiers() & Modifier.STATIC) != 0) continue;
Object obj = field.get(object); Object obj = field.get(object);
String propertyName = prefix.concat(".").concat(field.getName().toLowerCase()); String propertyName = prefix.concat(".").concat(field.getName().toLowerCase(Locale.US));
if(InjectClassAcceptor.isSerializableValue(obj)) if(InjectClassAcceptor.isSerializableValue(obj))
{ {
LogHelper.dev("Property name %s", propertyName); LogHelper.dev("Property name %s", propertyName);