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

Removed some unneeded casts now that the _entries array

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4064 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Ray Greenwell
2006-04-26 21:32:09 +00:00
parent e6ac65fd11
commit 481722188d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/presents/dobj/DSet.java
+5 -4
View File
@@ -153,7 +153,7 @@ public class DSet<E extends DSet.Entry>
// determine where we'll be adding the new element // determine where we'll be adding the new element
int eidx = ArrayUtil.binarySearch( int eidx = ArrayUtil.binarySearch(
_entries, 0, _size, key, ENTRY_COMP); _entries, 0, _size, key, ENTRY_COMP);
return (eidx < 0) ? null : (E)_entries[eidx]; return (eidx < 0) ? null : _entries[eidx];
} }
/** /**
@@ -164,6 +164,7 @@ public class DSet<E extends DSet.Entry>
* *
* @deprecated * @deprecated
*/ */
@Deprecated
public Iterator<E> entries () public Iterator<E> entries ()
{ {
return iterator(); return iterator();
@@ -192,7 +193,7 @@ public class DSet<E extends DSet.Entry>
} }
public E next () { public E next () {
checkComodification(); checkComodification();
return (E)_entries[_index++]; return _entries[_index++];
} }
public void remove () { public void remove () {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
@@ -319,7 +320,7 @@ public class DSet<E extends DSet.Entry>
// if we found it, remove it // if we found it, remove it
if (eidx >= 0) { if (eidx >= 0) {
// extract the old entry // extract the old entry
E oldEntry = (E)_entries[eidx]; E oldEntry = _entries[eidx];
_size--; _size--;
if ((_entries.length > INITIAL_CAPACITY) && if ((_entries.length > INITIAL_CAPACITY) &&
(_size < _entries.length/8)) { (_size < _entries.length/8)) {
@@ -360,7 +361,7 @@ public class DSet<E extends DSet.Entry>
// if we found it, update it // if we found it, update it
if (eidx >= 0) { if (eidx >= 0) {
E oldEntry = (E)_entries[eidx]; E oldEntry = _entries[eidx];
_entries[eidx] = elem; _entries[eidx] = elem;
_modCount++; _modCount++;
return oldEntry; return oldEntry;