Nix unneeded imports, add @Overrides, remove content-free comments, and rerun code generators.

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

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

@@ -40,21 +40,21 @@ import com.threerings.whirled.util.WhirledContext;
  */
 public abstract class SceneController extends PlaceController
 {
-    // documentation inherited
+    @Override
     public void init (CrowdContext ctx, PlaceConfig config)
     {
         super.init(ctx, config);
         _wctx = (WhirledContext)ctx;
     }
 
-    // documentation inherited
+    @Override
     public void willEnterPlace (PlaceObject plobj)
     {
         super.willEnterPlace(plobj);
         plobj.addListener(_updateListener);
     }
 
-    // documentation inherited
+    @Override
     public void didLeavePlace (PlaceObject plobj)
     {
         super.didLeavePlace(plobj);

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

@@ -483,7 +483,7 @@ public class SceneDirector extends BasicDirector
         }
     }
 
-    // documentation inherited from interface
+    @Override
     public void clientDidLogoff (Client client)
     {
         super.clientDidLogoff(client);
@@ -497,13 +497,13 @@ public class SceneDirector extends BasicDirector
         _sservice = null;
     }
 
-    // documentation inherited from interface
+    @Override
     protected void registerServices (Client client)
     {
         client.addServiceGroup(WHIRLED_GROUP);
     }
 
