Author: berndf
Date: Wed Apr 18 23:50:24 2012
New Revision: 1327743
URL: http://svn.apache.org/viewvc?rev=1327743&view=rev
Log:
remove close() method from XMLElementListener
Modified:
mina/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMLElementListener.java
mina/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMPPContentHandler.java
mina/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMPPDecoder.java
mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/XMPPContentHandlerTestCase.java
mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/perf/PerfRunner.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/parser/XMLParserUtil.java
mina/vysper/trunk/server/extensions/websockets/src/main/java/org/apache/vysper/xmpp/extension/websockets/WebSocketBackedSessionContext.java
Modified:
mina/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMLElementListener.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMLElementListener.java?rev=1327743&r1=1327742&r2=1327743&view=diff
==============================================================================
---
mina/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMLElementListener.java
(original)
+++
mina/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMLElementListener.java
Wed Apr 18 23:50:24 2012
@@ -23,6 +23,4 @@ import org.apache.vysper.xml.fragment.XM
public interface XMLElementListener {
void element(XMLElement element);
- void close();
- boolean isClosed();
}
\ No newline at end of file
Modified:
mina/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMPPContentHandler.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMPPContentHandler.java?rev=1327743&r1=1327742&r2=1327743&view=diff
==============================================================================
---
mina/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMPPContentHandler.java
(original)
+++
mina/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMPPContentHandler.java
Wed Apr 18 23:50:24 2012
@@ -139,7 +139,7 @@ public class XMPPContentHandler implemen
* End of the XMPP stream. Tell the XML listener we're done.
*/
public void endDocument() throws SAXException {
- this.listener.close();
+ /* nothing to do */
}
/**
Modified:
mina/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMPPDecoder.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMPPDecoder.java?rev=1327743&r1=1327742&r2=1327743&view=diff
==============================================================================
---
mina/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMPPDecoder.java
(original)
+++
mina/vysper/trunk/nbxml/src/main/java/org/apache/vysper/xml/decoder/XMPPDecoder.java
Wed Apr 18 23:50:24 2012
@@ -99,7 +99,7 @@ public class XMPPDecoder extends Cumulat
}
XMPPContentHandler contentHandler = (XMPPContentHandler)
reader.getContentHandler();
- XMLElementListener listener = new MinaStanzaListener(out);
+ MinaStanzaListener listener = new MinaStanzaListener(out);
contentHandler.setListener(listener);
reader.parse(in, CharsetUtil.UTF8_DECODER);
Modified:
mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/XMPPContentHandlerTestCase.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/XMPPContentHandlerTestCase.java?rev=1327743&r1=1327742&r2=1327743&view=diff
==============================================================================
---
mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/XMPPContentHandlerTestCase.java
(original)
+++
mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/XMPPContentHandlerTestCase.java
Wed Apr 18 23:50:24 2012
@@ -39,14 +39,10 @@ public class XMPPContentHandlerTestCase
private static class TestListener implements XMLElementListener {
public List<XMLElement> elements = new ArrayList<XMLElement>();
- private boolean closed = false;
public void element(XMLElement element) {
elements.add(element);
}
-
- public void close() { closed = true; }
- public boolean isClosed() { return closed; }
}
public void test() throws Exception {
@@ -67,7 +63,6 @@ public class XMPPContentHandlerTestCase
assertEquals("stanza", actual.next().getName());
assertEquals("message", actual.next().getName());
assertEquals("iq", actual.next().getName());
- assertTrue(listener.isClosed());
}
private void parse(NonBlockingXMLReader reader, String xml) throws
Exception {
Modified:
mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/perf/PerfRunner.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/perf/PerfRunner.java?rev=1327743&r1=1327742&r2=1327743&view=diff
==============================================================================
---
mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/perf/PerfRunner.java
(original)
+++
mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/perf/PerfRunner.java
Wed Apr 18 23:50:24 2012
@@ -39,9 +39,6 @@ public class PerfRunner {
public void element(XMLElement element) {
counter++;
}
-
- public void close() {}
- public boolean isClosed() { return false; }
}
private static final String SINGLE_LEVEL_XML = "<child att='foo'
att2='bar'></child>";
Modified:
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/parser/XMLParserUtil.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/parser/XMLParserUtil.java?rev=1327743&r1=1327742&r2=1327743&view=diff
==============================================================================
---
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/parser/XMLParserUtil.java
(original)
+++
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/parser/XMLParserUtil.java
Wed Apr 18 23:50:24 2012
@@ -60,8 +60,6 @@ public class XMLParserUtil {
public void element(XMLElement element) {
documents.add(element);
}
- public void close() {}
- public boolean isClosed() { return false; }
});
IoBuffer buffer = IoBuffer.wrap(xml.getBytes("UTF-8"));
Modified:
mina/vysper/trunk/server/extensions/websockets/src/main/java/org/apache/vysper/xmpp/extension/websockets/WebSocketBackedSessionContext.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/websockets/src/main/java/org/apache/vysper/xmpp/extension/websockets/WebSocketBackedSessionContext.java?rev=1327743&r1=1327742&r2=1327743&view=diff
==============================================================================
---
mina/vysper/trunk/server/extensions/websockets/src/main/java/org/apache/vysper/xmpp/extension/websockets/WebSocketBackedSessionContext.java
(original)
+++
mina/vysper/trunk/server/extensions/websockets/src/main/java/org/apache/vysper/xmpp/extension/websockets/WebSocketBackedSessionContext.java
Wed Apr 18 23:50:24 2012
@@ -177,11 +177,4 @@ public class WebSocketBackedSessionConte
// TODO how to handle?
closed = true;
}
-
- /**
- * Implementation for XMLElementListener.
- */
- public boolean isClosed() {
- return closed;
- }
}
