Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-22 06:12:05 +01:00
Code Issues Releases Wiki Activity

Fix MultiUserChat javadoc

Browse source
This commit is contained in:
Florian Schmaus 2015-07-15 22:37:49 +02:00
parent ea00caca31
commit 24365f0f1e
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
View file

@ -398,10 +398,9 @@ public class MultiUserChat {
} }
/** /**
* Same as {@link #createOrJoin(Resourcepart, String, DiscussionHistory, long)}, but without a password, specifying a * Create or join the MUC room with the given nickname.
* discussion history and using the connections default reply timeout.
* *
* @param nickname * @param nickname the nickname to use in the MUC room.
* @return A {@link MucCreateConfigFormHandle} if the room was created, or {code null} if the room was joined. * @return A {@link MucCreateConfigFormHandle} if the room was created, or {code null} if the room was joined.
* @throws NoResponseException * @throws NoResponseException
* @throws XMPPErrorException * @throws XMPPErrorException
@ -409,7 +408,6 @@ public class MultiUserChat {
* @throws NotConnectedException * @throws NotConnectedException
* @throws MucAlreadyJoinedException * @throws MucAlreadyJoinedException
* @throws NotAMucServiceException * @throws NotAMucServiceException
* @see #createOrJoin(Resourcepart, String, DiscussionHistory, long)
*/ */
public synchronized MucCreateConfigFormHandle createOrJoin(Resourcepart nickname) throws NoResponseException, XMPPErrorException, public synchronized MucCreateConfigFormHandle createOrJoin(Resourcepart nickname) throws NoResponseException, XMPPErrorException,
InterruptedException, MucAlreadyJoinedException, NotConnectedException, NotAMucServiceException { InterruptedException, MucAlreadyJoinedException, NotConnectedException, NotAMucServiceException {
@ -633,7 +631,7 @@ public class MultiUserChat {
* @throws NotConnectedException * @throws NotConnectedException
* @throws InterruptedException * @throws InterruptedException
* @throws NotAMucServiceException * @throws NotAMucServiceException
* @deprecated use {@link #join(MucEnterConfiguration) instead. * @deprecated use {@link #join(MucEnterConfiguration)} instead.
*/ */
@Deprecated @Deprecated
public void join( public void join(