Add some developer logging for debugging.

DenizenScript · Jun 2, 2013 · a55c54b · a55c54b
1 parent 73216cf
commit a55c54b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/objects/aH.java b/src/main/java/net/aufdemrand/denizen/objects/aH.java
@@ -109,7 +109,7 @@ public boolean matchesPrimitive(PrimitiveType argumentType) {
 
         public boolean matchesArgumentType(Class<? extends dScriptArgument> clazz) {
 
-            dB.log("Calling matches: " + prefix + ":" + value + " " + clazz.toString());
+            dB.log("Calling matches: " + prefix + ":" + value + " " + clazz.getCanonicalName());
 
             try {
                 return (Boolean) clazz.getMethod("matches", String.class).invoke(null, value);
@@ -126,7 +126,7 @@ public Element asElement() {
 
         public <T extends dScriptArgument> T asType(Class<? extends dScriptArgument> clazz) {
 
-            dB.log("Calling asType: " + prefix + ":" + value + " " + clazz.toString());
+            dB.log("Calling asType: " + prefix + ":" + value + " " + clazz.getCanonicalName());
 
             dScriptArgument arg = null;
             try {

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dLocation.java b/src/main/java/net/aufdemrand/denizen/objects/dLocation.java
@@ -3,6 +3,7 @@
 import net.aufdemrand.denizen.interfaces.dScriptArgument;
 import net.aufdemrand.denizen.tags.Attribute;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
+import net.aufdemrand.denizen.utilities.debugging.dB;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -235,25 +236,18 @@ public boolean isUnique() {
 
     @Override
     public String identify() {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    @Override
-    public String toString() {
         if (isSaved(this))
             return "l@" + getSaved(this);
         else return "l@" + getX() + "," + getY()
                 + "," + getZ() + "," + getWorld().getName();
     }
 
-
-
     @Override
     public String getAttribute(Attribute attribute) {
-
-
         if (attribute == null) return null;
 
+        dB.log("getAttribute: " + getType() + " ---> " + attribute.attributes.toString());
+
         if (attribute.startsWith("biome.formatted"))
             return new Element(getBlock().getBiome().name().toLowerCase().replace('_', ' '))
                     .getAttribute(attribute.fulfill(2));

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java b/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java
@@ -150,9 +150,10 @@ public String toString() {
 
     @Override
     public String getAttribute(Attribute attribute) {
-
         if (attribute == null) return null;
 
+        dB.log("getAttribute: " + getType() + " ---> " + attribute.attributes.toString());
+
         if (attribute.startsWith("has_played_before"))
             return new Element(String.valueOf(getOfflinePlayer().hasPlayedBefore()))
                     .getAttribute(attribute.fulfill(1));

diff --git a/src/main/java/net/aufdemrand/denizen/tags/Attribute.java b/src/main/java/net/aufdemrand/denizen/tags/Attribute.java
@@ -17,7 +17,8 @@
 
 public class Attribute {
 
-    List<String> attributes;
+    // TODO: Make this private. It's public right now to enable easy debugging.
+    public List<String> attributes;
 
     ScriptEntry scriptEntry;