From 1527dc5aa73a6813057439188b9232ef6283ddaf Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Fri, 21 Sep 2012 00:55:59 +0200 Subject: [PATCH] Removing two old invalid aproaches. --- .../cmd/arg/old/AHPlayerWrapperColl.java | 63 ------------------- .../cmd/arg/old/AHPlayerWrapperColls.java | 28 --------- 2 files changed, 91 deletions(-) delete mode 100644 src/com/massivecraft/mcore4/cmd/arg/old/AHPlayerWrapperColl.java delete mode 100644 src/com/massivecraft/mcore4/cmd/arg/old/AHPlayerWrapperColls.java diff --git a/src/com/massivecraft/mcore4/cmd/arg/old/AHPlayerWrapperColl.java b/src/com/massivecraft/mcore4/cmd/arg/old/AHPlayerWrapperColl.java deleted file mode 100644 index 27085159..00000000 --- a/src/com/massivecraft/mcore4/cmd/arg/old/AHPlayerWrapperColl.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.massivecraft.mcore4.cmd.arg.old; - -import java.util.Collection; - -import org.bukkit.command.CommandSender; - -import com.massivecraft.mcore4.MPlugin; -import com.massivecraft.mcore4.store.Coll; -import com.massivecraft.mcore4.util.PlayerUtil; -import com.massivecraft.mcore4.util.Txt; - -public class AHPlayerWrapperColl extends AHBase -{ - final Coll coll; - public Coll coll() { return this.coll; }; - - public AHPlayerWrapperColl(Coll coll) - { - this.coll = coll; - } - - @Override - public E parse(String str, String style, CommandSender sender, MPlugin p) - { - this.error.clear(); - if (str == null) return null; - - E ret; - - if (style != null && style.equalsIgnoreCase("match")) - { - @SuppressWarnings("unchecked") - Collection ids = (Collection) this.coll().ids(); - String id = Txt.getBestCIStart(ids, str); - ret = this.coll().get(id); - if (ret != null) - { - return ret; - } - this.error.add("No player name begins with \"

"+str+"\"."); - } - else if (style != null && style.equalsIgnoreCase("matchany")) - { - ret = this.coll().get(Txt.getBestCIStart(PlayerUtil.getAllVisitorNames(), str)); - if (ret != null) - { - return ret; - } - this.error.add("No player name begins with \"

"+str+"\"."); - } - else - { - ret = this.coll().get(str); - if (ret != null) - { - return ret; - - } - this.error.add("No player with the exact name \"

"+str+"\"."); - } - return null; - } -} diff --git a/src/com/massivecraft/mcore4/cmd/arg/old/AHPlayerWrapperColls.java b/src/com/massivecraft/mcore4/cmd/arg/old/AHPlayerWrapperColls.java deleted file mode 100644 index 49f776f3..00000000 --- a/src/com/massivecraft/mcore4/cmd/arg/old/AHPlayerWrapperColls.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.massivecraft.mcore4.cmd.arg.old; - -import org.bukkit.command.CommandSender; - -import com.massivecraft.mcore4.MPlugin; -import com.massivecraft.mcore4.store.Coll; -import com.massivecraft.mcore4.store.Colls; -public class AHPlayerWrapperColls extends AHBase -{ - protected final Colls, E, ?> colls; - public Colls, E, ?> colls() { return this.colls; }; - - @SuppressWarnings("unchecked") - public AHPlayerWrapperColls(Object colls) - { - this.colls = (Colls, E, ?>) colls; - } - - @Override - public E parse(String str, String style, CommandSender sender, MPlugin p) - { - Coll coll = colls.get(sender); - AHPlayerWrapperColl ahinner = new AHPlayerWrapperColl(coll); - E ret = ahinner.parse(str, style, sender, p); - this.error.addAll(ahinner.error); - return ret; - } -}