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

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

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

View file

@ -132,7 +132,7 @@ public final class JingleContent implements NamedElement {
}
@Override
public XmlStringBuilder toXML() {
public XmlStringBuilder toXML(String enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder(this);
xml.attribute(CREATOR_ATTRIBUTE_NAME, creator);
xml.optAttribute(DISPOSITION_ATTRIBUTE_NAME, disposition);

View file

@ -56,7 +56,7 @@ public abstract class JingleContentDescription implements ExtensionElement {
}
@Override
public XmlStringBuilder toXML() {
public XmlStringBuilder toXML(String enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder(this);
addExtraAttributes(xml);
xml.rightAngleBracket();

View file

@ -66,7 +66,7 @@ public abstract class JingleContentTransport implements ExtensionElement {
}
@Override
public XmlStringBuilder toXML() {
public XmlStringBuilder toXML(String enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder(this);
addExtraAttributes(xml);

View file

@ -55,7 +55,7 @@ public final class JingleError implements ExtensionElement {
}
@Override
public XmlStringBuilder toXML() {
public XmlStringBuilder toXML(String enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder(this);
xml.closeEmptyElement();
return xml;

View file

@ -114,7 +114,7 @@ public class JingleReason implements NamedElement {
}
@Override
public XmlStringBuilder toXML() {
public XmlStringBuilder toXML(String enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder(this);
xml.rightAngleBracket();
@ -143,7 +143,7 @@ public class JingleReason implements NamedElement {
}
@Override
public XmlStringBuilder toXML() {
public XmlStringBuilder toXML(String enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder(this);
xml.rightAngleBracket();

View file

@ -39,8 +39,8 @@ public final class UnknownJingleContentDescription extends JingleContentDescript
}
@Override
public XmlStringBuilder toXML() {
return standardExtensionElement.toXML();
public XmlStringBuilder toXML(String enclosingNamespace) {
return standardExtensionElement.toXML(null);
}
public StandardExtensionElement getStandardExtensionElement() {

View file

@ -41,8 +41,8 @@ public final class UnknownJingleContentTransport extends JingleContentTransport
}
@Override
public XmlStringBuilder toXML() {
return standardExtensionElement.toXML();
public XmlStringBuilder toXML(String enclosingNamespace) {
return standardExtensionElement.toXML(null);
}
@Override

View file

@ -86,6 +86,6 @@ public class JingleIBBTransport extends JingleContentTransport {
@Override
public int hashCode() {
return this.toXML().toString().hashCode();
return this.toXML(null).toString().hashCode();
}
}

View file

@ -130,7 +130,7 @@ public final class JingleS5BTransportCandidate extends JingleContentTransportCan
}
@Override
public CharSequence toXML() {
public CharSequence toXML(String enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder();
xml.halfOpenElement(this);
xml.attribute(ATTR_CID, cid);

View file

@ -38,7 +38,7 @@ public abstract class JingleS5BTransportInfo extends JingleContentTransportInfo
}
@Override
public final XmlStringBuilder toXML() {
public final XmlStringBuilder toXML(String enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder();
xml.halfOpenElement(this);
xml.attribute(ATTR_CID, getCandidateId());
@ -53,7 +53,7 @@ public abstract class JingleS5BTransportInfo extends JingleContentTransportInfo
}
JingleS5BCandidateTransportInfo otherCandidateTransportInfo = (JingleS5BCandidateTransportInfo) other;
return toXML().equals(otherCandidateTransportInfo.toXML());
return toXML(null).equals(otherCandidateTransportInfo.toXML(null));
}
@Override
@ -102,7 +102,7 @@ public abstract class JingleS5BTransportInfo extends JingleContentTransportInfo
}
@Override
public XmlStringBuilder toXML() {
public XmlStringBuilder toXML(String enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder();
xml.halfOpenElement(this);
xml.closeEmptyElement();
@ -116,7 +116,7 @@ public abstract class JingleS5BTransportInfo extends JingleContentTransportInfo
@Override
public int hashCode() {
return toXML().toString().hashCode();
return toXML(null).toString().hashCode();
}
}
@ -134,7 +134,7 @@ public abstract class JingleS5BTransportInfo extends JingleContentTransportInfo
}
@Override
public CharSequence toXML() {
public CharSequence toXML(String enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder();
xml.halfOpenElement(this);
xml.closeEmptyElement();
@ -148,7 +148,7 @@ public abstract class JingleS5BTransportInfo extends JingleContentTransportInfo
@Override
public int hashCode() {
return toXML().toString().hashCode();
return toXML(null).toString().hashCode();
}
}
}