General cleanup

7 files changed, 35 insertions, 26 deletions

diff --git a/Essentials/src/net/ess3/commands/Commandfly.java b/Essentials/src/net/ess3/commands/Commandfly.java
index 61cc2f69a..1d08276e2 100644
--- a/Essentials/src/net/ess3/commands/Commandfly.java
+++ b/Essentials/src/net/ess3/commands/Commandfly.java
@@ -24,10 +24,12 @@ public class Commandfly extends EssentialsToggleCommand
 
 	protected void informSender(final CommandSender sender, final boolean value, final IUser player)
 	{
-		if (value) {
-			sender.sendMessage( _("flyMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName()));
+		if (value)
+		{
+			sender.sendMessage(_("flyMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName()));
 		}
-		else {
+		else
+		{
 			//TODO: TL this
 			sender.sendMessage("Can't change fly mode for player " + player.getName());
 		}
@@ -39,7 +41,7 @@ public class Commandfly extends EssentialsToggleCommand
 		player.sendMessage(message);
 	}
 
-	protected boolean canToggleOthers(final IUser user)
+	protected boolean canEditOthers(final IUser user)
 	{
 		return Permissions.FLY_OTHERS.isAuthorized(user);
 	}
diff --git a/Essentials/src/net/ess3/commands/Commandgamemode.java b/Essentials/src/net/ess3/commands/Commandgamemode.java
index 82ef23135..ebfad400a 100644
--- a/Essentials/src/net/ess3/commands/Commandgamemode.java
+++ b/Essentials/src/net/ess3/commands/Commandgamemode.java
@@ -41,7 +41,7 @@ public class Commandgamemode extends EssentialsSettingsCommand
 		player.sendMessage(message);
 	}
 
-	protected boolean canToggleOthers(final IUser user)
+	protected boolean canEditOthers(final IUser user)
 	{
 		return Permissions.GAMEMODE_OTHERS.isAuthorized(user);
 	}
diff --git a/Essentials/src/net/ess3/commands/Commandgod.java b/Essentials/src/net/ess3/commands/Commandgod.java
index 2d2af4fc1..16d1e75bd 100644
--- a/Essentials/src/net/ess3/commands/Commandgod.java
+++ b/Essentials/src/net/ess3/commands/Commandgod.java
@@ -1,9 +1,10 @@
 package net.ess3.commands;
 
 import static net.ess3.I18n._;
+import org.bukkit.command.CommandSender;
 import net.ess3.api.IUser;
 import net.ess3.permissions.Permissions;
-import org.bukkit.command.CommandSender;
+
 
 public class Commandgod extends EssentialsToggleCommand
 {
@@ -20,10 +21,12 @@ public class Commandgod extends EssentialsToggleCommand
 
 	protected void informSender(final CommandSender sender, final boolean value, final IUser player)
 	{
-		if (value) {
-			sender.sendMessage( _("godMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName()));
+		if (value)
+		{
+			sender.sendMessage(_("godMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName()));
 		}
-		else {
+		else
+		{
 			//TODO: TL this
 			sender.sendMessage("Can't change god mode for player " + player.getName());
 		}
@@ -35,7 +38,7 @@ public class Commandgod extends EssentialsToggleCommand
 		player.sendMessage(message);
 	}
 
-	protected boolean canToggleOthers(final IUser user)
+	protected boolean canEditOthers(final IUser user)
 	{
 		return Permissions.GOD_OTHERS.isAuthorized(user);
 	}
diff --git a/Essentials/src/net/ess3/commands/Commandsocialspy.java b/Essentials/src/net/ess3/commands/Commandsocialspy.java
index 3e5c47007..2fe2c9ee9 100644
--- a/Essentials/src/net/ess3/commands/Commandsocialspy.java
+++ b/Essentials/src/net/ess3/commands/Commandsocialspy.java
@@ -37,7 +37,7 @@ public class Commandsocialspy extends EssentialsToggleCommand
 		player.sendMessage(message);
 	}
 
-	protected boolean canToggleOthers(final IUser user)
+	protected boolean canEditOthers(final IUser user)
 	{
 		return Permissions.SOCIALSPY_OTHERS.isAuthorized(user);
 	}
diff --git a/Essentials/src/net/ess3/commands/Commandtptoggle.java b/Essentials/src/net/ess3/commands/Commandtptoggle.java
index bc75d6d18..608de5565 100644
--- a/Essentials/src/net/ess3/commands/Commandtptoggle.java
+++ b/Essentials/src/net/ess3/commands/Commandtptoggle.java
@@ -22,10 +22,12 @@ public class Commandtptoggle extends EssentialsToggleCommand
 
 	protected void informSender(final CommandSender sender, final boolean value, final IUser player)
 	{
-		if (value) {
-			sender.sendMessage( _("teleportMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName()));
+		if (value)
+		{
+			sender.sendMessage(_("teleportMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName()));
 		}
-		else {
+		else
+		{
 			//TODO: TL this
 			sender.sendMessage("Can't change teleport toggle for player " + player.getName());
 		}
@@ -37,7 +39,7 @@ public class Commandtptoggle extends EssentialsToggleCommand
 		player.sendMessage(message);
 	}
 
-	protected boolean canToggleOthers(final IUser user)
+	protected boolean canEditOthers(final IUser user)
 	{
 		return Permissions.TPTOGGLE_OTHERS.isAuthorized(user);
 	}
diff --git a/Essentials/src/net/ess3/commands/Commandvanish.java b/Essentials/src/net/ess3/commands/Commandvanish.java
index 18baee384..2269755c2 100644
--- a/Essentials/src/net/ess3/commands/Commandvanish.java
+++ b/Essentials/src/net/ess3/commands/Commandvanish.java
@@ -20,10 +20,12 @@ public class Commandvanish extends EssentialsToggleCommand
 
 	protected void informSender(final CommandSender sender, final boolean value, final IUser player)
 	{
-		if (value) {
-			sender.sendMessage( _("vanishMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName()));
+		if (value)
+		{
+			sender.sendMessage(_("vanishMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName()));
 		}
-		else {
+		else
+		{
 			//TODO: TL this
 			sender.sendMessage("Can't change vanish mode for player " + player.getName());
 		}
@@ -34,7 +36,7 @@ public class Commandvanish extends EssentialsToggleCommand
 		player.sendMessage(getValue(player) ? _("vanished") : _("unvanished"));
 	}
 
-	protected boolean canToggleOthers(final IUser user)
+	protected boolean canEditOthers(final IUser user)
 	{
 		return Permissions.VANISH_OTHERS.isAuthorized(user);
 	}
diff --git a/Essentials/src/net/ess3/commands/EssentialsSettingsCommand.java b/Essentials/src/net/ess3/commands/EssentialsSettingsCommand.java
index fd0250dbd..d3559222b 100644
--- a/Essentials/src/net/ess3/commands/EssentialsSettingsCommand.java
+++ b/Essentials/src/net/ess3/commands/EssentialsSettingsCommand.java
@@ -13,7 +13,7 @@ public abstract class EssentialsSettingsCommand extends EssentialsCommand
 
 	abstract protected void informPlayer(final IUser player);
 
-	abstract protected boolean canToggleOthers(final IUser user);
+	abstract protected boolean canEditOthers(final IUser user);
 
 	abstract protected boolean isExempt(final CommandSender sender, final IUser player);
 
@@ -34,15 +34,15 @@ public abstract class EssentialsSettingsCommand extends EssentialsCommand
 			throw new NotEnoughArgumentsException();
 		}
 
-		toggleOtherPlayers(server, sender, args);
+		editOtherPlayers(server, sender, args);
 	}
 
 	@Override
 	protected void run(final IUser user, final String commandLabel, final String[] args) throws Exception
 	{
-		if (args.length > 1 && args[0].trim().length() > 2 && canToggleOthers(user))
+		if (args.length > 1 && args[0].trim().length() > 2 && canEditOthers(user))
 		{
-			toggleOtherPlayers(server, user, args);
+			editOtherPlayers(server, user, args);
 			return;
 		}
 		else if (args.length > 0)
@@ -51,9 +51,9 @@ public abstract class EssentialsSettingsCommand extends EssentialsCommand
 			{
 				playerMatch(user, args[0]);
 			}
-			else if (args[0].trim().length() > 2 && canToggleOthers(user))
+			else if (args[0].trim().length() > 2 && canEditOthers(user))
 			{
-				toggleOtherPlayers(server, user, args);
+				editOtherPlayers(server, user, args);
 				return;
 			}
 		}
@@ -64,7 +64,7 @@ public abstract class EssentialsSettingsCommand extends EssentialsCommand
 		informPlayer(user);
 	}
 
-	private void toggleOtherPlayers(final Server server, final CommandSender sender, final String[] args) throws NotEnoughArgumentsException
+	private void editOtherPlayers(final Server server, final CommandSender sender, final String[] args) throws NotEnoughArgumentsException
 	{
 		Set<IUser> matches = toggleOfflinePlayers() ? ess.getUserMap().matchUsers(args[0], true) : ess.getUserMap().matchUsersExcludingHidden(
 				args[0], getPlayerOrNull(sender));