diff --git a/xmpp/disco/Items.hx b/xmpp/disco/Items.hx
index dd2b572..45f6b59 100644
--- a/xmpp/disco/Items.hx
+++ b/xmpp/disco/Items.hx
@@ -19,7 +19,7 @@ package xmpp.disco;
class Items extends List<xmpp.disco.Item> {
- public static inline var XMLNS = xmpp.NS.PROTOCOL+'/disco#items';
+ public static var XMLNS = xmpp.NS.PROTOCOL+'/disco#items';
public var node : String;
@@ -29,24 +29,22 @@ class Items extends List<xmpp.disco.Item> {
}
public function toXml() : Xml {
- var q = xmpp.IQ.createQueryXml( XMLNS );
- if( node != null ) q.set( "node", node );
- if( !isEmpty() ) {
- for( i in iterator() ) {
- var item = Xml.createElement( 'item' );
- if( i.jid != null ) item.set( "jid", i.jid );
- if( i.name != null ) item.set( "name", i.name );
- q.addChild( item );
- }
- }
- return q;
+ var x = xmpp.IQ.createQueryXml( XMLNS );
+ if( node != null ) x.set( "node", node );
+ for( i in iterator() )
+ x.addChild( i.toXml() );
+ return x;
+ }
+
+ public override function toString() : String {
+ return toXml().toString();
}
public static function parse( x : Xml ) : Items {
- var items = new Items( x.get( "node" ) );
+ var i = new Items( x.get( "node" ) );
for( f in x.elementsNamed( "item" ) )
- items.add( xmpp.disco.Item.parse( f ) );
- return items;
+ i.add( xmpp.disco.Item.parse( f ) );
+ return i;
}
}