From 18608763ea3c080bebc9c626f8fc8ffbc45fd595 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Wed, 30 Jul 2008 13:56:07 +0000
Subject: [PATCH] Regenerated services and objects.

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@690 c613c5cb-e716-0410-b11b-feb51c14d237
---
 .../parlor/card/trick/data/TrickCardGameMarshaller.as  |  8 ++++----
 src/as/com/threerings/parlor/data/ParlorMarshaller.as  | 10 +++++-----
 .../parlor/data/ParlorMarshaller_InviteMarshaller.as   |  2 +-
 src/as/com/threerings/parlor/data/TableMarshaller.as   | 10 +++++-----
 src/as/com/threerings/whirled/data/SceneMarshaller.as  |  4 ++--
 .../data/SceneMarshaller_SceneMoveMarshaller.as        |  8 ++++----
 .../com/threerings/whirled/spot/data/SpotMarshaller.as | 10 +++++-----
 .../com/threerings/whirled/zone/data/ZoneMarshaller.as |  4 ++--
 .../zone/data/ZoneMarshaller_ZoneMoveMarshaller.as     |  6 +++---
 .../com/threerings/micasa/lobby/LobbyDispatcher.java   |  1 -
 .../micasa/lobby/table/TableLobbyObject.java           |  5 ++---
 .../micasa/simulator/server/SimulatorDispatcher.java   |  1 -
 .../card/trick/server/TrickCardGameDispatcher.java     |  1 -
 .../com/threerings/parlor/server/ParlorDispatcher.java |  1 -
 .../com/threerings/parlor/server/TableDispatcher.java  |  1 -
 .../threerings/parlor/tourney/data/TourneyObject.java  |  5 ++---
 .../parlor/tourney/server/TourneyDispatcher.java       |  1 -
 .../parlor/tourney/server/TourniesDispatcher.java      |  1 -
 .../threerings/puzzle/server/PuzzleGameDispatcher.java |  1 -
 .../threerings/stage/server/StageSceneDispatcher.java  |  1 -
 .../com/threerings/whirled/server/SceneDispatcher.java |  1 -
 .../threerings/whirled/spot/data/SpotSceneObject.java  | 10 ++++------
 .../threerings/whirled/spot/server/SpotDispatcher.java |  1 -
 .../threerings/whirled/zone/server/ZoneDispatcher.java |  1 -
 24 files changed, 39 insertions(+), 55 deletions(-)

diff --git a/src/as/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.as b/src/as/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.as
index a4bcecc9..27f9c373 100644
--- a/src/as/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.as
+++ b/src/as/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.as
@@ -29,7 +29,7 @@ import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.util.Integer;
 
 /**
- * Provides the implementation of the {@link TrickCardGameService} interface
+ * Provides the implementation of the <code>TrickCardGameService</code> interface
  * that marshalls the arguments and delivers the request to the provider
  * on the server. Also provides an implementation of the response listener
  * interfaces that marshall the response arguments and deliver them back
@@ -38,7 +38,7 @@ import com.threerings.util.Integer;
 public class TrickCardGameMarshaller extends InvocationMarshaller
     implements TrickCardGameService
 {
-    /** The method id used to dispatch {@link #playCard} requests. */
+    /** The method id used to dispatch <code>playCard</code> requests. */
     public static const PLAY_CARD :int = 1;
 
     // from interface TrickCardGameService
@@ -49,7 +49,7 @@ public class TrickCardGameMarshaller extends InvocationMarshaller
         ]);
     }
 
-    /** The method id used to dispatch {@link #requestRematch} requests. */
+    /** The method id used to dispatch <code>requestRematch</code> requests. */
     public static const REQUEST_REMATCH :int = 2;
 
     // from interface TrickCardGameService
@@ -60,7 +60,7 @@ public class TrickCardGameMarshaller extends InvocationMarshaller
         ]);
     }
 
-    /** The method id used to dispatch {@link #sendCardsToPlayer} requests. */
+    /** The method id used to dispatch <code>sendCardsToPlayer</code> requests. */
     public static const SEND_CARDS_TO_PLAYER :int = 3;
 
     // from interface TrickCardGameService
