Actually these had been generated. Bruno must have regenerated them with an old

version of Narya.


git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@710 c613c5cb-e716-0410-b11b-feb51c14d237

src/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java

@@ -25,7 +25,6 @@ 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.InvocationMarshaller;
-import com.threerings.presents.net.Transport;
 
 /**
  * Provides the implementation of the {@link TrickCardGameService} interface
@@ -54,9 +53,7 @@ public class TrickCardGameMarshaller extends InvocationMarshaller
     // from interface TrickCardGameService
     public void requestRematch (Client arg1)
     {
-        sendRequest(arg1, REQUEST_REMATCH, new Object[] {
-            
-        });
+        sendRequest(arg1, REQUEST_REMATCH, new Object[] {});
     }
 
     /** The method id used to dispatch {@link #sendCardsToPlayer} requests. */

src/java/com/threerings/parlor/card/trick/server/TrickCardGameDispatcher.java

@@ -24,7 +24,6 @@ package com.threerings.parlor.card.trick.server;
 import com.threerings.parlor.card.data.Card;
 import com.threerings.parlor.card.trick.data.TrickCardGameMarshaller;
 import com.threerings.presents.data.ClientObject;
-import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
 
@@ -48,7 +47,6 @@ public class TrickCardGameDispatcher extends InvocationDispatcher<TrickCardGameM
         return new TrickCardGameMarshaller();
     }
 
-    @SuppressWarnings("unchecked")
     @Override // documentation inherited
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
@@ -57,21 +55,19 @@ public class TrickCardGameDispatcher extends InvocationDispatcher<TrickCardGameM
         switch (methodId) {
         case TrickCardGameMarshaller.PLAY_CARD:
             ((TrickCardGameProvider)provider).playCard(
-                source,
-                (Card)args[0], ((Integer)args[1]).intValue()
+                source, (Card)args[0], ((Integer)args[1]).intValue()
             );
             return;
 
         case TrickCardGameMarshaller.REQUEST_REMATCH:
             ((TrickCardGameProvider)provider).requestRematch(
-                source                
+                source
             );
             return;
 
         case TrickCardGameMarshaller.SEND_CARDS_TO_PLAYER:
             ((TrickCardGameProvider)provider).sendCardsToPlayer(
-                source,
-                ((Integer)args[0]).intValue(), (Card[])args[1]
+                source, ((Integer)args[0]).intValue(), (Card[])args[1]
             );
             return;
 

src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java

@@ -22,6 +22,7 @@
 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.data.ClientObject;
 import com.threerings.presents.server.InvocationProvider;
 
@@ -33,15 +34,15 @@ public interface TrickCardGameProvider extends InvocationProvider
     /**
      * Handles a {@link TrickCardGameService#playCard} request.
      */
-    public void playCard (ClientObject caller, Card arg1, int arg2);
+    void playCard (ClientObject caller, Card arg1, int arg2);
 
     /**
      * Handles a {@link TrickCardGameService#requestRematch} request.
      */
-    public void requestRematch (ClientObject caller);
+    void requestRematch (ClientObject caller);
 
     /**
      * Handles a {@link TrickCardGameService#sendCardsToPlayer} request.
      */
-    public void sendCardsToPlayer (ClientObject caller, int arg1, Card[] arg2);
+    void sendCardsToPlayer (ClientObject caller, int arg1, Card[] arg2);
 }

src/java/com/threerings/parlor/data/ParlorMarshaller.java

@@ -27,7 +27,6 @@ import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.dobj.InvocationResponseEvent;
-import com.threerings.presents.net.Transport;
 import com.threerings.util.Name;
 
 /**
@@ -41,7 +40,7 @@ public class ParlorMarshaller extends InvocationMarshaller
     implements ParlorService
 {
     /**
-     * Marshalls results to implementations of {@link InviteListener}.
+     * Marshalls results to implementations of {@link ParlorService.InviteListener}.
      */
     public static class InviteMarshaller extends ListenerMarshaller
         implements InviteListener

