From 91ae43dd2d9c89d9ae897e7f1c29d6c98625fa97 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 24 Mar 2020 13:55:29 -0400 Subject: [PATCH] api: make IterableHashTable generic --- runelite-api/src/main/java/net/runelite/api/Client.java | 2 +- .../src/main/java/net/runelite/api/IterableHashTable.java | 4 ++-- .../runelite/client/plugins/chatfilter/ChatFilterPlugin.java | 2 +- .../runelite/client/plugins/timestamp/TimestampPlugin.java | 2 +- .../client/plugins/chatfilter/ChatFilterPluginTest.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java index 31feace4cf..e43a067701 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -861,7 +861,7 @@ public interface Client extends GameEngine * * @return the map */ - IterableHashTable getMessages(); + IterableHashTable getMessages(); /** * Gets the viewport widget. diff --git a/runelite-api/src/main/java/net/runelite/api/IterableHashTable.java b/runelite-api/src/main/java/net/runelite/api/IterableHashTable.java index bc8c23ccd9..48894f1863 100644 --- a/runelite-api/src/main/java/net/runelite/api/IterableHashTable.java +++ b/runelite-api/src/main/java/net/runelite/api/IterableHashTable.java @@ -24,7 +24,7 @@ */ package net.runelite.api; -public interface IterableHashTable extends Iterable +public interface IterableHashTable extends Iterable { - Node get(long hash); + T get(long hash); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java index d78f2c8bcd..67561b0833 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java @@ -135,7 +135,7 @@ public class ChatFilterPlugin extends Plugin return; } - MessageNode messageNode = (MessageNode) client.getMessages().get(messageId); + MessageNode messageNode = client.getMessages().get(messageId); String name = messageNode.getName(); if (!shouldFilterPlayerMessage(name)) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java index b2fb6d3e61..f49a4be15f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java @@ -105,7 +105,7 @@ public class TimestampPlugin extends Plugin int messageId = intStack[intStackSize - 1]; - MessageNode messageNode = (MessageNode) client.getMessages().get(messageId); + MessageNode messageNode = client.getMessages().get(messageId); String timestamp = generateTimestamp(messageNode.getTimestamp(), ZoneId.systemDefault()) + " "; diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java index 07a45e7a29..dfa8a08712 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/chatfilter/ChatFilterPluginTest.java @@ -90,7 +90,7 @@ public class ChatFilterPluginTest int[] simulatedIntStack = new int[]{1, messageType.getType(), 1}; // is msg allowed to show, ChatMessageType.PUBLICCHAT, message id String[] simulatedStringStack = new String[]{chatMessage}; - IterableHashTable messageTable = mock(IterableHashTable.class); + IterableHashTable messageTable = mock(IterableHashTable.class); MessageNode mockedMsgNode = mockMessageNode(sender); when(client.getIntStack()).thenReturn(simulatedIntStack); when(client.getIntStackSize()).thenReturn(simulatedIntStack.length);