diff --git a/src/as/com/threerings/parlor/data/ParlorMarshaller.as b/src/as/com/threerings/parlor/data/ParlorMarshaller.as
index a1b9e00b..56384ab1 100644
--- a/src/as/com/threerings/parlor/data/ParlorMarshaller.as
+++ b/src/as/com/threerings/parlor/data/ParlorMarshaller.as
@@ -34,7 +34,7 @@ import com.threerings.util.Integer;
 import com.threerings.util.Name;
 
 /**
- * Provides the implementation of the {@link ParlorService} interface
+ * Provides the implementation of the <code>ParlorService</code> interface
  * that marshalls the arguments and delivers the request to the provider
  * on the server. Also provides an implementation of the response listener
  * interfaces that marshall the response arguments and deliver them back
@@ -43,7 +43,7 @@ import com.threerings.util.Name;
 public class ParlorMarshaller extends InvocationMarshaller
     implements ParlorService
 {
-    /** The method id used to dispatch {@link #cancel} requests. */
+    /** The method id used to dispatch <code>cancel</code> requests. */
     public static const CANCEL :int = 1;
 
     // from interface ParlorService
@@ -56,7 +56,7 @@ public class ParlorMarshaller extends InvocationMarshaller
         ]);
     }
 
-    /** The method id used to dispatch {@link #invite} requests. */
+    /** The method id used to dispatch <code>invite</code> requests. */
     public static const INVITE :int = 2;
 
     // from interface ParlorService
@@ -69,7 +69,7 @@ public class ParlorMarshaller extends InvocationMarshaller
         ]);
     }
 
-    /** The method id used to dispatch {@link #respond} requests. */
+    /** The method id used to dispatch <code>respond</code> requests. */
     public static const RESPOND :int = 3;
 
     // from interface ParlorService
@@ -82,7 +82,7 @@ public class ParlorMarshaller extends InvocationMarshaller
         ]);
     }
 
-    /** The method id used to dispatch {@link #startSolitaire} requests. */
+    /** The method id used to dispatch <code>startSolitaire</code> requests. */
     public static const START_SOLITAIRE :int = 4;
 
     // from interface ParlorService
diff --git a/src/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as b/src/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as
index 35a135cf..b69f5053 100644
--- a/src/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as
+++ b/src/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as
@@ -30,7 +30,7 @@ import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
 public class ParlorMarshaller_InviteMarshaller
     extends InvocationMarshaller_ListenerMarshaller
 {
-    /** The method id used to dispatch {@link #inviteReceived} responses. */
+    /** The method id used to dispatch <code>inviteReceived</code> responses. */
     public static const INVITE_RECEIVED :int = 1;
 
     // from InvocationMarshaller_ListenerMarshaller
diff --git a/src/as/com/threerings/parlor/data/TableMarshaller.as b/src/as/com/threerings/parlor/data/TableMarshaller.as
index d15a279f..dea743b1 100644
--- a/src/as/com/threerings/parlor/data/TableMarshaller.as
+++ b/src/as/com/threerings/parlor/data/TableMarshaller.as
@@ -32,7 +32,7 @@ import com.threerings.presents.data.InvocationMarshaller_ResultMarshaller;
 import com.threerings.util.Integer;
 
 /**
- * Provides the implementation of the {@link TableService} interface
+ * Provides the implementation of the <code>TableService</code> interface
  * that marshalls the arguments and delivers the request to the provider
  * on the server. Also provides an implementation of the response listener
  * interfaces that marshall the response arguments and deliver them back
@@ -41,7 +41,7 @@ import com.threerings.util.Integer;
 public class TableMarshaller extends InvocationMarshaller
     implements TableService
 {
-    /** The method id used to dispatch {@link #createTable} requests. */
+    /** The method id used to dispatch <code>createTable</code> requests. */
     public static const CREATE_TABLE :int = 1;
 
     // from interface TableService
@@ -54,7 +54,7 @@ public class TableMarshaller extends InvocationMarshaller
         ]);
     }
 
-    /** The method id used to dispatch {@link #joinTable} requests. */
+    /** The method id used to dispatch <code>joinTable</code> requests. */
     public static const JOIN_TABLE :int = 2;
 
     // from interface TableService
@@ -67,7 +67,7 @@ public class TableMarshaller extends InvocationMarshaller
         ]);
     }
 
