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
This commit is contained in:
@@ -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 +
|
||||
|
||||
@@ -66,6 +66,7 @@ public class AuthResponse extends DownstreamMessage
|
||||
_data = data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString ()
|
||||
{
|
||||
return "[type=ARSP, msgid=" + messageId + ", data=" + _data + "]";
|
||||
|
||||
@@ -52,6 +52,7 @@ public class BootstrapNotification extends DownstreamMessage
|
||||
return _data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString ()
|
||||
{
|
||||
return "[type=BOOT, msgid=" + messageId + ", data=" + _data + "]";
|
||||
|
||||
@@ -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("[");
|
||||
|
||||
@@ -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 + "]";
|
||||
|
||||
@@ -59,6 +59,7 @@ public class EventNotification extends DownstreamMessage
|
||||
return _event.getTransport();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString ()
|
||||
{
|
||||
return "[type=EVT, evt=" + _event + "]";
|
||||
|
||||
@@ -50,6 +50,7 @@ public class FailureResponse extends DownstreamMessage
|
||||
return _message;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString ()
|
||||
{
|
||||
return "[type=FAIL, msgid=" + messageId + ", oid=" + _oid + ", msg=" + _message + "]";
|
||||
|
||||
@@ -62,6 +62,7 @@ public class ForwardEventRequest extends UpstreamMessage
|
||||
return _event.getTransport();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString ()
|
||||
{
|
||||
return "[type=FWD, evt=" + _event + "]";
|
||||
|
||||
@@ -31,6 +31,7 @@ public class LogoffRequest extends UpstreamMessage
|
||||
super();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString ()
|
||||
{
|
||||
return "[type=LOGOFF, msgid=" + messageId + "]";
|
||||
|
||||
@@ -47,6 +47,7 @@ public class ObjectResponse<T extends DObject>
|
||||
return _dobj;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString ()
|
||||
{
|
||||
return "[type=ORSP, msgid=" + messageId + ", obj=" + _dobj + "]";
|
||||
|
||||
@@ -105,6 +105,7 @@ public class PingRequest extends UpstreamMessage
|
||||
return _transport;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString ()
|
||||
{
|
||||
return "[type=PING, msgid=" + messageId + ", transport=" + _transport + "]";
|
||||
|
||||
@@ -125,6 +125,7 @@ public class PongResponse extends DownstreamMessage
|
||||
return _transport;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString ()
|
||||
{
|
||||
return "[type=PONG, msgid=" + messageId + ", transport=" + _transport + "]";
|
||||
|
||||
@@ -48,6 +48,7 @@ public class SubscribeRequest extends UpstreamMessage
|
||||
return _oid;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString ()
|
||||
{
|
||||
return "[type=SUB, msgid=" + messageId + ", oid=" + _oid + "]";
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -48,6 +48,7 @@ public class UnsubscribeRequest extends UpstreamMessage
|
||||
return _oid;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString ()
|
||||
{
|
||||
return "[type=UNSUB, msgid=" + messageId + ", oid=" + _oid + "]";
|
||||
|
||||
@@ -49,6 +49,7 @@ public class UnsubscribeResponse extends DownstreamMessage
|
||||
return _oid;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString ()
|
||||
{
|
||||
return "[type=UNACK, msgid=" + messageId + ", oid=" + _oid + "]";
|
||||
|
||||
@@ -52,6 +52,7 @@ public abstract class UpstreamMessage extends Message
|
||||
this.messageId = nextMessageId();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString ()
|
||||
{
|
||||
return "[msgid=" + messageId + "]";
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user