Fixed some unused variables, unused imports, type variable hiding, tricky

generic array type handling and other niggling bits.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5267 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2008-07-26 20:40:20 +00:00
parent 4fab6bb71a
commit 93fb7b01f7
11 changed files with 27 additions and 39 deletions
@@ -51,9 +51,7 @@ public class DependencyGraph<T>
public T removeAvailableElement ()
{
T elem = _orphans.get(0);
DependencyNode<T> node = _nodes.get(elem);
remove(elem);
return elem;
}
@@ -132,17 +130,17 @@ public class DependencyGraph<T>
protected ArrayList<T> _orphans = new ArrayList<T>();
/** Represents a node in our dependency graph. */
protected class DependencyNode<T>
protected class DependencyNode<DT>
{
public T content;
public ArrayList<DependencyNode<T>> parents;
public ArrayList<DependencyNode<T>> children;
public DT content;
public ArrayList<DependencyNode<DT>> parents;
public ArrayList<DependencyNode<DT>> children;
public DependencyNode (T contents)
public DependencyNode (DT contents)
{
this.content = contents;
this.parents = new ArrayList<DependencyNode<T>>();
this.children = new ArrayList<DependencyNode<T>>();
this.parents = new ArrayList<DependencyNode<DT>>();
this.children = new ArrayList<DependencyNode<DT>>();
}
}
}
@@ -246,7 +246,7 @@ public class StreamableEnumSet<E extends Enum<E>> extends AbstractSet<E>
{
try {
// make a deep clone of the contents
StreamableEnumSet cset = (StreamableEnumSet)super.clone();
@SuppressWarnings("unchecked") StreamableEnumSet<E> cset = (StreamableEnumSet<E>)super.clone();
cset._contents = _contents.clone();
return cset;