From 9068618e8cba511b556e123642325bb6f8d1588b Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Tue, 29 Jan 2013 19:00:10 +0100
Subject: [PATCH] Always case insensitive

---
 ...atchFullCI.java => ARStringMatchFull.java} |  4 +--
 .../mcore5/cmd/arg/ARStringMatchFullCS.java   | 25 ---------------
 ...chStartCI.java => ARStringMatchStart.java} |  4 +--
 .../mcore5/cmd/arg/ARStringMatchStartCS.java  | 32 -------------------
 .../massivecraft/mcore5/store/PlayerColl.java |  8 ++---
 .../massivecraft/mcore5/store/SenderColl.java |  8 ++---
 6 files changed, 12 insertions(+), 69 deletions(-)
 rename src/com/massivecraft/mcore5/cmd/arg/{ARStringMatchFullCI.java => ARStringMatchFull.java} (72%)
 delete mode 100644 src/com/massivecraft/mcore5/cmd/arg/ARStringMatchFullCS.java
 rename src/com/massivecraft/mcore5/cmd/arg/{ARStringMatchStartCI.java => ARStringMatchStart.java} (75%)
 delete mode 100644 src/com/massivecraft/mcore5/cmd/arg/ARStringMatchStartCS.java

diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARStringMatchFullCI.java b/src/com/massivecraft/mcore5/cmd/arg/ARStringMatchFull.java
similarity index 72%
rename from src/com/massivecraft/mcore5/cmd/arg/ARStringMatchFullCI.java
rename to src/com/massivecraft/mcore5/cmd/arg/ARStringMatchFull.java
index aba167b6..a417b91c 100644
--- a/src/com/massivecraft/mcore5/cmd/arg/ARStringMatchFullCI.java
+++ b/src/com/massivecraft/mcore5/cmd/arg/ARStringMatchFull.java
@@ -2,7 +2,7 @@ package com.massivecraft.mcore5.cmd.arg;
 
 import java.util.Collection;
 
