From e912b18e270a548f8dd02061cfb9a283d3004ca3 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Thu, 19 Jul 2001 19:30:14 +0000
Subject: [PATCH] toString()stravaganza!

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@77 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 src/java/com/threerings/presents/dobj/DObject.java        | 7 ++++++-
 src/java/com/threerings/presents/net/AuthRequest.java     | 7 ++++++-
 src/java/com/threerings/presents/net/AuthResponse.java    | 7 ++++++-
 .../threerings/presents/net/BootstrapNotification.java    | 7 ++++++-
 src/java/com/threerings/presents/net/Credentials.java     | 7 ++++++-
 .../com/threerings/presents/net/DownstreamMessage.java    | 7 ++++++-
 .../com/threerings/presents/net/EventNotification.java    | 7 ++++++-
 src/java/com/threerings/presents/net/FailureResponse.java | 7 ++++++-
 .../com/threerings/presents/net/ForwardEventRequest.java  | 7 ++++++-
 src/java/com/threerings/presents/net/LogoffRequest.java   | 7 ++++++-
 src/java/com/threerings/presents/net/ObjectResponse.java  | 7 ++++++-
 src/java/com/threerings/presents/net/PingRequest.java     | 7 ++++++-
 src/java/com/threerings/presents/net/PongResponse.java    | 7 ++++++-
 .../com/threerings/presents/net/SubscribeRequest.java     | 7 ++++++-
 .../com/threerings/presents/net/UnsubscribeRequest.java   | 7 ++++++-
 src/java/com/threerings/presents/net/UpstreamMessage.java | 7 ++++++-
 .../com/threerings/presents/server/PresentsClient.java    | 8 +++++++-
 .../threerings/presents/server/PresentsDObjectMgr.java    | 5 ++---
 18 files changed, 105 insertions(+), 20 deletions(-)

diff --git a/src/java/com/threerings/presents/dobj/DObject.java b/src/java/com/threerings/presents/dobj/DObject.java
index c19053cec..a85a6205f 100644
--- a/src/java/com/threerings/presents/dobj/DObject.java
+++ b/src/java/com/threerings/presents/dobj/DObject.java
@@ -1,5 +1,5 @@
 //
-// $Id: DObject.java,v 1.12 2001/07/19 05:56:20 mdb Exp $
+// $Id: DObject.java,v 1.13 2001/07/19 19:30:14 mdb Exp $
 
 package com.threerings.cocktail.cher.dobj;
 
@@ -235,6 +235,11 @@ public class DObject
         _oid = oid;
     }
 
+    public String toString ()
+    {
+        return "[oid=" + _oid + "]";
+    }
+
     /**
      * Called by derived instances when an attribute setter method was
      * called.
diff --git a/src/java/com/threerings/presents/net/AuthRequest.java b/src/java/com/threerings/presents/net/AuthRequest.java
index e5da35623..e64850e9a 100644
--- a/src/java/com/threerings/presents/net/AuthRequest.java
+++ b/src/java/com/threerings/presents/net/AuthRequest.java
@@ -1,5 +1,5 @@
 //
-// $Id: AuthRequest.java,v 1.5 2001/06/02 01:30:37 mdb Exp $
+// $Id: AuthRequest.java,v 1.6 2001/07/19 19:30:14 mdb Exp $
 
 package com.threerings.cocktail.cher.net;
 
@@ -54,6 +54,11 @@ public class AuthRequest extends UpstreamMessage
         _creds = (Credentials)TypedObjectFactory.readFrom(in);
     }
 
+    public String toString ()
+    {
+        return "[type=AREQ, msgid=" + messageId + ", creds=" + _creds + "]";
+    }
+
     /**
      * The credentials associated with this auth request.
      */
