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

Regenerated our marshaller and dispatcher classes with the new Java-based

Browse Source 
generator. It handles inner classes slightly differently and prepends a
project-specific header to the generated classes.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3239 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2004-11-25 04:47:40 +00:00
parent a0d343ff04
commit a04e23e025
32 changed files with 296 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/crowd/chat/data/ChatMarshaller.java
+5 -6
View File
@@ -1,5 +1,5 @@
//
// $Id: ChatMarshaller.java,v 1.9 2004/08/27 02:12:31 mdb Exp $
// $Id$
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -22,9 +22,8 @@
package com.threerings.crowd.chat.data;
import com.threerings.crowd.chat.client.ChatService;
import com.threerings.crowd.chat.client.ChatService.TellListener;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService.InvocationListener;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
import com.threerings.util.Name;
@@ -74,9 +73,9 @@ public class ChatMarshaller extends InvocationMarshaller
public static final int TELL = 1;
// documentation inherited from interface
public void tell (Client arg1, Name arg2, String arg3, TellListener arg4)
public void tell (Client arg1, Name arg2, String arg3, ChatService.TellListener arg4)
{
TellMarshaller listener4 = new TellMarshaller();
ChatMarshaller.TellMarshaller listener4 = new ChatMarshaller.TellMarshaller();
listener4.listener = arg4;
sendRequest(arg1, TELL, new Object[] {
arg2, arg3, listener4
@@ -87,7 +86,7 @@ public class ChatMarshaller extends InvocationMarshaller
public static final int BROADCAST = 2;
// documentation inherited from interface
public void broadcast (Client arg1, String arg2, InvocationListener arg3)
public void broadcast (Client arg1, String arg2, InvocationService.InvocationListener arg3)
{
ListenerMarshaller listener3 = new ListenerMarshaller();
listener3.listener = arg3;
src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java
+1 -1
View File
@@ -1,5 +1,5 @@
//
// $Id: SpeakMarshaller.java,v 1.6 2004/08/27 02:12:31 mdb Exp $
// $Id$
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
src/java/com/threerings/crowd/chat/server/ChatDispatcher.java
+4 -5
View File
@@ -1,5 +1,5 @@
//
// $Id: ChatDispatcher.java,v 1.9 2004/08/27 02:12:32 mdb Exp $
// $Id$
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -22,10 +22,9 @@
package com.threerings.crowd.chat.server;
import com.threerings.crowd.chat.client.ChatService;
import com.threerings.crowd.chat.client.ChatService.TellListener;
import com.threerings.crowd.chat.data.ChatMarshaller;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService.InvocationListener;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.server.InvocationDispatcher;
@@ -61,14 +60,14 @@ public class ChatDispatcher extends InvocationDispatcher
case ChatMarshaller.TELL:
((ChatProvider)provider).tell(
source,
(Name)args[0], (String)args[1], (TellListener)args[2]
(Name)args[0], (String)args[1], (ChatService.TellListener)args[2]
);
return;
case ChatMarshaller.BROADCAST:
((ChatProvider)provider).broadcast(
source,
(String)args[0], (InvocationListener)args[1]
(String)args[0], (InvocationService.InvocationListener)args[1]
);
return;
src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java
+1 -1
View File
@@ -1,5 +1,5 @@
//
// $Id: SpeakDispatcher.java,v 1.6 2004/08/27 02:12:32 mdb Exp $
// $Id$
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
src/java/com/threerings/crowd/data/BodyMarshaller.java
+1 -1
View File
@@ -1,5 +1,5 @@
//
// $Id: BodyMarshaller.java,v 1.5 2004/08/27 02:12:33 mdb Exp $
// $Id$
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
src/java/com/threerings/crowd/data/LocationMarshaller.java
+3 -4
View File
@@ -1,5 +1,5 @@
//
// $Id: LocationMarshaller.java,v 1.5 2004/08/27 02:12:33 mdb Exp $
// $Id$
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -22,7 +22,6 @@
package com.threerings.crowd.data;
import com.threerings.crowd.client.LocationService;
import com.threerings.crowd.client.LocationService.MoveListener;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.InvocationMarshaller;
@@ -73,9 +72,9 @@ public class LocationMarshaller extends InvocationMarshaller
public static final int MOVE_TO = 1;
// documentation inherited from interface
public void moveTo (Client arg1, int arg2, MoveListener arg3)
public void moveTo (Client arg1, int arg2, LocationService.MoveListener arg3)
{
MoveMarshaller listener3 = new MoveMarshaller();
LocationMarshaller.MoveMarshaller listener3 = new LocationMarshaller.MoveMarshaller();
listener3.listener = arg3;
sendRequest(arg1, MOVE_TO, new Object[] {
new Integer(arg2), listener3
src/java/com/threerings/crowd/server/BodyDispatcher.java
+1 -1
View File
@@ -1,5 +1,5 @@
//
// $Id: BodyDispatcher.java,v 1.5 2004/08/27 02:12:34 mdb Exp $
// $Id$
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
src/java/com/threerings/crowd/server/LocationDispatcher.java
+2 -3
View File
@@ -1,5 +1,5 @@
//
// $Id: LocationDispatcher.java,v 1.5 2004/08/27 02:12:34 mdb Exp $
// $Id$
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -22,7 +22,6 @@
package com.threerings.crowd.server;
import com.threerings.crowd.client.LocationService;
import com.threerings.crowd.client.LocationService.MoveListener;
import com.threerings.crowd.data.LocationMarshaller;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.presents.client.Client;
@@ -60,7 +59,7 @@ public class LocationDispatcher extends InvocationDispatcher
case LocationMarshaller.MOVE_TO:
((LocationProvider)provider).moveTo(
source,
((Integer)args[0]).intValue(), (MoveListener)args[1]
((Integer)args[0]).intValue(), (LocationService.MoveListener)args[1]
);
return;