diff --git a/src/java/com/threerings/admin/server/AdminDispatcher.java b/src/java/com/threerings/admin/server/AdminDispatcher.java index 7aa43d237..951b962d9 100644 --- a/src/java/com/threerings/admin/server/AdminDispatcher.java +++ b/src/java/com/threerings/admin/server/AdminDispatcher.java @@ -41,13 +41,13 @@ public class AdminDispatcher extends InvocationDispatcher this.provider = provider; } - @Override // documentation inherited + @Override public AdminMarshaller createMarshaller () { return new AdminMarshaller(); } - @Override // documentation inherited + @Override public void dispatchRequest ( ClientObject source, int methodId, Object[] args) throws InvocationException diff --git a/src/java/com/threerings/bureau/client/BureauDecoder.java b/src/java/com/threerings/bureau/client/BureauDecoder.java index bbbd91771..b5dbf35f4 100644 --- a/src/java/com/threerings/bureau/client/BureauDecoder.java +++ b/src/java/com/threerings/bureau/client/BureauDecoder.java @@ -48,13 +48,13 @@ public class BureauDecoder extends InvocationDecoder this.receiver = receiver; } - @Override // documentation inherited + @Override public String getReceiverCode () { return RECEIVER_CODE; } - @Override // documentation inherited + @Override public void dispatchNotification (int methodId, Object[] args) { switch (methodId) { diff --git a/src/java/com/threerings/bureau/server/BureauDispatcher.java b/src/java/com/threerings/bureau/server/BureauDispatcher.java index d62ee8b17..d471577de 100644 --- a/src/java/com/threerings/bureau/server/BureauDispatcher.java +++ b/src/java/com/threerings/bureau/server/BureauDispatcher.java @@ -40,13 +40,13 @@ public class BureauDispatcher extends InvocationDispatcher this.provider = provider; } - @Override // documentation inherited + @Override public BureauMarshaller createMarshaller () { return new BureauMarshaller(); } - @Override // documentation inherited + @Override public void dispatchRequest ( ClientObject source, int methodId, Object[] args) throws InvocationException diff --git a/src/java/com/threerings/crowd/chat/server/ChannelSpeakDispatcher.java b/src/java/com/threerings/crowd/chat/server/ChannelSpeakDispatcher.java index 539584ff9..0d65424f6 100644 --- a/src/java/com/threerings/crowd/chat/server/ChannelSpeakDispatcher.java +++ b/src/java/com/threerings/crowd/chat/server/ChannelSpeakDispatcher.java @@ -41,13 +41,13 @@ public class ChannelSpeakDispatcher extends InvocationDispatcher this.provider = provider; } - @Override // documentation inherited + @Override public ChatMarshaller createMarshaller () { return new ChatMarshaller(); } - @Override // documentation inherited + @Override public void dispatchRequest ( ClientObject source, int methodId, Object[] args) throws InvocationException diff --git a/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java b/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java index 62ad6dbc0..681944e93 100644 --- a/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java +++ b/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java @@ -40,13 +40,13 @@ public class SpeakDispatcher extends InvocationDispatcher this.provider = provider; } - @Override // documentation inherited + @Override public SpeakMarshaller createMarshaller () { return new SpeakMarshaller(); } - @Override // documentation inherited + @Override public void dispatchRequest ( ClientObject source, int methodId, Object[] args) throws InvocationException diff --git a/src/java/com/threerings/crowd/client/LocationDecoder.java b/src/java/com/threerings/crowd/client/LocationDecoder.java index 38463d6d6..e8a38f308 100644 --- a/src/java/com/threerings/crowd/client/LocationDecoder.java +++ b/src/java/com/threerings/crowd/client/LocationDecoder.java @@ -44,13 +44,13 @@ public class LocationDecoder extends InvocationDecoder this.receiver = receiver; } - @Override // documentation inherited + @Override public String getReceiverCode () { return RECEIVER_CODE; } - @Override // documentation inherited + @Override public void dispatchNotification (int methodId, Object[] args) { switch (methodId) { diff --git a/src/java/com/threerings/crowd/peer/server/CrowdPeerDispatcher.java b/src/java/com/threerings/crowd/peer/server/CrowdPeerDispatcher.java index d5d6af7e7..6aa145810 100644 --- a/src/java/com/threerings/crowd/peer/server/CrowdPeerDispatcher.java +++ b/src/java/com/threerings/crowd/peer/server/CrowdPeerDispatcher.java @@ -44,13 +44,13 @@ public class CrowdPeerDispatcher extends InvocationDispatcher this.provider = provider; } - @Override // documentation inherited + @Override public BodyMarshaller createMarshaller () { return new BodyMarshaller(); } - @Override // documentation inherited + @Override public void dispatchRequest ( ClientObject source, int methodId, Object[] args) throws InvocationException diff --git a/src/java/com/threerings/crowd/server/LocationDispatcher.java b/src/java/com/threerings/crowd/server/LocationDispatcher.java index bca73fc91..58fa2edfc 100644 --- a/src/java/com/threerings/crowd/server/LocationDispatcher.java +++ b/src/java/com/threerings/crowd/server/LocationDispatcher.java @@ -41,13 +41,13 @@ public class LocationDispatcher extends InvocationDispatcher this.provider = provider; } - @Override // documentation inherited + @Override public LocationMarshaller createMarshaller () { return new LocationMarshaller(); } - @Override // documentation inherited + @Override public void dispatchRequest ( ClientObject source, int methodId, Object[] args) throws InvocationException diff --git a/src/java/com/threerings/io/ByteBufferInputStream.java b/src/java/com/threerings/io/ByteBufferInputStream.java index 9cee96cfc..e5872b69a 100644 --- a/src/java/com/threerings/io/ByteBufferInputStream.java +++ b/src/java/com/threerings/io/ByteBufferInputStream.java @@ -49,7 +49,7 @@ public class ByteBufferInputStream extends InputStream return _buffer; } - @Override // documentation inherited + @Override public int read () { try { @@ -59,7 +59,7 @@ public class ByteBufferInputStream extends InputStream } } - @Override // documentation inherited + @Override public int read (byte[] b, int offset, int length) throws IOException { @@ -71,7 +71,7 @@ public class ByteBufferInputStream extends InputStream return length; } - @Override // documentation inherited + @Override public long skip (long n) throws IOException { @@ -80,25 +80,25 @@ public class ByteBufferInputStream extends InputStream return n; } - @Override // documentation inherited + @Override public int available () { return _buffer.remaining(); } - @Override // documentation inherited + @Override public boolean markSupported () { return true; } - @Override // documentation inherited + @Override public void mark (int readLimit) { _buffer.mark(); } - @Override // documentation inherited + @Override public void reset () throws IOException { diff --git a/src/java/com/threerings/io/ByteBufferOutputStream.java b/src/java/com/threerings/io/ByteBufferOutputStream.java index d7c4a39ac..65894fcb8 100644 --- a/src/java/com/threerings/io/ByteBufferOutputStream.java +++ b/src/java/com/threerings/io/ByteBufferOutputStream.java @@ -66,7 +66,7 @@ public class ByteBufferOutputStream extends OutputStream _buffer.clear(); } - @Override // documentation inherited + @Override public void write (int b) { try { @@ -77,7 +77,7 @@ public class ByteBufferOutputStream extends OutputStream } } - @Override // documentation inherited + @Override public void write (byte[] b, int off, int len) { // sanity check the arguments diff --git a/src/java/com/threerings/io/FramingOutputStream.java b/src/java/com/threerings/io/FramingOutputStream.java index 1122dd035..fd1ddc912 100644 --- a/src/java/com/threerings/io/FramingOutputStream.java +++ b/src/java/com/threerings/io/FramingOutputStream.java @@ -44,13 +44,13 @@ public class FramingOutputStream extends ByteBufferOutputStream _buffer.put(HEADER_PAD); } - @Override // documentation inherited + @Override public ByteBuffer flip () { throw new UnsupportedOperationException("Use frameAndReturnBuffer() instead."); } - @Override // documentation inherited + @Override public void reset () { throw new UnsupportedOperationException("Use resetFrame() instead."); diff --git a/src/java/com/threerings/io/UnreliableObjectInputStream.java b/src/java/com/threerings/io/UnreliableObjectInputStream.java index 691e32712..48c6497e9 100644 --- a/src/java/com/threerings/io/UnreliableObjectInputStream.java +++ b/src/java/com/threerings/io/UnreliableObjectInputStream.java @@ -37,7 +37,7 @@ public class UnreliableObjectInputStream extends ObjectInputStream super(source); } - @Override // documentation inherited + @Override protected ClassMapping mapClass (short code, String cname) throws IOException, ClassNotFoundException { @@ -62,7 +62,7 @@ public class UnreliableObjectInputStream extends ObjectInputStream return cmap; } - @Override // documentation inherited + @Override protected void mapIntern (short code, String value) { // see if we already have a mapping diff --git a/src/java/com/threerings/io/UnreliableObjectOutputStream.java b/src/java/com/threerings/io/UnreliableObjectOutputStream.java index bf39fb58e..ac81acad9 100644 --- a/src/java/com/threerings/io/UnreliableObjectOutputStream.java +++ b/src/java/com/threerings/io/UnreliableObjectOutputStream.java @@ -123,7 +123,7 @@ public class UnreliableObjectOutputStream extends ObjectOutputStream } } - @Override // documentation inherited + @Override protected Short createInternMapping (short code) { // the negative intern code indicates that we must rewrite the metadata for the first @@ -132,14 +132,14 @@ public class UnreliableObjectOutputStream extends ObjectOutputStream return (short)-code; } - @Override // documentation inherited + @Override protected void writeNewInternMapping (short code, String value) throws IOException { writeInternMapping(code, value); } - @Override // documentation inherited + @Override protected void writeExistingInternMapping (short code, String value) throws IOException { @@ -157,7 +157,7 @@ public class UnreliableObjectOutputStream extends ObjectOutputStream } } - @Override // documentation inherited + @Override protected void writeInternMapping (int code, String value) throws IOException { @@ -167,7 +167,7 @@ public class UnreliableObjectOutputStream extends ObjectOutputStream _mappedInterns.add(value); } - @Override // documentation inherited + @Override protected ClassMapping createClassMapping (short code, Class sclass, Streamer streamer) { // the negative class code indicates that we must rewrite the metadata for the first @@ -176,14 +176,14 @@ public class UnreliableObjectOutputStream extends ObjectOutputStream return new ClassMapping((short)(-code), sclass, streamer); } - @Override // documentation inherited + @Override protected void writeNewClassMapping (ClassMapping cmap) throws IOException { writeClassMapping(cmap.code, cmap.sclass); } - @Override // documentation inherited + @Override protected void writeExistingClassMapping (ClassMapping cmap) throws IOException { @@ -201,7 +201,7 @@ public class UnreliableObjectOutputStream extends ObjectOutputStream } } - @Override // documentation inherited + @Override protected void writeClassMapping (int code, Class sclass) throws IOException { diff --git a/src/java/com/threerings/presents/net/EventNotification.java b/src/java/com/threerings/presents/net/EventNotification.java index de9ebb468..214c66b4b 100644 --- a/src/java/com/threerings/presents/net/EventNotification.java +++ b/src/java/com/threerings/presents/net/EventNotification.java @@ -49,20 +49,20 @@ public class EventNotification extends DownstreamMessage return _event; } - @Override // documentation inherited + @Override public void setTransport (Transport transport) { // the event handles the transport _event.setTransport(transport); } - @Override // documentation inherited + @Override public Transport getTransport () { return _event.getTransport(); } - @Override // documentation inherited + @Override public void noteActualTransport (Transport transport) { _event.noteActualTransport(transport); diff --git a/src/java/com/threerings/presents/net/ForwardEventRequest.java b/src/java/com/threerings/presents/net/ForwardEventRequest.java index 085a1c5b2..636ad184e 100644 --- a/src/java/com/threerings/presents/net/ForwardEventRequest.java +++ b/src/java/com/threerings/presents/net/ForwardEventRequest.java @@ -52,14 +52,14 @@ public class ForwardEventRequest extends UpstreamMessage return _event; } - @Override // documentation inherited + @Override public void setTransport (Transport transport) { // the event handles the transport _event.setTransport(transport); } - @Override // documentation inherited + @Override public Transport getTransport () { return _event.getTransport(); diff --git a/src/java/com/threerings/presents/net/PingRequest.java b/src/java/com/threerings/presents/net/PingRequest.java index b01c5cd99..0f4ee443f 100644 --- a/src/java/com/threerings/presents/net/PingRequest.java +++ b/src/java/com/threerings/presents/net/PingRequest.java @@ -95,13 +95,13 @@ public class PingRequest extends UpstreamMessage in.defaultReadObject(); } - @Override // documentation inherited + @Override public void setTransport (Transport transport) { _transport = transport; } - @Override // documentation inherited + @Override public Transport getTransport () { return _transport; diff --git a/src/java/com/threerings/presents/net/PongResponse.java b/src/java/com/threerings/presents/net/PongResponse.java index 5a8f3229e..47700a019 100644 --- a/src/java/com/threerings/presents/net/PongResponse.java +++ b/src/java/com/threerings/presents/net/PongResponse.java @@ -115,13 +115,13 @@ public class PongResponse extends DownstreamMessage in.defaultReadObject(); } - @Override // documentation inherited + @Override public void setTransport (Transport transport) { _transport = transport; } - @Override // documentation inherited + @Override public Transport getTransport () { return _transport; diff --git a/src/java/com/threerings/presents/net/Transport.java b/src/java/com/threerings/presents/net/Transport.java index f20a3d04f..dce13e862 100644 --- a/src/java/com/threerings/presents/net/Transport.java +++ b/src/java/com/threerings/presents/net/Transport.java @@ -216,13 +216,13 @@ public class Transport (_channel == other._channel) ? _channel : 0); } - @Override // documentation inherited + @Override public int hashCode () { return 31*_type.hashCode() + _channel; } - @Override // documentation inherited + @Override public boolean equals (Object other) { Transport otrans; @@ -230,7 +230,7 @@ public class Transport otrans._channel == _channel; } - @Override // documentation inherited + @Override public String toString () { return "[type=" + _type + ", channel=" + _channel + "]"; diff --git a/src/java/com/threerings/presents/peer/data/NodeObject.java b/src/java/com/threerings/presents/peer/data/NodeObject.java index a76dd34d3..fd78a45e6 100644 --- a/src/java/com/threerings/presents/peer/data/NodeObject.java +++ b/src/java/com/threerings/presents/peer/data/NodeObject.java @@ -96,13 +96,13 @@ public class NodeObject extends DObject return this; } - @Override // documentation inherited + @Override public int hashCode () { return type.hashCode() + (id == null ? 0 : id.hashCode()); } - @Override // documentation inherited + @Override public boolean equals (Object other) { Lock olock = (Lock)other; diff --git a/src/java/com/threerings/presents/peer/server/PeerDispatcher.java b/src/java/com/threerings/presents/peer/server/PeerDispatcher.java index 5776c4aa1..a29657480 100644 --- a/src/java/com/threerings/presents/peer/server/PeerDispatcher.java +++ b/src/java/com/threerings/presents/peer/server/PeerDispatcher.java @@ -42,13 +42,13 @@ public class PeerDispatcher extends InvocationDispatcher this.provider = provider; } - @Override // documentation inherited + @Override public PeerMarshaller createMarshaller () { return new PeerMarshaller(); } - @Override // documentation inherited + @Override public void dispatchRequest ( ClientObject source, int methodId, Object[] args) throws InvocationException diff --git a/src/java/com/threerings/presents/peer/server/PeerManager.java b/src/java/com/threerings/presents/peer/server/PeerManager.java index c8c1029e2..4dc08bde7 100644 --- a/src/java/com/threerings/presents/peer/server/PeerManager.java +++ b/src/java/com/threerings/presents/peer/server/PeerManager.java @@ -1315,7 +1315,7 @@ public abstract class PeerManager } } - @Override // documentation inherited + @Override public String toString () { return "[node=" + getNodeName() + ", lock=" + _lock + ", acquire=" + _acquire + "]"; diff --git a/src/java/com/threerings/presents/server/TimeBaseDispatcher.java b/src/java/com/threerings/presents/server/TimeBaseDispatcher.java index bcc20257c..3241c8f3d 100644 --- a/src/java/com/threerings/presents/server/TimeBaseDispatcher.java +++ b/src/java/com/threerings/presents/server/TimeBaseDispatcher.java @@ -39,13 +39,13 @@ public class TimeBaseDispatcher extends InvocationDispatcher this.provider = provider; } - @Override // documentation inherited + @Override public TimeBaseMarshaller createMarshaller () { return new TimeBaseMarshaller(); } - @Override // documentation inherited + @Override public void dispatchRequest ( ClientObject source, int methodId, Object[] args) throws InvocationException diff --git a/src/java/com/threerings/presents/tools/decoder.tmpl b/src/java/com/threerings/presents/tools/decoder.tmpl index da87cafea..4a73dadae 100644 --- a/src/java/com/threerings/presents/tools/decoder.tmpl +++ b/src/java/com/threerings/presents/tools/decoder.tmpl @@ -27,13 +27,13 @@ public class ${name}Decoder extends InvocationDecoder this.receiver = receiver; } - @Override // documentation inherited + @Override public String getReceiverCode () { return RECEIVER_CODE; } - @Override // documentation inherited + @Override public void dispatchNotification (int methodId, Object[] args) { switch (methodId) { diff --git a/src/java/com/threerings/presents/tools/dispatcher.tmpl b/src/java/com/threerings/presents/tools/dispatcher.tmpl index ae8368a48..b9b85bec3 100644 --- a/src/java/com/threerings/presents/tools/dispatcher.tmpl +++ b/src/java/com/threerings/presents/tools/dispatcher.tmpl @@ -18,13 +18,13 @@ public class ${name}Dispatcher extends InvocationDispatcher<${name}Marshaller> this.provider = provider; } - @Override // documentation inherited + @Override public ${name}Marshaller createMarshaller () { return new ${name}Marshaller(); } - @Override // documentation inherited + @Override public void dispatchRequest ( ClientObject source, int methodId, Object[] args) throws InvocationException diff --git a/src/java/com/threerings/util/StreamableEnumSet.java b/src/java/com/threerings/util/StreamableEnumSet.java index 70b102b3f..fcde913c8 100644 --- a/src/java/com/threerings/util/StreamableEnumSet.java +++ b/src/java/com/threerings/util/StreamableEnumSet.java @@ -149,7 +149,7 @@ public class StreamableEnumSet> extends AbstractSet { } - @Override // documentation inherited + @Override public Iterator iterator () { return new Iterator() { @@ -184,13 +184,13 @@ public class StreamableEnumSet> extends AbstractSet }; } - @Override // documentation inherited + @Override public int size () { return _size; } - @Override // documentation inherited + @Override public boolean contains (Object o) { if (!_elementType.isInstance(o)) { @@ -201,7 +201,7 @@ public class StreamableEnumSet> extends AbstractSet return (_contents[idx] & mask) != 0; } - @Override // documentation inherited + @Override public boolean add (E o) { int ordinal = _elementType.cast(o).ordinal(); @@ -215,7 +215,7 @@ public class StreamableEnumSet> extends AbstractSet return false; } - @Override // documentation inherited + @Override public boolean remove (Object o) { if (!_elementType.isInstance(o)) { @@ -232,7 +232,7 @@ public class StreamableEnumSet> extends AbstractSet return false; } - @Override // documentation inherited + @Override public void clear () { Arrays.fill(_contents, (byte)0); @@ -240,7 +240,7 @@ public class StreamableEnumSet> extends AbstractSet _modcount++; } - @Override // documentation inherited + @Override public StreamableEnumSet clone () { try { diff --git a/tests/src/java/com/threerings/presents/server/TestDispatcher.java b/tests/src/java/com/threerings/presents/server/TestDispatcher.java index 36c363130..ac6e1f06b 100644 --- a/tests/src/java/com/threerings/presents/server/TestDispatcher.java +++ b/tests/src/java/com/threerings/presents/server/TestDispatcher.java @@ -41,13 +41,13 @@ public class TestDispatcher extends InvocationDispatcher this.provider = provider; } - @Override // documentation inherited + @Override public TestMarshaller createMarshaller () { return new TestMarshaller(); } - @Override // documentation inherited + @Override public void dispatchRequest ( ClientObject source, int methodId, Object[] args) throws InvocationException