//
// $Id: StreamableIntIntMap.java,v 1.2 2004/08/27 02:20:36 mdb Exp $
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 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 java.io.IOException;
import java.util.Iterator;

import com.samskivert.util.IntIntMap;

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

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

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

    /**
     * Writes our custom streamable fields.
     */
    public void writeObject (ObjectOutputStream out)
        throws IOException
    {
        int ecount = size();
        out.writeInt(ecount);
        Iterator iter = keys();
        while (iter.hasNext()) {
            int key = ((Integer)iter.next()).intValue();
            out.writeInt(key);
            out.writeInt(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.readInt());
        }
    }
}

@@ -6,69 +6,8 @@
  $Id
-: StreamableIntIntMap.java,v 1.2 2004/08/27 02:20:36 mdb Exp 
 $%0A//
@@ -1962,16 +1962,21 @@
         
+for (
 Iterator
@@ -1982,39 +1982,37 @@
 r it
-e
 r = 
-keys();%0A        while (
+entrySet().iterator(); 
 it
-e
 r.ha
@@ -2018,16 +2018,18 @@
 asNext()
+; 
 ) %7B%0A    
@@ -2040,39 +2040,40 @@
     
-int key = ((Integer)
+Entry entry = (Entry) 
 it
-e
 r.next()
 ).in
@@ -2072,20 +2072,8 @@
 xt()
-).intValue()
 ;%0A  
@@ -2095,19 +2095,33 @@
 riteInt(
-key
+entry.getIntKey()
 );%0A     
@@ -2144,15 +2144,26 @@
 Int(
-get(key
+entry.getIntValue(
 ));%0A

More efficient serialization.