From bd563d646b65c978c74b9ece083cb1a7b7a5592d Mon Sep 17 00:00:00 2001
From: fullwall <fullwall@optusnet.com>
Date: Sun, 22 Apr 2012 17:57:50 +0800
Subject: [PATCH] Remove hyphens from trait names, add TODO

---
 .../java/net/citizensnpcs/npc/CitizensCharacterManager.java   | 4 +++-
 src/main/java/net/citizensnpcs/npc/CitizensTraitManager.java  | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/citizensnpcs/npc/CitizensCharacterManager.java b/src/main/java/net/citizensnpcs/npc/CitizensCharacterManager.java
index a3c442e41..cbb1eb45e 100644
--- a/src/main/java/net/citizensnpcs/npc/CitizensCharacterManager.java
+++ b/src/main/java/net/citizensnpcs/npc/CitizensCharacterManager.java
@@ -20,7 +20,9 @@ public class CitizensCharacterManager implements CharacterManager {
     public void registerCharacter(CharacterFactory factory) {
         try {
             Character character = factory.create();
-            registered.put(character.getName(), character);
+            registered.put(character.getName(), character); // TODO: this only
+                                                            // allows singletons
+                                                            // for characters.
         } catch (CharacterException ex) {
             ex.printStackTrace();
         }
diff --git a/src/main/java/net/citizensnpcs/npc/CitizensTraitManager.java b/src/main/java/net/citizensnpcs/npc/CitizensTraitManager.java
index 0b5646d85..bc30599e8 100644
--- a/src/main/java/net/citizensnpcs/npc/CitizensTraitManager.java
+++ b/src/main/java/net/citizensnpcs/npc/CitizensTraitManager.java
@@ -40,7 +40,7 @@ public class CitizensTraitManager implements TraitManager {
         registerTrait(new TraitFactory(CurrentLocation.class).withName("location").withPlugin(plugin));
         registerTrait(new TraitFactory(Equipment.class).withName("equipment").withPlugin(plugin));
         registerTrait(new TraitFactory(Inventory.class).withName("inventory").withPlugin(plugin));
-        registerTrait(new TraitFactory(LookClose.class).withName("look-close").withPlugin(plugin));
+        registerTrait(new TraitFactory(LookClose.class).withName("lookclose").withPlugin(plugin));
         registerTrait(new TraitFactory(MobType.class).withName("type").withPlugin(plugin));
         registerTrait(new TraitFactory(Owner.class).withName("owner").withPlugin(plugin));
         registerTrait(new TraitFactory(Powered.class).withName("powered").withPlugin(plugin));
@@ -50,7 +50,7 @@ public class CitizensTraitManager implements TraitManager {
         registerTrait(new TraitFactory(Text.class).withName("text").withPlugin(plugin));
         registerTrait(new TraitFactory(VillagerProfession.class).withName("profession").withPlugin(plugin));
         registerTrait(new TraitFactory(Waypoints.class).withName("waypoints").withPlugin(plugin));
-        registerTrait(new TraitFactory(WoolColor.class).withName("wool-color").withPlugin(plugin));
+        registerTrait(new TraitFactory(WoolColor.class).withName("woolcolor").withPlugin(plugin));
         registerTrait(new TraitFactory(Controllable.class).withName("controllable").withPlugin(plugin));
     }