From a04e23e02592ee82143843f2f84816554168f703 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Thu, 25 Nov 2004 04:47:40 +0000 Subject: [PATCH] Regenerated our marshaller and dispatcher classes with the new Java-based 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 --- .../admin/data/AdminMarshaller.java | 7 +- .../admin/server/AdminDispatcher.java | 5 +- .../crowd/chat/data/ChatMarshaller.java | 11 +- .../crowd/chat/data/SpeakMarshaller.java | 2 +- .../crowd/chat/server/ChatDispatcher.java | 9 +- .../crowd/chat/server/SpeakDispatcher.java | 2 +- .../threerings/crowd/data/BodyMarshaller.java | 2 +- .../crowd/data/LocationMarshaller.java | 7 +- .../crowd/server/BodyDispatcher.java | 2 +- .../crowd/server/LocationDispatcher.java | 5 +- .../micasa/lobby/LobbyDispatcher.java | 8 +- .../micasa/lobby/LobbyMarshaller.java | 74 ++++++----- .../simulator/data/SimulatorMarshaller.java | 2 +- .../simulator/server/SimulatorDispatcher.java | 2 +- .../parlor/card/data/CardGameMarshaller.java | 24 +++- .../card/server/CardGameDispatcher.java | 22 +++- .../parlor/data/ParlorMarshaller.java | 122 +++++++++--------- .../parlor/game/GameDispatcher.java | 8 +- .../parlor/game/GameMarshaller.java | 2 +- .../parlor/server/ParlorDispatcher.java | 30 ++--- .../presents/data/TimeBaseMarshaller.java | 7 +- .../presents/server/TimeBaseDispatcher.java | 6 +- .../puzzle/data/PuzzleGameMarshaller.java | 20 ++- .../puzzle/data/PuzzleMarshaller.java | 26 +++- .../puzzle/server/PuzzleDispatcher.java | 24 +++- .../puzzle/server/PuzzleGameDispatcher.java | 20 ++- .../whirled/data/SceneMarshaller.java | 7 +- .../whirled/server/SceneDispatcher.java | 5 +- .../whirled/spot/data/SpotMarshaller.java | 20 +-- .../whirled/spot/server/SpotDispatcher.java | 14 +- .../whirled/zone/data/ZoneMarshaller.java | 7 +- .../whirled/zone/server/ZoneDispatcher.java | 5 +- 32 files changed, 296 insertions(+), 211 deletions(-) diff --git a/src/java/com/threerings/admin/data/AdminMarshaller.java b/src/java/com/threerings/admin/data/AdminMarshaller.java index c54ca2766..d11f8d223 100644 --- a/src/java/com/threerings/admin/data/AdminMarshaller.java +++ b/src/java/com/threerings/admin/data/AdminMarshaller.java @@ -1,5 +1,5 @@ // -// $Id: AdminMarshaller.java,v 1.5 2004/08/27 02:12:24 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.admin.data; import com.threerings.admin.client.AdminService; -import com.threerings.admin.client.AdminService.ConfigInfoListener; import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.dobj.InvocationResponseEvent; @@ -72,9 +71,9 @@ public class AdminMarshaller extends InvocationMarshaller public static final int GET_CONFIG_INFO = 1; // documentation inherited from interface - public void getConfigInfo (Client arg1, ConfigInfoListener arg2) + public void getConfigInfo (Client arg1, AdminService.ConfigInfoListener arg2) { - ConfigInfoMarshaller listener2 = new ConfigInfoMarshaller(); + AdminMarshaller.ConfigInfoMarshaller listener2 = new AdminMarshaller.ConfigInfoMarshaller(); listener2.listener = arg2; sendRequest(arg1, GET_CONFIG_INFO, new Object[] { listener2 diff --git a/src/java/com/threerings/admin/server/AdminDispatcher.java b/src/java/com/threerings/admin/server/AdminDispatcher.java index 4130fbe76..41485115f 100644 --- a/src/java/com/threerings/admin/server/AdminDispatcher.java +++ b/src/java/com/threerings/admin/server/AdminDispatcher.java @@ -1,5 +1,5 @@ // -// $Id: AdminDispatcher.java,v 1.5 2004/08/27 02:12:24 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.admin.server; import com.threerings.admin.client.AdminService; -import com.threerings.admin.client.AdminService.ConfigInfoListener; import com.threerings.admin.data.AdminMarshaller; import com.threerings.presents.client.Client; import com.threerings.presents.data.ClientObject; @@ -59,7 +58,7 @@ public class AdminDispatcher extends InvocationDispatcher case AdminMarshaller.GET_CONFIG_INFO: ((AdminProvider)provider).getConfigInfo( source, - (ConfigInfoListener)args[0] + (AdminService.ConfigInfoListener)args[0] ); return; diff --git a/src/java/com/threerings/crowd/chat/data/ChatMarshaller.java b/src/java/com/threerings/crowd/chat/data/ChatMarshaller.java index dc51f0f5a..16fa63844 100644 --- a/src/java/com/threerings/crowd/chat/data/ChatMarshaller.java +++ b/src/java/com/threerings/crowd/chat/data/ChatMarshaller.java @@ -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; diff --git a/src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java b/src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java index 4a2b4c06d..b2933ec90 100644 --- a/src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java +++ b/src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java @@ -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 diff --git a/src/java/com/threerings/crowd/chat/server/ChatDispatcher.java b/src/java/com/threerings/crowd/chat/server/ChatDispatcher.java index 6a6e9d8ae..a576f585d 100644 --- a/src/java/com/threerings/crowd/chat/server/ChatDispatcher.java +++ b/src/java/com/threerings/crowd/chat/server/ChatDispatcher.java @@ -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; diff --git a/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java b/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java index e50b50184..d42e87e03 100644 --- a/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java +++ b/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java @@ -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 diff --git a/src/java/com/threerings/crowd/data/BodyMarshaller.java b/src/java/com/threerings/crowd/data/BodyMarshaller.java index 827024570..774a01e02 100644 --- a/src/java/com/threerings/crowd/data/BodyMarshaller.java +++ b/src/java/com/threerings/crowd/data/BodyMarshaller.java @@ -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 diff --git a/src/java/com/threerings/crowd/data/LocationMarshaller.java b/src/java/com/threerings/crowd/data/LocationMarshaller.java index 49fe305c4..4064d08f8 100644 --- a/src/java/com/threerings/crowd/data/LocationMarshaller.java +++ b/src/java/com/threerings/crowd/data/LocationMarshaller.java @@ -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 diff --git a/src/java/com/threerings/crowd/server/BodyDispatcher.java b/src/java/com/threerings/crowd/server/BodyDispatcher.java index faf646342..bde16a177 100644 --- a/src/java/com/threerings/crowd/server/BodyDispatcher.java +++ b/src/java/com/threerings/crowd/server/BodyDispatcher.java @@ -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 diff --git a/src/java/com/threerings/crowd/server/LocationDispatcher.java b/src/java/com/threerings/crowd/server/LocationDispatcher.java index c67bd4372..c091c26b0 100644 --- a/src/java/com/threerings/crowd/server/LocationDispatcher.java +++ b/src/java/com/threerings/crowd/server/LocationDispatcher.java @@ -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; diff --git a/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java b/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java index c2a8abf70..11ea3f37b 100644 --- a/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java +++ b/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java @@ -1,5 +1,5 @@ // -// $Id: LobbyDispatcher.java,v 1.5 2004/08/27 02:12:50 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -23,8 +23,6 @@ package com.threerings.micasa.lobby; import com.threerings.micasa.lobby.LobbyMarshaller; import com.threerings.micasa.lobby.LobbyService; -import com.threerings.micasa.lobby.LobbyService.CategoriesListener; -import com.threerings.micasa.lobby.LobbyService.LobbiesListener; import com.threerings.presents.client.Client; import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.InvocationMarshaller; @@ -61,14 +59,14 @@ public class LobbyDispatcher extends InvocationDispatcher case LobbyMarshaller.GET_CATEGORIES: ((LobbyProvider)provider).getCategories( source, - (CategoriesListener)args[0] + (LobbyService.CategoriesListener)args[0] ); return; case LobbyMarshaller.GET_LOBBIES: ((LobbyProvider)provider).getLobbies( source, - (String)args[0], (LobbiesListener)args[1] + (String)args[0], (LobbyService.LobbiesListener)args[1] ); return; diff --git a/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java b/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java index e5dce6247..9e723f7c9 100644 --- a/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java +++ b/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java @@ -1,5 +1,5 @@ // -// $Id: LobbyMarshaller.java,v 1.5 2004/08/27 02:12:50 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -22,8 +22,6 @@ package com.threerings.micasa.lobby; import com.threerings.micasa.lobby.LobbyService; -import com.threerings.micasa.lobby.LobbyService.CategoriesListener; -import com.threerings.micasa.lobby.LobbyService.LobbiesListener; import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.dobj.InvocationResponseEvent; @@ -39,37 +37,6 @@ import java.util.List; public class LobbyMarshaller extends InvocationMarshaller implements LobbyService { - // documentation inherited - public static class LobbiesMarshaller extends ListenerMarshaller - implements LobbiesListener - { - /** The method id used to dispatch {@link #gotLobbies} - * responses. */ - public static final int GOT_LOBBIES = 1; - - // documentation inherited from interface - public void gotLobbies (List arg1) - { - omgr.postEvent(new InvocationResponseEvent( - callerOid, requestId, GOT_LOBBIES, - new Object[] { arg1 })); - } - - // documentation inherited - public void dispatchResponse (int methodId, Object[] args) - { - switch (methodId) { - case GOT_LOBBIES: - ((LobbiesListener)listener).gotLobbies( - (List)args[0]); - return; - - default: - super.dispatchResponse(methodId, args); - } - } - } - // documentation inherited public static class CategoriesMarshaller extends ListenerMarshaller implements CategoriesListener @@ -101,13 +68,44 @@ public class LobbyMarshaller extends InvocationMarshaller } } + // documentation inherited + public static class LobbiesMarshaller extends ListenerMarshaller + implements LobbiesListener + { + /** The method id used to dispatch {@link #gotLobbies} + * responses. */ + public static final int GOT_LOBBIES = 1; + + // documentation inherited from interface + public void gotLobbies (List arg1) + { + omgr.postEvent(new InvocationResponseEvent( + callerOid, requestId, GOT_LOBBIES, + new Object[] { arg1 })); + } + + // documentation inherited + public void dispatchResponse (int methodId, Object[] args) + { + switch (methodId) { + case GOT_LOBBIES: + ((LobbiesListener)listener).gotLobbies( + (List)args[0]); + return; + + default: + super.dispatchResponse(methodId, args); + } + } + } + /** The method id used to dispatch {@link #getCategories} requests. */ public static final int GET_CATEGORIES = 1; // documentation inherited from interface - public void getCategories (Client arg1, CategoriesListener arg2) + public void getCategories (Client arg1, LobbyService.CategoriesListener arg2) { - CategoriesMarshaller listener2 = new CategoriesMarshaller(); + LobbyMarshaller.CategoriesMarshaller listener2 = new LobbyMarshaller.CategoriesMarshaller(); listener2.listener = arg2; sendRequest(arg1, GET_CATEGORIES, new Object[] { listener2 @@ -118,9 +116,9 @@ public class LobbyMarshaller extends InvocationMarshaller public static final int GET_LOBBIES = 2; // documentation inherited from interface - public void getLobbies (Client arg1, String arg2, LobbiesListener arg3) + public void getLobbies (Client arg1, String arg2, LobbyService.LobbiesListener arg3) { - LobbiesMarshaller listener3 = new LobbiesMarshaller(); + LobbyMarshaller.LobbiesMarshaller listener3 = new LobbyMarshaller.LobbiesMarshaller(); listener3.listener = arg3; sendRequest(arg1, GET_LOBBIES, new Object[] { arg2, listener3 diff --git a/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java b/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java index 7ee8697f7..823f8e314 100644 --- a/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java +++ b/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java @@ -1,5 +1,5 @@ // -// $Id: SimulatorMarshaller.java,v 1.5 2004/08/27 02:12:53 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved diff --git a/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java b/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java index df99b8a40..385ad406a 100644 --- a/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java +++ b/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java @@ -1,5 +1,5 @@ // -// $Id: SimulatorDispatcher.java,v 1.5 2004/08/27 02:12:54 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved diff --git a/src/java/com/threerings/parlor/card/data/CardGameMarshaller.java b/src/java/com/threerings/parlor/card/data/CardGameMarshaller.java index dcbb4cf79..e2c4b2375 100644 --- a/src/java/com/threerings/parlor/card/data/CardGameMarshaller.java +++ b/src/java/com/threerings/parlor/card/data/CardGameMarshaller.java @@ -1,12 +1,30 @@ // // $Id$ +// +// Narya library - tools for developing networked games +// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved +// http://www.threerings.net/code/narya/ +// +// This library is free software; you can redistribute it and/or modify it +// under the terms of the GNU Lesser General Public License as published +// by the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA package com.threerings.parlor.card.data; import com.threerings.parlor.card.client.CardGameService; import com.threerings.parlor.card.data.Card; 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; @@ -24,9 +42,9 @@ public class CardGameMarshaller extends InvocationMarshaller public static final int SEND_CARDS_TO_PLAYER = 1; // documentation inherited from interface - public void sendCardsToPlayer (Client arg1, int arg2, Card[] arg3, ConfirmListener arg4) + public void sendCardsToPlayer (Client arg1, int arg2, Card[] arg3, InvocationService.ConfirmListener arg4) { - ConfirmMarshaller listener4 = new ConfirmMarshaller(); + InvocationMarshaller.ConfirmMarshaller listener4 = new InvocationMarshaller.ConfirmMarshaller(); listener4.listener = arg4; sendRequest(arg1, SEND_CARDS_TO_PLAYER, new Object[] { new Integer(arg2), arg3, listener4 diff --git a/src/java/com/threerings/parlor/card/server/CardGameDispatcher.java b/src/java/com/threerings/parlor/card/server/CardGameDispatcher.java index dd4c07769..fd4568fc9 100644 --- a/src/java/com/threerings/parlor/card/server/CardGameDispatcher.java +++ b/src/java/com/threerings/parlor/card/server/CardGameDispatcher.java @@ -1,5 +1,23 @@ // // $Id$ +// +// Narya library - tools for developing networked games +// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved +// http://www.threerings.net/code/narya/ +// +// This library is free software; you can redistribute it and/or modify it +// under the terms of the GNU Lesser General Public License as published +// by the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA package com.threerings.parlor.card.server; @@ -7,7 +25,7 @@ import com.threerings.parlor.card.client.CardGameService; import com.threerings.parlor.card.data.Card; import com.threerings.parlor.card.data.CardGameMarshaller; 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; @@ -42,7 +60,7 @@ public class CardGameDispatcher extends InvocationDispatcher case CardGameMarshaller.SEND_CARDS_TO_PLAYER: ((CardGameProvider)provider).sendCardsToPlayer( source, - ((Integer)args[0]).intValue(), (Card[])args[1], (ConfirmListener)args[2] + ((Integer)args[0]).intValue(), (Card[])args[1], (InvocationService.ConfirmListener)args[2] ); return; diff --git a/src/java/com/threerings/parlor/data/ParlorMarshaller.java b/src/java/com/threerings/parlor/data/ParlorMarshaller.java index 8c688e799..63f75f0b6 100644 --- a/src/java/com/threerings/parlor/data/ParlorMarshaller.java +++ b/src/java/com/threerings/parlor/data/ParlorMarshaller.java @@ -1,5 +1,5 @@ // -// $Id: ParlorMarshaller.java,v 1.4 2004/08/27 02:20:13 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -22,11 +22,9 @@ package com.threerings.parlor.data; import com.threerings.parlor.client.ParlorService; -import com.threerings.parlor.client.ParlorService.InviteListener; -import com.threerings.parlor.client.ParlorService.TableListener; import com.threerings.parlor.game.GameConfig; 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; @@ -41,37 +39,6 @@ import com.threerings.util.Name; public class ParlorMarshaller extends InvocationMarshaller implements ParlorService { - // documentation inherited - public static class TableMarshaller extends ListenerMarshaller - implements TableListener - { - /** The method id used to dispatch {@link #tableCreated} - * responses. */ - public static final int TABLE_CREATED = 1; - - // documentation inherited from interface - public void tableCreated (int arg1) - { - omgr.postEvent(new InvocationResponseEvent( - callerOid, requestId, TABLE_CREATED, - new Object[] { new Integer(arg1) })); - } - - // documentation inherited - public void dispatchResponse (int methodId, Object[] args) - { - switch (methodId) { - case TABLE_CREATED: - ((TableListener)listener).tableCreated( - ((Integer)args[0]).intValue()); - return; - - default: - super.dispatchResponse(methodId, args); - } - } - } - // documentation inherited public static class InviteMarshaller extends ListenerMarshaller implements InviteListener @@ -103,37 +70,42 @@ public class ParlorMarshaller extends InvocationMarshaller } } - /** The method id used to dispatch {@link #invite} requests. */ - public static final int INVITE = 1; - - // documentation inherited from interface - public void invite (Client arg1, Name arg2, GameConfig arg3, InviteListener arg4) + // documentation inherited + public static class TableMarshaller extends ListenerMarshaller + implements TableListener { - InviteMarshaller listener4 = new InviteMarshaller(); - listener4.listener = arg4; - sendRequest(arg1, INVITE, new Object[] { - arg2, arg3, listener4 - }); - } + /** The method id used to dispatch {@link #tableCreated} + * responses. */ + public static final int TABLE_CREATED = 1; - /** The method id used to dispatch {@link #respond} requests. */ - public static final int RESPOND = 2; + // documentation inherited from interface + public void tableCreated (int arg1) + { + omgr.postEvent(new InvocationResponseEvent( + callerOid, requestId, TABLE_CREATED, + new Object[] { new Integer(arg1) })); + } - // documentation inherited from interface - public void respond (Client arg1, int arg2, int arg3, Object arg4, InvocationListener arg5) - { - ListenerMarshaller listener5 = new ListenerMarshaller(); - listener5.listener = arg5; - sendRequest(arg1, RESPOND, new Object[] { - new Integer(arg2), new Integer(arg3), arg4, listener5 - }); + // documentation inherited + public void dispatchResponse (int methodId, Object[] args) + { + switch (methodId) { + case TABLE_CREATED: + ((TableListener)listener).tableCreated( + ((Integer)args[0]).intValue()); + return; + + default: + super.dispatchResponse(methodId, args); + } + } } /** The method id used to dispatch {@link #cancel} requests. */ - public static final int CANCEL = 3; + public static final int CANCEL = 1; // documentation inherited from interface - public void cancel (Client arg1, int arg2, InvocationListener arg3) + public void cancel (Client arg1, int arg2, InvocationService.InvocationListener arg3) { ListenerMarshaller listener3 = new ListenerMarshaller(); listener3.listener = arg3; @@ -142,13 +114,39 @@ 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; // documentation inherited from interface - public void createTable (Client arg1, int arg2, GameConfig arg3, TableListener arg4) + public void createTable (Client arg1, int arg2, GameConfig arg3, ParlorService.TableListener arg4) { - TableMarshaller listener4 = new TableMarshaller(); + ParlorMarshaller.TableMarshaller listener4 = new ParlorMarshaller.TableMarshaller(); listener4.listener = arg4; sendRequest(arg1, CREATE_TABLE, new Object[] { new Integer(arg2), arg3, listener4 @@ -159,7 +157,7 @@ public class ParlorMarshaller extends InvocationMarshaller public static final int JOIN_TABLE = 5; // documentation inherited from interface - public void joinTable (Client arg1, int arg2, int arg3, int arg4, InvocationListener arg5) + public void joinTable (Client arg1, int arg2, int arg3, int arg4, InvocationService.InvocationListener arg5) { ListenerMarshaller listener5 = new ListenerMarshaller(); listener5.listener = arg5; @@ -172,7 +170,7 @@ public class ParlorMarshaller extends InvocationMarshaller public static final int LEAVE_TABLE = 6; // documentation inherited from interface - public void leaveTable (Client arg1, int arg2, int arg3, InvocationListener arg4) + public void leaveTable (Client arg1, int arg2, int arg3, InvocationService.InvocationListener arg4) { ListenerMarshaller listener4 = new ListenerMarshaller(); listener4.listener = arg4; diff --git a/src/java/com/threerings/parlor/game/GameDispatcher.java b/src/java/com/threerings/parlor/game/GameDispatcher.java index 83ee3e17e..99a9710d8 100644 --- a/src/java/com/threerings/parlor/game/GameDispatcher.java +++ b/src/java/com/threerings/parlor/game/GameDispatcher.java @@ -1,5 +1,5 @@ // -// $Id: GameDispatcher.java,v 1.5 2004/08/27 02:20:14 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -57,15 +57,13 @@ public class GameDispatcher extends InvocationDispatcher switch (methodId) { case GameMarshaller.PLAYER_READY: ((GameProvider)provider).playerReady( - source - + source ); return; case GameMarshaller.START_PARTY_GAME: ((GameProvider)provider).startPartyGame( - source - + source ); return; diff --git a/src/java/com/threerings/parlor/game/GameMarshaller.java b/src/java/com/threerings/parlor/game/GameMarshaller.java index fc507bf15..466613038 100644 --- a/src/java/com/threerings/parlor/game/GameMarshaller.java +++ b/src/java/com/threerings/parlor/game/GameMarshaller.java @@ -1,5 +1,5 @@ // -// $Id: GameMarshaller.java,v 1.6 2004/08/27 02:20:14 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved diff --git a/src/java/com/threerings/parlor/server/ParlorDispatcher.java b/src/java/com/threerings/parlor/server/ParlorDispatcher.java index 2839acfd8..84076aeb4 100644 --- a/src/java/com/threerings/parlor/server/ParlorDispatcher.java +++ b/src/java/com/threerings/parlor/server/ParlorDispatcher.java @@ -1,5 +1,5 @@ // -// $Id: ParlorDispatcher.java,v 1.4 2004/08/27 02:20:14 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -22,12 +22,10 @@ package com.threerings.parlor.server; import com.threerings.parlor.client.ParlorService; -import com.threerings.parlor.client.ParlorService.InviteListener; -import com.threerings.parlor.client.ParlorService.TableListener; import com.threerings.parlor.data.ParlorMarshaller; import com.threerings.parlor.game.GameConfig; 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; @@ -60,45 +58,45 @@ public class ParlorDispatcher extends InvocationDispatcher throws InvocationException { switch (methodId) { + case ParlorMarshaller.CANCEL: + ((ParlorProvider)provider).cancel( + source, + ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1] + ); + return; + case ParlorMarshaller.INVITE: ((ParlorProvider)provider).invite( source, - (Name)args[0], (GameConfig)args[1], (InviteListener)args[2] + (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], (InvocationListener)args[3] - ); - return; - - case ParlorMarshaller.CANCEL: - ((ParlorProvider)provider).cancel( - source, - ((Integer)args[0]).intValue(), (InvocationListener)args[1] + ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (Object)args[2], (InvocationService.InvocationListener)args[3] ); return; case ParlorMarshaller.CREATE_TABLE: ((ParlorProvider)provider).createTable( source, - ((Integer)args[0]).intValue(), (GameConfig)args[1], (TableListener)args[2] + ((Integer)args[0]).intValue(), (GameConfig)args[1], (ParlorService.TableListener)args[2] ); return; case ParlorMarshaller.JOIN_TABLE: ((ParlorProvider)provider).joinTable( source, - ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), ((Integer)args[2]).intValue(), (InvocationListener)args[3] + ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), ((Integer)args[2]).intValue(), (InvocationService.InvocationListener)args[3] ); return; case ParlorMarshaller.LEAVE_TABLE: ((ParlorProvider)provider).leaveTable( source, - ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (InvocationListener)args[2] + ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (InvocationService.InvocationListener)args[2] ); return; diff --git a/src/java/com/threerings/presents/data/TimeBaseMarshaller.java b/src/java/com/threerings/presents/data/TimeBaseMarshaller.java index 475d92d41..abe44e737 100644 --- a/src/java/com/threerings/presents/data/TimeBaseMarshaller.java +++ b/src/java/com/threerings/presents/data/TimeBaseMarshaller.java @@ -1,5 +1,5 @@ // -// $Id: TimeBaseMarshaller.java,v 1.4 2004/08/27 02:20:19 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -23,7 +23,6 @@ package com.threerings.presents.data; import com.threerings.presents.client.Client; import com.threerings.presents.client.TimeBaseService; -import com.threerings.presents.client.TimeBaseService.GotTimeBaseListener; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.dobj.InvocationResponseEvent; @@ -72,9 +71,9 @@ public class TimeBaseMarshaller extends InvocationMarshaller public static final int GET_TIME_OID = 1; // documentation inherited from interface - public void getTimeOid (Client arg1, String arg2, GotTimeBaseListener arg3) + public void getTimeOid (Client arg1, String arg2, TimeBaseService.GotTimeBaseListener arg3) { - GotTimeBaseMarshaller listener3 = new GotTimeBaseMarshaller(); + TimeBaseMarshaller.GotTimeBaseMarshaller listener3 = new TimeBaseMarshaller.GotTimeBaseMarshaller(); listener3.listener = arg3; sendRequest(arg1, GET_TIME_OID, new Object[] { arg2, listener3 diff --git a/src/java/com/threerings/presents/server/TimeBaseDispatcher.java b/src/java/com/threerings/presents/server/TimeBaseDispatcher.java index 0ff6fd725..5a3f14424 100644 --- a/src/java/com/threerings/presents/server/TimeBaseDispatcher.java +++ b/src/java/com/threerings/presents/server/TimeBaseDispatcher.java @@ -1,5 +1,5 @@ // -// $Id: TimeBaseDispatcher.java,v 1.4 2004/08/27 02:20:23 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -21,9 +21,7 @@ package com.threerings.presents.server; -import com.threerings.presents.client.Client; import com.threerings.presents.client.TimeBaseService; -import com.threerings.presents.client.TimeBaseService.GotTimeBaseListener; import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.data.TimeBaseMarshaller; @@ -59,7 +57,7 @@ public class TimeBaseDispatcher extends InvocationDispatcher case TimeBaseMarshaller.GET_TIME_OID: ((TimeBaseProvider)provider).getTimeOid( source, - (String)args[0], (GotTimeBaseListener)args[1] + (String)args[0], (TimeBaseService.GotTimeBaseListener)args[1] ); return; diff --git a/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java b/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java index b3111c29b..969d9405e 100644 --- a/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java +++ b/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java @@ -1,5 +1,23 @@ // -// $Id: PuzzleGameMarshaller.java,v 1.3 2004/10/21 02:54:44 mdb Exp $ +// $Id$ +// +// Narya library - tools for developing networked games +// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved +// http://www.threerings.net/code/narya/ +// +// This library is free software; you can redistribute it and/or modify it +// under the terms of the GNU Lesser General Public License as published +// by the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA package com.threerings.puzzle.data; diff --git a/src/java/com/threerings/puzzle/data/PuzzleMarshaller.java b/src/java/com/threerings/puzzle/data/PuzzleMarshaller.java index b8cbb68c8..128aa97a8 100644 --- a/src/java/com/threerings/puzzle/data/PuzzleMarshaller.java +++ b/src/java/com/threerings/puzzle/data/PuzzleMarshaller.java @@ -1,10 +1,28 @@ // -// $Id: PuzzleMarshaller.java,v 1.5 2004/10/21 02:54:44 mdb Exp $ +// $Id$ +// +// Narya library - tools for developing networked games +// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved +// http://www.threerings.net/code/narya/ +// +// This library is free software; you can redistribute it and/or modify it +// under the terms of the GNU Lesser General Public License as published +// by the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA package com.threerings.puzzle.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.puzzle.client.PuzzleService; @@ -24,9 +42,9 @@ public class PuzzleMarshaller extends InvocationMarshaller public static final int START_PUZZLE = 1; // documentation inherited from interface - public void startPuzzle (Client arg1, SolitairePuzzleConfig arg2, ConfirmListener arg3) + public void startPuzzle (Client arg1, SolitairePuzzleConfig arg2, InvocationService.ConfirmListener arg3) { - ConfirmMarshaller listener3 = new ConfirmMarshaller(); + InvocationMarshaller.ConfirmMarshaller listener3 = new InvocationMarshaller.ConfirmMarshaller(); listener3.listener = arg3; sendRequest(arg1, START_PUZZLE, new Object[] { arg2, listener3 diff --git a/src/java/com/threerings/puzzle/server/PuzzleDispatcher.java b/src/java/com/threerings/puzzle/server/PuzzleDispatcher.java index 867d721ac..8263c0422 100644 --- a/src/java/com/threerings/puzzle/server/PuzzleDispatcher.java +++ b/src/java/com/threerings/puzzle/server/PuzzleDispatcher.java @@ -1,10 +1,28 @@ // -// $Id: PuzzleDispatcher.java,v 1.5 2004/10/21 02:54:44 mdb Exp $ +// $Id$ +// +// Narya library - tools for developing networked games +// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved +// http://www.threerings.net/code/narya/ +// +// This library is free software; you can redistribute it and/or modify it +// under the terms of the GNU Lesser General Public License as published +// by the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA package com.threerings.puzzle.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; @@ -42,7 +60,7 @@ public class PuzzleDispatcher extends InvocationDispatcher case PuzzleMarshaller.START_PUZZLE: ((PuzzleProvider)provider).startPuzzle( source, - (SolitairePuzzleConfig)args[0], (ConfirmListener)args[1] + (SolitairePuzzleConfig)args[0], (InvocationService.ConfirmListener)args[1] ); return; diff --git a/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java b/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java index 458d502cf..e15a7a9f3 100644 --- a/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java +++ b/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java @@ -1,5 +1,23 @@ // -// $Id: PuzzleGameDispatcher.java,v 1.3 2004/10/21 02:54:44 mdb Exp $ +// $Id$ +// +// Narya library - tools for developing networked games +// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved +// http://www.threerings.net/code/narya/ +// +// This library is free software; you can redistribute it and/or modify it +// under the terms of the GNU Lesser General Public License as published +// by the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA package com.threerings.puzzle.server; diff --git a/src/java/com/threerings/whirled/data/SceneMarshaller.java b/src/java/com/threerings/whirled/data/SceneMarshaller.java index 411ae0dbc..4f4fef17b 100644 --- a/src/java/com/threerings/whirled/data/SceneMarshaller.java +++ b/src/java/com/threerings/whirled/data/SceneMarshaller.java @@ -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 diff --git a/src/java/com/threerings/whirled/server/SceneDispatcher.java b/src/java/com/threerings/whirled/server/SceneDispatcher.java index 99219c905..66c9a88ed 100644 --- a/src/java/com/threerings/whirled/server/SceneDispatcher.java +++ b/src/java/com/threerings/whirled/server/SceneDispatcher.java @@ -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; diff --git a/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java b/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java index 2b85502de..732834d68 100644 --- a/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java +++ b/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java @@ -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 diff --git a/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java b/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java index be9287e83..cb572e1fb 100644 --- a/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java +++ b/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java @@ -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; diff --git a/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java b/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java index 9af85fde0..d35ad3de2 100644 --- a/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java +++ b/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java @@ -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 diff --git a/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java b/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java index 674fc6bfa..449b5aaa0 100644 --- a/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java +++ b/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java @@ -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;