-    /** The method id used to dispatch {@link #leaveTable} requests. */
+    /** The method id used to dispatch <code>leaveTable</code> requests. */
     public static const LEAVE_TABLE :int = 3;
 
     // from interface TableService
@@ -80,7 +80,7 @@ public class TableMarshaller extends InvocationMarshaller
         ]);
     }
 
-    /** The method id used to dispatch {@link #startTableNow} requests. */
+    /** The method id used to dispatch <code>startTableNow</code> requests. */
     public static const START_TABLE_NOW :int = 4;
 
     // from interface TableService
diff --git a/src/as/com/threerings/whirled/data/SceneMarshaller.as b/src/as/com/threerings/whirled/data/SceneMarshaller.as
index 1bab7169..9ce3a8d6 100644
--- a/src/as/com/threerings/whirled/data/SceneMarshaller.as
+++ b/src/as/com/threerings/whirled/data/SceneMarshaller.as
@@ -28,7 +28,7 @@ import com.threerings.whirled.client.SceneService;
 import com.threerings.whirled.client.SceneService_SceneMoveListener;
 
 /**
- * Provides the implementation of the {@link SceneService} interface
+ * Provides the implementation of the <code>SceneService</code> interface
  * that marshalls the arguments and delivers the request to the provider
  * on the server. Also provides an implementation of the response listener
  * interfaces that marshall the response arguments and deliver them back
@@ -37,7 +37,7 @@ import com.threerings.whirled.client.SceneService_SceneMoveListener;
 public class SceneMarshaller extends InvocationMarshaller
     implements SceneService
 {
-    /** The method id used to dispatch {@link #moveTo} requests. */
+    /** The method id used to dispatch <code>moveTo</code> requests. */
     public static const MOVE_TO :int = 1;
 
     // from interface SceneService
diff --git a/src/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as b/src/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as
index 6e20cd42..3f3d88cd 100644
--- a/src/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as
+++ b/src/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as
@@ -32,16 +32,16 @@ import com.threerings.whirled.client.SceneService_SceneMoveListener;
 public class SceneMarshaller_SceneMoveMarshaller
     extends InvocationMarshaller_ListenerMarshaller
 {
-    /** The method id used to dispatch {@link #moveRequiresServerSwitch} responses. */
+    /** The method id used to dispatch <code>moveRequiresServerSwitch</code> responses. */
     public static const MOVE_REQUIRES_SERVER_SWITCH :int = 1;
 
-    /** The method id used to dispatch {@link #moveSucceeded} responses. */
+    /** The method id used to dispatch <code>moveSucceeded</code> responses. */
     public static const MOVE_SUCCEEDED :int = 2;
 
-    /** The method id used to dispatch {@link #moveSucceededWithScene} responses. */
+    /** The method id used to dispatch <code>moveSucceededWithScene</code> responses. */
     public static const MOVE_SUCCEEDED_WITH_SCENE :int = 3;
 
-    /** The method id used to dispatch {@link #moveSucceededWithUpdates} responses. */
+    /** The method id used to dispatch <code>moveSucceededWithUpdates</code> responses. */
     public static const MOVE_SUCCEEDED_WITH_UPDATES :int = 4;
 
     // from InvocationMarshaller_ListenerMarshaller
diff --git a/src/as/com/threerings/whirled/spot/data/SpotMarshaller.as b/src/as/com/threerings/whirled/spot/data/SpotMarshaller.as
index 5e668af7..6e95ef7a 100644
--- a/src/as/com/threerings/whirled/spot/data/SpotMarshaller.as
+++ b/src/as/com/threerings/whirled/spot/data/SpotMarshaller.as
@@ -32,7 +32,7 @@ import com.threerings.whirled.data.SceneMarshaller_SceneMoveMarshaller;
 import com.threerings.whirled.spot.client.SpotService;
 
 /**
- * Provides the implementation of the {@link SpotService} interface
+ * Provides the implementation of the <code>SpotService</code> interface
  * that marshalls the arguments and delivers the request to the provider
  * on the server. Also provides an implementation of the response listener
  * interfaces that marshall the response arguments and deliver them back
@@ -41,7 +41,7 @@ import com.threerings.whirled.spot.client.SpotService;
 public class SpotMarshaller extends InvocationMarshaller
     implements SpotService
 {
-    /** The method id used to dispatch {@link #changeLocation} requests. */
+    /** The method id used to dispatch <code>changeLocation</code> requests. */
     public static const CHANGE_LOCATION :int = 1;
 
     // from interface SpotService
@@ -54,7 +54,7 @@ public class SpotMarshaller extends InvocationMarshaller
         ]);
     }
 
