Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2025-12-10 15:11:08 +01:00
Code Issues Releases Wiki Activity

Rename 'Packet' class to 'Stanza'

Browse source 
Smack still uses the term 'Packet' in some places. This is just the
first step towards using correct XMPP terms in Smack.
This commit is contained in:
Florian Schmaus 2015-02-05 11:17:27 +01:00
parent 9fc26f1d83
commit 4698805a34
142 changed files with 595 additions and 572 deletions
Download patch file Download diff file Expand all files Collapse all files

4
smack-tcp/src/main/java/org/jivesoftware/smack/sm/predicates/AfterXStanzas.java
View file

@ -17,7 +17,7 @@
package org.jivesoftware.smack.sm.predicates;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Stanza;
public class AfterXStanzas implements PacketFilter {
@ -30,7 +30,7 @@ public class AfterXStanzas implements PacketFilter {
}
@Override
public synchronized boolean accept(Packet packet) {
public synchronized boolean accept(Stanza packet) {
currentCount++;
if (currentCount == count) {
resetCounter();

4
smack-tcp/src/main/java/org/jivesoftware/smack/sm/predicates/ForEveryMessage.java
View file

@ -18,7 +18,7 @@ package org.jivesoftware.smack.sm.predicates;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Stanza;
public class ForEveryMessage implements PacketFilter {
@ -28,7 +28,7 @@ public class ForEveryMessage implements PacketFilter {
}
@Override
public boolean accept(Packet packet) {
public boolean accept(Stanza packet) {
if (packet instanceof Message) {
return true;
}

4
smack-tcp/src/main/java/org/jivesoftware/smack/sm/predicates/ForEveryStanza.java
View file

@ -17,7 +17,7 @@
package org.jivesoftware.smack.sm.predicates;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Stanza;
public class ForEveryStanza implements PacketFilter {
@ -27,7 +27,7 @@ public class ForEveryStanza implements PacketFilter {
}
@Override
public boolean accept(Packet packet) {
public boolean accept(Stanza packet) {
return true;
}

4
smack-tcp/src/main/java/org/jivesoftware/smack/sm/predicates/ForMatchingPredicateOrAfterXStanzas.java
View file

@ -17,7 +17,7 @@
package org.jivesoftware.smack.sm.predicates;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Stanza;
public class ForMatchingPredicateOrAfterXStanzas implements PacketFilter {
@ -30,7 +30,7 @@ public class ForMatchingPredicateOrAfterXStanzas implements PacketFilter {
}
@Override
public boolean accept(Packet packet) {
public boolean accept(Stanza packet) {
if (predicate.accept(packet)) {
afterXStanzas.resetCounter();
return true;

12
smack-tcp/src/main/java/org/jivesoftware/smack/sm/predicates/OnceForThisStanza.java
View file

@ -17,7 +17,7 @@
package org.jivesoftware.smack.sm.predicates;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smack.tcp.XMPPTCPConnection;
import org.jivesoftware.smack.util.StringUtils;
@ -26,22 +26,22 @@ public class OnceForThisStanza implements PacketFilter {
private final String id;
private final XMPPTCPConnection connection;
public static void setup(XMPPTCPConnection connection, Packet packet) {
public static void setup(XMPPTCPConnection connection, Stanza packet) {
PacketFilter packetFilter = new OnceForThisStanza(connection, packet);
connection.addRequestAckPredicate(packetFilter);
}
private OnceForThisStanza(XMPPTCPConnection connection, Packet packet) {
private OnceForThisStanza(XMPPTCPConnection connection, Stanza packet) {
this.connection = connection;
this.id = packet.getPacketID();
this.id = packet.getStanzaId();
if (StringUtils.isNullOrEmpty(id)) {
throw new IllegalArgumentException("Stanza ID must be set");
}
}
@Override
public boolean accept(Packet packet) {
String otherId = packet.getPacketID();
public boolean accept(Stanza packet) {
String otherId = packet.getStanzaId();
if (StringUtils.isNullOrEmpty(otherId)) {
return false;
}

4
smack-tcp/src/main/java/org/jivesoftware/smack/sm/predicates/ShortcutPredicates.java
View file

@ -21,7 +21,7 @@ import java.util.LinkedHashSet;
import java.util.Set;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Stanza;
public class ShortcutPredicates implements PacketFilter {
@ -43,7 +43,7 @@ public class ShortcutPredicates implements PacketFilter {
}
@Override
public boolean accept(Packet packet) {
public boolean accept(Stanza packet) {
for (PacketFilter predicate : predicates) {
if (predicate.accept(packet)) {
return true;