Swiftdiff options
| author | Nick Hudson <nick.hudson@isode.com> | 2012-01-16 12:14:02 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-01-18 11:03:48 (GMT) |
| commit | 6665e38f97f95dd6e0fc574dc65a1be37b2b101f (patch) | |
| tree | a780670c4a15abca042a0c75fa172b40b1808a22 /src/com/isode/stroke/network | |
| parent | 839db071f46d083b86996f514f5fe0f2d6aee80a (diff) | |
| download | stroke-6665e38f97f95dd6e0fc574dc65a1be37b2b101f.zip stroke-6665e38f97f95dd6e0fc574dc65a1be37b2b101f.tar.bz2 | |
Add toString to some more classes
Also made "Stanza" be an abstract class and had its ".toString()" include
the name of the subclass which is involved, so that the subclasses don't
have to do that themselves.
Also added null check to existing HostAddress.toString() method
Also fixed Remko copyright in Connector class
Test-information:
Stuff is displayed as expected in debugger.
Diffstat (limited to 'src/com/isode/stroke/network')
| -rw-r--r-- | src/com/isode/stroke/network/Connector.java | 15 | ||||
| -rw-r--r-- | src/com/isode/stroke/network/HostAddress.java | 7 | ||||
| -rw-r--r-- | src/com/isode/stroke/network/HostAddressPort.java | 7 | ||||
| -rw-r--r-- | src/com/isode/stroke/network/JavaConnection.java | 11 |
4 files changed, 33 insertions, 7 deletions
diff --git a/src/com/isode/stroke/network/Connector.java b/src/com/isode/stroke/network/Connector.java index 9b086fa..01fd114 100644 --- a/src/com/isode/stroke/network/Connector.java +++ b/src/com/isode/stroke/network/Connector.java @@ -1,10 +1,9 @@ /* - * Copyright (c) 2010 Remko Tronçon - * Licensed under the GNU General Public License v3. - * See Documentation/Licenses/GPLv3.txt for more information. + * Copyright (c) 2010-2012, Isode Limited, London, England. + * All rights reserved. */ /* - * Copyright (c) 2010, Isode Limited, London, England. + * Copyright (c) 2010 Remko Tronçon * All rights reserved. */ package com.isode.stroke.network; @@ -195,6 +194,14 @@ public class Connector { private void handleTimeout() { finish(null); } + + @Override + public String toString() { + return "Connector to \"" + hostname + "\" " + + (currentConnection == null ? "not connected" : "using " + currentConnection); + } + + private String hostname; private DomainNameResolver resolver; private ConnectionFactory connectionFactory; diff --git a/src/com/isode/stroke/network/HostAddress.java b/src/com/isode/stroke/network/HostAddress.java index 94ae1f7..7145fb3 100644 --- a/src/com/isode/stroke/network/HostAddress.java +++ b/src/com/isode/stroke/network/HostAddress.java @@ -26,6 +26,11 @@ public class HostAddress { @Override public String toString() { + // toString() should always be callable without risking + // NullPointerException + if (address_ == null) { + return "<no address>"; + } return address_.getHostAddress(); } @@ -51,6 +56,6 @@ public class HostAddress { InetAddress getInetAddress() { return address_; } - + private final InetAddress address_; } diff --git a/src/com/isode/stroke/network/HostAddressPort.java b/src/com/isode/stroke/network/HostAddressPort.java index 66ba3a7..c7d46a4 100644 --- a/src/com/isode/stroke/network/HostAddressPort.java +++ b/src/com/isode/stroke/network/HostAddressPort.java @@ -4,7 +4,7 @@ * See Documentation/Licenses/GPLv3.txt for more information. */ /* - * Copyright (c) 2010, Isode Limited, London, England. + * Copyright (c) 2010-2012, Isode Limited, London, England. * All rights reserved. */ package com.isode.stroke.network; @@ -52,6 +52,11 @@ public class HostAddressPort { public boolean isValid() { return address_.isValid() && port_ > 0; } + + @Override + public String toString() { + return address_ + ":" + port_; + } private HostAddress address_; private int port_; } diff --git a/src/com/isode/stroke/network/JavaConnection.java b/src/com/isode/stroke/network/JavaConnection.java index 29ec0e0..d014f5d 100644 --- a/src/com/isode/stroke/network/JavaConnection.java +++ b/src/com/isode/stroke/network/JavaConnection.java @@ -4,7 +4,7 @@ * See Documentation/Licenses/GPLv3.txt for more information. */ /* - * Copyright (c) 2010-2011, Isode Limited, London, England. + * Copyright (c) 2010-2012, Isode Limited, London, England. * All rights reserved. */ package com.isode.stroke.network; @@ -169,6 +169,15 @@ public class JavaConnection extends Connection implements EventOwner { public HostAddressPort getLocalAddress() { return new HostAddressPort(new HostAddress(socket_.getLocalAddress()), socket_.getLocalPort()); } + + @Override + public String toString() + { + return "JavaConnection " + + (socket_ == null ? "with no socket configured" : "for " + getLocalAddress()) + + (disconnecting_ ? " (disconnecting)" : ""); + } + private final EventLoop eventLoop_; private boolean disconnecting_ = false; private Socket socket_; |