diff --git a/src/java/com/threerings/presents/net/AuthResponse.java b/src/java/com/threerings/presents/net/AuthResponse.java
index 532399bad..b7b89ba82 100644
--- a/src/java/com/threerings/presents/net/AuthResponse.java
+++ b/src/java/com/threerings/presents/net/AuthResponse.java
@@ -1,5 +1,5 @@
 //
-// $Id: AuthResponse.java,v 1.7 2001/07/19 07:09:16 mdb Exp $
+// $Id: AuthResponse.java,v 1.8 2001/07/19 19:30:14 mdb Exp $
 
 package com.threerings.cocktail.cher.net;
 
@@ -61,5 +61,10 @@ public class AuthResponse extends DownstreamMessage
         _data = (AuthResponseData)DObjectFactory.readFrom(in);
     }
 
+    public String toString ()
+    {
+        return "[type=ARSP, msgid=" + messageId + ", data=" + _data + "]";
+    }
+
     protected AuthResponseData _data;
 }
diff --git a/src/java/com/threerings/presents/net/BootstrapNotification.java b/src/java/com/threerings/presents/net/BootstrapNotification.java
index d024032cf..1d8213a6a 100644
--- a/src/java/com/threerings/presents/net/BootstrapNotification.java
+++ b/src/java/com/threerings/presents/net/BootstrapNotification.java
@@ -1,5 +1,5 @@
 //
-// $Id: BootstrapNotification.java,v 1.1 2001/07/19 07:09:16 mdb Exp $
+// $Id: BootstrapNotification.java,v 1.2 2001/07/19 19:30:14 mdb Exp $
 
 package com.threerings.cocktail.cher.net;
 
@@ -62,6 +62,11 @@ public class BootstrapNotification extends DownstreamMessage
         _data = (BootstrapData)DObjectFactory.readFrom(in);
     }
 
+    public String toString ()
+    {
+        return "[type=BOOT, msgid=" + messageId + ", data=" + _data + "]";
+    }
+
     /** The data associated with this notification. */
     protected BootstrapData _data;
 }
diff --git a/src/java/com/threerings/presents/net/Credentials.java b/src/java/com/threerings/presents/net/Credentials.java
index 69b04de65..be2a1d82e 100644
--- a/src/java/com/threerings/presents/net/Credentials.java
+++ b/src/java/com/threerings/presents/net/Credentials.java
@@ -1,5 +1,5 @@
 //
-// $Id: Credentials.java,v 1.5 2001/06/02 01:30:37 mdb Exp $
+// $Id: Credentials.java,v 1.6 2001/07/19 19:30:14 mdb Exp $
 
 package com.threerings.cocktail.cher.net;
 
@@ -75,5 +75,10 @@ public abstract class Credentials implements TypedObject
         _username = in.readUTF();
     }
 
+    public String toString ()
+    {
+        return "[username=" + _username + "]";
+    }
+
     protected String _username;
 }
diff --git a/src/java/com/threerings/presents/net/DownstreamMessage.java b/src/java/com/threerings/presents/net/DownstreamMessage.java
index c87c6f6c0..82f41dfd4 100644
--- a/src/java/com/threerings/presents/net/DownstreamMessage.java
+++ b/src/java/com/threerings/presents/net/DownstreamMessage.java
@@ -1,5 +1,5 @@
 //
-// $Id: DownstreamMessage.java,v 1.6 2001/06/11 17:20:36 mdb Exp $
+// $Id: DownstreamMessage.java,v 1.7 2001/07/19 19:30:14 mdb Exp $
 
 package com.threerings.cocktail.cher.net;
 
@@ -65,4 +65,9 @@ public abstract class DownstreamMessage implements TypedObject
     {
         // we don't do anything here, but we may want to some day
     }
+
+    public String toString ()
+    {
+        return "[msgid=" + messageId + "]";
+    }
 }
