Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2025-09-10 18:59:41 +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

6
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java
View file

@ -24,7 +24,7 @@ import org.jivesoftware.smack.SmackException.NotConnectedException;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.filter.PacketTypeFilter;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smack.packet.Presence;
import org.jxmpp.util.XmppStringUtils;
@ -282,7 +282,7 @@ public class AgentRoster {
* Listens for all presence packets and processes them.
*/
private class PresencePacketListener implements PacketListener {
public void processPacket(Packet packet) {
public void processPacket(Stanza packet) {
Presence presence = (Presence)packet;
String from = presence.getFrom();
if (from == null) {
@ -358,7 +358,7 @@ public class AgentRoster {
*/
private class AgentStatusListener implements PacketListener {
public void processPacket(Packet packet) {
public void processPacket(Stanza packet) {
if (packet instanceof AgentStatusRequest) {
AgentStatusRequest statusRequest = (AgentStatusRequest)packet;
for (Iterator<AgentStatusRequest.Item> i = statusRequest.getAgents().iterator(); i.hasNext();) {

6
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java
View file

@ -44,7 +44,7 @@ import org.jivesoftware.smack.filter.PacketTypeFilter;
import org.jivesoftware.smack.packet.DefaultPacketExtension;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smack.packet.Presence;
import org.jivesoftware.smackx.muc.packet.MUCUser;
import org.jivesoftware.smackx.search.ReportedData;
@ -148,7 +148,7 @@ public class AgentSession {
new PacketTypeFilter(Message.class));
packetListener = new PacketListener() {
public void processPacket(Packet packet) {
public void processPacket(Stanza packet) {
try {
handlePacket(packet);
}
@ -689,7 +689,7 @@ public class AgentSession {
// PacketListener Implementation.
private void handlePacket(Packet packet) throws NotConnectedException {
private void handlePacket(Stanza packet) throws NotConnectedException {
if (packet instanceof OfferRequestProvider.OfferRequestPacket) {
// Acknowledge the IQ set.
IQ reply = IQ.createResultIQ((IQ) packet);

4
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java
View file

@ -20,7 +20,7 @@ package org.jivesoftware.smackx.workgroup.agent;
import org.jivesoftware.smack.SmackException.NotConnectedException;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Stanza;
import java.util.Date;
import java.util.List;
@ -83,7 +83,7 @@ public class Offer {
* @throws NotConnectedException
*/
public void accept() throws NotConnectedException {
Packet acceptPacket = new AcceptPacket(this.session.getWorkgroupJID());
Stanza acceptPacket = new AcceptPacket(this.session.getWorkgroupJID());
connection.sendPacket(acceptPacket);
// TODO: listen for a reply.
accepted = true;

14
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcript.java
View file

@ -18,7 +18,7 @@
package org.jivesoftware.smackx.workgroup.packet;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Stanza;
import java.util.ArrayList;
import java.util.Collections;
@ -34,7 +34,7 @@ import java.util.List;
*/
public class Transcript extends IQ {
private String sessionID;
private List<Packet> packets;
private List<Stanza> packets;
/**
* Creates a transcript request for the given sessionID.
@ -42,7 +42,7 @@ public class Transcript extends IQ {
* @param sessionID the id of the session to get the conversation transcript.
*/
public Transcript(String sessionID) {
this(sessionID, new ArrayList<Packet>());
this(sessionID, new ArrayList<Stanza>());
}
/**
@ -52,7 +52,7 @@ public class Transcript extends IQ {
* @param sessionID the id of the session that generated this conversation transcript.
* @param packets the list of messages and presences send to the room.
*/
public Transcript(String sessionID, List<Packet> packets) {
public Transcript(String sessionID, List<Stanza> packets) {
super("transcript", "http://jabber.org/protocol/workgroup");
this.sessionID = sessionID;
this.packets = packets;
@ -73,7 +73,7 @@ public class Transcript extends IQ {
*
* @return the list of Messages and Presences that were sent to the room.
*/
public List<Packet> getPackets() {
public List<Stanza> getPackets() {
return Collections.unmodifiableList(packets);
}
@ -83,8 +83,8 @@ public class Transcript extends IQ {
.append(sessionID)
.append("\">");
for (Iterator<Packet> it=packets.iterator(); it.hasNext();) {
Packet packet = it.next();
for (Iterator<Stanza> it=packets.iterator(); it.hasNext();) {
Stanza packet = it.next();
buf.append(packet.toXML());
}

4
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptProvider.java
View file

@ -19,7 +19,7 @@ package org.jivesoftware.smackx.workgroup.packet;
import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.provider.IQProvider;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smack.util.PacketParserUtils;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
@ -38,7 +38,7 @@ public class TranscriptProvider extends IQProvider<Transcript> {
@Override
public Transcript parse(XmlPullParser parser, int initialDepth) throws XmlPullParserException, IOException, SmackException {
String sessionID = parser.getAttributeValue("", "sessionID");
List<Packet> packets = new ArrayList<Packet>();
List<Stanza> packets = new ArrayList<Stanza>();
boolean done = false;
while (!done) {

6
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java
View file

@ -35,7 +35,7 @@ import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.filter.PacketTypeFilter;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smack.packet.Presence;
import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
@ -143,7 +143,7 @@ public class Workgroup {
PacketFilter typeFilter = new PacketTypeFilter(Message.class);
connection.addAsyncPacketListener(new PacketListener() {
public void processPacket(Packet packet) {
public void processPacket(Stanza packet) {
handlePacket(packet);
}
}, typeFilter);
@ -492,7 +492,7 @@ public class Workgroup {
// PacketListener Implementation.
private void handlePacket(Packet packet) {
private void handlePacket(Stanza packet) {
if (packet instanceof Message) {
Message msg = (Message)packet;
// Check to see if the user left the queue.

16
smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java
View file

@ -35,7 +35,7 @@ import org.jivesoftware.smack.filter.NotFilter;
import org.jivesoftware.smack.filter.PacketExtensionFilter;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smackx.xevent.packet.MessageEvent;
/**
@ -76,7 +76,7 @@ public class MessageEventManager extends Manager {
super(connection);
// Listens for all message event packets and fire the proper message event listeners.
connection.addAsyncPacketListener(new PacketListener() {
public void processPacket(Packet packet) {
public void processPacket(Stanza packet) {
Message message = (Message) packet;
MessageEvent messageEvent =
(MessageEvent) message.getExtension("x", "jabber:x:event");
@ -85,14 +85,14 @@ public class MessageEventManager extends Manager {
for (String eventType : messageEvent.getEventTypes())
fireMessageEventRequestListeners(
message.getFrom(),
message.getPacketID(),
message.getStanzaId(),
eventType.concat("NotificationRequested"));
} else
// Fire event for notifications of message events
for (String eventType : messageEvent.getEventTypes())
fireMessageEventNotificationListeners(
message.getFrom(),
messageEvent.getPacketID(),
messageEvent.getStanzaId(),
eventType.concat("Notification"));
}
}, PACKET_FILTER);
@ -215,7 +215,7 @@ public class MessageEventManager extends Manager {
// Create a MessageEvent Package and add it to the message
MessageEvent messageEvent = new MessageEvent();
messageEvent.setDelivered(true);
messageEvent.setPacketID(packetID);
messageEvent.setStanzaId(packetID);
msg.addExtension(messageEvent);
// Send the packet
connection().sendPacket(msg);
@ -234,7 +234,7 @@ public class MessageEventManager extends Manager {
// Create a MessageEvent Package and add it to the message
MessageEvent messageEvent = new MessageEvent();
messageEvent.setDisplayed(true);
messageEvent.setPacketID(packetID);
messageEvent.setStanzaId(packetID);
msg.addExtension(messageEvent);
// Send the packet
connection().sendPacket(msg);
@ -253,7 +253,7 @@ public class MessageEventManager extends Manager {
// Create a MessageEvent Package and add it to the message
MessageEvent messageEvent = new MessageEvent();
messageEvent.setComposing(true);
messageEvent.setPacketID(packetID);
messageEvent.setStanzaId(packetID);
msg.addExtension(messageEvent);
// Send the packet
connection().sendPacket(msg);
@ -272,7 +272,7 @@ public class MessageEventManager extends Manager {
// Create a MessageEvent Package and add it to the message
MessageEvent messageEvent = new MessageEvent();
messageEvent.setCancelled(true);
messageEvent.setPacketID(packetID);
messageEvent.setStanzaId(packetID);
msg.addExtension(messageEvent);
// Send the packet
connection().sendPacket(msg);

8
smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java
View file

@ -157,7 +157,7 @@ public class MessageEvent implements PacketExtension {
*
* @return the message id that requested to be notified of the event.
*/
public String getPacketID() {
public String getStanzaId() {
return packetID;
}
@ -258,7 +258,7 @@ public class MessageEvent implements PacketExtension {
*
* @param packetID the message id that requested to be notified of the event.
*/
public void setPacketID(String packetID) {
public void setStanzaId(String packetID) {
this.packetID = packetID;
}
@ -326,8 +326,8 @@ public class MessageEvent implements PacketExtension {
if (isComposing())
buf.append("<").append(MessageEvent.COMPOSING).append("/>");
// Add the id tag only if the MessageEvent is a notification message (not a request)
if (getPacketID() != null)
buf.append("<id>").append(getPacketID()).append("</id>");
if (getStanzaId() != null)
buf.append("<id>").append(getStanzaId()).append("</id>");
buf.append("</").append(getElementName()).append(">");
return buf.toString();
}

2
smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/provider/MessageEventProvider.java
View file

@ -49,7 +49,7 @@ public class MessageEventProvider extends PacketExtensionProvider<MessageEvent>
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG) {
if (parser.getName().equals("id"))
messageEvent.setPacketID(parser.nextText());
messageEvent.setStanzaId(parser.nextText());
if (parser.getName().equals(MessageEvent.COMPOSING))
messageEvent.setComposing(true);
if (parser.getName().equals(MessageEvent.DELIVERED))

4
smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java
View file

@ -30,7 +30,7 @@ import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.filter.PacketExtensionFilter;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smack.roster.Roster;
import org.jivesoftware.smack.roster.RosterEntry;
import org.jivesoftware.smack.roster.RosterGroup;
@ -77,7 +77,7 @@ public class RosterExchangeManager {
weakRefConnection = new WeakReference<XMPPConnection>(connection);
// Listens for all roster exchange packets and fire the roster exchange listeners.
packetListener = new PacketListener() {
public void processPacket(Packet packet) {
public void processPacket(Stanza packet) {
Message message = (Message) packet;
RosterExchange rosterExchange =
(RosterExchange) message.getExtension(ELEMENT, NAMESPACE);