-    /** The method id used to dispatch {@link #clusterSpeak} requests. */
+    /** The method id used to dispatch <code>clusterSpeak</code> requests. */
     public static const CLUSTER_SPEAK :int = 2;
 
     // from interface SpotService
@@ -65,7 +65,7 @@ public class SpotMarshaller extends InvocationMarshaller
         ]);
     }
 
-    /** The method id used to dispatch {@link #joinCluster} requests. */
+    /** The method id used to dispatch <code>joinCluster</code> requests. */
     public static const JOIN_CLUSTER :int = 3;
 
     // from interface SpotService
@@ -78,7 +78,7 @@ public class SpotMarshaller extends InvocationMarshaller
         ]);
     }
 
-    /** The method id used to dispatch {@link #traversePortal} requests. */
+    /** The method id used to dispatch <code>traversePortal</code> requests. */
     public static const TRAVERSE_PORTAL :int = 4;
 
     // from interface SpotService
diff --git a/src/as/com/threerings/whirled/zone/data/ZoneMarshaller.as b/src/as/com/threerings/whirled/zone/data/ZoneMarshaller.as
index 8cd85cd0..3fb18b13 100644
--- a/src/as/com/threerings/whirled/zone/data/ZoneMarshaller.as
+++ b/src/as/com/threerings/whirled/zone/data/ZoneMarshaller.as
@@ -28,7 +28,7 @@ import com.threerings.whirled.zone.client.ZoneService;
 import com.threerings.whirled.zone.client.ZoneService_ZoneMoveListener;
 
 /**
- * Provides the implementation of the {@link ZoneService} interface
+ * Provides the implementation of the <code>ZoneService</code> interface
  * that marshalls the arguments and delivers the request to the provider
  * on the server. Also provides an implementation of the response listener
  * interfaces that marshall the response arguments and deliver them back
@@ -37,7 +37,7 @@ import com.threerings.whirled.zone.client.ZoneService_ZoneMoveListener;
 public class ZoneMarshaller extends InvocationMarshaller
     implements ZoneService
 {
-    /** The method id used to dispatch {@link #moveTo} requests. */
+    /** The method id used to dispatch <code>moveTo</code> requests. */
     public static const MOVE_TO :int = 1;
 
     // from interface ZoneService
diff --git a/src/as/com/threerings/whirled/zone/data/ZoneMarshaller_ZoneMoveMarshaller.as b/src/as/com/threerings/whirled/zone/data/ZoneMarshaller_ZoneMoveMarshaller.as
index 8678d6d0..f21a6b28 100644
--- a/src/as/com/threerings/whirled/zone/data/ZoneMarshaller_ZoneMoveMarshaller.as
+++ b/src/as/com/threerings/whirled/zone/data/ZoneMarshaller_ZoneMoveMarshaller.as
@@ -33,13 +33,13 @@ import com.threerings.whirled.zone.client.ZoneService_ZoneMoveListener;
 public class ZoneMarshaller_ZoneMoveMarshaller
     extends InvocationMarshaller_ListenerMarshaller
 {
-    /** The method id used to dispatch {@link #moveSucceeded} responses. */
+    /** The method id used to dispatch <code>moveSucceeded</code> responses. */
     public static const MOVE_SUCCEEDED :int = 1;
 
-    /** The method id used to dispatch {@link #moveSucceededWithScene} responses. */
+    /** The method id used to dispatch <code>moveSucceededWithScene</code> responses. */
     public static const MOVE_SUCCEEDED_WITH_SCENE :int = 2;
 
-    /** The method id used to dispatch {@link #moveSucceededWithUpdates} responses. */
+    /** The method id used to dispatch <code>moveSucceededWithUpdates</code> responses. */
     public static const MOVE_SUCCEEDED_WITH_UPDATES :int = 3;
 
     // from InvocationMarshaller_ListenerMarshaller
diff --git a/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java b/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java
index 85da9428..2a1148c2 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java
@@ -45,7 +45,6 @@ public class LobbyDispatcher extends InvocationDispatcher<LobbyMarshaller>
         return new LobbyMarshaller();
     }
 
