Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2025-09-09 18:29:45 +02: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-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/ContentNegotiator.java
View file

@ -70,8 +70,8 @@ public class ContentNegotiator extends JingleNegotiator {
// TODO getState().eventError(iq);
} else if (iq.getType().equals(IQ.Type.result)) {
// Process ACKs
if (isExpectedId(iq.getPacketID())) {
removeExpectedId(iq.getPacketID());
if (isExpectedId(iq.getStanzaId())) {
removeExpectedId(iq.getStanzaId());
}
} else if (iq instanceof Jingle) {
Jingle jingle = (Jingle) iq;

6
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleManager.java
View file

@ -29,7 +29,7 @@ import org.jivesoftware.smack.XMPPConnectionRegistry;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smack.packet.Presence;
import org.jivesoftware.smack.provider.ProviderManager;
import org.jivesoftware.smack.roster.Roster;
@ -443,7 +443,7 @@ public class JingleManager implements JingleSessionListener {
private void initJingleSessionRequestListeners() {
PacketFilter initRequestFilter = new PacketFilter() {
// Return true if we accept this packet
public boolean accept(Packet pin) {
public boolean accept(Stanza pin) {
if (pin instanceof IQ) {
IQ iq = (IQ) pin;
if (iq.getType().equals(IQ.Type.set)) {
@ -463,7 +463,7 @@ public class JingleManager implements JingleSessionListener {
// Start a packet listener for session initiation requests
connection.addAsyncPacketListener(new PacketListener() {
public void processPacket(Packet packet) {
public void processPacket(Stanza packet) {
triggerSessionRequested((Jingle) packet);
}
}, initRequestFilter);

24
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java
View file

@ -32,7 +32,7 @@ import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smack.packet.XMPPError;
import org.jivesoftware.smackx.jingleold.listeners.JingleListener;
import org.jivesoftware.smackx.jingleold.listeners.JingleMediaListener;
@ -290,7 +290,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
responses.addAll(dispatchIncomingPacket(iq, null));
if (iq != null) {
responseId = iq.getPacketID();
responseId = iq.getStanzaId();
// Send the IQ to each of the content negotiators for further processing.
// Each content negotiator may pass back a list of JingleContent for addition to the response packet.
@ -355,14 +355,14 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
// TODO getState().eventError(iq);
} else if (iq.getType().equals(IQ.Type.result)) {
// Process ACKs
if (isExpectedId(iq.getPacketID())) {
if (isExpectedId(iq.getStanzaId())) {
// The other side provisionally accepted our session-initiate.
// Kick off some negotiators.
if (iq.getPacketID().equals(sessionInitPacketID)) {
if (iq.getStanzaId().equals(sessionInitPacketID)) {
startNegotiators();
}
removeExpectedId(iq.getPacketID());
removeExpectedId(iq.getStanzaId());
}
} else if (iq instanceof Jingle) {
// It is not an error: it is a Jingle packet...
@ -377,7 +377,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
if (response != null) {
// Save the packet id, for recognizing ACKs...
addExpectedId(response.getPacketID());
addExpectedId(response.getStanzaId());
responses.add(response);
}
@ -667,7 +667,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
LOGGER.fine("UpdatePacketListener");
packetListener = new PacketListener() {
public void processPacket(Packet packet) {
public void processPacket(Stanza packet) {
try {
receivePacketAndRespond((IQ) packet);
} catch (Exception e) {
@ -677,7 +677,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
};
packetFilter = new PacketFilter() {
public boolean accept(Packet packet) {
public boolean accept(Stanza packet) {
if (packet instanceof IQ) {
IQ iq = (IQ) packet;
@ -805,7 +805,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
jout.addContent(contentNegotiator.getJingleContent());
}
// Send the "accept" and wait for the ACK
addExpectedId(jout.getPacketID());
addExpectedId(jout.getStanzaId());
sendPacket(jout);
//triggerSessionEstablished();
@ -837,7 +837,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
jout.addContent(contentNegotiator.getJingleContent());
}
// Send the "accept" and wait for the ACK
addExpectedId(jout.getPacketID());
addExpectedId(jout.getStanzaId());
sendPacket(jout);
}
}
@ -1030,7 +1030,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
errorPacket = IQ.createErrorResponse(iq, error);
// Fill in the fields with the info from the Jingle packet
errorPacket.setPacketID(iq.getPacketID());
errorPacket.setStanzaId(iq.getStanzaId());
errorPacket.setError(error);
// errorPacket.addExtension(jingleError);
@ -1092,7 +1092,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
}
// Save the session-initiate packet ID, so that we can respond to it.
sessionInitPacketID = jingle.getPacketID();
sessionInitPacketID = jingle.getStanzaId();
sendPacket(jingle);

6
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaNegotiator.java
View file

@ -116,9 +116,9 @@ public class MediaNegotiator extends JingleNegotiator {
throw new JingleException(iq.getError().getDescriptiveText());
} else if (iq.getType().equals(IQ.Type.result)) {
// Process ACKs
if (isExpectedId(iq.getPacketID())) {
if (isExpectedId(iq.getStanzaId())) {
receiveResult(iq);
removeExpectedId(iq.getPacketID());
removeExpectedId(iq.getStanzaId());
}
} else if (iq instanceof Jingle) {
Jingle jingle = (Jingle) iq;
@ -165,7 +165,7 @@ public class MediaNegotiator extends JingleNegotiator {
}
if (response != null) {
addExpectedId(response.getPacketID());
addExpectedId(response.getStanzaId());
responses.add(response);
}

6
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportNegotiator.java
View file

@ -606,9 +606,9 @@ public abstract class TransportNegotiator extends JingleNegotiator {
throw new JingleException(iq.getError().getDescriptiveText());
} else if (iq.getType().equals(IQ.Type.result)) {
// Process ACKs
if (isExpectedId(iq.getPacketID())) {
if (isExpectedId(iq.getStanzaId())) {
response = receiveResult(iq);
removeExpectedId(iq.getPacketID());
removeExpectedId(iq.getStanzaId());
}
} else if (iq instanceof Jingle) {
// Get the action from the Jingle packet
@ -648,7 +648,7 @@ public abstract class TransportNegotiator extends JingleNegotiator {
}
if (response != null) {
addExpectedId(response.getPacketID());
addExpectedId(response.getStanzaId());
responses.add(response);
}