mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2025-09-10 18:59:41 +02:00
Fix typo in XmlStringBuilder, it's not an Angel
s/rightAngelBracket/rightAngleBracket/
This commit is contained in:
parent
066a4d6c9e
commit
bbf89c65bf
33 changed files with 77 additions and 62 deletions
|
@ -169,7 +169,7 @@ public class Bookmarks implements PrivateData {
|
|||
@Override
|
||||
public XmlStringBuilder toXML() {
|
||||
XmlStringBuilder buf = new XmlStringBuilder();
|
||||
buf.halfOpenElement(ELEMENT).xmlnsAttribute(NAMESPACE).rightAngelBracket();
|
||||
buf.halfOpenElement(ELEMENT).xmlnsAttribute(NAMESPACE).rightAngleBracket();
|
||||
|
||||
for (BookmarkedURL urlStorage : getBookmarkedURLS()) {
|
||||
if(urlStorage.isShared()) {
|
||||
|
@ -189,7 +189,7 @@ public class Bookmarks implements PrivateData {
|
|||
buf.attribute("name", conference.getName());
|
||||
buf.attribute("autojoin", Boolean.toString(conference.isAutoJoin()));
|
||||
buf.attribute("jid", conference.getJid());
|
||||
buf.rightAngelBracket();
|
||||
buf.rightAngleBracket();
|
||||
|
||||
buf.optElement("nick", conference.getNickname());
|
||||
buf.optElement("password", conference.getPassword());
|
||||
|
|
|
@ -138,7 +138,7 @@ public class DataPacketExtension implements PacketExtension {
|
|||
XmlStringBuilder xml = new XmlStringBuilder(this);
|
||||
xml.attribute("seq", Long.toString(seq));
|
||||
xml.attribute("sid", sessionID);
|
||||
xml.rightAngelBracket();
|
||||
xml.rightAngleBracket();
|
||||
xml.append(data);
|
||||
xml.closeElement(this);
|
||||
return xml;
|
||||
|
|
|
@ -224,7 +224,7 @@ public class Bytestream extends IQ {
|
|||
case set:
|
||||
xml.optAttribute("sid", getSessionID());
|
||||
xml.optAttribute("mode", getMode());
|
||||
xml.rightAngelBracket();
|
||||
xml.rightAngleBracket();
|
||||
if (getToActivate() == null) {
|
||||
for (StreamHost streamHost : getStreamHosts()) {
|
||||
xml.append(streamHost.toXML());
|
||||
|
@ -235,7 +235,7 @@ public class Bytestream extends IQ {
|
|||
}
|
||||
break;
|
||||
case result:
|
||||
xml.rightAngelBracket();
|
||||
xml.rightAngleBracket();
|
||||
if (getUsedHost() != null) {
|
||||
xml.append(getUsedHost().toXML());
|
||||
}
|
||||
|
@ -416,7 +416,7 @@ public class Bytestream extends IQ {
|
|||
@Override
|
||||
public XmlStringBuilder toXML() {
|
||||
XmlStringBuilder xml = new XmlStringBuilder(this);
|
||||
xml.rightAngelBracket();
|
||||
xml.rightAngleBracket();
|
||||
xml.escape(getTarget());
|
||||
xml.closeElement(this);
|
||||
return xml;
|
||||
|
|
|
@ -101,7 +101,7 @@ public class DelayInformation implements PacketExtension {
|
|||
XmlStringBuilder xml = new XmlStringBuilder(this);
|
||||
xml.attribute("stamp", XmppDateTime.formatXEP0082Date(stamp));
|
||||
xml.optAttribute("from", from);
|
||||
xml.rightAngelBracket();
|
||||
xml.rightAngleBracket();
|
||||
xml.optAppend(reason);
|
||||
xml.closeElement(this);
|
||||
return xml;
|
||||
|
|
|
@ -175,7 +175,7 @@ public class DiscoverInfo extends IQ implements Cloneable {
|
|||
xml.halfOpenElement("query");
|
||||
xml.xmlnsAttribute(NAMESPACE);
|
||||
xml.optAttribute("node", getNode());
|
||||
xml.rightAngelBracket();
|
||||
xml.rightAngleBracket();
|
||||
for (Identity identity : identities) {
|
||||
xml.append(identity.toXML());
|
||||
}
|
||||
|
|
|
@ -102,7 +102,7 @@ public class DiscoverItems extends IQ {
|
|||
xml.halfOpenElement("query");
|
||||
xml.xmlnsAttribute(NAMESPACE);
|
||||
xml.optAttribute("node", getNode());
|
||||
xml.rightAngelBracket();
|
||||
xml.rightAngleBracket();
|
||||
|
||||
for (Item item : items) {
|
||||
xml.append(item.toXML());
|
||||
|
|
|
@ -66,7 +66,7 @@ public class Forwarded implements PacketExtension {
|
|||
@Override
|
||||
public XmlStringBuilder toXML() {
|
||||
XmlStringBuilder xml = new XmlStringBuilder(this);
|
||||
xml.rightAngelBracket();
|
||||
xml.rightAngleBracket();
|
||||
xml.optElement(getDelayInformation());
|
||||
xml.append(forwardedPacket.toXML());
|
||||
xml.closeElement(this);
|
||||
|
|
|
@ -143,7 +143,7 @@ public class Version extends IQ {
|
|||
@Override
|
||||
public XmlStringBuilder getChildElementXML() {
|
||||
XmlStringBuilder xml = new XmlStringBuilder();
|
||||
xml.halfOpenElement(IQ.QUERY_ELEMENT).xmlnsAttribute(NAMESPACE).rightAngelBracket();
|
||||
xml.halfOpenElement(IQ.QUERY_ELEMENT).xmlnsAttribute(NAMESPACE).rightAngleBracket();
|
||||
// Although not really optional elements, 'name' and 'version' are not set when sending a
|
||||
// version request. So we must handle the case that those are 'null' here.
|
||||
xml.optElement("name", name);
|
||||
|
|
|
@ -137,7 +137,7 @@ public class JivePropertiesExtension implements PacketExtension {
|
|||
@Override
|
||||
public CharSequence toXML() {
|
||||
XmlStringBuilder xml = new XmlStringBuilder(this);
|
||||
xml.rightAngelBracket();
|
||||
xml.rightAngleBracket();
|
||||
// Loop through all properties and write them out.
|
||||
for (String name : getPropertyNames()) {
|
||||
Object value = getProperty(name);
|
||||
|
@ -209,7 +209,7 @@ public class JivePropertiesExtension implements PacketExtension {
|
|||
}
|
||||
}
|
||||
xml.attribute("type", type);
|
||||
xml.rightAngelBracket();
|
||||
xml.rightAngleBracket();
|
||||
xml.escape(valueStr);
|
||||
xml.closeElement("value");
|
||||
xml.closeElement("property");
|
||||
|
|
|
@ -72,7 +72,7 @@ public class Destroy implements Element {
|
|||
public XmlStringBuilder toXML() {
|
||||
XmlStringBuilder xml = new XmlStringBuilder(this);
|
||||
xml.optAttribute("jid", getJid());
|
||||
xml.rightAngelBracket();
|
||||
xml.rightAngleBracket();
|
||||
xml.optElement("reason", getReason());
|
||||
xml.closeElement(this);
|
||||
return xml;
|
||||
|
|
|
@ -66,7 +66,7 @@ public class MUCAdmin extends IQ {
|
|||
XmlStringBuilder xml = new XmlStringBuilder();
|
||||
xml.halfOpenElement(IQ.QUERY_ELEMENT);
|
||||
xml.xmlnsAttribute(NAMESPACE);
|
||||
xml.rightAngelBracket();
|
||||
xml.rightAngleBracket();
|
||||
synchronized (items) {
|
||||
for (MUCItem item : items) {
|
||||
xml.append(item.toXML());
|
||||
|
|
|
@ -56,7 +56,7 @@ public class MUCInitialPresence implements PacketExtension {
|
|||
@Override
|
||||
public XmlStringBuilder toXML() {
|
||||
XmlStringBuilder xml = new XmlStringBuilder(this);
|
||||
xml.rightAngelBracket();
|
||||
xml.rightAngleBracket();
|
||||
xml.optElement("password", getPassword());
|
||||
xml.optElement(getHistory());
|
||||
xml.closeElement(this);
|
||||
|
|
|
@ -173,7 +173,7 @@ public class MUCItem implements Element {
|
|||
xml.optAttribute("jid", getJid());
|
||||
xml.optAttribute("nick", getNick());
|
||||
xml.optAttribute("role", getRole());
|
||||
xml.rightAngelBracket();
|
||||
xml.rightAngleBracket();
|
||||
xml.optElement("reason", getReason());
|
||||
if (getActor() != null) {
|
||||
xml.halfOpenElement("actor").attribute("jid", getActor()).closeEmptyElement();
|
||||
|
|
|
@ -88,7 +88,7 @@ public class MUCOwner extends IQ {
|
|||
XmlStringBuilder xml = new XmlStringBuilder();
|
||||
xml.halfOpenElement(IQ.QUERY_ELEMENT);
|
||||
xml.xmlnsAttribute(NAMESPACE);
|
||||
xml.rightAngelBracket();
|
||||
xml.rightAngleBracket();
|
||||
synchronized (items) {
|
||||
for (MUCItem item : items) {
|
||||
xml.append(item.toXML());
|
||||
|
|
|
@ -51,7 +51,7 @@ public class MUCUser implements PacketExtension {
|
|||
@Override
|
||||
public XmlStringBuilder toXML() {
|
||||
XmlStringBuilder xml = new XmlStringBuilder(this);
|
||||
xml.rightAngelBracket();
|
||||
xml.rightAngleBracket();
|
||||
xml.optElement(getInvite());
|
||||
xml.optElement(getDecline());
|
||||
xml.optElement(getItem());
|
||||
|
@ -268,7 +268,7 @@ public class MUCUser implements PacketExtension {
|
|||
XmlStringBuilder xml = new XmlStringBuilder(this);
|
||||
xml.optAttribute("to", getTo());
|
||||
xml.optAttribute("from", getFrom());
|
||||
xml.rightAngelBracket();
|
||||
xml.rightAngleBracket();
|
||||
xml.optElement("reason", getReason());
|
||||
xml.closeElement(this);
|
||||
return xml;
|
||||
|
@ -354,7 +354,7 @@ public class MUCUser implements PacketExtension {
|
|||
XmlStringBuilder xml = new XmlStringBuilder(this);
|
||||
xml.optAttribute("to", getTo());
|
||||
xml.optAttribute("from", getFrom());
|
||||
xml.rightAngelBracket();
|
||||
xml.rightAngleBracket();
|
||||
xml.optElement("reason", getReason());
|
||||
xml.closeElement(this);
|
||||
return xml;
|
||||
|
|
|
@ -54,7 +54,7 @@ public class UserSearch extends IQ {
|
|||
XmlStringBuilder xml = new XmlStringBuilder();
|
||||
xml.halfOpenElement(IQ.QUERY_ELEMENT);
|
||||
xml.xmlnsAttribute(NAMESPACE);
|
||||
xml.rightAngelBracket();
|
||||
xml.rightAngleBracket();
|
||||
xml.append(getExtensionsXML());
|
||||
xml.closeElement(IQ.QUERY_ELEMENT);
|
||||
return xml;
|
||||
|
|
|
@ -271,7 +271,7 @@ public class FormField {
|
|||
buf.optAttribute("label", getLabel());
|
||||
buf.optAttribute("var", getVariable());
|
||||
buf.optAttribute("type", getType());
|
||||
buf.rightAngelBracket();
|
||||
buf.rightAngleBracket();
|
||||
// Add elements
|
||||
buf.optElement("desc", getDescription());
|
||||
buf.condEmptyElement(isRequired(), "required");
|
||||
|
@ -355,7 +355,7 @@ public class FormField {
|
|||
xml.halfOpenElement(ELEMENT);
|
||||
// Add attribute
|
||||
xml.optAttribute("label", getLabel());
|
||||
xml.rightAngelBracket();
|
||||
xml.rightAngleBracket();
|
||||
|
||||
// Add element
|
||||
xml.element("value", getValue());
|
||||
|
|
|
@ -214,7 +214,7 @@ public class DataForm implements PacketExtension {
|
|||
public XmlStringBuilder toXML() {
|
||||
XmlStringBuilder buf = new XmlStringBuilder(this);
|
||||
buf.attribute("type", getType());
|
||||
buf.rightAngelBracket();
|
||||
buf.rightAngleBracket();
|
||||
|
||||
buf.optElement("title", getTitle());
|
||||
for (String instruction : getInstructions()) {
|
||||
|
|
|
@ -56,7 +56,7 @@ public class XHTMLText {
|
|||
text.halfOpenElement(A);
|
||||
text.optAttribute(HREF, href);
|
||||
text.optAttribute(STYLE, style);
|
||||
text.rightAngelBracket();
|
||||
text.rightAngleBracket();
|
||||
return this;
|
||||
}
|
||||
|
||||
|
@ -78,7 +78,7 @@ public class XHTMLText {
|
|||
public XHTMLText appendOpenBlockQuoteTag(String style) {
|
||||
text.halfOpenElement(BLOCKQUOTE);
|
||||
text.optAttribute(STYLE, style);
|
||||
text.rightAngelBracket();
|
||||
text.rightAngleBracket();
|
||||
return this;
|
||||
}
|
||||
|
||||
|
@ -102,7 +102,7 @@ public class XHTMLText {
|
|||
text.xmlnsAttribute(NAMESPACE);
|
||||
text.optElement(STYLE, style);
|
||||
text.xmllangAttribute(lang);
|
||||
text.rightAngelBracket();
|
||||
text.rightAngleBracket();
|
||||
return this;
|
||||
}
|
||||
|
||||
|
@ -185,7 +185,7 @@ public class XHTMLText {
|
|||
}
|
||||
text.halfOpenElement(H + Integer.toString(level));
|
||||
text.optAttribute(STYLE, style);
|
||||
text.rightAngelBracket();
|
||||
text.rightAngleBracket();
|
||||
return this;
|
||||
}
|
||||
|
||||
|
@ -220,7 +220,7 @@ public class XHTMLText {
|
|||
text.optAttribute("height", height);
|
||||
text.optAttribute("src", src);
|
||||
text.optAttribute("width", width);
|
||||
text.rightAngelBracket();
|
||||
text.rightAngleBracket();
|
||||
return this;
|
||||
}
|
||||
|
||||
|
@ -235,7 +235,7 @@ public class XHTMLText {
|
|||
public XHTMLText appendLineItemTag(String style) {
|
||||
text.halfOpenElement(LI);
|
||||
text.optAttribute(STYLE, style);
|
||||
text.rightAngelBracket();
|
||||
text.rightAngleBracket();
|
||||
return this;
|
||||
}
|
||||
|
||||
|
@ -248,7 +248,7 @@ public class XHTMLText {
|
|||
public XHTMLText appendOpenOrderedListTag(String style) {
|
||||
text.halfOpenElement(OL);
|
||||
text.optAttribute(STYLE, style);
|
||||
text.rightAngelBracket();
|
||||
text.rightAngleBracket();
|
||||
return this;
|
||||
}
|
||||
|
||||
|
@ -272,7 +272,7 @@ public class XHTMLText {
|
|||
public XHTMLText appendOpenUnorderedListTag(String style) {
|
||||
text.halfOpenElement(UL);
|
||||
text.optAttribute(STYLE, style);
|
||||
text.rightAngelBracket();
|
||||
text.rightAngleBracket();
|
||||
return this;
|
||||
}
|
||||
|
||||
|
@ -296,7 +296,7 @@ public class XHTMLText {
|
|||
public XHTMLText appendOpenParagraphTag(String style) {
|
||||
text.halfOpenElement(P);
|
||||
text.optAttribute(STYLE, style);
|
||||
text.rightAngelBracket();
|
||||
text.rightAngleBracket();
|
||||
return this;
|
||||
}
|
||||
|
||||
|
@ -320,7 +320,7 @@ public class XHTMLText {
|
|||
public XHTMLText appendOpenInlinedQuoteTag(String style) {
|
||||
text.halfOpenElement(Q);
|
||||
text.optAttribute(STYLE, style);
|
||||
text.rightAngelBracket();
|
||||
text.rightAngleBracket();
|
||||
return this;
|
||||
}
|
||||
|
||||
|
@ -343,7 +343,7 @@ public class XHTMLText {
|
|||
public XHTMLText appendOpenSpanTag(String style) {
|
||||
text.halfOpenElement(SPAN);
|
||||
text.optAttribute(STYLE, style);
|
||||
text.rightAngelBracket();
|
||||
text.rightAngleBracket();
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -80,7 +80,7 @@ public class XHTMLExtension implements PacketExtension {
|
|||
@Override
|
||||
public XmlStringBuilder toXML() {
|
||||
XmlStringBuilder xml = new XmlStringBuilder(this);
|
||||
xml.rightAngelBracket();
|
||||
xml.rightAngleBracket();
|
||||
// Loop through all the bodies and append them to the string buffer
|
||||
for (CharSequence body : getBodies()) {
|
||||
xml.append(body);
|
||||
|
|
|
@ -76,7 +76,7 @@ public class DataTest {
|
|||
dataTag.xmlnsAttribute(DataPacketExtension.NAMESPACE);
|
||||
dataTag.attribute("seq", "0");
|
||||
dataTag.attribute("sid", "i781hf64");
|
||||
dataTag.rightAngelBracket();
|
||||
dataTag.rightAngleBracket();
|
||||
dataTag.escape(encodedData);
|
||||
dataTag.closeElement(DataPacketExtension.ELEMENT);
|
||||
when(dpe.toXML()).thenReturn(dataTag);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue