Cleaned imports across the entire project.

DV8FromTheWorld · May 6, 2016 · df9e060 · df9e060
1 parent e869517
commit df9e060
Show file tree

Hide file tree

Showing 18 changed files with 64 additions and 94 deletions.
diff --git a/src/main/java/net/dv8tion/discord/Permissions.java b/src/main/java/net/dv8tion/discord/Permissions.java
@@ -15,15 +15,15 @@
  */
 package net.dv8tion.discord;
 
+import net.dv8tion.discord.util.Database;
+import net.dv8tion.jda.entities.SelfInfo;
+import net.dv8tion.jda.entities.User;
+
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 
-import net.dv8tion.discord.util.Database;
-import net.dv8tion.jda.entities.SelfInfo;
-import net.dv8tion.jda.entities.User;
-
 public class Permissions
 {
     public static final String ADD_OP = "addOp";

diff --git a/src/main/java/net/dv8tion/discord/Settings.java b/src/main/java/net/dv8tion/discord/Settings.java
@@ -15,11 +15,11 @@
  */
 package net.dv8tion.discord;
 
-import java.util.List;
-
 import net.dv8tion.discord.bridge.BridgeInfo;
 import net.dv8tion.discord.bridge.IrcConnectInfo;
 
+import java.util.List;
+
 /**
  * This code came from Smbarbour's RavenBot
  * https://github.com/MCUpdater/RavenBot/blob/master/src/main/java/org/mcupdater/ravenbot/Settings.java

diff --git a/src/main/java/net/dv8tion/discord/SettingsManager.java b/src/main/java/net/dv8tion/discord/SettingsManager.java
@@ -15,6 +15,11 @@
  */
 package net.dv8tion.discord;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import net.dv8tion.discord.bridge.BridgeInfo;
+import net.dv8tion.discord.bridge.IrcConnectInfo;
+
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -25,12 +30,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import net.dv8tion.discord.bridge.BridgeInfo;
-import net.dv8tion.discord.bridge.IrcConnectInfo;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
 /**
  * This code came directly from Smbarbour's RavenBot.
  * https://github.com/MCUpdater/RavenBot/blob/master/src/main/java/org/mcupdater/ravenbot/SettingsManager.java

diff --git a/src/main/java/net/dv8tion/discord/Yui.java b/src/main/java/net/dv8tion/discord/Yui.java
@@ -15,20 +15,12 @@
  */
 package net.dv8tion.discord;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.List;
-
 import net.dv8tion.discord.bridge.IrcConnectInfo;
 import net.dv8tion.discord.bridge.IrcConnection;
 import net.dv8tion.discord.bridge.endpoint.EndPointInfo;
 import net.dv8tion.discord.bridge.endpoint.EndPointManager;
 import net.dv8tion.discord.commands.*;
 import net.dv8tion.discord.util.Database;
-
 import net.dv8tion.discord.util.GoogleSearch;
 import net.dv8tion.jda.JDA;
 import net.dv8tion.jda.JDABuilder;
@@ -37,6 +29,12 @@
 import org.apache.commons.lang3.StringUtils;
 
 import javax.security.auth.login.LoginException;
+import java.io.File;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.List;
 
 public class Yui
 {

diff --git a/src/main/java/net/dv8tion/discord/bridge/IrcConnectInfo.java b/src/main/java/net/dv8tion/discord/bridge/IrcConnectInfo.java
@@ -15,11 +15,11 @@
  */
 package net.dv8tion.discord.bridge;
 
-import java.util.List;
-
 import org.pircbotx.Configuration;
 import org.pircbotx.PircBotX;
 
+import java.util.List;
+
 public class IrcConnectInfo
 {
     private String identifier;

diff --git a/src/main/java/net/dv8tion/discord/bridge/IrcConnection.java b/src/main/java/net/dv8tion/discord/bridge/IrcConnection.java
@@ -15,15 +15,14 @@
  */
 package net.dv8tion.discord.bridge;
 
-import java.io.IOException;
-
 import net.dv8tion.discord.bridge.endpoint.EndPoint;
 import net.dv8tion.discord.bridge.endpoint.EndPointInfo;
 import net.dv8tion.discord.bridge.endpoint.EndPointManager;
 import net.dv8tion.discord.bridge.endpoint.EndPointMessage;
-
 import net.dv8tion.jda.events.Event;
-import net.dv8tion.jda.events.message.guild.*;
+import net.dv8tion.jda.events.message.guild.GenericGuildMessageEvent;
+import net.dv8tion.jda.events.message.guild.GuildMessageDeleteEvent;
+import net.dv8tion.jda.events.message.guild.GuildMessageEmbedEvent;
 import net.dv8tion.jda.hooks.EventListener;
 import org.pircbotx.Configuration.Builder;
 import org.pircbotx.PircBotX;
@@ -33,6 +32,8 @@
 import org.pircbotx.hooks.events.JoinEvent;
 import org.pircbotx.hooks.events.MessageEvent;
 
+import java.io.IOException;
+
 public class IrcConnection extends ListenerAdapter<PircBotX> implements EventListener
 {
     public static final int MESSAGE_DELAY_AMOUNT = 250;

diff --git a/src/main/java/net/dv8tion/discord/bridge/endpoint/EndPointManager.java b/src/main/java/net/dv8tion/discord/bridge/endpoint/EndPointManager.java
@@ -15,12 +15,12 @@
  */
 package net.dv8tion.discord.bridge.endpoint;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import net.dv8tion.discord.bridge.endpoint.types.DiscordEndPoint;
 import net.dv8tion.discord.bridge.endpoint.types.IrcEndPoint;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class EndPointManager
 {
     private static EndPointManager manager;

diff --git a/src/main/java/net/dv8tion/discord/bridge/endpoint/types/IrcEndPoint.java b/src/main/java/net/dv8tion/discord/bridge/endpoint/types/IrcEndPoint.java
@@ -20,7 +20,6 @@
 import net.dv8tion.discord.bridge.endpoint.EndPointInfo;
 import net.dv8tion.discord.bridge.endpoint.EndPointMessage;
 import net.dv8tion.discord.bridge.endpoint.EndPointType;
-
 import org.pircbotx.Channel;
 
 public class IrcEndPoint extends EndPoint

diff --git a/src/main/java/net/dv8tion/discord/commands/AnimeNewsNetworkCommand.java b/src/main/java/net/dv8tion/discord/commands/AnimeNewsNetworkCommand.java
@@ -15,22 +15,19 @@
  */
 package net.dv8tion.discord.commands;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import net.dv8tion.discord.util.Downloader;
 import net.dv8tion.discord.util.GoogleSearch;
-
 import net.dv8tion.discord.util.SearchResult;
 import net.dv8tion.jda.events.message.MessageReceivedEvent;
-import net.dv8tion.jda.events.message.guild.GuildMessageReceivedEvent;
-import net.dv8tion.jda.events.message.priv.PrivateMessageReceivedEvent;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 public class AnimeNewsNetworkCommand extends Command
 {
     public static final String ANIME_URL = "http://www.animenewsnetwork.com/encyclopedia/anime.php?id=";

diff --git a/src/main/java/net/dv8tion/discord/commands/Command.java b/src/main/java/net/dv8tion/discord/commands/Command.java
@@ -15,18 +15,13 @@
  */
 package net.dv8tion.discord.commands;
 
-import java.util.List;
-
 import net.dv8tion.jda.MessageBuilder;
 import net.dv8tion.jda.entities.Message;
-import net.dv8tion.jda.events.message.GenericMessageEvent;
 import net.dv8tion.jda.events.message.MessageReceivedEvent;
-import net.dv8tion.jda.events.message.guild.GuildMessageReceivedEvent;
-import net.dv8tion.jda.events.message.guild.GuildMessageUpdateEvent;
-import net.dv8tion.jda.events.message.priv.PrivateMessageReceivedEvent;
-import net.dv8tion.jda.events.message.priv.PrivateMessageUpdateEvent;
 import net.dv8tion.jda.hooks.ListenerAdapter;
 
+import java.util.List;
+
 public abstract class Command extends ListenerAdapter
 {
     public abstract void onCommand(MessageReceivedEvent e, String[] args);

diff --git a/src/main/java/net/dv8tion/discord/commands/HelpCommand.java b/src/main/java/net/dv8tion/discord/commands/HelpCommand.java
@@ -15,15 +15,16 @@
  */
 package net.dv8tion.discord.commands;
 
-import java.util.*;
-
 import net.dv8tion.jda.MessageBuilder;
 import net.dv8tion.jda.entities.PrivateChannel;
 import net.dv8tion.jda.events.message.MessageReceivedEvent;
-import net.dv8tion.jda.events.message.guild.GuildMessageReceivedEvent;
-import net.dv8tion.jda.events.message.priv.PrivateMessageReceivedEvent;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.TreeMap;
+
 public class HelpCommand extends Command
 {
     private static final String NO_NAME = "No name provided for this command. Sorry!";

diff --git a/src/main/java/net/dv8tion/discord/commands/MyAnimeListCommand.java b/src/main/java/net/dv8tion/discord/commands/MyAnimeListCommand.java
@@ -15,17 +15,16 @@
  */
 package net.dv8tion.discord.commands;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
 import net.dv8tion.discord.util.Downloader;
 import net.dv8tion.discord.util.GoogleSearch;
-
 import net.dv8tion.discord.util.SearchResult;
 import net.dv8tion.jda.events.message.MessageReceivedEvent;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 public class MyAnimeListCommand extends Command
 {
     public static final String ANIME_URL = "http://myanimelist.net/anime/";

diff --git a/src/main/java/net/dv8tion/discord/commands/NyaaCommand.java b/src/main/java/net/dv8tion/discord/commands/NyaaCommand.java
@@ -15,13 +15,13 @@
  */
 package net.dv8tion.discord.commands;
 
+import net.dv8tion.jda.events.message.MessageReceivedEvent;
+import org.apache.commons.lang3.StringUtils;
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import net.dv8tion.jda.events.message.MessageReceivedEvent;
-import org.apache.commons.lang3.StringUtils;
-
 public class NyaaCommand extends Command
 {
     public static final String NYAA_SEARCH_URL = "http://www.nyaa.se/?page=search&term=";

diff --git a/src/main/java/net/dv8tion/discord/commands/ReloadCommand.java b/src/main/java/net/dv8tion/discord/commands/ReloadCommand.java
@@ -15,14 +15,14 @@
  */
 package net.dv8tion.discord.commands;
 
+import net.dv8tion.discord.Permissions;
+import net.dv8tion.discord.Yui;
+import net.dv8tion.jda.events.message.MessageReceivedEvent;
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import net.dv8tion.discord.Yui;
-import net.dv8tion.discord.Permissions;
-import net.dv8tion.jda.events.message.MessageReceivedEvent;
-
 public class ReloadCommand extends Command
 {
     @Override

diff --git a/src/main/java/net/dv8tion/discord/commands/SearchCommand.java b/src/main/java/net/dv8tion/discord/commands/SearchCommand.java
@@ -15,16 +15,15 @@
  */
 package net.dv8tion.discord.commands;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
 import net.dv8tion.discord.util.GoogleSearch;
-
 import net.dv8tion.discord.util.SearchResult;
 import net.dv8tion.jda.events.message.MessageReceivedEvent;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 public class SearchCommand extends Command
 {
 	@Override

diff --git a/src/main/java/net/dv8tion/discord/commands/TestCommand.java b/src/main/java/net/dv8tion/discord/commands/TestCommand.java
@@ -15,16 +15,16 @@
  */
 package net.dv8tion.discord.commands;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
 import net.dv8tion.jda.MessageBuilder;
 import net.dv8tion.jda.events.message.GenericMessageEvent;
 import net.dv8tion.jda.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.events.message.guild.GenericGuildMessageEvent;
 import net.dv8tion.jda.events.message.priv.GenericPrivateMessageEvent;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 public class TestCommand extends Command
 {
     @Override

diff --git a/src/main/java/net/dv8tion/discord/util/Downloader.java b/src/main/java/net/dv8tion/discord/util/Downloader.java
@@ -15,20 +15,12 @@
  */
 package net.dv8tion.discord.util;
 
+import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.*;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import javax.imageio.ImageIO;
-
 public class Downloader
 {
     public static String webpage(String urlText)

diff --git a/src/main/java/net/dv8tion/discord/util/GoogleSearch.java b/src/main/java/net/dv8tion/discord/util/GoogleSearch.java
@@ -15,29 +15,19 @@
  */
 package net.dv8tion.discord.util;
 
+import org.json.JSONArray;
+import org.json.JSONObject;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLConnection;
-import java.net.URLDecoder;
-import java.time.Instant;
 import java.time.LocalDateTime;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
 
-import net.dv8tion.discord.Permissions;
-import org.apache.commons.lang3.StringEscapeUtils;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParser;
-import org.json.JSONArray;
-import org.json.JSONObject;
-
 public class GoogleSearch
 {
     public static final String GOOGLE_URL = "https://www.googleapis.com/customsearch/v1?cx=%s&key=%s&num=%d&q=%s";