diff --git a/src/java/com/threerings/presents/net/EventNotification.java b/src/java/com/threerings/presents/net/EventNotification.java
index c9b3c4786..bd91ae937 100644
--- a/src/java/com/threerings/presents/net/EventNotification.java
+++ b/src/java/com/threerings/presents/net/EventNotification.java
@@ -1,5 +1,5 @@
 //
-// $Id: EventNotification.java,v 1.8 2001/07/19 07:09:16 mdb Exp $
+// $Id: EventNotification.java,v 1.9 2001/07/19 19:30:14 mdb Exp $
 
 package com.threerings.cocktail.cher.net;
 
@@ -57,6 +57,11 @@ public class EventNotification extends DownstreamMessage
         _event = (TypedEvent)TypedObjectFactory.readFrom(in);
     }
 
+    public String toString ()
+    {
+        return "[type=EVT, msgid=" + messageId + ", evt=" + _event + "]";
+    }
+
     /** The event which we are forwarding. */
     protected TypedEvent _event;
 }
diff --git a/src/java/com/threerings/presents/net/FailureResponse.java b/src/java/com/threerings/presents/net/FailureResponse.java
index 5a6ad1109..61207e3ef 100644
--- a/src/java/com/threerings/presents/net/FailureResponse.java
+++ b/src/java/com/threerings/presents/net/FailureResponse.java
@@ -1,5 +1,5 @@
 //
-// $Id: FailureResponse.java,v 1.5 2001/07/19 07:09:16 mdb Exp $
+// $Id: FailureResponse.java,v 1.6 2001/07/19 19:30:14 mdb Exp $
 
 package com.threerings.cocktail.cher.net;
 
@@ -53,5 +53,10 @@ public class FailureResponse extends DownstreamMessage
         _oid = in.readInt();
     }
 
+    public String toString ()
+    {
+        return "[type=FAIL, msgid=" + messageId + ", oid=" + _oid + "]";
+    }
+
     protected int _oid;
 }
diff --git a/src/java/com/threerings/presents/net/ForwardEventRequest.java b/src/java/com/threerings/presents/net/ForwardEventRequest.java
index 2ce07c213..4b4a0a9b2 100644
--- a/src/java/com/threerings/presents/net/ForwardEventRequest.java
+++ b/src/java/com/threerings/presents/net/ForwardEventRequest.java
@@ -1,5 +1,5 @@
 //
-// $Id: ForwardEventRequest.java,v 1.7 2001/06/11 17:44:04 mdb Exp $
+// $Id: ForwardEventRequest.java,v 1.8 2001/07/19 19:30:14 mdb Exp $
 
 package com.threerings.cocktail.cher.net;
 
@@ -60,6 +60,11 @@ public class ForwardEventRequest extends UpstreamMessage
         _event = (TypedEvent)TypedObjectFactory.readFrom(in);
     }
 
+    public String toString ()
+    {
+        return "[type=FWD, msgid=" + messageId + ", evt=" + _event + "]";
+    }
+
     /** The event which we are forwarding. */
     protected TypedEvent _event;
 }
diff --git a/src/java/com/threerings/presents/net/LogoffRequest.java b/src/java/com/threerings/presents/net/LogoffRequest.java
index 001d4dd10..a1b82ef96 100644
--- a/src/java/com/threerings/presents/net/LogoffRequest.java
+++ b/src/java/com/threerings/presents/net/LogoffRequest.java
@@ -1,5 +1,5 @@
 //
-// $Id: LogoffRequest.java,v 1.3 2001/06/05 21:29:51 mdb Exp $
+// $Id: LogoffRequest.java,v 1.4 2001/07/19 19:30:14 mdb Exp $
 
 package com.threerings.cocktail.cher.net;
 
@@ -20,4 +20,9 @@ public class LogoffRequest extends UpstreamMessage
     {
         return TYPE;
     }
+
+    public String toString ()
+    {
+        return "[type=LOGOFF, msgid=" + messageId + "]";
+    }
 }
