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

config: Null checks

Browse Source
This commit is contained in:
sdburns1998
2019-07-07 04:57:51 +02:00
parent cefa24f4c3
commit 5b68c80569
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,6 +48,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.inject.Singleton; import javax.inject.Singleton;
@@ -992,7 +993,7 @@ public class ConfigPanel extends PluginPanel
if (e.getStateChange() == ItemEvent.SELECTED) if (e.getStateChange() == ItemEvent.SELECTED)
{ {
changeConfiguration(listItem, config, box, cd, cid); changeConfiguration(listItem, config, box, cd, cid);
box.setToolTipText(box.getSelectedItem().toString()); box.setToolTipText(Objects.requireNonNull(box.getSelectedItem()).toString());
} }
}); });
item.add(box, BorderLayout.EAST); item.add(box, BorderLayout.EAST);
@@ -1175,7 +1176,7 @@ public class ConfigPanel extends PluginPanel
else if (component instanceof JComboBox) else if (component instanceof JComboBox)
{ {
JComboBox jComboBox = (JComboBox) component; JComboBox jComboBox = (JComboBox) component;
configManager.setConfiguration(cd.getGroup().value(), cid.getItem().keyName(), ((Enum) jComboBox.getSelectedItem()).name()); configManager.setConfiguration(cd.getGroup().value(), cid.getItem().keyName(), ((Enum) Objects.requireNonNull(jComboBox.getSelectedItem())).name());
for (ConfigItemDescriptor cid2 : cd.getItems()) for (ConfigItemDescriptor cid2 : cd.getItems())
{ {

2
runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java
View File

@@ -186,7 +186,7 @@ public class PluginListItem extends JPanel
buttonPanel.add(configButton); buttonPanel.add(configButton);
// add a listener to configButton only if there are config items to show // add a listener to configButton only if there are config items to show
if (config != null && !configDescriptor.getItems().stream().allMatch(item -> item.getItem().hidden())) if (configDescriptor != null && config != null && !configDescriptor.getItems().stream().allMatch(item -> item.getItem().hidden()))
{ {
configButton.addActionListener(e -> configButton.addActionListener(e ->
{ {