From 395fd1f5193e35b70fba0c08c0ebbac69e9655b9 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 8 Jul 2020 17:44:51 -0400 Subject: [PATCH] config: minor plugin panel cleanup --- .../client/plugins/config/PluginListItem.java | 2 -- .../client/plugins/config/PluginListPanel.java | 18 +++++++++--------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java index 2c5cfe5bbd..0569944009 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java @@ -100,8 +100,6 @@ class PluginListItem extends JPanel keywords.add(mf.getInternalName()); } - final List popupMenuItems = new ArrayList<>(); - setLayout(new BorderLayout(3, 0)); setPreferredSize(new Dimension(PluginPanel.PANEL_WIDTH, 20)); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListPanel.java index 72d5d4cf36..c27cc2c800 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListPanel.java @@ -87,7 +87,6 @@ class PluginListPanel extends PluginPanel private final ConfigManager configManager; private final PluginManager pluginManager; - private final ScheduledExecutorService executorService; private final Provider configPanelProvider; private final List fakePlugins = new ArrayList<>(); @@ -117,7 +116,6 @@ class PluginListPanel extends PluginPanel this.configManager = configManager; this.pluginManager = pluginManager; this.externalPluginManager = externalPluginManager; - this.executorService = executorService; this.configPanelProvider = configPanelProvider; muxer = new MultiplexingPluginPanel(this) @@ -214,14 +212,16 @@ class PluginListPanel extends PluginPanel config, configDescriptor); }) - ).map(desc -> - { - PluginListItem listItem = new PluginListItem(this, desc); - listItem.setPinned(pinnedPlugins.contains(desc.getName())); - return listItem; - }).collect(Collectors.toList()); + ) + .map(desc -> + { + PluginListItem listItem = new PluginListItem(this, desc); + listItem.setPinned(pinnedPlugins.contains(desc.getName())); + return listItem; + }) + .sorted(Comparator.comparing(p -> p.getPluginConfig().getName())) + .collect(Collectors.toList()); - pluginList.sort(Comparator.comparing(p -> p.getPluginConfig().getName())); mainPanel.removeAll(); refresh(); }