Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2012-09-21 17:28:38 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-09-21 17:28:38 (GMT) |
| commit | 88c4b4ac3e8609049d6ccd6de9f57d5eaef67558 (patch) | |
| tree | dc90089e711d2626af20bb0e5a4e127b18557dc6 /src/com/isode/stroke/parser | |
| parent | db2202a586a56842a32a9f22c6348d6d1ec5bce4 (diff) | |
| download | stroke-88c4b4ac3e8609049d6ccd6de9f57d5eaef67558.zip stroke-88c4b4ac3e8609049d6ccd6de9f57d5eaef67558.tar.bz2 | |
Remove superfluous event loop
Diffstat (limited to 'src/com/isode/stroke/parser')
| -rw-r--r-- | src/com/isode/stroke/parser/AaltoXMLParser.java | 4 | ||||
| -rw-r--r-- | src/com/isode/stroke/parser/PlatformXMLParserFactory.java | 9 | ||||
| -rw-r--r-- | src/com/isode/stroke/parser/XMPPParser.java | 4 |
3 files changed, 6 insertions, 11 deletions
diff --git a/src/com/isode/stroke/parser/AaltoXMLParser.java b/src/com/isode/stroke/parser/AaltoXMLParser.java index 52fabea..99618fa 100644 --- a/src/com/isode/stroke/parser/AaltoXMLParser.java +++ b/src/com/isode/stroke/parser/AaltoXMLParser.java @@ -21,12 +21,10 @@ class AaltoXMLParser extends XMLParser { private final Logger logger_ = Logger.getLogger(this.getClass().getName()); private boolean error_ = false; - private final EventLoop eventLoop_; private final AsyncXMLStreamReader xmlReader_ = new InputFactoryImpl().createAsyncXMLStreamReader(); - public AaltoXMLParser(XMLParserClient client, EventLoop eventLoop) { + public AaltoXMLParser(XMLParserClient client) { super(client); - eventLoop_ = eventLoop; } diff --git a/src/com/isode/stroke/parser/PlatformXMLParserFactory.java b/src/com/isode/stroke/parser/PlatformXMLParserFactory.java index 000eb7f..132dbe7 100644 --- a/src/com/isode/stroke/parser/PlatformXMLParserFactory.java +++ b/src/com/isode/stroke/parser/PlatformXMLParserFactory.java @@ -9,13 +9,10 @@ package com.isode.stroke.parser; -import com.isode.stroke.eventloop.EventLoop; public class PlatformXMLParserFactory { - /** - * Unlike Swiften, this may be threaded, and therefore needs an eventloop. - */ - public static XMLParser createXMLParser(XMLParserClient client, EventLoop eventLoop) { - return new AaltoXMLParser(client, eventLoop); + + public static XMLParser createXMLParser(XMLParserClient client) { + return new AaltoXMLParser(client); } } diff --git a/src/com/isode/stroke/parser/XMPPParser.java b/src/com/isode/stroke/parser/XMPPParser.java index 5da4100..516ab76 100644 --- a/src/com/isode/stroke/parser/XMPPParser.java +++ b/src/com/isode/stroke/parser/XMPPParser.java @@ -23,10 +23,10 @@ public class XMPPParser implements XMLParserClient { private boolean parseErrorOccurred_ = false; private Logger logger_ = Logger.getLogger(this.getClass().getName()); - public XMPPParser(XMPPParserClient parserClient, PayloadParserFactoryCollection payloadParserFactories, EventLoop eventLoop) { + public XMPPParser(XMPPParserClient parserClient, PayloadParserFactoryCollection payloadParserFactories) { client_ = parserClient; payloadParserFactories_ = payloadParserFactories; - xmlParser_ = PlatformXMLParserFactory.createXMLParser(this, eventLoop); + xmlParser_ = PlatformXMLParserFactory.createXMLParser(this); } public boolean parse(String data) { |