-    @SuppressWarnings("unchecked")
     @Override // documentation inherited
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
diff --git a/src/java/com/threerings/micasa/lobby/table/TableLobbyObject.java b/src/java/com/threerings/micasa/lobby/table/TableLobbyObject.java
index 1eccf985..9268318a 100644
--- a/src/java/com/threerings/micasa/lobby/table/TableLobbyObject.java
+++ b/src/java/com/threerings/micasa/lobby/table/TableLobbyObject.java
@@ -90,7 +90,7 @@ public class TableLobbyObject extends LobbyObject
      * the <code>tableSet</code> set. The set will not change until the
      * event is actually propagated through the system.
      */
-    public void removeFromTableSet (Comparable key)
+    public void removeFromTableSet (Comparable<?> key)
     {
         requestEntryRemove(TABLE_SET, tableSet, key);
     }
@@ -118,8 +118,7 @@ public class TableLobbyObject extends LobbyObject
     public void setTableSet (DSet value)
     {
         requestAttributeChange(TABLE_SET, value, this.tableSet);
-        @SuppressWarnings("unchecked") DSet clone =
-            (value == null) ? null : value.typedClone();
+        DSet clone = (value == null) ? null : value.typedClone();
         this.tableSet = clone;
     }
 
diff --git a/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java b/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java
index 1ed07be3..b67c3c25 100644
--- a/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java
+++ b/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java
@@ -47,7 +47,6 @@ public class SimulatorDispatcher extends InvocationDispatcher<SimulatorMarshalle
         return new SimulatorMarshaller();
     }
 
-    @SuppressWarnings("unchecked")
     @Override // documentation inherited
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
diff --git a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameDispatcher.java b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameDispatcher.java
index 8a3794a6..fe9e28b6 100644
--- a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameDispatcher.java
+++ b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameDispatcher.java
@@ -47,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)
diff --git a/src/java/com/threerings/parlor/server/ParlorDispatcher.java b/src/java/com/threerings/parlor/server/ParlorDispatcher.java
index 90357f5c..dcbadd3d 100644
--- a/src/java/com/threerings/parlor/server/ParlorDispatcher.java
+++ b/src/java/com/threerings/parlor/server/ParlorDispatcher.java
@@ -50,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)
diff --git a/src/java/com/threerings/parlor/server/TableDispatcher.java b/src/java/com/threerings/parlor/server/TableDispatcher.java
index 5678773e..1448adc6 100644
--- a/src/java/com/threerings/parlor/server/TableDispatcher.java
+++ b/src/java/com/threerings/parlor/server/TableDispatcher.java
@@ -49,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)
diff --git a/src/java/com/threerings/parlor/tourney/data/TourneyObject.java b/src/java/com/threerings/parlor/tourney/data/TourneyObject.java
index bffcc5b2..92c8fcca 100644
--- a/src/java/com/threerings/parlor/tourney/data/TourneyObject.java
+++ b/src/java/com/threerings/parlor/tourney/data/TourneyObject.java
@@ -156,7 +156,7 @@ public class TourneyObject extends DObject
      * the <code>participants</code> set. The set will not change until the
      * event is actually propagated through the system.
      */
-    public void removeFromParticipants (Comparable key)
+    public void removeFromParticipants (Comparable<?> key)
     {
         requestEntryRemove(PARTICIPANTS, participants, key);
     }
@@ -184,8 +184,7 @@ public class TourneyObject extends DObject
     public void setParticipants (DSet<Participant> value)
     {
         requestAttributeChange(PARTICIPANTS, value, this.participants);
-        @SuppressWarnings("unchecked") DSet<Participant> clone =
-            (value == null) ? null : value.typedClone();
+        DSet<Participant> clone = (value == null) ? null : value.typedClone();
         this.participants = clone;
     }
     // AUTO-GENERATED: METHODS END
