From 99e8acd79f5ba4849aee0c9da1a1a2fcb6fad9f5 Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Mon, 24 Oct 2011 11:11:53 +0200
Subject: [PATCH] Streamlined the faction arg descriptores

---
 src/com/massivecraft/factions/cmd/CmdDeinvite.java      | 2 +-
 src/com/massivecraft/factions/cmd/CmdDisband.java       | 2 +-
 src/com/massivecraft/factions/cmd/CmdInvite.java        | 2 +-
 src/com/massivecraft/factions/cmd/CmdJoin.java          | 2 +-
 src/com/massivecraft/factions/cmd/CmdKick.java          | 2 +-
 src/com/massivecraft/factions/cmd/CmdLeader.java        | 2 +-
 src/com/massivecraft/factions/cmd/CmdMoneyBalance.java  | 2 +-
 src/com/massivecraft/factions/cmd/CmdMoneyDeposit.java  | 2 +-
 src/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java | 2 +-
 src/com/massivecraft/factions/cmd/CmdPower.java         | 2 +-
 src/com/massivecraft/factions/cmd/CmdSethome.java       | 2 +-
 src/com/massivecraft/factions/cmd/CmdShow.java          | 2 +-
 src/com/massivecraft/factions/cmd/CmdTag.java           | 2 +-
 src/com/massivecraft/factions/cmd/CmdTitle.java         | 2 +-
 src/com/massivecraft/factions/cmd/FRelationCommand.java | 4 ++--
 15 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/com/massivecraft/factions/cmd/CmdDeinvite.java b/src/com/massivecraft/factions/cmd/CmdDeinvite.java
index 96b1f5df..ce98edd2 100644
--- a/src/com/massivecraft/factions/cmd/CmdDeinvite.java
+++ b/src/com/massivecraft/factions/cmd/CmdDeinvite.java
@@ -12,7 +12,7 @@ public class CmdDeinvite extends FCommand
 		this.aliases.add("deinvite");
 		this.aliases.add("deinv");
 		
-		this.requiredArgs.add("player name");
+		this.requiredArgs.add("player");
 		//this.optionalArgs.put("", "");
 		
 		this.permission = Permission.DEINVITE.node;
diff --git a/src/com/massivecraft/factions/cmd/CmdDisband.java b/src/com/massivecraft/factions/cmd/CmdDisband.java
index e1e140a8..f41e3480 100644
--- a/src/com/massivecraft/factions/cmd/CmdDisband.java
+++ b/src/com/massivecraft/factions/cmd/CmdDisband.java
@@ -19,7 +19,7 @@ public class CmdDisband extends FCommand
 		this.aliases.add("disband");
 		
 		//this.requiredArgs.add("");
-		this.optionalArgs.put("faction tag", "yours");
+		this.optionalArgs.put("faction", "your");
 		
 		this.permission = Permission.DISBAND.node;
 		this.disableOnLock = true;
diff --git a/src/com/massivecraft/factions/cmd/CmdInvite.java b/src/com/massivecraft/factions/cmd/CmdInvite.java
index 93bf370e..2760577f 100644
--- a/src/com/massivecraft/factions/cmd/CmdInvite.java
+++ b/src/com/massivecraft/factions/cmd/CmdInvite.java
@@ -12,7 +12,7 @@ public class CmdInvite extends FCommand
 		this.aliases.add("invite");
 		this.aliases.add("inv");
 		
-		this.requiredArgs.add("player name");
+		this.requiredArgs.add("player");
 		//this.optionalArgs.put("", "");
 		
 		this.permission = Permission.INVITE.node;
diff --git a/src/com/massivecraft/factions/cmd/CmdJoin.java b/src/com/massivecraft/factions/cmd/CmdJoin.java
index 14b870c4..755bba7e 100644
--- a/src/com/massivecraft/factions/cmd/CmdJoin.java
+++ b/src/com/massivecraft/factions/cmd/CmdJoin.java
@@ -12,7 +12,7 @@ public class CmdJoin extends FCommand
 		super();
 		this.aliases.add("join");
 		
