Fix some differences between TS3Api and TS3ApiAsync

Author: rogermb

src/main/java/com/github/theholywaffle/teamspeak3/TS3Api.java

@@ -620,13 +620,15 @@ public int copyChannelGroup(int sourceGroupId, String targetName, PermissionGrou
 	 * @param type
 	 * 		the desired type of server group
 	 *
+	 * @return the ID of the newly created server group
+	 *
 	 * @throws TS3CommandFailedException
 	 * 		if the execution of a command fails
 	 * @querycommands 1
 	 * @see ServerGroup#getId()
 	 */
-	public void copyServerGroup(int sourceGroupId, int targetGroupId, PermissionGroupDatabaseType type) {
-		asyncApi.copyServerGroup(sourceGroupId, targetGroupId, type).getUninterruptibly();
+	public int copyServerGroup(int sourceGroupId, int targetGroupId, PermissionGroupDatabaseType type) {
+		return asyncApi.copyServerGroup(sourceGroupId, targetGroupId, type).getUninterruptibly();
 	}
 
 	/**
@@ -2978,7 +2980,7 @@ public void logout() {
 	 * To move a channel to root level, set {@code channelTargetId} to {@code 0}.
 	 * <p>
 	 * This will move the channel right below the specified parent channel, above all other child channels.
-	 * The command will fail if the channel already has the specified target channel as the parent channel.
+	 * This command will fail if the channel already has the specified target channel as the parent channel.
 	 * </p>
 	 *
 	 * @param channelId
@@ -3003,8 +3005,8 @@ public void moveChannel(int channelId, int channelTargetId) {
 	 * The channel will be ordered below the channel with the ID specified by {@code order}.
 	 * To move the channel right below the parent channel, set {@code order} to {@code 0}.
 	 * </p><p>
-	 * Note that re-ordering a channel without also changing its parent channel cannot be done with this method.
-	 * Use {@link #editChannel(int, Map)} to change {@link ChannelProperty#CHANNEL_ORDER} instead.
+	 * Note that you can't re-order a channel without also changing its parent channel with this method.
+	 * Use {@link #editChannel(int, ChannelProperty, String)} to change {@link ChannelProperty#CHANNEL_ORDER} instead.
 	 * </p>
 	 *
 	 * @param channelId
@@ -3025,10 +3027,9 @@ public void moveChannel(int channelId, int channelTargetId, int order) {
 	}
 
 	/**
-	 * Moves a client into a channel.
+	 * Moves a single client into a channel.
 	 * <p>
-	 * Consider using {@link #moveClients(int[], int)}
-	 * for moving multiple clients.
+	 * Consider using {@link #moveClients(int[], int)} to move multiple clients.
 	 * </p>
 	 *
 	 * @param clientId
@@ -3072,10 +3073,9 @@ public void moveClients(int[] clientIds, int channelId) {
 	}
 
 	/**
-	 * Moves a client into a channel.
+	 * Moves a single client into a channel.
 	 * <p>
-	 * Consider using {@link #moveClients(Client[], ChannelBase)}
-	 * for moving multiple clients.
+	 * Consider using {@link #moveClients(Client[], ChannelBase)} to move multiple clients.
 	 * </p>
 	 *
 	 * @param client
@@ -3117,10 +3117,9 @@ public void moveClients(Client[] clients, ChannelBase channel) {
 	}
 
 	/**
-	 * Moves a client into a channel using the specified password.
+	 * Moves a single client into a channel using the specified password.
 	 * <p>
-	 * Consider using {@link #moveClients(int[], int, String)}
-	 * for moving multiple clients.
+	 * Consider using {@link #moveClients(int[], int, String)} to move multiple clients.
 	 * </p>
 	 *
 	 * @param clientId
@@ -3170,8 +3169,7 @@ public void moveClients(int[] clientIds, int channelId, String channelPassword)
 	/**
 	 * Moves a single client into a channel using the specified password.
 	 * <p>
-	 * Consider using {@link #moveClients(Client[], ChannelBase, String)}
-	 * for moving multiple clients.
+	 * Consider using {@link #moveClients(Client[], ChannelBase, String)} to move multiple clients.
 	 * </p>
 	 *
 	 * @param client

src/main/java/com/github/theholywaffle/teamspeak3/TS3ApiAsync.java

@@ -673,7 +673,7 @@ public CommandFuture<Integer> copyChannelGroup(int sourceGroupId, String targetN
 	 * @param type
 	 * 		the desired type of server group
 	 *
-	 * @return a future to track the progress of this command
+	 * @return the ID of the newly created server group
 	 *
 	 * @throws TS3CommandFailedException
 	 * 		if the execution of a command fails
@@ -3458,7 +3458,9 @@ public CommandFuture<Void> moveChannel(int channelId, int channelTargetId) {
 	 * <p>
 	 * The channel will be ordered below the channel with the ID specified by {@code order}.
 	 * To move the channel right below the parent channel, set {@code order} to {@code 0}.
-	 * Also note that a channel cannot be re-ordered without also changing its parent channel.
+	 * </p><p>
+	 * Note that you can't re-order a channel without also changing its parent channel with this method.
+	 * Use {@link #editChannel(int, ChannelProperty, String)} to change {@link ChannelProperty#CHANNEL_ORDER} instead.
 	 * </p>
 	 *
 	 * @param channelId
@@ -3482,10 +3484,9 @@ public CommandFuture<Void> moveChannel(int channelId, int channelTargetId, int o
 	}
 
 	/**
-	 * Moves a client into a channel.
+	 * Moves a single client into a channel.
 	 * <p>
-	 * Consider using {@link #moveClients(int[], int)}
-	 * for moving multiple clients.
+	 * Consider using {@link #moveClients(int[], int)} to move multiple clients.
 	 * </p>
 	 *
 	 * @param clientId
@@ -3533,10 +3534,9 @@ public CommandFuture<Void> moveClients(int[] clientIds, int channelId) {
 	}
 
 	/**
-	 * Moves a client into a channel.
+	 * Moves a single client into a channel.
 	 * <p>
-	 * Consider using {@link #moveClients(Client[], ChannelBase)}
-	 * for moving multiple clients.
+	 * Consider using {@link #moveClients(Client[], ChannelBase)} to move multiple clients.
 	 * </p>
 	 *
 	 * @param client
@@ -3582,7 +3582,10 @@ public CommandFuture<Void> moveClients(Client[] clients, ChannelBase channel) {
 	}
 
 	/**
-	 * Moves a client into a channel using the specified password.
+	 * Moves a single client into a channel using the specified password.
+	 * <p>
+	 * Consider using {@link #moveClients(int[], int, String)} to move multiple clients.
+	 * </p>
 	 *
 	 * @param clientId
 	 * 		the ID of the client to move
@@ -3638,10 +3641,9 @@ public CommandFuture<Void> moveClients(int[] clientIds, int channelId, String ch
 	}
 
 	/**
-	 * Moves a client into a channel using the specified password.
+	 * Moves a single client into a channel using the specified password.
 	 * <p>
-	 * Consider using {@link #moveClients(Client[], ChannelBase, String)}
-	 * for moving multiple clients.
+	 * Consider using {@link #moveClients(Client[], ChannelBase, String)} to move multiple clients.
 	 * </p>
 	 *
 	 * @param client
@@ -4565,7 +4567,7 @@ public CommandFuture<Void> setCustomClientProperty(int clientDBId, String key, S
 	}
 
 	/**
-	 * Sets the read flag to true for a given message. This will not delete the message.
+	 * Sets the read flag to {@code true} for a given message. This will not delete the message.
 	 *
 	 * @param messageId
 	 * 		the ID of the message for which the read flag should be set
@@ -4582,7 +4584,7 @@ public CommandFuture<Void> setMessageRead(int messageId) {
 	}
 
 	/**
-	 * Sets the read flag to true for a given message. This will not delete the message.
+	 * Sets the read flag to {@code true} for a given message. This will not delete the message.
 	 *
 	 * @param message
 	 * 		the message for which the read flag should be set
@@ -4825,6 +4827,7 @@ public CommandFuture<Void> unregisterAllEvents() {
 	 * @throws TS3CommandFailedException
 	 * 		if the execution of a command fails
 	 * @querycommands 1
+	 * @see #updateClient(ClientProperty, String)
 	 * @see #editClient(int, Map)
 	 */
 	public CommandFuture<Void> updateClient(Map<ClientProperty, String> options) {