From f32b2de49020d5c514b987f62a5c983718ce440d Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Tue, 27 Sep 2005 23:09:45 +0000 Subject: [PATCH] Enumerated legacy services which have class-based providers and regenerated those that do not using the template. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3716 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- build.xml | 11 ++++ .../micasa/lobby/LobbyProvider.java | 28 +++++----- .../trick/server/TrickCardGameProvider.java | 53 +++++++++++-------- .../parlor/game/server/GameProvider.java | 11 ++-- .../puzzle/server/PuzzleGameProvider.java | 20 ++++--- .../stage/server/StageSceneProvider.java | 38 +++++++++---- 6 files changed, 96 insertions(+), 65 deletions(-) diff --git a/build.xml b/build.xml index 104227c3e..ce1ba778a 100644 --- a/build.xml +++ b/build.xml @@ -57,6 +57,17 @@ + + + + + + + + + + + diff --git a/src/java/com/threerings/micasa/lobby/LobbyProvider.java b/src/java/com/threerings/micasa/lobby/LobbyProvider.java index 6930a877b..c4a4a9b3e 100644 --- a/src/java/com/threerings/micasa/lobby/LobbyProvider.java +++ b/src/java/com/threerings/micasa/lobby/LobbyProvider.java @@ -1,8 +1,8 @@ // -// $Id: LobbyProvider.java,v 1.6 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 +// Copyright (C) 2002-2005 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 @@ -21,29 +21,27 @@ 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 com.threerings.micasa.lobby.LobbyService.CategoriesListener; -import com.threerings.micasa.lobby.LobbyService.LobbiesListener; +import java.util.List; /** - * Provides access to the server-side implementation of the lobby - * services. + * Defines the server-side of the {@link LobbyService}. */ public interface LobbyProvider extends InvocationProvider { /** - * Processes a request by the client to obtain a list of the lobby - * categories available on this server. + * Handles a {@link LobbyService#getCategories} request. */ - public void getCategories (ClientObject caller, - CategoriesListener listener); + public void getCategories (ClientObject caller, LobbyService.CategoriesListener arg1) + throws InvocationException; /** - * Processes a request by the client to obtain a list of lobbies - * matching the supplied category string. + * Handles a {@link LobbyService#getLobbies} request. */ - public void getLobbies (ClientObject caller, String category, - LobbiesListener listener); + public void getLobbies (ClientObject caller, String arg1, LobbyService.LobbiesListener arg2) + throws InvocationException; } diff --git a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java index f284ca322..1293ce8e6 100644 --- a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java +++ b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java @@ -1,43 +1,50 @@ // -// $Id: RoisterService.java 17829 2004-11-12 20:24:43Z mdb $ +// $Id$ +// +// Narya library - tools for developing networked games +// Copyright (C) 2002-2005 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.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; /** - * Service calls related to trick card games. + * Defines the server-side of the {@link TrickCardGameService}. */ public interface TrickCardGameProvider extends InvocationProvider { /** - * Sends a group of cards to the player at the specified index. - * - * @param client the client object - * @param toidx the index of the player to send the cards to - * @param cards the cards to send + * Handles a {@link TrickCardGameService#playCard} request. */ - public void sendCardsToPlayer (ClientObject client, int toidx, - Card[] cards); - + public void playCard (ClientObject caller, Card arg1, int arg2); + /** - * Plays a card in the trick. - * - * @param client the client object - * @param card the card to play - * @param handSize the size of the player's hand, which is used to verify - * that the request is for the current trick + * Handles a {@link TrickCardGameService#requestRematch} request. */ - public void playCard (ClientObject client, Card card, int handSize); - + public void requestRematch (ClientObject caller); + /** - * Processes a request for a rematch. - * - * @param client the client object + * Handles a {@link TrickCardGameService#sendCardsToPlayer} request. */ - public void requestRematch (ClientObject client); + public void sendCardsToPlayer (ClientObject caller, int arg1, Card[] arg2); } diff --git a/src/java/com/threerings/parlor/game/server/GameProvider.java b/src/java/com/threerings/parlor/game/server/GameProvider.java index 647515304..fd3cce987 100644 --- a/src/java/com/threerings/parlor/game/server/GameProvider.java +++ b/src/java/com/threerings/parlor/game/server/GameProvider.java @@ -2,7 +2,7 @@ // $Id$ // // Narya library - tools for developing networked games -// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved +// Copyright (C) 2002-2005 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 @@ -21,18 +21,19 @@ package com.threerings.parlor.game.server; +import com.threerings.parlor.game.client.GameService; +import com.threerings.presents.client.Client; import com.threerings.presents.data.ClientObject; +import com.threerings.presents.server.InvocationException; import com.threerings.presents.server.InvocationProvider; /** - * Provides access to the server-side implementation of the game - * invocation services. + * Defines the server-side of the {@link GameService}. */ public interface GameProvider extends InvocationProvider { /** - * Called when the client has sent a {@link GameService#playerReady} - * service request. + * Handles a {@link GameService#playerReady} request. */ public void playerReady (ClientObject caller); } diff --git a/src/java/com/threerings/puzzle/server/PuzzleGameProvider.java b/src/java/com/threerings/puzzle/server/PuzzleGameProvider.java index dcbff72a6..72e164b48 100644 --- a/src/java/com/threerings/puzzle/server/PuzzleGameProvider.java +++ b/src/java/com/threerings/puzzle/server/PuzzleGameProvider.java @@ -1,8 +1,8 @@ // -// $Id: PuzzleGameProvider.java,v 1.2 2004/08/27 02:20:32 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games -// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved +// Copyright (C) 2002-2005 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 @@ -21,27 +21,25 @@ 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; /** - * Handles the server side of the puzzle game services. + * Defines the server-side of the {@link PuzzleGameService}. */ public interface PuzzleGameProvider extends InvocationProvider { /** - * Called when the client has sent a {@link - * PuzzleGameService#updateProgress} service request. + * Handles a {@link PuzzleGameService#updateProgress} request. */ - public void updateProgress (ClientObject caller, int roundId, int[] events); + public void updateProgress (ClientObject caller, int arg1, int[] arg2); /** - * Called when the client has sent a {@link - * PuzzleGameService#updateProgressSync} service request. + * Handles a {@link PuzzleGameService#updateProgressSync} request. */ - public void updateProgressSync ( - ClientObject caller, int roundId, int[] events, Board[] states); + public void updateProgressSync (ClientObject caller, int arg1, int[] arg2, Board[] arg3); } diff --git a/src/java/com/threerings/stage/server/StageSceneProvider.java b/src/java/com/threerings/stage/server/StageSceneProvider.java index af93dabdb..d5f9083f7 100644 --- a/src/java/com/threerings/stage/server/StageSceneProvider.java +++ b/src/java/com/threerings/stage/server/StageSceneProvider.java @@ -1,32 +1,48 @@ // -// $Id: StageSceneProvider.java 14426 2004-03-12 12:12:32Z mdb $ +// $Id$ +// +// Narya library - tools for developing networked games +// Copyright (C) 2002-2005 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.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.miso.data.ObjectInfo; - import com.threerings.stage.client.StageSceneService; /** - * Defines the server side of the {@link StageSceneService}. + * Defines the server-side of the {@link StageSceneService}. */ public interface StageSceneProvider extends InvocationProvider { /** * Handles a {@link StageSceneService#addObject} request. */ - public void addObject (ClientObject caller, ObjectInfo info, - StageSceneService.ConfirmListener listener) + public void addObject (ClientObject caller, ObjectInfo arg1, InvocationService.ConfirmListener arg2) throws InvocationException; - + /** - * Handles a {@link StageSceneService#removeObject} request. + * Handles a {@link StageSceneService#removeObjects} request. */ - public void removeObjects (ClientObject caller, ObjectInfo[] info, - StageSceneService.ConfirmListener listener) + public void removeObjects (ClientObject caller, ObjectInfo[] arg1, InvocationService.ConfirmListener arg2) throws InvocationException; }