Merge pull request #101 from Linnun/master

Add Channel#isEmpty, Channel#isFamilyEmpty and ChannelProperty.CHANNEL_DELETE_DELAY

Author: rogermb

src/main/java/com/github/theholywaffle/teamspeak3/api/ChannelProperty.java

@@ -32,6 +32,7 @@ public enum ChannelProperty implements Property {
 	CHANNEL_CODEC_IS_UNENCRYPTED(true),
 	CHANNEL_CODEC_LATENCY_FACTOR(false),
 	CHANNEL_CODEC_QUALITY(true),
+	CHANNEL_DELETE_DELAY(true),
 	CHANNEL_DESCRIPTION(true),
 	CHANNEL_FILEPATH(false),
 	CHANNEL_FLAG_DEFAULT(true),
@@ -48,8 +49,8 @@ public enum ChannelProperty implements Property {
 	CHANNEL_MAXFAMILYCLIENTS(true),
 	CHANNEL_NAME(true),
 	CHANNEL_NAME_PHONETIC(true),
-	CHANNEL_NEEDED_TALK_POWER(true),
 	CHANNEL_NEEDED_SUBSCRIBE_POWER(false),
+	CHANNEL_NEEDED_TALK_POWER(true),
 	CHANNEL_ORDER(true),
 	CHANNEL_PASSWORD(true),
 	CHANNEL_TOPIC(true),

src/main/java/com/github/theholywaffle/teamspeak3/api/wrapper/Channel.java

@@ -52,4 +52,16 @@ public int getTotalClients() {
 	public int getNeededSubscribePower() {
 		return getInt(ChannelProperty.CHANNEL_NEEDED_SUBSCRIBE_POWER);
 	}
+
+	/**
+	 * @return {@code true}, if the channel is empty, {@code false} otherwise.
+	 */
+	public boolean isEmpty() {
+		return (getTotalClients() == 0);
+	}
+
+	@Override
+	public boolean isFamilyEmpty() {
+		return (getTotalClientsFamily() == 0);
+	}
 }

src/main/java/com/github/theholywaffle/teamspeak3/api/wrapper/ChannelBase.java

@@ -100,4 +100,13 @@ public int getMaxClients() {
 	public int getMaxFamilyClients() {
 		return getInt(ChannelProperty.CHANNEL_MAXFAMILYCLIENTS);
 	}
+
+	public int getSecondsEmpty() {
+		return getInt(ChannelProperty.SECONDS_EMPTY);
+	}
+
+	/**
+	 * @return {@code true}, if the channel and all child channels are empty, {@code false} otherwise.
+	 */
+	abstract public boolean isFamilyEmpty();
 }

src/main/java/com/github/theholywaffle/teamspeak3/api/wrapper/ChannelInfo.java

@@ -84,7 +84,8 @@ public String getPhoneticName() {
 		return get(ChannelProperty.CHANNEL_NAME_PHONETIC);
 	}
 
-	public int getSecondsEmpty() {
-		return getInt(ChannelProperty.SECONDS_EMPTY);
+	@Override
+	public boolean isFamilyEmpty() {
+		return (getSecondsEmpty() >= 0);
 	}
 }

src/main/java/com/github/theholywaffle/teamspeak3/commands/CChannelList.java

@@ -37,6 +37,7 @@ public CChannelList() {
 		add(new OptionParam("voice"));
 		add(new OptionParam("limits"));
 		add(new OptionParam("icon"));
+		add(new OptionParam("secondsempty"));
 	}
 
 }