Prune unneeded imports, nuke some unneeded casts, rerun code generators.

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

src/java/com/threerings/micasa/lobby/LobbyDispatcher.java

@@ -54,15 +54,13 @@ public class LobbyDispatcher extends InvocationDispatcher<LobbyMarshaller>
         switch (methodId) {
         case LobbyMarshaller.GET_CATEGORIES:
             ((LobbyProvider)provider).getCategories(
-                source,
+                source, (LobbyService.CategoriesListener)args[0]
-                (LobbyService.CategoriesListener)args[0]
             );
             return;
 
         case LobbyMarshaller.GET_LOBBIES:
             ((LobbyProvider)provider).getLobbies(
-                source,
+                source, (String)args[0], (LobbyService.LobbiesListener)args[1]
-                (String)args[0], (LobbyService.LobbiesListener)args[1]
             );
             return;
 

src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java

@@ -56,8 +56,7 @@ public class SimulatorDispatcher extends InvocationDispatcher<SimulatorMarshalle
         switch (methodId) {
         case SimulatorMarshaller.CREATE_GAME:
             ((SimulatorProvider)provider).createGame(
-                source,
+                source, (GameConfig)args[0], (String)args[1], ((Integer)args[2]).intValue()
-                (GameConfig)args[0], (String)args[1], ((Integer)args[2]).intValue()
             );
             return;
 

src/java/com/threerings/parlor/card/client/CardGameDecoder.java

@@ -21,7 +21,6 @@
 
 package com.threerings.parlor.card.client;
 
-import com.threerings.parlor.card.client.CardGameReceiver;
 import com.threerings.parlor.card.data.Card;
 import com.threerings.parlor.card.data.Hand;
 import com.threerings.presents.client.InvocationDecoder;

src/java/com/threerings/parlor/card/server/CardGameSender.java

@@ -22,7 +22,6 @@
 package com.threerings.parlor.card.server;
 
 import com.threerings.parlor.card.client.CardGameDecoder;
-import com.threerings.parlor.card.client.CardGameReceiver;
 import com.threerings.parlor.card.data.Card;
 import com.threerings.parlor.card.data.Hand;
 import com.threerings.presents.data.ClientObject;

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

@@ -56,21 +56,19 @@ public class TrickCardGameDispatcher extends InvocationDispatcher<TrickCardGameM
         switch (methodId) {
         case TrickCardGameMarshaller.PLAY_CARD:
             ((TrickCardGameProvider)provider).playCard(
-                source,
+                source, (Card)args[0], ((Integer)args[1]).intValue()
-                (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,
+                source, ((Integer)args[0]).intValue(), (Card[])args[1]
-                ((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;
 

src/java/com/threerings/parlor/client/ParlorDecoder.java

@@ -21,7 +21,6 @@
 
 package com.threerings.parlor.client;
 
-import com.threerings.parlor.client.ParlorReceiver;
 import com.threerings.parlor.game.data.GameConfig;
 import com.threerings.presents.client.InvocationDecoder;
 import com.threerings.util.Name;

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

@@ -59,29 +59,25 @@ public class ParlorDispatcher extends InvocationDispatcher<ParlorMarshaller>
         switch (methodId) {
         case ParlorMarshaller.CANCEL:
             ((ParlorProvider)provider).cancel(
-                source,
+                source, ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1]
-                ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1]
             );
             return;
 
         case ParlorMarshaller.INVITE:
             ((ParlorProvider)provider).invite(
-                source,
+                source, (Name)args[0], (GameConfig)args[1], (ParlorService.InviteListener)args[2]
-                (Name)args[0], (GameConfig)args[1], (ParlorService.InviteListener)args[2]
             );
             return;
 
         case ParlorMarshaller.RESPOND:
             ((ParlorProvider)provider).respond(
-                source,
+                source, ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), args[2], (InvocationService.InvocationListener)args[3]
-                ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), args[2], (InvocationService.InvocationListener)args[3]
             );
             return;
 
         case ParlorMarshaller.START_SOLITAIRE:
             ((ParlorProvider)provider).startSolitaire(
-                source,
+                source, (GameConfig)args[0], (InvocationService.ConfirmListener)args[1]
-                (GameConfig)args[0], (InvocationService.ConfirmListener)args[1]
             );
             return;
 

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

@@ -22,7 +22,6 @@
 package com.threerings.parlor.server;
 
 import com.threerings.parlor.client.ParlorDecoder;
-import com.threerings.parlor.client.ParlorReceiver;
 import com.threerings.parlor.game.data.GameConfig;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationSender;

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

@@ -58,29 +58,25 @@ public class TableDispatcher extends InvocationDispatcher<TableMarshaller>
         switch (methodId) {
         case TableMarshaller.CREATE_TABLE:
             ((TableProvider)provider).createTable(
-                source,
+                source, (TableConfig)args[0], (GameConfig)args[1], (InvocationService.ResultListener)args[2]
-                (TableConfig)args[0], (GameConfig)args[1], (InvocationService.ResultListener)args[2]
             );
             return;
 
         case TableMarshaller.JOIN_TABLE:
             ((TableProvider)provider).joinTable(
-                source,
+                source, ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (InvocationService.InvocationListener)args[2]
-                ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (InvocationService.InvocationListener)args[2]
             );
             return;
 
         case TableMarshaller.LEAVE_TABLE:
             ((TableProvider)provider).leaveTable(
-                source,
+                source, ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1]
-                ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1]
             );
             return;
 
         case TableMarshaller.START_TABLE_NOW:
             ((TableProvider)provider).startTableNow(
-                source,
+                source, ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1]
-                ((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;

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

@@ -181,10 +181,10 @@ public class TourneyObject extends DObject
      * change. Proxied copies of this object (on clients) will apply the
      * value change when they received the attribute changed notification.
      */
-    public void setParticipants (DSet<com.threerings.parlor.tourney.data.Participant> value)
+    public void setParticipants (DSet<Participant> value)
     {
         requestAttributeChange(PARTICIPANTS, value, this.participants);
-        @SuppressWarnings("unchecked") DSet<com.threerings.parlor.tourney.data.Participant> clone =
+        @SuppressWarnings("unchecked") DSet<Participant> clone =
             (value == null) ? null : value.typedClone();
         this.participants = clone;
     }

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

@@ -56,22 +56,19 @@ public class TourneyDispatcher extends InvocationDispatcher<TourneyMarshaller>
         switch (methodId) {
         case TourneyMarshaller.CANCEL:
             ((TourneyProvider)provider).cancel(
-                source,
+                source, (InvocationService.ConfirmListener)args[0]
-                (InvocationService.ConfirmListener)args[0]
             );
             return;
 
         case TourneyMarshaller.JOIN:
             ((TourneyProvider)provider).join(
-                source,
+                source, (InvocationService.ConfirmListener)args[0]
-                (InvocationService.ConfirmListener)args[0]
             );
             return;
 
         case TourneyMarshaller.LEAVE:
             ((TourneyProvider)provider).leave(
-                source,
+                source, (InvocationService.ConfirmListener)args[0]
-                (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;

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

@@ -57,8 +57,7 @@ public class TourniesDispatcher extends InvocationDispatcher<TourniesMarshaller>
         switch (methodId) {
         case TourniesMarshaller.CREATE_TOURNEY:
             ((TourniesProvider)provider).createTourney(
-                source,
+                source, (TourneyConfig)args[0], (InvocationService.ResultListener)args[1]
-                (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;

src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java

@@ -56,15 +56,13 @@ public class PuzzleGameDispatcher extends InvocationDispatcher<PuzzleGameMarshal
         switch (methodId) {
         case PuzzleGameMarshaller.UPDATE_PROGRESS:
             ((PuzzleGameProvider)provider).updateProgress(
-                source,
+                source, ((Integer)args[0]).intValue(), (int[])args[1]
-                ((Integer)args[0]).intValue(), (int[])args[1]
             );
             return;
 
         case PuzzleGameMarshaller.UPDATE_PROGRESS_SYNC:
             ((PuzzleGameProvider)provider).updateProgressSync(
-                source,
+                source, ((Integer)args[0]).intValue(), (int[])args[1], (Board[])args[2]
-                ((Integer)args[0]).intValue(), (int[])args[1], (Board[])args[2]
             );
             return;
 

src/java/com/threerings/puzzle/server/PuzzleGameProvider.java

@@ -23,6 +23,7 @@ package com.threerings.puzzle.server;
 
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationProvider;
+import com.threerings.puzzle.client.PuzzleGameService;
 import com.threerings.puzzle.data.Board;
 
 /**

src/java/com/threerings/stage/server/StageSceneDispatcher.java

@@ -57,15 +57,13 @@ public class StageSceneDispatcher extends InvocationDispatcher<StageSceneMarshal
         switch (methodId) {
         case StageSceneMarshaller.ADD_OBJECT:
             ((StageSceneProvider)provider).addObject(
-                source,
+                source, (ObjectInfo)args[0], (InvocationService.ConfirmListener)args[1]
-                (ObjectInfo)args[0], (InvocationService.ConfirmListener)args[1]
             );
             return;
 
         case StageSceneMarshaller.REMOVE_OBJECTS:
             ((StageSceneProvider)provider).removeObjects(
-                source,
+                source, (ObjectInfo[])args[0], (InvocationService.ConfirmListener)args[1]
-                (ObjectInfo[])args[0], (InvocationService.ConfirmListener)args[1]
             );
             return;
 

src/java/com/threerings/stage/server/StageSceneProvider.java

@@ -26,6 +26,7 @@ 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.stage.client.StageSceneService;
 
 /**
  * Defines the server-side of the {@link StageSceneService}.

src/java/com/threerings/stats/data/IntSetStat.java

@@ -98,8 +98,8 @@ public class IntSetStat extends SetStat<Integer>
     public void unpersistFrom (ObjectInputStream in, AuxDataSource aux)
         throws IOException, ClassNotFoundException
     {
-        _maxSize = ((int)in.readByte()) + 128;
+        _maxSize = in.readByte() + 128;
-        int numValues = ((int)in.readByte()) + 128;
+        int numValues = in.readByte() + 128;
         _intSet = new StreamableArrayIntSet(numValues);
         for (int ii = 0; ii < numValues; ii++) {
             _intSet.add(in.readInt());

src/java/com/threerings/whirled/client/SceneDecoder.java

@@ -22,7 +22,6 @@
 package com.threerings.whirled.client;
 
 import com.threerings.presents.client.InvocationDecoder;
-import com.threerings.whirled.client.SceneReceiver;
 
 /**
  * Dispatches calls to a {@link SceneReceiver} instance.

src/java/com/threerings/whirled/server/SceneDispatcher.java

@@ -56,8 +56,7 @@ public class SceneDispatcher extends InvocationDispatcher<SceneMarshaller>
         switch (methodId) {
         case SceneMarshaller.MOVE_TO:
             ((SceneProvider)provider).moveTo(
-                source,
+                source, ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (SceneService.SceneMoveListener)args[2]
-                ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (SceneService.SceneMoveListener)args[2]
             );
             return;
 

src/java/com/threerings/whirled/server/SceneSender.java

@@ -24,7 +24,6 @@ package com.threerings.whirled.server;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationSender;
 import com.threerings.whirled.client.SceneDecoder;
-import com.threerings.whirled.client.SceneReceiver;
 
 /**
  * Used to issue notifications to a {@link SceneReceiver} instance on a

src/java/com/threerings/whirled/spot/data/SpotSceneObject.java

@@ -85,10 +85,10 @@ public class SpotSceneObject extends SceneObject
      * change. Proxied copies of this object (on clients) will apply the
      * value change when they received the attribute changed notification.
      */
-    public void setOccupantLocs (DSet<com.threerings.whirled.spot.data.SceneLocation> value)
+    public void setOccupantLocs (DSet<SceneLocation> value)
     {
         requestAttributeChange(OCCUPANT_LOCS, value, this.occupantLocs);
-        @SuppressWarnings("unchecked") DSet<com.threerings.whirled.spot.data.SceneLocation> clone =
+        @SuppressWarnings("unchecked") DSet<SceneLocation> clone =
             (value == null) ? null : value.typedClone();
         this.occupantLocs = clone;
     }
@@ -133,10 +133,10 @@ public class SpotSceneObject extends SceneObject
      * change. Proxied copies of this object (on clients) will apply the
      * value change when they received the attribute changed notification.
      */
-    public void setClusters (DSet<com.threerings.whirled.spot.data.Cluster> value)
+    public void setClusters (DSet<Cluster> value)
     {
         requestAttributeChange(CLUSTERS, value, this.clusters);
-        @SuppressWarnings("unchecked") DSet<com.threerings.whirled.spot.data.Cluster> clone =
+        @SuppressWarnings("unchecked") DSet<Cluster> clone =
             (value == null) ? null : value.typedClone();
         this.clusters = clone;
     }

src/java/com/threerings/whirled/spot/server/SpotDispatcher.java

@@ -58,29 +58,25 @@ public class SpotDispatcher extends InvocationDispatcher<SpotMarshaller>
         switch (methodId) {
         case SpotMarshaller.CHANGE_LOCATION:
             ((SpotProvider)provider).changeLocation(
-                source,
+                source, ((Integer)args[0]).intValue(), (Location)args[1], (InvocationService.ConfirmListener)args[2]
-                ((Integer)args[0]).intValue(), (Location)args[1], (InvocationService.ConfirmListener)args[2]
             );
             return;
 
         case SpotMarshaller.CLUSTER_SPEAK:
             ((SpotProvider)provider).clusterSpeak(
-                source,
+                source, (String)args[0], ((Byte)args[1]).byteValue()
-                (String)args[0], ((Byte)args[1]).byteValue()
             );
             return;
 
         case SpotMarshaller.JOIN_CLUSTER:
             ((SpotProvider)provider).joinCluster(
-                source,
+                source, ((Integer)args[0]).intValue(), (InvocationService.ConfirmListener)args[1]
-                ((Integer)args[0]).intValue(), (InvocationService.ConfirmListener)args[1]
             );
             return;
 
         case SpotMarshaller.TRAVERSE_PORTAL:
             ((SpotProvider)provider).traversePortal(
-                source,
+                source, ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), ((Integer)args[2]).intValue(), (SceneService.SceneMoveListener)args[3]
-                ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), ((Integer)args[2]).intValue(), (SceneService.SceneMoveListener)args[3]
             );
             return;
 

src/java/com/threerings/whirled/spot/server/SpotProvider.java

@@ -26,6 +26,7 @@ import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.InvocationProvider;
 import com.threerings.whirled.client.SceneService;
+import com.threerings.whirled.spot.client.SpotService;
 import com.threerings.whirled.spot.data.Location;
 
 /**

src/java/com/threerings/whirled/zone/client/ZoneDecoder.java

@@ -22,7 +22,6 @@
 package com.threerings.whirled.zone.client;
 
 import com.threerings.presents.client.InvocationDecoder;
-import com.threerings.whirled.zone.client.ZoneReceiver;
 
 /**
  * Dispatches calls to a {@link ZoneReceiver} instance.

src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java

@@ -56,8 +56,7 @@ public class ZoneDispatcher extends InvocationDispatcher<ZoneMarshaller>
         switch (methodId) {
         case ZoneMarshaller.MOVE_TO:
             ((ZoneProvider)provider).moveTo(
-                source,
+                source, ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), ((Integer)args[2]).intValue(), (ZoneService.ZoneMoveListener)args[3]
-                ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), ((Integer)args[2]).intValue(), (ZoneService.ZoneMoveListener)args[3]
             );
             return;
 

src/java/com/threerings/whirled/zone/server/ZoneSender.java

@@ -24,7 +24,6 @@ package com.threerings.whirled.zone.server;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationSender;
 import com.threerings.whirled.zone.client.ZoneDecoder;
-import com.threerings.whirled.zone.client.ZoneReceiver;
 
 /**
  * Used to issue notifications to a {@link ZoneReceiver} instance on a