From 2c61fa6f56d0a2377a327ba51e9a342d343b8b07 Mon Sep 17 00:00:00 2001
From: Derek DeMoro <derek@jivesoftware.com>
Date: Tue, 22 May 2007 23:21:41 +0000
Subject: [PATCH] Update

git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@8378 b35dd754-fafc-0310-a699-88a17e54d16e
---
 build/lib/dist/smack.jar                      | Bin 268031 -> 268031 bytes
 build/lib/dist/smackx-debug.jar               | Bin 54810 -> 54810 bytes
 build/lib/dist/smackx.jar                     | Bin 475193 -> 475193 bytes
 .../jivesoftware/spark/ui/FromJIDFilter.java  |  44 ++++++++++++++++++
 .../spark/ui/rooms/ChatRoomImpl.java          |  12 ++---
 5 files changed, 50 insertions(+), 6 deletions(-)
 create mode 100644 src/java/org/jivesoftware/spark/ui/FromJIDFilter.java

diff --git a/build/lib/dist/smack.jar b/build/lib/dist/smack.jar
index 5e01a38978168e1e132ec69de587bdfe0090f7e5..0cd4969ec85e25a4b78f802d0e835aee8a383c52 100644
GIT binary patch
delta 149
zcmeyrR^b0y0p0*_W)?065U2{+Hj!6@xe`cO^fCi^jVD@9Ft(mx+IoUHp@6wMVB2)<
zLS|hsBf5}T9n5GgWYz&Owr?q9ULFn7H9hVuvjxbM=`+tV+k-^5-#*LS>;_hzD8gb3
XW-Jt8F$Xhli?G;$4UiILdCCX?_n9{j

delta 149
zcmeyrR^b0y0p0*_W)?065J)Q7I+0g{IT1)%^fCi^jVD@9Ft(mx+IoUHp#UT>UAvH3
z7tDw*WL5_=S__$VK#c8M3YnKjgN5SGGFyO5nLhI@vprbu_F3j;H?Uly2#YP4u~3A?
S9L%^a!eRqfBqhr7lo0?PFgKw9

diff --git a/build/lib/dist/smackx-debug.jar b/build/lib/dist/smackx-debug.jar
index e016edb4a5bc4f55172688b8af87adf176456480..3f7976f1a8c36869e1ea2dac6568e24142db58f1 100644
GIT binary patch
delta 231
zcmbQWhI!T+X5IjAW)?065U35<Hj!6@xdupCEM^Ar?kRz&&CHCN%wUE-OCW^N%x(u^
z9O3%T1eV&z>kAR#6Wj(7IWD{w!YCJ83}MJhvO?6T%0w*%>6+Yh&;n%N<h=*&!TkRR
zjli_YAzLtAa>yA>?}E^i4!eN4?uR|W^yI@HVEW!+H!!V!1VR@a0c+p9;YgMs0HWzy
Avj6}9

