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

6 files changed, 13 insertions, 14 deletions

diff --git a/Essentials2Compat/src/com/earth2me/essentials/Essentials.java b/Essentials2Compat/src/com/earth2me/essentials/Essentials.java
index d625586cd..4d61e6b3d 100644
--- a/Essentials2Compat/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials2Compat/src/com/earth2me/essentials/Essentials.java
@@ -1,11 +1,11 @@
 package com.earth2me.essentials;
 
 import java.io.File;
-import org.bukkit.Bukkit;
-import org.bukkit.plugin.java.JavaPlugin;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IItemDb;
 import net.ess3.api.IPlugin;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.java.JavaPlugin;
 
 
 public class Essentials extends JavaPlugin
diff --git a/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java b/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java
index 45f7b8a29..073f45bf5 100644
--- a/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java
+++ b/Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java
@@ -310,6 +310,7 @@ public class EssentialsConf extends YamlConfiguration
 		set(path, map);
 	}
 
+	@Override
 	public long getLong(final String path, final long def)
 	{
 		try
diff --git a/Essentials2Compat/src/com/earth2me/essentials/Settings.java b/Essentials2Compat/src/com/earth2me/essentials/Settings.java
index 406a1a540..221d94414 100644
--- a/Essentials2Compat/src/com/earth2me/essentials/Settings.java
+++ b/Essentials2Compat/src/com/earth2me/essentials/Settings.java
@@ -1,20 +1,20 @@
 package com.earth2me.essentials;
 
-import static net.ess3.I18n._;
 import java.io.File;
 import java.text.MessageFormat;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import static net.ess3.I18n._;
+import net.ess3.api.IEssentials;
 import org.bukkit.ChatColor;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.MemoryConfiguration;
 import org.bukkit.event.EventPriority;
 import org.bukkit.inventory.ItemStack;
-import net.ess3.api.IEssentials;
 
 
-public class Settings implements ISettings
+public final class Settings implements ISettings
 {
 	private final transient EssentialsConf config;
 	private final static Logger logger = Logger.getLogger("Minecraft");
diff --git a/Essentials2Compat/src/com/earth2me/essentials/UpdateUserFiles.java b/Essentials2Compat/src/com/earth2me/essentials/UpdateUserFiles.java
index 957ed9777..c53400efd 100644
--- a/Essentials2Compat/src/com/earth2me/essentials/UpdateUserFiles.java
+++ b/Essentials2Compat/src/com/earth2me/essentials/UpdateUserFiles.java
@@ -1,14 +1,14 @@
 package com.earth2me.essentials;
 
+import com.google.common.io.PatternFilenameFilter;
 import java.io.File;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.logging.Level;
-import org.bukkit.Material;
-import com.google.common.io.PatternFilenameFilter;
 import net.ess3.api.*;
 import net.ess3.user.User;
+import org.bukkit.Material;
 
 
 class UpdateUserFiles
diff --git a/Essentials2Compat/src/com/earth2me/essentials/UserData.java b/Essentials2Compat/src/com/earth2me/essentials/UserData.java
index 078535293..7052ffbca 100644
--- a/Essentials2Compat/src/com/earth2me/essentials/UserData.java
+++ b/Essentials2Compat/src/com/earth2me/essentials/UserData.java
@@ -2,12 +2,12 @@ package com.earth2me.essentials;
 
 import java.io.File;
 import java.util.*;
+import net.ess3.api.IEssentials;
+import net.ess3.storage.StoredLocation;
 import org.bukkit.Location;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.MemoryConfiguration;
 import org.bukkit.inventory.ItemStack;
-import net.ess3.api.IEssentials;
-import net.ess3.storage.StoredLocation;
 
 
 public class UserData
@@ -581,7 +581,7 @@ public class UserData
 		return lastLogin;
 	}
 
-	private void _setLastLogin(long time)
+	private void _setLastLogin(long time) //unused method
 	{
 		lastLogin = time;
 		config.setProperty("timestamps.login", time);
@@ -619,7 +619,7 @@ public class UserData
 		return lastLoginAddress;
 	}
 
-	private void _setLastLoginAddress(String address)
+	private void _setLastLoginAddress(String address) //unused method
 	{
 		lastLoginAddress = address;
 		config.setProperty("ipAddress", address);
@@ -651,7 +651,7 @@ public class UserData
 		return ret;
 	}
 
-	private boolean newplayer;
+	private boolean newplayer; //unused variable
 	private String geolocation;
 
 	private String _getGeoLocation()
diff --git a/Essentials2Compat/src/com/earth2me/essentials/Util.java b/Essentials2Compat/src/com/earth2me/essentials/Util.java
index 1bdc878bb..0500df536 100644
--- a/Essentials2Compat/src/com/earth2me/essentials/Util.java
+++ b/Essentials2Compat/src/com/earth2me/essentials/Util.java
@@ -4,7 +4,6 @@ import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.util.Collection;
 import java.util.Locale;
-import java.util.logging.Logger;
 import java.util.regex.Pattern;
 
 
@@ -14,7 +13,6 @@ public class Util
 	{
 	}
 
-	private final static Logger logger = Logger.getLogger("Minecraft");
 	private final static Pattern INVALIDFILECHARS = Pattern.compile("[^a-z0-9]");
 	private final static Pattern INVALIDCHARS = Pattern.compile("[^\t\n\r\u0020-\u007E\u0085\u00A0-\uD7FF\uE000-\uFFFC]");