From b05432e2c527e7813e9c278cc09803380afc599b Mon Sep 17 00:00:00 2001
From: Scott Burns <sd.burns1998@gmail.com>
Date: Mon, 22 Apr 2019 22:47:37 +0200
Subject: [PATCH] Small refactor to Plugin sorter

---
 .../pluginsorter/PluginSorterPlugin.java      | 76 ++++++++-----------
 1 file changed, 32 insertions(+), 44 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java
index 34285f6ea8..c5d48b0d82 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/pluginsorter/PluginSorterPlugin.java
@@ -76,24 +76,23 @@ public class PluginSorterPlugin extends Plugin {
     public void updateColors() {
         for (PluginListItem pli : ConfigPanel.pluginList) {
             if (pli.getPlugin()!=null) {
-                if (pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type()!=null)
-                    switch (pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type()) {
-                        case EXTERNAL:
-                            pli.nameLabel.setForeground(config.externalColor());
-                            break;
-                        case PVM:
-                            pli.nameLabel.setForeground(config.pvmColor());
-                            break;
-                        case PVP:
-                            pli.nameLabel.setForeground(config.pvpColor());
-                            break;
-                        case UTILITY:
-                            pli.nameLabel.setForeground(config.utilityColor());
-                            break;
-                        default:
-                            pli.nameLabel.setForeground(Color.WHITE);
-                            break;
-                    }
+				switch (pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type()) {
+					case EXTERNAL:
+						pli.nameLabel.setForeground(config.externalColor());
+						break;
+					case PVM:
+						pli.nameLabel.setForeground(config.pvmColor());
+						break;
+					case PVP:
+						pli.nameLabel.setForeground(config.pvpColor());
+						break;
+					case UTILITY:
+						pli.nameLabel.setForeground(config.utilityColor());
+						break;
+					default:
+						pli.nameLabel.setForeground(Color.WHITE);
+						break;
+				}
             }
         }
     }
@@ -103,38 +102,27 @@ public class PluginSorterPlugin extends Plugin {
         while (iter.hasNext()) {
             PluginListItem pli = iter.next();
             if (pli.getPlugin() != null) {
-                if (!pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type().equals(""))
-                    if (pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type().equals("external")) {
-                        iter.remove();
-                        removedPlugins.add(pli);
-                    }
-                if (!pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type().equals(""))
-                    if (pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type().equals("PVM")) {
-                        iter.remove();
-                        removedPlugins.add(pli);
-                    }
-                if (!pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type().equals(""))
-                    if (pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type().equals("PVP")) {
-                        iter.remove();
-                        removedPlugins.add(pli);
-                    }
-                if (!pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type().equals(""))
-                    if (pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type().equals("utility")) {
-                        iter.remove();
-                        removedPlugins.add(pli);
-                    }
+				switch (pli.getPlugin().getClass().getAnnotation(PluginDescriptor.class).type())
+				{
+					case PVM:
+					case PVP:
+					case UTILITY:
+					case EXTERNAL:
+						iter.remove();
+						removedPlugins.add(pli);
+						break;
+					case GENERAL_USE:
+					default:
+						break;
+				}
             }
         }
     }
 
     public void showPlugins() {
         List<PluginListItem> tempList = new ArrayList<>();
-        for (PluginListItem pli : removedPlugins) {
-            tempList.add(pli);
-        }
-        for (PluginListItem pli : ConfigPanel.pluginList) {
-            tempList.add(pli);
-        }
+		tempList.addAll(removedPlugins);
+		tempList.addAll(ConfigPanel.pluginList);
         ConfigPanel.pluginList = tempList;
     }
 }