vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-12-12 14:01:08 +01:00
Code Issues Releases Wiki Activity

Rename PacketFilter (and implementing classes) and PacketExtension

Browse source 
to StanzaFilter and ExtensionElement.
This commit is contained in:
Florian Schmaus 2015-02-26 18:41:17 +01:00
parent 2250ac20ed
commit d4a6d8e653
233 changed files with 1175 additions and 895 deletions
Download patch file Download diff file Expand all files Collapse all files

4
smack-extensions/src/main/java/org/jivesoftware/smackx/disco/AbstractNodeInformationProvider.java
View file

@ -16,7 +16,7 @@
*/
package org.jivesoftware.smackx.disco;
import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smackx.disco.packet.DiscoverInfo;
import org.jivesoftware.smackx.disco.packet.DiscoverItems;
@ -40,7 +40,7 @@ public abstract class AbstractNodeInformationProvider implements NodeInformation
return null;
}
public List<PacketExtension> getNodePacketExtensions() {
public List<ExtensionElement> getNodePacketExtensions() {
return null;
}

4
smack-extensions/src/main/java/org/jivesoftware/smackx/disco/NodeInformationProvider.java
View file

@ -17,7 +17,7 @@
package org.jivesoftware.smackx.disco;
import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smackx.disco.packet.DiscoverInfo;
import org.jivesoftware.smackx.disco.packet.DiscoverItems;
@ -68,5 +68,5 @@ public interface NodeInformationProvider {
*
* @return a list of the packet extensions defined in the node.
*/
List<PacketExtension> getNodePacketExtensions();
List<ExtensionElement> getNodePacketExtensions();
}

8
smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java
View file

@ -27,7 +27,7 @@ import org.jivesoftware.smack.iqrequest.AbstractIqRequestHandler;
import org.jivesoftware.smack.iqrequest.IQRequestHandler.Mode;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smack.packet.XMPPError;
import org.jivesoftware.smackx.caps.EntityCapsManager;
import org.jivesoftware.smackx.disco.packet.DiscoverInfo;
@ -445,10 +445,10 @@ public class ServiceDiscoveryManager extends Manager {
*
* @return the data form as List of PacketExtensions
*/
public List<PacketExtension> getExtendedInfoAsList() {
List<PacketExtension> res = null;
public List<ExtensionElement> getExtendedInfoAsList() {
List<ExtensionElement> res = null;
if (extendedInfo != null) {
res = new ArrayList<PacketExtension>(1);
res = new ArrayList<ExtensionElement>(1);
res.add(extendedInfo);
}
return res;

2
smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java
View file

@ -61,7 +61,7 @@ public class DiscoverInfoProvider extends IQProvider<DiscoverInfo> {
}
// Otherwise, it must be a packet extension.
else {
PacketParserUtils.addPacketExtension(discoverInfo, parser);
PacketParserUtils.addExtensionElement(discoverInfo, parser);
}
} else if (eventType == XmlPullParser.END_TAG) {
if (parser.getName().equals("identity")) {