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

Change Element.toXml() to toXml(String enclosingNamespace)

Browse source
This commit is contained in:
Florian Schmaus 2018-04-25 14:20:18 +02:00
parent 380f9a2b72
commit 5ab2903c32
229 changed files with 634 additions and 536 deletions
Download patch file Download diff file Expand all files Collapse all files

2
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Affiliation.java
View file

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

4
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/AffiliationsExtension.java
View file

@ -61,9 +61,9 @@ public class AffiliationsExtension extends NodeExtension {
}
@Override
public CharSequence toXML() {
public CharSequence toXML(String enclosingNamespace) {
if ((items == null) || (items.size() == 0)) {
return super.toXML();
return super.toXML(enclosingNamespace);
}
else {
// Can't use XmlStringBuilder(this), because we don't want the namespace to be included

4
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElement.java
View file

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

6
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java
View file

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

2
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/GetItemsRequest.java
View file

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

4
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Item.java
View file

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

8
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemsExtension.java
View file

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

4
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeExtension.java
View file

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

2
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/OptionsExtension.java
View file

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

6
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PayloadItem.java
View file

@ -130,11 +130,11 @@ public class PayloadItem<E extends ExtensionElement> extends Item {
}
@Override
public XmlStringBuilder toXML() {
public XmlStringBuilder toXML(String enclosingNamespace) {
XmlStringBuilder xml = getCommonXml();
xml.rightAngleBracket();
xml.append(payload.toXML());
xml.append(payload.toXML(null));
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() + "]";
return getClass().getName() + " | Content [" + toXML(null) + "]";
}
}

4
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishItem.java
View file

@ -51,7 +51,7 @@ public class PublishItem<T extends Item> extends NodeExtension {
}
@Override
public String toXML() {
public String toXML(String 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());
builder.append(item.toXML(null));
}
builder.append("</publish>");

2
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/RetractItem.java
View file

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

4
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SimplePayload.java
View file

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

2
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeExtension.java
View file

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

2
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Subscription.java
View file

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

6
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscriptionsExtension.java
View file

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

2
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/UnsubscribeExtension.java
View file

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