Brought things into line with new streaming world order.

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

src/java/com/threerings/whirled/zone/data/SceneSummary.java

@@ -1,10 +1,8 @@
 //
-// $Id: SceneSummary.java,v 1.3 2001/12/17 03:38:50 mdb Exp $
+// $Id: SceneSummary.java,v 1.4 2002/07/23 05:54:53 mdb Exp $
 
 package com.threerings.whirled.zone.data;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
 import java.io.IOException;
 
 import com.samskivert.util.StringUtil;
@@ -12,8 +10,9 @@ import com.samskivert.util.StringUtil;
 import com.threerings.util.DirectionCodes;
 import com.threerings.util.DirectionUtil;
 
-import com.threerings.presents.io.Streamable;
-import com.threerings.presents.io.StreamableUtil;
+import com.threerings.io.ObjectInputStream;
+import com.threerings.io.ObjectOutputStream;
+import com.threerings.io.Streamable;
 
 /**
  * The scene summary class is used to provide info about the connected
@@ -55,25 +54,23 @@ public class SceneSummary implements Streamable
         _population = population;
     }
 
-    // documentation inherited
-    public void writeTo (DataOutputStream out)
+    /**
+     * Writes our custom streamable fields.
+     */
+    public void writeObject (ObjectOutputStream out)
         throws IOException
     {
-        out.writeInt(sceneId);
-        out.writeUTF(name);
-        StreamableUtil.writeInts(out, neighbors);
-        StreamableUtil.writeInts(out, neighborDirs);
-        out.writeInt(_population);
+        out.defaultWriteObject();
+        out.writeInt(getPopulation());
     }
 
-    // documentation inherited
-    public void readFrom (DataInputStream in)
-        throws IOException
+    /**
+     * Reads our custom streamable fields.
+     */
+    public void readObject (ObjectInputStream in)
+        throws IOException, ClassNotFoundException
     {
-        sceneId = in.readInt();
-        name = in.readUTF();
-        neighbors = StreamableUtil.readInts(in);
-        neighborDirs = StreamableUtil.readInts(in);
+        in.defaultReadObject();
         _population = in.readInt();
     }
 
@@ -84,7 +81,8 @@ public class SceneSummary implements Streamable
     {
         return "[sceneId=" + sceneId + ", name=" + name +
             ", neighbors=" + StringUtil.toString(neighbors) +
-            ", neighborDirs=" + DirectionUtil.toString(neighborDirs) + "]";
+            ", neighborDirs=" + DirectionUtil.toString(neighborDirs) +
+            ", pop=" + _population + "]";
     }
 
     /** The number of people currently occupying this scene. */

src/java/com/threerings/whirled/zone/data/ZoneSummary.java

@@ -1,21 +1,18 @@
 //
-// $Id: ZoneSummary.java,v 1.3 2001/12/17 00:58:04 mdb Exp $
+// $Id: ZoneSummary.java,v 1.4 2002/07/23 05:54:53 mdb Exp $
 
 package com.threerings.whirled.zone.data;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
 import com.samskivert.util.StringUtil;
-import com.threerings.presents.io.Streamable;
+
+import com.threerings.io.SimpleStreamableObject;
 
 /**
  * The zone summary contains information on a zone, including its name and
  * summary info on all of the scenes in this zone (which can be used to
  * generate a map of the zone on the client).
  */
-public class ZoneSummary implements Streamable
+public class ZoneSummary extends SimpleStreamableObject
 {
     /** The zone's fully qualified unique identifier. */
     public int zoneId;
@@ -26,33 +23,6 @@ public class ZoneSummary implements Streamable
     /** The summary information for all of the scenes in the zone. */
     public SceneSummary[] scenes;
 
-    // documentation inherited
-    public void writeTo (DataOutputStream out)
-        throws IOException
-    {
-        out.writeInt(zoneId);
-        out.writeUTF(name);
-        int scount = scenes.length;
-        out.writeInt(scount);
-        for (int i = 0; i < scount; i++) {
-            scenes[i].writeTo(out);
-        }
-    }
-
-    // documentation inherited
-    public void readFrom (DataInputStream in)
-        throws IOException
-    {
-        zoneId = in.readInt();
-        name = in.readUTF();
-        int scount = in.readInt();
-        scenes = new SceneSummary[scount];
-        for (int i = 0; i < scount; i++) {
-            scenes[i] = new SceneSummary();
-            scenes[i].readFrom(in);
-        }
-    }
-
     /**
      * Generates a string representation of this instance.
      */