delta 231
zcmbQWhI!T+X5IjAW)?065J)cBI+0g{ISEKvEM^Ar?kRz&&CHCN%wUE-OCW^N%x(u^
z9O3%T1eV&z>kAR#6Wj(7IWD{w!YCJ83}MJhvO?6T%0w*%>6+Yh&;n%N<h=*&!TkRR
zjli_YAzLtAa>yA>?}E^i4!eN4?uR|W^yI@HVEW!+H!!V!1VR@a0c+p9;YgMs00d84
Aod5s;

diff --git a/build/lib/dist/smackx.jar b/build/lib/dist/smackx.jar
index 7d1490dbab796f350611a0d5d178c40b81ca4d25..5e7c2186d03e056c448275bee269d24c2da36f22 100644
GIT binary patch
delta 137
zcmdnlAiJ|cmN&qgnT3l11gZnJP2|;Jt^!gPi<yDE#(S;z7+dc#wccZHy~nck9&5@E
z=GuU5(_MeE%7Yo{KUvj4jO`PCvQFFx(lT9THJb&<i0SdG+3Z0g+ZV28ThI?y?qbcZ
S4`!5EvzvkSt+!_HVgUdL?=>R;

delta 146
zcmdnlAiJ|cmN&qgnT3l11d>X&PUO{KP6SdGi<yDE#(S;z7+dc#wccZHy~nck9&5@E
z=H!yC(_MeE%7Yo{KUvinlP3qV3QrII$11pe(@)m?jUb)VRaUcEfJ~YmznaY+B(i<s
cYPJRaU|lZO?D}9vnKio^MEmvw*6fum0L*PSH2?qr

diff --git a/src/java/org/jivesoftware/spark/ui/FromJIDFilter.java b/src/java/org/jivesoftware/spark/ui/FromJIDFilter.java
new file mode 100644
index 00000000..eeb0f621
--- /dev/null
+++ b/src/java/org/jivesoftware/spark/ui/FromJIDFilter.java
@@ -0,0 +1,44 @@
+/**
+ * $Revision$
+ * $Date$
+ *
+ * Copyright (C) 1999-2005 Jive Software. All rights reserved.
+ * This software is the proprietary information of Jive Software. Use is subject to license terms.
+ */
+
+package org.jivesoftware.spark.ui;
+
+import org.jivesoftware.smack.filter.PacketFilter;
+import org.jivesoftware.smack.packet.Packet;
+
+
+/**
+ * Filters for packets where the "from" field contains a specified value.
+ *
+ * @author Matt Tucker
+ */
+public class FromJIDFilter implements PacketFilter {
+
+    private String from;
+
+    /**
+     * Creates a "from" contains filter using the "from" field part.
+     *
+     * @param from the from field value the packet must contain.
+     */
+    public FromJIDFilter(String from) {
+        if (from == null) {
+            throw new IllegalArgumentException("Parameter cannot be null.");
+        }
+        this.from = from.toLowerCase();
+    }
+
+    public boolean accept(Packet packet) {
+        if (packet.getFrom() == null) {
+            return false;
+        }
+        else {
+            return packet.getFrom().toLowerCase().startsWith(from);
+        }
+    }
+}
diff --git a/src/java/org/jivesoftware/spark/ui/rooms/ChatRoomImpl.java b/src/java/org/jivesoftware/spark/ui/rooms/ChatRoomImpl.java
index f41a7c1b..7cc33937 100644
--- a/src/java/org/jivesoftware/spark/ui/rooms/ChatRoomImpl.java
+++ b/src/java/org/jivesoftware/spark/ui/rooms/ChatRoomImpl.java
@@ -16,7 +16,6 @@ import org.jivesoftware.smack.Roster;
 import org.jivesoftware.smack.RosterEntry;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.filter.AndFilter;
-import org.jivesoftware.smack.filter.FromContainsFilter;
 import org.jivesoftware.smack.filter.OrFilter;
 import org.jivesoftware.smack.filter.PacketFilter;
 import org.jivesoftware.smack.filter.PacketTypeFilter;
@@ -34,6 +33,7 @@ import org.jivesoftware.spark.ui.ChatRoom;
 import org.jivesoftware.spark.ui.ChatRoomButton;
 import org.jivesoftware.spark.ui.ContactItem;
 import org.jivesoftware.spark.ui.ContactList;
+import org.jivesoftware.spark.ui.FromJIDFilter;
 import org.jivesoftware.spark.ui.MessageEventListener;
 import org.jivesoftware.spark.ui.RosterDialog;
 import org.jivesoftware.spark.ui.VCardPanel;
@@ -47,6 +47,10 @@ import org.jivesoftware.sparkimpl.profile.VCardManager;
 import org.jivesoftware.sparkimpl.settings.local.LocalPreferences;
 import org.jivesoftware.sparkimpl.settings.local.SettingsManager;
 
+import javax.swing.Icon;
+import javax.swing.SwingUtilities;
+import javax.swing.event.DocumentEvent;
+
 import java.awt.GridBagConstraints;
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
@@ -59,10 +63,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.TimerTask;
 
-import javax.swing.Icon;
-import javax.swing.SwingUtilities;
-import javax.swing.event.DocumentEvent;
-
 /**
  * This is the Person to Person implementation of <code>ChatRoom</code>
  * This room only allows for 1 to 1 conversations.
@@ -109,7 +109,7 @@ public class ChatRoomImpl extends ChatRoom {
         loadHistory();
 
         // Register PacketListeners
-        PacketFilter fromFilter = new FromContainsFilter(participantJID);
+        PacketFilter fromFilter = new FromJIDFilter(participantJID);
         PacketFilter orFilter = new OrFilter(new PacketTypeFilter(Presence.class), new PacketTypeFilter(Message.class));
         PacketFilter andFilter = new AndFilter(orFilter, fromFilter);