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

Merge pull request #2154 from Im2be/inventorysetups-sorted-combobox

Browse Source 
inventorysetups: Add sorting to the JComboBox
This commit is contained in:
ST0NEWALL
2019-12-24 02:54:46 -05:00
committed by GitHub
parent 0187672557 a079e16e95
commit 25d0cd96ad
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java
View File

@@ -32,10 +32,12 @@ import java.awt.Color;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
@@ -213,7 +215,7 @@ public class InventorySetupPlugin extends Plugin
SwingUtilities.invokeLater(() -> SwingUtilities.invokeLater(() ->
{ {
inventorySetups.put(name, invSetup); inventorySetups.put(name, invSetup);
panel.addInventorySetup(name); panel.addInventorySetupUnsorted(name);
panel.setCurrentInventorySetup(name); panel.setCurrentInventorySetup(name);
updateConfig(); updateConfig();
@@ -305,7 +307,7 @@ public class InventorySetupPlugin extends Plugin
inventorySetups.putAll(gson.fromJson(json, type)); inventorySetups.putAll(gson.fromJson(json, type));
} }
for (final String key : inventorySetups.keySet()) for (final String key : inventorySetups.keySet().stream().sorted(Comparator.comparing(String::toLowerCase)).collect(Collectors.toList()))
{ {
panel.addInventorySetup(key); panel.addInventorySetup(key);
} }

15
runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/ui/InventorySetupPluginPanel.java
View File

@@ -275,6 +275,19 @@ public class InventorySetupPluginPanel extends PluginPanel
setupComboBox.addItem(name); setupComboBox.addItem(name);
} }
public void addInventorySetupUnsorted(final String name)
{
for (int i = 1; i < setupComboBox.getItemCount(); ++i)
{
if (setupComboBox.getItemAt(i).toLowerCase().compareTo(name.toLowerCase()) > 0)
{
setupComboBox.insertItemAt(name, i);
return;
}
}
setupComboBox.addItem(name);
}
public void removeInventorySetup(final String name) public void removeInventorySetup(final String name)
{ {
setupComboBox.removeItem(name); setupComboBox.removeItem(name);
@@ -307,4 +320,4 @@ public class InventorySetupPluginPanel extends PluginPanel
{ {
return (String) setupComboBox.getSelectedItem(); return (String) setupComboBox.getSelectedItem();
} }
} }