From 59cbfcf7feabbf9ffb3ce57de4231cf5e345dd8a Mon Sep 17 00:00:00 2001 From: sdburns1998 Date: Sun, 7 Jul 2019 18:44:07 +0200 Subject: [PATCH] skillcalculator: Use interface instead of type --- .../skillcalculator/BankedCalculator.java | 4 ++-- .../skillcalculator/SkillCalculator.java | 2 +- .../skillcalculator/SkillCalculatorPanel.java | 3 ++- .../skillcalculator/banked/CriticalItem.java | 17 +++++++++-------- .../skillcalculator/banked/beans/Activity.java | 9 +++++---- .../banked/ui/CriticalItemPanel.java | 3 +-- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java index ae5ce3e111..d76fec32a7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/BankedCalculator.java @@ -256,7 +256,7 @@ public class BankedCalculator extends JPanel private void calculatedBankedMaps() { // Grab all CriticalItems for this skill - ArrayList items = CriticalItem.getBySkillName(currentSkill); + List items = CriticalItem.getBySkillName(currentSkill); // Loop over all Critical Items for this skill and determine how many are in the bank for (CriticalItem item : items) @@ -414,7 +414,7 @@ public class BankedCalculator extends JPanel for (String category : CriticalItem.getSkillCategories(currentSkill)) { - ArrayList items = CriticalItem.getItemsForSkillCategories(currentSkill, category); + List items = CriticalItem.getItemsForSkillCategories(currentSkill, category); for (CriticalItem item : items) { Integer amount = bankMap.get(item.getItemID()); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java index de8b340c08..e0b614a95a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java @@ -74,7 +74,7 @@ class SkillCalculator extends JPanel @Getter(AccessLevel.PACKAGE) private final UICombinedActionSlot combinedActionSlot; @Getter(AccessLevel.PACKAGE) - private final ArrayList combinedActionSlots = new ArrayList<>(); + private final List combinedActionSlots = new ArrayList<>(); private final List bonusCheckBoxes = new ArrayList<>(); private final IconTextField searchBar = new IconTextField(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java index bef7020240..ff5e9eda1d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPanel.java @@ -32,6 +32,7 @@ import java.awt.GridBagLayout; import java.awt.GridLayout; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Objects; import javax.inject.Singleton; @@ -64,7 +65,7 @@ class SkillCalculatorPanel extends PluginPanel private final MaterialTabGroup skillGroup; private final MaterialTabGroup tabGroup; private String currentTab; - private ArrayList tabs = new ArrayList<>(); + private List tabs = new ArrayList<>(); @Getter private Map bankMap = new HashMap<>(); private GridBagConstraints c; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/CriticalItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/CriticalItem.java index 688a00d3c6..983526c59a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/CriticalItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/CriticalItem.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.skillcalculator.banked; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Set; import lombok.Getter; @@ -320,9 +321,9 @@ public enum CriticalItem } // Builds a Map to reduce looping frequency - private static Map> buildSkillItemMap() + private static Map> buildSkillItemMap() { - Map> map = new HashMap<>(); + Map> map = new HashMap<>(); for (CriticalItem item : values()) { map.computeIfAbsent(item.getSkill(), e -> new ArrayList<>()).add(item); @@ -331,9 +332,9 @@ public enum CriticalItem return map; } - private static final Map> bySkillName = buildSkillItemMap(); + private static final Map> bySkillName = buildSkillItemMap(); - public static ArrayList getBySkillName(Skill skill) + public static List getBySkillName(Skill skill) { return bySkillName.get(skill); } @@ -358,9 +359,9 @@ public enum CriticalItem } // Builds a Map to reduce looping frequency - private static Map> buildItemSkillCategoryMap() + private static Map> buildItemSkillCategoryMap() { - Map> map = new HashMap<>(); + Map> map = new HashMap<>(); for (CriticalItem item : values()) { String key = item.getCategory() + item.skill.getName(); @@ -370,9 +371,9 @@ public enum CriticalItem return map; } - private static final Map> itemsBySkillCategory = buildItemSkillCategoryMap(); + private static final Map> itemsBySkillCategory = buildItemSkillCategoryMap(); - public static ArrayList getItemsForSkillCategories(Skill skill, String category) + public static List getItemsForSkillCategories(Skill skill, String category) { return itemsBySkillCategory.get(category + skill.getName()); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java index 8d2b122119..080dad9cb9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/beans/Activity.java @@ -26,6 +26,7 @@ package net.runelite.client.plugins.skillcalculator.banked.beans; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import lombok.AccessLevel; import lombok.Getter; @@ -377,7 +378,7 @@ public enum Activity private static final Map> byCriticalItem = buildItemMap(); - public static ArrayList getByCriticalItem(CriticalItem item) + public static List getByCriticalItem(CriticalItem item) { return byCriticalItem.getOrDefault(item, new ArrayList<>()); @@ -390,10 +391,10 @@ public enum Activity * @param limitLevel Level to check Activitiy requirements against. -1 or 0 value disables limits * @return an empty list if no activities */ - public static ArrayList getByCriticalItem(CriticalItem item, int limitLevel) + public static List getByCriticalItem(CriticalItem item, int limitLevel) { - ArrayList activities = getByCriticalItem(item); - ArrayList l = new ArrayList<>(); + List activities = getByCriticalItem(item); + List l = new ArrayList<>(); if (limitLevel <= 0) { return l; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/ui/CriticalItemPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/ui/CriticalItemPanel.java index a6af1138ef..1b12419ec0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/ui/CriticalItemPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/banked/ui/CriticalItemPanel.java @@ -36,7 +36,6 @@ import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; import java.io.IOException; import java.text.DecimalFormat; -import java.util.ArrayList; import java.util.List; import java.util.Map; import javax.imageio.ImageIO; @@ -298,7 +297,7 @@ public class CriticalItemPanel extends JPanel private JPanel createActivitiesPanel() { - ArrayList activities = Activity.getByCriticalItem(item); + List activities = Activity.getByCriticalItem(item); if (activities == null || activities.size() == 1) { return null;