From 7ccf52b3b457257e2b4b61ffc5f96bb6fbed1789 Mon Sep 17 00:00:00 2001
From: Adam <Adam@sigterm.info>
Date: Mon, 24 Dec 2018 09:12:31 -0500
Subject: [PATCH] ui: cleanup progress bar

---
 .../runelite/client/plugins/xptracker/XpInfoBox.java |  6 ++++--
 .../runelite/client/ui/components/ProgressBar.java   | 12 ++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java
index aeeb514cc4..f5987290eb 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpInfoBox.java
@@ -31,6 +31,7 @@ import java.awt.Dimension;
 import java.io.IOException;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
@@ -213,9 +214,10 @@ class XpInfoBox extends JPanel
 				: "Lvl. " + xpSnapshotSingle.getEndLevel());
 
 			// Add intermediate level positions to progressBar
-			final List<Double> positions = new ArrayList<>();
 			if (xpTrackerConfig.showIntermediateLevels() && xpSnapshotSingle.getEndLevel() - xpSnapshotSingle.getStartLevel() > 1)
 			{
+				final List<Double> positions = new ArrayList<>();
+
 				for (int level = xpSnapshotSingle.getStartLevel() + 1; level < xpSnapshotSingle.getEndLevel(); level++)
 				{
 					double relativeStartExperience = Experience.getXpForLevel(level) - xpSnapshotSingle.getStartGoalXp();
@@ -227,7 +229,7 @@ class XpInfoBox extends JPanel
 			}
 			else
 			{
-				progressBar.setPositions(positions);
+				progressBar.setPositions(Collections.emptyList());
 			}
 
 			progressBar.setToolTipText(String.format(
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/components/ProgressBar.java b/runelite-client/src/main/java/net/runelite/client/ui/components/ProgressBar.java
index c88a762859..b5d335e9fb 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/components/ProgressBar.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/components/ProgressBar.java
@@ -28,7 +28,7 @@ import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import javax.swing.JLabel;
 import javax.swing.SwingConstants;
@@ -49,7 +49,7 @@ public class ProgressBar extends DimmableJPanel
 	private int value;
 
 	@Setter
-	private List<Double> positions = new ArrayList<>();
+	private List<Double> positions = Collections.emptyList();
 
 	private final JLabel leftLabel = new JShadowedLabel();
 	private final JLabel rightLabel = new JShadowedLabel();
@@ -88,8 +88,8 @@ public class ProgressBar extends DimmableJPanel
 	@Override
 	public void paint(Graphics g)
 	{
-		double percentage = getPercentage();
-		int topWidth = (int) (getSize().width * (percentage / 100));
+		int percentage = getPercentage();
+		int topWidth = (int) (getSize().width * (percentage / 100f));
 
 		super.paint(g);
 		g.setColor(getForeground());
@@ -98,7 +98,7 @@ public class ProgressBar extends DimmableJPanel
 
 		for (final Double position : positions)
 		{
-			final int xCord = (int) (getSize().width * (position));
+			final int xCord = (int) (getSize().width * position);
 			if (xCord > topWidth)
 			{
 				g.fillRect(xCord, 0, 1, 16);
@@ -149,7 +149,7 @@ public class ProgressBar extends DimmableJPanel
 		centerLabel.setText(isDimmed() ? txt : centerLabelText);
 	}
 
-	public double getPercentage()
+	public int getPercentage()
 	{
 		if (value == 0)
 		{