More code hygiene. Need to do some fiddling to make dispatchers not generate

generics warnings when calling methods with generic types.


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

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

@@ -21,7 +21,9 @@
 
 package com.threerings.parlor.client;
 
-import java.util.ArrayList;
+import java.util.List;
+
+import com.google.common.collect.Lists;
 
 import com.samskivert.util.HashIntMap;
 import com.threerings.util.Name;
@@ -138,7 +140,7 @@ public class ParlorDirector extends BasicDirector
         // see what our observers have to say about it
         boolean handled = false;
         for (int i = 0; i < _grobs.size(); i++) {
-            GameReadyObserver grob = (GameReadyObserver)_grobs.get(i);
+            GameReadyObserver grob = _grobs.get(i);
             handled = grob.receivedGameReady(gameOid) || handled;
         }
 
@@ -172,7 +174,7 @@ public class ParlorDirector extends BasicDirector
     public void receivedInviteResponse (int remoteId, int code, Object arg)
     {
         // look up the invitation record for this invitation
-        Invitation invite = (Invitation)_pendingInvites.get(remoteId);
+        Invitation invite = _pendingInvites.get(remoteId);
         if (invite == null) {
             log.warning("Have no record of invitation for which we received a response?! " +
                         "[remoteId=" + remoteId + ", code=" + code + ", arg=" + arg + "].");
@@ -230,8 +232,8 @@ public class ParlorDirector extends BasicDirector
 
     /** A table of acknowledged (but not yet accepted or refused) invitation requests, keyed on
      * invitation id. */
-    protected HashIntMap _pendingInvites = new HashIntMap();
+    protected HashIntMap<Invitation> _pendingInvites = new HashIntMap<Invitation>();
 
     /** We notify the entities on this list when we get a game ready notification. */
-    protected ArrayList _grobs = new ArrayList();
+    protected List<GameReadyObserver> _grobs = Lists.newArrayList();
 }

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

@@ -58,7 +58,7 @@ import static com.threerings.parlor.Log.log;
  * matchmaking takes place implements the {@link TableLobbyObject} interface.
  */
 public class TableDirector extends BasicDirector
-    implements SetListener, TableService.ResultListener
+    implements SetListener<Table>, TableService.ResultListener
 {
     /**
      * Creates a new table director to manage tables with the specified observer which will receive
@@ -227,10 +227,10 @@ public class TableDirector extends BasicDirector
     }
 
     // documentation inherited
-    public void entryAdded (EntryAddedEvent event)
+    public void entryAdded (EntryAddedEvent<Table> event)
     {
         if (event.getName().equals(_tableField)) {
-            Table table = (Table)event.getEntry();
+            Table table = event.getEntry();
             // check to see if we just joined a table
             checkSeatedness(table);
             // now let the observer know what's up
@@ -239,10 +239,10 @@ public class TableDirector extends BasicDirector
     }
 
     // documentation inherited
-    public void entryUpdated (EntryUpdatedEvent event)
+    public void entryUpdated (EntryUpdatedEvent<Table> event)
     {
         if (event.getName().equals(_tableField)) {
-            Table table = (Table)event.getEntry();
+            Table table = event.getEntry();
             // check to see if we just joined or left a table
             checkSeatedness(table);
             // now let the observer know what's up
@@ -251,7 +251,7 @@ public class TableDirector extends BasicDirector
     }
 
     // documentation inherited
-    public void entryRemoved (EntryRemovedEvent event)
+    public void entryRemoved (EntryRemovedEvent<Table> event)
     {
         if (event.getName().equals(_tableField)) {
             int tableId = ((Integer) event.getKey()).intValue();
@@ -275,7 +275,7 @@ public class TableDirector extends BasicDirector
             return;
         }
 
-        Table table = (Table) _tlobj.getTables().get(tableId);
+        Table table = _tlobj.getTables().get(tableId);
         if (table == null) {
             log.warning("Table created, but where is it? [tableId=" + tableId + "]");
             return;