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

Config parsing (#425)

Browse Source 
* Add support for parsing textfield values

* Add parsing to custom swapper

* Remove this check since invalid option aren't saved anymore
This commit is contained in:
sdburns1998
2019-05-28 20:47:31 +02:00
committed by Kyleeld
parent d13c8dafb9
commit 255daf4b68
5 changed files with 121 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,4 +58,9 @@ public @interface ConfigItem
String enabledBy() default "";
String disabledBy() default "";
boolean parse() default false;
Class<?> clazz() default void.class;
String method() default "";
}

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

@@ -36,11 +36,15 @@ import java.awt.Rectangle;
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
import java.awt.event.ItemEvent;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.awt.image.BufferedImage;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -65,6 +69,7 @@ import javax.swing.JTextArea;
import javax.swing.ScrollPaneConstants;
import javax.swing.SpinnerModel;
import javax.swing.SpinnerNumberModel;
import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
import javax.swing.border.Border;
import javax.swing.border.CompoundBorder;
@@ -426,6 +431,44 @@ public class ConfigPanel extends PluginPanel
});
}
private Boolean parse(ConfigItem item, String value)
{
try
{
Method parse = item.clazz().getMethod(item.method(), String.class);
boolean result = (boolean) parse.invoke(null, value);
return result;
}
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("Error: Invalid input");
}
}
void openGroupConfigPanel(PluginListItem listItem, Config config, ConfigDescriptor cd)
{
showingPluginList = false;
@@ -586,7 +629,7 @@ public class ConfigPanel extends PluginPanel
configEntryName.setPreferredSize(new Dimension(PANEL_WIDTH, (int) configEntryName.getPreferredSize().getHeight()));
configEntryName.setForeground(Color.WHITE);
configEntryName.setToolTipText("<html>" + name + ":<br>" + cid.getItem().description() + "</html>");
item.add(configEntryName, BorderLayout.CENTER);
item.add(configEntryName, cid.getType() != String.class ? BorderLayout.CENTER : BorderLayout.NORTH);
if (cid.getType() == Stub.class)
{
@@ -595,6 +638,7 @@ public class ConfigPanel extends PluginPanel
item.setBorder(new CompoundBorder(border, margin));
configEntryName.setForeground(Color.ORANGE);
configEntryName.setToolTipText(null);
}
if (cid.getType() == boolean.class)
@@ -676,11 +720,51 @@ public class ConfigPanel extends PluginPanel
@Override
public void focusLost(FocusEvent e)
{
changeConfiguration(listItem, config, textField, cd, cid);
ConfigItem item = cid.getItem();
if (item.parse())
{
Boolean result = parse(item, textField.getText());
if (result != null && result)
{
changeConfiguration(listItem, config, textField, cd, cid);
}
}
else
{
changeConfiguration(listItem, config, textField, cd, cid);
}
}
});
item.add(textField, BorderLayout.SOUTH);
if (cid.getItem().parse())
{
JLabel parsingLabel = new JLabel();
parsingLabel.setHorizontalAlignment(SwingConstants.CENTER);
parsingLabel.setPreferredSize(new Dimension(PANEL_WIDTH, 15));
textField.addKeyListener(new KeyAdapter()
{
public void keyReleased(KeyEvent e)
{
ConfigItem item = cid.getItem();
if (item.parse())
{
parseLabel(item, parsingLabel, textField.getText());
}
}
});
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)

5
runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
View File

@@ -301,7 +301,10 @@ public interface MenuEntrySwapperConfig extends Config
name = "Custom Swaps",
description = "Add custom swaps here, 1 per line. Syntax: option, target : option, target<br>Note that the first entry should be the left click one!",
position = 19,
group = "Miscellaneous"
group = "Miscellaneous",
parse = true,
clazz = Parse.class,
method = "parse"
)
default String customSwaps()
{

11
runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
View File

@@ -1155,16 +1155,7 @@ public class MenuEntrySwapperPlugin extends Plugin
if (!Strings.isNullOrEmpty(config))
{
Map<String, String> split;
try
{
split = NEWLINE_SPLITTER.withKeyValueSeparator(':').split(config);
}
catch (IllegalArgumentException ex)
{
return;
}
Map<String, String> split = NEWLINE_SPLITTER.withKeyValueSeparator(':').split(config);
for (Map.Entry<String, String> entry : split.entrySet())
{

24
runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/Parse.java Normal file
View File

@@ -0,0 +1,24 @@
package net.runelite.client.plugins.menuentryswapper;
import com.google.common.base.Splitter;
public class Parse
{
public static boolean parse(String value)
{
try
{
Splitter NEWLINE_SPLITTER = Splitter
.on("\n")
.omitEmptyStrings()
.trimResults();
NEWLINE_SPLITTER.withKeyValueSeparator(':').split(value);
return true;
}
catch (IllegalArgumentException ex)
{
return false;
}
}
}