diff --git a/src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java b/src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java
index 5467d3b4..67d8a9de 100644
--- a/src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java
+++ b/src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java
@@ -47,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)
diff --git a/src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java b/src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java
index 43ddc051..62812f32 100644
--- a/src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java
+++ b/src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java
@@ -48,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)
diff --git a/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java b/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java
index ecdf898b..80428afe 100644
--- a/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java
+++ b/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java
@@ -47,7 +47,6 @@ public class PuzzleGameDispatcher extends InvocationDispatcher<PuzzleGameMarshal
         return new PuzzleGameMarshaller();
     }
 
-    @SuppressWarnings("unchecked")
     @Override // documentation inherited
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
diff --git a/src/java/com/threerings/stage/server/StageSceneDispatcher.java b/src/java/com/threerings/stage/server/StageSceneDispatcher.java
index b93f783c..7329df17 100644
--- a/src/java/com/threerings/stage/server/StageSceneDispatcher.java
+++ b/src/java/com/threerings/stage/server/StageSceneDispatcher.java
@@ -48,7 +48,6 @@ public class StageSceneDispatcher extends InvocationDispatcher<StageSceneMarshal
         return new StageSceneMarshaller();
     }
 
-    @SuppressWarnings("unchecked")
     @Override // documentation inherited
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
diff --git a/src/java/com/threerings/whirled/server/SceneDispatcher.java b/src/java/com/threerings/whirled/server/SceneDispatcher.java
index e2b0d892..5c914461 100644
--- a/src/java/com/threerings/whirled/server/SceneDispatcher.java
+++ b/src/java/com/threerings/whirled/server/SceneDispatcher.java
@@ -47,7 +47,6 @@ public class SceneDispatcher extends InvocationDispatcher<SceneMarshaller>
         return new SceneMarshaller();
     }
 
-    @SuppressWarnings("unchecked")
     @Override // documentation inherited
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
diff --git a/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java b/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java
index a02513ba..feec45ff 100644
--- a/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java
+++ b/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java
@@ -60,7 +60,7 @@ public class SpotSceneObject extends SceneObject
      * the <code>occupantLocs</code> set. The set will not change until the
      * event is actually propagated through the system.
      */
-    public void removeFromOccupantLocs (Comparable key)
+    public void removeFromOccupantLocs (Comparable<?> key)
     {
         requestEntryRemove(OCCUPANT_LOCS, occupantLocs, key);
     }
@@ -88,8 +88,7 @@ public class SpotSceneObject extends SceneObject
     public void setOccupantLocs (DSet<SceneLocation> value)
     {
         requestAttributeChange(OCCUPANT_LOCS, value, this.occupantLocs);
-        @SuppressWarnings("unchecked") DSet<SceneLocation> clone =
-            (value == null) ? null : value.typedClone();
+        DSet<SceneLocation> clone = (value == null) ? null : value.typedClone();
         this.occupantLocs = clone;
     }
 
@@ -108,7 +107,7 @@ public class SpotSceneObject extends SceneObject
      * the <code>clusters</code> set. The set will not change until the
      * event is actually propagated through the system.
      */
-    public void removeFromClusters (Comparable key)
+    public void removeFromClusters (Comparable<?> key)
     {
         requestEntryRemove(CLUSTERS, clusters, key);
     }
@@ -136,8 +135,7 @@ public class SpotSceneObject extends SceneObject
     public void setClusters (DSet<Cluster> value)
     {
         requestAttributeChange(CLUSTERS, value, this.clusters);
-        @SuppressWarnings("unchecked") DSet<Cluster> clone =
-            (value == null) ? null : value.typedClone();
+        DSet<Cluster> clone = (value == null) ? null : value.typedClone();
         this.clusters = clone;
     }
     // AUTO-GENERATED: METHODS END
diff --git a/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java b/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java
index 0214637e..d39ecde0 100644
--- a/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java
+++ b/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java
@@ -49,7 +49,6 @@ public class SpotDispatcher extends InvocationDispatcher<SpotMarshaller>
         return new SpotMarshaller();
     }
 
-    @SuppressWarnings("unchecked")
     @Override // documentation inherited
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
diff --git a/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java b/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java
index a4cd2dc7..8e11434d 100644
--- a/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java
+++ b/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java
@@ -47,7 +47,6 @@ public class ZoneDispatcher extends InvocationDispatcher<ZoneMarshaller>
         return new ZoneMarshaller();
     }
 
-    @SuppressWarnings("unchecked")
     @Override // documentation inherited
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)