vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-26 22:12:05 +01:00
Code Issues Releases Wiki Activity

Modified to use new FromMatchesFilter. SMACK-71

Browse source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2522 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Gaston Dombiak 2005-08-10 04:50:50 +00:00 committed by gaston
parent e3e541d333
commit 69c86bbeec
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/org/jivesoftware/smackx/muc/MultiUserChat.java
View file

@ -287,7 +287,7 @@ public class MultiUserChat {
// Wait for a presence packet back from the server. // Wait for a presence packet back from the server.
PacketFilter responseFilter = PacketFilter responseFilter =
new AndFilter( new AndFilter(
new FromContainsFilter(room + "/" + nickname), new FromMatchesFilter(room + "/" + nickname),
new PacketTypeFilter(Presence.class)); new PacketTypeFilter(Presence.class));
PacketCollector response = connection.createPacketCollector(responseFilter); PacketCollector response = connection.createPacketCollector(responseFilter);
// Send create & join packet. // Send create & join packet.
@ -421,7 +421,7 @@ public class MultiUserChat {
// Wait for a presence packet back from the server. // Wait for a presence packet back from the server.
PacketFilter responseFilter = PacketFilter responseFilter =
new AndFilter( new AndFilter(
new FromContainsFilter(room + "/" + nickname), new FromMatchesFilter(room + "/" + nickname),
new PacketTypeFilter(Presence.class)); new PacketTypeFilter(Presence.class));
PacketCollector response = connection.createPacketCollector(responseFilter); PacketCollector response = connection.createPacketCollector(responseFilter);
// Send join packet. // Send join packet.
@ -901,7 +901,7 @@ public class MultiUserChat {
// Wait for a presence packet back from the server. // Wait for a presence packet back from the server.
PacketFilter responseFilter = PacketFilter responseFilter =
new AndFilter( new AndFilter(
new FromContainsFilter(room + "/" + nickname), new FromMatchesFilter(room + "/" + nickname),
new PacketTypeFilter(Presence.class)); new PacketTypeFilter(Presence.class));
PacketCollector response = connection.createPacketCollector(responseFilter); PacketCollector response = connection.createPacketCollector(responseFilter);
// Send join packet. // Send join packet.
@ -1838,7 +1838,7 @@ public class MultiUserChat {
// Wait for an error or confirmation message back from the server. // Wait for an error or confirmation message back from the server.
PacketFilter responseFilter = PacketFilter responseFilter =
new AndFilter( new AndFilter(
new FromContainsFilter(room), new FromMatchesFilter(room),
new PacketTypeFilter(Message.class)); new PacketTypeFilter(Message.class));
responseFilter = new AndFilter(responseFilter, new PacketFilter() { responseFilter = new AndFilter(responseFilter, new PacketFilter() {
public boolean accept(Packet packet) { public boolean accept(Packet packet) {
@ -2008,7 +2008,7 @@ public class MultiUserChat {
// Create a collector for incoming messages. // Create a collector for incoming messages.
messageFilter = messageFilter =
new AndFilter( new AndFilter(
new FromContainsFilter(room), new FromMatchesFilter(room),
new MessageTypeFilter(Message.Type.GROUP_CHAT)); new MessageTypeFilter(Message.Type.GROUP_CHAT));
messageFilter = new AndFilter(messageFilter, new PacketFilter() { messageFilter = new AndFilter(messageFilter, new PacketFilter() {
public boolean accept(Packet packet) { public boolean accept(Packet packet) {
@ -2021,7 +2021,7 @@ public class MultiUserChat {
// Create a listener for subject updates. // Create a listener for subject updates.
subjectFilter = subjectFilter =
new AndFilter( new AndFilter(
new FromContainsFilter(room), new FromMatchesFilter(room),
new MessageTypeFilter(Message.Type.GROUP_CHAT)); new MessageTypeFilter(Message.Type.GROUP_CHAT));
subjectFilter = new AndFilter(subjectFilter, new PacketFilter() { subjectFilter = new AndFilter(subjectFilter, new PacketFilter() {
public boolean accept(Packet packet) { public boolean accept(Packet packet) {
@ -2045,7 +2045,7 @@ public class MultiUserChat {
// Create a listener for all presence updates. // Create a listener for all presence updates.
presenceFilter = presenceFilter =
new AndFilter(new FromContainsFilter(room), new PacketTypeFilter(Presence.class)); new AndFilter(new FromMatchesFilter(room), new PacketTypeFilter(Presence.class));
presenceListener = new PacketListener() { presenceListener = new PacketListener() {
public void processPacket(Packet packet) { public void processPacket(Packet packet) {
Presence presence = (Presence) packet; Presence presence = (Presence) packet;