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

src/java/com/threerings/whirled/server/AbstractSceneMoveHandler.java

@@ -40,12 +40,9 @@ import com.threerings.whirled.Log;
 public abstract class AbstractSceneMoveHandler
     implements SceneRegistry.ResolutionListener
 {
-    public AbstractSceneMoveHandler (BodyObject body, int sceneId, int version,
+    public AbstractSceneMoveHandler (BodyObject body, InvocationService.InvocationListener listener)
-                                     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;
 }

src/java/com/threerings/whirled/server/SceneMoveHandler.java

@@ -39,10 +39,10 @@ import com.threerings.whirled.data.ScenedBodyObject;
  */
 public class SceneMoveHandler extends AbstractSceneMoveHandler
 {
-    public SceneMoveHandler (BodyObject body, int sceneId, int sceneVer,
+    public SceneMoveHandler (BodyObject body, int sceneVer, SceneService.SceneMoveListener listener)
-                             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;
 }

src/java/com/threerings/whirled/server/SceneRegistry.java

@@ -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));
     }
 
     /**

src/java/com/threerings/whirled/spot/server/SpotProvider.java

@@ -112,8 +112,8 @@ public class SpotProvider
         }
 
         // resolve their destination scene
-        _screg.resolveScene(dest.targetSceneId, new SpotSceneMoveHandler(
+        _screg.resolveScene(dest.targetSceneId,
-                                srcmgr, body, sceneId, destSceneVer, dest, listener));
+                            new SpotSceneMoveHandler(srcmgr, body, destSceneVer, dest, listener));
     }
 
     /**

src/java/com/threerings/whirled/spot/server/SpotSceneMoveHandler.java

@@ -36,10 +36,10 @@ import com.threerings.whirled.spot.data.Portal;
  */
 public class SpotSceneMoveHandler extends SceneMoveHandler
 {
-    public SpotSceneMoveHandler (SpotSceneManager srcmgr, BodyObject body, int sceneId,
+    public SpotSceneMoveHandler (SpotSceneManager srcmgr, BodyObject body, int sceneVer,
-                                 int sceneVer, Portal dest, SceneService.SceneMoveListener listener)
+                                 Portal dest, SceneService.SceneMoveListener listener)
     {
-        super(body, sceneId, sceneVer, listener);
+        super(body, sceneVer, listener);
         _srcmgr = srcmgr;
         _dest = dest;
     }

src/java/com/threerings/whirled/zone/server/ZoneMoveHandler.java

@@ -51,8 +51,10 @@ public class ZoneMoveHandler extends AbstractSceneMoveHandler
     public ZoneMoveHandler (ZoneManager zmgr, BodyObject body, int sceneId, int sceneVer,
                             ZoneService.ZoneMoveListener listener)
     {
-        super(body, sceneId, sceneVer, listener);
+        super(body, listener);
         _zmgr = zmgr;
+        _sceneId = sceneId;
+        _version = sceneVer;
     }
 
     // from interface ZoneManager.ResolutionListener
@@ -113,5 +115,6 @@ public class ZoneMoveHandler extends AbstractSceneMoveHandler
     }
 
     protected ZoneManager _zmgr;
+    protected int _sceneId, _version;
     protected ZoneSummary _summary;
 }