Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2012-10-18 16:27:38 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-10-18 16:27:38 (GMT) |
| commit | e1ab207943693a5d7c31d103f538f6c859c436ff (patch) | |
| tree | dbc5740fdb7cb17d304e08993c4d2b201a95f12e /src/com/isode/stroke/streamstack | |
| parent | b929d80743dca78406f0fb338175c90590a4ed67 (diff) | |
| download | stroke-e1ab207943693a5d7c31d103f538f6c859c436ff.zip stroke-e1ab207943693a5d7c31d103f538f6c859c436ff.tar.bz2 | |
And more cleanup
Change-Id: I49cf4cba01452b291655dfccdc134180270c1ff3
Diffstat (limited to 'src/com/isode/stroke/streamstack')
| -rw-r--r-- | src/com/isode/stroke/streamstack/XMPPLayer.java | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/com/isode/stroke/streamstack/XMPPLayer.java b/src/com/isode/stroke/streamstack/XMPPLayer.java index 8163998..34c25b5 100644 --- a/src/com/isode/stroke/streamstack/XMPPLayer.java +++ b/src/com/isode/stroke/streamstack/XMPPLayer.java @@ -29,7 +29,20 @@ import com.isode.stroke.signals.Signal1; * XML parsing being multi-threaded here. */ public class XMPPLayer implements HighLayer, XMPPParserClient { + public final Signal1<ProtocolHeader> onStreamStart = new Signal1<ProtocolHeader>(); + public final Signal1<Element> onElement = new Signal1<Element>(); + public final Signal1<ByteArray> onWriteData = new Signal1<ByteArray>(); + public final Signal1<ByteArray> onDataRead = new Signal1<ByteArray>(); + public final Signal onError = new Signal(); + private PayloadParserFactoryCollection payloadParserFactories_; + private XMPPParser xmppParser_; + private PayloadSerializerCollection payloadSerializers_; + private XMPPSerializer xmppSerializer_; + private boolean resetParserAfterParse_; + private boolean inParser_; + + public XMPPLayer( PayloadParserFactoryCollection payloadParserFactories, PayloadSerializerCollection payloadSerializers, @@ -80,12 +93,6 @@ public class XMPPLayer implements HighLayer, XMPPParserClient { writeDataToChildLayer(data); } - public final Signal1<ProtocolHeader> onStreamStart = new Signal1<ProtocolHeader>(); - public final Signal1<Element> onElement = new Signal1<Element>(); - public final Signal1<ByteArray> onWriteData = new Signal1<ByteArray>(); - public final Signal1<ByteArray> onDataRead = new Signal1<ByteArray>(); - public final Signal onError = new Signal(); - public void handleStreamStart(ProtocolHeader header) { onStreamStart.emit(header); } @@ -102,14 +109,6 @@ public class XMPPLayer implements HighLayer, XMPPParserClient { resetParserAfterParse_ = false; } - private PayloadParserFactoryCollection payloadParserFactories_; - private XMPPParser xmppParser_; - private PayloadSerializerCollection payloadSerializers_; - private XMPPSerializer xmppSerializer_; - private boolean resetParserAfterParse_; - private boolean inParser_; - private EventLoop eventLoop_; - /* Multiple-inheritance workarounds */ private StreamLayer fakeStreamLayer_ = new StreamLayer() { |