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

Merge pull request #2930 from Owain94/config-parsing

Browse Source
This commit is contained in:
Owain van Brakel
2021-02-22 23:16:06 +01:00
committed by GitHub
parent 87d83cf836 c4e66d100a
commit edfe1f4d6a
2 changed files with 72 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runelite-client/src/main/java/net/runelite/client/config/ConfigItem.java
View File

@@ -50,4 +50,10 @@ public @interface ConfigItem
String section() default ""; String section() default "";
String title() default ""; String title() default "";
boolean parse() default false;
Class<?> clazz() default void.class;
String method() default "";
} }

67
runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
View File

@@ -42,6 +42,8 @@ import java.awt.event.ItemEvent;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
@@ -65,6 +67,7 @@ import javax.swing.JTextArea;
import javax.swing.ScrollPaneConstants; import javax.swing.ScrollPaneConstants;
import javax.swing.SpinnerModel; import javax.swing.SpinnerModel;
import javax.swing.SpinnerNumberModel; import javax.swing.SpinnerNumberModel;
import javax.swing.SwingConstants;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import javax.swing.border.CompoundBorder; import javax.swing.border.CompoundBorder;
import javax.swing.border.EmptyBorder; import javax.swing.border.EmptyBorder;
@@ -106,6 +109,7 @@ import net.runelite.client.ui.components.ComboBoxListRenderer;
import net.runelite.client.ui.components.colorpicker.ColorPickerManager; import net.runelite.client.ui.components.colorpicker.ColorPickerManager;
import net.runelite.client.ui.components.colorpicker.RuneliteColorPicker; import net.runelite.client.ui.components.colorpicker.RuneliteColorPicker;
import net.runelite.client.util.ColorUtil; import net.runelite.client.util.ColorUtil;
import net.runelite.client.util.DeferredDocumentChangedListener;
import net.runelite.client.util.ImageUtil; import net.runelite.client.util.ImageUtil;
import net.runelite.client.util.LinkBrowser; import net.runelite.client.util.LinkBrowser;
import net.runelite.client.util.SwingUtil; import net.runelite.client.util.SwingUtil;
@@ -539,7 +543,31 @@ class ConfigPanel extends PluginPanel
} }
}); });
item.add(textField, BorderLayout.SOUTH); if (cid.getItem().parse())
{
JLabel parsingLabel = new JLabel();
parsingLabel.setHorizontalAlignment(SwingConstants.CENTER);
parsingLabel.setPreferredSize(new Dimension(PANEL_WIDTH, 15));
DeferredDocumentChangedListener listener = new DeferredDocumentChangedListener();
listener.addChangeListener(e ->
{
if (cid.getItem().parse())
{
parseLabel(cid.getItem(), parsingLabel, textField.getText());
}
});
textField.getDocument().addDocumentListener(listener);
item.add(textField, BorderLayout.CENTER);
parseLabel(cid.getItem(), parsingLabel, textField.getText());
item.add(parsingLabel, BorderLayout.SOUTH);
}
else
{
item.add(textField, BorderLayout.SOUTH);
}
} }
if (cid.getType() == Color.class) if (cid.getType() == Color.class)
@@ -723,6 +751,43 @@ class ConfigPanel extends PluginPanel
revalidate(); revalidate();
} }
private Boolean parse(ConfigItem item, String value)
{
try
{
Method parse = item.clazz().getMethod(item.method(), String.class);
return (boolean) parse.invoke(null, value);
}
catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ex)
{
log.error("Parsing failed: {}", ex.getMessage());
}
return null;
}
private void parseLabel(ConfigItem item, JLabel label, String value)
{
Boolean result = parse(item, value);
if (result == null)
{
label.setForeground(Color.RED);
label.setText("Parsing failed");
}
else if (result)
{
label.setForeground(Color.GREEN);
label.setText("Valid input");
}
else
{
label.setForeground(Color.RED);
label.setText("Invalid input");
}
}
private void changeConfiguration(Component component, ConfigDescriptor cd, ConfigItemDescriptor cid) private void changeConfiguration(Component component, ConfigDescriptor cd, ConfigItemDescriptor cid)
{ {
final ConfigItem configItem = cid.getItem(); final ConfigItem configItem = cid.getItem();