diff --git a/src/java/com/threerings/presents/net/ObjectResponse.java b/src/java/com/threerings/presents/net/ObjectResponse.java
index 6e39c0588..344bddba3 100644
--- a/src/java/com/threerings/presents/net/ObjectResponse.java
+++ b/src/java/com/threerings/presents/net/ObjectResponse.java
@@ -1,5 +1,5 @@
 //
-// $Id: ObjectResponse.java,v 1.9 2001/07/19 07:09:16 mdb Exp $
+// $Id: ObjectResponse.java,v 1.10 2001/07/19 19:30:14 mdb Exp $
 
 package com.threerings.cocktail.cher.net;
 
@@ -55,6 +55,11 @@ public class ObjectResponse extends DownstreamMessage
         _dobj = (DObject)DObjectFactory.readFrom(in);
     }
 
+    public String toString ()
+    {
+        return "[type=ORSP, msgid=" + messageId + ", obj=" + _dobj + "]";
+    }
+
     /** The object which is associated with this response. */
     protected DObject _dobj;
 }
diff --git a/src/java/com/threerings/presents/net/PingRequest.java b/src/java/com/threerings/presents/net/PingRequest.java
index 36b9a9585..f8aa6c452 100644
--- a/src/java/com/threerings/presents/net/PingRequest.java
+++ b/src/java/com/threerings/presents/net/PingRequest.java
@@ -1,5 +1,5 @@
 //
-// $Id: PingRequest.java,v 1.3 2001/06/05 21:29:51 mdb Exp $
+// $Id: PingRequest.java,v 1.4 2001/07/19 19:30:14 mdb Exp $
 
 package com.threerings.cocktail.cher.net;
 
@@ -20,4 +20,9 @@ public class PingRequest extends UpstreamMessage
     {
         return TYPE;
     }
+
+    public String toString ()
+    {
+        return "[type=PING, msgid=" + messageId + "]";
+    }
 }
diff --git a/src/java/com/threerings/presents/net/PongResponse.java b/src/java/com/threerings/presents/net/PongResponse.java
index 1d963482c..461c40be3 100644
--- a/src/java/com/threerings/presents/net/PongResponse.java
+++ b/src/java/com/threerings/presents/net/PongResponse.java
@@ -1,5 +1,5 @@
 //
-// $Id: PongResponse.java,v 1.4 2001/06/09 23:39:04 mdb Exp $
+// $Id: PongResponse.java,v 1.5 2001/07/19 19:30:14 mdb Exp $
 
 package com.threerings.cocktail.cher.net;
 
@@ -20,4 +20,9 @@ public class PongResponse extends DownstreamMessage
     {
         return TYPE;
     }
+
+    public String toString ()
+    {
+        return "[type=PONG, msgid=" + messageId + "]";
+    }
 }
diff --git a/src/java/com/threerings/presents/net/SubscribeRequest.java b/src/java/com/threerings/presents/net/SubscribeRequest.java
index 9897db0cc..c9ade4e0e 100644
--- a/src/java/com/threerings/presents/net/SubscribeRequest.java
+++ b/src/java/com/threerings/presents/net/SubscribeRequest.java
@@ -1,5 +1,5 @@
 //
-// $Id: SubscribeRequest.java,v 1.3 2001/06/05 22:44:31 mdb Exp $
+// $Id: SubscribeRequest.java,v 1.4 2001/07/19 19:30:14 mdb Exp $
 
 package com.threerings.cocktail.cher.net;
 
@@ -56,6 +56,11 @@ public class SubscribeRequest extends UpstreamMessage
         _oid = in.readInt();
     }
 
