ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

config: Handle sections and titles when using inheritance

Browse Source
This commit is contained in:
Owain van Brakel
2021-02-26 15:44:15 +01:00
parent d3162944fa
commit d9c5ee6661
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java
View File

@@ -41,6 +41,7 @@ import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.lang.reflect.Proxy; import java.lang.reflect.Proxy;
@@ -591,7 +592,7 @@ public class ConfigManager
throw new IllegalArgumentException("Not a config group"); throw new IllegalArgumentException("Not a config group");
} }
final List<ConfigSectionDescriptor> sections = Arrays.stream(inter.getDeclaredFields()) final List<ConfigSectionDescriptor> sections = getAllDeclaredInterfaceFields(inter).stream()
.filter(m -> m.isAnnotationPresent(ConfigSection.class) && m.getType() == String.class) .filter(m -> m.isAnnotationPresent(ConfigSection.class) && m.getType() == String.class)
.map(m -> .map(m ->
{ {
@@ -615,7 +616,7 @@ public class ConfigManager
.result()) .result())
.collect(Collectors.toList()); .collect(Collectors.toList());
final List<ConfigTitleDescriptor> titles = Arrays.stream(inter.getDeclaredFields()) final List<ConfigTitleDescriptor> titles = getAllDeclaredInterfaceFields(inter).stream()
.filter(m -> m.isAnnotationPresent(ConfigTitle.class) && m.getType() == String.class) .filter(m -> m.isAnnotationPresent(ConfigTitle.class) && m.getType() == String.class)
.map(m -> .map(m ->
{ {
@@ -924,20 +925,39 @@ public class ConfigManager
return object == null ? null : object.toString(); return object == null ? null : object.toString();
} }
/**
* Does DFS on a class's interfaces to find all of its implemented fields.
*/
private Collection<Field> getAllDeclaredInterfaceFields(Class<?> clazz)
{
Collection<Field> methods = new HashSet<>();
Stack<Class<?>> interfaces = new Stack<>();
interfaces.push(clazz);
while (!interfaces.isEmpty())
{
Class<?> interfaze = interfaces.pop();
Collections.addAll(methods, interfaze.getDeclaredFields());
Collections.addAll(interfaces, interfaze.getInterfaces());
}
return methods;
}
/** /**
* Does DFS on a class's interfaces to find all of its implemented methods. * Does DFS on a class's interfaces to find all of its implemented methods.
*/ */
private Collection<Method> getAllDeclaredInterfaceMethods(Class<?> clazz) private Collection<Method> getAllDeclaredInterfaceMethods(Class<?> clazz)
{ {
Collection<Method> methods = new HashSet<>(); Collection<Method> methods = new HashSet<>();
Stack<Class<?>> interfazes = new Stack<>(); Stack<Class<?>> interfaces = new Stack<>();
interfazes.push(clazz); interfaces.push(clazz);
while (!interfazes.isEmpty()) while (!interfaces.isEmpty())
{ {
Class<?> interfaze = interfazes.pop(); Class<?> interfaze = interfaces.pop();
Collections.addAll(methods, interfaze.getDeclaredMethods()); Collections.addAll(methods, interfaze.getDeclaredMethods());
Collections.addAll(interfazes, interfaze.getInterfaces()); Collections.addAll(interfaces, interfaze.getInterfaces());
} }
return methods; return methods;