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

config: Support inheritance

Browse Source
This commit is contained in:
Andrey Kaipov
2020-10-03 17:56:10 -04:00
committed by Owain van Brakel
parent b0447f518b
commit 6c45d1d3bb
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,6 +56,8 @@ import java.time.Instant;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Base64; import java.util.Base64;
import java.util.Collection;
import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
@@ -65,6 +67,7 @@ import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
import java.util.Stack;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
@@ -680,7 +683,7 @@ public class ConfigManager
return; return;
} }
for (Method method : clazz.getDeclaredMethods()) for (Method method : getAllDeclaredInterfaceMethods(clazz))
{ {
ConfigItem item = method.getAnnotation(ConfigItem.class); ConfigItem item = method.getAnnotation(ConfigItem.class);
@@ -868,6 +871,25 @@ 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 methods.
*/
private Collection<Method> getAllDeclaredInterfaceMethods(Class<?> clazz)
{
Collection<Method> methods = new HashSet<>();
Stack<Class<?>> interfazes = new Stack<>();
interfazes.push(clazz);
while (!interfazes.isEmpty())
{
Class<?> interfaze = interfazes.pop();
Collections.addAll(methods, interfaze.getDeclaredMethods());
Collections.addAll(interfazes, interfaze.getInterfaces());
}
return methods;
}
@Subscribe(priority = 100) @Subscribe(priority = 100)
private void onClientShutdown(ClientShutdown e) private void onClientShutdown(ClientShutdown e)
{ {