vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-10 01:29:38 +02:00
Code Issues Releases Wiki Activity

Fix typo in XmlStringBuilder, it's not an Angel

Browse source 
s/rightAngelBracket/rightAngleBracket/
This commit is contained in:
Florian Schmaus 2014-08-20 21:25:14 +02:00
parent 066a4d6c9e
commit bbf89c65bf
33 changed files with 77 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
smack-core/src/main/java/org/jivesoftware/smack/packet/Bind.java
View file

@ -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);

2
smack-core/src/main/java/org/jivesoftware/smack/packet/DefaultPacketExtension.java
View file

@ -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);

2
smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java
View file

@ -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.

6
smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java
View file

@ -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);
}

2
smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java
View file

@ -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) {

2
smack-core/src/main/java/org/jivesoftware/smack/packet/Registration.java
View file

@ -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()) {

4
smack-core/src/main/java/org/jivesoftware/smack/packet/RosterPacket.java
View file

@ -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);

4
smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java
View file

@ -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);
}

10
smack-core/src/main/java/org/jivesoftware/smack/sasl/packet/SaslStanzas.java
View file

@ -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;

2
smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
View file

@ -372,7 +372,7 @@ public class PacketParserUtils {
isEmptyElement = true;
}
else {
xml.rightAngelBracket();
xml.rightAngleBracket();
}
}
else if (event == XmlPullParser.END_TAG) {

25
smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
View file

@ -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("</").append(name);
rightAngelBracket();
rightAngleBracket();
return this;
}
@ -106,11 +106,26 @@ public class XmlStringBuilder implements Appendable, CharSequence {
return this;
}
public XmlStringBuilder rightAngelBracket() {
sb.append(RIGHT_ANGEL_BRACKET);
/**
* Add a right angle bracket '>'
*
* @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.
*