From 85364cf910d30d589f6a38cbead3126ed2176559 Mon Sep 17 00:00:00 2001
From: Pingex <pingex@pingex.net>
Date: Sat, 24 Dec 2016 18:18:12 +0100
Subject: [PATCH] Refactored GCM part 2/2. Also removed unused imports in the
 same class.

---
 .../java/net/pingex/dcf/DiscordCommandableFramework.java   | 4 ++--
 ...nnectionsManager.java => GatewayConnectionManager.java} | 7 ++-----
 .../net/pingex/dcf/modularity/events/EventManager.java     | 6 +++---
 3 files changed, 7 insertions(+), 10 deletions(-)
 rename src/main/java/net/pingex/dcf/core/{GatewayConnectionsManager.java => GatewayConnectionManager.java} (93%)

diff --git a/src/main/java/net/pingex/dcf/DiscordCommandableFramework.java b/src/main/java/net/pingex/dcf/DiscordCommandableFramework.java
index 5ce5a3b..db1a357 100644
--- a/src/main/java/net/pingex/dcf/DiscordCommandableFramework.java
+++ b/src/main/java/net/pingex/dcf/DiscordCommandableFramework.java
@@ -3,7 +3,7 @@ package net.pingex.dcf;
 import net.pingex.dcf.commands.CommandRegistry;
 import net.pingex.dcf.commands.InternalCommands;
 import net.pingex.dcf.core.Configuration;
-import net.pingex.dcf.core.GatewayConnectionsManager;
+import net.pingex.dcf.core.GatewayConnectionManager;
 import net.pingex.dcf.modularity.PluginLoader;
 import net.pingex.dcf.permissions.PermissionsCommands;
 import org.apache.logging.log4j.LogManager;
@@ -41,7 +41,7 @@ public class DiscordCommandableFramework
 		ClientBuilder builder = new ClientBuilder();
 		if(Configuration.isConnectionToken())	builder.withToken(Configuration.CONNECTION_TOKEN);
 		else									builder.withLogin(Configuration.CONNECTION_USERNAME, Configuration.CONNECTION_PASSWORD);
-		GatewayConnectionsManager.registerConnection(builder);
+		GatewayConnectionManager.registerConnection(builder);
 
 		// Register internal commands
 		new InternalCommands().getCommands().forEach(CommandRegistry::registerCommand);
diff --git a/src/main/java/net/pingex/dcf/core/GatewayConnectionsManager.java b/src/main/java/net/pingex/dcf/core/GatewayConnectionManager.java
similarity index 93%
rename from src/main/java/net/pingex/dcf/core/GatewayConnectionsManager.java
rename to src/main/java/net/pingex/dcf/core/GatewayConnectionManager.java
index 1bf3c5c..7da8ceb 100644
--- a/src/main/java/net/pingex/dcf/core/GatewayConnectionsManager.java
+++ b/src/main/java/net/pingex/dcf/core/GatewayConnectionManager.java
@@ -1,20 +1,17 @@
 package net.pingex.dcf.core;
 
-import net.pingex.dcf.util.DiscordInteractionsUtil;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import sx.blah.discord.api.ClientBuilder;
 import sx.blah.discord.api.IDiscordClient;
 import sx.blah.discord.util.DiscordException;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 
 /**
  * Storage of all active connection to Discord gateway
  */
-public class GatewayConnectionsManager
+public class GatewayConnectionManager
 {
 	/**
 	 * Main connection
@@ -29,7 +26,7 @@ public class GatewayConnectionsManager
 	/**
 	 * Logger
 	 */
-	private static final Logger LOGGER = LogManager.getLogger(GatewayConnectionsManager.class);
+	private static final Logger LOGGER = LogManager.getLogger(GatewayConnectionManager.class);
 
 	/**
 	 * Registers a connection and login automatically, called once in main
diff --git a/src/main/java/net/pingex/dcf/modularity/events/EventManager.java b/src/main/java/net/pingex/dcf/modularity/events/EventManager.java
index a8c7719..57431e8 100644
--- a/src/main/java/net/pingex/dcf/modularity/events/EventManager.java
+++ b/src/main/java/net/pingex/dcf/modularity/events/EventManager.java
@@ -1,10 +1,10 @@
 package net.pingex.dcf.modularity.events;
 
-import net.pingex.dcf.core.GatewayConnectionsManager;
+import net.pingex.dcf.core.GatewayConnectionManager;
 import net.pingex.dcf.modularity.PluginWrapper;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import sx.blah.discord.api.IDiscordClient;
+
 import java.util.HashSet;
 import java.util.Set;
 
@@ -92,6 +92,6 @@ public class EventManager
 	 */
 	public void updateConnectionHandlers()
 	{
-		GatewayConnectionsManager.updateListeners(collectAllHandlers());
+		GatewayConnectionManager.updateListeners(collectAllHandlers());
 	}
 }