From ea3b1cbccc1a22302b94d5e400aad6f7bd73bc60 Mon Sep 17 00:00:00 2001 From: vanitasvitae Date: Sat, 3 Jun 2017 23:30:37 +0200 Subject: [PATCH] Fix typos and xml issues --- .../smackx/jingle/JingleManager.java | 14 +++++++------- .../smackx/jingle/element/JingleContent.java | 10 +++++----- .../element/JingleContentDescription.java | 13 +++++++------ ... JingleContentDescriptionChildElement.java} | 2 +- .../jingle/element/JingleContentTransport.java | 18 ++++++++++++------ .../smackx/jingle/element/JingleError.java | 6 +++--- .../smackx/jingle/element/JingleReason.java | 8 ++++---- .../provider/JingleContentProviderManager.java | 4 ++-- 8 files changed, 41 insertions(+), 34 deletions(-) rename smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/{JingleContentDescriptionPayloadType.java => JingleContentDescriptionChildElement.java} (91%) diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java index 03fd4fe40..8b22f3f61 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java @@ -16,15 +16,10 @@ */ package org.jivesoftware.smackx.jingle; -import java.util.Map; -import java.util.WeakHashMap; -import java.util.concurrent.ConcurrentHashMap; -import java.util.logging.Logger; - import org.jivesoftware.smack.Manager; import org.jivesoftware.smack.XMPPConnection; -import org.jivesoftware.smack.iqrequest.IQRequestHandler.Mode; import org.jivesoftware.smack.iqrequest.AbstractIqRequestHandler; +import org.jivesoftware.smack.iqrequest.IQRequestHandler.Mode; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ.Type; import org.jivesoftware.smackx.jingle.element.Jingle; @@ -33,6 +28,11 @@ import org.jivesoftware.smackx.jingle.element.JingleContentDescription; import org.jxmpp.jid.FullJid; import org.jxmpp.jid.Jid; +import java.util.Map; +import java.util.WeakHashMap; +import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Logger; + public final class JingleManager extends Manager { private static final Logger LOGGER = Logger.getLogger(JingleManager.class.getName()); @@ -102,7 +102,7 @@ public final class JingleManager extends Manager { return jingleSessionHandlers.put(fullJidAndSessionId, sessionHandler); } - public JingleSessionHandler unregisterJingleSessionhandler(FullJid otherJid, String sessionId, JingleSessionHandler sessionHandler) { + public JingleSessionHandler unregisterJingleSessionHandler(FullJid otherJid, String sessionId, JingleSessionHandler sessionHandler) { FullJidAndSessionId fullJidAndSessionId = new FullJidAndSessionId(otherJid, sessionId); return jingleSessionHandlers.remove(fullJidAndSessionId); } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContent.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContent.java index ca5696bff..25bf61214 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContent.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContent.java @@ -16,15 +16,15 @@ */ package org.jivesoftware.smackx.jingle.element; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import org.jivesoftware.smack.packet.NamedElement; import org.jivesoftware.smack.util.Objects; import org.jivesoftware.smack.util.StringUtils; import org.jivesoftware.smack.util.XmlStringBuilder; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + /** * Jingle content element. */ @@ -140,7 +140,7 @@ public final class JingleContent implements NamedElement { @Override public XmlStringBuilder toXML() { - XmlStringBuilder xml = new XmlStringBuilder(); + XmlStringBuilder xml = new XmlStringBuilder(this); xml.attribute(CREATOR_ATTRIBUTE_NAME, creator); xml.optAttribute(DISPOSITION_ATTRIBUTE_NAME, disposition); xml.attribute(NAME_ATTRIBUTE_NAME, name); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescription.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescription.java index 7a1e6463f..98097662e 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescription.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescription.java @@ -16,12 +16,12 @@ */ package org.jivesoftware.smackx.jingle.element; -import java.util.Collections; -import java.util.List; - import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.util.XmlStringBuilder; +import java.util.Collections; +import java.util.List; + /** * Jingle content description. * @@ -30,9 +30,9 @@ public abstract class JingleContentDescription implements ExtensionElement { public static final String ELEMENT = "description"; - private final List payloads; + private final List payloads; - protected JingleContentDescription(List payloads) { + protected JingleContentDescription(List payloads) { if (payloads != null) { this.payloads = Collections.unmodifiableList(payloads); } @@ -46,7 +46,7 @@ public abstract class JingleContentDescription implements ExtensionElement { return ELEMENT; } - public List getJinglePayloadTypes() { + public List getJinglePayloadTypes() { return payloads; } @@ -62,6 +62,7 @@ public abstract class JingleContentDescription implements ExtensionElement { xml.append(payloads); + xml.closeElement(this); return xml; } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescriptionPayloadType.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescriptionChildElement.java similarity index 91% rename from smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescriptionPayloadType.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescriptionChildElement.java index ff525b0c1..bb09f205d 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescriptionPayloadType.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescriptionChildElement.java @@ -22,7 +22,7 @@ import org.jivesoftware.smack.packet.NamedElement; * An element found usually in 'description' elements. * */ -public abstract class JingleContentDescriptionPayloadType implements NamedElement { +public abstract class JingleContentDescriptionChildElement implements NamedElement { public static final String ELEMENT = "payload-type"; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentTransport.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentTransport.java index 5885c5ad8..fd6663d0e 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentTransport.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentTransport.java @@ -16,12 +16,12 @@ */ package org.jivesoftware.smackx.jingle.element; -import java.util.Collections; -import java.util.List; - import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.util.XmlStringBuilder; +import java.util.Collections; +import java.util.List; + /** * A jingle transport extension. * @@ -58,11 +58,17 @@ public abstract class JingleContentTransport implements ExtensionElement { public final XmlStringBuilder toXML() { XmlStringBuilder xml = new XmlStringBuilder(this); addExtraAttributes(xml); - xml.rightAngleBracket(); - xml.append(candidates); + if (candidates.isEmpty()) { + xml.closeEmptyElement(); + + } else { + + xml.rightAngleBracket(); + xml.append(candidates); + xml.closeElement(this); + } - xml.closeElement(this); return xml; } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleError.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleError.java index 6fa132893..3128484db 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleError.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleError.java @@ -17,11 +17,11 @@ package org.jivesoftware.smackx.jingle.element; -import java.util.Locale; - import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.util.XmlStringBuilder; +import java.util.Locale; + public final class JingleError implements ExtensionElement { public static String NAMESPACE = "urn:xmpp:jingle:errors:1"; @@ -39,7 +39,7 @@ public final class JingleError implements ExtensionElement { /** * Creates a new error with the specified code and errorName. * - * @param message a message describing the error. + * @param errorName a name describing the error. */ private JingleError(final String errorName) { this.errorName = errorName; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleReason.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleReason.java index b150832d3..8488b052d 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleReason.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleReason.java @@ -16,12 +16,12 @@ */ package org.jivesoftware.smackx.jingle.element; -import java.util.HashMap; -import java.util.Map; - import org.jivesoftware.smack.packet.NamedElement; import org.jivesoftware.smack.util.XmlStringBuilder; +import java.util.HashMap; +import java.util.Map; + /** * The Jingle 'reason' element. * @@ -96,7 +96,7 @@ public class JingleReason implements NamedElement { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); - xml.emptyElement(reason); + xml.emptyElement(reason.asString); xml.closeElement(this); return xml; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentProviderManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentProviderManager.java index a4592e45d..2144d1d01 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentProviderManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentProviderManager.java @@ -25,7 +25,7 @@ public class JingleContentProviderManager { private static final Map> jingleContentTransportProviders = new ConcurrentHashMap<>(); - public static JingleContentDescriptionProvider addJingleContentDescrptionProvider(String namespace, + public static JingleContentDescriptionProvider addJingleContentDescriptionProvider(String namespace, JingleContentDescriptionProvider provider) { return jingleContentDescriptionProviders.put(namespace, provider); } @@ -34,7 +34,7 @@ public class JingleContentProviderManager { return jingleContentDescriptionProviders.get(namespace); } - public static JingleContentTransportProvider addJingleContentDescrptionProvider(String namespace, + public static JingleContentTransportProvider addJingleContentTransportProvider(String namespace, JingleContentTransportProvider provider) { return jingleContentTransportProviders.put(namespace, provider); }