From 9c7243ccff2b5b598ff3cf52a7cde32f814cf5f9 Mon Sep 17 00:00:00 2001
From: Matthieu Casanova <kpouer@java.net>
Date: Wed, 7 Apr 2010 08:46:29 +0000
Subject: [PATCH] fixed removal of WhiteBoardParticipant, use of containsKey
 instead of contains on the HashTable as it is more efficient, removed
 unnecessary cast

---
 .../protocol/jabber/WhiteboardSessionJabberImpl.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/WhiteboardSessionJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/WhiteboardSessionJabberImpl.java
index 83bccca75..c666e9cad 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/WhiteboardSessionJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/WhiteboardSessionJabberImpl.java
@@ -288,7 +288,7 @@ public void participantStateChanged(WhiteboardParticipantChangeEvent evt)
         if ((newValue== WhiteboardParticipantState.DISCONNECTED)
                 || (newValue == WhiteboardParticipantState.FAILED))
         {
-            removeWhiteboardParticipant((WhiteboardParticipantJabberImpl) evt
+            removeWhiteboardParticipant(evt
                 .getSourceWhiteboardParticipant());
         }
     }
@@ -351,7 +351,7 @@ public void participantImageChanged(WhiteboardParticipantChangeEvent evt)
      */
     public void addWhiteboardParticipant(WhiteboardParticipant wbParticipant)
     {
-        if (wbParticipants.contains(wbParticipant))
+        if (wbParticipants.containsKey(wbParticipant.getContactAddress()))
             return;
 
         wbParticipant.addWhiteboardParticipantListener(this);
@@ -376,10 +376,10 @@ public void addWhiteboardParticipant(WhiteboardParticipant wbParticipant)
      */
     public void removeWhiteboardParticipant(WhiteboardParticipant wbParticipant)
     {
-        if (!wbParticipants.contains(wbParticipant))
+        if (!wbParticipants.containsKey(wbParticipant.getContactAddress()))
             return;
 
-        this.wbParticipants.remove(wbParticipant);
+        this.wbParticipants.remove(wbParticipant.getContactAddress());
 
         if (wbParticipant instanceof WhiteboardParticipantJabberImpl)
             ((WhiteboardParticipantJabberImpl) wbParticipant)
@@ -390,7 +390,7 @@ public void removeWhiteboardParticipant(WhiteboardParticipant wbParticipant)
         fireWhiteboardParticipantEvent(wbParticipant,
             WhiteboardParticipantEvent.WHITEBOARD_PARTICIPANT_REMOVED);
 
-        if (wbParticipants.size() == 0)
+        if (wbParticipants.isEmpty())
             setWhiteboardSessionState(WhiteboardSessionState.WHITEBOARD_ENDED);
     }