Final refactor bits.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4677 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/as/com/threerings/io/ObjectInputStream.as

@@ -31,7 +31,10 @@ import com.threerings.util.ClassUtil;
 
 public class ObjectInputStream
 {
-    private static const log :Log = Log.getLog(ObjectInputStream);
+    /** Enables verbose object I/O debugging. */
+    public static const DEBUG :Boolean = false;
+
+    public static const log :Log = Log.getLog(ObjectInputStream);
 
     public function ObjectInputStream (source :IDataInput = null)
     {
@@ -52,7 +55,7 @@ public class ObjectInputStream
     public function readObject () :Object
         //throws IOError
     {
-        var DEBUG_ID :String = "[" + (++_tempy) + "] ";
+        var DEBUG_ID :String = "[" + (++_debugObjectCounter) + "] ";
         try {
             // read in the class code for this instance
             var code :int = readShort();
@@ -256,8 +259,6 @@ public class ObjectInputStream
     /** A map of short class code to ClassMapping info. */
     protected var _classMap :Array = new Array();
 
-
-    public static const DEBUG :Boolean = false;
-    private static var _tempy :int = 0;
+    private static var _debugObjectCounter :int = 0;
 }
 }

src/as/com/threerings/util/StreamableHashMap.as

@@ -0,0 +1,54 @@
+//
+// $Id$
+//
+// Narya library - tools for developing networked games
+// Copyright (C) 2002-2007 Three Rings Design, Inc., All Rights Reserved
+// http://www.threerings.net/code/narya/
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published
+// by the Free Software Foundation; either version 2.1 of the License, or
+// (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+package com.threerings.util {
+
+import com.threerings.io.ObjectInputStream;
+import com.threerings.io.ObjectOutputStream;
+import com.threerings.io.Streamable;
+
+/**
+ * A {@link HashMap} that can be sent over the wire, bearing in mind that all keys and values must
+ * be primitives or implement {@link Streamable}.
+ */
+public class StreamableHashMap extends HashMap
+    implements Streamable
+{
+    // documentation inherited from interface Streamable
+    public function writeObject (out :ObjectOutputStream) :void
+    {
+        out.writeInt(size());
+        forEach(function (key :Object, value :Object) :void {
+            out.writeObject(key);
+            out.writeObject(value);
+        });
+    }
+
+    // documentation inherited from interface Streamable
+    public function readObject (ins :ObjectInputStream) :void
+    {
+        var ecount :int = ins.readInt();
+        for (var ii :int = 0; ii < ecount; ii++) {
+            put(ins.readObject(), ins.readObject());
+        }
+    }
+}
+}