From 951367c586fe5516428b331a2712bb827a8042f5 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Wed, 18 Jun 2014 23:28:12 +0200 Subject: [PATCH] Remove List Name Mixin. Not used. --- .../massivecore/mixin/ListNameMixin.java | 7 -- .../mixin/ListNameMixinAbstract.java | 6 -- .../mixin/ListNameMixinDefault.java | 92 ------------------- .../massivecraft/massivecore/mixin/Mixin.java | 28 ------ .../massivecore/store/SenderEntity.java | 12 --- 5 files changed, 145 deletions(-) delete mode 100644 src/com/massivecraft/massivecore/mixin/ListNameMixin.java delete mode 100644 src/com/massivecraft/massivecore/mixin/ListNameMixinAbstract.java delete mode 100644 src/com/massivecraft/massivecore/mixin/ListNameMixinDefault.java diff --git a/src/com/massivecraft/massivecore/mixin/ListNameMixin.java b/src/com/massivecraft/massivecore/mixin/ListNameMixin.java deleted file mode 100644 index 0a9abf67..00000000 --- a/src/com/massivecraft/massivecore/mixin/ListNameMixin.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.massivecraft.massivecore.mixin; - -public interface ListNameMixin -{ - public String getListName(Object senderObject); - public void setListName(Object senderObject, String listName); -} diff --git a/src/com/massivecraft/massivecore/mixin/ListNameMixinAbstract.java b/src/com/massivecraft/massivecore/mixin/ListNameMixinAbstract.java deleted file mode 100644 index 77c3a418..00000000 --- a/src/com/massivecraft/massivecore/mixin/ListNameMixinAbstract.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.massivecraft.massivecore.mixin; - -public abstract class ListNameMixinAbstract implements ListNameMixin -{ - -} \ No newline at end of file diff --git a/src/com/massivecraft/massivecore/mixin/ListNameMixinDefault.java b/src/com/massivecraft/massivecore/mixin/ListNameMixinDefault.java deleted file mode 100644 index 4fa675c5..00000000 --- a/src/com/massivecraft/massivecore/mixin/ListNameMixinDefault.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.massivecraft.massivecore.mixin; - -import java.util.Map; -import java.util.TreeMap; - -import org.bukkit.ChatColor; -import org.bukkit.entity.Player; - -import com.massivecraft.massivecore.util.IdUtil; - -public class ListNameMixinDefault extends ListNameMixinAbstract -{ - public final static ChatColor DEFAULT_COLOR = ChatColor.WHITE; - - // -------------------------------------------- // - // INSTANCE & CONSTRUCT - // -------------------------------------------- // - - private static ListNameMixinDefault i = new ListNameMixinDefault(); - public static ListNameMixinDefault get() { return i; } - - // -------------------------------------------- // - // FIELDS - // -------------------------------------------- // - - protected Map idToListName = new TreeMap(String.CASE_INSENSITIVE_ORDER); - - // -------------------------------------------- // - // OVERRIDE - // -------------------------------------------- // - - @Override - public String getListName(Object senderObject) - { - String senderId = IdUtil.getId(senderObject); - if (senderId == null) return null; - - // Our Map - String ret = this.idToListName.get(senderId); - - // Bukkit - if (ret == null) - { - Player player = IdUtil.getPlayer(senderObject); - if (player != null) - { - ret = player.getPlayerListName(); - } - } - - // Fixed Name - if (ret == null) - { - ret = IdUtil.getName(senderObject); - } - - // Id Fallback - if (ret == null) - { - ret = senderId; - } - - // Ensure Colored - if (ChatColor.stripColor(ret).equals(ret)) - { - ret = DEFAULT_COLOR.toString()+ret; - } - - return ret; - } - - @Override - public void setListName(Object senderObject, String listName) - { - String senderId = IdUtil.getId(senderObject); - if (senderId == null) return; - - if (listName == null) - { - this.idToListName.remove(senderId); - } - else - { - this.idToListName.put(senderId, listName); - } - - Player player = IdUtil.getPlayer(senderObject); - if (player == null) return; - player.setPlayerListName(this.getListName(senderObject)); - } - -} \ No newline at end of file diff --git a/src/com/massivecraft/massivecore/mixin/Mixin.java b/src/com/massivecraft/massivecore/mixin/Mixin.java index 9cc8908d..1d9068b5 100644 --- a/src/com/massivecraft/massivecore/mixin/Mixin.java +++ b/src/com/massivecraft/massivecore/mixin/Mixin.java @@ -29,10 +29,6 @@ public class Mixin public static DisplayNameMixin getDisplayNameMixin() { return displayNameMixin; } public static void setDisplayNameMixin(DisplayNameMixin val) { displayNameMixin = val; } - private static ListNameMixin listNameMixin = ListNameMixinDefault.get(); - public static ListNameMixin getListNameMixin() { return listNameMixin; } - public static void setListNameMixin(ListNameMixin val) { listNameMixin = val; } - private static SenderPsMixin senderPsMixin = SenderPsMixinDefault.get(); public static SenderPsMixin getSenderPsMixin() { return senderPsMixin; } public static void setSenderPsMixin(SenderPsMixin val) { senderPsMixin = val; } @@ -133,30 +129,6 @@ public class Mixin getDisplayNameMixin().setDisplayName(senderObject, displayName); } - // -------------------------------------------- // - // STATIC EXPOSE: LIST NAME - // -------------------------------------------- // - - public static String getListName(String senderId) - { - return getListNameMixin().getListName(senderId); - } - - public static void setListName(String senderId, String listName) - { - getListNameMixin().setListName(senderId, listName); - } - - public static String getListName(CommandSender sender) - { - return getListNameMixin().getListName(sender); - } - - public static void setListName(CommandSender sender, String listName) - { - getListNameMixin().setListName(sender, listName); - } - // -------------------------------------------- // // STATIC EXPOSE: SENDER PS // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/store/SenderEntity.java b/src/com/massivecraft/massivecore/store/SenderEntity.java index 5d6401d2..80626830 100644 --- a/src/com/massivecraft/massivecore/store/SenderEntity.java +++ b/src/com/massivecraft/massivecore/store/SenderEntity.java @@ -105,18 +105,6 @@ public abstract class SenderEntity> extends Entity Mixin.setDisplayName(this.getId(), displayName); } - // LIST NAME - - public String getListName() - { - return Mixin.getListName(this.getId()); - } - - public void setListName(String listName) - { - Mixin.setListName(this.getId(), listName); - } - // CONVENIENCE SEND MESSAGE public boolean sendMessage(String message)