ClientCollection

Client management is now contained in one single class, extending
ArrayList. Channel is just an extansion adding a name to the Collection.
maxUsers and maxChannels are now read from the config file, instead of
being hard-coded.
Arrays are now initialized in main method.
More organized property file reading.
Less exclamation marks.
getClients() is now a single method instead of two.
Simplified and removed many methods.
Added cleanup method to remove disconnected clients.
Message formatting in toString() instead of constructor, allowing the
message to be edited after creation.
/list command fixed
/exit now disconnects users before exiting

src/command/Channel.java

@@ -15,7 +15,7 @@ public class Channel extends Command {
 		}
 		
 		try {
-			Server.getChannelByName(args[0]).addUser(caller);
+			Server.getChannelByName(args[0]).add(caller);
 		} catch (NullPointerException ex) {
 			caller.send(new Message("No such channel!"));
 			return;

src/command/Exit.java

@@ -1,13 +1,13 @@
 package command;
 
 import server.Client;
+import server.Server;
 
 public class Exit extends Command{
 
 	@Override
 	public void execute(String[] args, Client caller) {
-		caller.send("Shutting down server!");
-		System.exit(0);
+		Server.exit();
 	}
 
 	@Override

src/command/List.java

@@ -7,7 +7,7 @@ public class List extends Command {
 	
 	@Override
 	public void execute(String[] args, Client caller) {
-		caller.send("Users online are:" + Server.getUsersOnlineString());
+		caller.send("Users online are:" + "\n" + Server.getUsersOnlineString());
 	}
 
 	@Override

src/common/Message.java

@@ -21,15 +21,10 @@ public class Message implements java.io.Serializable {
 		this.channel = channel;
 		this.content = con;
 		usersOnline = Server.getUsersOnline();
-		
-		if (channel.equals("PM")) {
-			StyleConstants.setForeground(style, Color.GRAY);
-		}
 	}
 	
 	public Message(String send, String con) {
 		this("Info", send, con);
-		StyleConstants.setForeground(style, Color.BLUE);
 	}
 	
 	public Message(String con) {
@@ -45,6 +40,11 @@ public class Message implements java.io.Serializable {
 	
 	@Override
 	public String toString() {
+		if (channel.equals("PM"))
+			StyleConstants.setForeground(style, Color.GRAY);
+		else if (channel.equals("Info"))
+			StyleConstants.setForeground(style, Color.BLUE);
+		
 		DateFormat dateFormat = new SimpleDateFormat("[HH:mm:ss]");
 		Date time = new Date();
 		String timestamp = dateFormat.format(time);
@@ -55,4 +55,4 @@ public class Message implements java.io.Serializable {
 		
 		return messEntry;
 	}
-}
+}

src/server/Channel.java

@@ -2,65 +2,22 @@ package server;
 
 import common.Message;
 
-public class Channel {
-	Client[] users = new Client[Server.maxUsers];
+public class Channel extends ClientCollection {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 	
 	public String name;
 	
 	public Channel(String name) {
+		super();
 		this.name = name;
 	}
 	
-	void broadcast(Client sender, String content) {
-		Message mess = new Message(name, sender.username, content);
-		 if (mess.validate()) {
-			for (int i = 0; i < users.length; i++){
-				if (!positionFree(i))
-					users[i].send(mess);
-			}
-			Server.OPClient.send(mess.toString());
-		}
-	}
-	 
-	boolean hasUser(Client user) {
-		for (int i = 0; i < users.length; i++)
-			if (!positionFree(i))
-				if (users[i].equals(user))
-					return true;
-		return false;
-	}
-	
-	public boolean addUser(Client user) {
-		if (hasUser(user))
-			return true;
-		
-		for (int i = 0; i < users.length; i++)
-			if (positionFree(i)) {
-				users[i] = user;
-				return true;
-			}
-		return false;
-	}
-	
-	public boolean removeUser(Client user) {
-		for (int i = 0; i < users.length; i++)
-			if (users[i].equals(user)) {
-				users[i] = null;
-				return true;
-			}
-		return false;
-	}
-	
-	public String getUsersInChannel() {
-		String usersInChannel = "";
-		for (int i = 0; i < users.length; i++)
-			if (!positionFree(i)) {
-				usersInChannel += users[i].username + "\n" ;
-			}
-		return usersInChannel;
-	}
-	
-	boolean positionFree(int pos) {
-		return users[pos] == null || !users[pos].isConnected();
+	@Override
+	void broadcast(Message mess) {
+		mess.channel = name;
+		super.broadcast(mess);
 	}
 }

src/server/Client.java

@@ -8,7 +8,6 @@ import java.io.InputStreamReader;
 import java.io.ObjectOutputStream;
 import java.net.Socket;
 import java.time.LocalDateTime;
-
 import javax.swing.Timer;
 
 import common.Message;
@@ -42,7 +41,7 @@ public class Client implements Runnable, ActionListener {
 		
 		if (!validateUser()) {
 			disconnect(false);
-			return;
+			throw new IllegalArgumentException();
 		}
 		
 		permissions = new String[] {"noob.*"};
@@ -65,14 +64,11 @@ public class Client implements Runnable, ActionListener {
 		}
 		
 		//Not same username as anyone else
-		for (int i = 0; i < Server.clients.length; i++) {
-			if (!Server.positionFree(i))
-				if (Server.clients[i].username.equalsIgnoreCase(username)) {
-					send("Username already taken!");
-					return false;
-				}
+		if (Server.clients.getClientByName(username) != null) {
+			send("Username already taken!");
+			return false;
 		}
-		
+			
 		//No connect if banned
 		for (int i = 0; i < Server.banNotes.size(); i++)
 			if (Server.banNotes.get(i).ip.equals(sock.getInetAddress().toString())) {
@@ -93,6 +89,9 @@ public class Client implements Runnable, ActionListener {
 	}
 	
 	public void disconnect(boolean output) {
+		if (!isConnected()) //Already disconnected
+			return;
+		
 		if (timer.isRunning())
 			timer.stop();
 		
@@ -104,6 +103,9 @@ public class Client implements Runnable, ActionListener {
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
+		
+		Server.cleanUp();
+		
 		if (output)
 			Server.broadcast(new Message(username + " has disconnected."));
 	}
@@ -129,16 +131,19 @@ public class Client implements Runnable, ActionListener {
 		String lastMess;
 		try {
 			while (!readuser.isInterrupted() && ((lastMess = in.readLine()) != null)) {
-				if (lastMess.startsWith("/")) {
+				if (lastMess.startsWith("/")) //Command handling
+				{
 					String[] commandarray = lastMess.substring(1).split(" ");
 					CommandHandler.executeCommand(commandarray, this);
-				} else {
+				}
+				else //Normal message handling
+				{
 					messLastPeriod++;
 					if (messLastPeriod > 5) {
 						send("No spamming!");
 						disconnect(false);
 					} else
-						primaryChannel.broadcast(this, lastMess);
+						primaryChannel.broadcast(new Message(this.username, lastMess));
 				}
 			}
 			disconnect();
@@ -155,6 +160,11 @@ public class Client implements Runnable, ActionListener {
 			e.printStackTrace();
 		}
 	}
+	
+	@Override
+	public String toString() {
+		return username;
+	}
 
 	@Override
 	public void actionPerformed(ActionEvent e) {

src/server/ClientCollection.java

@@ -0,0 +1,75 @@
+package server;
+
+import java.util.ArrayList;
+
+import common.Message;
+
+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 (int i = 0; i < size(); i++) {
+			if (get(i).username.equals(name))
+				return get(i);
+		}
+		return null;
+	}
+	
+	void broadcast(Message mess) { //Broadcast to all
+		 if (mess.validate()) {
+			for (int i = 0; i < size(); i++)
+				get(i).send(mess);
+			Server.OPClient.send(mess.toString());
+		}
+	}
+	
+	@Override
+	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
+		remove(user, false);
+	}
+	
+	public void remove(Client user, boolean disconnect) { //Remove and disconnect if needed
+		if (disconnect)
+			user.disconnect();
+		remove(user);
+	}
+	
+	public String listClients() { //String from array
+		return toString().replace(", ", "\n").replace("[", "").replace("]", "");
+	}
+	
+	public String[] listClientsArray() { //Array instead of string
+		return listClients().split("\n");
+	}
+	
+	public void cleanUp() { //Remove unused clients
+		for (int i = 0; i < size(); i++)
+			if (!get(i).isConnected())
+				remove(i);
+	}
+}

src/server/Server.java

@@ -15,14 +15,13 @@ import server.CommandHandler;
 import server.Channel;
 
 public class Server {
-	
 	static Properties prop = new Properties();
-	static int port, maxUsers = 20, maxChannels = 10;
+	static int port, maxUsers, maxChannels;
 	static final String version = "0.3";
 	
 	public static ArrayList<BanNote> banNotes = new ArrayList<BanNote>();
-	public static Channel[] channels = new Channel[maxChannels];
-	public static Client[] clients = new Client[maxUsers];
+	public static Channel[] channels;
+	public static ClientCollection clients;
 	
 	static ServerSocket so;
 	public static LocalClient OPClient;
@@ -30,36 +29,18 @@ public class Server {
 	public static void main(String[] arg){
 		System.out.println("Starting ChatServer version " + version + "...");
 		
-		System.out.println("Loadning properties file!");
-		try {
-			prop.load(new FileInputStream("server.properties"));
-		} catch (FileNotFoundException ex1) {
-			try {
-				new File("server.properties").createNewFile();
-				prop.setProperty("port", "25566");
-				prop.store(new FileWriter("server.properties"), "ChatServer config file");
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-			
-		} catch (IOException e) {
-			System.out.println("Could not load properties!");
-			e.printStackTrace();
-		}
-		System.out.println("Reading portnumber from properties!");
-		Scanner sc = new Scanner(prop.getProperty("port"));
-		port = sc.nextInt();
-		sc.close();
+		loadProperties();
 		
-		System.out.println("Setting up socket!");
+		System.out.println("Setting up socket.");
 		try {
 			so = new ServerSocket(port);
 		} catch(IOException ex) {
-			System.out.println("Error setting up socket! Server already running?");
+			System.out.println("Error setting up socket. Server already running?");
 			System.exit(0);
 		}
 		
-		System.out.println("Starting main channel!");
+		clients = new ClientCollection();
+		channels = new Channel[maxChannels];
 		channels[0] = new Channel("Main");
 		
 		System.out.println("Starting commandhandler!");
@@ -72,24 +53,20 @@ public class Server {
 		
 		getClients();
 	}
-	
-	static void getNewClient() throws IOException {
-		Client newClient = new Client(Server.so.accept());
-		if (newClient.readuser != null) {
-			for (int i = 0; i < clients.length; i++)
-				if (positionFree(i)) {
-					clients[i] = newClient;
-					channels[0].addUser(newClient);
-					Server.broadcast(new Message(clients[i].username + " has connected."));
-					return;
-				}
-		}
-	}
 
 	static void getClients() {
 		while(true) {
+			Client newClient = null;
 			try {
-				getNewClient();
+				newClient = new Client(Server.so.accept());
+				clients.add(newClient);
+				channels[0].add(newClient);
+				broadcast(new Message(newClient.username + " has connected."));
+			} catch (IllegalArgumentException ex) {
+				
+			} catch (ArrayIndexOutOfBoundsException ex) {
+				newClient.send(new Message("Server full!"));
+				newClient.disconnect(false);
 			} catch (Exception ex) {
 				System.out.println("Could not get new client!");
 				ex.printStackTrace();
@@ -97,16 +74,7 @@ public class Server {
 		}
 	}
 	
-	public static Client getUserByName(String name) throws NullPointerException {
-		for (int i = 0; i < clients.length; i++) {
-			if (!positionFree(i))
-				if (clients[i].username.equals(name))
-					return clients[i];
-		}
-		throw new NullPointerException();
-	}
-	
-	public static Channel getChannelByName(String name) {
+	public static Channel getChannelByName(String name) throws NullPointerException {
 		for (int i = 0; i < channels.length; i++) {
 			if (channels[i] != null)
 				if (channels[i].name.equals(name)) {
@@ -115,45 +83,79 @@ public class Server {
 		}
 		return null;
 	}
-	
-	static boolean positionFree(int pos) {
-		return clients[pos] == null || !clients[pos].isConnected();
-	}
 
 	public static void broadcast(Message mess) {
-		for (int i = 0; i < clients.length; i++)
-			if (!positionFree(i))
-				clients[i].send(mess);
-		OPClient.send(mess.toString());
-	}
-	
-	public static void broadcast(Object mess) {
-		for (int i = 0; i < clients.length; i++)
-			if (!positionFree(i))
-				clients[i].send(mess);
+		clients.broadcast(mess);
 	}
 
 	public static String[] getUsersOnline() {
-		ArrayList<String> usersOnline = new ArrayList<String>();
-		for (int i = 0; i < clients.length; i++)
-			if (!Server.positionFree(i)) {
-				usersOnline.add(clients[i].username);
-			}
-		String[] usersOnlineStr = new String[usersOnline.size()];
-		for (int i = 0; i < usersOnline.size(); i++)
-			usersOnlineStr[i] = usersOnline.get(i);
-		return usersOnlineStr;
+		return clients.listClientsArray();
 	}
 	
 	public static String getUsersOnlineString() {
-		String[] usersOnlineArr = getUsersOnline();
-		String usersOnline = "";
+		return clients.listClients();
+	}
+
+	public static Client getUserByName(String username) {
+		return clients.getClientByName(username);
+	}
+	
+	public static void cleanUp() { //Makes sure the client gets removed from all arrays
+		clients.cleanUp();
+		for (int i = 0; i < channels.length; i++)
+			if (channels[i] != null)
+				channels[i].cleanUp();
+	}
+	
+	public static void exit() {
+		broadcast(new Message("Shutting down server!"));
+		
+		for (int i = 0; i < clients.size(); i++)
+			clients.get(i).disconnect();
+		
+		System.exit(0);
+	}
+	
+	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();
+		}
 		
-		for (int i = 0; i < usersOnlineArr.length; i++) {
-			if (i != 0)
-				usersOnline += "\n";
-			usersOnline += usersOnlineArr[i];
+		System.out.println("Reading numbers from properties object.");
+		try {
+			port = CInt(prop.getProperty("port"));
+			maxUsers = CInt(prop.getProperty("maxUsers"));
+			maxChannels = CInt(prop.getProperty("maxChannels"));
+		} catch (NullPointerException ex) {
+			System.out.println("Could not get values from properties file.");
+			newPropertiesFile();
+		}
+	}
+	
+	static void newPropertiesFile() {
+		System.out.println("Generating new preperties file.");
+		try {
+			new File("server.properties").createNewFile();
+			prop.setProperty("port", "25566");
+			prop.setProperty("maxUsers", "20");
+			prop.setProperty("maxChannels", "10");
+			prop.store(new FileWriter("server.properties"), "ChatServer config file");
+		} catch (IOException e) {
+			e.printStackTrace();
 		}
-		return usersOnline;
 	}
 }