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

Because we defined DSet as parameterized on <E extends DSet.Entry> it rewrites

Browse Source 
all generic references to E as DSet.Entry rather than Object which is what I
was assuming. So when I write:

(E[])new Object[...]

that gets rewritten to:

(Entry[])new Object[...]

which causes le freakout. We need to use Entry[] everywhere, which we happened
to be doing for everything except toArray().

I rewrote things to use E[] everywhere now that I know it will get rewritten to
Entry[]. I thought it was going to get rewritten to Object[] before so I didn't
genericize that stuff.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4059 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2006-04-26 02:13:10 +00:00
parent ad9a3e54e3
commit 0e27af2af4
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/presents/dobj/DSet.java
+5 -5
View File
@@ -226,7 +226,7 @@ public class DSet<E extends DSet.Entry>
public E[] toArray (E[] array)
{
if (array == null) {
array = (E[])new Object[size()];
array = (E[])new Entry[size()];
}
System.arraycopy(_entries, 0, array, 0, array.length);
return array;
@@ -268,7 +268,7 @@ public class DSet<E extends DSet.Entry>
}
// create a new array and copy our data into it
Entry[] elems = new Entry[elength*2];
E[] elems = (E[])new Entry[elength*2];
System.arraycopy(_entries, 0, elems, 0, elength);
_entries = elems;
}
@@ -324,7 +324,7 @@ public class DSet<E extends DSet.Entry>
if ((_entries.length > INITIAL_CAPACITY) &&
(_size < _entries.length/8)) {
// if we're using less than 1/8 of our capacity, shrink by half
Entry[] newEnts = new Entry[_entries.length/2];
E[] newEnts = (E[])new Entry[_entries.length/2];
System.arraycopy(_entries, 0, newEnts, 0, eidx);
System.arraycopy(_entries, eidx+1, newEnts, eidx, _size-eidx);
_entries = newEnts;
@@ -424,14 +424,14 @@ public class DSet<E extends DSet.Entry>
while (capacity < _size) {
capacity <<= 1;
}
_entries = new Entry[capacity];
_entries = (E[])new Entry[capacity];
for (int ii = 0; ii < _size; ii++) {
_entries[ii] = (E)in.readObject();
}
}
/** The entries of the set (in a sparse array). */
protected Entry[] _entries = new Entry[INITIAL_CAPACITY];
protected E[] _entries = (E[])new Entry[INITIAL_CAPACITY];
/** The number of entries in this set. */
protected int _size;