Lots of cleanup :: remove some unused variables :: add comments for future reference

14 files changed, 29 insertions, 33 deletions

diff --git a/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java b/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java
index ad6445c23..7333a7414 100644
--- a/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java
+++ b/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java
@@ -21,7 +21,7 @@ import net.ess3.utils.FormatUtil;
 
 public class EssentialsSign
 {
-	private static final Set<Material> EMPTY_SET = new HashSet<Material>();
+	private static final Set<Material> EMPTY_SET = new HashSet<Material>(); // Would an Enum be better here?
 	protected transient final String signName;
 
 	public EssentialsSign(final String signName)
@@ -254,7 +254,7 @@ public class EssentialsSign
 	{
 		return EMPTY_SET;
 	}
-
+	
 	protected final void validateTrade(final ISign sign, final int index, final IEssentials ess) throws SignException
 	{
 		final String line = sign.getLine(index).trim();
diff --git a/EssentialsSigns/src/net/ess3/signs/SignConfig.java b/EssentialsSigns/src/net/ess3/signs/SignConfig.java
index 4964333eb..1008512ea 100644
--- a/EssentialsSigns/src/net/ess3/signs/SignConfig.java
+++ b/EssentialsSigns/src/net/ess3/signs/SignConfig.java
@@ -35,6 +35,6 @@ public class SignConfig implements StorageObject
 	public int getSignUsePerSecond()
 	{
 
-		return signUsesPerSecond > 0 ? signUsesPerSecond : 1;
+		return signUsesPerSecond > 0 ? signUsesPerSecond : 1; //This needs to be ported from 2.9
 	}
 }
diff --git a/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java b/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java
index 96d1326a4..9c62337c4 100644
--- a/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java
+++ b/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java
@@ -2,9 +2,9 @@ package net.ess3.signs;
 
 import java.io.File;
 import java.util.*;
-import org.bukkit.plugin.Plugin;
 import net.ess3.api.IEssentials;
 import net.ess3.storage.AsyncStorageObjectHolder;
+import org.bukkit.plugin.Plugin;
 
 
 public class SignsConfigHolder extends AsyncStorageObjectHolder<SignConfig>
diff --git a/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java b/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java
index adc53729f..4aa8182b5 100644
--- a/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java
+++ b/EssentialsSigns/src/net/ess3/signs/listeners/SignBlockListener.java
@@ -2,6 +2,13 @@ package net.ess3.signs.listeners;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import net.ess3.api.IEssentials;
+import net.ess3.api.IUser;
+import net.ess3.permissions.Permissions;
+import net.ess3.signs.EssentialsSign;
+import net.ess3.signs.ISignsPlugin;
+import net.ess3.signs.Signs;
+import net.ess3.utils.FormatUtil;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.Sign;
@@ -10,14 +17,6 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.*;
-import net.ess3.api.IEssentials;
-import net.ess3.api.ISettings;
-import net.ess3.api.IUser;
-import net.ess3.permissions.Permissions;
-import net.ess3.signs.EssentialsSign;
-import net.ess3.signs.ISignsPlugin;
-import net.ess3.signs.Signs;
-import net.ess3.utils.FormatUtil;
 
 
 public class SignBlockListener implements Listener
@@ -37,7 +36,6 @@ public class SignBlockListener implements Listener
 	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
 	public void onBlockBreak(final BlockBreakEvent event)
 	{
-		ISettings settings = ess.getSettings();
 		if (plugin.getSettings().areSignsDisabled())
 		{
 			return;
diff --git a/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java b/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java
index 8fdebce8e..3c9d63977 100644
--- a/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java
+++ b/EssentialsSigns/src/net/ess3/signs/listeners/SignEntityListener.java
@@ -1,5 +1,8 @@
 package net.ess3.signs.listeners;
 
+import net.ess3.api.IEssentials;
+import net.ess3.signs.EssentialsSign;
+import net.ess3.signs.ISignsPlugin;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.event.EventHandler;
@@ -7,9 +10,6 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityChangeBlockEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
-import net.ess3.api.IEssentials;
-import net.ess3.signs.EssentialsSign;
-import net.ess3.signs.ISignsPlugin;
 
 
 public class SignEntityListener implements Listener
diff --git a/EssentialsSigns/src/net/ess3/signs/listeners/SignPlayerListener.java b/EssentialsSigns/src/net/ess3/signs/listeners/SignPlayerListener.java
index f1460f411..6d6f14b93 100644
--- a/EssentialsSigns/src/net/ess3/signs/listeners/SignPlayerListener.java
+++ b/EssentialsSigns/src/net/ess3/signs/listeners/SignPlayerListener.java
@@ -1,5 +1,8 @@
 package net.ess3.signs.listeners;
 
+import net.ess3.api.IEssentials;
+import net.ess3.signs.EssentialsSign;
+import net.ess3.signs.ISignsPlugin;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.Sign;
@@ -8,9 +11,6 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
-import net.ess3.api.IEssentials;
-import net.ess3.signs.EssentialsSign;
-import net.ess3.signs.ISignsPlugin;
 
 
 public class SignPlayerListener implements Listener
diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java b/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java
index 90acd26f4..50e99a8d7 100644
--- a/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java
+++ b/EssentialsSigns/src/net/ess3/signs/signs/SignEnchant.java
@@ -1,15 +1,15 @@
 package net.ess3.signs.signs;
 
-import static net.ess3.I18n._;
 import java.util.Locale;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.inventory.ItemStack;
+import static net.ess3.I18n._;
 import net.ess3.api.ChargeException;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IUser;
 import net.ess3.bukkit.Enchantments;
 import net.ess3.economy.Trade;
 import net.ess3.signs.EssentialsSign;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.inventory.ItemStack;
 
 
 public class SignEnchant extends EssentialsSign
@@ -66,7 +66,6 @@ public class SignEnchant extends EssentialsSign
 	protected boolean onSignInteract(ISign sign, IUser player, String username, IEssentials ess) throws SignException, ChargeException
 	{
 		final ItemStack search = sign.getLine(1).equals("*") || sign.getLine(1).equalsIgnoreCase("any") ? null : getItemStack(sign.getLine(1), 1, ess);
-		int slot = -1;
 		final Trade charge = getTrade(sign, 3, ess);
 		charge.isAffordableFor(player);
 		final String[] enchantLevel = sign.getLine(2).split(":");
diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignFree.java b/EssentialsSigns/src/net/ess3/signs/signs/SignFree.java
index feac92b86..8c4b29705 100644
--- a/EssentialsSigns/src/net/ess3/signs/signs/SignFree.java
+++ b/EssentialsSigns/src/net/ess3/signs/signs/SignFree.java
@@ -1,13 +1,13 @@
 package net.ess3.signs.signs;
 
 import static net.ess3.I18n._;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IUser;
 import net.ess3.craftbukkit.InventoryWorkaround;
 import net.ess3.economy.Trade;
 import net.ess3.signs.EssentialsSign;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
 
 
 public class SignFree extends EssentialsSign
@@ -34,7 +34,7 @@ public class SignFree extends EssentialsSign
 		}
 
 		item.setAmount(item.getType().getMaxStackSize());
-		InventoryWorkaround.addItems(player.getPlayer().getInventory(), item);
+		InventoryWorkaround.addItems(player.getPlayer().getInventory(), item); //Netbeans doesn't seem to like the addItems call, even though it appears valid.
 		player.sendMessage("Item added to your inventory.");
 		player.getPlayer().updateInventory();
 		//TODO: wait for a fix in bukkit
diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignKit.java b/EssentialsSigns/src/net/ess3/signs/signs/SignKit.java
index fbd32b9f6..fc95f09d6 100644
--- a/EssentialsSigns/src/net/ess3/signs/signs/SignKit.java
+++ b/EssentialsSigns/src/net/ess3/signs/signs/SignKit.java
@@ -1,7 +1,7 @@
 package net.ess3.signs.signs;
 
-import static net.ess3.I18n._;
 import java.util.Locale;
+import static net.ess3.I18n._;
 import net.ess3.api.ChargeException;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IUser;
@@ -61,7 +61,6 @@ public class SignKit extends EssentialsSign
 			charge.isAffordableFor(player);
 			try
 			{
-				;
 				final Kit kit = ess.getKits().getKit(kitName);
 				ess.getKits().checkTime(player, kit);
 				ess.getKits().sendKit(player, kit);
diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignMail.java b/EssentialsSigns/src/net/ess3/signs/signs/SignMail.java
index aca55a6ea..2f93aadb0 100644
--- a/EssentialsSigns/src/net/ess3/signs/signs/SignMail.java
+++ b/EssentialsSigns/src/net/ess3/signs/signs/SignMail.java
@@ -1,7 +1,7 @@
 package net.ess3.signs.signs;
 
-import static net.ess3.I18n._;
 import java.util.List;
+import static net.ess3.I18n._;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IUser;
 import net.ess3.signs.EssentialsSign;
diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignTime.java b/EssentialsSigns/src/net/ess3/signs/signs/SignTime.java
index 77e992f60..d6d65f76d 100644
--- a/EssentialsSigns/src/net/ess3/signs/signs/SignTime.java
+++ b/EssentialsSigns/src/net/ess3/signs/signs/SignTime.java
@@ -1,12 +1,12 @@
 package net.ess3.signs.signs;
 
 import static net.ess3.I18n._;
-import org.bukkit.World;
 import net.ess3.api.ChargeException;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IUser;
 import net.ess3.economy.Trade;
 import net.ess3.signs.EssentialsSign;
+import org.bukkit.World;
 
 
 public class SignTime extends EssentialsSign
diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignTrade.java b/EssentialsSigns/src/net/ess3/signs/signs/SignTrade.java
index 79479e96c..eb95774ea 100644
--- a/EssentialsSigns/src/net/ess3/signs/signs/SignTrade.java
+++ b/EssentialsSigns/src/net/ess3/signs/signs/SignTrade.java
@@ -1,7 +1,6 @@
 package net.ess3.signs.signs;
 
 import static net.ess3.I18n._;
-import org.bukkit.inventory.ItemStack;
 import net.ess3.api.ChargeException;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IUser;
@@ -9,6 +8,7 @@ import net.ess3.economy.Trade;
 import net.ess3.signs.EssentialsSign;
 import net.ess3.signs.SignsPermissions;
 import net.ess3.utils.FormatUtil;
+import org.bukkit.inventory.ItemStack;
 
 
 //TODO: Sell Enchantment on Trade signs?
diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignWarp.java b/EssentialsSigns/src/net/ess3/signs/signs/SignWarp.java
index 8cad890e9..43e4792aa 100644
--- a/EssentialsSigns/src/net/ess3/signs/signs/SignWarp.java
+++ b/EssentialsSigns/src/net/ess3/signs/signs/SignWarp.java
@@ -1,12 +1,12 @@
 package net.ess3.signs.signs;
 
-import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import net.ess3.api.ChargeException;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IUser;
 import net.ess3.economy.Trade;
 import net.ess3.permissions.Permissions;
 import net.ess3.signs.EssentialsSign;
+import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 
 public class SignWarp extends EssentialsSign
diff --git a/EssentialsSigns/src/net/ess3/signs/signs/SignWeather.java b/EssentialsSigns/src/net/ess3/signs/signs/SignWeather.java
index d96c40355..0d428f11d 100644
--- a/EssentialsSigns/src/net/ess3/signs/signs/SignWeather.java
+++ b/EssentialsSigns/src/net/ess3/signs/signs/SignWeather.java
@@ -1,12 +1,12 @@
 package net.ess3.signs.signs;
 
 import static net.ess3.I18n._;
-import org.bukkit.World;
 import net.ess3.api.ChargeException;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IUser;
 import net.ess3.economy.Trade;
 import net.ess3.signs.EssentialsSign;
+import org.bukkit.World;
 
 
 public class SignWeather extends EssentialsSign