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

Fixed ArrayIntSet constructor, made equals() use AbstractSet when not comparing

Browse Source 
against another ArrayIntSet which will provide contents-based equality with
other sets.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2593 6335cc39-0255-0410-8fd6-9bcaacd3b74c
This commit is contained in:
samskivert
2009-07-14 17:53:00 +00:00
parent b5af1884b3
commit af5ebf8cc7
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/samskivert/util/ArrayIntSet.java
+13 -15
View File
@@ -49,13 +49,11 @@ public class ArrayIntSet extends AbstractSet<Integer>
if (_size > 1) {
int last = _values[0];
for (int ii = 1; ii < _size; ) {
if (values[ii] == last) {
// shift everything down 1
if (_values[ii] == last) { // shift everything down 1
_size--;
System.arraycopy(_values, ii + 1, _values, ii, _size - ii);
} else {
last = values[ii++];
last = _values[ii++];
}
}
}
@@ -383,21 +381,21 @@ public class ArrayIntSet extends AbstractSet<Integer>
@Override
public boolean equals (Object o)
{
// use an optimized equality test for another ArrayIntSet
if (o instanceof ArrayIntSet) {
ArrayIntSet other = (ArrayIntSet)o;
if (other._size == _size) {
for (int ii = 0; ii < _size; ii++) {
// we can't use Arrays.equals() because we only want to
// compare the first _size values
if (_values[ii] != other._values[ii]) {
return false;
}
}
return true;
if (other._size != _size) {
return false;
}
// we can't use Arrays.equals() because we only want to compare the first _size values
for (int ii = 0; ii < _size; ii++) {
if (_values[ii] != other._values[ii]) {
return false;
}
}
return true;
}
return false;
return super.equals(o);
}
@Override