package com.github.theholywaffle.teamspeak3.commands.parameter;

/*
 * #%L
 * TeamSpeak 3 Java API
 * %%
 * Copyright (C) 2014 Bert De Geyter
 * %%
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
 * 
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
 * 
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
 * #L%
 */

import com.github.theholywaffle.teamspeak3.commands.CommandEncoding;

public class KeyValueParam extends Parameter {

	private final String key;
	private final String value;

	public KeyValueParam(String key, String value) {
		this.key = key;
		this.value = value;
	}

	public KeyValueParam(String key, int value) {
		this(key, String.valueOf(value));
	}

	public KeyValueParam(String key, long value) {
		this(key, String.valueOf(value));
	}

	public KeyValueParam(String key, boolean value) {
		this(key, value ? "1" : "0");
	}

	@Override
	public String build() {
		return CommandEncoding.encode(key) + "=" + CommandEncoding.encode(value);
	}

}

@@ -1448,24 +1448,96 @@
 ng value) %7B%0A
+%09%09if (key == null) throw new IllegalArgumentException(%22Key was null%22);%0A%0A
 %09%09this.key =
@@ -1557,21 +1557,44 @@
 value = 
+(
 value
+ != null) ? value : %22%22
 ;%0A%09%7D%0A%0A%09p
@@ -1968,11 +1968,10 @@
 ue);%0A%09%7D%0A
-%0A
 %7D%0A

Make KeyValueParam handle null correctly.