src/java/com/threerings/parlor/data/TableMarshaller.java

@@ -26,7 +26,6 @@ import com.threerings.parlor.game.data.GameConfig;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.InvocationMarshaller;
-import com.threerings.presents.net.Transport;
 
 /**
  * Provides the implementation of the {@link TableService} interface

src/java/com/threerings/parlor/server/ParlorDispatcher.java

@@ -26,7 +26,6 @@ import com.threerings.parlor.data.ParlorMarshaller;
 import com.threerings.parlor.game.data.GameConfig;
 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.util.Name;
@@ -51,7 +50,6 @@ public class ParlorDispatcher extends InvocationDispatcher<ParlorMarshaller>
         return new ParlorMarshaller();
     }
 
-    @SuppressWarnings("unchecked")
     @Override // documentation inherited
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
@@ -60,29 +58,25 @@ public class ParlorDispatcher extends InvocationDispatcher<ParlorMarshaller>
         switch (methodId) {
         case ParlorMarshaller.CANCEL:
             ((ParlorProvider)provider).cancel(
-                source,
-                ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1]
+                source, ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1]
             );
             return;
 
         case ParlorMarshaller.INVITE:
             ((ParlorProvider)provider).invite(
-                source,
-                (Name)args[0], (GameConfig)args[1], (ParlorService.InviteListener)args[2]
+                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(), args[2], (InvocationService.InvocationListener)args[3]
+                source, ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), args[2], (InvocationService.InvocationListener)args[3]
             );
             return;
 
         case ParlorMarshaller.START_SOLITAIRE:
             ((ParlorProvider)provider).startSolitaire(
-                source,
-                (GameConfig)args[0], (InvocationService.ConfirmListener)args[1]
+                source, (GameConfig)args[0], (InvocationService.ConfirmListener)args[1]
             );
             return;
 

src/java/com/threerings/parlor/server/ParlorProvider.java

@@ -37,24 +37,24 @@ public interface ParlorProvider extends InvocationProvider
     /**
      * Handles a {@link ParlorService#cancel} request.
      */
-    public void cancel (ClientObject caller, int arg1, InvocationService.InvocationListener arg2)
+    void cancel (ClientObject caller, int arg1, InvocationService.InvocationListener arg2)
         throws InvocationException;
 
     /**
      * Handles a {@link ParlorService#invite} request.
      */
-    public void invite (ClientObject caller, Name arg1, GameConfig arg2, ParlorService.InviteListener arg3)
+    void invite (ClientObject caller, Name arg1, GameConfig arg2, ParlorService.InviteListener arg3)
         throws InvocationException;
 
     /**
      * Handles a {@link ParlorService#respond} request.
      */
-    public void respond (ClientObject caller, int arg1, int arg2, Object arg3, InvocationService.InvocationListener arg4)
+    void respond (ClientObject caller, int arg1, int arg2, Object arg3, InvocationService.InvocationListener arg4)
         throws InvocationException;
 
     /**
      * Handles a {@link ParlorService#startSolitaire} request.
      */
-    public void startSolitaire (ClientObject caller, GameConfig arg1, InvocationService.ConfirmListener arg2)
+    void startSolitaire (ClientObject caller, GameConfig arg1, InvocationService.ConfirmListener arg2)
         throws InvocationException;
 }

src/java/com/threerings/parlor/server/TableDispatcher.java

@@ -26,7 +26,6 @@ import com.threerings.parlor.data.TableMarshaller;
 import com.threerings.parlor.game.data.GameConfig;
 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;
 
@@ -50,7 +49,6 @@ public class TableDispatcher extends InvocationDispatcher<TableMarshaller>
         return new TableMarshaller();
     }
 
