1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-12-12 22:11:07 +01:00

Introduce XmlEnvironment

This commit is contained in:
Florian Schmaus 2019-02-04 13:27:41 +01:00
parent dc780ffd6c
commit fee3ed81ca
229 changed files with 715 additions and 526 deletions

View file

@ -174,7 +174,7 @@ public class Affiliation implements ExtensionElement {
}
@Override
public XmlStringBuilder toXML(String enclosingNamespace) {
public XmlStringBuilder toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder(this);
xml.optAttribute("node", node);
xml.optAttribute("jid", jid);

View file

@ -61,7 +61,7 @@ public class AffiliationsExtension extends NodeExtension {
}
@Override
public CharSequence toXML(String enclosingNamespace) {
public CharSequence toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
if ((items == null) || (items.size() == 0)) {
return super.toXML(enclosingNamespace);
}

View file

@ -76,10 +76,10 @@ public class EventElement implements EmbeddedPacketExtension {
}
@Override
public XmlStringBuilder toXML(String enclosingNamespace) {
public XmlStringBuilder toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder(this);
xml.rightAngleBracket();
xml.append(ext.toXML(null));
xml.append(ext.toXML());
xml.closeElement(this);
return xml;
}

View file

@ -69,7 +69,7 @@ public class FormNode extends NodeExtension {
}
@Override
public CharSequence toXML(String enclosingNamespace) {
public CharSequence toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
if (configForm == null) {
return super.toXML(enclosingNamespace);
}
@ -84,7 +84,7 @@ public class FormNode extends NodeExtension {
}
else
builder.append('>');
builder.append(configForm.getDataFormToSend().toXML(null));
builder.append(configForm.getDataFormToSend().toXML());
builder.append("</");
builder.append(getElementName() + '>');
return builder.toString();

View file

@ -54,7 +54,7 @@ public class GetItemsRequest extends NodeExtension {
}
@Override
public XmlStringBuilder toXML(String enclosingNamespace) {
public XmlStringBuilder toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder();
xml.halfOpenElement(getElementName());
xml.attribute("node", getNode());

View file

@ -147,7 +147,7 @@ public class Item extends NodeExtension {
}
@Override
public XmlStringBuilder toXML(String enclosingNamespace) {
public XmlStringBuilder toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
XmlStringBuilder xml = getCommonXml();
xml.closeEmptyElement();
@ -166,7 +166,7 @@ public class Item extends NodeExtension {
@Override
public String toString() {
return getClass().getName() + " | Content [" + toXML(null) + "]";
return getClass().getName() + " | Content [" + toXML() + "]";
}
}

View file

@ -149,7 +149,7 @@ public class ItemsExtension extends NodeExtension implements EmbeddedPacketExten
}
@Override
public CharSequence toXML(String enclosingNamespace) {
public CharSequence toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
if ((items == null) || (items.size() == 0)) {
return super.toXML(enclosingNamespace);
}
@ -169,7 +169,7 @@ public class ItemsExtension extends NodeExtension implements EmbeddedPacketExten
else {
builder.append("'>");
for (NamedElement item : items) {
builder.append(item.toXML(null));
builder.append(item.toXML());
}
}
@ -182,7 +182,7 @@ public class ItemsExtension extends NodeExtension implements EmbeddedPacketExten
@Override
public String toString() {
return getClass().getName() + "Content [" + toXML(null) + "]";
return getClass().getName() + "Content [" + toXML() + "]";
}
}

View file

@ -78,12 +78,12 @@ public class NodeExtension implements ExtensionElement {
}
@Override
public CharSequence toXML(String enclosingNamespace) {
public CharSequence toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
return '<' + getElementName() + (node == null ? "" : " node='" + node + '\'') + "/>";
}
@Override
public String toString() {
return getClass().getName() + " - content [" + toXML(null) + "]";
return getClass().getName() + " - content [" + toXML() + "]";
}
}

View file

@ -50,7 +50,7 @@ public class OptionsExtension extends NodeExtension {
}
@Override
public XmlStringBuilder toXML(String enclosingNamespace) {
public XmlStringBuilder toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder();
xml.halfOpenElement(getElementName());
xml.attribute("jid", jid);

View file

@ -130,11 +130,11 @@ public class PayloadItem<E extends ExtensionElement> extends Item {
}
@Override
public XmlStringBuilder toXML(String enclosingNamespace) {
public XmlStringBuilder toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
XmlStringBuilder xml = getCommonXml();
xml.rightAngleBracket();
xml.append(payload.toXML(null));
xml.append(payload.toXML());
xml.closeElement(this);
return xml;
@ -142,6 +142,6 @@ public class PayloadItem<E extends ExtensionElement> extends Item {
@Override
public String toString() {
return getClass().getName() + " | Content [" + toXML(null) + "]";
return getClass().getName() + " | Content [" + toXML() + "]";
}
}

View file

@ -51,7 +51,7 @@ public class PublishItem<T extends Item> extends NodeExtension {
}
@Override
public String toXML(String enclosingNamespace) {
public String toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
StringBuilder builder = new StringBuilder("<");
builder.append(getElementName());
builder.append(" node='");
@ -59,7 +59,7 @@ public class PublishItem<T extends Item> extends NodeExtension {
builder.append("'>");
for (Item item : items) {
builder.append(item.toXML(null));
builder.append(item.toXML());
}
builder.append("</publish>");

View file

@ -54,7 +54,7 @@ public class RetractItem implements ExtensionElement {
}
@Override
public String toXML(String enclosingNamespace) {
public String toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
return "<retract id='" + id + "'/>";
}
}

View file

@ -93,12 +93,12 @@ public class SimplePayload implements ExtensionElement {
}
@Override
public String toXML(String enclosingNamespace) {
public String toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
return payload;
}
@Override
public String toString() {
return getClass().getName() + "payload [" + toXML(null) + "]";
return getClass().getName() + "payload [" + toXML() + "]";
}
}

View file

@ -39,7 +39,7 @@ public class SubscribeExtension extends NodeExtension {
}
@Override
public String toXML(String enclosingNamespace) {
public String toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
StringBuilder builder = new StringBuilder("<");
builder.append(getElementName());

View file

@ -138,7 +138,7 @@ public class Subscription extends NodeExtension {
}
@Override
public XmlStringBuilder toXML(String enclosingNamespace) {
public XmlStringBuilder toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
XmlStringBuilder builder = new XmlStringBuilder(this);
builder.attribute("jid", jid);

View file

@ -91,7 +91,7 @@ public class SubscriptionsExtension extends NodeExtension {
}
@Override
public CharSequence toXML(String enclosingNamespace) {
public CharSequence toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
if ((items == null) || (items.size() == 0)) {
return super.toXML(enclosingNamespace);
}
@ -107,7 +107,7 @@ public class SubscriptionsExtension extends NodeExtension {
builder.append('>');
for (Subscription item : items) {
builder.append(item.toXML(null));
builder.append(item.toXML());
}
builder.append("</");

View file

@ -51,7 +51,7 @@ public class UnsubscribeExtension extends NodeExtension {
}
@Override
public XmlStringBuilder toXML(String enclosingNamespace) {
public XmlStringBuilder toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder();
xml.halfOpenElement(getElementName());
xml.attribute("jid", jid);