vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add PacketUtil.extensionElementFrom() 

and deprecate extensionElementfromCollection()
This commit is contained in:
Florian Schmaus 2015-01-19 08:38:41 +01:00
parent 6bf9498904
commit 8409dddffd
4 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractError.java
View File

@ -92,7 +92,7 @@ public class AbstractError {
* @return the extension, or <tt>null</tt> if it doesn't exist. * @return the extension, or <tt>null</tt> if it doesn't exist.
*/ */
public <PE extends PacketExtension> PE getExtension(String elementName, String namespace) { public <PE extends PacketExtension> PE getExtension(String elementName, String namespace) {
return PacketUtil.packetExtensionfromCollection(extensions, elementName, namespace); return PacketUtil.extensionElementFrom(extensions, elementName, namespace);
} }
protected void addDescriptiveTextsAndExtensions(XmlStringBuilder xml) { protected void addDescriptiveTextsAndExtensions(XmlStringBuilder xml) {

2
smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java
View File

@ -227,7 +227,7 @@ public abstract class Packet implements TopLevelStreamElement {
* @return the packet extension with the given namespace. * @return the packet extension with the given namespace.
*/ */
public PacketExtension getExtension(String namespace) { public PacketExtension getExtension(String namespace) {
return PacketUtil.packetExtensionfromCollection(getExtensions(), null, namespace); return PacketUtil.extensionElementFrom(getExtensions(), null, namespace);
} }
/** /**

25
smack-core/src/main/java/org/jivesoftware/smack/util/PacketUtil.java
View File

@ -22,10 +22,33 @@ import org.jivesoftware.smack.packet.PacketExtension;
public class PacketUtil { public class PacketUtil {
@SuppressWarnings("unchecked") /**
* Get a extension element from a collection
*
* @param collection
* @param element
* @param namespace
* @return the extension element
* @deprecated use {@link #extensionElementFrom(Collection, String, String)} instead
*/
@Deprecated
public static <PE extends PacketExtension> PE packetExtensionfromCollection( public static <PE extends PacketExtension> PE packetExtensionfromCollection(
Collection<PacketExtension> collection, String element, Collection<PacketExtension> collection, String element,
String namespace) { String namespace) {
return extensionElementFrom(collection, element, namespace);
}
/**
* Get a extension element from a collection
*
* @param collection
* @param element
* @param namespace
* @return the extension element
*/
@SuppressWarnings("unchecked")
public static <PE extends PacketExtension> PE extensionElementFrom(Collection<PacketExtension> collection,
String element, String namespace) {
for (PacketExtension packetExtension : collection) { for (PacketExtension packetExtension : collection) {
if ((element == null || packetExtension.getElementName().equals( if ((element == null || packetExtension.getElementName().equals(
element)) element))

2
smack-extensions/src/main/java/org/jivesoftware/smackx/rsm/RSMManager.java
View File

@ -46,7 +46,7 @@ public class RSMManager {
if (additionalExtensions == null) { if (additionalExtensions == null) {
additionalExtensions = new LinkedList<PacketExtension>(); additionalExtensions = new LinkedList<PacketExtension>();
} }
RSMSet resultRsmSet = PacketUtil.packetExtensionfromCollection(returnedExtensions, RSMSet.ELEMENT, RSMSet.NAMESPACE); RSMSet resultRsmSet = PacketUtil.extensionElementFrom(returnedExtensions, RSMSet.ELEMENT, RSMSet.NAMESPACE);
if (resultRsmSet == null) { if (resultRsmSet == null) {
throw new IllegalArgumentException("returnedExtensions did not contain a RSMset"); throw new IllegalArgumentException("returnedExtensions did not contain a RSMset");
} }