-    @SuppressWarnings("unchecked")
     @Override // documentation inherited
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
@@ -59,36 +57,31 @@ public class TableDispatcher extends InvocationDispatcher<TableMarshaller>
         switch (methodId) {
         case TableMarshaller.BOOT_PLAYER:
             ((TableProvider)provider).bootPlayer(
-                source,
-                ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (InvocationService.InvocationListener)args[2]
+                source, ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (InvocationService.InvocationListener)args[2]
             );
             return;
 
         case TableMarshaller.CREATE_TABLE:
             ((TableProvider)provider).createTable(
-                source,
-                (TableConfig)args[0], (GameConfig)args[1], (InvocationService.ResultListener)args[2]
+                source, (TableConfig)args[0], (GameConfig)args[1], (InvocationService.ResultListener)args[2]
             );
             return;
 
         case TableMarshaller.JOIN_TABLE:
             ((TableProvider)provider).joinTable(
-                source,
-                ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (InvocationService.InvocationListener)args[2]
+                source, ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (InvocationService.InvocationListener)args[2]
             );
             return;
 
         case TableMarshaller.LEAVE_TABLE:
             ((TableProvider)provider).leaveTable(
-                source,
-                ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1]
+                source, ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1]
             );
             return;
 
         case TableMarshaller.START_TABLE_NOW:
             ((TableProvider)provider).startTableNow(
-                source,
-                ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1]
+                source, ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1]
             );
             return;
 

src/java/com/threerings/parlor/server/TableProvider.java

@@ -21,6 +21,7 @@
 
 package com.threerings.parlor.server;
 
+import com.threerings.parlor.client.TableService;
 import com.threerings.parlor.data.TableConfig;
 import com.threerings.parlor.game.data.GameConfig;
 import com.threerings.presents.client.InvocationService;
@@ -36,30 +37,30 @@ public interface TableProvider extends InvocationProvider
     /**
      * Handles a {@link TableService#bootPlayer} request.
      */
-    public void bootPlayer (ClientObject caller, int arg1, int arg2, InvocationService.InvocationListener arg3)
+    void bootPlayer (ClientObject caller, int arg1, int arg2, InvocationService.InvocationListener arg3)
         throws InvocationException;
 
     /**
      * Handles a {@link TableService#createTable} request.
      */
-    public void createTable (ClientObject caller, TableConfig arg1, GameConfig arg2, InvocationService.ResultListener arg3)
+    void createTable (ClientObject caller, TableConfig arg1, GameConfig arg2, InvocationService.ResultListener arg3)
         throws InvocationException;
 
     /**
      * Handles a {@link TableService#joinTable} request.
      */
-    public void joinTable (ClientObject caller, int arg1, int arg2, InvocationService.InvocationListener arg3)
+    void joinTable (ClientObject caller, int arg1, int arg2, InvocationService.InvocationListener arg3)
         throws InvocationException;
 
     /**
      * Handles a {@link TableService#leaveTable} request.
      */
-    public void leaveTable (ClientObject caller, int arg1, InvocationService.InvocationListener arg2)
+    void leaveTable (ClientObject caller, int arg1, InvocationService.InvocationListener arg2)
         throws InvocationException;
 
     /**
      * Handles a {@link TableService#startTableNow} request.
      */
-    public void startTableNow (ClientObject caller, int arg1, InvocationService.InvocationListener arg2)
+    void startTableNow (ClientObject caller, int arg1, InvocationService.InvocationListener arg2)
         throws InvocationException;
 }

src/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java

