Various generics/typesafety bits.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6602 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Mike Thomas
2011-04-05 17:35:59 +00:00
parent d076ff4bb7
commit 1d3b40c4dc
4 changed files with 4 additions and 4 deletions
@@ -112,7 +112,7 @@ public class EntryAddedEvent<T extends DSet.Entry> extends EntryEvent<T>
}
/** Used by {@link DObject} to note if this event has already been applied locally. */
protected EntryAddedEvent setAlreadyApplied (boolean alreadyApplied)
protected EntryAddedEvent<T> setAlreadyApplied (boolean alreadyApplied)
{
_alreadyApplied = alreadyApplied;
return this;
@@ -115,7 +115,7 @@ public class EntryRemovedEvent<T extends DSet.Entry> extends EntryEvent<T>
buf.append(", key=").append(_key);
}
protected EntryRemovedEvent setOldEntry (T oldEntry)
protected EntryRemovedEvent<T> setOldEntry (T oldEntry)
{
_oldEntry = oldEntry;
return this;
@@ -118,7 +118,7 @@ public class EntryUpdatedEvent<T extends DSet.Entry> extends EntryEvent<T>
StringUtil.toString(buf, _entry);
}
protected EntryUpdatedEvent setOldEntry (T oldEntry)
protected EntryUpdatedEvent<T> setOldEntry (T oldEntry)
{
_oldEntry = oldEntry;
return this;
@@ -340,7 +340,7 @@ public abstract class InvocationTask extends GenTask
protected void collectTypeParams (Type type, List<String> params) {
if (type instanceof TypeVariable) {
String tvar = ((TypeVariable)type).getName();
String tvar = ((TypeVariable<?>)type).getName();
if (!params.contains(tvar)) params.add(tvar);
} else if (type instanceof ParameterizedType) {
for (Type pt : ((ParameterizedType)type).getActualTypeArguments()) {