Organized and chenged how CommandRegistry works

CommandRegistry now extends HashMap<String, Command>, this makes it
easier to .get() commands.
Created a util package for various utilities.

src/main/java/command/Ban.java

@@ -5,9 +5,10 @@ import java.util.InputMismatchException;
 import common.Message;
 import common.Message.MessageType;
 import server.Client;
-import server.CommandHandler;
 import server.Server;
 import server.BanNote;
+import util.Numbers;
+import util.StringArrays;
 
 public class Ban extends Command {
 
@@ -32,14 +33,14 @@ public class Ban extends Command {
 			bn = new BanNote(IP);
 		else
 			try {
-				duration = Server.CInt(args[1]);
+				duration = Numbers.CInt(args[1]);
 				
 				if (args.length >= 3)
-					bn = new BanNote(IP, duration, CommandHandler.stringArrayToString(CommandHandler.removeFirst(CommandHandler.removeFirst(args))));
+					bn = new BanNote(IP, duration, StringArrays.arrayToString(StringArrays.removeFirst(StringArrays.removeFirst(args))));
 				else
 					bn = new BanNote(IP, duration);
 			} catch (InputMismatchException ime) {
-				bn = new BanNote(IP, CommandHandler.stringArrayToString(CommandHandler.removeFirst(args)));
+				bn = new BanNote(IP, StringArrays.arrayToString(StringArrays.removeFirst(args)));
 			}
 		
 		Server.banNotes.add(bn);
@@ -57,7 +58,7 @@ public class Ban extends Command {
 	}
 
 	@Override
-	public String writeDescription() {
+	public String getDescription() {
 		return "Bans a user. (/ban <username> [seconds] [reason])";
 	}
 

src/main/java/command/Command.java

@@ -6,6 +6,6 @@ public abstract class Command {
 	public abstract void execute (String[] args, Client caller) throws Exception;
 	public abstract String getName ();
 	public abstract String getPermission ();
-	public abstract String writeDescription ();
+	public abstract String getDescription ();
 	public abstract int getMinArgNumber ();
 }

src/main/java/command/CreateChannel.java

@@ -25,7 +25,7 @@ public class CreateChannel extends Command{
 	}
 
 	@Override
-	public String writeDescription() {
+	public String getDescription() {
 		return "Creates a channel with specified settings. (/createchannel <name>)";
 	}
 

src/main/java/command/Exit.java

@@ -21,7 +21,7 @@ public class Exit extends Command{
 	}
 
 	@Override
-	public String writeDescription() {
+	public String getDescription() {
 		return "Exits the server.";
 	}
 

src/main/java/command/Help.java

@@ -1,20 +1,26 @@
 package command;
 
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
 import common.Message;
 import common.Message.MessageType;
 import server.Client;
-import server.CommandHandler;
+import server.Server;
 
 public class Help extends Command {
 
 	@Override
 	public void execute(String[] args, Client caller) {
 		String help = "Help for all commands:" + "\n";
-		for (int i = 0; i < CommandHandler.commands.length; i++) {
-			help += CommandHandler.commands[i].getName() + ": ";
-			help += "\t";
-			help += CommandHandler.commands[i].writeDescription();
-			if (i + 1 < CommandHandler.commands.length)
+		Iterator<Entry<String, Command>> it = Server.commReg.entrySet().iterator();
+
+		while (it.hasNext()) {
+			Map.Entry<String, Command> pair = it.next();
+
+			help += pair.getKey() + ": " + "\t" + pair.getValue().getDescription();
+			if (it.hasNext())
 				help += "\n";
 		}
 		caller.send(new Message(help, MessageType.COMMAND, false));
@@ -31,7 +37,7 @@ public class Help extends Command {
 	}
 
 	@Override
-	public String writeDescription() {
+	public String getDescription() {
 		return "Writes the descriptions for all commands.";
 	}
 

src/main/java/command/JoinChannel.java

@@ -34,7 +34,7 @@ public class JoinChannel extends Command {
 	}
 
 	@Override
-	public String writeDescription() {
+	public String getDescription() {
 		return "Sets specified channel as primary (/join <channel>)";
 	}
 

src/main/java/command/Kick.java

@@ -27,7 +27,7 @@ public class Kick extends Command {
 	}
 
 	@Override
-	public String writeDescription() {
+	public String getDescription() {
 		return "Kicks a user. (/kick <username>)";
 	}
 

src/main/java/command/LeaveChannel.java

@@ -37,7 +37,7 @@ public class LeaveChannel extends Command{
 	}
 
 	@Override
-	public String writeDescription() {
+	public String getDescription() {
 		return "Removes caller from specified channel. (/leave <channel>)";
 	}
 

src/main/java/command/List.java

@@ -39,7 +39,7 @@ public class List extends Command {
 	}
 
 	@Override
-	public String writeDescription() {
+	public String getDescription() {
 		return "Lists all users online. (/list [channel])";
 	}
 

src/main/java/command/PrivateMessage.java

@@ -2,8 +2,8 @@ package command;
 
 import common.Message;
 import server.Client;
-import server.CommandHandler;
 import server.Server;
+import util.StringArrays;
 
 public class PrivateMessage extends Command {
 
@@ -19,7 +19,7 @@ public class PrivateMessage extends Command {
 			return;
 		}
 		
-		Message mess = new Message("PM", caller.username, CommandHandler.stringArrayToString(CommandHandler.removeFirst(args)), Message.MessageType.PM);
+		Message mess = new Message("PM", caller.username, StringArrays.arrayToString(StringArrays.removeFirst(args)), Message.MessageType.PM);
 
 		reciever.send(mess); caller.send(mess);
 
@@ -36,7 +36,7 @@ public class PrivateMessage extends Command {
 	}
 
 	@Override
-	public String writeDescription() {
+	public String getDescription() {
 		return "Sends a private message to a user";
 	}
 

src/main/java/server/Client.java

@@ -134,7 +134,7 @@ public class Client implements Runnable, ActionListener {
 				if (lastMess.startsWith("/")) //Command handling
 				{
 					String[] commandarray = lastMess.substring(1).split(" ");
-					CommandHandler.executeCommand(commandarray, this);
+					Server.commReg.executeCommand(commandarray, this);
 				}
 				else //Normal message handling
 				{

src/main/java/server/CommandHandler.java

@@ -1,58 +0,0 @@
-package server;
-
-import command.*;
-
-public class CommandHandler {
-	
-	public static Command[] commands;
-	
-	public CommandHandler() {
-		commands = new Command[9];
-		commands[0] = new command.Kick();
-		commands[1] = new command.List();
-		commands[2] = new command.Exit();
-		commands[3] = new command.Help();
-		commands[4] = new command.PrivateMessage();
-		commands[5] = new command.JoinChannel();
-		commands[6] = new command.Ban();
-		commands[7] = new command.LeaveChannel();
-		commands[8] = new command.CreateChannel();
-	}
-	
-	public static void executeCommand(String[] command, Client caller) {
-		for (Command comm: commands) { //Go through all commands
-			if ((comm.getName()).equals(command[0])) { //Look for command with correct name
-				if (caller.hasPermission(comm.getPermission())) //Check if the client has permission
-					if (command.length -1 >= comm.getMinArgNumber()) { //Check the number of arguments
-						try {
-							comm.execute(removeFirst(command), caller); //Execute command
-						} catch (Exception e) {
-							caller.send("Error while executing command!");
-							e.printStackTrace();
-						} 
-						return;
-					} else {
-						caller.send("More arguments required!");
-						return;
-					}
-				else {
-					caller.send("Not enough permissions!");
-					return;
-				}
-			}
-		}
-		caller.send("No such command!");
-	}
-	
-	public static String[] removeFirst(String[] command) {
-		String[] newCommand = new String[command.length - 1];
-		for (int i = 0; i < command.length -1; i++) {
-			newCommand[i] = command[i + 1];
-		}
-		return newCommand;
-	}
-	
-	public static String stringArrayToString(String[] strArr) {
-		return strArr.toString().replace("[", "").replace("]", "").replace(", ", " ");
-	}
-}

src/main/java/server/CommandRegistry.java

@@ -0,0 +1,57 @@
+package server;
+
+import java.util.HashMap;
+
+import util.StringArrays;
+
+import command.Command;
+
+public class CommandRegistry extends HashMap<String, Command> {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	public CommandRegistry() {
+		Command[] commands = new Command[9];
+		commands[0] = new command.Kick();
+		commands[1] = new command.List();
+		commands[2] = new command.Exit();
+		commands[3] = new command.Help();
+		commands[4] = new command.PrivateMessage();
+		commands[5] = new command.JoinChannel();
+		commands[6] = new command.Ban();
+		commands[7] = new command.LeaveChannel();
+		commands[8] = new command.CreateChannel();
+
+		for (Command comm : commands)
+			put(comm.getName(), comm);
+	}
+
+	public void executeCommand(String[] command, Client caller) {
+		Command comm;
+		if ((comm = get(command[0])) != null) // Get the command
+			if (caller.hasPermission(comm.getPermission())) { // Check if the client has permission
+				String[] args = StringArrays.removeFirst(command);
+				if (args.length >= comm.getMinArgNumber()) { // Check the number of arguments
+					try {
+						comm.execute(args, caller); // Execute command
+					} catch (Exception e) {
+						caller.send("Error while executing command!");
+						e.printStackTrace();
+					}
+					return;
+				} else {
+					caller.send("More arguments required!");
+					return;
+				}
+			} else {
+				caller.send("Not enough permissions!");
+				return;
+			}
+		else
+			caller.send("No such command! Type '/help' for a list of commands.");
+	}
+
+}

src/main/java/server/Server.java

@@ -1,22 +1,18 @@
 package server;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.util.ArrayList;
-import java.util.Properties;
-import java.util.Scanner;
 import java.util.Set;
 
 import common.Message;
-import server.CommandHandler;
+import server.CommandRegistry;
 import server.Channel;
+import util.Logger;
+import util.ServerProperties;
 
 public class Server {
-	static Properties prop = new Properties();
+	static ServerProperties prop = new ServerProperties();
 	static int port, maxUsers;
 	static final String version = "0.3";
 	
@@ -27,11 +23,17 @@ public class Server {
 	static ServerSocket so;
 	public static LocalClient OPClient;
 	public static Logger log;
+	public static CommandRegistry commReg;
 	
 	public static void main(String[] arg){
 		System.out.println("Starting ChatServer version " + version + "...");
 		
-		loadProperties();
+		System.out.println("Loadning properties file.");
+		prop.loadProperties();
+		
+		System.out.println("Reading numbers from properties object.");
+		port = prop.getNumberProperty("port");
+		maxUsers = prop.getNumberProperty("maxUsers");
 		
 		System.out.print("Setting up socket...");
 		try {
@@ -47,7 +49,7 @@ public class Server {
 		channels.add(new Channel("Main"));
 		
 		System.out.print("Starting commandhandler...");
-		new CommandHandler();
+		commReg = new CommandRegistry();
 		System.out.println("Done");
 		
 		System.out.print("Creating virtual local client...");
@@ -145,45 +147,4 @@ public class Server {
 		for (Thread th: threadSet)
 			System.out.println(th.toString() + ", " + th.isAlive());
 	}
-	
-	public static int CInt(String str) {
-		int i;
-		Scanner sc = new Scanner(str);
-		i = sc.nextInt();
-		sc.close();
-		return i;
-	}
-	
-	static void loadProperties() {
-		System.out.println("Loadning properties file.");
-		try {
-			prop.load(new FileInputStream("server.properties"));
-		} catch (FileNotFoundException e1) {
-			newPropertiesFile();
-		} catch (IOException e2) {
-			System.out.println("Could not load properties.");
-			e2.printStackTrace();
-		}
-		
-		System.out.println("Reading numbers from properties object.");
-		try {
-			port = CInt(prop.getProperty("port"));
-			maxUsers = CInt(prop.getProperty("maxUsers"));
-		} catch (NullPointerException ex) {
-			System.out.println("Could not get values from properties file.");
-			newPropertiesFile();
-		}
-	}
-	
-	static void newPropertiesFile() {
-		System.out.println("Generating new properties file.");
-		try {
-			new File("server.properties").createNewFile();
-			prop.setProperty("port", "25566");
-			prop.setProperty("maxUsers", "20");
-			prop.store(new FileWriter("server.properties"), "ChatServer config file");
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
 }

src/main/java/server/Logger.java → src/main/java/util/Logger.java

@@ -1,4 +1,4 @@
-package server;
+package util;
 
 import java.io.File;
 import java.io.IOException;

src/main/java/util/Numbers.java

@@ -0,0 +1,13 @@
+package util;
+
+import java.util.Scanner;
+
+public class Numbers {
+	public static int CInt(String str) {
+		int i;
+		Scanner sc = new Scanner(str);
+		i = sc.nextInt();
+		sc.close();
+		return i;
+	}
+}

src/main/java/util/ServerProperties.java

@@ -0,0 +1,48 @@
+package util;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileWriter;
+import java.io.IOException;
+
+public class ServerProperties extends java.util.Properties{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	
+	public void loadProperties() {
+		try {
+			load(new FileInputStream("server.properties"));
+		} catch (FileNotFoundException e1) {
+			newPropertiesFile();
+		} catch (IOException e2) {
+			System.out.println("Could not load properties.");
+			e2.printStackTrace();
+		}
+	}
+	
+	public int getNumberProperty(String key) {
+		int num;
+		try {
+			num = Numbers.CInt(getProperty(key));
+			return num;
+		} catch (NullPointerException ex) {
+			System.out.println("The property " + key + " could not be read as a number.");
+			return -1;
+		}
+	}
+	
+	void newPropertiesFile() {
+		System.out.println("Generating new properties file.");
+		try {
+			new File("server.properties").createNewFile();
+			setProperty("port", "25566");
+			setProperty("maxUsers", "20");
+			store(new FileWriter("server.properties"), "ChatServer config file");
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+}

src/main/java/util/StringArrays.java

@@ -0,0 +1,18 @@
+package util;
+
+import java.util.ArrayList;
+
+public class StringArrays {
+	public static String[] removeFirst(String[] oldArr) {
+		ArrayList<String> newArr = new ArrayList<String>();
+		for (int i = 1; i < oldArr.length; i++) {
+			newArr.add(oldArr[i]);
+		}
+		return (String[]) newArr.toArray();
+	}
+
+	public static String arrayToString(String[] arr) {
+		return arr.toString().replace("[", "").replace("]", "")
+				.replace(", ", " ");
+	}
+}

src/test/java/server/ServerTestCase.java

@@ -6,6 +6,8 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import util.Numbers;
+
 public class ServerTestCase {
 	
 	@BeforeClass 
@@ -15,7 +17,7 @@ public class ServerTestCase {
 	
 	@Test
 	public void testCInt() {
-		assertEquals(Server.CInt("832"), 832);
+		assertEquals(Numbers.CInt("832"), 832);
 	}
 	
 	@AfterClass