From 9a5337db3c7a65aa405b35522fe116cd74f6753b Mon Sep 17 00:00:00 2001 From: Max Weber Date: Sun, 9 Feb 2020 04:14:57 -0700 Subject: [PATCH] runelite-client: typecheck configs extend Config --- .../main/java/net/runelite/client/config/ConfigManager.java | 4 ++-- .../net/runelite/client/plugins/devtools/DevToolsConfig.java | 3 ++- .../src/test/java/net/runelite/client/config/TestConfig.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java index fdc2475ef0..b76849be96 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java +++ b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java @@ -341,7 +341,7 @@ public class ConfigManager } } - public T getConfig(Class clazz) + public T getConfig(Class clazz) { if (!Modifier.isPublic(clazz.getModifiers())) { @@ -439,7 +439,7 @@ public class ConfigManager eventBus.post(configChanged); } - public ConfigDescriptor getConfigDescriptor(Object configurationProxy) + public ConfigDescriptor getConfigDescriptor(Config configurationProxy) { Class inter = configurationProxy.getClass().getInterfaces()[0]; ConfigGroup group = inter.getAnnotation(ConfigGroup.class); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsConfig.java index a08edfd26c..ef12183573 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsConfig.java @@ -24,11 +24,12 @@ */ package net.runelite.client.plugins.devtools; +import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; @ConfigGroup("devtools") -public interface DevToolsConfig +public interface DevToolsConfig extends Config { @ConfigItem( keyName = "inspectorAlwaysOnTop", diff --git a/runelite-client/src/test/java/net/runelite/client/config/TestConfig.java b/runelite-client/src/test/java/net/runelite/client/config/TestConfig.java index 9bc5f29b37..66e659d98a 100644 --- a/runelite-client/src/test/java/net/runelite/client/config/TestConfig.java +++ b/runelite-client/src/test/java/net/runelite/client/config/TestConfig.java @@ -25,7 +25,7 @@ package net.runelite.client.config; @ConfigGroup("test") -public interface TestConfig +public interface TestConfig extends Config { @ConfigItem( keyName = "key",