IntStatSet fixes
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@658 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
@@ -13,11 +13,11 @@ import com.threerings.io.ObjectOutputStream;
|
|||||||
public class IntSetStat extends Stat
|
public class IntSetStat extends Stat
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Constructs a new IntSetStat that will store an unbounded number of ints.
|
* Constructs a new IntSetStat that will store up to Integer.MAX_VALUE ints.
|
||||||
*/
|
*/
|
||||||
public IntSetStat ()
|
public IntSetStat ()
|
||||||
{
|
{
|
||||||
_maxSize = -1;
|
_maxSize = Integer.MAX_VALUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -51,14 +51,15 @@ public class IntSetStat extends Stat
|
|||||||
*/
|
*/
|
||||||
public boolean add (int key)
|
public boolean add (int key)
|
||||||
{
|
{
|
||||||
return (_maxSize < 0 || _intSet.size() < _maxSize ? _intSet.add(key) : false);
|
return (_intSet.size() < _maxSize ? _intSet.add(key) : false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void persistTo (ObjectOutputStream out, AuxDataSource aux)
|
public void persistTo (ObjectOutputStream out, AuxDataSource aux)
|
||||||
throws IOException
|
throws IOException
|
||||||
{
|
{
|
||||||
out.writeByte(_intSet.size());
|
out.writeInt(_maxSize);
|
||||||
|
out.writeInt(_intSet.size());
|
||||||
for (int key : _intSet) {
|
for (int key : _intSet) {
|
||||||
out.writeInt(key);
|
out.writeInt(key);
|
||||||
}
|
}
|
||||||
@@ -68,7 +69,8 @@ public class IntSetStat extends Stat
|
|||||||
public void unpersistFrom (ObjectInputStream in, AuxDataSource aux)
|
public void unpersistFrom (ObjectInputStream in, AuxDataSource aux)
|
||||||
throws IOException, ClassNotFoundException
|
throws IOException, ClassNotFoundException
|
||||||
{
|
{
|
||||||
int numValues = in.readByte();
|
_maxSize = in.readInt();
|
||||||
|
int numValues = in.readInt();
|
||||||
_intSet = new HashSet<Integer>(numValues);
|
_intSet = new HashSet<Integer>(numValues);
|
||||||
for (int ii = 0; ii < numValues; ii++) {
|
for (int ii = 0; ii < numValues; ii++) {
|
||||||
_intSet.add(in.readInt());
|
_intSet.add(in.readInt());
|
||||||
|
|||||||
Reference in New Issue
Block a user