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

Regenerated invocation service bits.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@613 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
Michael Bayne
2008-06-06 14:39:03 +00:00
parent f663e36fe6
commit 2090bcdfeb
33 changed files with 58 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/micasa/lobby/LobbyDispatcher.java
+3 -6
View File
@@ -21,14 +21,10 @@
package com.threerings.micasa.lobby;
import com.threerings.micasa.lobby.LobbyMarshaller;
import com.threerings.micasa.lobby.LobbyService;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.server.InvocationDispatcher;
import com.threerings.presents.server.InvocationException;
import java.util.List;
/**
* Dispatches requests to the {@link LobbyProvider}.
@@ -44,13 +40,14 @@ public class LobbyDispatcher extends InvocationDispatcher
this.provider = provider;
}
// from InvocationDispatcher
@Override // documentation inherited
public InvocationMarshaller createMarshaller ()
{
return new LobbyMarshaller();
}
@SuppressWarnings("unchecked") // from InvocationDispatcher
@SuppressWarnings("unchecked")
@Override // documentation inherited
public void dispatchRequest (
ClientObject source, int methodId, Object[] args)
throws InvocationException
src/java/com/threerings/micasa/lobby/LobbyMarshaller.java
+3 -3
View File
@@ -21,10 +21,10 @@
package com.threerings.micasa.lobby;
import com.threerings.micasa.lobby.LobbyService;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
import com.threerings.presents.net.Transport;
import java.util.List;
/**
@@ -53,7 +53,7 @@ public class LobbyMarshaller extends InvocationMarshaller
_invId = null;
omgr.postEvent(new InvocationResponseEvent(
callerOid, requestId, GOT_CATEGORIES,
new Object[] { arg1 }));
new Object[] { arg1 }, transport));
}
@Override // from InvocationMarshaller
@@ -88,7 +88,7 @@ public class LobbyMarshaller extends InvocationMarshaller
_invId = null;
omgr.postEvent(new InvocationResponseEvent(
callerOid, requestId, GOT_LOBBIES,
new Object[] { arg1 }));
new Object[] { arg1 }, transport));
}
@Override // from InvocationMarshaller
src/java/com/threerings/micasa/lobby/LobbyProvider.java
-3
View File
@@ -21,12 +21,9 @@
package com.threerings.micasa.lobby;
import com.threerings.micasa.lobby.LobbyService;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.server.InvocationException;
import com.threerings.presents.server.InvocationProvider;
import java.util.List;
/**
* Defines the server-side of the {@link LobbyService}.
src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java
+1 -1
View File
@@ -25,7 +25,7 @@ import com.threerings.micasa.simulator.client.SimulatorService;
import com.threerings.parlor.game.data.GameConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
import com.threerings.presents.net.Transport;
/**
* Provides the implementation of the {@link SimulatorService} interface
src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java
+3 -4
View File
@@ -21,10 +21,8 @@
package com.threerings.micasa.simulator.server;
import com.threerings.micasa.simulator.client.SimulatorService;
import com.threerings.micasa.simulator.data.SimulatorMarshaller;
import com.threerings.parlor.game.data.GameConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.server.InvocationDispatcher;
@@ -44,13 +42,14 @@ public class SimulatorDispatcher extends InvocationDispatcher
this.provider = provider;
}
// from InvocationDispatcher
@Override // documentation inherited
public InvocationMarshaller createMarshaller ()
{
return new SimulatorMarshaller();
}
@SuppressWarnings("unchecked") // from InvocationDispatcher
@SuppressWarnings("unchecked")
@Override // documentation inherited
public void dispatchRequest (
ClientObject source, int methodId, Object[] args)
throws InvocationException
src/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java
+1 -1
View File
@@ -25,7 +25,7 @@ import com.threerings.parlor.card.data.Card;
import com.threerings.parlor.card.trick.client.TrickCardGameService;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
import com.threerings.presents.net.Transport;
/**
* Provides the implementation of the {@link TrickCardGameService} interface
src/java/com/threerings/parlor/card/trick/server/TrickCardGameDispatcher.java
+3 -4
View File
@@ -22,9 +22,7 @@
package com.threerings.parlor.card.trick.server;
import com.threerings.parlor.card.data.Card;
import com.threerings.parlor.card.trick.client.TrickCardGameService;
import com.threerings.parlor.card.trick.data.TrickCardGameMarshaller;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.server.InvocationDispatcher;
@@ -44,13 +42,14 @@ public class TrickCardGameDispatcher extends InvocationDispatcher
this.provider = provider;
}
// from InvocationDispatcher
@Override // documentation inherited
public InvocationMarshaller createMarshaller ()
{
return new TrickCardGameMarshaller();
}
@SuppressWarnings("unchecked") // from InvocationDispatcher
@SuppressWarnings("unchecked")
@Override // documentation inherited
public void dispatchRequest (
ClientObject source, int methodId, Object[] args)
throws InvocationException
src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java
-3
View File
@@ -22,10 +22,7 @@
package com.threerings.parlor.card.trick.server;
import com.threerings.parlor.card.data.Card;
import com.threerings.parlor.card.trick.client.TrickCardGameService;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.server.InvocationException;
import com.threerings.presents.server.InvocationProvider;
/**
src/java/com/threerings/parlor/data/ParlorMarshaller.java
+2 -1
View File
@@ -27,6 +27,7 @@ import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
import com.threerings.presents.net.Transport;
import com.threerings.util.Name;
/**
@@ -55,7 +56,7 @@ public class ParlorMarshaller extends InvocationMarshaller
_invId = null;
omgr.postEvent(new InvocationResponseEvent(
callerOid, requestId, INVITE_RECEIVED,
new Object[] { Integer.valueOf(arg1) }));
new Object[] { Integer.valueOf(arg1) }, transport));
}
@Override // from InvocationMarshaller
src/java/com/threerings/parlor/data/TableMarshaller.java
+1 -2
View File
@@ -22,12 +22,11 @@
package com.threerings.parlor.data;
import com.threerings.parlor.client.TableService;
import com.threerings.parlor.data.TableConfig;
import com.threerings.parlor.game.data.GameConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
import com.threerings.presents.net.Transport;
/**
* Provides the implementation of the {@link TableService} interface
src/java/com/threerings/parlor/server/ParlorDispatcher.java
+3 -3
View File
@@ -24,7 +24,6 @@ package com.threerings.parlor.server;
import com.threerings.parlor.client.ParlorService;
import com.threerings.parlor.data.ParlorMarshaller;
import com.threerings.parlor.game.data.GameConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.data.InvocationMarshaller;
@@ -46,13 +45,14 @@ public class ParlorDispatcher extends InvocationDispatcher
this.provider = provider;
}
// from InvocationDispatcher
@Override // documentation inherited
public InvocationMarshaller createMarshaller ()
{
return new ParlorMarshaller();
}
@SuppressWarnings("unchecked") // from InvocationDispatcher
@SuppressWarnings("unchecked")
@Override // documentation inherited
public void dispatchRequest (
ClientObject source, int methodId, Object[] args)
throws InvocationException
src/java/com/threerings/parlor/server/ParlorProvider.java
-1
View File
@@ -23,7 +23,6 @@ package com.threerings.parlor.server;
import com.threerings.parlor.client.ParlorService;
import com.threerings.parlor.game.data.GameConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.server.InvocationException;
src/java/com/threerings/parlor/server/TableDispatcher.java
+3 -4
View File
@@ -21,11 +21,9 @@
package com.threerings.parlor.server;
import com.threerings.parlor.client.TableService;
import com.threerings.parlor.data.TableConfig;
import com.threerings.parlor.data.TableMarshaller;
import com.threerings.parlor.game.data.GameConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.data.InvocationMarshaller;
@@ -46,13 +44,14 @@ public class TableDispatcher extends InvocationDispatcher
this.provider = provider;
}
// from InvocationDispatcher
@Override // documentation inherited
public InvocationMarshaller createMarshaller ()
{
return new TableMarshaller();
}
@SuppressWarnings("unchecked") // from InvocationDispatcher
@SuppressWarnings("unchecked")
@Override // documentation inherited
public void dispatchRequest (
ClientObject source, int methodId, Object[] args)
throws InvocationException
src/java/com/threerings/parlor/server/TableProvider.java
-2
View File
@@ -21,10 +21,8 @@
package com.threerings.parlor.server;
import com.threerings.parlor.client.TableService;
import com.threerings.parlor.data.TableConfig;
import com.threerings.parlor.game.data.GameConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.server.InvocationException;
src/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java
+1 -1
View File
@@ -25,7 +25,7 @@ import com.threerings.parlor.tourney.client.TourneyService;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
import com.threerings.presents.net.Transport;
/**
* Provides the implementation of the {@link TourneyService} interface
src/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java
+1 -2
View File
@@ -22,11 +22,10 @@
package com.threerings.parlor.tourney.data;
import com.threerings.parlor.tourney.client.TourniesService;
import com.threerings.parlor.tourney.data.TourneyConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
import com.threerings.presents.net.Transport;
/**
* Provides the implementation of the {@link TourniesService} interface
src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java
+3 -4
View File
@@ -21,9 +21,7 @@
package com.threerings.parlor.tourney.server;
import com.threerings.parlor.tourney.client.TourneyService;
import com.threerings.parlor.tourney.data.TourneyMarshaller;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.data.InvocationMarshaller;
@@ -44,13 +42,14 @@ public class TourneyDispatcher extends InvocationDispatcher
this.provider = provider;
}
// from InvocationDispatcher
@Override // documentation inherited
public InvocationMarshaller createMarshaller ()
{
return new TourneyMarshaller();
}
@SuppressWarnings("unchecked") // from InvocationDispatcher
@SuppressWarnings("unchecked")
@Override // documentation inherited
public void dispatchRequest (
ClientObject source, int methodId, Object[] args)
throws InvocationException
src/java/com/threerings/parlor/tourney/server/TourneyProvider.java
-2
View File
@@ -21,8 +21,6 @@
package com.threerings.parlor.tourney.server;
import com.threerings.parlor.tourney.client.TourneyService;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.server.InvocationException;
src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java
+3 -4
View File
@@ -21,10 +21,8 @@
package com.threerings.parlor.tourney.server;
import com.threerings.parlor.tourney.client.TourniesService;
import com.threerings.parlor.tourney.data.TourneyConfig;
import com.threerings.parlor.tourney.data.TourniesMarshaller;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.data.InvocationMarshaller;
@@ -45,13 +43,14 @@ public class TourniesDispatcher extends InvocationDispatcher
this.provider = provider;
}
// from InvocationDispatcher
@Override // documentation inherited
public InvocationMarshaller createMarshaller ()
{
return new TourniesMarshaller();
}
@SuppressWarnings("unchecked") // from InvocationDispatcher
@SuppressWarnings("unchecked")
@Override // documentation inherited
public void dispatchRequest (
ClientObject source, int methodId, Object[] args)
throws InvocationException
src/java/com/threerings/parlor/tourney/server/TourniesProvider.java
-2
View File
@@ -21,9 +21,7 @@
package com.threerings.parlor.tourney.server;
import com.threerings.parlor.tourney.client.TourniesService;
import com.threerings.parlor.tourney.data.TourneyConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.server.InvocationException;
src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java
+1 -2
View File
@@ -23,9 +23,8 @@ package com.threerings.puzzle.data;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
import com.threerings.presents.net.Transport;
import com.threerings.puzzle.client.PuzzleGameService;
import com.threerings.puzzle.data.Board;
/**
* Provides the implementation of the {@link PuzzleGameService} interface
src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java
+3 -4
View File
@@ -21,12 +21,10 @@
package com.threerings.puzzle.server;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.server.InvocationDispatcher;
import com.threerings.presents.server.InvocationException;
import com.threerings.puzzle.client.PuzzleGameService;
import com.threerings.puzzle.data.Board;
import com.threerings.puzzle.data.PuzzleGameMarshaller;
@@ -44,13 +42,14 @@ public class PuzzleGameDispatcher extends InvocationDispatcher
this.provider = provider;
}
// from InvocationDispatcher
@Override // documentation inherited
public InvocationMarshaller createMarshaller ()
{
return new PuzzleGameMarshaller();
}
@SuppressWarnings("unchecked") // from InvocationDispatcher
@SuppressWarnings("unchecked")
@Override // documentation inherited
public void dispatchRequest (
ClientObject source, int methodId, Object[] args)
throws InvocationException
src/java/com/threerings/puzzle/server/PuzzleGameProvider.java
-3
View File
@@ -21,11 +21,8 @@
package com.threerings.puzzle.server;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.server.InvocationException;
import com.threerings.presents.server.InvocationProvider;
import com.threerings.puzzle.client.PuzzleGameService;
import com.threerings.puzzle.data.Board;
/**
src/java/com/threerings/stage/data/StageSceneMarshaller.java
+1 -1
View File
@@ -25,7 +25,7 @@ import com.threerings.miso.data.ObjectInfo;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
import com.threerings.presents.net.Transport;
import com.threerings.stage.client.StageSceneService;
/**
src/java/com/threerings/stage/server/StageSceneDispatcher.java
+3 -4
View File
@@ -22,13 +22,11 @@
package com.threerings.stage.server;
import com.threerings.miso.data.ObjectInfo;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.server.InvocationDispatcher;
import com.threerings.presents.server.InvocationException;
import com.threerings.stage.client.StageSceneService;
import com.threerings.stage.data.StageSceneMarshaller;
/**
@@ -45,13 +43,14 @@ public class StageSceneDispatcher extends InvocationDispatcher
this.provider = provider;
}
// from InvocationDispatcher
@Override // documentation inherited
public InvocationMarshaller createMarshaller ()
{
return new StageSceneMarshaller();
}
@SuppressWarnings("unchecked") // from InvocationDispatcher
@SuppressWarnings("unchecked")
@Override // documentation inherited
public void dispatchRequest (
ClientObject source, int methodId, Object[] args)
throws InvocationException
src/java/com/threerings/stage/server/StageSceneProvider.java
-2
View File
@@ -22,12 +22,10 @@
package com.threerings.stage.server;
import com.threerings.miso.data.ObjectInfo;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.server.InvocationException;
import com.threerings.presents.server.InvocationProvider;
import com.threerings.stage.client.StageSceneService;
/**
* Defines the server-side of the {@link StageSceneService}.
src/java/com/threerings/whirled/data/SceneMarshaller.java
+5 -6
View File
@@ -25,9 +25,8 @@ import com.threerings.crowd.data.PlaceConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
import com.threerings.presents.net.Transport;
import com.threerings.whirled.client.SceneService;
import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.data.SceneUpdate;
/**
* Provides the implementation of the {@link SceneService} interface
@@ -55,7 +54,7 @@ public class SceneMarshaller extends InvocationMarshaller
_invId = null;
omgr.postEvent(new InvocationResponseEvent(
callerOid, requestId, MOVE_REQUIRES_SERVER_SWITCH,
new Object[] { arg1, arg2 }));
new Object[] { arg1, arg2 }, transport));
}
/** The method id used to dispatch {@link #moveSucceeded}
@@ -68,7 +67,7 @@ public class SceneMarshaller extends InvocationMarshaller
_invId = null;
omgr.postEvent(new InvocationResponseEvent(
callerOid, requestId, MOVE_SUCCEEDED,
new Object[] { Integer.valueOf(arg1), arg2 }));
new Object[] { Integer.valueOf(arg1), arg2 }, transport));
}
/** The method id used to dispatch {@link #moveSucceededWithScene}
@@ -81,7 +80,7 @@ public class SceneMarshaller extends InvocationMarshaller
_invId = null;
omgr.postEvent(new InvocationResponseEvent(
callerOid, requestId, MOVE_SUCCEEDED_WITH_SCENE,
new Object[] { Integer.valueOf(arg1), arg2, arg3 }));
new Object[] { Integer.valueOf(arg1), arg2, arg3 }, transport));
}
/** The method id used to dispatch {@link #moveSucceededWithUpdates}
@@ -94,7 +93,7 @@ public class SceneMarshaller extends InvocationMarshaller
_invId = null;
omgr.postEvent(new InvocationResponseEvent(
callerOid, requestId, MOVE_SUCCEEDED_WITH_UPDATES,
new Object[] { Integer.valueOf(arg1), arg2, arg3 }));
new Object[] { Integer.valueOf(arg1), arg2, arg3 }, transport));
}
@Override // from InvocationMarshaller
src/java/com/threerings/whirled/server/SceneDispatcher.java
+3 -6
View File
@@ -21,16 +21,12 @@
package com.threerings.whirled.server;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.server.InvocationDispatcher;
import com.threerings.presents.server.InvocationException;
import com.threerings.whirled.client.SceneService;
import com.threerings.whirled.data.SceneMarshaller;
import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.data.SceneUpdate;
/**
* Dispatches requests to the {@link SceneProvider}.
@@ -46,13 +42,14 @@ public class SceneDispatcher extends InvocationDispatcher
this.provider = provider;
}
// from InvocationDispatcher
@Override // documentation inherited
public InvocationMarshaller createMarshaller ()
{
return new SceneMarshaller();
}
@SuppressWarnings("unchecked") // from InvocationDispatcher
@SuppressWarnings("unchecked")
@Override // documentation inherited
public void dispatchRequest (
ClientObject source, int methodId, Object[] args)
throws InvocationException
src/java/com/threerings/whirled/server/SceneProvider.java
-4
View File
@@ -21,14 +21,10 @@
package com.threerings.whirled.server;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.server.InvocationException;
import com.threerings.presents.server.InvocationProvider;
import com.threerings.whirled.client.SceneService;
import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.data.SceneUpdate;
/**
* Defines the server-side of the {@link SceneService}.
src/java/com/threerings/whirled/spot/data/SpotMarshaller.java
+1 -2
View File
@@ -24,11 +24,10 @@ package com.threerings.whirled.spot.data;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
import com.threerings.presents.net.Transport;
import com.threerings.whirled.client.SceneService;
import com.threerings.whirled.data.SceneMarshaller;
import com.threerings.whirled.spot.client.SpotService;
import com.threerings.whirled.spot.data.Location;
/**
* Provides the implementation of the {@link SpotService} interface
src/java/com/threerings/whirled/spot/server/SpotDispatcher.java
+3 -5
View File
@@ -21,15 +21,12 @@
package com.threerings.whirled.spot.server;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.server.InvocationDispatcher;
import com.threerings.presents.server.InvocationException;
import com.threerings.whirled.client.SceneService;
import com.threerings.whirled.data.SceneMarshaller;
import com.threerings.whirled.spot.client.SpotService;
import com.threerings.whirled.spot.data.Location;
import com.threerings.whirled.spot.data.SpotMarshaller;
@@ -47,13 +44,14 @@ public class SpotDispatcher extends InvocationDispatcher
this.provider = provider;
}
// from InvocationDispatcher
@Override // documentation inherited
public InvocationMarshaller createMarshaller ()
{
return new SpotMarshaller();
}
@SuppressWarnings("unchecked") // from InvocationDispatcher
@SuppressWarnings("unchecked")
@Override // documentation inherited
public void dispatchRequest (
ClientObject source, int methodId, Object[] args)
throws InvocationException
src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java
+4 -4
View File
@@ -25,10 +25,10 @@ import com.threerings.crowd.data.PlaceConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
import com.threerings.presents.net.Transport;
import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.data.SceneUpdate;
import com.threerings.whirled.zone.client.ZoneService;
import com.threerings.whirled.zone.data.ZoneSummary;
/**
* Provides the implementation of the {@link ZoneService} interface
@@ -56,7 +56,7 @@ public class ZoneMarshaller extends InvocationMarshaller
_invId = null;
omgr.postEvent(new InvocationResponseEvent(
callerOid, requestId, MOVE_SUCCEEDED,
new Object[] { Integer.valueOf(arg1), arg2, arg3 }));
new Object[] { Integer.valueOf(arg1), arg2, arg3 }, transport));
}
/** The method id used to dispatch {@link #moveSucceededWithScene}
@@ -69,7 +69,7 @@ public class ZoneMarshaller extends InvocationMarshaller
_invId = null;
omgr.postEvent(new InvocationResponseEvent(
callerOid, requestId, MOVE_SUCCEEDED_WITH_SCENE,
new Object[] { Integer.valueOf(arg1), arg2, arg3, arg4 }));
new Object[] { Integer.valueOf(arg1), arg2, arg3, arg4 }, transport));
}
/** The method id used to dispatch {@link #moveSucceededWithUpdates}
@@ -82,7 +82,7 @@ public class ZoneMarshaller extends InvocationMarshaller
_invId = null;
omgr.postEvent(new InvocationResponseEvent(
callerOid, requestId, MOVE_SUCCEEDED_WITH_UPDATES,
new Object[] { Integer.valueOf(arg1), arg2, arg3, arg4 }));
new Object[] { Integer.valueOf(arg1), arg2, arg3, arg4 }, transport));
}
@Override // from InvocationMarshaller
src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java
+3 -7
View File
@@ -21,17 +21,12 @@
package com.threerings.whirled.zone.server;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.server.InvocationDispatcher;
import com.threerings.presents.server.InvocationException;
import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.data.SceneUpdate;
import com.threerings.whirled.zone.client.ZoneService;
import com.threerings.whirled.zone.data.ZoneMarshaller;
import com.threerings.whirled.zone.data.ZoneSummary;
/**
* Dispatches requests to the {@link ZoneProvider}.
@@ -47,13 +42,14 @@ public class ZoneDispatcher extends InvocationDispatcher
this.provider = provider;
}
// from InvocationDispatcher
@Override // documentation inherited
public InvocationMarshaller createMarshaller ()
{
return new ZoneMarshaller();
}
@SuppressWarnings("unchecked") // from InvocationDispatcher
@SuppressWarnings("unchecked")
@Override // documentation inherited
public void dispatchRequest (
ClientObject source, int methodId, Object[] args)
throws InvocationException