More code hygiene. Need to do some fiddling to make dispatchers not generate
generics warnings when calling methods with generic types. git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@698 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
@@ -452,7 +452,7 @@ public class SpotSceneManager extends SceneManager
|
||||
/**
|
||||
* Used to manage clusters which are groups of users that can chat to one another.
|
||||
*/
|
||||
protected class ClusterRecord extends HashIntMap
|
||||
protected class ClusterRecord extends HashIntMap<ClusteredBodyObject>
|
||||
{
|
||||
public ClusterRecord ()
|
||||
{
|
||||
@@ -460,9 +460,7 @@ public class SpotSceneManager extends SceneManager
|
||||
_clusters.put(_clobj.getOid(), this);
|
||||
|
||||
// let any mapped users know about our cluster
|
||||
Iterator iter = values().iterator();
|
||||
while (iter.hasNext()) {
|
||||
ClusteredBodyObject body = (ClusteredBodyObject)iter.next();
|
||||
for (ClusteredBodyObject body : values()) {
|
||||
body.setClusterOid(_clobj.getOid());
|
||||
_clobj.addToOccupants(((BodyObject)body).getOid());
|
||||
}
|
||||
@@ -495,7 +493,7 @@ public class SpotSceneManager extends SceneManager
|
||||
// make sure our intrepid joiner is not in any another cluster
|
||||
removeFromCluster(body.getOid());
|
||||
|
||||
put(body.getOid(), body);
|
||||
put(body.getOid(), (ClusteredBodyObject)body);
|
||||
_ssobj.startTransaction();
|
||||
try {
|
||||
body.startTransaction();
|
||||
|
||||
Reference in New Issue
Block a user