//
// $Id: StreamableHashIntMap.java,v 1.1 2003/02/18 03:01:16 mdb Exp $

package com.threerings.util;

import java.io.IOException;
import java.util.Iterator;

import com.samskivert.util.HashIntMap;

import com.threerings.io.ObjectInputStream;
import com.threerings.io.ObjectOutputStream;
import com.threerings.io.Streamable;

/**
 * A {@link HashIntMap} extension that can be streamed. The keys and
 * values in the map must also be of streamable types.
 *
 * @see Streamable
 */
public class StreamableHashIntMap extends HashIntMap
    implements Streamable
{
    /**
     * Constructs an empty hash int map with the specified number of hash
     * buckets.
     */
    public StreamableHashIntMap (int buckets, float loadFactor)
    {
        super(buckets, loadFactor);
    }

    /**
     * Constructs an empty hash int map with the default number of hash
     * buckets.
     */
    public StreamableHashIntMap ()
    {
        super();
    }

    /**
     * Writes our custom streamable fields.
     */
    public void writeObject (ObjectOutputStream out)
        throws IOException
    {
        int ecount = size();
        out.writeInt(ecount);
        Iterator iter = keySet().iterator();
        while (iter.hasNext()) {
            int key = ((Integer)iter.next()).intValue();
            out.writeInt(key);
            out.writeObject(get(key));
        }
    }

    /**
     * Reads our custom streamable fields.
     */
    public void readObject (ObjectInputStream in)
        throws IOException, ClassNotFoundException
    {
        int ecount = in.readInt();
        for (int ii = 0; ii < ecount; ii++) {
            int key = in.readInt();
            put(key, in.readObject());
        }
    }
}

@@ -38,33 +38,33 @@
 v 1.
-1
+2
  2003/0
-2/18 03:01:16 mdb
+5/27 23:00:22 ray
  Exp
@@ -151,16 +151,38 @@
 terator;
+%0Aimport java.util.Map;
 %0A%0Aimport
@@ -1178,16 +1178,21 @@
         
+for (
 Iterator
@@ -1199,18 +1199,20 @@
  iter = 
-k
 e
+ntr
 ySet().i
@@ -1225,24 +1225,9 @@
 r();
-%0A        while (
+ 
 iter
@@ -1236,16 +1236,18 @@
 asNext()
+; 
 ) %7B%0A    
@@ -1258,81 +1258,113 @@
     
-int key = ((Integer)iter.next()).intValue();%0A            out.writeInt(key
+Map.Entry entry = (Map.Entry) iter.next();%0A            out.writeInt(((Integer) entry.getKey()).intValue()
 );%0A 
@@ -1394,15 +1394,23 @@
 ect(
-get(key
+entry.getValue(
 ));%0A

Iterate over the entries and save the key and value without having to look up the value.