From 09f8a25876e1c09688d047f03a06e0b40dd34ecd Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Tue, 22 Jul 2008 12:51:17 +0000 Subject: [PATCH] More style-related cleanup. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5247 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/admin/server/AdminDispatcher.java | 3 +-- .../admin/server/DatabaseConfigRegistry.java | 5 +++-- .../admin/server/PeeredDatabaseConfigRegistry.java | 7 ++++--- .../admin/server/persist/ConfigRepository.java | 2 +- .../com/threerings/bureau/client/BureauDecoder.java | 1 - .../threerings/bureau/server/BureauDispatcher.java | 12 ++++-------- .../com/threerings/bureau/server/BureauProvider.java | 1 + .../com/threerings/bureau/server/BureauSender.java | 1 - .../threerings/crowd/chat/client/ChatDirector.java | 4 ++-- .../threerings/crowd/chat/server/ChatDispatcher.java | 9 +++------ .../crowd/chat/server/SpeakDispatcher.java | 3 +-- .../threerings/crowd/chat/server/SpeakProvider.java | 1 + .../com/threerings/crowd/client/LocationDecoder.java | 1 - .../com/threerings/crowd/client/PlaceController.java | 10 +++++----- src/java/com/threerings/crowd/client/PlaceView.java | 4 ++-- src/java/com/threerings/crowd/data/OccupantInfo.java | 2 -- .../crowd/peer/client/CrowdPeerService.java | 7 +++---- .../crowd/peer/server/CrowdPeerDispatcher.java | 6 ++---- .../crowd/peer/server/CrowdPeerProvider.java | 1 + .../com/threerings/crowd/server/BodyDispatcher.java | 3 +-- .../com/threerings/crowd/server/BodyManager.java | 2 +- .../com/threerings/crowd/server/BodyProvider.java | 1 + .../threerings/crowd/server/LocationDispatcher.java | 5 ++--- .../com/threerings/crowd/server/LocationSender.java | 1 - .../com/threerings/crowd/server/PlaceManager.java | 6 +++--- .../com/threerings/crowd/server/PlaceRegistry.java | 4 ++-- .../presents/peer/server/PeerDispatcher.java | 6 ++---- .../presents/peer/server/PeerProvider.java | 1 + .../presents/server/TimeBaseDispatcher.java | 3 +-- 29 files changed, 48 insertions(+), 64 deletions(-) diff --git a/src/java/com/threerings/admin/server/AdminDispatcher.java b/src/java/com/threerings/admin/server/AdminDispatcher.java index a1bb844a2..3db1c5dff 100644 --- a/src/java/com/threerings/admin/server/AdminDispatcher.java +++ b/src/java/com/threerings/admin/server/AdminDispatcher.java @@ -56,8 +56,7 @@ public class AdminDispatcher extends InvocationDispatcher switch (methodId) { case AdminMarshaller.GET_CONFIG_INFO: ((AdminProvider)provider).getConfigInfo( - source, - (AdminService.ConfigInfoListener)args[0] + source, (AdminService.ConfigInfoListener)args[0] ); return; diff --git a/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java b/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java index 112c1e9ba..604c8bbd6 100644 --- a/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java +++ b/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java @@ -115,6 +115,7 @@ public class DatabaseConfigRegistry extends ConfigRegistry return new DatabaseObjectRecord(path, object); } + /** Stores settings in a database. */ protected class DatabaseObjectRecord extends ObjectRecord { public DatabaseObjectRecord (String path, DObject object) @@ -134,7 +135,7 @@ public class DatabaseConfigRegistry extends ConfigRegistry _data = _repo.loadConfig(_node, _path); } catch (PersistenceException pe) { log.warning("Failed to load object configuration [path=" + _path + "].", pe); - _data = new HashMap(); + _data = new HashMap(); } super.init(); @@ -321,7 +322,7 @@ public class DatabaseConfigRegistry extends ConfigRegistry } protected String _path; - protected HashMap _data; + protected HashMap _data; } protected ConfigRepository _repo; diff --git a/src/java/com/threerings/admin/server/PeeredDatabaseConfigRegistry.java b/src/java/com/threerings/admin/server/PeeredDatabaseConfigRegistry.java index 1103bf3a5..5e913e3a2 100644 --- a/src/java/com/threerings/admin/server/PeeredDatabaseConfigRegistry.java +++ b/src/java/com/threerings/admin/server/PeeredDatabaseConfigRegistry.java @@ -59,6 +59,7 @@ public class PeeredDatabaseConfigRegistry extends DatabaseConfigRegistry return new PeerDatabaseObjectRecord(path, object); } + /** Stores settings in a database and broadcasts changes to peers. */ protected class PeerDatabaseObjectRecord extends DatabaseObjectRecord implements PeerManager.StaleCacheObserver { @@ -71,8 +72,8 @@ public class PeeredDatabaseConfigRegistry extends DatabaseConfigRegistry // from interface PeerManager.StaleCacheObserver public void changedCacheData (Streamable data) { - @SuppressWarnings("unchecked") StreamableTuple change = - (StreamableTuple)data; + @SuppressWarnings("unchecked") StreamableTuple change = + (StreamableTuple)data; // note that we should ignore the attribute change event we're about to generate // because it is not a real configuration change but rather a sync @@ -112,7 +113,7 @@ public class PeeredDatabaseConfigRegistry extends DatabaseConfigRegistry { // broadcast to the other nodes that this value has changed _peermgr.broadcastStaleCacheData( - PEER_CACHE_PREFIX + _path, new StreamableTuple(field, value)); + PEER_CACHE_PREFIX + _path, new StreamableTuple(field, value)); } protected ArrayList _pendingSyncs = new ArrayList(); diff --git a/src/java/com/threerings/admin/server/persist/ConfigRepository.java b/src/java/com/threerings/admin/server/persist/ConfigRepository.java index 95c4d079f..e3ee68e4a 100644 --- a/src/java/com/threerings/admin/server/persist/ConfigRepository.java +++ b/src/java/com/threerings/admin/server/persist/ConfigRepository.java @@ -48,7 +48,7 @@ public class ConfigRepository extends DepotRepository * * @return a map containing field/value pairs for all stored configuration data. */ - public HashMap loadConfig (String node, String object) + public HashMap loadConfig (String node, String object) throws PersistenceException { HashMap data = new HashMap(); diff --git a/src/java/com/threerings/bureau/client/BureauDecoder.java b/src/java/com/threerings/bureau/client/BureauDecoder.java index e1c3312fd..f6cfade97 100644 --- a/src/java/com/threerings/bureau/client/BureauDecoder.java +++ b/src/java/com/threerings/bureau/client/BureauDecoder.java @@ -21,7 +21,6 @@ package com.threerings.bureau.client; -import com.threerings.bureau.client.BureauReceiver; import com.threerings.presents.client.InvocationDecoder; /** diff --git a/src/java/com/threerings/bureau/server/BureauDispatcher.java b/src/java/com/threerings/bureau/server/BureauDispatcher.java index 292ffcf4d..b568e28f0 100644 --- a/src/java/com/threerings/bureau/server/BureauDispatcher.java +++ b/src/java/com/threerings/bureau/server/BureauDispatcher.java @@ -55,29 +55,25 @@ public class BureauDispatcher extends InvocationDispatcher switch (methodId) { case BureauMarshaller.AGENT_CREATED: ((BureauProvider)provider).agentCreated( - source, - ((Integer)args[0]).intValue() + source, ((Integer)args[0]).intValue() ); return; case BureauMarshaller.AGENT_CREATION_FAILED: ((BureauProvider)provider).agentCreationFailed( - source, - ((Integer)args[0]).intValue() + source, ((Integer)args[0]).intValue() ); return; case BureauMarshaller.AGENT_DESTROYED: ((BureauProvider)provider).agentDestroyed( - source, - ((Integer)args[0]).intValue() + source, ((Integer)args[0]).intValue() ); return; case BureauMarshaller.BUREAU_INITIALIZED: ((BureauProvider)provider).bureauInitialized( - source, - (String)args[0] + source, (String)args[0] ); return; diff --git a/src/java/com/threerings/bureau/server/BureauProvider.java b/src/java/com/threerings/bureau/server/BureauProvider.java index b3dd06d64..7c82c3853 100644 --- a/src/java/com/threerings/bureau/server/BureauProvider.java +++ b/src/java/com/threerings/bureau/server/BureauProvider.java @@ -21,6 +21,7 @@ package com.threerings.bureau.server; +import com.threerings.bureau.client.BureauService; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationProvider; diff --git a/src/java/com/threerings/bureau/server/BureauSender.java b/src/java/com/threerings/bureau/server/BureauSender.java index e3bed6091..9fd1061f7 100644 --- a/src/java/com/threerings/bureau/server/BureauSender.java +++ b/src/java/com/threerings/bureau/server/BureauSender.java @@ -22,7 +22,6 @@ package com.threerings.bureau.server; import com.threerings.bureau.client.BureauDecoder; -import com.threerings.bureau.client.BureauReceiver; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationSender; diff --git a/src/java/com/threerings/crowd/chat/client/ChatDirector.java b/src/java/com/threerings/crowd/chat/client/ChatDirector.java index 29242a629..d8103eb84 100644 --- a/src/java/com/threerings/crowd/chat/client/ChatDirector.java +++ b/src/java/com/threerings/crowd/chat/client/ChatDirector.java @@ -1260,8 +1260,8 @@ public class ChatDirector extends BasicDirector } // clear out from the history any tells that are mistypes - for (Iterator iter = _history.iterator(); iter.hasNext(); ) { - String hist = (String)iter.next(); + for (Iterator iter = _history.iterator(); iter.hasNext(); ) { + String hist = iter.next(); if (hist.startsWith("/" + command)) { String harg = hist.substring(command.length() + 1).trim(); // we blow away any historic tells that have msg content diff --git a/src/java/com/threerings/crowd/chat/server/ChatDispatcher.java b/src/java/com/threerings/crowd/chat/server/ChatDispatcher.java index ec4e7a966..9ab2641ac 100644 --- a/src/java/com/threerings/crowd/chat/server/ChatDispatcher.java +++ b/src/java/com/threerings/crowd/chat/server/ChatDispatcher.java @@ -58,22 +58,19 @@ public class ChatDispatcher extends InvocationDispatcher switch (methodId) { case ChatMarshaller.AWAY: ((ChatProvider)provider).away( - source, - (String)args[0] + source, (String)args[0] ); return; case ChatMarshaller.BROADCAST: ((ChatProvider)provider).broadcast( - source, - (String)args[0], (InvocationService.InvocationListener)args[1] + source, (String)args[0], (InvocationService.InvocationListener)args[1] ); return; case ChatMarshaller.TELL: ((ChatProvider)provider).tell( - source, - (Name)args[0], (String)args[1], (ChatService.TellListener)args[2] + source, (Name)args[0], (String)args[1], (ChatService.TellListener)args[2] ); return; diff --git a/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java b/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java index 1032917f2..66ecaf489 100644 --- a/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java +++ b/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java @@ -55,8 +55,7 @@ public class SpeakDispatcher extends InvocationDispatcher switch (methodId) { case SpeakMarshaller.SPEAK: ((SpeakProvider)provider).speak( - source, - (String)args[0], ((Byte)args[1]).byteValue() + source, (String)args[0], ((Byte)args[1]).byteValue() ); return; diff --git a/src/java/com/threerings/crowd/chat/server/SpeakProvider.java b/src/java/com/threerings/crowd/chat/server/SpeakProvider.java index 92e2fe9b7..a350e4a85 100644 --- a/src/java/com/threerings/crowd/chat/server/SpeakProvider.java +++ b/src/java/com/threerings/crowd/chat/server/SpeakProvider.java @@ -21,6 +21,7 @@ package com.threerings.crowd.chat.server; +import com.threerings.crowd.chat.client.SpeakService; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationProvider; diff --git a/src/java/com/threerings/crowd/client/LocationDecoder.java b/src/java/com/threerings/crowd/client/LocationDecoder.java index be3638fe7..4a8a848c1 100644 --- a/src/java/com/threerings/crowd/client/LocationDecoder.java +++ b/src/java/com/threerings/crowd/client/LocationDecoder.java @@ -21,7 +21,6 @@ package com.threerings.crowd.client; -import com.threerings.crowd.client.LocationReceiver; import com.threerings.presents.client.InvocationDecoder; /** diff --git a/src/java/com/threerings/crowd/client/PlaceController.java b/src/java/com/threerings/crowd/client/PlaceController.java index 29cf76ab1..414b940b8 100644 --- a/src/java/com/threerings/crowd/client/PlaceController.java +++ b/src/java/com/threerings/crowd/client/PlaceController.java @@ -154,14 +154,14 @@ public abstract class PlaceController extends Controller // keep a handle on our place object _plobj = plobj; - if (_view != null ) { + if (_view != null) { // let the UI hierarchy know that we've got our place PlaceViewUtil.dispatchWillEnterPlace(_view, plobj); // and display the user interface _ctx.setPlaceView(_view); } - // let our delegates know what's up + // let our delegates know what's up applyToDelegates(new DelegateOp(PlaceControllerDelegate.class) { @Override public void apply (PlaceControllerDelegate delegate) { @@ -183,7 +183,7 @@ public abstract class PlaceController extends Controller */ public void mayLeavePlace (final PlaceObject plobj) { - // let our delegates know what's up + // let our delegates know what's up applyToDelegates(new DelegateOp(PlaceControllerDelegate.class) { @Override public void apply (PlaceControllerDelegate delegate) { @@ -201,7 +201,7 @@ public abstract class PlaceController extends Controller */ public void didLeavePlace (final PlaceObject plobj) { - // let our delegates know what's up + // let our delegates know what's up applyToDelegates(new DelegateOp(PlaceControllerDelegate.class) { @Override public void apply (PlaceControllerDelegate delegate) { @@ -210,7 +210,7 @@ public abstract class PlaceController extends Controller }); // let the UI hierarchy know that we're outta here - if (_view != null ) { + if (_view != null) { PlaceViewUtil.dispatchDidLeavePlace(_view, plobj); _ctx.clearPlaceView(_view); _view = null; diff --git a/src/java/com/threerings/crowd/client/PlaceView.java b/src/java/com/threerings/crowd/client/PlaceView.java index 98e780ba2..38caa888e 100644 --- a/src/java/com/threerings/crowd/client/PlaceView.java +++ b/src/java/com/threerings/crowd/client/PlaceView.java @@ -64,7 +64,7 @@ public interface PlaceView * * @param plobj the place object that was just entered. */ - public void willEnterPlace (PlaceObject plobj); + void willEnterPlace (PlaceObject plobj); /** * Called after the client has left a place and needs to clean up @@ -72,5 +72,5 @@ public interface PlaceView * * @param plobj the place object that was just left. */ - public void didLeavePlace (PlaceObject plobj); + void didLeavePlace (PlaceObject plobj); } diff --git a/src/java/com/threerings/crowd/data/OccupantInfo.java b/src/java/com/threerings/crowd/data/OccupantInfo.java index f59c0291a..7a8938692 100644 --- a/src/java/com/threerings/crowd/data/OccupantInfo.java +++ b/src/java/com/threerings/crowd/data/OccupantInfo.java @@ -26,8 +26,6 @@ import com.threerings.util.Name; import com.threerings.presents.dobj.DSet; -import com.threerings.crowd.data.BodyObject; - /** * The occupant info object contains all of the information about an occupant of a place that * should be shared with other occupants of the place. These objects are stored in the place object diff --git a/src/java/com/threerings/crowd/peer/client/CrowdPeerService.java b/src/java/com/threerings/crowd/peer/client/CrowdPeerService.java index 1ecc3805b..97cfd2793 100644 --- a/src/java/com/threerings/crowd/peer/client/CrowdPeerService.java +++ b/src/java/com/threerings/crowd/peer/client/CrowdPeerService.java @@ -38,12 +38,11 @@ public interface CrowdPeerService extends InvocationService * Used to forward a tell request to the server on which the destination user actually * occupies. */ - public void deliverTell (Client client, UserMessage message, Name target, - ChatService.TellListener listener); + void deliverTell (Client client, UserMessage message, Name target, + ChatService.TellListener listener); /** * Dispatches a broadcast message on this peer. */ - public void deliverBroadcast ( - Client client, Name from, String bundle, String msg, boolean attention); + void deliverBroadcast (Client client, Name from, String bundle, String msg, boolean attention); } diff --git a/src/java/com/threerings/crowd/peer/server/CrowdPeerDispatcher.java b/src/java/com/threerings/crowd/peer/server/CrowdPeerDispatcher.java index 1286e1f82..f95d20efd 100644 --- a/src/java/com/threerings/crowd/peer/server/CrowdPeerDispatcher.java +++ b/src/java/com/threerings/crowd/peer/server/CrowdPeerDispatcher.java @@ -58,15 +58,13 @@ public class CrowdPeerDispatcher extends InvocationDispatcher switch (methodId) { case BodyMarshaller.SET_IDLE: ((BodyProvider)provider).setIdle( - source, - ((Boolean)args[0]).booleanValue() + source, ((Boolean)args[0]).booleanValue() ); return; diff --git a/src/java/com/threerings/crowd/server/BodyManager.java b/src/java/com/threerings/crowd/server/BodyManager.java index a47b2c54f..c5f8cee00 100644 --- a/src/java/com/threerings/crowd/server/BodyManager.java +++ b/src/java/com/threerings/crowd/server/BodyManager.java @@ -48,7 +48,7 @@ public class BodyManager * @return true if changes were made and thus the object should be published anew to the * place object, false if no publish should be done. */ - public boolean update (OccupantInfo oinfo); + boolean update (OccupantInfo oinfo); } /** diff --git a/src/java/com/threerings/crowd/server/BodyProvider.java b/src/java/com/threerings/crowd/server/BodyProvider.java index f3ed0a5a8..b1a12e0aa 100644 --- a/src/java/com/threerings/crowd/server/BodyProvider.java +++ b/src/java/com/threerings/crowd/server/BodyProvider.java @@ -21,6 +21,7 @@ package com.threerings.crowd.server; +import com.threerings.crowd.client.BodyService; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationProvider; diff --git a/src/java/com/threerings/crowd/server/LocationDispatcher.java b/src/java/com/threerings/crowd/server/LocationDispatcher.java index 6b1d75609..c42f977be 100644 --- a/src/java/com/threerings/crowd/server/LocationDispatcher.java +++ b/src/java/com/threerings/crowd/server/LocationDispatcher.java @@ -56,14 +56,13 @@ public class LocationDispatcher extends InvocationDispatcher switch (methodId) { case LocationMarshaller.LEAVE_PLACE: ((LocationProvider)provider).leavePlace( - source + source ); return; case LocationMarshaller.MOVE_TO: ((LocationProvider)provider).moveTo( - source, - ((Integer)args[0]).intValue(), (LocationService.MoveListener)args[1] + source, ((Integer)args[0]).intValue(), (LocationService.MoveListener)args[1] ); return; diff --git a/src/java/com/threerings/crowd/server/LocationSender.java b/src/java/com/threerings/crowd/server/LocationSender.java index 6ef8333c4..0f80d2ce0 100644 --- a/src/java/com/threerings/crowd/server/LocationSender.java +++ b/src/java/com/threerings/crowd/server/LocationSender.java @@ -22,7 +22,6 @@ package com.threerings.crowd.server; import com.threerings.crowd.client.LocationDecoder; -import com.threerings.crowd.client.LocationReceiver; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationSender; diff --git a/src/java/com/threerings/crowd/server/PlaceManager.java b/src/java/com/threerings/crowd/server/PlaceManager.java index da102f7a2..37859fa96 100644 --- a/src/java/com/threerings/crowd/server/PlaceManager.java +++ b/src/java/com/threerings/crowd/server/PlaceManager.java @@ -92,7 +92,7 @@ public class PlaceManager * @param event the message event received. * @param pmgr the place manager for which the message is being handled. */ - public void handleEvent (MessageEvent event, PlaceManager pmgr); + void handleEvent (MessageEvent event, PlaceManager pmgr); } /** @@ -667,7 +667,7 @@ public class PlaceManager _shutdownInterval = new Interval(_omgr) { @Override public void expired () { - log.debug("Unloading idle place '" + where () + "'."); + log.debug("Unloading idle place '" + where() + "'."); shutdown(); } }; @@ -735,7 +735,7 @@ public class PlaceManager protected PlaceConfig _config; /** Message handlers are used to process message events. */ - protected Map _msghandlers; + protected Map _msghandlers; /** A list of the delegates in use by this manager. */ protected List _delegates; diff --git a/src/java/com/threerings/crowd/server/PlaceRegistry.java b/src/java/com/threerings/crowd/server/PlaceRegistry.java index 0518e0d74..beccbaf41 100644 --- a/src/java/com/threerings/crowd/server/PlaceRegistry.java +++ b/src/java/com/threerings/crowd/server/PlaceRegistry.java @@ -53,7 +53,7 @@ public class PlaceRegistry /** Used in conjunction with {@link #createPlace}. */ public static interface PreStartupHook { - public void invoke (PlaceManager plmgr); + void invoke (PlaceManager plmgr); } /** @@ -87,7 +87,7 @@ public class PlaceRegistry /** * Creates and registers a new place manager with no delegates. * - * @see #createPlace(PlaceConfig,List) + * @see #createPlace(PlaceConfig,List) */ public PlaceManager createPlace (PlaceConfig config) throws InstantiationException, InvocationException diff --git a/src/java/com/threerings/presents/peer/server/PeerDispatcher.java b/src/java/com/threerings/presents/peer/server/PeerDispatcher.java index b7b762d5f..8e008f25e 100644 --- a/src/java/com/threerings/presents/peer/server/PeerDispatcher.java +++ b/src/java/com/threerings/presents/peer/server/PeerDispatcher.java @@ -56,15 +56,13 @@ public class PeerDispatcher extends InvocationDispatcher switch (methodId) { case PeerMarshaller.INVOKE_ACTION: ((PeerProvider)provider).invokeAction( - source, - (byte[])args[0] + source, (byte[])args[0] ); return; case PeerMarshaller.RATIFY_LOCK_ACTION: ((PeerProvider)provider).ratifyLockAction( - source, - (NodeObject.Lock)args[0], ((Boolean)args[1]).booleanValue() + source, (NodeObject.Lock)args[0], ((Boolean)args[1]).booleanValue() ); return; diff --git a/src/java/com/threerings/presents/peer/server/PeerProvider.java b/src/java/com/threerings/presents/peer/server/PeerProvider.java index a509f9345..a7744d598 100644 --- a/src/java/com/threerings/presents/peer/server/PeerProvider.java +++ b/src/java/com/threerings/presents/peer/server/PeerProvider.java @@ -22,6 +22,7 @@ package com.threerings.presents.peer.server; import com.threerings.presents.data.ClientObject; +import com.threerings.presents.peer.client.PeerService; import com.threerings.presents.peer.data.NodeObject; import com.threerings.presents.server.InvocationProvider; diff --git a/src/java/com/threerings/presents/server/TimeBaseDispatcher.java b/src/java/com/threerings/presents/server/TimeBaseDispatcher.java index aae12a382..89cb7d934 100644 --- a/src/java/com/threerings/presents/server/TimeBaseDispatcher.java +++ b/src/java/com/threerings/presents/server/TimeBaseDispatcher.java @@ -54,8 +54,7 @@ public class TimeBaseDispatcher extends InvocationDispatcher switch (methodId) { case TimeBaseMarshaller.GET_TIME_OID: ((TimeBaseProvider)provider).getTimeOid( - source, - (String)args[0], (TimeBaseService.GotTimeBaseListener)args[1] + source, (String)args[0], (TimeBaseService.GotTimeBaseListener)args[1] ); return;