2 files changed, 20 insertions, 3 deletions
diff --git a/src/com/isode/stroke/client/ClientOptions.java b/src/com/isode/stroke/client/ClientOptions.java
index 99b3242..10dc8b3 100644
--- a/src/com/isode/stroke/client/ClientOptions.java
+++ b/src/com/isode/stroke/client/ClientOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Isode Limited, London, England.
+ * Copyright (c) 2011-2012 Isode Limited, London, England.
  * All rights reserved.
  */
 /*
@@ -9,7 +9,7 @@
 package com.isode.stroke.client;
 
 /**
- *
+ * Options for a client connection
  */
 public class ClientOptions {
 
@@ -17,13 +17,22 @@ public class ClientOptions {
 
         NeverUseTLS,
         UseTLSWhenAvailable
-    };
+    }
 
     public ClientOptions() {
         useStreamCompression = true;
         useTLS = UseTLS.UseTLSWhenAvailable;
         useStreamResumption = false;
     }
+    
+    @Override
+    public String toString() {
+        return  
+            "useStreamCompression:" + useStreamCompression +
+            "; useStreamResumption:" + useStreamResumption +
+            "; " + useTLS;
+    }
+
     /**
      * Whether ZLib stream compression should be used when available.
      *
@@ -42,4 +51,5 @@ public class ClientOptions {
      * Default: false
      */
     public boolean useStreamResumption;
+    
 }
diff --git a/src/com/isode/stroke/client/CoreClient.java b/src/com/isode/stroke/client/CoreClient.java
index cc9fd61..828906c 100644
--- a/src/com/isode/stroke/client/CoreClient.java
+++ b/src/com/isode/stroke/client/CoreClient.java
@@ -395,6 +395,13 @@ public class CoreClient {
             return jid_;
         }
     }
+    
+    @Override
+    public String toString()
+    {
+        return "CoreClient for \"" + jid_ + "\"" +
+        "; session " + (isAvailable() ? "" : "un") + "available"; 
+    }
 
     /**
      * The user should add a listener to this signal, which will be called when