From 1b917895f0acb70f65a5953843867c9d7ac2f0d4 Mon Sep 17 00:00:00 2001
From: Adam <Adam@sigterm.info>
Date: Mon, 15 Mar 2021 20:30:42 -0400
Subject: [PATCH] ge plugin: cleanup

---
 .../grandexchange/GrandExchangeOfferSlot.java |  1 -
 .../GrandExchangeOffersPanel.java             | 21 ++++++++++---------
 .../grandexchange/GrandExchangePanel.java     |  8 +++----
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java
index ab9a04f5c2..189336e17e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java
@@ -252,7 +252,6 @@ public class GrandExchangeOfferSlot extends JPanel
 		}
 
 		revalidate();
-		repaint();
 	}
 
 	private String htmlTooltip(String value)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOffersPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOffersPanel.java
index a9100c52a0..da1776234d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOffersPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOffersPanel.java
@@ -30,6 +30,8 @@ import java.awt.CardLayout;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.image.BufferedImage;
+import java.util.Arrays;
+import javax.inject.Inject;
 import javax.swing.JPanel;
 import javax.swing.border.EmptyBorder;
 import net.runelite.api.GrandExchangeOffer;
@@ -56,7 +58,8 @@ class GrandExchangeOffersPanel extends JPanel
 
 	private final GrandExchangeOfferSlot[] offerSlotPanels = new GrandExchangeOfferSlot[MAX_OFFERS];
 
-	GrandExchangeOffersPanel()
+	@Inject
+	private GrandExchangeOffersPanel()
 	{
 		setLayout(new BorderLayout());
 		setBackground(ColorScheme.DARK_GRAY_COLOR);
@@ -96,10 +99,7 @@ class GrandExchangeOffersPanel extends JPanel
 	void resetOffers()
 	{
 		offerPanel.removeAll();
-		for (int i = 0; i < offerSlotPanels.length; i++)
-		{
-			offerSlotPanels[i] = null;
-		}
+		Arrays.fill(offerSlotPanels, null);
 		updateEmptyOffersPanel();
 	}
 
@@ -122,15 +122,16 @@ class GrandExchangeOffersPanel extends JPanel
 		}
 
 		/* If slot was empty, and is now filled, add it to the list */
-		if (offerSlotPanels[slot] == null)
+		GrandExchangeOfferSlot offerSlot = offerSlotPanels[slot];
+		if (offerSlot == null)
 		{
-			GrandExchangeOfferSlot newSlot = new GrandExchangeOfferSlot();
-			offerSlotPanels[slot] = newSlot;
-			offerPanel.add(newSlot, constraints);
+			offerSlot = new GrandExchangeOfferSlot();
+			offerSlotPanels[slot] = offerSlot;
+			offerPanel.add(offerSlot, constraints);
 			constraints.gridy++;
 		}
 
-		offerSlotPanels[slot].updateOffer(item, itemImage, newOffer);
+		offerSlot.updateOffer(item, itemImage, newOffer);
 
 		removeTopMargin();
 
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePanel.java
index a3fc4c70dc..5407e3034c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePanel.java
@@ -48,21 +48,19 @@ class GrandExchangePanel extends PluginPanel
 	@Getter
 	private final GrandExchangeSearchPanel searchPanel;
 	@Getter
-	private GrandExchangeOffersPanel offersPanel;
+	private final GrandExchangeOffersPanel offersPanel;
 
 	@Inject
-	private GrandExchangePanel(GrandExchangeSearchPanel searchPanel)
+	private GrandExchangePanel(GrandExchangeSearchPanel searchPanel, GrandExchangeOffersPanel offersPanel)
 	{
 		super(false);
 
 		this.searchPanel = searchPanel;
+		this.offersPanel = offersPanel;
 
 		setLayout(new BorderLayout());
 		setBackground(ColorScheme.DARK_GRAY_COLOR);
 
-		//Offers Panel
-		offersPanel = new GrandExchangeOffersPanel();
-
 		MaterialTab offersTab = new MaterialTab("Offers", tabGroup, offersPanel);
 		searchTab = new MaterialTab("Search", tabGroup, searchPanel);