@@ -25,7 +25,6 @@ import com.threerings.parlor.tourney.client.TourneyService;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.InvocationMarshaller;
-import com.threerings.presents.net.Transport;
 
 /**
  * Provides the implementation of the {@link TourneyService} interface

src/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java

@@ -25,7 +25,6 @@ import com.threerings.parlor.tourney.client.TourniesService;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.InvocationMarshaller;
-import com.threerings.presents.net.Transport;
 
 /**
  * Provides the implementation of the {@link TourniesService} interface

src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java

@@ -24,7 +24,6 @@ package com.threerings.parlor.tourney.server;
 import com.threerings.parlor.tourney.data.TourneyMarshaller;
 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;
 
@@ -48,7 +47,6 @@ public class TourneyDispatcher extends InvocationDispatcher<TourneyMarshaller>
         return new TourneyMarshaller();
     }
 
-    @SuppressWarnings("unchecked")
     @Override // documentation inherited
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
@@ -57,22 +55,19 @@ public class TourneyDispatcher extends InvocationDispatcher<TourneyMarshaller>
         switch (methodId) {
         case TourneyMarshaller.CANCEL:
             ((TourneyProvider)provider).cancel(
-                source,
-                (InvocationService.ConfirmListener)args[0]
+                source, (InvocationService.ConfirmListener)args[0]
             );
             return;
 
         case TourneyMarshaller.JOIN:
             ((TourneyProvider)provider).join(
-                source,
-                (InvocationService.ConfirmListener)args[0]
+                source, (InvocationService.ConfirmListener)args[0]
             );
             return;
 
         case TourneyMarshaller.LEAVE:
             ((TourneyProvider)provider).leave(
-                source,
-                (InvocationService.ConfirmListener)args[0]
+                source, (InvocationService.ConfirmListener)args[0]
             );
             return;
 

src/java/com/threerings/parlor/tourney/server/TourneyProvider.java

@@ -21,6 +21,7 @@
 
 package com.threerings.parlor.tourney.server;
 
+import com.threerings.parlor.tourney.client.TourneyService;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationException;
@@ -34,18 +35,18 @@ public interface TourneyProvider extends InvocationProvider
     /**
      * Handles a {@link TourneyService#cancel} request.
      */
-    public void cancel (ClientObject caller, InvocationService.ConfirmListener arg1)
+    void cancel (ClientObject caller, InvocationService.ConfirmListener arg1)
         throws InvocationException;
 
     /**
      * Handles a {@link TourneyService#join} request.
      */
-    public void join (ClientObject caller, InvocationService.ConfirmListener arg1)
+    void join (ClientObject caller, InvocationService.ConfirmListener arg1)
         throws InvocationException;
 
     /**
      * Handles a {@link TourneyService#leave} request.
      */
-    public void leave (ClientObject caller, InvocationService.ConfirmListener arg1)
+    void leave (ClientObject caller, InvocationService.ConfirmListener arg1)
         throws InvocationException;
 }

src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java

@@ -25,7 +25,6 @@ import com.threerings.parlor.tourney.data.TourneyConfig;
 import com.threerings.parlor.tourney.data.TourniesMarshaller;
 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;
 
@@ -49,7 +48,6 @@ public class TourniesDispatcher extends InvocationDispatcher<TourniesMarshaller>
         return new TourniesMarshaller();
     }
 
-    @SuppressWarnings("unchecked")
     @Override // documentation inherited
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
@@ -58,8 +56,7 @@ public class TourniesDispatcher extends InvocationDispatcher<TourniesMarshaller>
         switch (methodId) {
         case TourniesMarshaller.CREATE_TOURNEY:
             ((TourniesProvider)provider).createTourney(
-                source,
-                (TourneyConfig)args[0], (InvocationService.ResultListener)args[1]
+                source, (TourneyConfig)args[0], (InvocationService.ResultListener)args[1]
             );
             return;
 

src/java/com/threerings/parlor/tourney/server/TourniesProvider.java

@@ -21,6 +21,7 @@
 
 package com.threerings.parlor.tourney.server;
 
+import com.threerings.parlor.tourney.client.TourniesService;
 import com.threerings.parlor.tourney.data.TourneyConfig;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
@@ -35,6 +36,6 @@ public interface TourniesProvider extends InvocationProvider
     /**
      * Handles a {@link TourniesService#createTourney} request.
      */
-    public void createTourney (ClientObject caller, TourneyConfig arg1, InvocationService.ResultListener arg2)
+    void createTourney (ClientObject caller, TourneyConfig arg1, InvocationService.ResultListener arg2)
         throws InvocationException;
 }