Restore Plugin Toolbar Button Tooltips (runelite#2833)

* Always set button tooltips * Completely remove name property and replace it with tooltips * Make tooltips final
josephcsible · May 19, 2018 · 53f7dea · 53f7dea
1 parent cea85de
commit 53f7dea
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 20 deletions.
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java
@@ -76,7 +76,7 @@ protected void startUp() throws Exception
 		}
 
 		navButton = NavigationButton.builder()
-			.name("Configuration")
+			.tooltip("Configuration")
 			.icon(icon)
 			.priority(0)
 			.panel(configPanel)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java
@@ -120,7 +120,7 @@ protected void startUp() throws Exception
 		}
 
 		navButton = NavigationButton.builder()
-			.name("Developer Tools")
+			.tooltip("Developer Tools")
 			.icon(icon)
 			.priority(1)
 			.panel(panel)

diff --git a/...client/src/main/java/net/runelite/client/plugins/farmingtracker/FarmingTrackerPlugin.java b/...client/src/main/java/net/runelite/client/plugins/farmingtracker/FarmingTrackerPlugin.java
@@ -95,7 +95,7 @@ protected void startUp() throws Exception
 		panel = new FarmingTrackerPanel(client, itemManager, configManager, config, farmingWorld);
 
 		navButton = NavigationButton.builder()
-			.name("Farming Tracker")
+			.tooltip("Farming Tracker")
 			.icon(icon)
 			.panel(panel)
 			.priority(4)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java
@@ -91,7 +91,7 @@ protected void startUp() throws Exception
 		}
 
 		navButton = NavigationButton.builder()
-			.name("News Feed")
+			.tooltip("News Feed")
 			.icon(icon)
 			.priority(8)
 			.panel(feedPanel)

diff --git a/...e-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java b/...e-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
@@ -112,7 +112,7 @@ protected void startUp() throws IOException
 		}
 
 		button = NavigationButton.builder()
-			.name("GE Offers")
+			.tooltip("GE Offers")
 			.icon(icon)
 			.priority(3)
 			.panel(panel)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java
@@ -102,7 +102,7 @@ protected void startUp() throws Exception
 		}
 
 		navButton = NavigationButton.builder()
-			.name("Hiscore")
+			.tooltip("Hiscore")
 			.icon(icon)
 			.priority(5)
 			.panel(hiscorePanel)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java
@@ -56,7 +56,7 @@ protected void startUp() throws Exception
 		}
 
 		navButton = NavigationButton.builder()
-			.name("Info")
+			.tooltip("Info")
 			.icon(icon)
 			.priority(9)
 			.panel(panel)

diff --git a/...client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java b/...client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java
@@ -93,7 +93,7 @@ protected void startUp() throws Exception
 		}
 
 		navButton = NavigationButton.builder()
-			.name("Kourend Library")
+			.tooltip("Kourend Library")
 			.priority(6)
 			.icon(icon)
 			.panel(panel)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java
@@ -72,7 +72,7 @@ protected void startUp() throws Exception
 		}
 
 		navButton = NavigationButton.builder()
-			.name("Notes")
+			.tooltip("Notes")
 			.icon(icon)
 			.priority(7)
 			.panel(panel)

diff --git a/...ient/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java b/...ient/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java
@@ -76,7 +76,7 @@ protected void startUp() throws Exception
 
 		uiPanel = new SkillCalculatorPanel(skillIconManager, client);
 		uiNavigationButton = NavigationButton.builder()
-			.name("Skill Calculator")
+			.tooltip("Skill Calculator")
 			.icon(icon)
 			.priority(6)
 			.panel(uiPanel)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
@@ -120,7 +120,7 @@ protected void startUp() throws Exception
 		}
 
 		navButton = NavigationButton.builder()
-			.name("XP Tracker")
+			.tooltip("XP Tracker")
 			.icon(icon)
 			.priority(2)
 			.panel(xpPanel)

diff --git a/runelite-client/src/main/java/net/runelite/client/ui/NavigationButton.java b/runelite-client/src/main/java/net/runelite/client/ui/NavigationButton.java
@@ -36,14 +36,9 @@
  */
 @Data
 @Builder
-@EqualsAndHashCode(of = {"name", "tooltip"})
+@EqualsAndHashCode(of = {"tooltip"})
 public class NavigationButton
 {
-	/**
-	 * Button name.
-	 */
-	private final String name;
-
 	/**
 	 * Icon of button.
 	 */
@@ -52,7 +47,7 @@ public class NavigationButton
 	/**
 	 * Tooltip to show when hovered.
 	 */
-	private String tooltip;
+	private final String tooltip;
 
 	/**
 	 * Button selection state

diff --git a/runelite-client/src/main/java/net/runelite/client/ui/PluginToolbar.java b/runelite-client/src/main/java/net/runelite/client/ui/PluginToolbar.java
@@ -42,7 +42,7 @@ public class PluginToolbar
 	private final TreeSet<NavigationButton> buttons = new TreeSet<>((a, b) ->
 		ComparisonChain.start()
 			.compare(a.getPriority(), b.getPriority())
-			.compare(a.getName(), b.getName())
+			.compare(a.getTooltip(), b.getTooltip())
 			.result());
 
 	@Inject

diff --git a/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java b/runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java
@@ -311,7 +311,6 @@ public static JButton createSwingButton(
 
 		final JButton button = new JButton();
 		button.setMaximumSize(new Dimension(30, 30));
-		button.setName(navigationButton.getName());
 		button.setToolTipText(navigationButton.getTooltip());
 		button.setIcon(new ImageIcon(scaledImage));
 		button.putClientProperty(SubstanceSynapse.FLAT_LOOK, Boolean.TRUE);