From bbf89c65bfd8bbdd3489a2db17a2b0d175a23479 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Wed, 20 Aug 2014 21:25:14 +0200 Subject: [PATCH] Fix typo in XmlStringBuilder, it's not an Angel s/rightAngelBracket/rightAngleBracket/ --- .../org/jivesoftware/smack/packet/Bind.java | 2 +- .../smack/packet/DefaultPacketExtension.java | 2 +- .../org/jivesoftware/smack/packet/IQ.java | 2 +- .../jivesoftware/smack/packet/Message.java | 6 ++--- .../jivesoftware/smack/packet/Presence.java | 2 +- .../smack/packet/Registration.java | 2 +- .../smack/packet/RosterPacket.java | 4 +-- .../jivesoftware/smack/packet/XMPPError.java | 4 +-- .../smack/sasl/packet/SaslStanzas.java | 10 ++++---- .../smack/util/PacketParserUtils.java | 2 +- .../smack/util/XmlStringBuilder.java | 25 +++++++++++++++---- .../carbons/packet/CarbonExtension.java | 2 +- .../smackx/bookmarks/Bookmarks.java | 4 +-- .../ibb/packet/DataPacketExtension.java | 2 +- .../bytestreams/socks5/packet/Bytestream.java | 6 ++--- .../smackx/delay/packet/DelayInformation.java | 2 +- .../smackx/disco/packet/DiscoverInfo.java | 2 +- .../smackx/disco/packet/DiscoverItems.java | 2 +- .../smackx/forward/Forwarded.java | 2 +- .../smackx/iqversion/packet/Version.java | 2 +- .../packet/JivePropertiesExtension.java | 4 +-- .../smackx/muc/packet/Destroy.java | 2 +- .../smackx/muc/packet/MUCAdmin.java | 2 +- .../smackx/muc/packet/MUCInitialPresence.java | 2 +- .../smackx/muc/packet/MUCItem.java | 2 +- .../smackx/muc/packet/MUCOwner.java | 2 +- .../smackx/muc/packet/MUCUser.java | 6 ++--- .../smackx/search/UserSearch.java | 2 +- .../jivesoftware/smackx/xdata/FormField.java | 4 +-- .../smackx/xdata/packet/DataForm.java | 2 +- .../smackx/xhtmlim/XHTMLText.java | 22 ++++++++-------- .../smackx/xhtmlim/packet/XHTMLExtension.java | 2 +- .../bytestreams/ibb/packet/DataTest.java | 2 +- 33 files changed, 77 insertions(+), 62 deletions(-) diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Bind.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Bind.java index f9a9b4f71..df424ed75 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Bind.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Bind.java @@ -55,7 +55,7 @@ public class Bind extends IQ { public XmlStringBuilder getChildElementXML() { XmlStringBuilder xml = new XmlStringBuilder(); - xml.halfOpenElement(ELEMENT).xmlnsAttribute(NAMESPACE).rightAngelBracket(); + xml.halfOpenElement(ELEMENT).xmlnsAttribute(NAMESPACE).rightAngleBracket(); xml.optElement("resource", resource); xml.optElement("jid", jid); xml.closeElement(ELEMENT); diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/DefaultPacketExtension.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/DefaultPacketExtension.java index 71b9e6142..45f32c0b9 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/DefaultPacketExtension.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/DefaultPacketExtension.java @@ -84,7 +84,7 @@ public class DefaultPacketExtension implements PacketExtension { @Override public CharSequence toXML() { XmlStringBuilder buf = new XmlStringBuilder(); - buf.halfOpenElement(elementName).xmlnsAttribute(namespace).rightAngelBracket(); + buf.halfOpenElement(elementName).xmlnsAttribute(namespace).rightAngleBracket(); for (String name : getNames()) { String value = getValue(name); buf.element(name, value); diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java index 9d619f368..e31d18dc7 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java @@ -86,7 +86,7 @@ public abstract class IQ extends Packet { else { buf.attribute("type", type.toString()); } - buf.rightAngelBracket(); + buf.rightAngleBracket(); // Add the query section if there is one. buf.optAppend(getChildElementXML()); // Add the error sub-packet, if there is one. diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java index 777781b0b..ae1192a46 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java @@ -422,7 +422,7 @@ public class Message extends Packet { if (type != Type.normal) { buf.attribute("type", type); } - buf.rightAngelBracket(); + buf.rightAngleBracket(); // Add the subject in the default language Subject defaultSubject = getMessageSubject(null); @@ -434,7 +434,7 @@ public class Message extends Packet { // Skip the default language if(subject.equals(defaultSubject)) continue; - buf.halfOpenElement("subject").xmllangAttribute(subject.language).rightAngelBracket(); + buf.halfOpenElement("subject").xmllangAttribute(subject.language).rightAngleBracket(); buf.escape(subject.subject); buf.closeElement("subject"); } @@ -448,7 +448,7 @@ public class Message extends Packet { // Skip the default language if(body.equals(defaultBody)) continue; - buf.halfOpenElement(BODY).xmllangAttribute(body.getLanguage()).rightAngelBracket(); + buf.halfOpenElement(BODY).xmllangAttribute(body.getLanguage()).rightAngleBracket(); buf.escape(body.getMessage()); buf.closeElement(BODY); } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java index 03538808d..994e84665 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java @@ -234,7 +234,7 @@ public class Presence extends Packet { if (type != Type.available) { buf.attribute("type", type); } - buf.rightAngelBracket(); + buf.rightAngleBracket(); buf.optElement("status", status); if (priority != Integer.MIN_VALUE) { diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Registration.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Registration.java index 5e15be995..b4b7894dc 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Registration.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Registration.java @@ -92,7 +92,7 @@ public class Registration extends IQ { XmlStringBuilder xml = new XmlStringBuilder(); xml.halfOpenElement("query"); xml.xmlnsAttribute("jabber:iq:register"); - xml.rightAngelBracket(); + xml.rightAngleBracket(); xml.optElement("instructions", instructions); if (attributes != null && attributes.size() > 0) { for (String name : attributes.keySet()) { diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/RosterPacket.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/RosterPacket.java index cddff51ad..3ab7d87b5 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/RosterPacket.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/RosterPacket.java @@ -76,7 +76,7 @@ public class RosterPacket extends IQ { buf.halfOpenElement("query"); buf.xmlnsAttribute("jabber:iq:roster"); buf.optAttribute("ver", rosterVersion); - buf.rightAngelBracket(); + buf.rightAngleBracket(); synchronized (rosterItems) { for (Item entry : rosterItems) { @@ -220,7 +220,7 @@ public class RosterPacket extends IQ { xml.optAttribute("name", name); xml.optAttribute("subscription", itemType); xml.optAttribute("ask", itemStatus); - xml.rightAngelBracket(); + xml.rightAngleBracket(); for (String groupName : groupNames) { xml.openElement(GROUP).escape(groupName).closeElement(GROUP); diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java index 367286e32..94f6b43fd 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java @@ -162,7 +162,7 @@ public class XMPPError { XmlStringBuilder xml = new XmlStringBuilder(); xml.halfOpenElement(ERROR); xml.optAttribute("type", type.name().toLowerCase(Locale.US)); - xml.rightAngelBracket(); + xml.rightAngleBracket(); if (condition != null) { xml.halfOpenElement(condition); @@ -173,7 +173,7 @@ public class XMPPError { xml.halfOpenElement(Packet.TEXT); xml.xmllangAttribute("en"); xml.xmlnsAttribute(NAMESPACE); - xml.rightAngelBracket(); + xml.rightAngleBracket(); xml.escape(message); xml.closeElement(Packet.TEXT); } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/sasl/packet/SaslStanzas.java b/smack-core/src/main/java/org/jivesoftware/smack/sasl/packet/SaslStanzas.java index 30098f4ba..2321045a3 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/sasl/packet/SaslStanzas.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/sasl/packet/SaslStanzas.java @@ -47,7 +47,7 @@ public class SaslStanzas { @Override public XmlStringBuilder toXML() { XmlStringBuilder xml = new XmlStringBuilder(); - xml.halfOpenElement(ELEMENT).xmlnsAttribute(NAMESPACE).attribute("mechanism", mechanism).rightAngelBracket(); + xml.halfOpenElement(ELEMENT).xmlnsAttribute(NAMESPACE).attribute("mechanism", mechanism).rightAngleBracket(); xml.optAppend(authenticationText); xml.closeElement(ELEMENT); return xml; @@ -69,7 +69,7 @@ public class SaslStanzas { @Override public XmlStringBuilder toXML() { XmlStringBuilder xml = new XmlStringBuilder().halfOpenElement(ELEMENT).xmlnsAttribute( - NAMESPACE).rightAngelBracket(); + NAMESPACE).rightAngleBracket(); xml.optAppend(data); xml.closeElement(ELEMENT); return xml; @@ -95,7 +95,7 @@ public class SaslStanzas { @Override public XmlStringBuilder toXML() { XmlStringBuilder xml = new XmlStringBuilder(); - xml.halfOpenElement(ELEMENT).xmlnsAttribute(NAMESPACE).rightAngelBracket(); + xml.halfOpenElement(ELEMENT).xmlnsAttribute(NAMESPACE).rightAngleBracket(); xml.optAppend(authenticationText); xml.closeElement(ELEMENT); return xml; @@ -132,7 +132,7 @@ public class SaslStanzas { @Override public XmlStringBuilder toXML() { XmlStringBuilder xml = new XmlStringBuilder(); - xml.halfOpenElement(ELEMENT).xmlnsAttribute(NAMESPACE).rightAngelBracket(); + xml.halfOpenElement(ELEMENT).xmlnsAttribute(NAMESPACE).rightAngleBracket(); xml.optAppend(data); xml.closeElement(ELEMENT); return xml; @@ -180,7 +180,7 @@ public class SaslStanzas { @Override public XmlStringBuilder toXML() { XmlStringBuilder xml = new XmlStringBuilder(); - xml.halfOpenElement(ELEMENT).xmlnsAttribute(ELEMENT).rightAngelBracket(); + xml.halfOpenElement(ELEMENT).xmlnsAttribute(ELEMENT).rightAngleBracket(); xml.emptyElement(saslErrorString); xml.closeElement(ELEMENT); return xml; diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java index 3119a6804..968442840 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java @@ -372,7 +372,7 @@ public class PacketParserUtils { isEmptyElement = true; } else { - xml.rightAngelBracket(); + xml.rightAngleBracket(); } } else if (event == XmlPullParser.END_TAG) { diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java b/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java index 9f3a1bdab..888d7b839 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java @@ -20,7 +20,7 @@ import org.jivesoftware.smack.packet.Element; import org.jivesoftware.smack.packet.PacketExtension; public class XmlStringBuilder implements Appendable, CharSequence { - public static final String RIGHT_ANGEL_BRACKET = Character.toString('>'); + public static final String RIGHT_ANGLE_BRACKET = Character.toString('>'); private final LazyStringBuilder sb; @@ -86,13 +86,13 @@ public class XmlStringBuilder implements Appendable, CharSequence { } public XmlStringBuilder openElement(String name) { - halfOpenElement(name).rightAngelBracket(); + halfOpenElement(name).rightAngleBracket(); return this; } public XmlStringBuilder closeElement(String name) { sb.append("' + * + * @return a reference to this object. + */ + public XmlStringBuilder rightAngleBracket() { + sb.append(RIGHT_ANGLE_BRACKET); return this; } + /** + * + * @return a reference to this object + * @deprecated use {@link #rightAngleBracket()} instead + */ + @Deprecated + public XmlStringBuilder rightAngelBracket() { + return rightAngleBracket(); + } + /** * Does nothing if value is null. * diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java index 88248e074..9590367c8 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java @@ -80,7 +80,7 @@ public class CarbonExtension implements PacketExtension { @Override public XmlStringBuilder toXML() { XmlStringBuilder xml = new XmlStringBuilder(this); - xml.rightAngelBracket(); + xml.rightAngleBracket(); xml.append(fwd.toXML()); xml.closeElement(this); return xml; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java index 6c1dfe599..735ed17c7 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java @@ -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()); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java index c02ef7364..6749feaf5 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java @@ -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; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java index 1d3b65cbe..b7abb17f5 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java @@ -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; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java index 6692d6496..c27c4fbb5 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java @@ -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; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java index 135f9d89a..61b26d082 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java @@ -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()); } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java index 2edbc613b..7f295d88a 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java @@ -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()); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/Forwarded.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/Forwarded.java index f40826e54..f34c0a306 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/Forwarded.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/Forwarded.java @@ -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); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/packet/Version.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/packet/Version.java index 5d1627cc4..e87843be5 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/packet/Version.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/packet/Version.java @@ -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); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/packet/JivePropertiesExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/packet/JivePropertiesExtension.java index be50315f6..7abac4e32 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/packet/JivePropertiesExtension.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/packet/JivePropertiesExtension.java @@ -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"); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/Destroy.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/Destroy.java index b14931f08..f1bbf8929 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/Destroy.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/Destroy.java @@ -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; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java index 37c957233..ed264288e 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java @@ -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()); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java index 64ae7363d..ce568e3a3 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java @@ -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); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCItem.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCItem.java index e5d888668..f032dce41 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCItem.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCItem.java @@ -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(); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java index 1767adb96..8f9352a14 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java @@ -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()); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java index cbf7d5ade..764737e26 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java @@ -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; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java index 395aad5a5..804594f0b 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java @@ -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; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java index 5b8172f5c..92facb542 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java @@ -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()); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java index 9090a370a..b0f759c85 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java @@ -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()) { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLText.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLText.java index 6a65f6450..1848104b9 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLText.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLText.java @@ -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; } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java index 5325ab3de..0bf793169 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java @@ -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); diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java index 0bda270e9..75001699d 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java @@ -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);