-		this.requiredArgs.add("faction name");
+		this.requiredArgs.add("faction");
 		//this.optionalArgs.put("", "");
 		
 		this.permission = Permission.JOIN.node;
diff --git a/src/com/massivecraft/factions/cmd/CmdKick.java b/src/com/massivecraft/factions/cmd/CmdKick.java
index 52e2426f..b7791c26 100644
--- a/src/com/massivecraft/factions/cmd/CmdKick.java
+++ b/src/com/massivecraft/factions/cmd/CmdKick.java
@@ -16,7 +16,7 @@ public class CmdKick extends FCommand
 		super();
 		this.aliases.add("kick");
 		
-		this.requiredArgs.add("player name");
+		this.requiredArgs.add("player");
 		//this.optionalArgs.put("", "");
 		
 		this.permission = Permission.KICK.node;
diff --git a/src/com/massivecraft/factions/cmd/CmdLeader.java b/src/com/massivecraft/factions/cmd/CmdLeader.java
index 47293549..26efc465 100644
--- a/src/com/massivecraft/factions/cmd/CmdLeader.java
+++ b/src/com/massivecraft/factions/cmd/CmdLeader.java
@@ -12,7 +12,7 @@ public class CmdLeader extends FCommand
 		super();
 		this.aliases.add("leader");
 		
-		this.requiredArgs.add("player name");
+		this.requiredArgs.add("player");
 		//this.optionalArgs.put("", "");
 		
 		this.permission = Permission.LEADER.node;
diff --git a/src/com/massivecraft/factions/cmd/CmdMoneyBalance.java b/src/com/massivecraft/factions/cmd/CmdMoneyBalance.java
index df7b9e6e..d95bf363 100644
--- a/src/com/massivecraft/factions/cmd/CmdMoneyBalance.java
+++ b/src/com/massivecraft/factions/cmd/CmdMoneyBalance.java
@@ -13,7 +13,7 @@ public class CmdMoneyBalance extends FCommand
 		this.aliases.add("balance");
 		
 		//this.requiredArgs.add("");
-		this.optionalArgs.put("faction", "yours");
+		this.optionalArgs.put("faction", "your");
 		
 		this.permission = Permission.MONEY_BALANCE.node;
 		this.setHelpShort("show faction balance");
diff --git a/src/com/massivecraft/factions/cmd/CmdMoneyDeposit.java b/src/com/massivecraft/factions/cmd/CmdMoneyDeposit.java
index da5d007d..3c5a8589 100644
--- a/src/com/massivecraft/factions/cmd/CmdMoneyDeposit.java
+++ b/src/com/massivecraft/factions/cmd/CmdMoneyDeposit.java
@@ -19,7 +19,7 @@ public class CmdMoneyDeposit extends FCommand
 		this.aliases.add("deposit");
 		
 		this.requiredArgs.add("amount");
-		this.optionalArgs.put("faction", "yours");
+		this.optionalArgs.put("faction", "your");
 		
 		this.permission = Permission.MONEY_DEPOSIT.node;
 		this.setHelpShort("deposit money");
diff --git a/src/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java b/src/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java
index 445e6fa3..cc02d62b 100644
--- a/src/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java
+++ b/src/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java
@@ -17,7 +17,7 @@ public class CmdMoneyWithdraw extends FCommand
 		this.aliases.add("withdraw");
 		
 		this.requiredArgs.add("amount");
-		this.optionalArgs.put("faction", "yours");
+		this.optionalArgs.put("faction", "your");
 		
 		this.permission = Permission.MONEY_WITHDRAW.node;
 		this.setHelpShort("withdraw money");
