From f1370f24e4b8d30471a880ec07a8eb03f17a9bb6 Mon Sep 17 00:00:00 2001 From: Yana Stamcheva Date: Wed, 13 Jun 2007 11:48:50 +0000 Subject: [PATCH] fix multi chat implementation --- .../chat/conference/ConferenceChatPanel.java | 22 +++-- .../chat/conference/MultiUserChatManager.java | 12 +-- .../protocol/jabber/ChatRoomJabberImpl.java | 88 +++++++++++++++++-- .../OperationSetMultiUserChatJabberImpl.java | 17 ++-- .../jabber/TestOperationSetMultiUserChat.java | 13 ++- 5 files changed, 118 insertions(+), 34 deletions(-) diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatPanel.java index 27b000ed8..663595a87 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatPanel.java @@ -26,8 +26,8 @@ public class ConferenceChatPanel extends ChatPanel implements ChatRoomMessageListener, ChatRoomPropertyChangeListener, - ChatRoomLocalUserStatusListener, - ChatRoomMemberListener + ChatRoomLocalUserPresenceListener, + ChatRoomMemberPresenceListener { private Logger logger = Logger.getLogger(ConferenceChatPanel.class); @@ -62,9 +62,9 @@ public ConferenceChatPanel(ChatWindow chatWindow, ChatRoom chatRoom) } this.chatRoom.addMessageListener(this); - this.chatRoom.addChatRoomPropertyChangeListener(this); - this.chatRoom.addLocalUserStatusListener(this); - this.chatRoom.addMemberListener(this); + this.chatRoom.addPropertyChangeListener(this); + this.chatRoom.addLocalUserPresenceListener(this); + this.chatRoom.addMemberPresenceListener(this); } /** @@ -361,11 +361,15 @@ public void chatRoomChanged(ChatRoomPropertyChangeEvent event) { } - public void localUserStatusChanged(ChatRoomLocalUserStatusChangeEvent evt) - { + public void localUserPresenceChanged(ChatRoomLocalUserPresenceChangeEvent evt) + { + // TODO Auto-generated method stub + } - public void memberStatusChanged(ChatRoomMemberEvent evt) - { + public void memberPresenceChanged(ChatRoomMemberPresenceChangeEvent evt) + { + // TODO Auto-generated method stub + } } diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/MultiUserChatManager.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/MultiUserChatManager.java index da8f6b2e1..b6b39e1ee 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/MultiUserChatManager.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/MultiUserChatManager.java @@ -16,8 +16,8 @@ * @author Yana Stamcheva */ public class MultiUserChatManager - implements InvitationListener, - InvitationRejectionListener + implements ChatRoomInvitationListener, + ChatRoomInvitationRejectionListener { private MainFrame mainFrame; @@ -32,13 +32,15 @@ public MultiUserChatManager(MainFrame mainFrame) this.mainFrame = mainFrame; } - public void invitationReceived(InvitationReceivedEvent evt) + public void invitationReceived(ChatRoomInvitationReceivedEvent evt) { + // TODO Auto-generated method stub } - public void invitationRejected(InvitationRejectedEvent evt) + public void invitationRejected(ChatRoomInvitationRejectedEvent evt) { - + // TODO Auto-generated method stub + } } diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomJabberImpl.java index 954b926c0..7782c876c 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomJabberImpl.java @@ -102,7 +102,7 @@ public ChatRoomJabberImpl(MultiUserChat multiUserChat, * @param listener the ChatRoomChangeListener that is to be * registered for ChatRoomChangeEvent-s. */ - public void addChatRoomPropertyChangeListener( + public void addPropertyChangeListener( ChatRoomPropertyChangeListener listener) { synchronized(chatRoomPropertyChangeListeners) @@ -118,7 +118,7 @@ public void addChatRoomPropertyChangeListener( * * @param listener the ChatRoomChangeListener to remove. */ - public void removeChatRoomPropertyChangeListener( + public void removePropertyChangeListener( ChatRoomPropertyChangeListener listener) { synchronized(chatRoomPropertyChangeListeners) @@ -133,8 +133,8 @@ public void removeChatRoomPropertyChangeListener( * * @param listener a local user status listener. */ - public void addLocalUserStatusListener( - ChatRoomLocalUserStatusListener listener) + public void addLocalUserPresenceListener( + ChatRoomLocalUserPresenceListener listener) { synchronized(localUserStatusListeners) { @@ -150,8 +150,8 @@ public void addLocalUserStatusListener( * * @param listener a local user status listener. */ - public void removeLocalUserStatusListener(ChatRoomLocalUserStatusListener - listener) + public void removeLocalUserPresenceListener( + ChatRoomLocalUserPresenceListener listener) { synchronized(localUserStatusListeners) { @@ -196,7 +196,8 @@ public void removeMessageListener(ChatRoomMessageListener listener) * * @param listener a participant status listener. */ - public void addMemberListener(ChatRoomMemberListener listener) + public void addMemberPresenceListener( + ChatRoomMemberPresenceListener listener) { synchronized(memberListeners) { @@ -212,7 +213,8 @@ public void addMemberListener(ChatRoomMemberListener listener) * * @param listener a participant status listener. */ - public void removeMemberListener(ChatRoomMemberListener listener) + public void removeMemberPresenceListener( + ChatRoomMemberPresenceListener listener) { synchronized(memberListeners) { @@ -796,4 +798,74 @@ public void ownershipGranted(String participant) /** @todo implement ownershipGranted() */ } } + + public void addLocalUserRoleListener( + ChatRoomLocalUserRoleListener listener) + { + } + + public void removelocalUserRoleListener( + ChatRoomLocalUserRoleListener listener) + { + } + + public void addMemberRoleListener(ChatRoomMemberRoleListener listener) + { + } + + public void removeMemberRoleListener(ChatRoomMemberRoleListener listener) + { + } + + public void setPassword(String password) + throws OperationFailedException + { + } + + public String getPassword() + { + return null; + } + + public void addBanMask(String banMask) throws OperationFailedException + { + } + + public void removeBanMask(String banMask) throws OperationFailedException + { + } + + public void setUserLimit(int userLimit) throws OperationFailedException + { + } + + public int getUserLimit() + { + return 0; + } + + public void addConfigParam(ChatRoomConfigParam configParam) + throws OperationFailedException + { + } + + public void removeConfigParam(ChatRoomConfigParam configParam) + throws OperationFailedException + { + } + + public Iterator getSupportedConfigParams() + { + return null; + } + + public Iterator getConfiguration() + { + return null; + } + + public Iterator getBanList() + { + return null; + } } diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetMultiUserChatJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetMultiUserChatJabberImpl.java index 4bef0745b..e0bea415b 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetMultiUserChatJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetMultiUserChatJabberImpl.java @@ -10,6 +10,7 @@ import net.java.sip.communicator.service.protocol.*; import net.java.sip.communicator.service.protocol.event.*; + import org.jivesoftware.smack.*; import net.java.sip.communicator.util.*; import org.jivesoftware.smackx.muc.MultiUserChat; @@ -72,7 +73,7 @@ public class OperationSetMultiUserChatJabberImpl * * @param listener an invitation listener. */ - public void addInvitationListener(InvitationListener listener) + public void addInvitationListener(ChatRoomInvitationListener listener) { synchronized(invitationListeners) { @@ -87,7 +88,7 @@ public void addInvitationListener(InvitationListener listener) * * @param listener the invitation listener to remove. */ - public void removeInvitationListener(InvitationListener listener) + public void removeInvitationListener(ChatRoomInvitationListener listener) { synchronized(invitationListeners) { @@ -103,7 +104,7 @@ public void removeInvitationListener(InvitationListener listener) * rejection events. */ public void addInvitationRejectionListener( - InvitationRejectionListener listener) + ChatRoomInvitationRejectionListener listener) { synchronized(invitationRejectionListeners) { @@ -118,8 +119,8 @@ public void addInvitationRejectionListener( * * @param listener the invitation listener to remove. */ - public void removeInvitationRejectionListener(InvitationRejectionListener - listener) + public void removeInvitationRejectionListener( + ChatRoomInvitationRejectionListener listener) { synchronized(invitationRejectionListeners) { @@ -563,4 +564,10 @@ public ChatRoomJabberImpl getChatRoom(String chatRoomName) { return (ChatRoomJabberImpl)this.chatRoomCache.get(chatRoomName); } + + public List getCurrentlyJoinedChatRooms(ChatRoomMember chatRoomMember) + throws OperationFailedException, OperationNotSupportedException + { + return null; + } } diff --git a/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetMultiUserChat.java b/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetMultiUserChat.java index 0699d6826..4b0f7e240 100644 --- a/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetMultiUserChat.java +++ b/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetMultiUserChat.java @@ -6,13 +6,12 @@ */ package net.java.sip.communicator.slick.protocol.jabber; -import net.java.sip.communicator.util.*; +import java.util.*; + import junit.framework.*; import net.java.sip.communicator.service.protocol.*; -import java.util.*; -import net.java.sip.communicator.service.protocol.event. - ChatRoomMemberEvent; import net.java.sip.communicator.service.protocol.event.*; +import net.java.sip.communicator.util.*; /** * Creates a chat room on the server, then tries to make both users join the @@ -326,7 +325,7 @@ public void testOurLeave() } private class ParticipantStatusEventCollector - implements ChatRoomMemberListener + implements ChatRoomMemberPresenceListener { /** @@ -334,8 +333,8 @@ private class ParticipantStatusEventCollector * * @param event the event containing the source call. */ - public void memberStatusChanged( - ChatRoomMemberEvent evt) + public void memberPresenceChanged( + ChatRoomMemberPresenceChangeEvent evt) { synchronized(this) {