Regenerated everything in alphabetical order.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3244 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -69,16 +69,14 @@ public class ChatMarshaller extends InvocationMarshaller
|
||||
}
|
||||
}
|
||||
|
||||
/** The method id used to dispatch {@link #tell} requests. */
|
||||
public static final int TELL = 1;
|
||||
/** The method id used to dispatch {@link #away} requests. */
|
||||
public static final int AWAY = 1;
|
||||
|
||||
// documentation inherited from interface
|
||||
public void tell (Client arg1, Name arg2, String arg3, ChatService.TellListener arg4)
|
||||
public void away (Client arg1, String arg2)
|
||||
{
|
||||
ChatMarshaller.TellMarshaller listener4 = new ChatMarshaller.TellMarshaller();
|
||||
listener4.listener = arg4;
|
||||
sendRequest(arg1, TELL, new Object[] {
|
||||
arg2, arg3, listener4
|
||||
sendRequest(arg1, AWAY, new Object[] {
|
||||
arg2
|
||||
});
|
||||
}
|
||||
|
||||
@@ -95,14 +93,16 @@ public class ChatMarshaller extends InvocationMarshaller
|
||||
});
|
||||
}
|
||||
|
||||
/** The method id used to dispatch {@link #away} requests. */
|
||||
public static final int AWAY = 3;
|
||||
/** The method id used to dispatch {@link #tell} requests. */
|
||||
public static final int TELL = 3;
|
||||
|
||||
// documentation inherited from interface
|
||||
public void away (Client arg1, String arg2)
|
||||
public void tell (Client arg1, Name arg2, String arg3, ChatService.TellListener arg4)
|
||||
{
|
||||
sendRequest(arg1, AWAY, new Object[] {
|
||||
arg2
|
||||
ChatMarshaller.TellMarshaller listener4 = new ChatMarshaller.TellMarshaller();
|
||||
listener4.listener = arg4;
|
||||
sendRequest(arg1, TELL, new Object[] {
|
||||
arg2, arg3, listener4
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -57,10 +57,10 @@ public class ChatDispatcher extends InvocationDispatcher
|
||||
throws InvocationException
|
||||
{
|
||||
switch (methodId) {
|
||||
case ChatMarshaller.TELL:
|
||||
((ChatProvider)provider).tell(
|
||||
case ChatMarshaller.AWAY:
|
||||
((ChatProvider)provider).away(
|
||||
source,
|
||||
(Name)args[0], (String)args[1], (ChatService.TellListener)args[2]
|
||||
(String)args[0]
|
||||
);
|
||||
return;
|
||||
|
||||
@@ -71,10 +71,10 @@ public class ChatDispatcher extends InvocationDispatcher
|
||||
);
|
||||
return;
|
||||
|
||||
case ChatMarshaller.AWAY:
|
||||
((ChatProvider)provider).away(
|
||||
case ChatMarshaller.TELL:
|
||||
((ChatProvider)provider).tell(
|
||||
source,
|
||||
(String)args[0]
|
||||
(Name)args[0], (String)args[1], (ChatService.TellListener)args[2]
|
||||
);
|
||||
return;
|
||||
|
||||
|
||||
@@ -114,34 +114,8 @@ public class ParlorMarshaller extends InvocationMarshaller
|
||||
});
|
||||
}
|
||||
|
||||
/** The method id used to dispatch {@link #invite} requests. */
|
||||
public static final int INVITE = 2;
|
||||
|
||||
// documentation inherited from interface
|
||||
public void invite (Client arg1, Name arg2, GameConfig arg3, ParlorService.InviteListener arg4)
|
||||
{
|
||||
ParlorMarshaller.InviteMarshaller listener4 = new ParlorMarshaller.InviteMarshaller();
|
||||
listener4.listener = arg4;
|
||||
sendRequest(arg1, INVITE, new Object[] {
|
||||
arg2, arg3, listener4
|
||||
});
|
||||
}
|
||||
|
||||
/** The method id used to dispatch {@link #respond} requests. */
|
||||
public static final int RESPOND = 3;
|
||||
|
||||
// documentation inherited from interface
|
||||
public void respond (Client arg1, int arg2, int arg3, Object arg4, InvocationService.InvocationListener arg5)
|
||||
{
|
||||
ListenerMarshaller listener5 = new ListenerMarshaller();
|
||||
listener5.listener = arg5;
|
||||
sendRequest(arg1, RESPOND, new Object[] {
|
||||
new Integer(arg2), new Integer(arg3), arg4, listener5
|
||||
});
|
||||
}
|
||||
|
||||
/** The method id used to dispatch {@link #createTable} requests. */
|
||||
public static final int CREATE_TABLE = 4;
|
||||
public static final int CREATE_TABLE = 2;
|
||||
|
||||
// documentation inherited from interface
|
||||
public void createTable (Client arg1, int arg2, GameConfig arg3, ParlorService.TableListener arg4)
|
||||
@@ -153,8 +127,21 @@ public class ParlorMarshaller extends InvocationMarshaller
|
||||
});
|
||||
}
|
||||
|
||||
/** The method id used to dispatch {@link #invite} requests. */
|
||||
public static final int INVITE = 3;
|
||||
|
||||
// documentation inherited from interface
|
||||
public void invite (Client arg1, Name arg2, GameConfig arg3, ParlorService.InviteListener arg4)
|
||||
{
|
||||
ParlorMarshaller.InviteMarshaller listener4 = new ParlorMarshaller.InviteMarshaller();
|
||||
listener4.listener = arg4;
|
||||
sendRequest(arg1, INVITE, new Object[] {
|
||||
arg2, arg3, listener4
|
||||
});
|
||||
}
|
||||
|
||||
/** The method id used to dispatch {@link #joinTable} requests. */
|
||||
public static final int JOIN_TABLE = 5;
|
||||
public static final int JOIN_TABLE = 4;
|
||||
|
||||
// documentation inherited from interface
|
||||
public void joinTable (Client arg1, int arg2, int arg3, int arg4, InvocationService.InvocationListener arg5)
|
||||
@@ -167,7 +154,7 @@ public class ParlorMarshaller extends InvocationMarshaller
|
||||
}
|
||||
|
||||
/** The method id used to dispatch {@link #leaveTable} requests. */
|
||||
public static final int LEAVE_TABLE = 6;
|
||||
public static final int LEAVE_TABLE = 5;
|
||||
|
||||
// documentation inherited from interface
|
||||
public void leaveTable (Client arg1, int arg2, int arg3, InvocationService.InvocationListener arg4)
|
||||
@@ -179,4 +166,17 @@ public class ParlorMarshaller extends InvocationMarshaller
|
||||
});
|
||||
}
|
||||
|
||||
/** The method id used to dispatch {@link #respond} requests. */
|
||||
public static final int RESPOND = 6;
|
||||
|
||||
// documentation inherited from interface
|
||||
public void respond (Client arg1, int arg2, int arg3, Object arg4, InvocationService.InvocationListener arg5)
|
||||
{
|
||||
ListenerMarshaller listener5 = new ListenerMarshaller();
|
||||
listener5.listener = arg5;
|
||||
sendRequest(arg1, RESPOND, new Object[] {
|
||||
new Integer(arg2), new Integer(arg3), arg4, listener5
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -65,20 +65,6 @@ public class ParlorDispatcher extends InvocationDispatcher
|
||||
);
|
||||
return;
|
||||
|
||||
case ParlorMarshaller.INVITE:
|
||||
((ParlorProvider)provider).invite(
|
||||
source,
|
||||
(Name)args[0], (GameConfig)args[1], (ParlorService.InviteListener)args[2]
|
||||
);
|
||||
return;
|
||||
|
||||
case ParlorMarshaller.RESPOND:
|
||||
((ParlorProvider)provider).respond(
|
||||
source,
|
||||
((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (Object)args[2], (InvocationService.InvocationListener)args[3]
|
||||
);
|
||||
return;
|
||||
|
||||
case ParlorMarshaller.CREATE_TABLE:
|
||||
((ParlorProvider)provider).createTable(
|
||||
source,
|
||||
@@ -86,6 +72,13 @@ public class ParlorDispatcher extends InvocationDispatcher
|
||||
);
|
||||
return;
|
||||
|
||||
case ParlorMarshaller.INVITE:
|
||||
((ParlorProvider)provider).invite(
|
||||
source,
|
||||
(Name)args[0], (GameConfig)args[1], (ParlorService.InviteListener)args[2]
|
||||
);
|
||||
return;
|
||||
|
||||
case ParlorMarshaller.JOIN_TABLE:
|
||||
((ParlorProvider)provider).joinTable(
|
||||
source,
|
||||
@@ -100,6 +93,13 @@ public class ParlorDispatcher extends InvocationDispatcher
|
||||
);
|
||||
return;
|
||||
|
||||
case ParlorMarshaller.RESPOND:
|
||||
((ParlorProvider)provider).respond(
|
||||
source,
|
||||
((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (Object)args[2], (InvocationService.InvocationListener)args[3]
|
||||
);
|
||||
return;
|
||||
|
||||
default:
|
||||
super.dispatchRequest(source, methodId, args);
|
||||
}
|
||||
|
||||
@@ -55,21 +55,9 @@ public class SceneMarshaller extends InvocationMarshaller
|
||||
new Object[] { new Integer(arg1), arg2 }));
|
||||
}
|
||||
|
||||
/** The method id used to dispatch {@link #moveSucceededWithUpdates}
|
||||
* responses. */
|
||||
public static final int MOVE_SUCCEEDED_WITH_UPDATES = 2;
|
||||
|
||||
// documentation inherited from interface
|
||||
public void moveSucceededWithUpdates (int arg1, PlaceConfig arg2, SceneUpdate[] arg3)
|
||||
{
|
||||
omgr.postEvent(new InvocationResponseEvent(
|
||||
callerOid, requestId, MOVE_SUCCEEDED_WITH_UPDATES,
|
||||
new Object[] { new Integer(arg1), arg2, arg3 }));
|
||||
}
|
||||
|
||||
/** The method id used to dispatch {@link #moveSucceededWithScene}
|
||||
* responses. */
|
||||
public static final int MOVE_SUCCEEDED_WITH_SCENE = 3;
|
||||
public static final int MOVE_SUCCEEDED_WITH_SCENE = 2;
|
||||
|
||||
// documentation inherited from interface
|
||||
public void moveSucceededWithScene (int arg1, PlaceConfig arg2, SceneModel arg3)
|
||||
@@ -79,6 +67,18 @@ public class SceneMarshaller extends InvocationMarshaller
|
||||
new Object[] { new Integer(arg1), arg2, arg3 }));
|
||||
}
|
||||
|
||||
/** The method id used to dispatch {@link #moveSucceededWithUpdates}
|
||||
* responses. */
|
||||
public static final int MOVE_SUCCEEDED_WITH_UPDATES = 3;
|
||||
|
||||
// documentation inherited from interface
|
||||
public void moveSucceededWithUpdates (int arg1, PlaceConfig arg2, SceneUpdate[] arg3)
|
||||
{
|
||||
omgr.postEvent(new InvocationResponseEvent(
|
||||
callerOid, requestId, MOVE_SUCCEEDED_WITH_UPDATES,
|
||||
new Object[] { new Integer(arg1), arg2, arg3 }));
|
||||
}
|
||||
|
||||
// documentation inherited
|
||||
public void dispatchResponse (int methodId, Object[] args)
|
||||
{
|
||||
@@ -88,16 +88,16 @@ public class SceneMarshaller extends InvocationMarshaller
|
||||
((Integer)args[0]).intValue(), (PlaceConfig)args[1]);
|
||||
return;
|
||||
|
||||
case MOVE_SUCCEEDED_WITH_UPDATES:
|
||||
((SceneMoveListener)listener).moveSucceededWithUpdates(
|
||||
((Integer)args[0]).intValue(), (PlaceConfig)args[1], (SceneUpdate[])args[2]);
|
||||
return;
|
||||
|
||||
case MOVE_SUCCEEDED_WITH_SCENE:
|
||||
((SceneMoveListener)listener).moveSucceededWithScene(
|
||||
((Integer)args[0]).intValue(), (PlaceConfig)args[1], (SceneModel)args[2]);
|
||||
return;
|
||||
|
||||
case MOVE_SUCCEEDED_WITH_UPDATES:
|
||||
((SceneMoveListener)listener).moveSucceededWithUpdates(
|
||||
((Integer)args[0]).intValue(), (PlaceConfig)args[1], (SceneUpdate[])args[2]);
|
||||
return;
|
||||
|
||||
default:
|
||||
super.dispatchResponse(methodId, args);
|
||||
}
|
||||
|
||||
@@ -40,21 +40,8 @@ import com.threerings.whirled.spot.data.Location;
|
||||
public class SpotMarshaller extends InvocationMarshaller
|
||||
implements SpotService
|
||||
{
|
||||
/** The method id used to dispatch {@link #traversePortal} requests. */
|
||||
public static final int TRAVERSE_PORTAL = 1;
|
||||
|
||||
// documentation inherited from interface
|
||||
public void traversePortal (Client arg1, int arg2, int arg3, SceneService.SceneMoveListener arg4)
|
||||
{
|
||||
SceneMarshaller.SceneMoveMarshaller listener4 = new SceneMarshaller.SceneMoveMarshaller();
|
||||
listener4.listener = arg4;
|
||||
sendRequest(arg1, TRAVERSE_PORTAL, new Object[] {
|
||||
new Integer(arg2), new Integer(arg3), listener4
|
||||
});
|
||||
}
|
||||
|
||||
/** The method id used to dispatch {@link #changeLocation} requests. */
|
||||
public static final int CHANGE_LOCATION = 2;
|
||||
public static final int CHANGE_LOCATION = 1;
|
||||
|
||||
// documentation inherited from interface
|
||||
public void changeLocation (Client arg1, int arg2, Location arg3, InvocationService.ConfirmListener arg4)
|
||||
@@ -66,6 +53,17 @@ public class SpotMarshaller extends InvocationMarshaller
|
||||
});
|
||||
}
|
||||
|
||||
/** The method id used to dispatch {@link #clusterSpeak} requests. */
|
||||
public static final int CLUSTER_SPEAK = 2;
|
||||
|
||||
// documentation inherited from interface
|
||||
public void clusterSpeak (Client arg1, String arg2, byte arg3)
|
||||
{
|
||||
sendRequest(arg1, CLUSTER_SPEAK, new Object[] {
|
||||
arg2, new Byte(arg3)
|
||||
});
|
||||
}
|
||||
|
||||
/** The method id used to dispatch {@link #joinCluster} requests. */
|
||||
public static final int JOIN_CLUSTER = 3;
|
||||
|
||||
@@ -79,14 +77,16 @@ public class SpotMarshaller extends InvocationMarshaller
|
||||
});
|
||||
}
|
||||
|
||||
/** The method id used to dispatch {@link #clusterSpeak} requests. */
|
||||
public static final int CLUSTER_SPEAK = 4;
|
||||
/** The method id used to dispatch {@link #traversePortal} requests. */
|
||||
public static final int TRAVERSE_PORTAL = 4;
|
||||
|
||||
// documentation inherited from interface
|
||||
public void clusterSpeak (Client arg1, String arg2, byte arg3)
|
||||
public void traversePortal (Client arg1, int arg2, int arg3, SceneService.SceneMoveListener arg4)
|
||||
{
|
||||
sendRequest(arg1, CLUSTER_SPEAK, new Object[] {
|
||||
arg2, new Byte(arg3)
|
||||
SceneMarshaller.SceneMoveMarshaller listener4 = new SceneMarshaller.SceneMoveMarshaller();
|
||||
listener4.listener = arg4;
|
||||
sendRequest(arg1, TRAVERSE_PORTAL, new Object[] {
|
||||
new Integer(arg2), new Integer(arg3), listener4
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -59,13 +59,6 @@ public class SpotDispatcher extends InvocationDispatcher
|
||||
throws InvocationException
|
||||
{
|
||||
switch (methodId) {
|
||||
case SpotMarshaller.TRAVERSE_PORTAL:
|
||||
((SpotProvider)provider).traversePortal(
|
||||
source,
|
||||
((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (SceneService.SceneMoveListener)args[2]
|
||||
);
|
||||
return;
|
||||
|
||||
case SpotMarshaller.CHANGE_LOCATION:
|
||||
((SpotProvider)provider).changeLocation(
|
||||
source,
|
||||
@@ -73,13 +66,6 @@ public class SpotDispatcher extends InvocationDispatcher
|
||||
);
|
||||
return;
|
||||
|
||||
case SpotMarshaller.JOIN_CLUSTER:
|
||||
((SpotProvider)provider).joinCluster(
|
||||
source,
|
||||
((Integer)args[0]).intValue(), (InvocationService.ConfirmListener)args[1]
|
||||
);
|
||||
return;
|
||||
|
||||
case SpotMarshaller.CLUSTER_SPEAK:
|
||||
((SpotProvider)provider).clusterSpeak(
|
||||
source,
|
||||
@@ -87,6 +73,20 @@ public class SpotDispatcher extends InvocationDispatcher
|
||||
);
|
||||
return;
|
||||
|
||||
case SpotMarshaller.JOIN_CLUSTER:
|
||||
((SpotProvider)provider).joinCluster(
|
||||
source,
|
||||
((Integer)args[0]).intValue(), (InvocationService.ConfirmListener)args[1]
|
||||
);
|
||||
return;
|
||||
|
||||
case SpotMarshaller.TRAVERSE_PORTAL:
|
||||
((SpotProvider)provider).traversePortal(
|
||||
source,
|
||||
((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (SceneService.SceneMoveListener)args[2]
|
||||
);
|
||||
return;
|
||||
|
||||
default:
|
||||
super.dispatchRequest(source, methodId, args);
|
||||
}
|
||||
|
||||
@@ -56,21 +56,9 @@ public class ZoneMarshaller extends InvocationMarshaller
|
||||
new Object[] { new Integer(arg1), arg2, arg3 }));
|
||||
}
|
||||
|
||||
/** The method id used to dispatch {@link #moveSucceededWithUpdates}
|
||||
* responses. */
|
||||
public static final int MOVE_SUCCEEDED_WITH_UPDATES = 2;
|
||||
|
||||
// documentation inherited from interface
|
||||
public void moveSucceededWithUpdates (int arg1, PlaceConfig arg2, ZoneSummary arg3, SceneUpdate[] arg4)
|
||||
{
|
||||
omgr.postEvent(new InvocationResponseEvent(
|
||||
callerOid, requestId, MOVE_SUCCEEDED_WITH_UPDATES,
|
||||
new Object[] { new Integer(arg1), arg2, arg3, arg4 }));
|
||||
}
|
||||
|
||||
/** The method id used to dispatch {@link #moveSucceededWithScene}
|
||||
* responses. */
|
||||
public static final int MOVE_SUCCEEDED_WITH_SCENE = 3;
|
||||
public static final int MOVE_SUCCEEDED_WITH_SCENE = 2;
|
||||
|
||||
// documentation inherited from interface
|
||||
public void moveSucceededWithScene (int arg1, PlaceConfig arg2, ZoneSummary arg3, SceneModel arg4)
|
||||
@@ -80,6 +68,18 @@ public class ZoneMarshaller extends InvocationMarshaller
|
||||
new Object[] { new Integer(arg1), arg2, arg3, arg4 }));
|
||||
}
|
||||
|
||||
/** The method id used to dispatch {@link #moveSucceededWithUpdates}
|
||||
* responses. */
|
||||
public static final int MOVE_SUCCEEDED_WITH_UPDATES = 3;
|
||||
|
||||
// documentation inherited from interface
|
||||
public void moveSucceededWithUpdates (int arg1, PlaceConfig arg2, ZoneSummary arg3, SceneUpdate[] arg4)
|
||||
{
|
||||
omgr.postEvent(new InvocationResponseEvent(
|
||||
callerOid, requestId, MOVE_SUCCEEDED_WITH_UPDATES,
|
||||
new Object[] { new Integer(arg1), arg2, arg3, arg4 }));
|
||||
}
|
||||
|
||||
// documentation inherited
|
||||
public void dispatchResponse (int methodId, Object[] args)
|
||||
{
|
||||
@@ -89,16 +89,16 @@ public class ZoneMarshaller extends InvocationMarshaller
|
||||
((Integer)args[0]).intValue(), (PlaceConfig)args[1], (ZoneSummary)args[2]);
|
||||
return;
|
||||
|
||||
case MOVE_SUCCEEDED_WITH_UPDATES:
|
||||
((ZoneMoveListener)listener).moveSucceededWithUpdates(
|
||||
((Integer)args[0]).intValue(), (PlaceConfig)args[1], (ZoneSummary)args[2], (SceneUpdate[])args[3]);
|
||||
return;
|
||||
|
||||
case MOVE_SUCCEEDED_WITH_SCENE:
|
||||
((ZoneMoveListener)listener).moveSucceededWithScene(
|
||||
((Integer)args[0]).intValue(), (PlaceConfig)args[1], (ZoneSummary)args[2], (SceneModel)args[3]);
|
||||
return;
|
||||
|
||||
case MOVE_SUCCEEDED_WITH_UPDATES:
|
||||
((ZoneMoveListener)listener).moveSucceededWithUpdates(
|
||||
((Integer)args[0]).intValue(), (PlaceConfig)args[1], (ZoneSummary)args[2], (SceneUpdate[])args[3]);
|
||||
return;
|
||||
|
||||
default:
|
||||
super.dispatchResponse(methodId, args);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user