Field visibility enhanced

- Some tests changed

src/main/java/client/ChatWindow.java

@@ -39,107 +39,108 @@ import common.MessagePacket.MessageType;
 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();
+
+	Socket so;
 	ObjectInputStream objIn;
 	PrintWriter out;
-	
+
 	GridBagLayout g = new GridBagLayout();
 	GridBagConstraints con = new GridBagConstraints();
-	
+
 	JPanel right = new JPanel();
 	JLabel infoLabel = 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
+		// Label config
 		infoLabel.setHorizontalAlignment(JLabel.CENTER);
 		infoLabel.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(infoLabel, con);
-		
+
 		con.weighty = 1;
 		con.fill = GridBagConstraints.BOTH;
 		right.add(userList, con);
-		
+
 		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
+
+		// 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())
+		if (so.isConnected() && !so.isClosed()) {
 			out.println(text);
-		else {
+			out.flush();
+		} else {
 			chat.log(new MessagePacket("Not connected to server!", MessageType.WARNING));
 			write.setEnabled(false);
 		}
 	}
-	
+
 	void connect(String address, int port, String username) {
 		chat.log(new MessagePacket("Connecting to " + address + " on port " + port + ".", MessageType.INFO));
 		if (getMessages != null)
 			getMessages.interrupt();
-		
+
 		try {
 			so.close();
 			objIn.close();
 			out.close();
 		} catch (NullPointerException ex) {
-			//Nothing
+			// Nothing
 		} catch (IOException ex) {
 			chat.log(new MessagePacket(ex.toString(), MessageType.ERROR));
 		}
-		
+
 		try {
 			so = new Socket();
-			so.connect(new InetSocketAddress(address, port), 1000);
+			so.connect(new InetSocketAddress(address, port));
 			objIn = new ObjectInputStream(so.getInputStream());
 			out = new PrintWriter(so.getOutputStream(), true);
 		} catch (SocketTimeoutException ex) {
@@ -149,21 +150,21 @@ public class ChatWindow extends JFrame implements ActionListener, Runnable, KeyL
 			chat.log(new MessagePacket(e.toString(), MessageType.ERROR));
 			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().equals(reconnect))
 			connect(adress, port, username);
 	}
-	
+
 	@Override
 	public void run() {
 		try {
@@ -171,12 +172,14 @@ public class ChatWindow extends JFrame implements ActionListener, Runnable, KeyL
 		} catch (EOFException eof) {
 			chat.log(new MessagePacket(eof.toString() + " Disconnected from host.", MessageType.ERROR));
 		} catch (ClassNotFoundException cnf) {
-			chat.log(new MessagePacket("The message recieved from the server could not be understood. Are you using the right version?", MessageType.ERROR));
+			chat.log(new MessagePacket(
+					"The message recieved from the server could not be understood. Are you using the right version?",
+					MessageType.ERROR));
 		} catch (IOException e) {
 			chat.log(new MessagePacket(e.toString(), MessageType.ERROR));
 		}
 	}
-	
+
 	public void getMessages() throws IOException, ClassNotFoundException {
 		while (!getMessages.isInterrupted()) {
 			Object fromServer = objIn.readObject();
@@ -185,22 +188,21 @@ public class ChatWindow extends JFrame implements ActionListener, Runnable, KeyL
 				chat.log(mess);
 			} else if (fromServer instanceof InfoPacket) {
 				InfoPacket info = (InfoPacket) fromServer;
-				
+
 				infoLabel.setText("<html>" + info.toString().replace("\n", "<br>"));
-				
+
 				model = new DefaultListModel<String>();
-				for (String user: info.usersOnline)
+				for (String user : info.usersOnline)
 					model.addElement(user);
-				
+
 				userList.setModel(model);
-			}
-			else if (fromServer instanceof String) {
+			} else if (fromServer instanceof String) {
 				chat.log(new MessagePacket((String) fromServer, MessageType.NORMAL));
 			} else
 				throw new ClassNotFoundException();
 		}
 	}