-    // documentation inherited from interface
+    @Override
     protected void fetchServices (Client client)
     {
         // get a handle on our scene service

src/java/com/threerings/whirled/data/DefaultSceneConfig.java

@@ -36,7 +36,7 @@ import com.threerings.whirled.client.SceneController;
  */
 public class DefaultSceneConfig extends PlaceConfig
 {
-    // documentation inherited
+    @Override
     public String getManagerClassName ()
     {
         return "com.threerings.whirled.server.SceneManager";

src/java/com/threerings/whirled/data/SceneImpl.java

@@ -110,9 +110,7 @@ public class SceneImpl implements Scene
         return _model;
     }
 
-    /**
-     * Generates a string representation of this instance.
-     */
+    @Override
     public String toString ()
     {
         return "[model=" + _model + ", config=" + _config + "]";

src/java/com/threerings/whirled/data/SceneMarshaller.java

@@ -25,7 +25,6 @@ import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.dobj.InvocationResponseEvent;
-import com.threerings.presents.net.Transport;
 import com.threerings.whirled.client.SceneService;
 
 /**

src/java/com/threerings/whirled/data/SceneModel.java

@@ -60,7 +60,7 @@ public class SceneModel extends SimpleStreamableObject
         auxModels = ArrayUtil.append(auxModels, auxModel);
     }
 
-    // documentation inherited
+    @Override
     public Object clone ()
         throws CloneNotSupportedException
     {

src/java/com/threerings/whirled/data/SceneUpdate.java

@@ -172,9 +172,7 @@ public class SceneUpdate
         }
     }
 
-    /**
-     * Generates a string representation of this instance.
-     */
+    @Override
     public String toString ()
     {
         StringBuilder buf = new StringBuilder("[");

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

@@ -28,7 +28,6 @@ import com.threerings.presents.server.InvocationException;
 import com.threerings.crowd.data.BodyObject;
 import com.threerings.crowd.server.LocationManager;
 
-import com.threerings.whirled.client.SceneService;
 import com.threerings.whirled.data.SceneCodes;
 
 import static com.threerings.whirled.Log.log;

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

@@ -22,7 +22,6 @@
 package com.threerings.whirled.server;
 
 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.whirled.client.SceneService;

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

@@ -35,7 +35,6 @@ import com.threerings.whirled.data.Scene;
 import com.threerings.whirled.data.SceneCodes;
 import com.threerings.whirled.data.ScenePlace;
 import com.threerings.whirled.data.SceneUpdate;
-import com.threerings.whirled.server.WhirledServer;
 import com.threerings.whirled.util.UpdateList;
 
 import static com.threerings.whirled.Log.log;
@@ -64,7 +63,7 @@ public class SceneManager extends PlaceManager
         return _updates.getUpdates(fromVersion);
     }
 
-    @Override // from PlaceManager
+    @Override
     public Place getLocation ()
     {
         return new ScenePlace(_plobj.getOid(), _scene.getId());
@@ -115,6 +114,7 @@ public class SceneManager extends PlaceManager
      * We're fully ready to go, so now we register ourselves with the scene registry which will
      * make us available to the clients and system at large.
      */
+    @Override
     protected void didStartup ()
     {
         super.didStartup();
@@ -128,9 +128,7 @@ public class SceneManager extends PlaceManager
         });
     }
 
-    /**
-     * Called when we have shutdown.
-     */
+    @Override
     protected void didShutdown ()
     {
         super.didShutdown();
@@ -161,6 +159,7 @@ public class SceneManager extends PlaceManager
         // and apply and store it in the repository
         if (isPersistent()) {
             _invoker.postUnit(new WriteOnlyUnit("recordUpdate(" + update + ")") {
+                @Override
                 public void invokePersist () throws Exception {
                     _screg.getSceneRepository().applyAndRecordUpdate(_scene.getSceneModel(), update);
                 }
@@ -171,13 +170,13 @@ public class SceneManager extends PlaceManager
         _plobj.postMessage(SceneCodes.SCENE_UPDATE, new Object[] { update });
     }
 
-    // documentation inherited
+    @Override
     public String where ()
     {
         return _scene.getName() + " (" + super.where() + ":" + _scene.getId() + ")";
     }
 
-    // documentation inherited
+    @Override
     protected void toString (StringBuilder buf)
     {
         super.toString(buf);

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

@@ -21,7 +21,6 @@
 
 package com.threerings.whirled.server;
 
-import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.server.InvocationException;
 
 import com.threerings.crowd.data.BodyObject;
@@ -29,7 +28,6 @@ import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.crowd.server.LocationManager;
 
 import com.threerings.whirled.client.SceneService;
-import com.threerings.whirled.data.SceneCodes;
 import com.threerings.whirled.data.SceneModel;
 import com.threerings.whirled.data.SceneUpdate;
 
@@ -45,7 +43,7 @@ public class SceneMoveHandler extends AbstractSceneMoveHandler
         _version = sceneVer;
     }
 
-    @Override // from AbstractSceneMoveHandler
+    @Override
     protected void effectSceneMove (SceneManager scmgr)
         throws InvocationException
     {

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

@@ -34,6 +34,6 @@ public interface SceneProvider extends InvocationProvider
     /**
      * Handles a {@link SceneService#moveTo} request.
      */
-    public void moveTo (ClientObject caller, int arg1, int arg2, SceneService.SceneMoveListener arg3)
+    void moveTo (ClientObject caller, int arg1, int arg2, SceneService.SceneMoveListener arg3)
         throws InvocationException;
 }

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

@@ -34,8 +34,6 @@ import com.samskivert.util.Invoker;
 
 import com.threerings.presents.annotation.MainInvoker;
 import com.threerings.presents.data.ClientObject;
-import com.threerings.presents.data.InvocationMarshaller;
-import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.InvocationManager;
 
 import com.threerings.crowd.data.BodyObject;
@@ -48,7 +46,6 @@ import com.threerings.whirled.client.SceneService;
 import com.threerings.whirled.data.Scene;
 import com.threerings.whirled.data.SceneCodes;
 import com.threerings.whirled.data.SceneModel;
-import com.threerings.whirled.data.SceneUpdate;
 import com.threerings.whirled.server.persist.SceneRepository;
 import com.threerings.whirled.util.NoSuchSceneException;
 import com.threerings.whirled.util.SceneFactory;
@@ -169,13 +166,16 @@ public class SceneRegistry
         // otherwise we have to load the scene from the repository
         final int fsceneId = sceneId;
         _invoker.postUnit(new RepositoryUnit("resolveScene(" + sceneId + ")") {
+            @Override
             public void invokePersist () throws Exception {
                 _model = _screp.loadSceneModel(fsceneId);
                 _updates = _screp.loadUpdates(fsceneId);
             }
+            @Override
             public void handleSuccess () {
                 processSuccessfulResolution(_model, _updates);
             }
+            @Override
             public void handleFailure (Exception error) {
                 processFailedResolution(fsceneId, error);
             }

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

@@ -22,7 +22,6 @@
 package com.threerings.whirled.server;
 
 import com.threerings.presents.data.ClientObject;
-import com.threerings.presents.net.Transport;
 import com.threerings.presents.server.InvocationSender;
 import com.threerings.whirled.client.SceneDecoder;
 import com.threerings.whirled.client.SceneReceiver;

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

@@ -21,7 +21,6 @@
 
 package com.threerings.whirled.server;
 
-import com.google.inject.Inject;
 import com.google.inject.Injector;
 
 import com.threerings.util.Name;
@@ -33,11 +32,6 @@ import com.threerings.presents.server.PresentsClient;
 
 import com.threerings.crowd.server.CrowdServer;
 
-import com.threerings.whirled.server.persist.SceneRepository;
-import com.threerings.whirled.util.SceneFactory;
-
-import static com.threerings.whirled.Log.log;
-
 /**
  * The Whirled server extends the {@link CrowdServer} and provides access to managers and the like
  * that are needed by the Whirled serviecs.
@@ -53,7 +47,7 @@ public abstract class WhirledServer extends CrowdServer
         }
     }
 
-    @Override // from CrowdServer
+    @Override
     public void init (Injector injector)
         throws Exception
     {

src/java/com/threerings/whirled/spot/client/SpotSceneDirector.java

@@ -77,6 +77,7 @@ public class SpotSceneDirector extends BasicDirector
 
         // wire ourselves up to hear about leave place notifications
         locdir.addLocationObserver(new LocationAdapter() {
+            @Override
             public void locationDidChange (PlaceObject place) {
                 // we need to clear some things out when we leave a place
                 handleDeparture();
@@ -347,7 +348,7 @@ public class SpotSceneDirector extends BasicDirector
         }
     }
 
-    // documentation inherited
+    @Override
     public void clientDidLogon (Client client)
     {
         super.clientDidLogon(client);
@@ -363,7 +364,7 @@ public class SpotSceneDirector extends BasicDirector
         }
     }
 
-    // documentation inherited
+    @Override
     public void clientObjectDidChange (Client client)
     {
         super.clientObjectDidChange(client);
@@ -374,7 +375,7 @@ public class SpotSceneDirector extends BasicDirector
         _self = (ClusteredBodyObject) clientObj;
     }
 
-    // documentation inherited
+    @Override
     public void clientDidLogoff (Client client)
     {
         super.clientDidLogoff(client);
@@ -390,7 +391,7 @@ public class SpotSceneDirector extends BasicDirector
         _self = null;
     }
 
-    // documentation inherited
+    @Override
     protected void fetchServices (Client client)
     {
         _sservice = client.requireService(SpotService.class);

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

@@ -49,7 +49,7 @@ public class Cluster extends Rectangle
         return _key;
     }
 
-    // documentation inherited
+    @Override
     @ActionScript(omit=true)
     public boolean equals (Object other)
     {
@@ -60,15 +60,13 @@ public class Cluster extends Rectangle
         }
     }
 
-    // documentation inherited
+    @Override
     public int hashCode ()
     {
         return clusterOid;
     }
 
-    /**
-     * Generates a string representation of this instance.
-     */
+    @Override
     public String toString ()
     {
         return StringUtil.fieldsToString(this);

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

@@ -84,9 +84,7 @@ public class Portal extends SimpleStreamableObject
             ((targetPortalId > 0) || (targetPortalId == -1));
     }
 
-    /**
-     * Creates a clone of this instance.
-     */
+    @Override
     public Object clone ()
     {
         try {
@@ -99,6 +97,7 @@ public class Portal extends SimpleStreamableObject
     /**
      * Portal equality is determined by portal id.
      */
+    @Override
     public boolean equals (Object other)
     {
         return (other instanceof Portal) &&
@@ -108,6 +107,7 @@ public class Portal extends SimpleStreamableObject
     /**
      * Computes a reasonable hashcode for portal instances.
      */
+    @Override
     public int hashCode ()
     {
         return portalId;

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

@@ -63,14 +63,14 @@ public class SceneLocation extends SimpleStreamableObject
         return _key;
     }
 
-    // documentation inherited
+    @Override
     public boolean equals (Object other)
     {
         return (other instanceof SceneLocation) &&
             this.loc.equals(((SceneLocation) other).loc);
     }
 
-    // documentation inherited
+    @Override
     public int hashCode ()
     {
         return loc.hashCode();

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

@@ -24,7 +24,6 @@ package com.threerings.whirled.spot.data;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.InvocationMarshaller;
-import com.threerings.presents.net.Transport;
 import com.threerings.whirled.client.SceneService;
 import com.threerings.whirled.data.SceneMarshaller;
 import com.threerings.whirled.spot.client.SpotService;

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

@@ -65,7 +65,7 @@ public class SpotSceneModel extends SimpleStreamableObject
         }
     }
 
-    // documentation inherited
+    @Override
     public Object clone ()
         throws CloneNotSupportedException
     {

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

@@ -23,7 +23,6 @@ package com.threerings.whirled.spot.server;
 
 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.whirled.client.SceneService;

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

@@ -36,23 +36,23 @@ public interface SpotProvider extends InvocationProvider
     /**
      * Handles a {@link SpotService#changeLocation} request.
      */
-    public void changeLocation (ClientObject caller, int arg1, Location arg2, InvocationService.ConfirmListener arg3)
+    void changeLocation (ClientObject caller, int arg1, Location arg2, InvocationService.ConfirmListener arg3)
         throws InvocationException;
 
     /**
      * Handles a {@link SpotService#clusterSpeak} request.
      */
-    public void clusterSpeak (ClientObject caller, String arg1, byte arg2);
+    void clusterSpeak (ClientObject caller, String arg1, byte arg2);
 
     /**
      * Handles a {@link SpotService#joinCluster} request.
      */
-    public void joinCluster (ClientObject caller, int arg1, InvocationService.ConfirmListener arg2)
+    void joinCluster (ClientObject caller, int arg1, InvocationService.ConfirmListener arg2)
         throws InvocationException;
 
     /**
      * Handles a {@link SpotService#traversePortal} request.
      */
-    public void traversePortal (ClientObject caller, int arg1, int arg2, int arg3, SceneService.SceneMoveListener arg4)
+    void traversePortal (ClientObject caller, int arg1, int arg2, int arg3, SceneService.SceneMoveListener arg4)
         throws InvocationException;
 }

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

@@ -111,7 +111,7 @@ public class SpotSceneManager extends SceneManager
         updateLocation(body, portal.getLocation());
     }
 
-    // documentation inherited
+    @Override
     protected void didStartup ()
     {
         // get a casted reference to our place object (we need to do this before calling
@@ -122,7 +122,7 @@ public class SpotSceneManager extends SceneManager
         super.didStartup();
     }
 
-    // documentation inherited
+    @Override
     protected void gotSceneData ()
     {
         super.gotSceneData();
@@ -131,7 +131,7 @@ public class SpotSceneManager extends SceneManager
         _sscene = (SpotScene)_scene;
     }
 
-    // documentation inherited
+    @Override
     protected void bodyLeft (int bodyOid)
     {
         super.bodyLeft(bodyOid);
@@ -160,7 +160,7 @@ public class SpotSceneManager extends SceneManager
         }
     }
 
-    // documentation inherited
+    @Override
     protected void insertOccupantInfo (OccupantInfo info, BodyObject body)
     {
         super.insertOccupantInfo(info, body);
@@ -564,6 +564,7 @@ public class SpotSceneManager extends SceneManager
             return _cluster;
         }
 
+        @Override
         public String toString ()
         {
             return "[cluster=" + _cluster + ", size=" + size() + "]";

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

@@ -29,17 +29,12 @@ import com.threerings.util.Name;
 
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.data.InvocationMarshaller;
-import com.threerings.presents.dobj.RootDObjectManager;
 import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.InvocationManager;
-import com.threerings.presents.server.InvocationProvider;
-
 import com.threerings.crowd.chat.data.ChatCodes;
 import com.threerings.crowd.chat.data.UserMessage;
 import com.threerings.crowd.chat.server.SpeakUtil;
 import com.threerings.crowd.data.BodyObject;
-import com.threerings.crowd.server.PlaceRegistry;
-
 import com.threerings.whirled.client.SceneService;
 import com.threerings.whirled.data.SceneCodes;
 import com.threerings.whirled.data.ScenePlace;

src/java/com/threerings/whirled/spot/tools/xml/SpotSceneRuleSet.java

@@ -84,7 +84,7 @@ public abstract class SpotSceneRuleSet implements NestableRuleSet
             _ruleset = ruleset;
         }
 
-        // documentation inherited
+        @Override
         public void begin (String namespace, String name, Attributes attributes)
                 throws Exception
         {
@@ -105,7 +105,7 @@ public abstract class SpotSceneRuleSet implements NestableRuleSet
      */
     protected static class PortalFieldsRule extends Rule
     {
-        // documentation inherited
+        @Override
         public void begin (String namespace, String name, Attributes attrs)
             throws Exception
         {

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

@@ -148,13 +148,13 @@ public class ZoneDirector extends BasicDirector
         return true;
     }
 
-    // documentation inherited
+    @Override
     protected void fetchServices (Client client)
     {
         _zservice = client.requireService(ZoneService.class);
     }
 
-    // documentation inherited
+    @Override
     public void clientDidLogoff (Client client)
     {
         super.clientDidLogoff(client);

src/java/com/threerings/whirled/zone/data/SceneSummary.java

@@ -46,9 +46,7 @@ public class SceneSummary implements Streamable
     /** The directions in which each of the neighbors lay. */
     public int[] neighborDirs;
 
-    /**
-     * Generates a string representation of this instance.
-     */
+    @Override
     public String toString ()
     {
         return "[sceneId=" + sceneId + ", name=" + name +

src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java

@@ -25,7 +25,6 @@ import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.dobj.InvocationResponseEvent;
-import com.threerings.presents.net.Transport;
 import com.threerings.whirled.data.SceneModel;
 import com.threerings.whirled.data.SceneUpdate;
 import com.threerings.whirled.zone.client.ZoneService;

src/java/com/threerings/whirled/zone/data/ZoneSummary.java

@@ -42,9 +42,7 @@ public class ZoneSummary extends SimpleStreamableObject
     /** The summary information for all of the scenes in the zone. */
     public SceneSummary[] scenes;
 
-    /**
-     * Generates a string representation of this instance.
-     */
+    @Override
     public String toString ()
     {
         return "[zoneId=" + zoneId + ", name=" + name +

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

@@ -22,7 +22,6 @@
 package com.threerings.whirled.zone.server;
 
 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.whirled.zone.client.ZoneService;

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

@@ -27,12 +27,10 @@ import com.threerings.crowd.data.BodyObject;
 import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.crowd.server.LocationManager;
 
-import com.threerings.whirled.client.SceneService;
 import com.threerings.whirled.data.SceneModel;
 import com.threerings.whirled.data.SceneUpdate;
 import com.threerings.whirled.server.AbstractSceneMoveHandler;
 import com.threerings.whirled.server.SceneManager;
-import com.threerings.whirled.server.SceneMoveHandler;
 import com.threerings.whirled.server.SceneRegistry;
 
 import com.threerings.whirled.zone.client.ZoneService;
@@ -81,7 +79,7 @@ public class ZoneMoveHandler extends AbstractSceneMoveHandler
         _listener.requestFailed(ZoneCodes.NO_SUCH_ZONE);
     }
 
-    @Override // from AbstractSceneMoveHandler
+    @Override
     protected void effectSceneMove (SceneManager scmgr)
         throws InvocationException
     {

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

@@ -34,6 +34,6 @@ public interface ZoneProvider extends InvocationProvider
     /**
      * Handles a {@link ZoneService#moveTo} request.
      */
-    public void moveTo (ClientObject caller, int arg1, int arg2, int arg3, ZoneService.ZoneMoveListener arg4)
+    void moveTo (ClientObject caller, int arg1, int arg2, int arg3, ZoneService.ZoneMoveListener arg4)
         throws InvocationException;
 }

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

@@ -22,7 +22,6 @@
 package com.threerings.whirled.zone.server;
 
 import com.threerings.presents.data.ClientObject;
-import com.threerings.presents.net.Transport;
 import com.threerings.presents.server.InvocationSender;
 import com.threerings.whirled.zone.client.ZoneDecoder;
 import com.threerings.whirled.zone.client.ZoneReceiver;