AfflictionNetworks/vilya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apparently we already have a StreamableArrayIntSet; use that instead.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@676 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
Tom Conkling
2008-07-24 20:11:41 +00:00
parent 3c3146d381
commit 25a657d7c6
1 changed files with 3 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/stats/data/IntSetStat.java
+3 -33
View File
@@ -5,11 +5,10 @@ package com.threerings.stats.data;
import java.io.IOException; import java.io.IOException;
import com.samskivert.util.ArrayIntSet;
import com.samskivert.util.IntSet;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
import com.threerings.io.ObjectInputStream; import com.threerings.io.ObjectInputStream;
import com.threerings.io.ObjectOutputStream; import com.threerings.io.ObjectOutputStream;
import com.threerings.util.StreamableArrayIntSet;
/** /**
* Used to track a statistic comprised of a bounded set of integers. * Used to track a statistic comprised of a bounded set of integers.
@@ -80,7 +79,7 @@ public class IntSetStat extends Stat
{ {
_maxSize = ((int)in.readByte()) + 128; _maxSize = ((int)in.readByte()) + 128;
int numValues = ((int)in.readByte()) + 128; int numValues = ((int)in.readByte()) + 128;
_intSet = new ArrayIntSet(numValues); _intSet = new StreamableArrayIntSet(numValues);
for (int ii = 0; ii < numValues; ii++) { for (int ii = 0; ii < numValues; ii++) {
_intSet.add(in.readInt()); _intSet.add(in.readInt());
} }
@@ -93,37 +92,8 @@ public class IntSetStat extends Stat
return StringUtil.toString(_intSet); return StringUtil.toString(_intSet);
} }
/** Writes our custom streamable fields. */
@Override // from Stat
public void writeObject (ObjectOutputStream out)
throws IOException
{
super.writeObject(out);
out.writeInt(_intSet.size());
for (int val : _intSet) {
out.writeInt(val);
}
}
/** Reads our custom streamable fields. */
@Override // from Stat
public void readObject (ObjectInputStream in)
throws IOException, ClassNotFoundException
{
super.readObject(in);
int setSize = in.readInt();
_intSet = new ArrayIntSet(setSize);
for (int ii = 0; ii < setSize; ii++) {
_intSet.add(in.readInt());
}
}
protected int _maxSize; protected int _maxSize;
protected StreamableArrayIntSet _intSet = new StreamableArrayIntSet();
/** ArrayIntSet is not Streamable, so we implement writeObject() and readObject() ourselves. */
protected transient IntSet _intSet = new ArrayIntSet();
protected static final int MAX_MAX_SIZE = 255; protected static final int MAX_MAX_SIZE = 255;