From bcbe163a12946ca6aeb75902619ed0be28fad56c Mon Sep 17 00:00:00 2001 From: Dave Hoover Date: Mon, 28 Jul 2008 17:27:38 +0000 Subject: [PATCH] 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 --- .../com/threerings/micasa/lobby/LobbyDispatcher.java | 6 ++---- .../micasa/simulator/server/SimulatorDispatcher.java | 3 +-- .../parlor/card/client/CardGameDecoder.java | 1 - .../parlor/card/server/CardGameSender.java | 1 - .../card/trick/server/TrickCardGameDispatcher.java | 8 +++----- .../card/trick/server/TrickCardGameProvider.java | 1 + .../com/threerings/parlor/client/ParlorDecoder.java | 1 - .../threerings/parlor/server/ParlorDispatcher.java | 12 ++++-------- .../com/threerings/parlor/server/ParlorSender.java | 1 - .../threerings/parlor/server/TableDispatcher.java | 12 ++++-------- .../com/threerings/parlor/server/TableProvider.java | 1 + .../parlor/tourney/data/TourneyObject.java | 4 ++-- .../parlor/tourney/server/TourneyDispatcher.java | 9 +++------ .../parlor/tourney/server/TourneyProvider.java | 1 + .../parlor/tourney/server/TourniesDispatcher.java | 3 +-- .../parlor/tourney/server/TourniesProvider.java | 1 + .../puzzle/server/PuzzleGameDispatcher.java | 6 ++---- .../threerings/puzzle/server/PuzzleGameProvider.java | 1 + .../stage/server/StageSceneDispatcher.java | 6 ++---- .../threerings/stage/server/StageSceneProvider.java | 1 + src/java/com/threerings/stats/data/IntSetStat.java | 4 ++-- .../com/threerings/whirled/client/SceneDecoder.java | 1 - .../threerings/whirled/server/SceneDispatcher.java | 3 +-- .../com/threerings/whirled/server/SceneSender.java | 1 - .../whirled/spot/data/SpotSceneObject.java | 8 ++++---- .../whirled/spot/server/SpotDispatcher.java | 12 ++++-------- .../threerings/whirled/spot/server/SpotProvider.java | 1 + .../threerings/whirled/zone/client/ZoneDecoder.java | 1 - .../whirled/zone/server/ZoneDispatcher.java | 3 +-- .../threerings/whirled/zone/server/ZoneSender.java | 1 - 30 files changed, 43 insertions(+), 71 deletions(-) diff --git a/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java b/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java index ba392ebb..85da9428 100644 --- a/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java +++ b/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java @@ -54,15 +54,13 @@ public class LobbyDispatcher extends InvocationDispatcher switch (methodId) { case LobbyMarshaller.GET_CATEGORIES: ((LobbyProvider)provider).getCategories( - source, - (LobbyService.CategoriesListener)args[0] + source, (LobbyService.CategoriesListener)args[0] ); return; case LobbyMarshaller.GET_LOBBIES: ((LobbyProvider)provider).getLobbies( - source, - (String)args[0], (LobbyService.LobbiesListener)args[1] + source, (String)args[0], (LobbyService.LobbiesListener)args[1] ); return; diff --git a/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java b/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java index cbaf072b..1ed07be3 100644 --- a/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java +++ b/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java @@ -56,8 +56,7 @@ public class SimulatorDispatcher extends InvocationDispatcher switch (methodId) { case ParlorMarshaller.CANCEL: ((ParlorProvider)provider).cancel( - source, - ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1] + source, ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1] ); return; case ParlorMarshaller.INVITE: ((ParlorProvider)provider).invite( - source, - (Name)args[0], (GameConfig)args[1], (ParlorService.InviteListener)args[2] + source, (Name)args[0], (GameConfig)args[1], (ParlorService.InviteListener)args[2] ); return; case ParlorMarshaller.RESPOND: ((ParlorProvider)provider).respond( - source, - ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), args[2], (InvocationService.InvocationListener)args[3] + source, ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), args[2], (InvocationService.InvocationListener)args[3] ); return; case ParlorMarshaller.START_SOLITAIRE: ((ParlorProvider)provider).startSolitaire( - source, - (GameConfig)args[0], (InvocationService.ConfirmListener)args[1] + source, (GameConfig)args[0], (InvocationService.ConfirmListener)args[1] ); return; diff --git a/src/java/com/threerings/parlor/server/ParlorSender.java b/src/java/com/threerings/parlor/server/ParlorSender.java index 013f3010..b59eaeed 100644 --- a/src/java/com/threerings/parlor/server/ParlorSender.java +++ b/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; diff --git a/src/java/com/threerings/parlor/server/TableDispatcher.java b/src/java/com/threerings/parlor/server/TableDispatcher.java index 4067c78c..5678773e 100644 --- a/src/java/com/threerings/parlor/server/TableDispatcher.java +++ b/src/java/com/threerings/parlor/server/TableDispatcher.java @@ -58,29 +58,25 @@ public class TableDispatcher extends InvocationDispatcher switch (methodId) { case TableMarshaller.CREATE_TABLE: ((TableProvider)provider).createTable( - source, - (TableConfig)args[0], (GameConfig)args[1], (InvocationService.ResultListener)args[2] + source, (TableConfig)args[0], (GameConfig)args[1], (InvocationService.ResultListener)args[2] ); return; case TableMarshaller.JOIN_TABLE: ((TableProvider)provider).joinTable( - source, - ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (InvocationService.InvocationListener)args[2] + source, ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (InvocationService.InvocationListener)args[2] ); return; case TableMarshaller.LEAVE_TABLE: ((TableProvider)provider).leaveTable( - source, - ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1] + source, ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1] ); return; case TableMarshaller.START_TABLE_NOW: ((TableProvider)provider).startTableNow( - source, - ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1] + source, ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1] ); return; diff --git a/src/java/com/threerings/parlor/server/TableProvider.java b/src/java/com/threerings/parlor/server/TableProvider.java index a3b6d42d..ccc88f0a 100644 --- a/src/java/com/threerings/parlor/server/TableProvider.java +++ b/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; diff --git a/src/java/com/threerings/parlor/tourney/data/TourneyObject.java b/src/java/com/threerings/parlor/tourney/data/TourneyObject.java index 64e1d252..bffcc5b2 100644 --- a/src/java/com/threerings/parlor/tourney/data/TourneyObject.java +++ b/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 value) + public void setParticipants (DSet value) { requestAttributeChange(PARTICIPANTS, value, this.participants); - @SuppressWarnings("unchecked") DSet clone = + @SuppressWarnings("unchecked") DSet clone = (value == null) ? null : value.typedClone(); this.participants = clone; } diff --git a/src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java b/src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java index 87a3c8e4..5467d3b4 100644 --- a/src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java +++ b/src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java @@ -56,22 +56,19 @@ public class TourneyDispatcher extends InvocationDispatcher switch (methodId) { case TourneyMarshaller.CANCEL: ((TourneyProvider)provider).cancel( - source, - (InvocationService.ConfirmListener)args[0] + source, (InvocationService.ConfirmListener)args[0] ); return; case TourneyMarshaller.JOIN: ((TourneyProvider)provider).join( - source, - (InvocationService.ConfirmListener)args[0] + source, (InvocationService.ConfirmListener)args[0] ); return; case TourneyMarshaller.LEAVE: ((TourneyProvider)provider).leave( - source, - (InvocationService.ConfirmListener)args[0] + source, (InvocationService.ConfirmListener)args[0] ); return; diff --git a/src/java/com/threerings/parlor/tourney/server/TourneyProvider.java b/src/java/com/threerings/parlor/tourney/server/TourneyProvider.java index f25340ac..cfbb2cb8 100644 --- a/src/java/com/threerings/parlor/tourney/server/TourneyProvider.java +++ b/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; diff --git a/src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java b/src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java index df49971b..43ddc051 100644 --- a/src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java +++ b/src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java @@ -57,8 +57,7 @@ public class TourniesDispatcher extends InvocationDispatcher switch (methodId) { case TourniesMarshaller.CREATE_TOURNEY: ((TourniesProvider)provider).createTourney( - source, - (TourneyConfig)args[0], (InvocationService.ResultListener)args[1] + source, (TourneyConfig)args[0], (InvocationService.ResultListener)args[1] ); return; diff --git a/src/java/com/threerings/parlor/tourney/server/TourniesProvider.java b/src/java/com/threerings/parlor/tourney/server/TourniesProvider.java index 622fc385..e6f9e006 100644 --- a/src/java/com/threerings/parlor/tourney/server/TourniesProvider.java +++ b/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; diff --git a/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java b/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java index 943098c4..ecdf898b 100644 --- a/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java +++ b/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java @@ -56,15 +56,13 @@ public class PuzzleGameDispatcher extends InvocationDispatcher public void unpersistFrom (ObjectInputStream in, AuxDataSource aux) throws IOException, ClassNotFoundException { - _maxSize = ((int)in.readByte()) + 128; - int numValues = ((int)in.readByte()) + 128; + _maxSize = in.readByte() + 128; + int numValues = in.readByte() + 128; _intSet = new StreamableArrayIntSet(numValues); for (int ii = 0; ii < numValues; ii++) { _intSet.add(in.readInt()); diff --git a/src/java/com/threerings/whirled/client/SceneDecoder.java b/src/java/com/threerings/whirled/client/SceneDecoder.java index b01d214c..7635aa14 100644 --- a/src/java/com/threerings/whirled/client/SceneDecoder.java +++ b/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. diff --git a/src/java/com/threerings/whirled/server/SceneDispatcher.java b/src/java/com/threerings/whirled/server/SceneDispatcher.java index e328816c..e2b0d892 100644 --- a/src/java/com/threerings/whirled/server/SceneDispatcher.java +++ b/src/java/com/threerings/whirled/server/SceneDispatcher.java @@ -56,8 +56,7 @@ public class SceneDispatcher extends InvocationDispatcher switch (methodId) { case SceneMarshaller.MOVE_TO: ((SceneProvider)provider).moveTo( - source, - ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (SceneService.SceneMoveListener)args[2] + source, ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (SceneService.SceneMoveListener)args[2] ); return; diff --git a/src/java/com/threerings/whirled/server/SceneSender.java b/src/java/com/threerings/whirled/server/SceneSender.java index 95790620..7a89a763 100644 --- a/src/java/com/threerings/whirled/server/SceneSender.java +++ b/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 diff --git a/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java b/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java index f73cb51c..a02513ba 100644 --- a/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java +++ b/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 value) + public void setOccupantLocs (DSet value) { requestAttributeChange(OCCUPANT_LOCS, value, this.occupantLocs); - @SuppressWarnings("unchecked") DSet clone = + @SuppressWarnings("unchecked") DSet 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 value) + public void setClusters (DSet value) { requestAttributeChange(CLUSTERS, value, this.clusters); - @SuppressWarnings("unchecked") DSet clone = + @SuppressWarnings("unchecked") DSet clone = (value == null) ? null : value.typedClone(); this.clusters = clone; } diff --git a/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java b/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java index 6ddf84c2..0214637e 100644 --- a/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java +++ b/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java @@ -58,29 +58,25 @@ public class SpotDispatcher extends InvocationDispatcher switch (methodId) { case SpotMarshaller.CHANGE_LOCATION: ((SpotProvider)provider).changeLocation( - source, - ((Integer)args[0]).intValue(), (Location)args[1], (InvocationService.ConfirmListener)args[2] + source, ((Integer)args[0]).intValue(), (Location)args[1], (InvocationService.ConfirmListener)args[2] ); return; case SpotMarshaller.CLUSTER_SPEAK: ((SpotProvider)provider).clusterSpeak( - source, - (String)args[0], ((Byte)args[1]).byteValue() + source, (String)args[0], ((Byte)args[1]).byteValue() ); return; case SpotMarshaller.JOIN_CLUSTER: ((SpotProvider)provider).joinCluster( - source, - ((Integer)args[0]).intValue(), (InvocationService.ConfirmListener)args[1] + source, ((Integer)args[0]).intValue(), (InvocationService.ConfirmListener)args[1] ); return; case SpotMarshaller.TRAVERSE_PORTAL: ((SpotProvider)provider).traversePortal( - source, - ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), ((Integer)args[2]).intValue(), (SceneService.SceneMoveListener)args[3] + source, ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), ((Integer)args[2]).intValue(), (SceneService.SceneMoveListener)args[3] ); return; diff --git a/src/java/com/threerings/whirled/spot/server/SpotProvider.java b/src/java/com/threerings/whirled/spot/server/SpotProvider.java index c8422d48..09e68085 100644 --- a/src/java/com/threerings/whirled/spot/server/SpotProvider.java +++ b/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; /** diff --git a/src/java/com/threerings/whirled/zone/client/ZoneDecoder.java b/src/java/com/threerings/whirled/zone/client/ZoneDecoder.java index 64891df3..91ca5cfa 100644 --- a/src/java/com/threerings/whirled/zone/client/ZoneDecoder.java +++ b/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. diff --git a/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java b/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java index 05b86c9a..a4cd2dc7 100644 --- a/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java +++ b/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java @@ -56,8 +56,7 @@ public class ZoneDispatcher extends InvocationDispatcher switch (methodId) { case ZoneMarshaller.MOVE_TO: ((ZoneProvider)provider).moveTo( - source, - ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), ((Integer)args[2]).intValue(), (ZoneService.ZoneMoveListener)args[3] + source, ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), ((Integer)args[2]).intValue(), (ZoneService.ZoneMoveListener)args[3] ); return; diff --git a/src/java/com/threerings/whirled/zone/server/ZoneSender.java b/src/java/com/threerings/whirled/zone/server/ZoneSender.java index 7cf49f2a..6e86c5dd 100644 --- a/src/java/com/threerings/whirled/zone/server/ZoneSender.java +++ b/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