AfflictionNetworks/vilya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@670 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
Dave Hoover
2008-07-18 19:02:08 +00:00
parent f30cb74ace
commit 624daadcd9
171 changed files with 371 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/whirled/spot/client/SpotSceneDirector.java
+5 -4
View File
@@ -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
+3 -5
View File
@@ -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
+3 -3
View File
@@ -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
+2 -2
View File
@@ -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
-1
View File
@@ -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
+1 -1
View File
@@ -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
-1
View File
@@ -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
+4 -4
View File
@@ -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
+5 -4
View File
@@ -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
-5
View File
@@ -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
+2 -2
View File
@@ -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
{