5 files changed, 33 insertions, 9 deletions
diff --git a/src/com/isode/stroke/elements/IQ.java b/src/com/isode/stroke/elements/IQ.java
index 098dfaf..78d4d6a 100644
--- a/src/com/isode/stroke/elements/IQ.java
+++ b/src/com/isode/stroke/elements/IQ.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Isode Limited, London, England.
+ * Copyright (c) 2010-2012, Isode Limited, London, England.
  * All rights reserved.
  */
 /*
@@ -11,7 +11,7 @@ package com.isode.stroke.elements;
 import com.isode.stroke.jid.JID;
 
 public class IQ extends Stanza {
-    public enum Type {Get, Set, Result, Error};
+    public enum Type {Get, Set, Result, Error}
 
     private Type type_;
 
@@ -55,4 +55,8 @@ public class IQ extends Stanza {
         return iq;
     }
 
+    @Override
+    public String toString() {
+        return super.toString() + " Type=" + type_; 
+    }
 }
diff --git a/src/com/isode/stroke/elements/Message.java b/src/com/isode/stroke/elements/Message.java
index 67903ae..5cfb58f 100644
--- a/src/com/isode/stroke/elements/Message.java
+++ b/src/com/isode/stroke/elements/Message.java
@@ -56,6 +56,6 @@ public class Message extends Stanza {
     
     @Override
     public String toString() {
-        return "Message " + super.toString() + " subject=\"" + getSubject() + "\""; 
+        return super.toString() + " subject=\"" + getSubject() + "\""; 
     }
 }
diff --git a/src/com/isode/stroke/elements/Presence.java b/src/com/isode/stroke/elements/Presence.java
index 9c8a870..acf0a40 100644
--- a/src/com/isode/stroke/elements/Presence.java
+++ b/src/com/isode/stroke/elements/Presence.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Isode Limited, London, England.
+ * Copyright (c) 2010-2012, Isode Limited, London, England.
  * All rights reserved.
  */
 /*
@@ -66,4 +66,9 @@ public class Presence extends Stanza {
     public void setPriority(int priority) {
         updatePayload(new Priority(priority));
     }
+
+    @Override
+    public String toString() {
+        return super.toString() + " Type=" + type_; 
+    }
 }
diff --git a/src/com/isode/stroke/elements/Stanza.java b/src/com/isode/stroke/elements/Stanza.java
index 85b9d00..036ec8b 100644
--- a/src/com/isode/stroke/elements/Stanza.java
+++ b/src/com/isode/stroke/elements/Stanza.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Isode Limited, London, England.
+ * Copyright (c) 2010-2012, Isode Limited, London, England.
  * All rights reserved.
  */
 /*
@@ -13,9 +13,9 @@ import com.isode.stroke.jid.JID;
 import java.util.Vector;
 
 /**
- * Basic XMPP stanza.
+ * Base class for all types of XMPP stanza.
  */
-public class Stanza implements Element {
+public abstract class Stanza implements Element {
     private String id_;
     private JID from_;
     private JID to_;
@@ -83,9 +83,18 @@ public class Stanza implements Element {
         id_ = id;
     }
     
+    /**
+     * Returns debug-friendly String description of this Stanza, which will
+     * include the subclass's name (e.g. "Presence").
+     * @return a debug-friendly String.  
+     */
     @Override
     public String toString() {
-        return "Stanza from \"" + from_ + "\" to \"" + to_ + "\"" +
+        String className = this.getClass().getSimpleName();
+
+        // Include actual stanza type based on class name of the object
+        return className + 
+        " stanza from \"" + from_ + "\" to \"" + to_ + "\"" +
         " id=\"" + id_ + "\"";
     }
 
diff --git a/src/com/isode/stroke/elements/Status.java b/src/com/isode/stroke/elements/Status.java
index 250917d..215703b 100644
--- a/src/com/isode/stroke/elements/Status.java
+++ b/src/com/isode/stroke/elements/Status.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Isode Limited, London, England.
+ * Copyright (c) 2010-2012, Isode Limited, London, England.
  * All rights reserved.
  */
 /*
@@ -26,4 +26,10 @@ public class Status extends Payload {
     public String getText() {
         return text_;
     }
+    
+    @Override
+    public String toString() {
+        return "Status : " + text_;
+    }
+    
 }