Change panel supplier to just getter for panel

As none of the plugins are creating the panels on demand anymore,
supplier for panel is not needed.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-03-09 14:44:14 +01:00
parent 9a54c75113
commit d1cbf181e3
11 changed files with 14 additions and 16 deletions

View File

@@ -78,7 +78,7 @@ public class ConfigPlugin extends Plugin
navButton = NavigationButton.builder() navButton = NavigationButton.builder()
.name("Configuration") .name("Configuration")
.icon(icon) .icon(icon)
.panel(() -> configPanel) .panel(configPanel)
.build(); .build();
pluginToolbar.addNavigation(navButton); pluginToolbar.addNavigation(navButton);

View File

@@ -92,7 +92,7 @@ public class DevToolsPlugin extends Plugin
navButton = NavigationButton.builder() navButton = NavigationButton.builder()
.name("Developer Tools") .name("Developer Tools")
.icon(icon) .icon(icon)
.panel(() -> panel) .panel(panel)
.build(); .build();
pluginToolbar.addNavigation(navButton); pluginToolbar.addNavigation(navButton);

View File

@@ -93,7 +93,7 @@ public class FeedPlugin extends Plugin
navButton = NavigationButton.builder() navButton = NavigationButton.builder()
.name("News Feed") .name("News Feed")
.icon(icon) .icon(icon)
.panel(() -> feedPanel) .panel(feedPanel)
.build(); .build();
pluginToolbar.addNavigation(navButton); pluginToolbar.addNavigation(navButton);

View File

@@ -94,7 +94,7 @@ public class GrandExchangePlugin extends Plugin
button = NavigationButton.builder() button = NavigationButton.builder()
.name("GE Offers") .name("GE Offers")
.icon(icon) .icon(icon)
.panel(() -> panel) .panel(panel)
.build(); .build();
pluginToolbar.addNavigation(button); pluginToolbar.addNavigation(button);

View File

@@ -84,7 +84,7 @@ public class HiscorePlugin extends Plugin
navButton = NavigationButton.builder() navButton = NavigationButton.builder()
.name("Hiscore") .name("Hiscore")
.icon(icon) .icon(icon)
.panel(() -> hiscorePanel) .panel(hiscorePanel)
.build(); .build();
pluginToolbar.addNavigation(navButton); pluginToolbar.addNavigation(navButton);

View File

@@ -58,7 +58,7 @@ public class InfoPlugin extends Plugin
navButton = NavigationButton.builder() navButton = NavigationButton.builder()
.name("Info") .name("Info")
.icon(icon) .icon(icon)
.panel(() -> panel) .panel(panel)
.build(); .build();
pluginToolbar.addNavigation(navButton); pluginToolbar.addNavigation(navButton);

View File

@@ -89,7 +89,7 @@ public class KourendLibraryPlugin extends Plugin
navButton = NavigationButton.builder() navButton = NavigationButton.builder()
.name("Kourend Library") .name("Kourend Library")
.icon(icon) .icon(icon)
.panel(() -> panel) .panel(panel)
.build(); .build();
pluginToolbar.addNavigation(navButton); pluginToolbar.addNavigation(navButton);

View File

@@ -74,7 +74,7 @@ public class NotesPlugin extends Plugin
navButton = NavigationButton.builder() navButton = NavigationButton.builder()
.name("Notes") .name("Notes")
.icon(icon) .icon(icon)
.panel(() -> panel) .panel(panel)
.build(); .build();
pluginToolbar.addNavigation(navButton); pluginToolbar.addNavigation(navButton);

View File

@@ -115,7 +115,7 @@ public class XpTrackerPlugin extends Plugin
navButton = NavigationButton.builder() navButton = NavigationButton.builder()
.name("XP Tracker") .name("XP Tracker")
.icon(icon) .icon(icon)
.panel(() -> xpPanel) .panel(xpPanel)
.build(); .build();
pluginToolbar.addNavigation(navButton); pluginToolbar.addNavigation(navButton);

View File

@@ -39,7 +39,6 @@ import java.awt.Toolkit;
import java.awt.TrayIcon; import java.awt.TrayIcon;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.IOException; import java.io.IOException;
import java.util.function.Supplier;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.inject.Inject; import javax.inject.Inject;
@@ -210,9 +209,9 @@ public class ClientUI
button.setIcon(new ImageIcon(event.getButton().getIcon())); button.setIcon(new ImageIcon(event.getButton().getIcon()));
button.addActionListener(e -> button.addActionListener(e ->
{ {
final Supplier<PluginPanel> panelSupplier = event.getButton().getPanel(); final PluginPanel panel = event.getButton().getPanel();
if (panelSupplier == null) if (panel == null)
{ {
return; return;
} }
@@ -231,7 +230,7 @@ public class ClientUI
{ {
currentButton = button; currentButton = button;
currentButton.setSelected(true); currentButton.setSelected(true);
expand(panelSupplier.get()); expand(panel);
} }
if (event.getButton().getOnClick() != null) if (event.getButton().getOnClick() != null)

View File

@@ -27,7 +27,6 @@ package net.runelite.client.ui;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.util.Map; import java.util.Map;
import java.util.function.Supplier;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@@ -71,9 +70,9 @@ public class NavigationButton
private Runnable onClick; private Runnable onClick;
/** /**
* Supplier for plugin panel, used when expanding and contracting sidebar. * Plugin panel, used when expanding and contracting sidebar.
*/ */
private Supplier<PluginPanel> panel; private PluginPanel panel;
/** /**
* Map of key-value pairs for setting the popup menu * Map of key-value pairs for setting the popup menu