Organized and formatted whole project

Organized and formatted, plus remade the CommandHandler/Registry system
a little bit.

src/main/java/client/ChatClient.java

@@ -16,8 +16,8 @@ import javax.swing.JTextField;
 public class ChatClient {
 	static Properties prop = new Properties();
 	static File confFile = new File("client.properties");
-	
-	public static void main (String[] arg) {
+
+	public static void main(String[] arg) {
 		try {
 			prop.load(new FileInputStream(confFile));
 		} catch (FileNotFoundException e) {
@@ -27,25 +27,24 @@ public class ChatClient {
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
-		
+
 		JTextField hostBox = new JTextField(prop.getProperty("host"));
 		JTextField portBox = new JTextField(prop.getProperty("port"));
 		JTextField userBox = new JTextField(prop.getProperty("username"));
-		final JComponent[] inputs = new JComponent[] {
-				new JLabel("Host:"), hostBox,
-				new JLabel("Port:"), portBox,
-				new JLabel("Username:"), userBox
-		};
-		
+		final JComponent[] inputs = new JComponent[] { new JLabel("Host:"),
+				hostBox, new JLabel("Port:"), portBox, new JLabel("Username:"),
+				userBox };
+
 		String host, username, portString;
-		
-		JOptionPane.showMessageDialog(null, inputs, "Chat settings", JOptionPane.PLAIN_MESSAGE);
-		
+
+		JOptionPane.showMessageDialog(null, inputs, "Chat settings",
+				JOptionPane.PLAIN_MESSAGE);
+
 		host = hostBox.getText();
 		prop.setProperty("host", host);
 		username = userBox.getText();
 		prop.setProperty("username", username);
-		
+
 		portString = portBox.getText();
 		Scanner sc = new Scanner(portString);
 		int port = sc.nextInt();
@@ -53,15 +52,16 @@ public class ChatClient {
 		prop.setProperty("port", portString);
 
 		writeConfFile();
-		
+
 		new ChatWindow(host, port, username);
 	}
-	
+
 	static void writeConfFile() {
 		try {
 			if (!confFile.exists())
 				confFile.createNewFile();
-			prop.store(new FileOutputStream(confFile), "Configuration for chat client");
+			prop.store(new FileOutputStream(confFile),
+					"Configuration for chat client");
 		} catch (IOException e) {
 			e.printStackTrace();
 		}

src/main/java/client/ChatWindow.java

@@ -19,55 +19,66 @@ import java.net.Socket;
 import java.net.SocketTimeoutException;
 import java.util.ArrayList;
 
-import javax.swing.*;
+import javax.swing.DefaultListModel;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextField;
+import javax.swing.ListSelectionModel;
+import javax.swing.SwingConstants;
+import javax.swing.WindowConstants;
 import javax.swing.border.EmptyBorder;
 
 import common.Message;
 import common.Message.MessageType;
 
 @SuppressWarnings("serial")
-public class ChatWindow extends JFrame implements ActionListener, Runnable, KeyListener{
+public class ChatWindow extends JFrame implements ActionListener, Runnable,
+		KeyListener {
 	Thread getMessages;
 	static File confFile = new File("client.properties");
-	
+
 	String adress, username;
 	ArrayList<String> lastMess = new ArrayList<String>();
 	int port, messIndex = 0;
-	
+
 	Socket so = new Socket();
 	ObjectInputStream objIn;
 	PrintWriter out;
-	
+
 	GridBagLayout g = new GridBagLayout();
 	GridBagConstraints con = new GridBagConstraints();
-	
+
 	JPanel right = new JPanel();
 	JLabel lblUsersOnline = new JLabel("Users online:");
 	DefaultListModel<String> model = new DefaultListModel<String>();
 	JList<String> userList = new JList<String>(model);
 	JButton reconnect = new JButton("Reconnect");
-	
+
 	Console chat = new Console();
 	JScrollPane scroll = new JScrollPane(chat);
 	JTextField write = new JTextField();
-	
+
 	public ChatWindow(String adress, int port, String username) {
 		this.adress = adress;
 		this.port = port;
 		this.username = username;
-		
-		//List config
+
+		// List config
 		userList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 		userList.setLayoutOrientation(JList.VERTICAL);
-		//Label config
-		lblUsersOnline.setHorizontalAlignment(JLabel.CENTER);
+		// Label config
+		lblUsersOnline.setHorizontalAlignment(SwingConstants.CENTER);
 		lblUsersOnline.setBorder(new EmptyBorder(5, 5, 5, 5));
-		//Layout config
+		// Layout config
 		right.setLayout(g);
 		con.fill = GridBagConstraints.HORIZONTAL;
 		con.weightx = 1;
 		con.gridx = 0;
-		
+
 		right.add(lblUsersOnline, con);
 
 		con.weighty = 1;
@@ -77,75 +88,81 @@ public class ChatWindow extends JFrame implements ActionListener, Runnable, KeyL
 		con.weighty = 0;
 		con.fill = GridBagConstraints.HORIZONTAL;
 		right.add(reconnect, con);
-		
+
 		setLayout(new BorderLayout());
-		add(chat, BorderLayout.NORTH); add(write, BorderLayout.SOUTH); add(right, BorderLayout.EAST);
-		
-		//Scrollbar config
+		add(chat, BorderLayout.NORTH);
+		add(write, BorderLayout.SOUTH);
+		add(right, BorderLayout.EAST);
+
+		// Scrollbar config
 		add(scroll);
 		scroll.setMinimumSize(new Dimension(100, 100));
 		scroll.setViewportView(chat);
 		scroll.setSize(500, 130);
-		
-		//Listener config
+
+		// Listener config
 		reconnect.addActionListener(this);
 		write.addKeyListener(this);
-		
-		//Window config
+
+		// Window config
 		this.setLocation(new Point(100, 100));
 		setSize(600, 600);
 		setVisible(true);
 		setTitle("Chat on " + adress + " | Username: " + username);
 		setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
-		
+
 		connect(adress, port, username);
 	}
-	
+
 	public void send(String text) {
 		if (so.isConnected() && !so.isClosed())
 			out.println(text);
 		else {
-			chat.log(new Message("Not connected to server!", MessageType.WARNING, false));
+			chat.log(new Message("Not connected to server!",
+					MessageType.WARNING, false));
 			write.setEnabled(false);
 		}
 	}
-	
+
 	void connect(String address, int port, String username) {
-		chat.log(new Message("Connecting to " + address + " on port " + port + ".", MessageType.INFO, false));
+		chat.log(new Message("Connecting to " + address + " on port " + port
+				+ ".", MessageType.INFO, false));
 		if (getMessages != null)
 			getMessages.interrupt();
-		
+
 		try {
 			so.close();
 			objIn.close();
 			out.close();
 		} catch (NullPointerException ex) {
-			//Nothing
+			// Nothing
 		} catch (IOException ex) {
 			chat.log(new Message(ex.toString(), MessageType.ERROR, false));
 		}
-		
+
 		try {
 			so = new Socket();
 			so.connect(new InetSocketAddress(address, port), 1000);
-			objIn =		new ObjectInputStream(so.getInputStream());
-			out =		new PrintWriter(so.getOutputStream(), true);
+			objIn = new ObjectInputStream(so.getInputStream());
+			out = new PrintWriter(so.getOutputStream(), true);
 		} catch (SocketTimeoutException ex) {
-			chat.log(new Message("Could not connect to server. (Connection timed out!)", MessageType.ERROR, false));
+			chat.log(new Message(
+					"Could not connect to server. (Connection timed out!)",
+					MessageType.ERROR, false));
 			return;
 		} catch (IOException e) {
 			chat.log(new Message(e.toString(), MessageType.ERROR, false));
 			return;
 		}
-		
-		send(username); //First packet sent to server sets username
-		
+
+		send(username); // First packet sent to server sets username
+
 		getMessages = new Thread(this);
 		getMessages.start();
-		
+
 		write.setEnabled(true);
 	}
-	
+
 	@Override
 	public void actionPerformed(ActionEvent e) {
 		if (e.getSource() == reconnect)
@@ -157,31 +174,35 @@ public class ChatWindow extends JFrame implements ActionListener, Runnable, KeyL
 		try {
 			getMessages();
 		} catch (EOFException eof) {
-			chat.log(new Message(eof.toString() + " Disconnected from host.", MessageType.ERROR, false));
+			chat.log(new Message(eof.toString() + " Disconnected from host.",
+					MessageType.ERROR, false));
 		} catch (ClassNotFoundException cnf) {
-			chat.log(new Message("The message recieved from the server could not be understood. Are you using the right version?", MessageType.ERROR, false));
+			chat.log(new Message(
+					"The message recieved from the server could not be understood. Are you using the right version?",
+					MessageType.ERROR, false));
 		} catch (IOException e) {
 			chat.log(new Message(e.toString(), MessageType.ERROR, false));
 		}
 	}
-	
+
 	public void getMessages() throws IOException, ClassNotFoundException {
-		while(!getMessages.isInterrupted()) {
+		while (!getMessages.isInterrupted()) {
 			Object fromServer = objIn.readObject();
 			if (fromServer instanceof Message) {
-				Message mess = ((Message)fromServer);
+				Message mess = ((Message) fromServer);
 				chat.log(mess);
-				
+
 				if (mess.usersOnline == null)
 					continue;
-				
+
 				model = new DefaultListModel<String>();
-				for (String user: mess.usersOnline)
+				for (String user : mess.usersOnline)
 					model.addElement(user);
-				
+
 				userList.setModel(model);
 			} else if (fromServer instanceof String) {
-				chat.log(new Message((String)fromServer, MessageType.NORMAL, false));
+				chat.log(new Message((String) fromServer, MessageType.NORMAL,
+						false));
 			} else
 				throw new ClassNotFoundException();
 		}
@@ -190,37 +211,39 @@ public class ChatWindow extends JFrame implements ActionListener, Runnable, KeyL
 	@Override
 	public void keyPressed(KeyEvent eKey) {
 		int keyCode = eKey.getKeyCode();
-		 switch( keyCode ) {
-	        case KeyEvent.VK_UP:
-	        	if (messIndex > 0)
-	        		messIndex--;
-	        	if (!lastMess.isEmpty())
-	        		write.setText(lastMess.get(messIndex));
-	            break;
-	        case KeyEvent.VK_DOWN:
-	        	if (messIndex <= lastMess.size())
-	        		messIndex++;
-	        	if (messIndex >= lastMess.size()) {
-	        		messIndex = lastMess.size();
-	        		write.setText("");
-	        	} else
-	        		write.setText(lastMess.get(messIndex));
-	            break;
-	        case KeyEvent.VK_ENTER:
-	        	String text = write.getText().trim();
-	    		if (!text.equals("")) {
-	    			send(text);
-	    			lastMess.add(text);
-	    			messIndex = lastMess.size();
-	    			write.setText("");
-	    		}
-	        	break;
-	     }
+		switch (keyCode) {
+		case KeyEvent.VK_UP:
+			if (messIndex > 0)
+				messIndex--;
+			if (!lastMess.isEmpty())
+				write.setText(lastMess.get(messIndex));
+			break;
+		case KeyEvent.VK_DOWN:
+			if (messIndex <= lastMess.size())
+				messIndex++;
+			if (messIndex >= lastMess.size()) {
+				messIndex = lastMess.size();
+				write.setText("");
+			} else
+				write.setText(lastMess.get(messIndex));
+			break;
+		case KeyEvent.VK_ENTER:
+			String text = write.getText().trim();
+			if (!text.equals("")) {
+				send(text);
+				lastMess.add(text);
+				messIndex = lastMess.size();
+				write.setText("");
+			}
+			break;
+		}
 	}
 
 	@Override
-	public void keyReleased(KeyEvent arg0) {}
+	public void keyReleased(KeyEvent arg0) {
+	}
 
 	@Override
-	public void keyTyped(KeyEvent arg0) {}
+	public void keyTyped(KeyEvent arg0) {
+	}
 }

src/main/java/client/Console.java

@@ -1,37 +1,41 @@
 package client;
 
-import javax.swing.*;
-import javax.swing.text.*;
+import javax.swing.JTextPane;
+import javax.swing.SwingUtilities;
+import javax.swing.text.SimpleAttributeSet;
+import javax.swing.text.StyledDocument;
 
 import common.Message;
 
 @SuppressWarnings("serial")
 public class Console extends JTextPane {
-	
+
 	public Console() {
 		setEditable(false);
 	}
-	
+
 	void log(Message mess) {
-		SwingUtilities.invokeLater(new AppendThread(mess.toString(), mess.style, this.getStyledDocument()));
+		SwingUtilities.invokeLater(new AppendThread(mess.toString(),
+				mess.style, this.getStyledDocument()));
 	}
-	
+
 	private static class AppendThread extends Thread {
 		String text;
 		SimpleAttributeSet style;
 		StyledDocument doc;
-		
-		public AppendThread(String text, SimpleAttributeSet style, StyledDocument doc) {
+
+		public AppendThread(String text, SimpleAttributeSet style,
+				StyledDocument doc) {
 			this.text = text;
 			this.style = style;
 			this.doc = doc;
 		}
-		
+
 		@Override
 		public synchronized void run() {
 			try {
-			    doc.insertString(doc.getLength(), text + "\n", style);
-			} catch(Exception e) {
+				doc.insertString(doc.getLength(), text + "\n", style);
+			} catch (Exception e) {
 				System.out.println(e);
 			}
 		}

src/main/java/command/Ban.java

@@ -2,12 +2,14 @@ package command;
 
 import java.util.InputMismatchException;
 
-import common.Message;
-import common.Message.MessageType;
+import server.BanNote;
 import server.Client;
-import server.CommandHandler;
 import server.Server;
-import server.BanNote;
+import server.util.Numbers;
+import server.util.StringArrays;
+
+import common.Message;
+import common.Message.MessageType;
 
 public class Ban extends Command {
 
@@ -16,32 +18,37 @@ public class Ban extends Command {
 		String IP = null;
 		int duration = -1;
 		Client victim;
-		
+
 		try {
 			victim = Server.getUserByName(args[0]);
-		}	catch (NullPointerException e) {
+		} catch (NullPointerException e) {
 			caller.send(new Message("No such user!", MessageType.WARNING, false));
 			return;
 		}
-		
+
 		IP = victim.sock.getInetAddress().toString();
-		
+
 		BanNote bn = new BanNote(IP);
-		
+
 		if (args.length == 1)
 			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);
 		victim.disconnect(false);
 	}
@@ -57,7 +64,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

@@ -3,9 +3,13 @@ package command;
 import server.Client;
 
 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 int getMinArgNumber ();
+	public abstract void execute(String[] args, Client caller) throws Exception;
+
+	public abstract String getName();
+
+	public abstract String getPermission();
+
+	public abstract String getDescription();
+
+	public abstract int getMinArgNumber();
 }

src/main/java/command/CreateChannel.java

@@ -1,17 +1,18 @@
 package command;
 
-import common.Message;
-
 import server.Client;
 import server.Server;
 
-public class CreateChannel extends Command{
+import common.Message;
+
+public class CreateChannel extends Command {
 
 	@Override
 	public void execute(String[] args, Client caller) throws Exception {
 		Server.channels.add(new server.Channel(args[0]));
-		
-		Server.wideBroadcast(new Message("Channel " + args[0] + " is now available. Use '/join " + args[0] + "' to join."));
+
+		Server.wideBroadcast(new Message("Channel " + args[0]
+				+ " is now available. Use '/join " + args[0] + "' to join."));
 	}
 
 	@Override
@@ -25,7 +26,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

@@ -3,7 +3,7 @@ package command;
 import server.Client;
 import server.Server;
 
-public class Exit extends Command{
+public class Exit extends Command {
 
 	@Override
 	public void execute(String[] args, Client caller) {
@@ -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,30 @@
 package command;
 
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import server.Client;
+import server.Server;
+
 import common.Message;
 import common.Message.MessageType;
-import server.Client;
-import server.CommandHandler;
 
 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 +41,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

@@ -1,10 +1,11 @@
 package command;
 
-import common.Message;
-import common.Message.MessageType;
 import server.Client;
 import server.Server;
 
+import common.Message;
+import common.Message.MessageType;
+
 public class JoinChannel extends Command {
 
 	@Override
@@ -13,13 +14,15 @@ public class JoinChannel extends Command {
 			caller.send("Client-only command.");
 			return;
 		}
-		
+
 		try {
 			Server.getChannelByName(args[0]).add(caller);
 			caller.primaryChannel = Server.getChannelByName(args[0]);
-			caller.send(new Message("You are now speaking in channel " + args[0] + ".", MessageType.COMMAND, false));
+			caller.send(new Message("You are now speaking in channel "
+					+ args[0] + ".", MessageType.COMMAND, false));
 		} catch (NullPointerException ex) {
-			caller.send(new Message("No such channel!", MessageType.ERROR, false));
+			caller.send(new Message("No such channel!", MessageType.ERROR,
+					false));
 		}
 	}
 
@@ -34,7 +37,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

@@ -1,10 +1,11 @@
 package command;
 
-import common.Message;
-import common.Message.MessageType;
 import server.Client;
 import server.Server;
 
+import common.Message;
+import common.Message.MessageType;
+
 public class Kick extends Command {
 
 	@Override
@@ -12,7 +13,8 @@ public class Kick extends Command {
 		try {
 			Server.getUserByName(args[0]).disconnect(false);
 		} catch (NullPointerException ex) {
-			caller.send(new Message("No user called " + args[0] + "!", MessageType.ERROR, false));
+			caller.send(new Message("No user called " + args[0] + "!",
+					MessageType.ERROR, false));
 		}
 	}
 
@@ -27,7 +29,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

@@ -1,27 +1,32 @@
 package command;
 
-import common.Message;
-import common.Message.MessageType;
 import server.Client;
 import server.Server;
 
-public class LeaveChannel extends Command{
+import common.Message;
+import common.Message.MessageType;
+
+public class LeaveChannel extends Command {
 
 	@Override
 	public void execute(String[] args, Client caller) throws Exception {
-		if (caller.equals(Server.OPClient)){
+		if (caller.equals(Server.OPClient)) {
 			caller.send("Client-only command.");
 			return;
 		}
-		
+
 		try {
 			Server.getChannelByName(args[0]).remove(caller);
 			if (caller.primaryChannel.equals(Server.getChannelByName(args[0])))
 				caller.primaryChannel = Server.channels.get(0);
-			caller.send(new Message("You left channel " + args[0] + ".", MessageType.COMMAND, false));
-			caller.send(new Message("You are now speaking in channel " + caller.primaryChannel.name + ".", MessageType.COMMAND, false));
-		} catch(NullPointerException ex) {
-			caller.send(new Message("No channel named " + args[0] + ".", MessageType.ERROR, false));
+			caller.send(new Message("You left channel " + args[0] + ".",
+					MessageType.COMMAND, false));
+			caller.send(new Message("You are now speaking in channel "
+					+ caller.primaryChannel.name + ".", MessageType.COMMAND,
+					false));
+		} catch (NullPointerException ex) {
+			caller.send(new Message("No channel named " + args[0] + ".",
+					MessageType.ERROR, false));
 			return;
 		}
 	}
@@ -37,7 +42,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

@@ -1,31 +1,36 @@
 package command;
 
-import common.Message;
-import common.Message.MessageType;
 import server.Client;
 import server.Server;
 
+import common.Message;
+import common.Message.MessageType;
+
 public class List extends Command {
-	
+
 	@Override
 	public void execute(String[] args, Client caller) {
 		String arr, channelName = null;
-		
+
 		if (args.length >= 1) {
 			channelName = args[0];
 			try {
 				arr = Server.getChannelByName(channelName).listClients();
 			} catch (NullPointerException ex) {
-				caller.send(new Message("No channel named " + channelName + ".", MessageType.ERROR, false));
+				caller.send(new Message(
+						"No channel named " + channelName + ".",
+						MessageType.ERROR, false));
 				return;
 			}
 		} else
-			arr =  Server.listClients();
-		
+			arr = Server.listClients();
+
 		if (channelName == null)
-			caller.send(new Message("Users online are:" + "\n" + arr, MessageType.COMMAND, false));
+			caller.send(new Message("Users online are:" + "\n" + arr,
+					MessageType.COMMAND, false));
 		else
-			caller.send(new Message("Users in channel " + channelName + " are:" + "\n" + arr, MessageType.COMMAND, false));
+			caller.send(new Message("Users in channel " + channelName + " are:"
+					+ "\n" + arr, MessageType.COMMAND, false));
 	}
 
 	@Override
@@ -39,7 +44,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

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

src/main/java/common/Message.java

@@ -12,17 +12,17 @@ import server.Server;
 
 @SuppressWarnings("serial")
 public class Message implements java.io.Serializable {
-	
+
 	public enum MessageType {
 		PM, NORMAL, WARNING, ERROR, COMMAND, INFO
 	}
-	
+
 	public MessageType messType = MessageType.NORMAL;
 	public String content = "", channel = "", sender = "";
 	public SimpleAttributeSet style = new SimpleAttributeSet();
 	public String[] usersOnline;
 	public boolean preInfo = true;
-	
+
 	public Message(String channel, String send, String con, MessageType messType) {
 		this.sender = send;
 		this.channel = channel;
@@ -30,32 +30,39 @@ public class Message implements java.io.Serializable {
 		this.messType = messType;
 		usersOnline = Server.getUsersOnline();
 	}
-	
+
 	public Message(String sender, String con) {
 		this("", sender, con, MessageType.NORMAL);
 	}
-	
+
 	public Message(String con) {
 		this("Info", "SERVER", con, MessageType.INFO);
 	}
-	
-	public Message(String con, MessageType messType, boolean preInfo) { //TODO Needs to include Server.getUsersOnline() to prevent NullPointerException
+
+	public Message(String con, MessageType messType, boolean preInfo) { // TODO
+																		// Needs
+																		// to
+																		// include
+																		// Server.getUsersOnline()
+																		// to
+																		// prevent
+																		// NullPointerException
 		this.content = con;
-		this.preInfo = preInfo; 
+		this.preInfo = preInfo;
 		this.messType = messType;
 		if (preInfo)
 			usersOnline = Server.getUsersOnline();
 		else
 			usersOnline = null;
 	}
-	
+
 	public boolean validate() {
 		if (content.equals("") || content == null) {
 			return false;
 		}
 		return true;
 	}
-	
+
 	@Override
 	public String toString() {
 		switch (messType) {
@@ -78,14 +85,14 @@ public class Message implements java.io.Serializable {
 			break;
 		default:
 			break;
-		}	
-		
+		}
+
 		DateFormat dateFormat = new SimpleDateFormat("[HH:mm:ss]");
 		Date time = new Date();
 		String timestamp = dateFormat.format(time);
-		
+
 		String preInfoStr = timestamp + "<" + channel + ">" + sender + ": ";
-		
+
 		if (preInfo)
 			return preInfoStr + content;
 		else

src/main/java/server/BanNote.java

@@ -7,37 +7,40 @@ import java.time.temporal.ChronoUnit;
 public class BanNote {
 	String ip, reason;
 	LocalDateTime expiry;
-	
+
 	public BanNote(String ip, int duration, String reason) {
 		this.ip = ip;
 		if (duration == -1)
 			this.expiry = null;
-		
+
 		else
-			this.expiry = LocalDateTime.now().plus(duration, ChronoUnit.SECONDS);
+			this.expiry = LocalDateTime.now()
+					.plus(duration, ChronoUnit.SECONDS);
 		this.reason = reason;
 	}
-	
+
 	public BanNote(String ip, String reason) {
 		this(ip, -1, reason);
 	}
-	
+
 	public BanNote(String ip, int duration) {
 		this(ip, duration, "You are banned.");
 	}
-	
+
 	public BanNote(String ip) {
 		this(ip, -1);
 	}
-	
+
 	@Override
 	public String toString() {
 		String expStr;
 		if (expiry == null)
 			expStr = "Forever";
 		else
-			expStr = expiry.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-		
-		return "You are banned from this server." + "\n" + "Reason: " + reason + "\n" + "Expiry: " + expStr;
+			expStr = expiry.format(DateTimeFormatter
+					.ofPattern("yyyy-MM-dd HH:mm:ss"));
+
+		return "You are banned from this server." + "\n" + "Reason: " + reason
+				+ "\n" + "Expiry: " + expStr;
 	}
 }

src/main/java/server/Channel.java

@@ -7,14 +7,14 @@ public class Channel extends ClientCollection {
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
-	
+
 	public String name;
-	
+
 	public Channel(String name) {
 		super();
 		this.name = name;
 	}
-	
+
 	@Override
 	void broadcast(Message mess) {
 		mess.channel = name;

src/main/java/server/Client.java

@@ -8,70 +8,74 @@ import java.io.InputStreamReader;
 import java.io.ObjectOutputStream;
 import java.net.Socket;
 import java.time.LocalDateTime;
+
 import javax.swing.Timer;
 
 import common.Message;
 
 public class Client implements Runnable, ActionListener {
 	Thread readuser;
-	
+
 	BufferedReader in;
 	ObjectOutputStream objOut;
-	
+
 	public String username;
 	public Socket sock;
-	
+
 	String[] permissions;
-	
+
 	int messLastPeriod = 0;
 	Timer timer = new Timer(3000, this);
-	
+
 	public Channel primaryChannel = Server.channels.get(0);
-	
+
 	public Client(Socket s) {
 		sock = s;
-		
+
 		try {
-			in = new BufferedReader(new InputStreamReader(sock.getInputStream()));
+			in = new BufferedReader(
+					new InputStreamReader(sock.getInputStream()));
 			objOut = new ObjectOutputStream(sock.getOutputStream());
 			username = in.readLine();
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
-		
+
 		if (!validateUser()) {
 			disconnect(false);
 			throw new IllegalArgumentException();
 		}
-		
-		permissions = new String[] {"noob.*"};
-		
+
+		permissions = new String[] { "noob.*" };
+
 		send(new Message("Welcome to the server! Enjoy your stay!"));
-		
+
 		readuser = new Thread(this, username);
 		readuser.start();
-		
+
 		timer.start();
 	}
-	
-	public Client() {}
-	
+
+	public Client() {
+	}
+
 	private boolean validateUser() {
-		//No spaces
-		if (username.contains(" ")){
+		// No spaces
+		if (username.contains(" ")) {
 			send("No spaces in usernames please!");
 			return false;
 		}
-		
-		//Not same username as anyone else
+
+		// Not same username as anyone else
 		if (Server.clients.getClientByName(username) != null) {
 			send("Username already taken!");
 			return false;
 		}
-			
-		//No connect if banned
+
+		// No connect if banned
 		for (int i = 0; i < Server.banNotes.size(); i++)
-			if (Server.banNotes.get(i).ip.equals(sock.getInetAddress().toString())) {
+			if (Server.banNotes.get(i).ip.equals(sock.getInetAddress()
+					.toString())) {
 				BanNote bn = Server.banNotes.get(i);
 				if (bn.expiry == null) {
 					send(bn.toString());
@@ -84,43 +88,45 @@ public class Client implements Runnable, ActionListener {
 					return false;
 				}
 			}
-		
+
 		return true;
 	}
-	
+
 	public void disconnect(boolean output) {
-		if (!isConnected()) //Already disconnected
+		if (!isConnected()) // Already disconnected
 			return;
-		
+
 		if (timer.isRunning())
 			timer.stop();
-		
+
 		if (readuser != null)
 			readuser.interrupt();
-		
+
 		try {
 			sock.close();
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
-		
+
 		Server.cleanUp();
-		
+
 		if (output)
 			Server.wideBroadcast(new Message(username + " has disconnected."));
 	}
-	
+
 	public void disconnect() {
 		disconnect(true);
 	}
-	
+
 	public boolean isConnected() {
 		return !sock.isClosed();
 	}
-	
+
 	boolean hasPermission(String commandPermission) {
 		for (int i = 0; i < permissions.length; i++) {
-			if (commandPermission.startsWith(permissions[i].replace(".*", ".")) || commandPermission.equalsIgnoreCase(permissions[i]) || permissions[i].equalsIgnoreCase("*"))
+			if (commandPermission.startsWith(permissions[i].replace(".*", "."))
+					|| commandPermission.equalsIgnoreCase(permissions[i])
+					|| permissions[i].equalsIgnoreCase("*"))
 				return true;
 		}
 		return false;
@@ -130,20 +136,21 @@ public class Client implements Runnable, ActionListener {
 	public void run() {
 		String lastMess;
 		try {
-			while (!readuser.isInterrupted() && ((lastMess = in.readLine()) != null)) {
-				if (lastMess.startsWith("/")) //Command handling
+			while (!readuser.isInterrupted()
+					&& ((lastMess = in.readLine()) != null)) {
+				if (lastMess.startsWith("/")) // Command handling
 				{
 					String[] commandarray = lastMess.substring(1).split(" ");
-					CommandHandler.executeCommand(commandarray, this);
-				}
-				else //Normal message handling
+					Server.commReg.executeCommand(commandarray, this);
+				} else // Normal message handling
 				{
 					messLastPeriod++;
 					if (messLastPeriod > 5) {
 						send("No spamming!");
 						disconnect(false);
 					} else
-						primaryChannel.broadcast(new Message(this.username, lastMess));
+						primaryChannel.broadcast(new Message(this.username,
+								lastMess));
 				}
 			}
 			disconnect();
@@ -151,7 +158,7 @@ public class Client implements Runnable, ActionListener {
 			disconnect();
 		}
 	}
-	
+
 	public void send(Object message) {
 		try {
 			objOut.writeObject(message);
@@ -160,7 +167,7 @@ public class Client implements Runnable, ActionListener {
 			e.printStackTrace();
 		}
 	}
-	
+
 	@Override
 	public String toString() {
 		return username;

src/main/java/server/ClientCollection.java

@@ -4,70 +4,73 @@ import java.util.ArrayList;
 
 import common.Message;
 
-public class ClientCollection extends ArrayList<Client>{
+public class ClientCollection extends ArrayList<Client> {
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
-	
+
 	int maxClients = Server.maxUsers;
-	
+
 	public ClientCollection() {
 		this(Server.maxUsers);
 	}
-	
+
 	public ClientCollection(int maxUsers) {
 		super(maxUsers);
 		maxClients = maxUsers;
 	}
-	
+
 	public Client getClientByName(String name) throws NullPointerException {
-		for (Client c: this) {
+		for (Client c : this) {
 			if (c.username.equals(name))
 				return c;
 		}
 		return null;
 	}
-	
-	void broadcast(Message mess) { //Broadcast to all
-		 if (mess.validate()) {
-			for (Client c: this)
+
+	void broadcast(Message mess) { // Broadcast to all
+		if (mess.validate()) {
+			for (Client c : this)
 				c.send(mess);
 			Server.OPClient.send(mess.toString());
 		}
 	}
-	
+
 	@Override
-	public boolean add(Client user) throws ArrayIndexOutOfBoundsException { //Add user
+	public boolean add(Client user) throws ArrayIndexOutOfBoundsException { // Add
+																			// user
 		if (contains(user))
 			return true;
-		
+
 		if (size() >= maxClients)
 			throw new ArrayIndexOutOfBoundsException();
 		else
 			super.add(user);
 		return true;
 	}
-	
-	public void remove(Client user) { //Remove without DC
+
+	public void remove(Client user) { // Remove without DC
 		remove(user, false);
 	}
-	
-	public void remove(Client user, boolean disconnect) { //Remove and disconnect if needed
+
+	public void remove(Client user, boolean disconnect) { // Remove and
+															// disconnect if
+															// needed
 		if (disconnect)
 			user.disconnect();
 		super.remove(user);
 	}
-	
-	public String listClients() { //String from array
+
+	public String listClients() { // String from array
 		return toString().replace(", ", "\n").replace("[", "").replace("]", "");
 	}
-	
-	public String[] listClientsArray() { //Array instead of string
+
+	public String[] listClientsArray() { // Array instead of string
 		return listClients().split("\n");
 	}
-	
-	public void cleanUp() { //Remove unused clients
+
+	public void cleanUp() { // Remove unused clients
 		for (int i = 0; i < size(); i++)
 			if (!get(i).isConnected())
 				remove(i);

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 server.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/LocalClient.java

@@ -4,22 +4,23 @@ import java.io.BufferedReader;
 import java.io.InputStreamReader;
 
 public class LocalClient extends Client {
-	
-	public LocalClient() { //Constructor for local client, the server, with full permissions
+
+	public LocalClient() { // Constructor for local client, the server, with
+							// full permissions
 		in = new BufferedReader(new InputStreamReader(System.in));
-		
+
 		username = "SERVER";
-		permissions = new String[] {"*"};
-		
+		permissions = new String[] { "*" };
+
 		readuser = new Thread(this, username);
 		readuser.start();
 	}
-	
+
 	@Override
 	public void disconnect() {
 		readuser.interrupt();
 	}
-	
+
 	@Override
 	public void send(Object message) {
 		System.out.println(message);

src/main/java/server/Pong.java

@@ -6,15 +6,16 @@ import java.awt.event.ActionListener;
 import javax.swing.Timer;
 
 public class Pong implements ActionListener {
-	
+
 	Timer tim = new Timer(100, this);
-	
-	Client player1; Client player2;
-	
-	public Pong (Client p1, Client p2) {
+
+	Client player1;
+	Client player2;
+
+	public Pong(Client p1, Client p2) {
 		player1 = p1;
 		player2 = p2;
-		
+
 		// TODO Initialize game here
 	}
 

src/main/java/server/Server.java

@@ -8,12 +8,11 @@ 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 server.util.*;
 
 public class Server {
 	static Properties prop = new Properties();
@@ -27,6 +26,7 @@ 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 + "...");
@@ -47,7 +47,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...");
@@ -140,19 +140,9 @@ public class Server {
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
-		
-		Set<Thread> threadSet = Thread.getAllStackTraces().keySet();
-		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.");
@@ -167,8 +157,8 @@ public class Server {
 		
 		System.out.println("Reading numbers from properties object.");
 		try {
-			port = CInt(prop.getProperty("port"));
-			maxUsers = CInt(prop.getProperty("maxUsers"));
+			port = Numbers.CInt(prop.getProperty("port"));
+			maxUsers = Numbers.CInt(prop.getProperty("maxUsers"));
 		} catch (NullPointerException ex) {
 			System.out.println("Could not get values from properties file.");
 			newPropertiesFile();

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

@@ -1,4 +1,4 @@
-package server;
+package server.util;
 
 import java.io.File;
 import java.io.IOException;
@@ -8,26 +8,26 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 
 public class Logger {
-	
+
 	PrintWriter out;
 	File log;
-	
+
 	public Logger() throws IOException {
 		DateFormat dateFormat = new SimpleDateFormat("yyyy-dd-MM(HH-mm)");
 		Date time = new Date();
 		String timestamp = dateFormat.format(time);
-		
+
 		log = new File("logs/log-" + timestamp + ".log");
 		log.getParentFile().mkdirs();
 		log.createNewFile();
 		out = new PrintWriter(log);
 	}
-	
+
 	public void log(String txt) {
 		out.println(txt);
 		out.flush();
 	}
-	
+
 	public void close() {
 		out.close();
 	}

src/main/java/server/util/Numbers.java

@@ -0,0 +1,13 @@
+package server.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/server/util/StringArrays.java

@@ -0,0 +1,18 @@
+package server.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/client/ClientTestCase.java

@@ -1,6 +1,6 @@
 package client;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -11,33 +11,33 @@ import server.Server;
 public class ClientTestCase {
 	public static ChatWindow user1;
 	public static ChatWindow user2;
-	
-	static Thread runServer = new Thread(){
-    	@Override
-    	public void run() {
-    		Server.main(new String[]{});
-    	}
-    };
-	
-    @BeforeClass 
-    public static void setUpClass() {
+
+	static Thread runServer = new Thread() {
+		@Override
+		public void run() {
+			Server.main(new String[] {});
+		}
+	};
+
+	@BeforeClass
+	public static void setUpClass() {
 		runServer.start();
-        user1 = new ChatWindow("localhost", 25566, "user1");
-        assertTrue(user1.so.isConnected());
-    }
-	
+		user1 = new ChatWindow("localhost", 25566, "user1");
+		assertTrue(user1.so.isConnected());
+	}
+
 	@Test
 	public void testSend() {
 		user1.send("Hello!");
 	}
-	
+
 	@Test
 	public void testPM() {
 		user2 = new ChatWindow("localhost", 25566, "user2");
-		
+
 		user1.send("/pm user2 Hi there user2!");
 	}
-	
+
 	@AfterClass
 	public static void tearDownClass() {
 		Server.exit();

src/test/java/client/ClientTestSuite.java

@@ -6,4 +6,5 @@ import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(value = Suite.class)
 @SuiteClasses(value = { ClientTestCase.class })
-public class ClientTestSuite {}
+public class ClientTestSuite {
+}

src/test/java/common/CompleteTestSuite.java

@@ -1,24 +1,24 @@
 package common;
 
-
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
+
 import server.ServerTestSuite;
 
 @RunWith(Suite.class)
 @SuiteClasses({ ServerTestSuite.class, client.ClientTestSuite.class })
 public class CompleteTestSuite {
-	
+
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		
+
 	}
 
 	@AfterClass
 	public static void tearDownAfterClass() throws Exception {
-		
+
 	}
 }

src/test/java/server/ServerTestCase.java

@@ -1,23 +1,23 @@
 package server;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class ServerTestCase {
-	
-	@BeforeClass 
-    public static void setUpClass() {
-    	ServerTestSuite.runServer.start();
-    }
-	
+
+	@BeforeClass
+	public static void setUpClass() {
+		ServerTestSuite.runServer.start();
+	}
+
 	@Test
 	public void testCInt() {
-		assertEquals(Server.CInt("832"), 832);
+		assertEquals(server.util.Numbers.CInt("832"), 832);
 	}
-	
+
 	@AfterClass
 	public static void tearDownClass() {
 		Server.exit();

src/test/java/server/ServerTestSuite.java

@@ -7,11 +7,11 @@ import org.junit.runners.Suite.SuiteClasses;
 @RunWith(value = Suite.class)
 @SuiteClasses(value = { client.ClientTestSuite.class })
 public class ServerTestSuite {
-	
-	public static Thread runServer = new Thread(){
-    	@Override
-    	public void run() {
-    		Server.main(new String[]{});
-    	}
-    };
+
+	public static Thread runServer = new Thread() {
+		@Override
+		public void run() {
+			Server.main(new String[] {});
+		}
+	};
 }