We don't need the sceneId or version in the base class.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@364 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
@@ -40,12 +40,9 @@ import com.threerings.whirled.Log;
|
||||
public abstract class AbstractSceneMoveHandler
|
||||
implements SceneRegistry.ResolutionListener
|
||||
{
|
||||
public AbstractSceneMoveHandler (BodyObject body, int sceneId, int version,
|
||||
InvocationService.InvocationListener listener)
|
||||
public AbstractSceneMoveHandler (BodyObject body, InvocationService.InvocationListener listener)
|
||||
{
|
||||
_body = body;
|
||||
_sceneId = sceneId;
|
||||
_version = version;
|
||||
_listener = listener;
|
||||
}
|
||||
|
||||
@@ -84,7 +81,5 @@ public abstract class AbstractSceneMoveHandler
|
||||
throws InvocationException;
|
||||
|
||||
protected BodyObject _body;
|
||||
protected int _sceneId;
|
||||
protected int _version;
|
||||
protected InvocationService.InvocationListener _listener;
|
||||
}
|
||||
|
||||
@@ -39,10 +39,10 @@ import com.threerings.whirled.data.ScenedBodyObject;
|
||||
*/
|
||||
public class SceneMoveHandler extends AbstractSceneMoveHandler
|
||||
{
|
||||
public SceneMoveHandler (BodyObject body, int sceneId, int sceneVer,
|
||||
SceneService.SceneMoveListener listener)
|
||||
public SceneMoveHandler (BodyObject body, int sceneVer, SceneService.SceneMoveListener listener)
|
||||
{
|
||||
super(body, sceneId, sceneVer, listener);
|
||||
super(body, listener);
|
||||
_version = sceneVer;
|
||||
}
|
||||
|
||||
@Override // from AbstractSceneMoveHandler
|
||||
@@ -73,4 +73,6 @@ public class SceneMoveHandler extends AbstractSceneMoveHandler
|
||||
listener.moveSucceeded(ploid, config);
|
||||
}
|
||||
}
|
||||
|
||||
protected int _version;
|
||||
}
|
||||
|
||||
@@ -225,7 +225,7 @@ public class SceneRegistry
|
||||
SceneService.SceneMoveListener listener)
|
||||
{
|
||||
BodyObject body = (BodyObject)caller;
|
||||
resolveScene(sceneId, new SceneMoveHandler(body, sceneId, sceneVer, listener));
|
||||
resolveScene(sceneId, new SceneMoveHandler(body, sceneVer, listener));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user