diff --git a/src/com/massivecraft/factions/cmd/CmdPower.java b/src/com/massivecraft/factions/cmd/CmdPower.java
index 909f5507..1826faa3 100644
--- a/src/com/massivecraft/factions/cmd/CmdPower.java
+++ b/src/com/massivecraft/factions/cmd/CmdPower.java
@@ -14,7 +14,7 @@ public class CmdPower extends FCommand
 		this.aliases.add("pow");
 		
 		//this.requiredArgs.add("faction tag");
-		this.optionalArgs.put("player name", "you");
+		this.optionalArgs.put("player", "you");
 		
 		this.permission = Permission.POWER.node;
 		this.disableOnLock = false;
diff --git a/src/com/massivecraft/factions/cmd/CmdSethome.java b/src/com/massivecraft/factions/cmd/CmdSethome.java
index 0e3546a3..219f76db 100644
--- a/src/com/massivecraft/factions/cmd/CmdSethome.java
+++ b/src/com/massivecraft/factions/cmd/CmdSethome.java
@@ -14,7 +14,7 @@ public class CmdSethome extends FCommand
 		this.aliases.add("sethome");
 		
 		//this.requiredArgs.add("");
-		this.optionalArgs.put("faction tag", "mine");
+		this.optionalArgs.put("faction", "your");
 		
 		this.permission = Permission.SETHOME.node;
 		this.disableOnLock = true;
diff --git a/src/com/massivecraft/factions/cmd/CmdShow.java b/src/com/massivecraft/factions/cmd/CmdShow.java
index eb75ce51..e7269810 100644
--- a/src/com/massivecraft/factions/cmd/CmdShow.java
+++ b/src/com/massivecraft/factions/cmd/CmdShow.java
@@ -20,7 +20,7 @@ public class CmdShow extends FCommand
 		this.aliases.add("who");
 		
 		//this.requiredArgs.add("");
-		this.optionalArgs.put("faction tag", "yours");
+		this.optionalArgs.put("faction", "your");
 		
 		this.permission = Permission.SHOW.node;
 		this.disableOnLock = false;
diff --git a/src/com/massivecraft/factions/cmd/CmdTag.java b/src/com/massivecraft/factions/cmd/CmdTag.java
index 42348a74..9c569fc9 100644
--- a/src/com/massivecraft/factions/cmd/CmdTag.java
+++ b/src/com/massivecraft/factions/cmd/CmdTag.java
@@ -16,7 +16,7 @@ public class CmdTag extends FCommand
 	{
 		this.aliases.add("tag");
 		
-		this.requiredArgs.add("faction tag");
+		this.requiredArgs.add("new tag");
 		//this.optionalArgs.put("", "");
 		
 		this.permission = Permission.TAG.node;
diff --git a/src/com/massivecraft/factions/cmd/CmdTitle.java b/src/com/massivecraft/factions/cmd/CmdTitle.java
index 8b4ed912..4c98ba8e 100644
--- a/src/com/massivecraft/factions/cmd/CmdTitle.java
+++ b/src/com/massivecraft/factions/cmd/CmdTitle.java
@@ -12,7 +12,7 @@ public class CmdTitle extends FCommand
 	{
 		this.aliases.add("title");
 		
-		this.requiredArgs.add("player name");
+		this.requiredArgs.add("player");
 		this.optionalArgs.put("title", "");
 		
 		this.permission = Permission.TITLE.node;
diff --git a/src/com/massivecraft/factions/cmd/FRelationCommand.java b/src/com/massivecraft/factions/cmd/FRelationCommand.java
index 7e691333..234c1669 100644
--- a/src/com/massivecraft/factions/cmd/FRelationCommand.java
+++ b/src/com/massivecraft/factions/cmd/FRelationCommand.java
@@ -14,8 +14,8 @@ public abstract class FRelationCommand extends FCommand
 	public FRelationCommand()
 	{
 		super();
-		this.requiredArgs.add("faction tag");
-		//this.optionalArgs.put("player name", "you");
+		this.requiredArgs.add("faction");
+		//this.optionalArgs.put("", "");
 		
 		this.permission = Permission.RELATION.node;
 		this.disableOnLock = true;