Cleanup :: Standardize import organization :: lots of comments :: remove unused eco systems

7 files changed, 16 insertions, 18 deletions

diff --git a/EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java
index 05106145e..68609207d 100644
--- a/EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java
+++ b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmpp.java
@@ -1,9 +1,9 @@
 package net.ess3.xmpp;
 
-import org.bukkit.command.CommandSender;
 import net.ess3.Console;
 import net.ess3.commands.EssentialsCommand;
 import net.ess3.commands.NotEnoughArgumentsException;
+import org.bukkit.command.CommandSender;
 
 
 public class Commandxmpp extends EssentialsCommand
diff --git a/EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java
index 0be64d91a..ca78962f6 100644
--- a/EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java
+++ b/EssentialsXMPP/src/net/ess3/xmpp/Commandxmppspy.java
@@ -1,10 +1,10 @@
 package net.ess3.xmpp;
 
 import java.util.List;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 import net.ess3.commands.EssentialsCommand;
 import net.ess3.commands.NotEnoughArgumentsException;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 
 public class Commandxmppspy extends EssentialsCommand
diff --git a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java
index d7241d57b..fbfbbf56a 100644
--- a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java
+++ b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java
@@ -1,19 +1,19 @@
 package net.ess3.xmpp;
 
-import static net.ess3.I18n._;
 import java.util.List;
 import java.util.Locale;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import static net.ess3.I18n._;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IPlugin;
+import net.ess3.api.IUser;
+import net.ess3.commands.EssentialsCommandHandler;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
-import net.ess3.api.IEssentials;
-import net.ess3.api.IPlugin;
-import net.ess3.api.IUser;
-import net.ess3.commands.EssentialsCommandHandler;
 
 
 public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP
diff --git a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java
index c2cd8428d..85676198c 100644
--- a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java
+++ b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPPPlayerListener.java
@@ -1,14 +1,14 @@
 package net.ess3.xmpp;
 
+import net.ess3.api.IEssentials;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerChatEvent;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
-import net.ess3.api.IEssentials;
-
 
+//TODO: port 2.9 changes and verify thread safety.
 class EssentialsXMPPPlayerListener implements Listener
 {
 	private final transient IEssentials ess;
@@ -26,7 +26,7 @@ class EssentialsXMPPPlayerListener implements Listener
 	}
 
 	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPlayerChat(final PlayerChatEvent event)
+	public void onPlayerChat(final AsyncPlayerChatEvent event)
 	{
 		sendMessageToSpyUsers(String.format(event.getFormat(), event.getPlayer().getDisplayName(), event.getMessage()));
 	}
diff --git a/EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java b/EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java
index a464dc398..789ccddc9 100644
--- a/EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java
+++ b/EssentialsXMPP/src/net/ess3/xmpp/IEssentialsXMPP.java
@@ -1,9 +1,9 @@
 package net.ess3.xmpp;
 
 import java.util.List;
+import net.ess3.api.IUser;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.Plugin;
-import net.ess3.api.IUser;
 
 
 public interface IEssentialsXMPP extends Plugin
diff --git a/EssentialsXMPP/src/net/ess3/xmpp/UserManager.java b/EssentialsXMPP/src/net/ess3/xmpp/UserManager.java
index 56da0d7e7..c80680445 100644
--- a/EssentialsXMPP/src/net/ess3/xmpp/UserManager.java
+++ b/EssentialsXMPP/src/net/ess3/xmpp/UserManager.java
@@ -5,8 +5,8 @@ import java.io.IOException;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.bukkit.configuration.file.YamlConfiguration;
 import net.ess3.api.IReload;
+import org.bukkit.configuration.file.YamlConfiguration;
 
 
 public class UserManager implements IReload
diff --git a/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java b/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java
index 740046894..a04ab25d9 100644
--- a/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java
+++ b/EssentialsXMPP/src/net/ess3/xmpp/XMPPManager.java
@@ -3,13 +3,11 @@ package net.ess3.xmpp;
 import java.io.File;
 import java.util.*;
 import java.util.logging.*;
-
-import com.avaje.ebeaninternal.server.transaction.log.SimpleLogger;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
 import net.ess3.api.IReload;
 import net.ess3.api.IUser;
 import net.ess3.utils.FormatUtil;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
 import org.jivesoftware.smack.*;
 import org.jivesoftware.smack.Roster.SubscriptionMode;
 import org.jivesoftware.smack.packet.Message;