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/whirled/data/SceneMarshaller.java
+3 -4
View File
@@ -1,5 +1,5 @@
//
// $Id: SceneMarshaller.java,v 1.5 2004/08/27 02:20:42 mdb Exp $
// $Id$
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -26,7 +26,6 @@ import com.threerings.presents.client.Client;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
import com.threerings.whirled.client.SceneService;
import com.threerings.whirled.client.SceneService.SceneMoveListener;
import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.data.SceneUpdate;
@@ -109,9 +108,9 @@ public class SceneMarshaller extends InvocationMarshaller
public static final int MOVE_TO = 1;
// documentation inherited from interface
public void moveTo (Client arg1, int arg2, int arg3, SceneMoveListener arg4)
public void moveTo (Client arg1, int arg2, int arg3, SceneService.SceneMoveListener arg4)
{
SceneMoveMarshaller listener4 = new SceneMoveMarshaller();
SceneMarshaller.SceneMoveMarshaller listener4 = new SceneMarshaller.SceneMoveMarshaller();
listener4.listener = arg4;
sendRequest(arg1, MOVE_TO, new Object[] {
new Integer(arg2), new Integer(arg3), listener4
src/java/com/threerings/whirled/server/SceneDispatcher.java
+2 -3
View File
@@ -1,5 +1,5 @@
//
// $Id: SceneDispatcher.java,v 1.5 2004/08/27 02:20:43 mdb Exp $
// $Id$
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -28,7 +28,6 @@ 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.client.SceneService.SceneMoveListener;
import com.threerings.whirled.data.SceneMarshaller;
import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.data.SceneUpdate;
@@ -62,7 +61,7 @@ public class SceneDispatcher extends InvocationDispatcher
case SceneMarshaller.MOVE_TO:
((SceneProvider)provider).moveTo(
source,
((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (SceneMoveListener)args[2]
((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (SceneService.SceneMoveListener)args[2]
);
return;
src/java/com/threerings/whirled/spot/data/SpotMarshaller.java
+10 -10
View File
@@ -1,5 +1,5 @@
//
// $Id: SpotMarshaller.java,v 1.6 2004/08/27 02:20:46 mdb Exp $
// $Id$
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -22,11 +22,11 @@
package com.threerings.whirled.spot.data;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService.ConfirmListener;
import com.threerings.presents.client.InvocationService;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
import com.threerings.whirled.client.SceneService.SceneMoveListener;
import com.threerings.whirled.data.SceneMarshaller.SceneMoveMarshaller;
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;
@@ -44,9 +44,9 @@ public class SpotMarshaller extends InvocationMarshaller
public static final int TRAVERSE_PORTAL = 1;
// documentation inherited from interface
public void traversePortal (Client arg1, int arg2, int arg3, SceneMoveListener arg4)
public void traversePortal (Client arg1, int arg2, int arg3, SceneService.SceneMoveListener arg4)
{
SceneMoveMarshaller listener4 = new SceneMoveMarshaller();
SceneMarshaller.SceneMoveMarshaller listener4 = new SceneMarshaller.SceneMoveMarshaller();
listener4.listener = arg4;
sendRequest(arg1, TRAVERSE_PORTAL, new Object[] {
new Integer(arg2), new Integer(arg3), listener4
@@ -57,9 +57,9 @@ public class SpotMarshaller extends InvocationMarshaller
public static final int CHANGE_LOCATION = 2;
// documentation inherited from interface
public void changeLocation (Client arg1, int arg2, Location arg3, ConfirmListener arg4)
public void changeLocation (Client arg1, int arg2, Location arg3, InvocationService.ConfirmListener arg4)
{
ConfirmMarshaller listener4 = new ConfirmMarshaller();
InvocationMarshaller.ConfirmMarshaller listener4 = new InvocationMarshaller.ConfirmMarshaller();
listener4.listener = arg4;
sendRequest(arg1, CHANGE_LOCATION, new Object[] {
new Integer(arg2), arg3, listener4
@@ -70,9 +70,9 @@ public class SpotMarshaller extends InvocationMarshaller
public static final int JOIN_CLUSTER = 3;
// documentation inherited from interface
public void joinCluster (Client arg1, int arg2, ConfirmListener arg3)
public void joinCluster (Client arg1, int arg2, InvocationService.ConfirmListener arg3)
{
ConfirmMarshaller listener3 = new ConfirmMarshaller();
InvocationMarshaller.ConfirmMarshaller listener3 = new InvocationMarshaller.ConfirmMarshaller();
listener3.listener = arg3;
sendRequest(arg1, JOIN_CLUSTER, new Object[] {
new Integer(arg2), listener3
src/java/com/threerings/whirled/spot/server/SpotDispatcher.java
+7 -7
View File
@@ -1,5 +1,5 @@
//
// $Id: SpotDispatcher.java,v 1.6 2004/08/27 02:20:47 mdb Exp $
// $Id$
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -22,13 +22,13 @@
package com.threerings.whirled.spot.server;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService.ConfirmListener;
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.SceneMoveListener;
import com.threerings.whirled.data.SceneMarshaller.SceneMoveMarshaller;
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;
@@ -62,21 +62,21 @@ public class SpotDispatcher extends InvocationDispatcher
case SpotMarshaller.TRAVERSE_PORTAL:
((SpotProvider)provider).traversePortal(
source,
((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (SceneMoveListener)args[2]
((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (SceneService.SceneMoveListener)args[2]
);
return;
case SpotMarshaller.CHANGE_LOCATION:
((SpotProvider)provider).changeLocation(
source,
((Integer)args[0]).intValue(), (Location)args[1], (ConfirmListener)args[2]
((Integer)args[0]).intValue(), (Location)args[1], (InvocationService.ConfirmListener)args[2]
);
return;
case SpotMarshaller.JOIN_CLUSTER:
((SpotProvider)provider).joinCluster(
source,
((Integer)args[0]).intValue(), (ConfirmListener)args[1]
((Integer)args[0]).intValue(), (InvocationService.ConfirmListener)args[1]
);
return;
src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java
+3 -4
View File
@@ -1,5 +1,5 @@
//
// $Id: ZoneMarshaller.java,v 1.5 2004/08/27 02:20:51 mdb Exp $
// $Id$
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -28,7 +28,6 @@ import com.threerings.presents.dobj.InvocationResponseEvent;
import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.data.SceneUpdate;
import com.threerings.whirled.zone.client.ZoneService;
import com.threerings.whirled.zone.client.ZoneService.ZoneMoveListener;
import com.threerings.whirled.zone.data.ZoneSummary;
/**
@@ -110,9 +109,9 @@ public class ZoneMarshaller extends InvocationMarshaller
public static final int MOVE_TO = 1;
// documentation inherited from interface
public void moveTo (Client arg1, int arg2, int arg3, int arg4, ZoneMoveListener arg5)
public void moveTo (Client arg1, int arg2, int arg3, int arg4, ZoneService.ZoneMoveListener arg5)
{
ZoneMoveMarshaller listener5 = new ZoneMoveMarshaller();
ZoneMarshaller.ZoneMoveMarshaller listener5 = new ZoneMarshaller.ZoneMoveMarshaller();
listener5.listener = arg5;
sendRequest(arg1, MOVE_TO, new Object[] {
new Integer(arg2), new Integer(arg3), new Integer(arg4), listener5
src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java
+2 -3
View File
@@ -1,5 +1,5 @@
//
// $Id: ZoneDispatcher.java,v 1.5 2004/08/27 02:20:51 mdb Exp $
// $Id$
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -30,7 +30,6 @@ 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.client.ZoneService.ZoneMoveListener;
import com.threerings.whirled.zone.data.ZoneMarshaller;
import com.threerings.whirled.zone.data.ZoneSummary;
@@ -63,7 +62,7 @@ public class ZoneDispatcher extends InvocationDispatcher
case ZoneMarshaller.MOVE_TO:
((ZoneProvider)provider).moveTo(
source,
((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), ((Integer)args[2]).intValue(), (ZoneMoveListener)args[3]
((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), ((Integer)args[2]).intValue(), (ZoneService.ZoneMoveListener)args[3]
);
return;