From 0693ddac1d5675652ec4c392a610c705a8e34a69 Mon Sep 17 00:00:00 2001 From: Emil Ivov Date: Sat, 3 Mar 2007 17:07:37 +0000 Subject: [PATCH] fix javadoc conflicts --- .../service/protocol/OperationSetMultiUserChat.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/net/java/sip/communicator/service/protocol/OperationSetMultiUserChat.java b/src/net/java/sip/communicator/service/protocol/OperationSetMultiUserChat.java index 720dffdd0..35d875ce6 100644 --- a/src/net/java/sip/communicator/service/protocol/OperationSetMultiUserChat.java +++ b/src/net/java/sip/communicator/service/protocol/OperationSetMultiUserChat.java @@ -63,6 +63,8 @@ public List getExistingChatRooms() * @throws OperationFailedException if the room couldn't be created for some * reason (e.g. room already exists; user already joined to an existant * room or user has no permissions to create a chat room). + * + * @return the newly created ChatRoom named roomName. */ public ChatRoom createChatRoom(String roomName, Hashtable roomProperties) throws OperationFailedException; @@ -80,10 +82,7 @@ public ChatRoom createChatRoom(String roomName, Hashtable roomProperties) /** * Informs the sender of an invitation that we decline their invitation. * - * @param conn the connection to use for sending the rejection. - * @param room the room that sent the original invitation. - * @param inviter the inviter of the declined invitation. - * @param reason the reason why the invitee is declining the invitation. + * @param invitation the invitation we are rejecting. */ public void rejectInvitation(ChatRoomInvitation invitation);