From 6b1d65553fb0768ff2439f2b80a0425487ca102c Mon Sep 17 00:00:00 2001 From: Dave Hoover Date: Fri, 18 Jul 2008 23:20:17 +0000 Subject: [PATCH] And finally, narya gets the imports/overrides/regen love. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5241 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../admin/client/AsStringFieldEditor.java | 4 +- .../admin/client/BooleanFieldEditor.java | 4 +- .../admin/client/ConfigEditorPanel.java | 2 +- .../admin/client/ConfigObjectManager.java | 3 + .../threerings/admin/client/DSetEditor.java | 6 +- .../threerings/admin/client/FieldEditor.java | 3 +- .../admin/client/ObjectEditorPanel.java | 2 +- .../admin/client/PulldownFieldEditor.java | 10 +-- .../admin/server/DatabaseConfigRegistry.java | 21 +++++ .../admin/server/PrefsConfigRegistry.java | 20 +++++ .../admin/server/persist/ConfigDatum.java | 1 + .../bureau/server/BureauRegistry.java | 4 + .../crowd/chat/client/ChatDirector.java | 18 +++-- .../crowd/chat/data/ChatMessage.java | 4 +- .../crowd/client/LocationDirector.java | 8 +- .../crowd/client/OccupantDirector.java | 2 +- .../crowd/client/PlaceController.java | 6 ++ .../com/threerings/crowd/data/BodyObject.java | 2 +- .../threerings/crowd/data/OccupantInfo.java | 4 +- .../threerings/crowd/data/PlaceConfig.java | 2 +- .../threerings/crowd/server/CrowdClient.java | 6 +- .../threerings/crowd/server/CrowdServer.java | 3 +- .../threerings/crowd/server/PlaceManager.java | 11 +++ .../crowd/server/PlaceRegistry.java | 1 - .../com/threerings/io/BasicStreamers.java | 77 ++++++++++--------- src/java/com/threerings/io/ClassMapping.java | 1 + .../com/threerings/io/FieldMarshaller.java | 29 ++++++- .../com/threerings/io/FramedInputStream.java | 7 ++ .../com/threerings/io/ObjectInputStream.java | 4 +- .../threerings/io/SimpleStreamableObject.java | 4 +- src/java/com/threerings/io/Streamer.java | 4 +- .../io/TrackedStreamableObject.java | 4 +- .../presents/client/BlockingCommunicator.java | 18 +++++ .../threerings/presents/client/Client.java | 5 ++ .../presents/client/ClientCommunicator.java | 1 + .../presents/client/ClientDObjectMgr.java | 2 + .../presents/client/InvocationReceiver.java | 2 +- .../presents/data/InvocationMarshaller.java | 16 ++-- .../presents/dobj/AttributeChangedEvent.java | 8 +- .../presents/dobj/CompoundEvent.java | 10 +-- .../com/threerings/presents/dobj/DEvent.java | 4 +- .../com/threerings/presents/dobj/DSet.java | 5 +- .../presents/dobj/ElementUpdatedEvent.java | 8 +- .../presents/dobj/EntryAddedEvent.java | 8 +- .../presents/dobj/EntryRemovedEvent.java | 8 +- .../presents/dobj/EntryUpdatedEvent.java | 8 +- .../dobj/InvocationNotificationEvent.java | 8 +- .../presents/dobj/InvocationRequestEvent.java | 8 +- .../dobj/InvocationResponseEvent.java | 8 +- .../presents/dobj/MessageEvent.java | 8 +- .../threerings/presents/dobj/NamedEvent.java | 1 + .../presents/dobj/ObjectAddedEvent.java | 8 +- .../presents/dobj/ObjectDestroyedEvent.java | 6 +- .../presents/dobj/ObjectRemovedEvent.java | 8 +- .../com/threerings/presents/dobj/OidList.java | 1 + .../presents/dobj/ReleaseLockEvent.java | 4 +- .../threerings/presents/net/AuthRequest.java | 4 +- .../threerings/presents/net/AuthResponse.java | 1 + .../presents/net/BootstrapNotification.java | 1 + .../threerings/presents/net/Credentials.java | 8 +- .../presents/net/DownstreamMessage.java | 4 +- .../presents/net/EventNotification.java | 1 + .../presents/net/FailureResponse.java | 1 + .../presents/net/ForwardEventRequest.java | 1 + .../presents/net/LogoffRequest.java | 1 + .../presents/net/ObjectResponse.java | 1 + .../threerings/presents/net/PingRequest.java | 1 + .../threerings/presents/net/PongResponse.java | 1 + .../presents/net/SubscribeRequest.java | 1 + .../threerings/presents/net/Transport.java | 4 + .../presents/net/UnsubscribeRequest.java | 1 + .../presents/net/UnsubscribeResponse.java | 1 + .../presents/net/UpstreamMessage.java | 1 + .../presents/net/UsernamePasswordCreds.java | 8 +- .../peer/server/PeerAuthenticator.java | 1 - .../presents/peer/server/PeerClient.java | 2 + .../presents/peer/server/PeerManager.java | 7 ++ .../presents/peer/server/PeerNode.java | 2 + .../peer/server/persist/NodeRecord.java | 4 +- .../presents/server/Authenticator.java | 5 +- .../presents/server/ClientFactory.java | 1 - .../presents/server/ClientManager.java | 1 + .../presents/server/ClientResolver.java | 8 +- .../presents/server/DummyAuthenticator.java | 4 +- .../presents/server/InvocationManager.java | 2 - .../presents/server/LocalDObjectMgr.java | 6 +- .../presents/server/NativeSignalHandler.java | 1 + .../presents/server/PresentsClient.java | 4 +- .../presents/server/PresentsDObjectMgr.java | 5 +- .../presents/server/PresentsInvoker.java | 5 +- .../presents/server/RebootManager.java | 4 + .../threerings/presents/server/Rejector.java | 6 +- .../presents/server/ReportManager.java | 3 +- .../presents/server/SunSignalHandler.java | 3 +- .../presents/server/TimeBaseProvider.java | 4 - .../server/net/AuthingConnection.java | 4 +- .../presents/server/net/Connection.java | 1 - .../server/net/ConnectionManager.java | 13 ++-- .../server/net/RunningConnection.java | 1 + .../presents/tools/ActionScriptSource.java | 1 + .../tools/GenActionScriptBundlesTask.java | 5 +- .../presents/tools/GenActionScriptTask.java | 10 +-- .../presents/tools/GenDObjectTask.java | 19 +---- .../presents/tools/GenReceiverTask.java | 2 +- .../presents/tools/GenServiceTask.java | 2 + .../presents/tools/GenStreamableTask.java | 5 +- .../threerings/presents/tools/GenUtil.java | 2 - .../threerings/presents/tools/ImportSet.java | 6 +- .../tools/InstrumentStreamableTask.java | 4 +- .../presents/tools/InvocationTask.java | 4 +- .../presents/util/SafeSubscriber.java | 4 +- .../com/threerings/util/MessageBundle.java | 4 +- src/java/com/threerings/util/Name.java | 7 +- .../com/threerings/util/TrackedObject.java | 3 +- .../threerings/util/signal/SignalManager.java | 1 + .../threerings/bureau/client/TestClient.java | 4 + .../bureau/server/RegistryTester.java | 1 + .../threerings/crowd/client/JabberClient.java | 1 + .../crowd/client/JabberController.java | 1 + .../threerings/crowd/data/JabberConfig.java | 2 + .../threerings/crowd/server/JabberServer.java | 2 - .../src/java/com/threerings/io/FrameTest.java | 3 +- .../com/threerings/io/StreamableTest.java | 2 + .../presents/client/TestDecoder.java | 4 +- .../presents/data/TestMarshaller.java | 1 - .../threerings/presents/dobj/DSetTest.java | 2 + .../presents/server/TestDispatcher.java | 1 - .../presents/server/TestServer.java | 3 +- .../threerings/util/MessageBundleTest.java | 3 +- 129 files changed, 383 insertions(+), 304 deletions(-) diff --git a/src/java/com/threerings/admin/client/AsStringFieldEditor.java b/src/java/com/threerings/admin/client/AsStringFieldEditor.java index 7651654ee..b69bd9b25 100644 --- a/src/java/com/threerings/admin/client/AsStringFieldEditor.java +++ b/src/java/com/threerings/admin/client/AsStringFieldEditor.java @@ -49,7 +49,7 @@ public class AsStringFieldEditor extends FieldEditor _value.addFocusListener(this); } - // documentation inherited + @Override protected Object getDisplayValue () throws Exception { @@ -95,7 +95,7 @@ public class AsStringFieldEditor extends FieldEditor } } - // documentation inherited + @Override protected void displayValue (Object value) { _value.setText(StringUtil.toString(value, "", "")); diff --git a/src/java/com/threerings/admin/client/BooleanFieldEditor.java b/src/java/com/threerings/admin/client/BooleanFieldEditor.java index 9561d2c24..638a96927 100644 --- a/src/java/com/threerings/admin/client/BooleanFieldEditor.java +++ b/src/java/com/threerings/admin/client/BooleanFieldEditor.java @@ -59,14 +59,14 @@ public class BooleanFieldEditor extends FieldEditor _value.addFocusListener(this); } - // documentation inherited + @Override protected Object getDisplayValue () throws Exception { return Boolean.valueOf(_value.isSelected()); } - // documentation inherited + @Override protected void displayValue (Object value) { _value.setSelected(Boolean.TRUE.equals(value)); diff --git a/src/java/com/threerings/admin/client/ConfigEditorPanel.java b/src/java/com/threerings/admin/client/ConfigEditorPanel.java index 30013bfb1..e539ee743 100644 --- a/src/java/com/threerings/admin/client/ConfigEditorPanel.java +++ b/src/java/com/threerings/admin/client/ConfigEditorPanel.java @@ -75,7 +75,7 @@ public class ConfigEditorPanel extends JPanel service.getConfigInfo(_ctx.getClient(), this); } - // documentation inherited + @Override public void removeNotify () { super.removeNotify(); diff --git a/src/java/com/threerings/admin/client/ConfigObjectManager.java b/src/java/com/threerings/admin/client/ConfigObjectManager.java index d1368cb30..ad9eecd6f 100644 --- a/src/java/com/threerings/admin/client/ConfigObjectManager.java +++ b/src/java/com/threerings/admin/client/ConfigObjectManager.java @@ -44,14 +44,17 @@ public class ConfigObjectManager implements AdminService.ConfigInfoListener _serverconfig = new HashMap(); _client = client; _client.addClientObserver(new ClientAdapter() { + @Override public void clientWillLogon (Client client) { client.addServiceGroup(AdminCodes.ADMIN_GROUP); } + @Override public void clientDidLogon (Client client) { _dobjmgr = _client.getDObjectManager(); _service = client.requireService(AdminService.class); getConfigInfo(); } + @Override public void clientDidLogoff (Client client) { // Clean up our subscription to the server's configuration for (int ii = 0; ii < _csubscribers.length; ii++) { diff --git a/src/java/com/threerings/admin/client/DSetEditor.java b/src/java/com/threerings/admin/client/DSetEditor.java index e78da893e..8e099c78c 100644 --- a/src/java/com/threerings/admin/client/DSetEditor.java +++ b/src/java/com/threerings/admin/client/DSetEditor.java @@ -121,7 +121,7 @@ public class DSetEditor extends JPanel return (DSet.Entry)_table.getSelectedObject(); } - // documentation inherited + @Override public Dimension getPreferredSize () { Dimension d = super.getPreferredSize(); @@ -129,7 +129,7 @@ public class DSetEditor extends JPanel return d; } - // documentation inherited + @Override public void addNotify () { super.addNotify(); @@ -140,7 +140,7 @@ public class DSetEditor extends JPanel refreshData(); } - // documentation inherited + @Override public void removeNotify () { _setter.removeListener(this); diff --git a/src/java/com/threerings/admin/client/FieldEditor.java b/src/java/com/threerings/admin/client/FieldEditor.java index c6ce8d8f2..60299f752 100644 --- a/src/java/com/threerings/admin/client/FieldEditor.java +++ b/src/java/com/threerings/admin/client/FieldEditor.java @@ -65,7 +65,7 @@ public abstract class FieldEditor extends JPanel updateBorder(false); } - // documentation inherited + @Override public void addNotify () { super.addNotify(); @@ -75,6 +75,7 @@ public abstract class FieldEditor extends JPanel displayValue(getValue()); } + @Override public void removeNotify () { super.removeNotify(); diff --git a/src/java/com/threerings/admin/client/ObjectEditorPanel.java b/src/java/com/threerings/admin/client/ObjectEditorPanel.java index 979062d1e..49b7378cc 100644 --- a/src/java/com/threerings/admin/client/ObjectEditorPanel.java +++ b/src/java/com/threerings/admin/client/ObjectEditorPanel.java @@ -72,7 +72,7 @@ public class ObjectEditorPanel extends ScrollablePanel _safesub.subscribe(_ctx.getDObjectManager()); } - // documentation inherited from interface + @Override public boolean getScrollableTracksViewportWidth () { return true; diff --git a/src/java/com/threerings/admin/client/PulldownFieldEditor.java b/src/java/com/threerings/admin/client/PulldownFieldEditor.java index 17983fcdf..558b3e362 100644 --- a/src/java/com/threerings/admin/client/PulldownFieldEditor.java +++ b/src/java/com/threerings/admin/client/PulldownFieldEditor.java @@ -57,7 +57,7 @@ public class PulldownFieldEditor extends FieldEditor value = val; } - // documentation inherited + @Override public String toString () { return _name; @@ -95,21 +95,21 @@ public class PulldownFieldEditor extends FieldEditor addChoice(new Choice(name, choice)); } - // documentation inherited + @Override public void addNotify () { super.addNotify(); _value.addActionListener(this); } - // documentation inherited + @Override public void removeNotify () { _value.removeActionListener(this); super.removeNotify(); } - // documentation inherited + @Override protected Object getDisplayValue () throws Exception { @@ -120,7 +120,7 @@ public class PulldownFieldEditor extends FieldEditor return ((Choice)obj).value; } - // documentation inherited + @Override protected void displayValue (Object value) { for (int ii = _value.getItemCount() - 1; ii >= 0; ii--) { diff --git a/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java b/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java index d16467d14..112c1e9ba 100644 --- a/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java +++ b/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java @@ -140,6 +140,7 @@ public class DatabaseConfigRegistry extends ConfigRegistry super.init(); } + @Override protected boolean getValue (String field, boolean defval) { String value = _data.get(field); if (value != null) { @@ -148,6 +149,7 @@ public class DatabaseConfigRegistry extends ConfigRegistry return defval; } + @Override protected short getValue (String field, short defval) { String value = _data.get(field); try { @@ -160,6 +162,7 @@ public class DatabaseConfigRegistry extends ConfigRegistry return defval; } + @Override protected int getValue (String field, int defval) { String value = _data.get(field); try { @@ -172,6 +175,7 @@ public class DatabaseConfigRegistry extends ConfigRegistry return defval; } + @Override protected long getValue (String field, long defval) { String value = _data.get(field); try { @@ -184,6 +188,7 @@ public class DatabaseConfigRegistry extends ConfigRegistry return defval; } + @Override protected float getValue (String field, float defval) { String value = _data.get(field); try { @@ -196,11 +201,13 @@ public class DatabaseConfigRegistry extends ConfigRegistry return defval; } + @Override protected String getValue (String field, String defval) { String value = _data.get(field); return (value == null) ? defval : value; } + @Override protected int[] getValue (String field, int[] defval) { String value = _data.get(field); try { @@ -216,6 +223,7 @@ public class DatabaseConfigRegistry extends ConfigRegistry return defval; } + @Override protected float[] getValue (String field, float[] defval) { String value = _data.get(field); try { @@ -231,6 +239,7 @@ public class DatabaseConfigRegistry extends ConfigRegistry return defval; } + @Override protected long[] getValue (String field, long[] defval) { String value = _data.get(field); try { @@ -246,6 +255,7 @@ public class DatabaseConfigRegistry extends ConfigRegistry return defval; } + @Override protected String[] getValue (String field, String[] defval) { String value = _data.get(field); try { @@ -258,33 +268,43 @@ public class DatabaseConfigRegistry extends ConfigRegistry return defval; } + @Override protected void setValue (String field, boolean value) { setAndFlush(field, String.valueOf(value)); } + @Override protected void setValue (String field, short value) { setAndFlush(field, String.valueOf(value)); } + @Override protected void setValue (String field, int value) { setAndFlush(field, String.valueOf(value)); } + @Override protected void setValue (String field, long value) { setAndFlush(field, String.valueOf(value)); } + @Override protected void setValue (String field, float value) { setAndFlush(field, String.valueOf(value)); } + @Override protected void setValue (String field, String value) { setAndFlush(field, value); } + @Override protected void setValue (String field, int[] value) { setAndFlush(field, StringUtil.toString(value, "", "")); } + @Override protected void setValue (String field, float[] value) { setAndFlush(field, StringUtil.toString(value, "", "")); } + @Override protected void setValue (String field, long[] value) { setAndFlush(field, StringUtil.toString(value, "", "")); } + @Override protected void setValue (String field, String[] value) { setAndFlush(field, StringUtil.joinEscaped(value)); } @@ -293,6 +313,7 @@ public class DatabaseConfigRegistry extends ConfigRegistry _data.put(field, value); String iname = "updateConfig(" + _path + ", " + field + ", value=" + value + ")"; _invoker.postUnit(new WriteOnlyUnit(iname) { + @Override public void invokePersist () throws Exception { _repo.updateConfig(_node, _path, field, value); } diff --git a/src/java/com/threerings/admin/server/PrefsConfigRegistry.java b/src/java/com/threerings/admin/server/PrefsConfigRegistry.java index 8992bc107..9646ec32c 100644 --- a/src/java/com/threerings/admin/server/PrefsConfigRegistry.java +++ b/src/java/com/threerings/admin/server/PrefsConfigRegistry.java @@ -51,64 +51,84 @@ public class PrefsConfigRegistry extends ConfigRegistry this.config = new PrefsConfig(path); } + @Override protected boolean getValue (String field, boolean defval) { return config.getValue(field, defval); } + @Override protected short getValue (String field, short defval) { return (short)config.getValue(field, defval); } + @Override protected int getValue (String field, int defval) { return config.getValue(field, defval); } + @Override protected long getValue (String field, long defval) { return config.getValue(field, defval); } + @Override protected float getValue (String field, float defval) { return config.getValue(field, defval); } + @Override protected String getValue (String field, String defval) { return config.getValue(field, defval); } + @Override protected int[] getValue (String field, int[] defval) { return config.getValue(field, defval); } + @Override protected float[] getValue (String field, float[] defval) { return config.getValue(field, defval); } + @Override protected long[] getValue (String field, long[] defval) { return config.getValue(field, defval); } + @Override protected String[] getValue (String field, String[] defval) { return config.getValue(field, defval); } + @Override protected void setValue (String field, boolean value) { config.setValue(field, value); } + @Override protected void setValue (String field, short value) { config.setValue(field, value); } + @Override protected void setValue (String field, int value) { config.setValue(field, value); } + @Override protected void setValue (String field, long value) { config.setValue(field, value); } + @Override protected void setValue (String field, float value) { config.setValue(field, value); } + @Override protected void setValue (String field, String value) { config.setValue(field, value); } + @Override protected void setValue (String field, int[] value) { config.setValue(field, value); } + @Override protected void setValue (String field, float[] value) { config.setValue(field, value); } + @Override protected void setValue (String field, long[] value) { config.setValue(field, value); } + @Override protected void setValue (String field, String[] value) { config.setValue(field, value); } diff --git a/src/java/com/threerings/admin/server/persist/ConfigDatum.java b/src/java/com/threerings/admin/server/persist/ConfigDatum.java index 365328ad2..4fab99ab0 100644 --- a/src/java/com/threerings/admin/server/persist/ConfigDatum.java +++ b/src/java/com/threerings/admin/server/persist/ConfigDatum.java @@ -31,6 +31,7 @@ public class ConfigDatum public String field; public String value; + @Override public String toString () { return node + "." + object + "." + field + "=" + value + "]"; } diff --git a/src/java/com/threerings/bureau/server/BureauRegistry.java b/src/java/com/threerings/bureau/server/BureauRegistry.java index 7a0ff9b31..a9c97b228 100644 --- a/src/java/com/threerings/bureau/server/BureauRegistry.java +++ b/src/java/com/threerings/bureau/server/BureauRegistry.java @@ -197,6 +197,7 @@ public class BureauRegistry ProcessLogger.copyMergedOutput(log, bureauId, process); } + @Override public String toString () { return "DefaultLauncher for " + cmdGenerator; } @@ -586,6 +587,7 @@ public class BureauRegistry _bureau = bureau; } + @Override public boolean invoke () { try { @@ -597,6 +599,7 @@ public class BureauRegistry return true; } + @Override public void handleResult () { _bureau.launched = true; @@ -677,6 +680,7 @@ public class BureauRegistry // The states of the various agents allocated to this bureau Map agentStates = Maps.newHashMap(); + @Override public String toString () { StringBuilder builder = new StringBuilder(); diff --git a/src/java/com/threerings/crowd/chat/client/ChatDirector.java b/src/java/com/threerings/crowd/chat/client/ChatDirector.java index 45ee6d920..fce626519 100644 --- a/src/java/com/threerings/crowd/chat/client/ChatDirector.java +++ b/src/java/com/threerings/crowd/chat/client/ChatDirector.java @@ -653,7 +653,7 @@ public class ChatDirector extends BasicDirector } } - // documentation inherited + @Override public void clientDidLogon (Client client) { super.clientDidLogon(client); @@ -662,7 +662,7 @@ public class ChatDirector extends BasicDirector addAuxiliarySource(_clobj = client.getClientObject(), USER_CHAT_TYPE); } - // documentation inherited + @Override public void clientObjectDidChange (Client client) { super.clientObjectDidChange(client); @@ -674,7 +674,7 @@ public class ChatDirector extends BasicDirector clearDisplays(); } - // documentation inherited + @Override public void clientDidLogoff (Client client) { super.clientDidLogoff(client); @@ -1038,13 +1038,13 @@ public class ChatDirector extends BasicDirector return (type == null) ? PLACE_CHAT_TYPE : type; } - @Override // from BasicDirector + @Override protected void registerServices (Client client) { client.addServiceGroup(CrowdCodes.CROWD_GROUP); } - @Override // from BasicDirector + @Override protected void fetchServices (Client client) { // get a handle on our chat service @@ -1110,6 +1110,7 @@ public class ChatDirector extends BasicDirector /** Implements /help. */ protected class HelpHandler extends CommandHandler { + @Override public String handleCommand (SpeakService speakSvc, String command, String args, String[] history) { @@ -1161,6 +1162,7 @@ public class ChatDirector extends BasicDirector /** Implements /clear. */ protected class ClearHandler extends CommandHandler { + @Override public String handleCommand (SpeakService speakSvc, String command, String args, String[] history) { @@ -1172,6 +1174,7 @@ public class ChatDirector extends BasicDirector /** Implements /speak. */ protected class SpeakHandler extends CommandHandler { + @Override public String handleCommand (SpeakService speakSvc, String command, String args, String[] history) { @@ -1189,6 +1192,7 @@ public class ChatDirector extends BasicDirector /** Implements /emote. */ protected class EmoteHandler extends CommandHandler { + @Override public String handleCommand (SpeakService speakSvc, String command, String args, String[] history) { @@ -1204,6 +1208,7 @@ public class ChatDirector extends BasicDirector /** Implements /think. */ protected class ThinkHandler extends CommandHandler { + @Override public String handleCommand (SpeakService speakSvc, String command, String args, String[] history) { @@ -1219,6 +1224,7 @@ public class ChatDirector extends BasicDirector /** Implements /tell. */ protected class TellHandler extends CommandHandler { + @Override public String handleCommand (SpeakService speakSvc, final String command, String args, String[] history) { @@ -1339,6 +1345,7 @@ public class ChatDirector extends BasicDirector /** Implements /broadcast. */ protected class BroadcastHandler extends CommandHandler { + @Override public String handleCommand (SpeakService speakSvc, String command, String args, String[] history) { @@ -1362,6 +1369,7 @@ public class ChatDirector extends BasicDirector return ChatCodes.SUCCESS; } + @Override public boolean checkAccess (BodyObject user) { return user.checkAccess(ChatCodes.BROADCAST_ACCESS) == null; diff --git a/src/java/com/threerings/crowd/chat/data/ChatMessage.java b/src/java/com/threerings/crowd/chat/data/ChatMessage.java index 1e54d372c..18ade324d 100644 --- a/src/java/com/threerings/crowd/chat/data/ChatMessage.java +++ b/src/java/com/threerings/crowd/chat/data/ChatMessage.java @@ -82,9 +82,7 @@ public abstract class ChatMessage return null; } - /** - * Generates a string representation of this instance. - */ + @Override public String toString () { return StringUtil.shortClassName(this) + StringUtil.fieldsToString(this); diff --git a/src/java/com/threerings/crowd/client/LocationDirector.java b/src/java/com/threerings/crowd/client/LocationDirector.java index 4216a0ceb..e9ad29a71 100644 --- a/src/java/com/threerings/crowd/client/LocationDirector.java +++ b/src/java/com/threerings/crowd/client/LocationDirector.java @@ -393,7 +393,7 @@ public class LocationDirector extends BasicDirector } } - // documentation inherited from interface + @Override public void clientDidLogon (Client client) { super.clientDidLogon(client); @@ -412,7 +412,7 @@ public class LocationDirector extends BasicDirector client.getDObjectManager().subscribeToObject(cloid, sub); } - // documentation inherited from interface + @Override public void clientDidLogoff (Client client) { super.clientDidLogoff(client); @@ -432,13 +432,13 @@ public class LocationDirector extends BasicDirector _lservice = null; } - @Override // from BasicDirector + @Override protected void registerServices (Client client) { client.addServiceGroup(CrowdCodes.CROWD_GROUP); } - // documentation inherited + @Override protected void fetchServices (Client client) { // obtain our service handle diff --git a/src/java/com/threerings/crowd/client/OccupantDirector.java b/src/java/com/threerings/crowd/client/OccupantDirector.java index f91f6d23b..f0afb8979 100644 --- a/src/java/com/threerings/crowd/client/OccupantDirector.java +++ b/src/java/com/threerings/crowd/client/OccupantDirector.java @@ -107,7 +107,7 @@ public class OccupantDirector extends BasicDirector return (_place == null) ? null : _place.getOccupantInfo(username); } - // documentation inherited from interface + @Override public void clientDidLogoff (Client client) { // clear things out diff --git a/src/java/com/threerings/crowd/client/PlaceController.java b/src/java/com/threerings/crowd/client/PlaceController.java index ea1232765..29cf76ab1 100644 --- a/src/java/com/threerings/crowd/client/PlaceController.java +++ b/src/java/com/threerings/crowd/client/PlaceController.java @@ -80,6 +80,7 @@ public abstract class PlaceController extends Controller // initialize our delegates applyToDelegates(new DelegateOp(PlaceControllerDelegate.class) { + @Override public void apply (PlaceControllerDelegate delegate) { delegate.init(_ctx, _config); } @@ -162,6 +163,7 @@ public abstract class PlaceController extends Controller // let our delegates know what's up applyToDelegates(new DelegateOp(PlaceControllerDelegate.class) { + @Override public void apply (PlaceControllerDelegate delegate) { delegate.willEnterPlace(plobj); } @@ -183,6 +185,7 @@ public abstract class PlaceController extends Controller { // let our delegates know what's up applyToDelegates(new DelegateOp(PlaceControllerDelegate.class) { + @Override public void apply (PlaceControllerDelegate delegate) { delegate.mayLeavePlace(plobj); } @@ -200,6 +203,7 @@ public abstract class PlaceController extends Controller { // let our delegates know what's up applyToDelegates(new DelegateOp(PlaceControllerDelegate.class) { + @Override public void apply (PlaceControllerDelegate delegate) { delegate.didLeavePlace(plobj); } @@ -220,12 +224,14 @@ public abstract class PlaceController extends Controller * should be sure to call super.handleAction for events * they don't specifically handle. */ + @Override public boolean handleAction (final ActionEvent action) { final boolean[] handled = new boolean[1]; // let our delegates have a crack at the action applyToDelegates(new DelegateOp(PlaceControllerDelegate.class) { + @Override public void apply (PlaceControllerDelegate delegate) { // we take advantage of short-circuiting here handled[0] = handled[0] || delegate.handleAction(action); diff --git a/src/java/com/threerings/crowd/data/BodyObject.java b/src/java/com/threerings/crowd/data/BodyObject.java index 24f6f4d91..6e41f5a13 100644 --- a/src/java/com/threerings/crowd/data/BodyObject.java +++ b/src/java/com/threerings/crowd/data/BodyObject.java @@ -140,7 +140,7 @@ public class BodyObject extends ClientObject op.apply(getOid()); } - // documentation inherited + @Override public String who () { StringBuilder buf = new StringBuilder(username.toString()); diff --git a/src/java/com/threerings/crowd/data/OccupantInfo.java b/src/java/com/threerings/crowd/data/OccupantInfo.java index 54c383555..f59c0291a 100644 --- a/src/java/com/threerings/crowd/data/OccupantInfo.java +++ b/src/java/com/threerings/crowd/data/OccupantInfo.java @@ -92,9 +92,7 @@ public class OccupantInfo extends SimpleStreamableObject return bodyOid; } - /** - * Generates a cloned copy of this instance. - */ + @Override public Object clone () { try { diff --git a/src/java/com/threerings/crowd/data/PlaceConfig.java b/src/java/com/threerings/crowd/data/PlaceConfig.java index 505534c34..1f36c588c 100644 --- a/src/java/com/threerings/crowd/data/PlaceConfig.java +++ b/src/java/com/threerings/crowd/data/PlaceConfig.java @@ -89,7 +89,7 @@ public abstract class PlaceConfig extends SimpleStreamableObject */ public abstract String getManagerClassName (); - // documentation inherited + @Override @ActionScript(name="toStringBuilder") protected void toString (StringBuilder buf) { diff --git a/src/java/com/threerings/crowd/server/CrowdClient.java b/src/java/com/threerings/crowd/server/CrowdClient.java index bd8760fba..9a84a8352 100644 --- a/src/java/com/threerings/crowd/server/CrowdClient.java +++ b/src/java/com/threerings/crowd/server/CrowdClient.java @@ -34,7 +34,7 @@ import com.threerings.crowd.data.OccupantInfo; */ public class CrowdClient extends PresentsClient { - // documentation inherited + @Override protected void sessionConnectionClosed () { super.sessionConnectionClosed(); @@ -46,7 +46,7 @@ public class CrowdClient extends PresentsClient } } - // documentation inherited + @Override protected void sessionWillResume () { super.sessionWillResume(); @@ -56,7 +56,7 @@ public class CrowdClient extends PresentsClient _bodyman.updateOccupantStatus(bobj, bobj.location, OccupantInfo.ACTIVE); } - // documentation inherited + @Override protected void sessionDidEnd () { super.sessionDidEnd(); diff --git a/src/java/com/threerings/crowd/server/CrowdServer.java b/src/java/com/threerings/crowd/server/CrowdServer.java index bd04e24bc..c9e874585 100644 --- a/src/java/com/threerings/crowd/server/CrowdServer.java +++ b/src/java/com/threerings/crowd/server/CrowdServer.java @@ -25,7 +25,6 @@ import com.google.inject.Guice; import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Singleton; - import com.threerings.util.Name; import com.threerings.presents.net.AuthRequest; @@ -33,7 +32,6 @@ import com.threerings.presents.server.ClientFactory; import com.threerings.presents.server.ClientResolver; import com.threerings.presents.server.PresentsClient; import com.threerings.presents.server.PresentsServer; - import com.threerings.crowd.chat.server.ChatProvider; import static com.threerings.crowd.Log.log; @@ -56,6 +54,7 @@ public class CrowdServer extends PresentsServer /** * Initializes all of the server services and prepares for operation. */ + @Override public void init (Injector injector) throws Exception { diff --git a/src/java/com/threerings/crowd/server/PlaceManager.java b/src/java/com/threerings/crowd/server/PlaceManager.java index 44730a5ea..da102f7a2 100644 --- a/src/java/com/threerings/crowd/server/PlaceManager.java +++ b/src/java/com/threerings/crowd/server/PlaceManager.java @@ -193,6 +193,7 @@ public class PlaceManager // initialize our delegates applyToDelegates(new DelegateOp(PlaceManagerDelegate.class) { + @Override public void apply (PlaceManagerDelegate delegate) { delegate.init(PlaceManager.this, _omgr, _invmgr); } @@ -442,6 +443,7 @@ public class PlaceManager * * @see #toString(StringBuilder) */ + @Override public String toString () { StringBuilder buf = new StringBuilder(); @@ -483,6 +485,7 @@ public class PlaceManager { // initialize our delegates applyToDelegates(new DelegateOp(PlaceManagerDelegate.class) { + @Override public void apply (PlaceManagerDelegate delegate) { delegate.didInit(_config); } @@ -524,6 +527,7 @@ public class PlaceManager { // let our delegates know that we've started up applyToDelegates(new DelegateOp(PlaceManagerDelegate.class) { + @Override public void apply (PlaceManagerDelegate delegate) { delegate.didStartup(_plobj); } @@ -543,6 +547,7 @@ public class PlaceManager // let our delegates know that we've shut down applyToDelegates(new DelegateOp(PlaceManagerDelegate.class) { + @Override public void apply (PlaceManagerDelegate delegate) { delegate.didShutdown(); } @@ -568,6 +573,7 @@ public class PlaceManager // let our delegates know what's up applyToDelegates(new DelegateOp(PlaceManagerDelegate.class) { + @Override public void apply (PlaceManagerDelegate delegate) { delegate.bodyEntered(bodyOid); } @@ -596,6 +602,7 @@ public class PlaceManager // let our delegates know what's up applyToDelegates(new DelegateOp(PlaceManagerDelegate.class) { + @Override public void apply (PlaceManagerDelegate delegate) { delegate.bodyLeft(bodyOid); } @@ -622,6 +629,7 @@ public class PlaceManager { // let our delegates know what's up applyToDelegates(new DelegateOp(PlaceManagerDelegate.class) { + @Override public void apply (PlaceManagerDelegate delegate) { delegate.bodyUpdated(info); } @@ -637,6 +645,7 @@ public class PlaceManager { // let our delegates know what's up applyToDelegates(new DelegateOp(PlaceManagerDelegate.class) { + @Override public void apply (PlaceManagerDelegate delegate) { delegate.placeBecameEmpty(); } @@ -656,6 +665,7 @@ public class PlaceManager long idlePeriod = idleUnloadPeriod(); if (idlePeriod > 0L && _shutdownInterval == null) { _shutdownInterval = new Interval(_omgr) { + @Override public void expired () { log.debug("Unloading idle place '" + where () + "'."); shutdown(); @@ -698,6 +708,7 @@ public class PlaceManager /** Listens for occupant updates. */ protected SetAdapter _bodyUpdater = new SetAdapter() { + @Override public void entryUpdated (EntryUpdatedEvent event) { if (event.getName().equals(PlaceObject.OCCUPANT_INFO)) { bodyUpdated((OccupantInfo)event.getEntry()); diff --git a/src/java/com/threerings/crowd/server/PlaceRegistry.java b/src/java/com/threerings/crowd/server/PlaceRegistry.java index 7bbde7b89..0518e0d74 100644 --- a/src/java/com/threerings/crowd/server/PlaceRegistry.java +++ b/src/java/com/threerings/crowd/server/PlaceRegistry.java @@ -36,7 +36,6 @@ import com.threerings.presents.server.InvocationException; import com.threerings.presents.server.InvocationManager; import com.threerings.presents.server.ShutdownManager; -import com.threerings.crowd.data.Place; import com.threerings.crowd.data.PlaceConfig; import com.threerings.crowd.data.PlaceObject; diff --git a/src/java/com/threerings/io/BasicStreamers.java b/src/java/com/threerings/io/BasicStreamers.java index a0ce0ab58..1851ebada 100644 --- a/src/java/com/threerings/io/BasicStreamers.java +++ b/src/java/com/threerings/io/BasicStreamers.java @@ -85,14 +85,14 @@ public class BasicStreamers /** Streams {@link Boolean} instances. */ public static class BooleanStreamer extends BasicStreamer { - // documentation inherited + @Override public Object createObject (ObjectInputStream in) throws IOException { return Boolean.valueOf(in.readBoolean()); } - // documentation inherited + @Override public void writeObject (Object object, ObjectOutputStream out, boolean useWriter) throws IOException { @@ -103,14 +103,14 @@ public class BasicStreamers /** Streams {@link Byte} instances. */ public static class ByteStreamer extends BasicStreamer { - // documentation inherited + @Override public Object createObject (ObjectInputStream in) throws IOException { return Byte.valueOf(in.readByte()); } - // documentation inherited + @Override public void writeObject (Object object, ObjectOutputStream out, boolean useWriter) throws IOException { @@ -121,14 +121,14 @@ public class BasicStreamers /** Streams {@link Short} instances. */ public static class ShortStreamer extends BasicStreamer { - // documentation inherited + @Override public Object createObject (ObjectInputStream in) throws IOException { return Short.valueOf(in.readShort()); } - // documentation inherited + @Override public void writeObject (Object object, ObjectOutputStream out, boolean useWriter) throws IOException { @@ -139,13 +139,13 @@ public class BasicStreamers /** Streams {@link Character} instances. */ public static class CharacterStreamer extends BasicStreamer { - // documentation inherited + @Override public Object createObject (ObjectInputStream in)throws IOException { return Character.valueOf(in.readChar()); } - // documentation inherited + @Override public void writeObject (Object object, ObjectOutputStream out, boolean useWriter) throws IOException { @@ -156,14 +156,14 @@ public class BasicStreamers /** Streams {@link Integer} instances. */ public static class IntegerStreamer extends BasicStreamer { - // documentation inherited + @Override public Object createObject (ObjectInputStream in) throws IOException { return Integer.valueOf(in.readInt()); } - // documentation inherited + @Override public void writeObject (Object object, ObjectOutputStream out, boolean useWriter) throws IOException { @@ -174,14 +174,14 @@ public class BasicStreamers /** Streams {@link Long} instances. */ public static class LongStreamer extends BasicStreamer { - // documentation inherited + @Override public Object createObject (ObjectInputStream in) throws IOException { return Long.valueOf(in.readLong()); } - // documentation inherited + @Override public void writeObject (Object object, ObjectOutputStream out, boolean useWriter) throws IOException { @@ -192,14 +192,14 @@ public class BasicStreamers /** Streams {@link Float} instances. */ public static class FloatStreamer extends BasicStreamer { - // documentation inherited + @Override public Object createObject (ObjectInputStream in) throws IOException { return Float.valueOf(in.readFloat()); } - // documentation inherited + @Override public void writeObject (Object object, ObjectOutputStream out, boolean useWriter) throws IOException { @@ -210,14 +210,14 @@ public class BasicStreamers /** Streams {@link Double} instances. */ public static class DoubleStreamer extends BasicStreamer { - // documentation inherited + @Override public Object createObject (ObjectInputStream in) throws IOException { return Double.valueOf(in.readDouble()); } - // documentation inherited + @Override public void writeObject (Object object, ObjectOutputStream out, boolean useWriter) throws IOException { @@ -228,14 +228,14 @@ public class BasicStreamers /** Streams {@link String} instances. */ public static class StringStreamer extends BasicStreamer { - // documentation inherited + @Override public Object createObject (ObjectInputStream in) throws IOException { return in.readUTF(); } - // documentation inherited + @Override public void writeObject (Object object, ObjectOutputStream out, boolean useWriter) throws IOException { @@ -246,14 +246,14 @@ public class BasicStreamers /** Streams arrays of booleans. */ public static class BooleanArrayStreamer extends BasicStreamer { - // documentation inherited + @Override public Object createObject (ObjectInputStream in) throws IOException { return readBooleanArray(in); } - // documentation inherited + @Override public void writeObject (Object object, ObjectOutputStream out, boolean useWriter) throws IOException { @@ -264,14 +264,14 @@ public class BasicStreamers /** Streams arrays of bytes. */ public static class ByteArrayStreamer extends BasicStreamer { - // documentation inherited + @Override public Object createObject (ObjectInputStream in) throws IOException { return readByteArray(in); } - // documentation inherited + @Override public void writeObject (Object object, ObjectOutputStream out, boolean useWriter) throws IOException { @@ -282,14 +282,14 @@ public class BasicStreamers /** Streams arrays of shorts. */ public static class ShortArrayStreamer extends BasicStreamer { - // documentation inherited + @Override public Object createObject (ObjectInputStream in) throws IOException { return readShortArray(in); } - // documentation inherited + @Override public void writeObject (Object object, ObjectOutputStream out, boolean useWriter) throws IOException { @@ -300,14 +300,14 @@ public class BasicStreamers /** Streams arrays of chars. */ public static class CharArrayStreamer extends BasicStreamer { - // documentation inherited + @Override public Object createObject (ObjectInputStream in) throws IOException { return readCharArray(in); } - // documentation inherited + @Override public void writeObject (Object object, ObjectOutputStream out, boolean useWriter) throws IOException { @@ -318,14 +318,14 @@ public class BasicStreamers /** Streams arrays of ints. */ public static class IntArrayStreamer extends BasicStreamer { - // documentation inherited + @Override public Object createObject (ObjectInputStream in) throws IOException { return readIntArray(in); } - // documentation inherited + @Override public void writeObject (Object object, ObjectOutputStream out, boolean useWriter) throws IOException { @@ -336,14 +336,14 @@ public class BasicStreamers /** Streams arrays of longs. */ public static class LongArrayStreamer extends BasicStreamer { - // documentation inherited + @Override public Object createObject (ObjectInputStream in) throws IOException { return readLongArray(in); } - // documentation inherited + @Override public void writeObject (Object object, ObjectOutputStream out, boolean useWriter) throws IOException { @@ -354,14 +354,14 @@ public class BasicStreamers /** Streams arrays of floats. */ public static class FloatArrayStreamer extends BasicStreamer { - // documentation inherited + @Override public Object createObject (ObjectInputStream in) throws IOException { return readFloatArray(in); } - // documentation inherited + @Override public void writeObject (Object object, ObjectOutputStream out, boolean useWriter) throws IOException { @@ -372,14 +372,14 @@ public class BasicStreamers /** Streams arrays of doubles. */ public static class DoubleArrayStreamer extends BasicStreamer { - // documentation inherited + @Override public Object createObject (ObjectInputStream in) throws IOException { return readDoubleArray(in); } - // documentation inherited + @Override public void writeObject (Object object, ObjectOutputStream out, boolean useWriter) throws IOException { @@ -390,14 +390,14 @@ public class BasicStreamers /** Streams arrays of Object instances. */ public static class ObjectArrayStreamer extends BasicStreamer { - // documentation inherited + @Override public Object createObject (ObjectInputStream in) throws IOException, ClassNotFoundException { return readObjectArray(in); } - // documentation inherited + @Override public void writeObject (Object object, ObjectOutputStream out, boolean useWriter) throws IOException { @@ -408,14 +408,14 @@ public class BasicStreamers /** Streams {@link List} instances. */ public static class ListStreamer extends BasicStreamer { - // documentation inherited + @Override public Object createObject (ObjectInputStream in) throws IOException, ClassNotFoundException { return readList(in); } - // documentation inherited + @Override public void writeObject (Object object, ObjectOutputStream out, boolean useWriter) throws IOException { @@ -426,6 +426,7 @@ public class BasicStreamers /** Streams {@link String} instances. */ public static class BasicStreamer extends Streamer { + @Override public void readObject (Object object, ObjectInputStream in, boolean useReader) throws IOException, ClassNotFoundException { diff --git a/src/java/com/threerings/io/ClassMapping.java b/src/java/com/threerings/io/ClassMapping.java index 15887f781..b3a17f882 100644 --- a/src/java/com/threerings/io/ClassMapping.java +++ b/src/java/com/threerings/io/ClassMapping.java @@ -38,6 +38,7 @@ class ClassMapping this.streamer = streamer; } + @Override public String toString () { return "[code=" + code + ", class=" + sclass.getName() + "]"; diff --git a/src/java/com/threerings/io/FieldMarshaller.java b/src/java/com/threerings/io/FieldMarshaller.java index 52ea2e27f..92e2b4df2 100644 --- a/src/java/com/threerings/io/FieldMarshaller.java +++ b/src/java/com/threerings/io/FieldMarshaller.java @@ -141,7 +141,7 @@ public abstract class FieldMarshaller _streamer = streamer; } - // documentation inherited + @Override public void readField (Field field, Object target, ObjectInputStream in) throws Exception { @@ -154,7 +154,7 @@ public abstract class FieldMarshaller } } - // documentation inherited + @Override public void writeField (Field field, Object source, ObjectOutputStream out) throws Exception { @@ -167,6 +167,7 @@ public abstract class FieldMarshaller } } + @Override public String toString () { return "StreamerMarshaller:" + _streamer.toString(); @@ -187,14 +188,14 @@ public abstract class FieldMarshaller _writer = writer; } - // documentation inherited + @Override public void readField (Field field, Object target, ObjectInputStream in) throws Exception { _reader.invoke(target, in); } - // documentation inherited + @Override public void writeField (Field field, Object source, ObjectOutputStream out) throws Exception { @@ -215,10 +216,12 @@ public abstract class FieldMarshaller // create a generic marshaller for streamable instances FieldMarshaller gmarsh = new FieldMarshaller() { + @Override public void readField (Field field, Object target, ObjectInputStream in) throws Exception { field.set(target, in.readObject()); } + @Override public void writeField (Field field, Object source, ObjectOutputStream out) throws Exception { out.writeObject(field.get(source)); @@ -234,90 +237,108 @@ public abstract class FieldMarshaller // create marshallers for the primitive types _marshallers.put(Boolean.TYPE, new FieldMarshaller() { + @Override public void readField (Field field, Object target, ObjectInputStream in) throws Exception { field.setBoolean(target, in.readBoolean()); } + @Override public void writeField (Field field, Object source, ObjectOutputStream out) throws Exception { out.writeBoolean(field.getBoolean(source)); } }); _marshallers.put(Byte.TYPE, new FieldMarshaller() { + @Override public void readField (Field field, Object target, ObjectInputStream in) throws Exception { field.setByte(target, in.readByte()); } + @Override public void writeField (Field field, Object source, ObjectOutputStream out) throws Exception { out.writeByte(field.getByte(source)); } }); _marshallers.put(Character.TYPE, new FieldMarshaller() { + @Override public void readField (Field field, Object target, ObjectInputStream in) throws Exception { field.setChar(target, in.readChar()); } + @Override public void writeField (Field field, Object source, ObjectOutputStream out) throws Exception { out.writeChar(field.getChar(source)); } }); _marshallers.put(Short.TYPE, new FieldMarshaller() { + @Override public void readField (Field field, Object target, ObjectInputStream in) throws Exception { field.setShort(target, in.readShort()); } + @Override public void writeField (Field field, Object source, ObjectOutputStream out) throws Exception { out.writeShort(field.getShort(source)); } }); _marshallers.put(Integer.TYPE, new FieldMarshaller() { + @Override public void readField (Field field, Object target, ObjectInputStream in) throws Exception { field.setInt(target, in.readInt()); } + @Override public void writeField (Field field, Object source, ObjectOutputStream out) throws Exception { out.writeInt(field.getInt(source)); } }); _marshallers.put(Long.TYPE, new FieldMarshaller() { + @Override public void readField (Field field, Object target, ObjectInputStream in) throws Exception { field.setLong(target, in.readLong()); } + @Override public void writeField (Field field, Object source, ObjectOutputStream out) throws Exception { out.writeLong(field.getLong(source)); } }); _marshallers.put(Float.TYPE, new FieldMarshaller() { + @Override public void readField (Field field, Object target, ObjectInputStream in) throws Exception { field.setFloat(target, in.readFloat()); } + @Override public void writeField (Field field, Object source, ObjectOutputStream out) throws Exception { out.writeFloat(field.getFloat(source)); } }); _marshallers.put(Double.TYPE, new FieldMarshaller() { + @Override public void readField (Field field, Object target, ObjectInputStream in) throws Exception { field.setDouble(target, in.readDouble()); } + @Override public void writeField (Field field, Object source, ObjectOutputStream out) throws Exception { out.writeDouble(field.getDouble(source)); } }); _marshallers.put(Date.class, new FieldMarshaller() { + @Override public void readField (Field field, Object target, ObjectInputStream in) throws Exception { field.set(target, new Date(in.readLong())); } + @Override public void writeField (Field field, Object source, ObjectOutputStream out) throws Exception { out.writeLong(((Date)field.get(source)).getTime()); diff --git a/src/java/com/threerings/io/FramedInputStream.java b/src/java/com/threerings/io/FramedInputStream.java index 378584762..4f496ec26 100644 --- a/src/java/com/threerings/io/FramedInputStream.java +++ b/src/java/com/threerings/io/FramedInputStream.java @@ -193,6 +193,7 @@ public class FramedInputStream extends InputStream * @return the next byte of data, or -1 if the end of the * stream has been reached. */ + @Override public int read () { return (_buffer.remaining() > 0) ? (_buffer.get() & 0xFF) : -1; @@ -221,6 +222,7 @@ public class FramedInputStream extends InputStream * -1 if there is no more data because the end of the * stream has been reached. */ + @Override public int read (byte[] b, int off, int len) { // if they want no bytes, we give them no bytes; this is @@ -252,6 +254,7 @@ public class FramedInputStream extends InputStream * * @return the actual number of bytes skipped. */ + @Override public long skip (long n) { throw new UnsupportedOperationException(); @@ -264,6 +267,7 @@ public class FramedInputStream extends InputStream * @return the number of bytes remaining to be read from the buffered * frame. */ + @Override public int available () { return _buffer.remaining(); @@ -273,6 +277,7 @@ public class FramedInputStream extends InputStream * Always returns false as framed input streams do not support * marking. */ + @Override public boolean markSupported () { return false; @@ -281,6 +286,7 @@ public class FramedInputStream extends InputStream /** * Does nothing, as marking is not supported. */ + @Override public void mark (int readAheadLimit) { // not supported; do nothing @@ -289,6 +295,7 @@ public class FramedInputStream extends InputStream /** * Resets the buffer to the beginning of the buffered frames. */ + @Override public void reset () { // position our buffer at the beginning of the frame data diff --git a/src/java/com/threerings/io/ObjectInputStream.java b/src/java/com/threerings/io/ObjectInputStream.java index 9ef076987..bab3b9fd0 100644 --- a/src/java/com/threerings/io/ObjectInputStream.java +++ b/src/java/com/threerings/io/ObjectInputStream.java @@ -230,9 +230,7 @@ public class ObjectInputStream extends DataInputStream _streamer.readObject(_current, this, false); } - /** - * Generates a string representation of this instance. - */ + @Override public String toString () { return "[hash=" + hashCode() + ", mappings=" + _classmap.size() + diff --git a/src/java/com/threerings/io/SimpleStreamableObject.java b/src/java/com/threerings/io/SimpleStreamableObject.java index d193a2b67..6db1dfb00 100644 --- a/src/java/com/threerings/io/SimpleStreamableObject.java +++ b/src/java/com/threerings/io/SimpleStreamableObject.java @@ -31,9 +31,7 @@ import com.threerings.util.ActionScript; */ public class SimpleStreamableObject implements Streamable { - /** - * Generates a string representation of this instance. - */ + @Override public String toString () { StringBuilder buf = new StringBuilder("["); diff --git a/src/java/com/threerings/io/Streamer.java b/src/java/com/threerings/io/Streamer.java index 403bd7fa5..a87997a58 100644 --- a/src/java/com/threerings/io/Streamer.java +++ b/src/java/com/threerings/io/Streamer.java @@ -391,9 +391,7 @@ public class Streamer } } - /** - * Generates a string representation of this instance. - */ + @Override public String toString () { return (_target == null) ? getClass().getName() : diff --git a/src/java/com/threerings/io/TrackedStreamableObject.java b/src/java/com/threerings/io/TrackedStreamableObject.java index b3f6a6816..cfc509e79 100644 --- a/src/java/com/threerings/io/TrackedStreamableObject.java +++ b/src/java/com/threerings/io/TrackedStreamableObject.java @@ -33,9 +33,7 @@ import com.threerings.util.TrackedObject; public class TrackedStreamableObject extends TrackedObject implements Streamable { - /** - * Generates a string representation of this instance. - */ + @Override public String toString () { StringBuilder buf = new StringBuilder("["); diff --git a/src/java/com/threerings/presents/client/BlockingCommunicator.java b/src/java/com/threerings/presents/client/BlockingCommunicator.java index d420b3f36..8699c0973 100644 --- a/src/java/com/threerings/presents/client/BlockingCommunicator.java +++ b/src/java/com/threerings/presents/client/BlockingCommunicator.java @@ -540,6 +540,7 @@ public class BlockingCommunicator extends Communicator super("BlockingCommunicator_Reader"); } + @Override protected void willStart () { // first we connect and authenticate with the server @@ -609,6 +610,7 @@ public class BlockingCommunicator extends Communicator // now that we're authenticated, we manage the reading half of things by continuously // reading messages from the socket and processing them + @Override protected void iterate () { DownstreamMessage msg = null; @@ -642,17 +644,20 @@ public class BlockingCommunicator extends Communicator } } + @Override protected void handleIterateFailure (Exception e) { log.warning("Uncaught exception it reader thread.", e); } + @Override protected void didShutdown () { // let the communicator know when we finally go away readerDidExit(); } + @Override protected void kick () { // we want to interrupt the reader thread as it may be blocked listening to the socket; @@ -677,6 +682,7 @@ public class BlockingCommunicator extends Communicator super("BlockingCommunicator_Writer"); } + @Override protected void iterate () { // fetch the next message from the queue @@ -700,16 +706,19 @@ public class BlockingCommunicator extends Communicator } } + @Override protected void handleIterateFailure (Exception e) { log.warning("Uncaught exception it writer thread.", e); } + @Override protected void didShutdown () { writerDidExit(); } + @Override protected void kick () { // post a bogus message to the outgoing queue to ensure that the writer thread notices @@ -728,6 +737,7 @@ public class BlockingCommunicator extends Communicator super("BlockingCommunicator_DatagramReader"); } + @Override protected void willStart () { try { @@ -823,6 +833,7 @@ public class BlockingCommunicator extends Communicator return false; } + @Override protected void iterate () { DownstreamMessage msg = null; @@ -849,16 +860,19 @@ public class BlockingCommunicator extends Communicator } } + @Override protected void handleIterateFailure (Exception e) { log.warning("Uncaught exception in datagram reader thread.", e); } + @Override protected void didShutdown () { datagramReaderDidExit(); } + @Override protected void kick () { // if we have a selector, wake it up @@ -878,6 +892,7 @@ public class BlockingCommunicator extends Communicator super("BlockingCommunicator_DatagramWriter"); } + @Override protected void iterate () { // fetch the next message from the queue @@ -898,16 +913,19 @@ public class BlockingCommunicator extends Communicator } } + @Override protected void handleIterateFailure (Exception e) { log.warning("Uncaught exception in datagram writer thread.", e); } + @Override protected void didShutdown () { datagramWriterDidExit(); } + @Override protected void kick () { // post a bogus message to the outgoing queue to ensure that the writer thread notices diff --git a/src/java/com/threerings/presents/client/Client.java b/src/java/com/threerings/presents/client/Client.java index cedf717ea..74a70c72e 100644 --- a/src/java/com/threerings/presents/client/Client.java +++ b/src/java/com/threerings/presents/client/Client.java @@ -425,9 +425,11 @@ public class Client // appropriate if (_tickInterval == null) { _tickInterval = new Interval(_runQueue) { + @Override public void expired () { tick(); } + @Override public String toString () { return "Client.tickInterval"; } @@ -897,6 +899,7 @@ public class Client } } + @Override public void clientDidClear (Client client) { // configure the client to point to the new server and logon @@ -910,6 +913,7 @@ public class Client } } + @Override public void clientDidLogon (Client client) { removeClientObserver(this); @@ -918,6 +922,7 @@ public class Client } } + @Override public void clientFailedToLogon (Client client, Exception cause) { removeClientObserver(this); diff --git a/src/java/com/threerings/presents/client/ClientCommunicator.java b/src/java/com/threerings/presents/client/ClientCommunicator.java index 1f9389f5e..b5a161238 100644 --- a/src/java/com/threerings/presents/client/ClientCommunicator.java +++ b/src/java/com/threerings/presents/client/ClientCommunicator.java @@ -144,6 +144,7 @@ public class ClientCommunicator extends BlockingCommunicator _nextPort = nextPort; } + @Override public void expired () { if (clearPPI(false)) { setPrefPort(_key, _thisPort); diff --git a/src/java/com/threerings/presents/client/ClientDObjectMgr.java b/src/java/com/threerings/presents/client/ClientDObjectMgr.java index 352f4d575..835ceac64 100644 --- a/src/java/com/threerings/presents/client/ClientDObjectMgr.java +++ b/src/java/com/threerings/presents/client/ClientDObjectMgr.java @@ -66,6 +66,7 @@ public class ClientDObjectMgr // register a flush interval new Interval(client.getRunQueue()) { + @Override public void expired () { flushObjects(); } @@ -440,6 +441,7 @@ public class ClientDObjectMgr this.subscribe = subscribe; } + @Override public String toString () { return StringUtil.fieldsToString(this); diff --git a/src/java/com/threerings/presents/client/InvocationReceiver.java b/src/java/com/threerings/presents/client/InvocationReceiver.java index 6f6e2a27e..f44eb13e9 100644 --- a/src/java/com/threerings/presents/client/InvocationReceiver.java +++ b/src/java/com/threerings/presents/client/InvocationReceiver.java @@ -79,7 +79,7 @@ public interface InvocationReceiver return receiverCode; } - /** Generates a string representation of this instance. */ + @Override public String toString () { return "[" + receiverCode + " => " + receiverId + "]"; diff --git a/src/java/com/threerings/presents/data/InvocationMarshaller.java b/src/java/com/threerings/presents/data/InvocationMarshaller.java index a50ea51e2..986f03a4b 100644 --- a/src/java/com/threerings/presents/data/InvocationMarshaller.java +++ b/src/java/com/threerings/presents/data/InvocationMarshaller.java @@ -26,8 +26,6 @@ import com.samskivert.util.StringUtil; import com.threerings.io.Streamable; import com.threerings.presents.client.Client; -import com.threerings.presents.client.InvocationService.ConfirmListener; -import com.threerings.presents.client.InvocationService.ResultListener; import com.threerings.presents.client.InvocationService; import com.threerings.presents.dobj.DObjectManager; @@ -116,16 +114,14 @@ public class InvocationMarshaller } } - /** - * Generates a string representation of this instance. - */ + @Override public String toString () { return "[callerOid=" + callerOid + ", reqId=" + requestId + ", type=" + getClass().getName() + "]"; } - // documentation inherited + @Override protected void finalize () throws Throwable { @@ -156,7 +152,7 @@ public class InvocationMarshaller callerOid, requestId, REQUEST_PROCESSED, null, transport)); } - // documentation inherited + @Override public void dispatchResponse (int methodId, Object[] args) { switch (methodId) { @@ -187,7 +183,7 @@ public class InvocationMarshaller callerOid, requestId, REQUEST_PROCESSED, new Object[] { result }, transport)); } - // documentation inherited + @Override public void dispatchResponse (int methodId, Object[] args) { switch (methodId) { @@ -240,9 +236,7 @@ public class InvocationMarshaller } } - /** - * Generates a string representation of this instance. - */ + @Override public String toString () { return "[invOid=" + _invOid + ", code=" + _invCode + ", type=" + getClass().getName() + "]"; diff --git a/src/java/com/threerings/presents/dobj/AttributeChangedEvent.java b/src/java/com/threerings/presents/dobj/AttributeChangedEvent.java index 2475c1f68..5012a7a65 100644 --- a/src/java/com/threerings/presents/dobj/AttributeChangedEvent.java +++ b/src/java/com/threerings/presents/dobj/AttributeChangedEvent.java @@ -114,7 +114,7 @@ public class AttributeChangedEvent extends NamedEvent return ((Double)_value).doubleValue(); } - @Override // from DEvent + @Override public boolean alreadyApplied () { // if we have an old value, that means we're running on the master server and we have @@ -122,7 +122,7 @@ public class AttributeChangedEvent extends NamedEvent return (_oldValue != UNSET_OLD_VALUE); } - @Override // from DEvent + @Override public boolean applyToObject (DObject target) throws ObjectAccessException { @@ -184,7 +184,7 @@ public class AttributeChangedEvent extends NamedEvent _oldValue = oldValue; } - // documentation inherited + @Override protected void notifyListener (Object listener) { if (listener instanceof AttributeChangeListener) { @@ -192,7 +192,7 @@ public class AttributeChangedEvent extends NamedEvent } } - // documentation inherited + @Override protected void toString (StringBuilder buf) { buf.append("CHANGE:"); diff --git a/src/java/com/threerings/presents/dobj/CompoundEvent.java b/src/java/com/threerings/presents/dobj/CompoundEvent.java index b6125279c..b3b1560e1 100644 --- a/src/java/com/threerings/presents/dobj/CompoundEvent.java +++ b/src/java/com/threerings/presents/dobj/CompoundEvent.java @@ -122,7 +122,7 @@ public class CompoundEvent extends DEvent _events.clear(); } - @Override // from DEvent + @Override public void setSourceOid (int sourceOid) { super.setSourceOid(sourceOid); @@ -134,7 +134,7 @@ public class CompoundEvent extends DEvent } } - @Override // from DEvent + @Override public void setTargetOid (int targetOid) { super.setTargetOid(targetOid); @@ -146,7 +146,7 @@ public class CompoundEvent extends DEvent } } - @Override // from DEvent + @Override public void setTransport (Transport transport) { super.setTransport(transport); @@ -155,7 +155,7 @@ public class CompoundEvent extends DEvent } } - @Override // from DEvent + @Override public boolean applyToObject (DObject target) throws ObjectAccessException { @@ -174,7 +174,7 @@ public class CompoundEvent extends DEvent } } - // documentation inherited + @Override protected void toString (StringBuilder buf) { buf.append("COMPOUND:"); diff --git a/src/java/com/threerings/presents/dobj/DEvent.java b/src/java/com/threerings/presents/dobj/DEvent.java index 55e661d67..5cb47ff81 100644 --- a/src/java/com/threerings/presents/dobj/DEvent.java +++ b/src/java/com/threerings/presents/dobj/DEvent.java @@ -162,9 +162,7 @@ public abstract class DEvent implements Streamable // the default is to do nothing } - /** - * Constructs and returns a string representation of this event. - */ + @Override public String toString () { StringBuilder buf = new StringBuilder(); diff --git a/src/java/com/threerings/presents/dobj/DSet.java b/src/java/com/threerings/presents/dobj/DSet.java index 90e1618c6..df87582cc 100644 --- a/src/java/com/threerings/presents/dobj/DSet.java +++ b/src/java/com/threerings/presents/dobj/DSet.java @@ -409,14 +409,13 @@ public class DSet /** * Generates a shallow copy of this object. */ + @Override public Object clone () { return typedClone(); } - /** - * Generates a string representation of this set instance. - */ + @Override public String toString () { StringBuilder buf = new StringBuilder("("); diff --git a/src/java/com/threerings/presents/dobj/ElementUpdatedEvent.java b/src/java/com/threerings/presents/dobj/ElementUpdatedEvent.java index 71a29d74e..a4ce5302d 100644 --- a/src/java/com/threerings/presents/dobj/ElementUpdatedEvent.java +++ b/src/java/com/threerings/presents/dobj/ElementUpdatedEvent.java @@ -153,13 +153,13 @@ public class ElementUpdatedEvent extends NamedEvent return ((Double)_value).doubleValue(); } - @Override // from DEvent + @Override public boolean alreadyApplied () { return (_oldValue != UNSET_OLD_VALUE); } - @Override // from DEvent + @Override public boolean applyToObject (DObject target) throws ObjectAccessException { @@ -191,7 +191,7 @@ public class ElementUpdatedEvent extends NamedEvent return true; } - // documentation inherited + @Override protected void notifyListener (Object listener) { if (listener instanceof ElementUpdateListener) { @@ -199,7 +199,7 @@ public class ElementUpdatedEvent extends NamedEvent } } - // documentation inherited + @Override protected void toString (StringBuilder buf) { buf.append("UPDATE:"); diff --git a/src/java/com/threerings/presents/dobj/EntryAddedEvent.java b/src/java/com/threerings/presents/dobj/EntryAddedEvent.java index f7dd2e846..2f152388b 100644 --- a/src/java/com/threerings/presents/dobj/EntryAddedEvent.java +++ b/src/java/com/threerings/presents/dobj/EntryAddedEvent.java @@ -71,13 +71,13 @@ public class EntryAddedEvent extends NamedEvent return _entry; } - @Override // from DEvent + @Override public boolean alreadyApplied () { return _alreadyApplied; } - @Override // from DEvent + @Override public boolean applyToObject (DObject target) throws ObjectAccessException { @@ -89,7 +89,7 @@ public class EntryAddedEvent extends NamedEvent return true; } - // documentation inherited + @Override protected void notifyListener (Object listener) { if (listener instanceof SetListener) { @@ -98,7 +98,7 @@ public class EntryAddedEvent extends NamedEvent } } - // documentation inherited + @Override protected void toString (StringBuilder buf) { buf.append("ELADD:"); diff --git a/src/java/com/threerings/presents/dobj/EntryRemovedEvent.java b/src/java/com/threerings/presents/dobj/EntryRemovedEvent.java index 0aa608e0e..ccc240bc9 100644 --- a/src/java/com/threerings/presents/dobj/EntryRemovedEvent.java +++ b/src/java/com/threerings/presents/dobj/EntryRemovedEvent.java @@ -72,13 +72,13 @@ public class EntryRemovedEvent extends NamedEvent return _oldEntry; } - @Override // from DEvent + @Override public boolean alreadyApplied () { return (_oldEntry != UNSET_OLD_ENTRY); } - @Override // from DEvent + @Override public boolean applyToObject (DObject target) throws ObjectAccessException { @@ -95,7 +95,7 @@ public class EntryRemovedEvent extends NamedEvent return true; } - // documentation inherited + @Override protected void notifyListener (Object listener) { if (listener instanceof SetListener) { @@ -104,7 +104,7 @@ public class EntryRemovedEvent extends NamedEvent } } - // documentation inherited + @Override protected void toString (StringBuilder buf) { buf.append("ELREM:"); diff --git a/src/java/com/threerings/presents/dobj/EntryUpdatedEvent.java b/src/java/com/threerings/presents/dobj/EntryUpdatedEvent.java index 3b0916052..22d545c11 100644 --- a/src/java/com/threerings/presents/dobj/EntryUpdatedEvent.java +++ b/src/java/com/threerings/presents/dobj/EntryUpdatedEvent.java @@ -90,13 +90,13 @@ public class EntryUpdatedEvent extends NamedEvent return _oldEntry; } - @Override // from DEvent + @Override public boolean alreadyApplied () { return (_oldEntry != UNSET_OLD_ENTRY); } - @Override // from DEvent + @Override public boolean applyToObject (DObject target) throws ObjectAccessException { @@ -114,7 +114,7 @@ public class EntryUpdatedEvent extends NamedEvent return true; } - // documentation inherited + @Override protected void notifyListener (Object listener) { if (listener instanceof SetListener) { @@ -123,7 +123,7 @@ public class EntryUpdatedEvent extends NamedEvent } } - // documentation inherited + @Override protected void toString (StringBuilder buf) { buf.append("ELUPD:"); diff --git a/src/java/com/threerings/presents/dobj/InvocationNotificationEvent.java b/src/java/com/threerings/presents/dobj/InvocationNotificationEvent.java index 8003c30b5..9c2b6746c 100644 --- a/src/java/com/threerings/presents/dobj/InvocationNotificationEvent.java +++ b/src/java/com/threerings/presents/dobj/InvocationNotificationEvent.java @@ -107,9 +107,7 @@ public class InvocationNotificationEvent extends DEvent return _args; } - /** - * Applies this attribute change to the object. - */ + @Override public boolean applyToObject (DObject target) throws ObjectAccessException { @@ -117,13 +115,13 @@ public class InvocationNotificationEvent extends DEvent return true; } - // documentation inherited + @Override protected void notifyListener (Object listener) { // nothing to do here } - // documentation inherited + @Override protected void toString (StringBuilder buf) { buf.append("INOT:"); diff --git a/src/java/com/threerings/presents/dobj/InvocationRequestEvent.java b/src/java/com/threerings/presents/dobj/InvocationRequestEvent.java index 73f7ec522..abe6bb415 100644 --- a/src/java/com/threerings/presents/dobj/InvocationRequestEvent.java +++ b/src/java/com/threerings/presents/dobj/InvocationRequestEvent.java @@ -102,9 +102,7 @@ public class InvocationRequestEvent extends DEvent return _args; } - /** - * Applies this attribute change to the object. - */ + @Override public boolean applyToObject (DObject target) throws ObjectAccessException { @@ -112,13 +110,13 @@ public class InvocationRequestEvent extends DEvent return true; } - // documentation inherited + @Override protected void notifyListener (Object listener) { // nothing to do here } - // documentation inherited + @Override protected void toString (StringBuilder buf) { buf.append("IREQ:"); diff --git a/src/java/com/threerings/presents/dobj/InvocationResponseEvent.java b/src/java/com/threerings/presents/dobj/InvocationResponseEvent.java index ee2d7bf43..9e5ca329c 100644 --- a/src/java/com/threerings/presents/dobj/InvocationResponseEvent.java +++ b/src/java/com/threerings/presents/dobj/InvocationResponseEvent.java @@ -102,9 +102,7 @@ public class InvocationResponseEvent extends DEvent return _args; } - /** - * Applies this attribute change to the object. - */ + @Override public boolean applyToObject (DObject target) throws ObjectAccessException { @@ -112,13 +110,13 @@ public class InvocationResponseEvent extends DEvent return true; } - // documentation inherited + @Override protected void notifyListener (Object listener) { // nothing to do here } - // documentation inherited + @Override protected void toString (StringBuilder buf) { buf.append("IRSP:"); diff --git a/src/java/com/threerings/presents/dobj/MessageEvent.java b/src/java/com/threerings/presents/dobj/MessageEvent.java index 0f14804ec..f5c837d95 100644 --- a/src/java/com/threerings/presents/dobj/MessageEvent.java +++ b/src/java/com/threerings/presents/dobj/MessageEvent.java @@ -94,9 +94,7 @@ public class MessageEvent extends NamedEvent _args = args; } - /** - * Applies this attribute change to the object. - */ + @Override public boolean applyToObject (DObject target) throws ObjectAccessException { @@ -104,7 +102,7 @@ public class MessageEvent extends NamedEvent return true; } - // documentation inherited + @Override protected void notifyListener (Object listener) { if (listener instanceof MessageListener) { @@ -112,7 +110,7 @@ public class MessageEvent extends NamedEvent } } - // documentation inherited + @Override protected void toString (StringBuilder buf) { buf.append("MSG:"); diff --git a/src/java/com/threerings/presents/dobj/NamedEvent.java b/src/java/com/threerings/presents/dobj/NamedEvent.java index e96a00f4b..ae823dfda 100644 --- a/src/java/com/threerings/presents/dobj/NamedEvent.java +++ b/src/java/com/threerings/presents/dobj/NamedEvent.java @@ -71,6 +71,7 @@ public abstract class NamedEvent extends DEvent return _name; } + @Override protected void toString (StringBuilder buf) { super.toString(buf); diff --git a/src/java/com/threerings/presents/dobj/ObjectAddedEvent.java b/src/java/com/threerings/presents/dobj/ObjectAddedEvent.java index dcb5da4ed..ff9541abe 100644 --- a/src/java/com/threerings/presents/dobj/ObjectAddedEvent.java +++ b/src/java/com/threerings/presents/dobj/ObjectAddedEvent.java @@ -63,9 +63,7 @@ public class ObjectAddedEvent extends NamedEvent return _oid; } - /** - * Applies this event to the object. - */ + @Override public boolean applyToObject (DObject target) throws ObjectAccessException { @@ -74,7 +72,7 @@ public class ObjectAddedEvent extends NamedEvent return true; } - // documentation inherited + @Override protected void notifyListener (Object listener) { if (listener instanceof OidListListener) { @@ -82,7 +80,7 @@ public class ObjectAddedEvent extends NamedEvent } } - // documentation inherited + @Override protected void toString (StringBuilder buf) { buf.append("OBJADD:"); diff --git a/src/java/com/threerings/presents/dobj/ObjectDestroyedEvent.java b/src/java/com/threerings/presents/dobj/ObjectDestroyedEvent.java index 5ea9c9cdc..e785c3e15 100644 --- a/src/java/com/threerings/presents/dobj/ObjectDestroyedEvent.java +++ b/src/java/com/threerings/presents/dobj/ObjectDestroyedEvent.java @@ -49,7 +49,7 @@ public class ObjectDestroyedEvent extends DEvent { } - // documentation inherited + @Override public boolean applyToObject (DObject target) throws ObjectAccessException { @@ -58,7 +58,7 @@ public class ObjectDestroyedEvent extends DEvent return true; } - // documentation inherited + @Override protected void notifyListener (Object listener) { if (listener instanceof ObjectDeathListener) { @@ -66,7 +66,7 @@ public class ObjectDestroyedEvent extends DEvent } } - // documentation inherited + @Override protected void toString (StringBuilder buf) { buf.append("DESTROY:"); diff --git a/src/java/com/threerings/presents/dobj/ObjectRemovedEvent.java b/src/java/com/threerings/presents/dobj/ObjectRemovedEvent.java index 1aeac6a4a..8116257bc 100644 --- a/src/java/com/threerings/presents/dobj/ObjectRemovedEvent.java +++ b/src/java/com/threerings/presents/dobj/ObjectRemovedEvent.java @@ -64,9 +64,7 @@ public class ObjectRemovedEvent extends NamedEvent return _oid; } - /** - * Applies this event to the object. - */ + @Override public boolean applyToObject (DObject target) throws ObjectAccessException { @@ -75,7 +73,7 @@ public class ObjectRemovedEvent extends NamedEvent return true; } - // documentation inherited + @Override protected void notifyListener (Object listener) { if (listener instanceof OidListListener) { @@ -83,7 +81,7 @@ public class ObjectRemovedEvent extends NamedEvent } } - // documentation inherited + @Override protected void toString (StringBuilder buf) { buf.append("OBJREM:"); diff --git a/src/java/com/threerings/presents/dobj/OidList.java b/src/java/com/threerings/presents/dobj/OidList.java index 84d0cfd64..33c2181eb 100644 --- a/src/java/com/threerings/presents/dobj/OidList.java +++ b/src/java/com/threerings/presents/dobj/OidList.java @@ -133,6 +133,7 @@ public class OidList implements Streamable return _oids[index]; } + @Override public String toString () { StringBuilder buf = new StringBuilder(); diff --git a/src/java/com/threerings/presents/dobj/ReleaseLockEvent.java b/src/java/com/threerings/presents/dobj/ReleaseLockEvent.java index 6bd9d87c4..0b0f32bd3 100644 --- a/src/java/com/threerings/presents/dobj/ReleaseLockEvent.java +++ b/src/java/com/threerings/presents/dobj/ReleaseLockEvent.java @@ -54,7 +54,7 @@ public class ReleaseLockEvent extends NamedEvent { } - // documentation inherited + @Override public boolean isPrivate () { // we need only run on the server; no need to propagate to proxies @@ -64,6 +64,7 @@ public class ReleaseLockEvent extends NamedEvent /** * Applies this lock release to the object. */ + @Override public boolean applyToObject (DObject target) throws ObjectAccessException { @@ -73,6 +74,7 @@ public class ReleaseLockEvent extends NamedEvent return false; } + @Override protected void toString (StringBuilder buf) { buf.append("UNLOCK:"); diff --git a/src/java/com/threerings/presents/net/AuthRequest.java b/src/java/com/threerings/presents/net/AuthRequest.java index f174668cd..a7126e037 100644 --- a/src/java/com/threerings/presents/net/AuthRequest.java +++ b/src/java/com/threerings/presents/net/AuthRequest.java @@ -82,9 +82,7 @@ public class AuthRequest extends UpstreamMessage return _bootGroups; } - /** - * Generates a string representation of this instance. - */ + @Override public String toString () { return "[type=AREQ, msgid=" + messageId + ", creds=" + _creds + diff --git a/src/java/com/threerings/presents/net/AuthResponse.java b/src/java/com/threerings/presents/net/AuthResponse.java index d0062fc17..3dc8269fc 100644 --- a/src/java/com/threerings/presents/net/AuthResponse.java +++ b/src/java/com/threerings/presents/net/AuthResponse.java @@ -66,6 +66,7 @@ public class AuthResponse extends DownstreamMessage _data = data; } + @Override public String toString () { return "[type=ARSP, msgid=" + messageId + ", data=" + _data + "]"; diff --git a/src/java/com/threerings/presents/net/BootstrapNotification.java b/src/java/com/threerings/presents/net/BootstrapNotification.java index eab8e5403..dca4df8d1 100644 --- a/src/java/com/threerings/presents/net/BootstrapNotification.java +++ b/src/java/com/threerings/presents/net/BootstrapNotification.java @@ -52,6 +52,7 @@ public class BootstrapNotification extends DownstreamMessage return _data; } + @Override public String toString () { return "[type=BOOT, msgid=" + messageId + ", data=" + _data + "]"; diff --git a/src/java/com/threerings/presents/net/Credentials.java b/src/java/com/threerings/presents/net/Credentials.java index ffd9095cb..846ef868b 100644 --- a/src/java/com/threerings/presents/net/Credentials.java +++ b/src/java/com/threerings/presents/net/Credentials.java @@ -71,13 +71,13 @@ public abstract class Credentials implements Streamable return ""; } - // documentation inherited + @Override public int hashCode () { return _username.hashCode(); } - // documentation inherited + @Override public boolean equals (Object other) { if (other instanceof Credentials) { @@ -87,9 +87,7 @@ public abstract class Credentials implements Streamable } } - /** - * Generates a string representation of this instance. - */ + @Override public String toString () { StringBuilder buf = new StringBuilder("["); diff --git a/src/java/com/threerings/presents/net/DownstreamMessage.java b/src/java/com/threerings/presents/net/DownstreamMessage.java index 2eb337f42..6928e8390 100644 --- a/src/java/com/threerings/presents/net/DownstreamMessage.java +++ b/src/java/com/threerings/presents/net/DownstreamMessage.java @@ -35,9 +35,7 @@ public abstract class DownstreamMessage extends Message */ public short messageId = -1; - /** - * Generates a string representation of this instance. - */ + @Override public String toString () { return "[msgid=" + messageId + "]"; diff --git a/src/java/com/threerings/presents/net/EventNotification.java b/src/java/com/threerings/presents/net/EventNotification.java index 1123fbc21..de8db7638 100644 --- a/src/java/com/threerings/presents/net/EventNotification.java +++ b/src/java/com/threerings/presents/net/EventNotification.java @@ -59,6 +59,7 @@ public class EventNotification extends DownstreamMessage return _event.getTransport(); } + @Override public String toString () { return "[type=EVT, evt=" + _event + "]"; diff --git a/src/java/com/threerings/presents/net/FailureResponse.java b/src/java/com/threerings/presents/net/FailureResponse.java index e5021b07b..ce366e3ca 100644 --- a/src/java/com/threerings/presents/net/FailureResponse.java +++ b/src/java/com/threerings/presents/net/FailureResponse.java @@ -50,6 +50,7 @@ public class FailureResponse extends DownstreamMessage return _message; } + @Override public String toString () { return "[type=FAIL, msgid=" + messageId + ", oid=" + _oid + ", msg=" + _message + "]"; diff --git a/src/java/com/threerings/presents/net/ForwardEventRequest.java b/src/java/com/threerings/presents/net/ForwardEventRequest.java index 1f554765b..c64a0b528 100644 --- a/src/java/com/threerings/presents/net/ForwardEventRequest.java +++ b/src/java/com/threerings/presents/net/ForwardEventRequest.java @@ -62,6 +62,7 @@ public class ForwardEventRequest extends UpstreamMessage return _event.getTransport(); } + @Override public String toString () { return "[type=FWD, evt=" + _event + "]"; diff --git a/src/java/com/threerings/presents/net/LogoffRequest.java b/src/java/com/threerings/presents/net/LogoffRequest.java index 68f48fb3c..572e2f944 100644 --- a/src/java/com/threerings/presents/net/LogoffRequest.java +++ b/src/java/com/threerings/presents/net/LogoffRequest.java @@ -31,6 +31,7 @@ public class LogoffRequest extends UpstreamMessage super(); } + @Override public String toString () { return "[type=LOGOFF, msgid=" + messageId + "]"; diff --git a/src/java/com/threerings/presents/net/ObjectResponse.java b/src/java/com/threerings/presents/net/ObjectResponse.java index 5a96d8b31..2356b8eef 100644 --- a/src/java/com/threerings/presents/net/ObjectResponse.java +++ b/src/java/com/threerings/presents/net/ObjectResponse.java @@ -47,6 +47,7 @@ public class ObjectResponse return _dobj; } + @Override public String toString () { return "[type=ORSP, msgid=" + messageId + ", obj=" + _dobj + "]"; diff --git a/src/java/com/threerings/presents/net/PingRequest.java b/src/java/com/threerings/presents/net/PingRequest.java index 151f9b510..06d76143a 100644 --- a/src/java/com/threerings/presents/net/PingRequest.java +++ b/src/java/com/threerings/presents/net/PingRequest.java @@ -105,6 +105,7 @@ public class PingRequest extends UpstreamMessage return _transport; } + @Override public String toString () { return "[type=PING, msgid=" + messageId + ", transport=" + _transport + "]"; diff --git a/src/java/com/threerings/presents/net/PongResponse.java b/src/java/com/threerings/presents/net/PongResponse.java index 865bd4f57..21306ea91 100644 --- a/src/java/com/threerings/presents/net/PongResponse.java +++ b/src/java/com/threerings/presents/net/PongResponse.java @@ -125,6 +125,7 @@ public class PongResponse extends DownstreamMessage return _transport; } + @Override public String toString () { return "[type=PONG, msgid=" + messageId + ", transport=" + _transport + "]"; diff --git a/src/java/com/threerings/presents/net/SubscribeRequest.java b/src/java/com/threerings/presents/net/SubscribeRequest.java index 892b5ff6a..832ec544f 100644 --- a/src/java/com/threerings/presents/net/SubscribeRequest.java +++ b/src/java/com/threerings/presents/net/SubscribeRequest.java @@ -48,6 +48,7 @@ public class SubscribeRequest extends UpstreamMessage return _oid; } + @Override public String toString () { return "[type=SUB, msgid=" + messageId + ", oid=" + _oid + "]"; diff --git a/src/java/com/threerings/presents/net/Transport.java b/src/java/com/threerings/presents/net/Transport.java index c5dcbf33e..af5d17825 100644 --- a/src/java/com/threerings/presents/net/Transport.java +++ b/src/java/com/threerings/presents/net/Transport.java @@ -40,6 +40,7 @@ public class Transport * and without duplicates. Functionally identical to UDP. */ UNRELIABLE_UNORDERED(false, false) { + @Override public Type combine (Type other) { return other; // we defer to all } @@ -50,6 +51,7 @@ public class Transport * order and without duplicates. In other words, out-of-order packets will be dropped. */ UNRELIABLE_ORDERED(false, true) { + @Override public Type combine (Type other) { return other.isReliable() ? RELIABLE_ORDERED : this; } @@ -60,6 +62,7 @@ public class Transport * order. */ RELIABLE_UNORDERED(true, false) { + @Override public Type combine (Type other) { return other.isOrdered() ? RELIABLE_ORDERED : this; } @@ -70,6 +73,7 @@ public class Transport * Functionally identical to TCP. */ RELIABLE_ORDERED(true, true) { + @Override public Type combine (Type other) { return this; // we override all } diff --git a/src/java/com/threerings/presents/net/UnsubscribeRequest.java b/src/java/com/threerings/presents/net/UnsubscribeRequest.java index 6e7450a2e..173bf67f8 100644 --- a/src/java/com/threerings/presents/net/UnsubscribeRequest.java +++ b/src/java/com/threerings/presents/net/UnsubscribeRequest.java @@ -48,6 +48,7 @@ public class UnsubscribeRequest extends UpstreamMessage return _oid; } + @Override public String toString () { return "[type=UNSUB, msgid=" + messageId + ", oid=" + _oid + "]"; diff --git a/src/java/com/threerings/presents/net/UnsubscribeResponse.java b/src/java/com/threerings/presents/net/UnsubscribeResponse.java index a40e760ba..6f3d24423 100644 --- a/src/java/com/threerings/presents/net/UnsubscribeResponse.java +++ b/src/java/com/threerings/presents/net/UnsubscribeResponse.java @@ -49,6 +49,7 @@ public class UnsubscribeResponse extends DownstreamMessage return _oid; } + @Override public String toString () { return "[type=UNACK, msgid=" + messageId + ", oid=" + _oid + "]"; diff --git a/src/java/com/threerings/presents/net/UpstreamMessage.java b/src/java/com/threerings/presents/net/UpstreamMessage.java index f561ec727..2e609fb0d 100644 --- a/src/java/com/threerings/presents/net/UpstreamMessage.java +++ b/src/java/com/threerings/presents/net/UpstreamMessage.java @@ -52,6 +52,7 @@ public abstract class UpstreamMessage extends Message this.messageId = nextMessageId(); } + @Override public String toString () { return "[msgid=" + messageId + "]"; diff --git a/src/java/com/threerings/presents/net/UsernamePasswordCreds.java b/src/java/com/threerings/presents/net/UsernamePasswordCreds.java index fb620c9a7..107b8801c 100644 --- a/src/java/com/threerings/presents/net/UsernamePasswordCreds.java +++ b/src/java/com/threerings/presents/net/UsernamePasswordCreds.java @@ -47,19 +47,19 @@ public class UsernamePasswordCreds extends Credentials return _password; } - @Override // documentation inherited + @Override public String getDatagramSecret () { return _password; } - // documentation inherited + @Override public int hashCode () { return super.hashCode() ^ _password.hashCode(); } - // documentation inherited + @Override public boolean equals (Object other) { if (other instanceof UsernamePasswordCreds) { @@ -71,7 +71,7 @@ public class UsernamePasswordCreds extends Credentials } } - // documentation inherited + @Override protected void toString (StringBuilder buf) { super.toString(buf); diff --git a/src/java/com/threerings/presents/peer/server/PeerAuthenticator.java b/src/java/com/threerings/presents/peer/server/PeerAuthenticator.java index 4100cbdbf..2d54a6833 100644 --- a/src/java/com/threerings/presents/peer/server/PeerAuthenticator.java +++ b/src/java/com/threerings/presents/peer/server/PeerAuthenticator.java @@ -28,7 +28,6 @@ import com.threerings.presents.data.AuthCodes; import com.threerings.presents.net.AuthRequest; import com.threerings.presents.net.AuthResponse; import com.threerings.presents.net.AuthResponseData; -import com.threerings.presents.server.Authenticator; import com.threerings.presents.server.ChainedAuthenticator; import com.threerings.presents.server.net.AuthingConnection; diff --git a/src/java/com/threerings/presents/peer/server/PeerClient.java b/src/java/com/threerings/presents/peer/server/PeerClient.java index f3d70c043..2d120584b 100644 --- a/src/java/com/threerings/presents/peer/server/PeerClient.java +++ b/src/java/com/threerings/presents/peer/server/PeerClient.java @@ -52,6 +52,7 @@ public class PeerClient extends PresentsClient * bootstrap data classes that contain extra bootstrap information, if * desired. */ + @Override protected BootstrapData createBootstrapData () { return new PeerBootstrapData(); @@ -67,6 +68,7 @@ public class PeerClient extends PresentsClient * thread which means that object manipulations are OK, but client * instance manipulations must be done carefully. */ + @Override protected void populateBootstrapData (BootstrapData data) { super.populateBootstrapData(data); diff --git a/src/java/com/threerings/presents/peer/server/PeerManager.java b/src/java/com/threerings/presents/peer/server/PeerManager.java index 3862b4bd1..4e7be2ff1 100644 --- a/src/java/com/threerings/presents/peer/server/PeerManager.java +++ b/src/java/com/threerings/presents/peer/server/PeerManager.java @@ -220,6 +220,7 @@ public abstract class PeerManager _self = new NodeRecord( _nodeName, hostName, (publicHostName == null) ? hostName : publicHostName, port); _invoker.postUnit(new WriteOnlyUnit("registerNode(" + _self + ")") { + @Override public void invokePersist () throws Exception { _noderepo.updateNode(_self); } @@ -701,6 +702,7 @@ public abstract class PeerManager // clear our record from the node table _invoker.postUnit(new WriteOnlyUnit("deleteNode(" + _nodeName + ")") { + @Override public void invokePersist () throws Exception { _noderepo.deleteNode(_nodeName); } @@ -797,12 +799,14 @@ public abstract class PeerManager { // load up information on our nodes _invoker.postUnit(new RepositoryUnit("refreshPeers") { + @Override public void invokePersist () throws Exception { // let the world know that we're alive _noderepo.heartbeatNode(_nodeName); // then load up all the peer records _nodes = _noderepo.loadNodes(); } + @Override public void handleSuccess() { for (NodeRecord record : _nodes) { if (record.nodeName.equals(_nodeName)) { @@ -815,6 +819,7 @@ public abstract class PeerManager } } } + @Override public long getLongThreshold () { return 700L; } @@ -1011,6 +1016,7 @@ public abstract class PeerManager // schedule a timeout to act if something goes wrong (_timeout = new Interval(_omgr) { + @Override public void expired () { log.warning("Lock handler timed out, acting anyway [lock=" + _lock + ", acquire=" + _acquire + "]."); @@ -1187,6 +1193,7 @@ public abstract class PeerManager // (this need not use a runqueue as all it will do is post an invoker unit) protected Interval _peerRefresher = new Interval() { + @Override public void expired () { refreshPeers(); } diff --git a/src/java/com/threerings/presents/peer/server/PeerNode.java b/src/java/com/threerings/presents/peer/server/PeerNode.java index 39284ef9f..f1e614411 100644 --- a/src/java/com/threerings/presents/peer/server/PeerNode.java +++ b/src/java/com/threerings/presents/peer/server/PeerNode.java @@ -60,6 +60,7 @@ public class PeerNode _omgr = omgr; _record = record; _client = new Client(null, _omgr) { + @Override protected void convertFromRemote (DObject target, DEvent event) { super.convertFromRemote(target, event); // rewrite the event's target oid using the oid currently configured on the @@ -70,6 +71,7 @@ public class PeerNode // properly deal with it event.eventId = PeerNode.this._omgr.getNextEventId(true); } + @Override protected Communicator createCommunicator () { // TODO: make a custom communicator that uses the ClientManager NIO system to do // its I/O instead of using two threads and blocking socket I/O diff --git a/src/java/com/threerings/presents/peer/server/persist/NodeRecord.java b/src/java/com/threerings/presents/peer/server/persist/NodeRecord.java index 6e3beb2cd..e8f442f9e 100644 --- a/src/java/com/threerings/presents/peer/server/persist/NodeRecord.java +++ b/src/java/com/threerings/presents/peer/server/persist/NodeRecord.java @@ -119,9 +119,7 @@ public class NodeRecord extends PersistentRecord this.nodeName = nodeName; } - /** - * Generates a string representation of this instance. - */ + @Override public String toString () { return StringUtil.fieldsToString(this); diff --git a/src/java/com/threerings/presents/server/Authenticator.java b/src/java/com/threerings/presents/server/Authenticator.java index 2b1a65b14..abd98db7b 100644 --- a/src/java/com/threerings/presents/server/Authenticator.java +++ b/src/java/com/threerings/presents/server/Authenticator.java @@ -26,7 +26,6 @@ import com.samskivert.io.PersistenceException; import com.samskivert.util.Invoker; import com.samskivert.util.ResultListener; -import com.threerings.presents.annotation.MainInvoker; import com.threerings.presents.data.AuthCodes; import com.threerings.presents.net.AuthRequest; @@ -34,8 +33,6 @@ import com.threerings.presents.net.AuthResponse; import com.threerings.presents.net.AuthResponseData; import com.threerings.presents.server.net.AuthingConnection; -import com.threerings.presents.server.net.ConnectionManager; - import static com.threerings.presents.Log.log; /** @@ -57,6 +54,7 @@ public abstract class Authenticator final AuthResponse rsp = new AuthResponse(rdata); invoker.postUnit(new Invoker.Unit("authenticateConnection") { + @Override public boolean invoke() { try { processAuthentication(conn, rsp); @@ -67,6 +65,7 @@ public abstract class Authenticator return true; } + @Override public void handleResult () { // stuff a reference to the auth response into the connection so that we have // access to it later in the authentication process diff --git a/src/java/com/threerings/presents/server/ClientFactory.java b/src/java/com/threerings/presents/server/ClientFactory.java index 541bd29d0..5531bf473 100644 --- a/src/java/com/threerings/presents/server/ClientFactory.java +++ b/src/java/com/threerings/presents/server/ClientFactory.java @@ -23,7 +23,6 @@ package com.threerings.presents.server; import com.threerings.util.Name; -import com.threerings.presents.data.ClientObject; import com.threerings.presents.net.AuthRequest; /** diff --git a/src/java/com/threerings/presents/server/ClientManager.java b/src/java/com/threerings/presents/server/ClientManager.java index 5ea4cb368..60c48fab9 100644 --- a/src/java/com/threerings/presents/server/ClientManager.java +++ b/src/java/com/threerings/presents/server/ClientManager.java @@ -107,6 +107,7 @@ public class ClientManager // start up an interval that will check for expired clients and flush them from the bowels // of the server new Interval(_omgr) { + @Override public void expired () { flushClients(); } diff --git a/src/java/com/threerings/presents/server/ClientResolver.java b/src/java/com/threerings/presents/server/ClientResolver.java index 708252359..182e17559 100644 --- a/src/java/com/threerings/presents/server/ClientResolver.java +++ b/src/java/com/threerings/presents/server/ClientResolver.java @@ -32,8 +32,6 @@ import com.threerings.util.Name; import com.threerings.presents.annotation.MainInvoker; import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.PermissionPolicy; -import com.threerings.presents.dobj.DObject; -import com.threerings.presents.dobj.ObjectAccessException; import com.threerings.presents.dobj.RootDObjectManager; import static com.threerings.presents.Log.log; @@ -92,7 +90,7 @@ public class ClientResolver extends Invoker.Unit _invoker.postUnit(this); } - // documentation inherited + @Override public boolean invoke () { try { @@ -105,7 +103,7 @@ public class ClientResolver extends Invoker.Unit return true; } - // documentation inherited + @Override public void handleResult () { // if we haven't failed, finish resolution on the dobj thread @@ -140,7 +138,7 @@ public class ClientResolver extends Invoker.Unit } } - // documentation inherited + @Override public String toString () { return "ClientResolver:" + _username; diff --git a/src/java/com/threerings/presents/server/DummyAuthenticator.java b/src/java/com/threerings/presents/server/DummyAuthenticator.java index c18dcc17c..9dbe45323 100644 --- a/src/java/com/threerings/presents/server/DummyAuthenticator.java +++ b/src/java/com/threerings/presents/server/DummyAuthenticator.java @@ -23,8 +23,6 @@ package com.threerings.presents.server; import com.samskivert.io.PersistenceException; -import com.samskivert.util.Invoker; - import com.threerings.presents.net.AuthResponse; import com.threerings.presents.net.AuthResponseData; import com.threerings.presents.server.net.AuthingConnection; @@ -36,7 +34,7 @@ import static com.threerings.presents.Log.log; */ public class DummyAuthenticator extends Authenticator { - // from abstract Authenticator + @Override protected void processAuthentication (AuthingConnection conn, AuthResponse rsp) throws PersistenceException { diff --git a/src/java/com/threerings/presents/server/InvocationManager.java b/src/java/com/threerings/presents/server/InvocationManager.java index e34654f78..c5521d911 100644 --- a/src/java/com/threerings/presents/server/InvocationManager.java +++ b/src/java/com/threerings/presents/server/InvocationManager.java @@ -43,8 +43,6 @@ import com.threerings.presents.dobj.DEvent; import com.threerings.presents.dobj.DObject; import com.threerings.presents.dobj.EventListener; import com.threerings.presents.dobj.InvocationRequestEvent; -import com.threerings.presents.dobj.ObjectAccessException; - import com.threerings.presents.net.Transport; import static com.threerings.presents.Log.log; diff --git a/src/java/com/threerings/presents/server/LocalDObjectMgr.java b/src/java/com/threerings/presents/server/LocalDObjectMgr.java index 32d7aa091..c3128bd6a 100644 --- a/src/java/com/threerings/presents/server/LocalDObjectMgr.java +++ b/src/java/com/threerings/presents/server/LocalDObjectMgr.java @@ -75,13 +75,13 @@ public class LocalDObjectMgr extends PresentsDObjectMgr }; } - // documentation inherited + @Override public synchronized boolean isDispatchThread () { return EventQueue.isDispatchThread(); } - // documentation inherited + @Override public void postEvent (final DEvent event) { EventQueue.invokeLater(new Runnable() { @@ -91,7 +91,7 @@ public class LocalDObjectMgr extends PresentsDObjectMgr }); } - // documentation inherited + @Override public void postRunnable (Runnable unit) { // we just pass this right on to the AWT event queue rather than running them through diff --git a/src/java/com/threerings/presents/server/NativeSignalHandler.java b/src/java/com/threerings/presents/server/NativeSignalHandler.java index 780ad24c1..03548c4d5 100644 --- a/src/java/com/threerings/presents/server/NativeSignalHandler.java +++ b/src/java/com/threerings/presents/server/NativeSignalHandler.java @@ -51,6 +51,7 @@ public class NativeSignalHandler extends AbstractSignalHandler return true; } + @Override protected boolean registerHandlers () { if (!SignalManager.servicesAvailable()) { diff --git a/src/java/com/threerings/presents/server/PresentsClient.java b/src/java/com/threerings/presents/server/PresentsClient.java index f945c5064..526e383c3 100644 --- a/src/java/com/threerings/presents/server/PresentsClient.java +++ b/src/java/com/threerings/presents/server/PresentsClient.java @@ -807,9 +807,7 @@ public class PresentsClient return false; } - /** - * Generates a string representation of this instance. - */ + @Override public String toString () { StringBuilder buf = new StringBuilder("["); diff --git a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java index a7e4d5b26..26cdd6206 100644 --- a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java +++ b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java @@ -29,7 +29,6 @@ import com.google.common.collect.Maps; import com.google.inject.Inject; import com.google.inject.Singleton; -import com.samskivert.util.AuditLogger; import com.samskivert.util.Histogram; import com.samskivert.util.IntMap; import com.samskivert.util.IntMaps; @@ -845,11 +844,13 @@ public class PresentsDObjectMgr _action = action; } + @Override public boolean isPrivate () { return true; } + @Override public boolean applyToObject (DObject target) throws ObjectAccessException { @@ -930,6 +931,7 @@ public class PresentsDObjectMgr return (this.reffingOid == reffingOid && this.field.equals(field)); } + @Override public String toString () { return "[reffingOid=" + reffingOid + ", field=" + field + @@ -947,6 +949,7 @@ public class PresentsDObjectMgr _histo.addValue((int)elapsed); } + @Override public String toString () { int count = _histo.size(); diff --git a/src/java/com/threerings/presents/server/PresentsInvoker.java b/src/java/com/threerings/presents/server/PresentsInvoker.java index 350d3a02d..0d2a4c7e5 100644 --- a/src/java/com/threerings/presents/server/PresentsInvoker.java +++ b/src/java/com/threerings/presents/server/PresentsInvoker.java @@ -21,8 +21,6 @@ package com.threerings.presents.server; -import java.util.Iterator; - import com.google.inject.Inject; import com.google.inject.Singleton; @@ -134,6 +132,7 @@ public class PresentsInvoker extends Invoker protected class ShutdownUnit extends Unit { // run on the invoker thread + @Override public boolean invoke () { if (checkLoops()) { @@ -154,6 +153,7 @@ public class PresentsInvoker extends Invoker } // run on the dobj thread + @Override public void handleResult () { if (checkLoops()) { @@ -206,6 +206,7 @@ public class PresentsInvoker extends Invoker // end the invoker thread postUnit(new Unit() { + @Override public boolean invoke () { _running = false; return false; diff --git a/src/java/com/threerings/presents/server/RebootManager.java b/src/java/com/threerings/presents/server/RebootManager.java index 9ed2ea911..66f1166e0 100644 --- a/src/java/com/threerings/presents/server/RebootManager.java +++ b/src/java/com/threerings/presents/server/RebootManager.java @@ -148,6 +148,7 @@ public abstract class RebootManager _rebootSoon = false; long firstWarnTime = (_nextReboot - (WARNINGS[0] * 60 * 1000)) - now; _interval = new Interval(_omgr) { + @Override public void expired () { doWarning(0); } @@ -238,6 +239,7 @@ public abstract class RebootManager // wait 1 second, then do it new Interval() { // Note: This interval does not run on the dobj thread + @Override public void expired () { // ...but we then post a LongRunnable... _omgr.postRunnable(new PresentsDObjectMgr.LongRunnable() { @@ -265,6 +267,7 @@ public abstract class RebootManager // schedule the next warning _interval = new Interval(_omgr) { + @Override public void expired () { doWarning(level + 1); } @@ -287,6 +290,7 @@ public abstract class RebootManager StringUtil.toString(_rebootLocks.elements())); broadcast("m.reboot_delayed"); _interval = new Interval(_omgr) { + @Override public void expired () { doWarning(WARNINGS.length); } diff --git a/src/java/com/threerings/presents/server/Rejector.java b/src/java/com/threerings/presents/server/Rejector.java index bc11ae579..949317e81 100644 --- a/src/java/com/threerings/presents/server/Rejector.java +++ b/src/java/com/threerings/presents/server/Rejector.java @@ -26,12 +26,10 @@ import com.google.inject.Injector; import com.samskivert.io.PersistenceException; -import com.samskivert.util.Invoker; import com.samskivert.util.StringUtil; import com.threerings.util.MessageBundle; import com.threerings.presents.net.AuthResponse; -import com.threerings.presents.net.AuthResponseData; import com.threerings.presents.server.net.AuthingConnection; import static com.threerings.presents.Log.log; @@ -51,7 +49,7 @@ public class Rejector extends PresentsServer } } - // documentation inherited + @Override protected int[] getListenPorts () { return _ports; @@ -87,7 +85,7 @@ public class Rejector extends PresentsServer */ protected class RejectingAuthenticator extends Authenticator { - // from abstract Authenticator + @Override protected void processAuthentication (AuthingConnection conn, AuthResponse rsp) throws PersistenceException { diff --git a/src/java/com/threerings/presents/server/ReportManager.java b/src/java/com/threerings/presents/server/ReportManager.java index a939c8785..71f280fa5 100644 --- a/src/java/com/threerings/presents/server/ReportManager.java +++ b/src/java/com/threerings/presents/server/ReportManager.java @@ -30,8 +30,6 @@ import com.samskivert.util.Interval; import com.samskivert.util.RunQueue; import com.samskivert.util.StringUtil; -import com.threerings.presents.annotation.EventQueue; - import static com.threerings.presents.Log.log; /** @@ -62,6 +60,7 @@ public class ReportManager { // queue up an interval which will generate reports _reportInterval = new Interval(rqueue) { + @Override public void expired () { logReport(generateReport(System.currentTimeMillis(), true)); } diff --git a/src/java/com/threerings/presents/server/SunSignalHandler.java b/src/java/com/threerings/presents/server/SunSignalHandler.java index 8f9c2a5f0..06547a1dc 100644 --- a/src/java/com/threerings/presents/server/SunSignalHandler.java +++ b/src/java/com/threerings/presents/server/SunSignalHandler.java @@ -24,13 +24,12 @@ package com.threerings.presents.server; import com.samskivert.util.RunAnywhere; import com.samskivert.util.SignalUtil; -import static com.threerings.presents.Log.log; - /** * Handles signals using Sun's undocumented Signal class. */ public class SunSignalHandler extends AbstractSignalHandler { + @Override protected boolean registerHandlers () { SignalUtil.register(SignalUtil.Number.TERM, new SignalUtil.Handler() { diff --git a/src/java/com/threerings/presents/server/TimeBaseProvider.java b/src/java/com/threerings/presents/server/TimeBaseProvider.java index 7103dfdbb..fb32ebd6f 100644 --- a/src/java/com/threerings/presents/server/TimeBaseProvider.java +++ b/src/java/com/threerings/presents/server/TimeBaseProvider.java @@ -22,8 +22,6 @@ package com.threerings.presents.server; import java.util.HashMap; -import com.samskivert.util.ResultListener; - import com.threerings.presents.client.TimeBaseService.GotTimeBaseListener; import com.threerings.presents.data.ClientObject; @@ -32,8 +30,6 @@ import com.threerings.presents.data.TimeBaseObject; import com.threerings.presents.dobj.RootDObjectManager; -import static com.threerings.presents.Log.log; - /** * Provides the server-side of the time base services. The time base services provide a means by * which delta times can be sent over the network which are expanded based on a shared base time diff --git a/src/java/com/threerings/presents/server/net/AuthingConnection.java b/src/java/com/threerings/presents/server/net/AuthingConnection.java index 9a558699c..f0b4d853c 100644 --- a/src/java/com/threerings/presents/server/net/AuthingConnection.java +++ b/src/java/com/threerings/presents/server/net/AuthingConnection.java @@ -101,9 +101,7 @@ public class AuthingConnection extends Connection _authrsp = authrsp; } - /** - * Generates a string representation of this instance. - */ + @Override public String toString () { return "[mode=AUTHING, addr=" + diff --git a/src/java/com/threerings/presents/server/net/Connection.java b/src/java/com/threerings/presents/server/net/Connection.java index 175f871ee..e2a2999bd 100644 --- a/src/java/com/threerings/presents/server/net/Connection.java +++ b/src/java/com/threerings/presents/server/net/Connection.java @@ -36,7 +36,6 @@ import java.security.NoSuchAlgorithmException; import com.samskivert.util.StringUtil; import com.threerings.io.ByteBufferInputStream; -import com.threerings.io.ByteBufferOutputStream; import com.threerings.io.FramedInputStream; import com.threerings.io.FramingOutputStream; import com.threerings.io.ObjectInputStream; diff --git a/src/java/com/threerings/presents/server/net/ConnectionManager.java b/src/java/com/threerings/presents/server/net/ConnectionManager.java index deb1318d4..2fe124295 100644 --- a/src/java/com/threerings/presents/server/net/ConnectionManager.java +++ b/src/java/com/threerings/presents/server/net/ConnectionManager.java @@ -24,7 +24,6 @@ package com.threerings.presents.server.net; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.ByteBuffer; -import java.nio.channels.Channel; import java.nio.channels.DatagramChannel; import java.nio.channels.SelectableChannel; import java.nio.channels.SelectionKey; @@ -52,7 +51,6 @@ import com.samskivert.util.Invoker; import com.samskivert.util.LoopingThread; import com.samskivert.util.Queue; import com.samskivert.util.ResultListener; -import com.samskivert.util.StringUtil; import com.samskivert.util.Tuple; import com.threerings.io.FramingOutputStream; @@ -281,7 +279,7 @@ public class ConnectionManager extends LoopingThread } } - // documentation inherited + @Override protected void willStart () { int successes = 0; @@ -414,6 +412,7 @@ public class ConnectionManager extends LoopingThread /** * Performs the select loop. This is the body of the conmgr thread. */ + @Override protected void iterate () { long iterStamp = System.currentTimeMillis(); @@ -708,14 +707,14 @@ public class ConnectionManager extends LoopingThread _stats.bytesOut += bytes; } - // documentation inherited + @Override protected void handleIterateFailure (Exception e) { // log the exception log.warning("ConnectionManager.iterate() uncaught exception.", e); } - // documentation inherited + @Override protected void didShutdown () { // take one last crack at the outgoing message queue @@ -1026,9 +1025,7 @@ public class ConnectionManager extends LoopingThread _partial.flip(); } - /** - * Returns a string representation of this instance. - */ + @Override public String toString () { return "[conn=" + conn + ", partials=" + _partials + ", msgs=" + _msgs + "]"; diff --git a/src/java/com/threerings/presents/server/net/RunningConnection.java b/src/java/com/threerings/presents/server/net/RunningConnection.java index e289e6543..a1fa55210 100644 --- a/src/java/com/threerings/presents/server/net/RunningConnection.java +++ b/src/java/com/threerings/presents/server/net/RunningConnection.java @@ -51,6 +51,7 @@ public class RunningConnection extends Connection { } + @Override public String toString () { return "[mode=RUNNING, id=" + (hashCode() % 1000) + diff --git a/src/java/com/threerings/presents/tools/ActionScriptSource.java b/src/java/com/threerings/presents/tools/ActionScriptSource.java index 3d67f6dd7..d5eafd7b4 100644 --- a/src/java/com/threerings/presents/tools/ActionScriptSource.java +++ b/src/java/com/threerings/presents/tools/ActionScriptSource.java @@ -975,6 +975,7 @@ public class ActionScriptSource writer.flush(); } + @Override public String toString () { StringBuilder builder = new StringBuilder(); diff --git a/src/java/com/threerings/presents/tools/GenActionScriptBundlesTask.java b/src/java/com/threerings/presents/tools/GenActionScriptBundlesTask.java index c4e4883e7..7679a473c 100644 --- a/src/java/com/threerings/presents/tools/GenActionScriptBundlesTask.java +++ b/src/java/com/threerings/presents/tools/GenActionScriptBundlesTask.java @@ -31,14 +31,10 @@ import java.util.Date; import java.util.Map; import java.util.Properties; -import com.samskivert.util.StringUtil; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.FileSet; -import org.apache.tools.ant.types.Reference; -import org.apache.tools.ant.util.ClasspathUtils; /** * Generates our own ResourceBundle classes. @@ -58,6 +54,7 @@ public class GenActionScriptBundlesTask extends Task _asroot = asroot; } + @Override public void execute () throws BuildException { diff --git a/src/java/com/threerings/presents/tools/GenActionScriptTask.java b/src/java/com/threerings/presents/tools/GenActionScriptTask.java index 07ed0e2b3..6f581f12c 100644 --- a/src/java/com/threerings/presents/tools/GenActionScriptTask.java +++ b/src/java/com/threerings/presents/tools/GenActionScriptTask.java @@ -21,16 +21,12 @@ package com.threerings.presents.tools; -import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; -import java.io.OutputStreamWriter; import java.io.PrintWriter; -import java.io.StringWriter; - import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -40,15 +36,10 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.FileSet; -import org.apache.tools.ant.types.Reference; -import org.apache.tools.ant.util.ClasspathUtils; - import org.apache.commons.io.IOUtils; -import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; -import com.samskivert.util.StringUtil; import com.samskivert.velocity.VelocityUtil; import com.threerings.io.Streamable; @@ -94,6 +85,7 @@ public class GenActionScriptTask extends Task /** * Performs the actual work of the task. */ + @Override public void execute () throws BuildException { try { diff --git a/src/java/com/threerings/presents/tools/GenDObjectTask.java b/src/java/com/threerings/presents/tools/GenDObjectTask.java index 19dc2b45b..023ded8bb 100644 --- a/src/java/com/threerings/presents/tools/GenDObjectTask.java +++ b/src/java/com/threerings/presents/tools/GenDObjectTask.java @@ -21,11 +21,7 @@ package com.threerings.presents.tools; -import java.io.BufferedReader; -import java.io.BufferedWriter; import java.io.File; -import java.io.FileReader; -import java.io.FileWriter; import java.io.IOException; import java.io.StringWriter; @@ -35,15 +31,6 @@ import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; - -import java.util.regex.Pattern; -import java.util.regex.Matcher; - -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.apache.tools.ant.AntClassLoader; @@ -57,14 +44,10 @@ import org.apache.tools.ant.util.ClasspathUtils; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.VelocityEngine; -import com.samskivert.util.ObjectUtil; -import com.samskivert.util.SortableArrayList; import com.samskivert.util.StringUtil; import com.samskivert.velocity.VelocityUtil; import com.threerings.presents.annotation.TransportHint; -import com.threerings.presents.net.Transport; - import com.threerings.presents.dobj.DObject; import com.threerings.presents.dobj.DSet; import com.threerings.presents.dobj.OidList; @@ -96,7 +79,7 @@ public class GenDObjectTask extends Task ((AntClassLoader)_cloader).setParent(getClass().getClassLoader()); } - /** Performs the actual work of the task. */ + @Override public void execute () throws BuildException { if (_cloader == null) { diff --git a/src/java/com/threerings/presents/tools/GenReceiverTask.java b/src/java/com/threerings/presents/tools/GenReceiverTask.java index a6e25c299..c8e6ac692 100644 --- a/src/java/com/threerings/presents/tools/GenReceiverTask.java +++ b/src/java/com/threerings/presents/tools/GenReceiverTask.java @@ -46,7 +46,7 @@ import com.threerings.presents.server.InvocationSender; */ public class GenReceiverTask extends InvocationTask { - // documentation inherited + @Override protected void processService (File source, Class receiver) { System.out.println("Processing " + receiver.getName() + "..."); diff --git a/src/java/com/threerings/presents/tools/GenServiceTask.java b/src/java/com/threerings/presents/tools/GenServiceTask.java index 481b04dd5..3158f1d8d 100644 --- a/src/java/com/threerings/presents/tools/GenServiceTask.java +++ b/src/java/com/threerings/presents/tools/GenServiceTask.java @@ -94,6 +94,7 @@ public class GenServiceTask extends InvocationTask return getName().compareTo(other.getName()); } + @Override public boolean equals (Object other) { return getClass().equals(other.getClass()) && @@ -134,6 +135,7 @@ public class GenServiceTask extends InvocationTask } // documentation inherited + @Override protected void processService (File source, Class service) { System.out.println("Processing " + service.getName() + "..."); diff --git a/src/java/com/threerings/presents/tools/GenStreamableTask.java b/src/java/com/threerings/presents/tools/GenStreamableTask.java index 48b0cb725..a0576da20 100644 --- a/src/java/com/threerings/presents/tools/GenStreamableTask.java +++ b/src/java/com/threerings/presents/tools/GenStreamableTask.java @@ -37,7 +37,6 @@ import org.apache.tools.ant.types.FileSet; import com.threerings.io.SimpleStreamableObject; import com.threerings.io.Streamable; -import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.dobj.DObject; /** @@ -55,9 +54,7 @@ public class GenStreamableTask extends Task _filesets.add(set); } - /** - * Performs the actual work of the task. - */ + @Override public void execute () throws BuildException { for (FileSet fs : _filesets) { diff --git a/src/java/com/threerings/presents/tools/GenUtil.java b/src/java/com/threerings/presents/tools/GenUtil.java index a7f1ec5ac..0fa27c797 100644 --- a/src/java/com/threerings/presents/tools/GenUtil.java +++ b/src/java/com/threerings/presents/tools/GenUtil.java @@ -27,8 +27,6 @@ import java.io.FileReader; import java.io.IOException; import java.lang.reflect.Field; -import java.lang.reflect.GenericArrayType; -import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.regex.Matcher; diff --git a/src/java/com/threerings/presents/tools/ImportSet.java b/src/java/com/threerings/presents/tools/ImportSet.java index a4e105d25..82adfe195 100644 --- a/src/java/com/threerings/presents/tools/ImportSet.java +++ b/src/java/com/threerings/presents/tools/ImportSet.java @@ -91,9 +91,7 @@ public class ImportSet _imports.add(name); } - /** - * Makes a copy of this import set. - */ + @Override public ImportSet clone () { ImportSet newset = new ImportSet(); @@ -322,7 +320,7 @@ public class ImportSet return list; } - @Override // from Object + @Override public String toString () { return StringUtil.toString(_imports); diff --git a/src/java/com/threerings/presents/tools/InstrumentStreamableTask.java b/src/java/com/threerings/presents/tools/InstrumentStreamableTask.java index b1e5a4112..e811558d7 100644 --- a/src/java/com/threerings/presents/tools/InstrumentStreamableTask.java +++ b/src/java/com/threerings/presents/tools/InstrumentStreamableTask.java @@ -79,9 +79,7 @@ public class InstrumentStreamableTask extends Task _outdir = outdir; } - /** - * Performs the actual work of the task. - */ + @Override public void execute () throws BuildException { // configure our ClassPool with our classpath diff --git a/src/java/com/threerings/presents/tools/InvocationTask.java b/src/java/com/threerings/presents/tools/InvocationTask.java index a4cb4b32a..486c63748 100644 --- a/src/java/com/threerings/presents/tools/InvocationTask.java +++ b/src/java/com/threerings/presents/tools/InvocationTask.java @@ -48,8 +48,6 @@ import com.samskivert.util.StringUtil; import com.samskivert.velocity.VelocityUtil; import com.threerings.presents.annotation.TransportHint; -import com.threerings.presents.net.Transport; - import com.threerings.presents.client.InvocationService.InvocationListener; /** @@ -331,7 +329,7 @@ public abstract class InvocationTask extends Task ((AntClassLoader)_cloader).setParent(getClass().getClassLoader()); } - /** Performs the actual work of the task. */ + @Override public void execute () throws BuildException { if (_cloader == null) { diff --git a/src/java/com/threerings/presents/util/SafeSubscriber.java b/src/java/com/threerings/presents/util/SafeSubscriber.java index b2f9b307d..7e80354a8 100644 --- a/src/java/com/threerings/presents/util/SafeSubscriber.java +++ b/src/java/com/threerings/presents/util/SafeSubscriber.java @@ -213,9 +213,7 @@ public class SafeSubscriber } } - /** - * Returns a string representation of this instance. - */ + @Override public String toString () { return "[oid=" + _oid + diff --git a/src/java/com/threerings/util/MessageBundle.java b/src/java/com/threerings/util/MessageBundle.java index 0e4a72ffe..a4ae58b48 100644 --- a/src/java/com/threerings/util/MessageBundle.java +++ b/src/java/com/threerings/util/MessageBundle.java @@ -403,9 +403,7 @@ public class MessageBundle } } - /** - * Returns a string representation of this instance. - */ + @Override public String toString () { return "[bundle=" + _bundle + ", path=" + _path + "]"; diff --git a/src/java/com/threerings/util/Name.java b/src/java/com/threerings/util/Name.java index 4b67de8b0..8d21971ac 100644 --- a/src/java/com/threerings/util/Name.java +++ b/src/java/com/threerings/util/Name.java @@ -21,8 +21,6 @@ package com.threerings.util; -import java.util.regex.Pattern; - import com.threerings.io.SimpleStreamableObject; /** @@ -99,18 +97,19 @@ public class Name extends SimpleStreamableObject /** * Returns the unprocessed name as a string. */ + @Override public String toString () { return _name; } - @Override // from Object + @Override public int hashCode () { return getNormal().hashCode(); } - @Override // from Object + @Override public boolean equals (Object other) { if (other != null) { diff --git a/src/java/com/threerings/util/TrackedObject.java b/src/java/com/threerings/util/TrackedObject.java index e58cb2e7f..3957ee2a8 100644 --- a/src/java/com/threerings/util/TrackedObject.java +++ b/src/java/com/threerings/util/TrackedObject.java @@ -44,7 +44,7 @@ public class TrackedObject incrementInstanceCount(); } - // documentation inherited + @Override protected Object clone () throws CloneNotSupportedException { @@ -67,6 +67,7 @@ public class TrackedObject } /** Records that this object was collected. */ + @Override protected void finalize () throws Throwable { diff --git a/src/java/com/threerings/util/signal/SignalManager.java b/src/java/com/threerings/util/signal/SignalManager.java index 15ad0ec57..1f0f48afb 100644 --- a/src/java/com/threerings/util/signal/SignalManager.java +++ b/src/java/com/threerings/util/signal/SignalManager.java @@ -171,6 +171,7 @@ public class SignalManager // make sure the signal dispatcher thread is started if (_haveLibrary && _sigdis == null) { _sigdis = new Thread("SignalDispatcher") { + @Override public void run () { log.info("Dispatching signals..."); dispatchSignals(); diff --git a/tests/src/java/com/threerings/bureau/client/TestClient.java b/tests/src/java/com/threerings/bureau/client/TestClient.java index 32a0ca063..1dac2a1f8 100644 --- a/tests/src/java/com/threerings/bureau/client/TestClient.java +++ b/tests/src/java/com/threerings/bureau/client/TestClient.java @@ -90,11 +90,13 @@ public class TestClient extends BureauClient */ static protected class TestAgent extends Agent { + @Override public void start () { log.info("Starting agent " + StringUtil.toString(_agentObj)); } + @Override public void stop () { log.info("Stopping agent " + StringUtil.toString(_agentObj)); @@ -118,11 +120,13 @@ public class TestClient extends BureauClient } // overridden - creates a simple director + @Override protected BureauDirector createDirector () { // just use our test agent exclusively - in the real world, the agent created would depend // on the object's type and/or properties return new BureauDirector(_ctx) { + @Override public Agent createAgent (AgentObject agentObj) { return new TestAgent(); } diff --git a/tests/src/java/com/threerings/bureau/server/RegistryTester.java b/tests/src/java/com/threerings/bureau/server/RegistryTester.java index f266b0ebf..e3cec8655 100644 --- a/tests/src/java/com/threerings/bureau/server/RegistryTester.java +++ b/tests/src/java/com/threerings/bureau/server/RegistryTester.java @@ -121,6 +121,7 @@ public class RegistryTester _server.setClientTarget(_clientTarget); Thread thread = new Thread("Registry test thread") { + @Override public void run () { log.info(getName() + " started"); runTestThread(); diff --git a/tests/src/java/com/threerings/crowd/client/JabberClient.java b/tests/src/java/com/threerings/crowd/client/JabberClient.java index 0f97eb7f8..ebc50f2d7 100644 --- a/tests/src/java/com/threerings/crowd/client/JabberClient.java +++ b/tests/src/java/com/threerings/crowd/client/JabberClient.java @@ -71,6 +71,7 @@ public class JabberClient // log off when they close the window _frame.addWindowListener(new WindowAdapter() { + @Override public void windowClosing (WindowEvent evt) { // if we're logged on, log off if (_client.isLoggedOn()) { diff --git a/tests/src/java/com/threerings/crowd/client/JabberController.java b/tests/src/java/com/threerings/crowd/client/JabberController.java index dc449a839..68e757a3c 100644 --- a/tests/src/java/com/threerings/crowd/client/JabberController.java +++ b/tests/src/java/com/threerings/crowd/client/JabberController.java @@ -10,6 +10,7 @@ import com.threerings.crowd.util.CrowdContext; */ public class JabberController extends PlaceController { + @Override protected PlaceView createPlaceView (CrowdContext ctx) { return new JabberPanel(ctx); diff --git a/tests/src/java/com/threerings/crowd/data/JabberConfig.java b/tests/src/java/com/threerings/crowd/data/JabberConfig.java index 147f73251..b9eef560e 100644 --- a/tests/src/java/com/threerings/crowd/data/JabberConfig.java +++ b/tests/src/java/com/threerings/crowd/data/JabberConfig.java @@ -13,12 +13,14 @@ import com.threerings.crowd.data.PlaceConfig; public class JabberConfig extends PlaceConfig { // documentation inherited + @Override public PlaceController createController () { return new JabberController(); } // documentation inherited + @Override public String getManagerClassName () { // nothing special needed on the server side diff --git a/tests/src/java/com/threerings/crowd/server/JabberServer.java b/tests/src/java/com/threerings/crowd/server/JabberServer.java index 24216fad8..8753339b9 100644 --- a/tests/src/java/com/threerings/crowd/server/JabberServer.java +++ b/tests/src/java/com/threerings/crowd/server/JabberServer.java @@ -7,8 +7,6 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.threerings.crowd.data.JabberConfig; -import com.threerings.crowd.data.PlaceObject; - import static com.threerings.crowd.Log.log; /** diff --git a/tests/src/java/com/threerings/io/FrameTest.java b/tests/src/java/com/threerings/io/FrameTest.java index b4601b7bb..178c451b4 100644 --- a/tests/src/java/com/threerings/io/FrameTest.java +++ b/tests/src/java/com/threerings/io/FrameTest.java @@ -1,5 +1,5 @@ // -// $Id: FrameTest.java,v 1.10 2004/08/27 02:20:57 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -88,6 +88,7 @@ public class FrameTest extends TestCase assertTrue("hit eof", fin.read() == -1); } + @Override public void runTest () { try { diff --git a/tests/src/java/com/threerings/io/StreamableTest.java b/tests/src/java/com/threerings/io/StreamableTest.java index 88048a083..f75bb35da 100644 --- a/tests/src/java/com/threerings/io/StreamableTest.java +++ b/tests/src/java/com/threerings/io/StreamableTest.java @@ -87,6 +87,7 @@ public class StreamableTest extends TestCase _fizzle = in.readInt(); } + @Override protected void toString (StringBuilder buf) { super.toString(buf); @@ -101,6 +102,7 @@ public class StreamableTest extends TestCase super(StreamableTest.class.getName()); } + @Override public void runTest () { try { diff --git a/tests/src/java/com/threerings/presents/client/TestDecoder.java b/tests/src/java/com/threerings/presents/client/TestDecoder.java index 72bdc4433..c3251d479 100644 --- a/tests/src/java/com/threerings/presents/client/TestDecoder.java +++ b/tests/src/java/com/threerings/presents/client/TestDecoder.java @@ -1,5 +1,5 @@ // -// $Id: TestDecoder.java,v 1.2 2004/08/27 02:21:02 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -46,12 +46,14 @@ public class TestDecoder extends InvocationDecoder } // documentation inherited + @Override public String getReceiverCode () { return RECEIVER_CODE; } // documentation inherited + @Override public void dispatchNotification (int methodId, Object[] args) { switch (methodId) { diff --git a/tests/src/java/com/threerings/presents/data/TestMarshaller.java b/tests/src/java/com/threerings/presents/data/TestMarshaller.java index 7f1b76899..90ad7dd64 100644 --- a/tests/src/java/com/threerings/presents/data/TestMarshaller.java +++ b/tests/src/java/com/threerings/presents/data/TestMarshaller.java @@ -24,7 +24,6 @@ package com.threerings.presents.data; import com.threerings.presents.client.Client; import com.threerings.presents.client.TestService; import com.threerings.presents.dobj.InvocationResponseEvent; -import com.threerings.presents.net.Transport; import java.util.ArrayList; /** diff --git a/tests/src/java/com/threerings/presents/dobj/DSetTest.java b/tests/src/java/com/threerings/presents/dobj/DSetTest.java index eacadcf05..e832d3cca 100644 --- a/tests/src/java/com/threerings/presents/dobj/DSetTest.java +++ b/tests/src/java/com/threerings/presents/dobj/DSetTest.java @@ -43,6 +43,7 @@ public class DSetTest extends TestCase return _value; } + @Override public String toString () { return _value.toString(); @@ -56,6 +57,7 @@ public class DSetTest extends TestCase super(DSetTest.class.getName()); } + @Override public void runTest () { ArrayList seed = new ArrayList(); diff --git a/tests/src/java/com/threerings/presents/server/TestDispatcher.java b/tests/src/java/com/threerings/presents/server/TestDispatcher.java index bff009206..ab57ffbe1 100644 --- a/tests/src/java/com/threerings/presents/server/TestDispatcher.java +++ b/tests/src/java/com/threerings/presents/server/TestDispatcher.java @@ -23,7 +23,6 @@ package com.threerings.presents.server; import com.threerings.presents.client.TestService; import com.threerings.presents.data.ClientObject; -import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.data.TestMarshaller; import java.util.ArrayList; diff --git a/tests/src/java/com/threerings/presents/server/TestServer.java b/tests/src/java/com/threerings/presents/server/TestServer.java index 9ab43e23b..b7d14cede 100644 --- a/tests/src/java/com/threerings/presents/server/TestServer.java +++ b/tests/src/java/com/threerings/presents/server/TestServer.java @@ -25,14 +25,13 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.threerings.presents.data.TestObject; -import com.threerings.presents.dobj.*; - import static com.threerings.presents.Log.log; public class TestServer extends PresentsServer { public static TestObject testobj; + @Override public void init (Injector injector) throws Exception { diff --git a/tests/src/java/com/threerings/util/MessageBundleTest.java b/tests/src/java/com/threerings/util/MessageBundleTest.java index 0a472141b..aba52495d 100644 --- a/tests/src/java/com/threerings/util/MessageBundleTest.java +++ b/tests/src/java/com/threerings/util/MessageBundleTest.java @@ -1,5 +1,5 @@ // -// $Id: MessageBundleTest.java,v 1.5 2004/08/27 02:21:05 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -36,6 +36,7 @@ public class MessageBundleTest extends TestCase super(MessageBundleTest.class.getName()); } + @Override public void runTest () { try {