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

Implicit depends removal.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@636 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
Michael Bayne
2008-06-29 14:13:36 +00:00
parent 5317113b01
commit 0aac6b230d
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/stage/server/StageSceneManager.java
+5 -8
View File
@@ -55,7 +55,6 @@ import com.threerings.stage.data.StageLocation;
import com.threerings.stage.data.StageMisoSceneModel; import com.threerings.stage.data.StageMisoSceneModel;
import com.threerings.stage.data.StageOccupantInfo; import com.threerings.stage.data.StageOccupantInfo;
import com.threerings.stage.data.StageScene; import com.threerings.stage.data.StageScene;
import com.threerings.stage.data.StageSceneMarshaller;
import com.threerings.stage.data.StageSceneModel; import com.threerings.stage.data.StageSceneModel;
import com.threerings.stage.data.StageSceneObject; import com.threerings.stage.data.StageSceneObject;
import com.threerings.stage.util.StageSceneUtil; import com.threerings.stage.util.StageSceneUtil;
@@ -254,16 +253,14 @@ public class StageSceneManager extends SpotSceneManager
_ssobj = (StageSceneObject)_plobj; _ssobj = (StageSceneObject)_plobj;
// register and fill in our stage scene service // register and fill in our stage scene service
StageSceneMarshaller service = (StageSceneMarshaller) _ssobj.setStageSceneService(_invmgr.registerDispatcher(new StageSceneDispatcher(this)));
StageServer.invmgr.registerDispatcher(new StageSceneDispatcher(this));
_ssobj.setStageSceneService(service);
} }
@Override // documentation inherited @Override // documentation inherited
protected void didShutdown () protected void didShutdown ()
{ {
super.didShutdown(); super.didShutdown();
StageServer.invmgr.clearDispatcher(_ssobj.stageSceneService); _invmgr.clearDispatcher(_ssobj.stageSceneService);
} }
@Override // documentation inherited @Override // documentation inherited
@@ -560,7 +557,7 @@ public class StageSceneManager extends SpotSceneManager
} }
// make sure the subsumee exists // make sure the subsumee exists
final BodyObject bobj = (BodyObject)StageServer.omgr.getObject(bodyOid); final BodyObject bobj = (BodyObject)_omgr.getObject(bodyOid);
if (bobj == null) { if (bobj == null) {
log.warning("Can't subsume disappeared body " + log.warning("Can't subsume disappeared body " +
"[where=" + where() + ", cluster=" + cl + "[where=" + where() + ", cluster=" + cl +
@@ -572,7 +569,7 @@ public class StageSceneManager extends SpotSceneManager
// to our cluster to be processed after we finish adding // to our cluster to be processed after we finish adding
// ourselves to this cluster // ourselves to this cluster
final ClusterRecord fclrec = clrec; final ClusterRecord fclrec = clrec;
StageServer.omgr.postRunnable(new Runnable() { _omgr.postRunnable(new Runnable() {
public void run () { public void run () {
try { try {
log.info("Subsuming " + bobj.who() + log.info("Subsuming " + bobj.who() +
@@ -709,7 +706,7 @@ public class StageSceneManager extends SpotSceneManager
{ {
SceneLocation sloc = _ssobj.occupantLocs.get(Integer.valueOf(bodyOid)); SceneLocation sloc = _ssobj.occupantLocs.get(Integer.valueOf(bodyOid));
if (sloc == null) { if (sloc == null) {
BodyObject user = (BodyObject)StageServer.omgr.getObject(bodyOid); BodyObject user = (BodyObject)_omgr.getObject(bodyOid);
String who = (user == null) ? ("" + bodyOid) : user.who(); String who = (user == null) ? ("" + bodyOid) : user.who();
log.warning("Can't position locationless user " + log.warning("Can't position locationless user " +
"[where=" + where() + ", cluster=" + cl + "[where=" + where() + ", cluster=" + cl +