-	
+
 	@Override
 	public void keyPressed(KeyEvent eKey) {
 		int keyCode = eKey.getKeyCode();
@@ -231,10 +233,12 @@ public class ChatWindow extends JFrame implements ActionListener, Runnable, KeyL
 			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/server/Channel.java

@@ -3,15 +3,9 @@ package server;
 import common.MessagePacket;
 
 public class Channel extends ClientCollection {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	
 	public String name;
 	
 	public Channel(String name) {
-		super();
 		this.name = name;
 	}
 	

src/main/java/server/Client.java

@@ -6,6 +6,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.ObjectOutputStream;
+import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.time.LocalDateTime;
 
@@ -17,136 +18,144 @@ import common.Packet;
 
 public class Client implements ActionListener {
 	ReadUser readuser;
-	
+
 	BufferedReader in;
 	ObjectOutputStream objOut;
-	
-	public String username;
+
+	public final String username;
 	public Socket sock;
-	
+
 	public String[] permissions;
 	public boolean isOP = false;
-	
+
 	int messLastPeriod = 0;
 	Timer timer = new Timer(800, this);
-	
-	public Channel primaryChannel = Server.channels.get(0);
-	
-	public Client(Socket s) {
-		sock = s;
+
+	public Channel primaryChannel = Server.getChannels().get(0);
+
+	public Client(Socket socket) {
+		sock = socket;
 		
+		String line = null;
 		try {
-			in = new BufferedReader(new InputStreamReader(sock.getInputStream()));
 			objOut = new ObjectOutputStream(sock.getOutputStream());
-			username = in.readLine();
+			in = new BufferedReader(new InputStreamReader(sock.getInputStream()));
+			line = in.readLine();
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
 		
+		username = line;
+
 		if (!validateUser()) {
 			disconnect(false);
 			throw new IllegalArgumentException();
 		}
-		
-		permissions = new String[] {"noob.*"};
-		
-		send(new MessagePacket("Welcome to the server! Enjoy your stay!"));
-		
+
+		permissions = new String[] { "user.*" };
+
+		send(new MessagePacket("Welcome to the server, " + username + "! Enjoy your stay!"));
+
 		readuser = new ReadUser();
-		
+
 		timer.start();
 	}
-	
-	public Client() {}
-	
+
+	public Client(String username) {
+		this.username = username;
+	}
+
 	private boolean validateUser() {
-		//No spaces
+		// No spaces
 		if (username.contains(" ")) {
 			send("No spaces in usernames please!");
 			return false;
 		}
-		
-		//Not same username as anyone else
-		if (Server.clients.getClientByName(username).isPresent()) {
+
+		// Not same username as anyone else
+		if (Server.getClients().getClientByName(username).isPresent()) {
 			send("Username already taken!");
 			return false;
 		}
-		
-		//No connect if banned
-		for (BanNote note: Server.banNotes)
-			if (note.ip.equals(sock.getInetAddress().toString())) {
-				if (note.expiry == null) {
-					send(note.toString());
-					return false;
-				} else if (note.expiry.isBefore(LocalDateTime.now())) {
-					Server.banNotes.remove(note);
-					return true;
-				} else {
-					send(note.toString());
-					return false;
+
+		// No connect if banned
+		for (BanNote note : Server.getBanned())
+			try {
+				if (note.ip.equals(getIP())) {
+					if (note.expiry == null) {
+						send(note.toString());
+						return false;
+					} else if (note.expiry.isBefore(LocalDateTime.now())) {
+						Server.getBanned().remove(note);
+						return true;
+					} else {
+						send(note.toString());
+						return false;
+					}
 				}
+			} catch (IOException e) {
+				e.printStackTrace();
 			}
 		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 MessagePacket(username + " has disconnected."));
 	}
-	
+
 	public void disconnect() {
 		disconnect(true);
 	}
-	
+
 	public boolean isConnected() {
-		return !sock.isClosed();
+		return sock.isConnected() && !sock.isClosed();
 	}
-	
+
 	public boolean hasPermission(String commandPermission) {
 		if (this.isOP)
 			return true;
-		
+
 		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;
 	}
-	
+
 	class ReadUser extends Thread {
 		ReadUser() {
-			super(Client.this.username);
+			super(Client.this.username + " listener thread");
 			this.start();
 		}
-		
+
 		@Override
 		public void run() {
 			String mess;
-			while (!readuser.isInterrupted() && (mess = getNewMessage()) != null) {
-				
-				if (mess.startsWith("/")) //Command handling
-					Server.commReg.executeCommand(mess, Client.this);
-				else //Normal message handling
+			while (!isInterrupted() && (mess = getNewMessage()) != null) {
+
+				if (mess.startsWith("/")) // Command handling
+					Server.getCommReg().executeCommand(mess, Client.this);
+				else // Normal message handling
 				{
 					messLastPeriod++;
-					if (messLastPeriod > 1 && !(Client.this instanceof LocalClient)) {
+					if (messLastPeriod > 1 && !(Client.this.hasPermission("mod.spam"))) {
 						send("No spamming!");
 						disconnect(false);
 					} else
@@ -155,27 +164,27 @@ public class Client implements ActionListener {
 			}
 			disconnect();
 		}
-		
+
 		public String getNewMessage() {
 			try {
 				return in.readLine();
 			} catch (IOException e) {
 				disconnect();
+				return null;
 			}
-			return null;
 		}
 	}
-	
 
-	
 	/**
 	 * Sends a packet to the user.
 	 * 
-	 * @param pack Packet to send to the user
+	 * @param pack
+	 *            Packet to send to the user
 	 */
 	public void send(Packet pack) {
 		try {
 			objOut.writeObject(pack);
+			objOut.flush();
 			objOut.writeObject(InfoPacket.of(this));
 			objOut.flush();
 		} catch (IOException e) {
@@ -183,20 +192,20 @@ public class Client implements ActionListener {
 				disconnect();
 		}
 	}
-	
+
 	public void send(String message) {
 		send(new MessagePacket(message));
 	}
-	
-	public String getIP() {
-		return sock.getInetAddress().toString();
+
+	public String getIP() throws IOException {
+		return ((InetSocketAddress) sock.getRemoteSocketAddress()).getAddress().getHostAddress();
 	}
-	
+
 	@Override
 	public String toString() {
 		return username;
 	}
-	
+
 	@Override
 	public void actionPerformed(ActionEvent e) {
 		messLastPeriod = 0;

src/main/java/server/ClientCollection.java

@@ -1,108 +1,94 @@
 package server;
 
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 
 import common.MessagePacket;
 
-public class ClientCollection extends ArrayList<Client> {
-	/**
-	 * A collection of clients.
-	 */
-	private static final long serialVersionUID = 1L;
-	
-	int maxClients = Server.maxUsers;
-	
-	public ClientCollection() {
-		this(Server.maxUsers);
-	}
-	
-	public ClientCollection(int maxUsers) {
-		super(maxUsers);
-		maxClients = maxUsers;
-	}
+/**
+ * A collection of clients.
+ */
+public class ClientCollection {
 	
+	private List<Client> clients = new ArrayList<>();
+
 	/**
 	 * Gets the user with specified username.
 	 * 
-	 * @param name The username of wanted user.
+	 * @param name
+	 *            The username of wanted user.
 	 * @return Optional containing found user.
 	 */
 	public Optional<Client> getClientByName(String name) {
-		return stream()
-				.filter(c -> c.username.equals(name))
-				.findFirst();
+		return clients.stream().filter(c -> c.username.equals(name)).findFirst();
 	}
-	
+
 	/**
 	 * Sends a message to all users in the collection.
 	 * 
-	 * @param mess The message object to send.
+	 * @param mess
+	 *            The message object to send.
 	 */
 	void broadcast(MessagePacket mess) {
 		if (mess.validate()) {
-			for (Client c: this)
+			for (Client c : clients)
 				c.send(mess);
-			Server.OPClient.send(mess.toString());
+			Server.getOPClient().send(mess.toString());
 		}
 	}
-	
+
 	/**
 	 * Adds a user to the collection, checking that the user has not already
 	 * been added and that the the collection isn't "full".
 	 * 
-	 * @param user User to be added to collection.
+	 * @param user
+	 *            User to be added to collection.
+	 * @return 
 	 */
-	@Override
-	public boolean add(Client user) throws ArrayIndexOutOfBoundsException {
-		if (contains(user))
-			return true;
-		
-		if (size() >= maxClients)
-			throw new ArrayIndexOutOfBoundsException();
-		else
-			super.add(user);
-		return true;
+	public void add(Client user) {
+		if (clients.contains(user))
+			return;
+
+		clients.add(user);
 	}
-	
+
 	/**
 	 * Remove the user without disconnecting them.
 	 * 
-	 * @param user User to remove.
+	 * @param user
+	 *            User to remove.
 	 */
 	public void remove(Client user) {
 		remove(user, false);
 	}
-	
+
 	/**
 	 * Removes a user from the collection.
 	 * 
-	 * @param user User to remove.
-	 * @param disconnect Should the user also be disconnected?
+	 * @param user
+	 *            User to remove.
+	 * @param disconnect
+	 *            Should the user also be disconnected?
 	 */
 	public void remove(Client user, boolean disconnect) {
 		if (disconnect)
 			user.disconnect();
-		super.remove(user);
+		clients.remove(user);
 	}
-	
+
 	/**
 	 * Create a string containing usernames of current connected users,
 	 * separated by specified separator.
 	 * 
-	 * @param sep The char to put between the names.
+	 * @param sep
+	 *            The char to put between the names.
 	 * @return String containing all usernames separated by separator.
 	 */
-	public String listClients(char sep) {
-		String[] names = getUsernameArray();
-		String namesString = "";
-		for (String name: names)
-			namesString += name + sep;
-		//Remove last separator
-		namesString = namesString.substring(0, namesString.length() - sep);
-		return namesString;
+	public String listClients(CharSequence sep) {
+		return String.join(sep, getUsernameArray());
 	}
-	
+
 	/**
 	 * String array representation of current users by name.
 	 * 
@@ -111,19 +97,17 @@ public class ClientCollection extends ArrayList<Client> {
 	 * @see String
 	 */
 	public String[] getUsernameArray() {
-		String[] names = new String[size()];
-		for (int i = 0; i < size(); i++)
-			names[i] = this.get(i).username;
-		return names;
+		return clients.stream().map(c -> c.username).toArray(i -> new String[i]);
 	}
 	
+	public void disconnectAll() {
+		clients.forEach(c -> c.disconnect());
+	}
+
 	/**
 	 * Removes disconnected clients from the collection.
 	 */
 	public void cleanUp() {
-		for (int i = 0; i < size(); i++)
-			//Has to be done with number iteration, otherwise unsafe
-			if (!get(i).isConnected())
-				remove(i);
+		clients.removeIf(c -> !c.isConnected());
 	}
 }

src/main/java/server/LocalClient.java

@@ -9,12 +9,14 @@ import common.Packet;
 
 public class LocalClient extends Client {
 	
-	public LocalClient() { //Constructor for local client, the server, with full permissions
+	/**
+	 * Constructor for local client, the server, with full permissions
+	 */
+	public LocalClient() {
+		super("SERVER");
 		in = new BufferedReader(new InputStreamReader(System.in));
 		
-		this.isOP = true;
-		
-		username = "SERVER";
+		isOP = true;
 		permissions = new String[] {"*"};
 		
 		readuser = new ReadUser();
@@ -44,6 +46,6 @@ public class LocalClient extends Client {
 	@Override
 	public void send(String message) {
 		System.out.println(message.toString());
-		Server.log.log(message.toString());
+		Server.getLogger().log(message.toString());
 	}
 }

src/main/java/server/Server.java

@@ -1,40 +1,57 @@
 package server;
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.net.ServerSocket;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
+import java.util.Properties;
 
-import util.Logger;
-import util.ServerProperties;
 import common.MessagePacket;
+import util.Logger;
 
 public class Server {
-	static ServerProperties prop = new ServerProperties();
-	static int port, maxUsers;
-	static final String version = "0.3";
-	
-	public static ArrayList<BanNote> banNotes = new ArrayList<BanNote>();
-	public static ArrayList<Channel> channels;
-	public static ClientCollection clients;
-	
-	static ServerSocket so;
-	public static LocalClient OPClient;
-	public static Logger log;
-	public static CommandRegistry commReg;
-	
+	private static Thread clientListener;
+	private static Properties prop = new Properties();
+	private static File propFile = new File("server.properties");
+	private static int port, maxUsers;
+	private static final String version = "0.3";
+
+	private static ArrayList<BanNote> banNotes = new ArrayList<BanNote>();
+	private static ArrayList<Channel> channels = new ArrayList<Channel>();
+	private static ClientCollection clients;
+
+	private static ServerSocket so;
+	private static LocalClient OPClient;
+	private static Logger log;
+	private static CommandRegistry commandRegistry;
+
 	public static void main(String[] arg) {
 		System.out.println("Starting ChatServer version " + version + "...");
-		
+
 		System.out.print("Loadning properties file...");
-		prop.loadProperties();
+		try {
+			prop.load(new FileReader(propFile));
+		} catch (FileNotFoundException e1) {
+			try {
+				prop.load(Server.class.getResourceAsStream("/" + propFile.getName()));
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		} catch (IOException e1) {
+			e1.printStackTrace();
+		}
 		System.out.println("Done");
-		
+
 		System.out.print("Reading numbers from properties object...");
-		port = prop.getNumberProperty("port");
-		maxUsers = prop.getNumberProperty("maxUsers");
+		port = Integer.parseInt(prop.getProperty("port"));
+		maxUsers = Integer.parseInt(prop.getProperty("maxUsers"));
 		System.out.println("Done");
-		
+
 		System.out.print("Setting up socket...");
 		try {
 			so = new ServerSocket(port);
@@ -43,19 +60,18 @@ public class Server {
 			System.exit(0);
 		}
 		System.out.println("Done");
-		
+
 		clients = new ClientCollection();
-		channels = new ArrayList<Channel>();
-		channels.add(new Channel("Main"));
-		
+		getChannels().add(new Channel("Main"));
+
 		System.out.print("Starting commandhandler...");
 		commandRegistry = new CommandRegistry();
 		System.out.println("Done");
-		
+
 		System.out.print("Creating virtual local client...");
 		OPClient = new LocalClient();
 		System.out.println("Done");
-		
+
 		System.out.print("Starting logger...");
 		try {
 			log = new Logger();
@@ -66,22 +82,25 @@ public class Server {
 			return;
 		}
 		System.out.println("Done");
-		
+
+		System.out.print("Starting client listener thread...");
+		clientListener = new Thread(Server::listenClients);
+		clientListener.start();
+		System.out.println("Done");
+
 		System.out.println("Server started successfully!");
-		
-		getClients();
 	}
-	
-	static void getClients() {
+
+	static void listenClients() {
 		while (!so.isClosed()) {
 			Client newClient = null;
 			try {
-				newClient = new Client(Server.so.accept());
+				newClient = new Client(so.accept());
 				clients.add(newClient);
-				channels.get(0).add(newClient);
+				getChannels().get(0).add(newClient);
 				wideBroadcast(new MessagePacket(newClient.username + " has connected."));
 			} catch (IllegalArgumentException ex) {
-				
+
 			} catch (ArrayIndexOutOfBoundsException ex) {
 				newClient.send(new MessagePacket("Server full!"));
 				newClient.disconnect(false);
@@ -94,53 +113,89 @@ public class Server {
 			}
 		}
 	}
-	
+
 	public static Optional<Channel> getChannelByName(String name) throws NullPointerException {
-		return channels.stream().filter(c -> c.name.equals(name)).findFirst();
+		return getChannels().stream().filter(c -> c.name.equals(name)).findFirst();
 	}
-	
+
 	public static void wideBroadcast(MessagePacket mess) {
-		clients.broadcast(mess);
+		getClients().broadcast(mess);
 	}
-	
+
 	public static String[] getUsersOnline() {
-		return clients.getUsernameArray();
+		return getClients().getUsernameArray();
 	}
-	
-	public static String listClients(char c) {
-		return clients.listClients(c);
+
+	public static String listClients(CharSequence c) {
+		return getClients().listClients(c);
 	}
-	
+
 	public static Optional<Client> getUserByName(String username) {
-		return clients.getClientByName(username);
+		return getClients().getClientByName(username);
 	}
-	
+
+	public static void ban(BanNote ban) {
+		banNotes.add(ban);
+	}
+
 	/**
 	 * Removes disconnected clients from all collections on the server.
 	 */
 	public static void cleanUp() {
-		clients.cleanUp();
-		channels.forEach(c -> c.cleanUp());
+		getClients().cleanUp();
+		getChannels().forEach(c -> c.cleanUp());
 	}
-	
+
 	/**
 	 * Disconnects all users and closes log and socket.
 	 */
 	public static void exit() {
 		wideBroadcast(new MessagePacket("Shutting down server!"));
-		
-		for (int i = 0; i < clients.size(); i++)
-			//Has to be done with number iteration, otherwise unsafe
-			clients.get(i).disconnect();
-		
-		log.close();
-		
-		OPClient.disconnect();
-		
+
 		try {
 			so.close();
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
+		clientListener.interrupt();
+
+		clients.disconnectAll();
+		getOPClient().disconnect();
+
+		log.close();
+		try {
+			prop.store(new PrintWriter(propFile), "ChatServer config file");
+		} catch (IOException e1) {
+			e1.printStackTrace();
+		}
+	}
+
+	public static int getMaxUsers() {
+		return maxUsers;
 	}
+
+	public static LocalClient getOPClient() {
+		return OPClient;
+	}
+
+	public static Logger getLogger() {
+		return log;
+	}
+
+	public static ArrayList<Channel> getChannels() {
+		return channels;
+	}
+
+	public static ClientCollection getClients() {
+		return clients;
+	}
+
+	public static CommandRegistry getCommReg() {
+		return commandRegistry;
+	}
+
+	public static List<BanNote> getBanned() {
+		return banNotes;
+	}
+
 }

src/main/java/util/ServerProperties.java

@@ -1,48 +0,0 @@
-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/test/java/client/ClientTestCase.java

@@ -2,42 +2,46 @@ package client;
 
 import static org.junit.Assert.assertTrue;
 
+import org.junit.After;
 import org.junit.AfterClass;
+import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 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[] {});
-		}
-	};
+	private ChatWindow user1;
+	private ChatWindow user2;
 	
 	@BeforeClass
 	public static void setUpClass() {
-		runServer.start();
+		Server.main(new String[] {});
+	}
+	
+	@Before
+	public void setUp() {
 		user1 = new ChatWindow("localhost", 25566, "user1");
-		assertTrue(user1.so.isConnected());
+		user2 = new ChatWindow("localhost", 25566, "user2");
 	}
 	
 	@Test
 	public void testSend() {
 		user1.send("Hello!");
+		assertTrue(user1.so.isConnected());
 	}
 	
 	@Test
 	public void testPM() {
-		user2 = new ChatWindow("localhost", 25566, "user2");
-		
 		user1.send("/pm user2 Hi there user2!");
 	}
 	
+	@After
+	public void cleanUp() {
+		user1.dispose();
+		user2.dispose();
+	}
+	
 	@AfterClass
 	public static void tearDownClass() {
 		Server.exit();