+    public String toString ()
+    {
+        return "[type=SUB, msgid=" + messageId + ", oid=" + _oid + "]";
+    }
+
     /**
      * The object id of the distributed object to which we are
      * subscribing.
diff --git a/src/java/com/threerings/presents/net/UnsubscribeRequest.java b/src/java/com/threerings/presents/net/UnsubscribeRequest.java
index 95c770cca..ef0b20143 100644
--- a/src/java/com/threerings/presents/net/UnsubscribeRequest.java
+++ b/src/java/com/threerings/presents/net/UnsubscribeRequest.java
@@ -1,5 +1,5 @@
 //
-// $Id: UnsubscribeRequest.java,v 1.4 2001/06/05 22:44:31 mdb Exp $
+// $Id: UnsubscribeRequest.java,v 1.5 2001/07/19 19:30:14 mdb Exp $
 
 package com.threerings.cocktail.cher.net;
 
@@ -56,6 +56,11 @@ public class UnsubscribeRequest extends UpstreamMessage
         _oid = in.readInt();
     }
 
+    public String toString ()
+    {
+        return "[type=UNSUB, msgid=" + messageId + ", oid=" + _oid + "]";
+    }
+
     /**
      * The object id of the distributed object from which we are
      * unsubscribing.
diff --git a/src/java/com/threerings/presents/net/UpstreamMessage.java b/src/java/com/threerings/presents/net/UpstreamMessage.java
index 23b97e252..404f8d75a 100644
--- a/src/java/com/threerings/presents/net/UpstreamMessage.java
+++ b/src/java/com/threerings/presents/net/UpstreamMessage.java
@@ -1,5 +1,5 @@
 //
-// $Id: UpstreamMessage.java,v 1.6 2001/06/11 17:20:36 mdb Exp $
+// $Id: UpstreamMessage.java,v 1.7 2001/07/19 19:30:14 mdb Exp $
 
 package com.threerings.cocktail.cher.net;
 
@@ -66,6 +66,11 @@ public abstract class UpstreamMessage implements TypedObject
         messageId = in.readShort();
     }
 
+    public String toString ()
+    {
+        return "[msgid=" + messageId + "]";
+    }
+
     /**
      * Returns the next message id suitable for use by an upstream
      * message.
diff --git a/src/java/com/threerings/presents/server/PresentsClient.java b/src/java/com/threerings/presents/server/PresentsClient.java
index c025c96f6..2a25dd9d4 100644
--- a/src/java/com/threerings/presents/server/PresentsClient.java
+++ b/src/java/com/threerings/presents/server/PresentsClient.java
@@ -1,5 +1,5 @@
 //
-// $Id: PresentsClient.java,v 1.8 2001/07/19 18:08:20 mdb Exp $
+// $Id: PresentsClient.java,v 1.9 2001/07/19 19:30:14 mdb Exp $
 
 package com.threerings.cocktail.cher.server;
 
@@ -245,6 +245,12 @@ public class Client implements Subscriber, MessageHandler
         return true;
     }
 
+    public String toString ()
+    {
+        return "[username=" + _username + ", conn=" + _conn +
+            ", cloid=" + ((_clobj == null) ? -1 : _clobj.getOid()) + "]";
+    }
+
     /**
      * Message dispatchers are used to dispatch each different type of
      * upstream message. We can look the dispatcher up in a table and
diff --git a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java
index 79c8c0d46..de9c2c984 100644
--- a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java
+++ b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java
@@ -1,5 +1,5 @@
 //
-// $Id: PresentsDObjectMgr.java,v 1.7 2001/07/19 19:18:07 mdb Exp $
+// $Id: PresentsDObjectMgr.java,v 1.8 2001/07/19 19:30:14 mdb Exp $
 
 package com.threerings.cocktail.cher.server;
 
@@ -210,8 +210,7 @@ public class CherDObjectMgr implements DObjectManager
                 // insert it into the table
                 _objects.put(oid, obj);
 
-                Log.info("Created object [oid=" + oid +
-                         ", obj=" + obj + "].");
+                Log.info("Created object [obj=" + obj + "].");
 
                 if (_target != null) {
                     // add the subscriber to this object's subscriber list