-public class ARStringMatchFullCI extends ARAbstractStringMatch
+public class ARStringMatchFull extends ARAbstractStringMatch
 {
 	// -------------------------------------------- //
 	// IMPLEMENTATION
@@ -18,7 +18,7 @@ public class ARStringMatchFullCI extends ARAbstractStringMatch
 	// CONSTRUCT
 	// -------------------------------------------- //
 	
-	public ARStringMatchFullCI(String typename, Collection<Collection<String>> altColls)
+	public ARStringMatchFull(String typename, Collection<Collection<String>> altColls)
 	{
 		super(typename, altColls);
 	}
diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARStringMatchFullCS.java b/src/com/massivecraft/mcore5/cmd/arg/ARStringMatchFullCS.java
deleted file mode 100644
index 3d5a1a00..00000000
--- a/src/com/massivecraft/mcore5/cmd/arg/ARStringMatchFullCS.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.massivecraft.mcore5.cmd.arg;
-
-import java.util.Collection;
-
-public class ARStringMatchFullCS extends ARAbstractStringMatch
-{
-	// -------------------------------------------- //
-	// IMPLEMENTATION
-	// -------------------------------------------- //
-	
-	@Override
-	public Integer matches(String arg, String alt)
-	{
-		return alt.equals(arg) ? 0 : null;
-	}
-
-	// -------------------------------------------- //
-	// CONSTRUCT
-	// -------------------------------------------- //
-	
-	public ARStringMatchFullCS(String typename, Collection<Collection<String>> altColls)
-	{
-		super(typename, altColls);
-	}
-}
diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARStringMatchStartCI.java b/src/com/massivecraft/mcore5/cmd/arg/ARStringMatchStart.java
similarity index 75%
rename from src/com/massivecraft/mcore5/cmd/arg/ARStringMatchStartCI.java
rename to src/com/massivecraft/mcore5/cmd/arg/ARStringMatchStart.java
index 1ab46033..380aafbe 100644
--- a/src/com/massivecraft/mcore5/cmd/arg/ARStringMatchStartCI.java
+++ b/src/com/massivecraft/mcore5/cmd/arg/ARStringMatchStart.java
@@ -2,7 +2,7 @@ package com.massivecraft.mcore5.cmd.arg;
 
 import java.util.Collection;
 
-public class ARStringMatchStartCI extends ARAbstractStringMatch
+public class ARStringMatchStart extends ARAbstractStringMatch
 {
 	// -------------------------------------------- //
 	// IMPLEMENTATION
@@ -27,7 +27,7 @@ public class ARStringMatchStartCI extends ARAbstractStringMatch
 	// CONSTRUCT
 	// -------------------------------------------- //
 	
-	public ARStringMatchStartCI(String typename, Collection<Collection<String>> altColls)
+	public ARStringMatchStart(String typename, Collection<Collection<String>> altColls)
 	{
 		super(typename, altColls);
 	}
diff --git a/src/com/massivecraft/mcore5/cmd/arg/ARStringMatchStartCS.java b/src/com/massivecraft/mcore5/cmd/arg/ARStringMatchStartCS.java
deleted file mode 100644
index f54acc71..00000000
--- a/src/com/massivecraft/mcore5/cmd/arg/ARStringMatchStartCS.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.massivecraft.mcore5.cmd.arg;
-
-import java.util.Collection;
-
-public class ARStringMatchStartCS extends ARAbstractStringMatch
-{
-	// -------------------------------------------- //
-	// IMPLEMENTATION
-	// -------------------------------------------- //
-	
-	@Override
-	public Integer matches(String arg, String alt)
-	{
-		if (alt.startsWith(arg))
-		{
-			return alt.length() - arg.length();
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	// -------------------------------------------- //
-	// CONSTRUCT
-	// -------------------------------------------- //
-	
-	public ARStringMatchStartCS(String typename, Collection<Collection<String>> altColls)
-	{
-		super(typename, altColls);
-	}
-}
diff --git a/src/com/massivecraft/mcore5/store/PlayerColl.java b/src/com/massivecraft/mcore5/store/PlayerColl.java
index d5d83d1e..2f92ade2 100644
--- a/src/com/massivecraft/mcore5/store/PlayerColl.java
+++ b/src/com/massivecraft/mcore5/store/PlayerColl.java
@@ -11,8 +11,8 @@ import com.massivecraft.mcore5.MCore;
 import com.massivecraft.mcore5.MPlugin;
 import com.massivecraft.mcore5.Predictate;
 import com.massivecraft.mcore5.cmd.arg.ARStringEntity;
-import com.massivecraft.mcore5.cmd.arg.ARStringMatchFullCI;
-import com.massivecraft.mcore5.cmd.arg.ARStringMatchStartCI;
+import com.massivecraft.mcore5.cmd.arg.ARStringMatchFull;
+import com.massivecraft.mcore5.cmd.arg.ARStringMatchStart;
 import com.massivecraft.mcore5.cmd.arg.ArgReader;
 import com.massivecraft.mcore5.util.MUtil;
 import com.massivecraft.mcore5.util.PlayerUtil;
@@ -134,12 +134,12 @@ public class PlayerColl<E extends PlayerEntity<E>> extends Coll<E, String>
 	
 	public ArgReader<String> argReaderPlayerNameFull()
 	{
-		return new ARStringMatchFullCI("player", this.forgeAltColls());
+		return new ARStringMatchFull("player", this.forgeAltColls());
 	}
 	
 	public ArgReader<String> argReaderPlayerNameStart()
 	{
-		return new ARStringMatchStartCI("player", this.forgeAltColls());
+		return new ARStringMatchStart("player", this.forgeAltColls());
 	}
 	
 	public ArgReader<E> argReaderPlayerFull()
diff --git a/src/com/massivecraft/mcore5/store/SenderColl.java b/src/com/massivecraft/mcore5/store/SenderColl.java
index 8cc27099..08b6120f 100644
--- a/src/com/massivecraft/mcore5/store/SenderColl.java
+++ b/src/com/massivecraft/mcore5/store/SenderColl.java
@@ -10,8 +10,8 @@ import org.bukkit.command.CommandSender;
 import com.massivecraft.mcore5.MPlugin;
 import com.massivecraft.mcore5.Predictate;
 import com.massivecraft.mcore5.cmd.arg.ARStringEntity;
-import com.massivecraft.mcore5.cmd.arg.ARStringMatchFullCI;
-import com.massivecraft.mcore5.cmd.arg.ARStringMatchStartCI;
+import com.massivecraft.mcore5.cmd.arg.ARStringMatchFull;
+import com.massivecraft.mcore5.cmd.arg.ARStringMatchStart;
 import com.massivecraft.mcore5.cmd.arg.ArgReader;
 import com.massivecraft.mcore5.mixin.Mixin;
 import com.massivecraft.mcore5.util.MUtil;
@@ -148,12 +148,12 @@ public class SenderColl<E extends SenderEntity<E>> extends Coll<E, String>
 	
 	public ArgReader<String> argReaderSenderIdFull()
 	{
-		return new ARStringMatchFullCI("player", this.forgeAltColls());
+		return new ARStringMatchFull("player", this.forgeAltColls());
 	}
 	
 	public ArgReader<String> argReaderSenderIdStart()
 	{
-		return new ARStringMatchStartCI("player", this.forgeAltColls());
+		return new ARStringMatchStart("player", this.forgeAltColls());
 	}
 	
 	public ArgReader<E> argReaderEntityFull()