Channel commands, logging, unlimited channels

Added commands for creating, leaving och joining channels.
Added a logger class for logging messages.
Channels is now an ArrayList instead of an array

.gitignore

@@ -1,8 +1,10 @@
 .settings/
 .metadata/
 bin/
+logs/
 *.class
 *.properties
+*.log
 
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/

src/command/CreateChannel.java

@@ -0,0 +1,37 @@
+package command;
+
+import common.Message;
+
+import server.Client;
+import server.Server;
+
+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."));
+	}
+
+	@Override
+	public String setName() {
+		return "createchannel";
+	}
+
+	@Override
+	public String setPermission() {
+		return "server.createchannel";
+	}
+
+	@Override
+	public String writeDescription() {
+		return "Creates a channel with specified settings. (/createchannel <name>)";
+	}
+
+	@Override
+	public int setMinArgNumber() {
+		return 1;
+	}
+
+}

src/command/Channel.java → src/command/JoinChannel.java

@@ -1,31 +1,29 @@
 package command;
 
-import common.Message;
-
 import server.Client;
 import server.Server;
 
-public class Channel extends Command {
+public class JoinChannel extends Command {
 
 	@Override
 	public void execute(String[] args, Client caller) {
 		if (caller.equals(Server.OPClient)) {
-			caller.send(new Message("Client-only command."));
+			caller.send("Client-only command.");
 			return;
 		}
 		
 		try {
 			Server.getChannelByName(args[0]).add(caller);
+			caller.primaryChannel = Server.getChannelByName(args[0]);
+			caller.send("You are now speaking in channel " + args[0] + ".");
 		} catch (NullPointerException ex) {
-			caller.send(new Message("No such channel!"));
-			return;
+			caller.send("No such channel!");
 		}
-		caller.primaryChannel = Server.getChannelByName(args[0]);
 	}
 
 	@Override
 	public String setName() {
-		return "channel";
+		return "join";
 	}
 
 	@Override
@@ -35,7 +33,7 @@ public class Channel extends Command {
 
 	@Override
 	public String writeDescription() {
-		return "Sets specified channel as primary (/channel <channel>)";
+		return "Sets specified channel as primary (/join <channel>)";
 	}
 
 	@Override

src/command/LeaveChannel.java

@@ -0,0 +1,47 @@
+package command;
+
+import server.Client;
+import server.Server;
+
+public class LeaveChannel extends Command{
+
+	@Override
+	public void execute(String[] args, Client caller) throws Exception {
+		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("You left channel " + args[0] + ".");
+			caller.send("You are now speaking in channel " + caller.primaryChannel.name + ".");
+		} catch(NullPointerException ex) {
+			caller.send("No channel named " + args[0] + ".");
+			return;
+		}
+	}
+
+	@Override
+	public String setName() {
+		return "leave";
+	}
+
+	@Override
+	public String setPermission() {
+		return "noob.leave";
+	}
+
+	@Override
+	public String writeDescription() {
+		return "Removes caller from specified channel. (/leave <channel>)";
+	}
+
+	@Override
+	public int setMinArgNumber() {
+		return 1;
+	}
+
+}

src/server/Client.java

@@ -26,7 +26,7 @@ public class Client implements Runnable, ActionListener {
 	int messLastPeriod = 0;
 	Timer timer = new Timer(3000, this);
 	
-	public Channel primaryChannel = Server.channels[0];
+	public Channel primaryChannel = Server.channels.get(0);
 	
 	public Client(Socket s) {
 		sock = s;
@@ -133,7 +133,7 @@ public class Client implements Runnable, ActionListener {
 			while (!readuser.isInterrupted() && ((lastMess = in.readLine()) != null)) {
 				if (lastMess.startsWith("/")) //Command handling
 				{
-					String[] commandarray = lastMess.substring(1).split(" ");
+					String[] commandarray = lastMess.toLowerCase().substring(1).split(" ");
 					CommandHandler.executeCommand(commandarray, this);
 				}
 				else //Normal message handling

src/server/CommandHandler.java

@@ -7,14 +7,16 @@ public class CommandHandler {
 	public static Command[] commands;
 	
 	public CommandHandler() {
-		commands = new Command[7];
+		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.Channel();
+		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) {

src/server/LocalClient.java

@@ -18,5 +18,6 @@ public class LocalClient extends Client {
 	@Override
 	public void send(Object message) {
 		System.out.println(message);
+		Server.log.log(message.toString());
 	}
 }

src/server/Logger.java

@@ -0,0 +1,34 @@
+package server;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.text.DateFormat;
+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/server/Server.java

@@ -16,38 +16,53 @@ import server.Channel;
 
 public class Server {
 	static Properties prop = new Properties();
-	static int port, maxUsers, maxChannels;
+	static int port, maxUsers;
 	static final String version = "0.3";
 	
 	public static ArrayList<BanNote> banNotes = new ArrayList<BanNote>();
-	public static Channel[] channels;
+	public static ArrayList<Channel> channels;
 	public static ClientCollection clients;
 	
 	static ServerSocket so;
 	public static LocalClient OPClient;
+	public static Logger log;
 	
 	public static void main(String[] arg){
 		System.out.println("Starting ChatServer version " + version + "...");
 		
 		loadProperties();
 		
-		System.out.println("Setting up socket.");
+		System.out.print("Setting up socket...");
 		try {
 			so = new ServerSocket(port);
 		} catch(IOException ex) {
 			System.out.println("Error setting up socket. Server already running?");
 			System.exit(0);
 		}
+		System.out.println("Done");
 		
 		clients = new ClientCollection();
-		channels = new Channel[maxChannels];
-		channels[0] = new Channel("Main");
+		channels = new ArrayList<Channel>();
+		channels.add(new Channel("Main"));
 		
-		System.out.println("Starting commandhandler!");
+		System.out.print("Starting commandhandler...");
 		new CommandHandler();
+		System.out.println("Done");
 		
-		System.out.println("Creating virtual local client!");
+		System.out.print("Creating virtual local client...");
 		OPClient = new LocalClient();
+		System.out.println("Done");
+		
+		System.out.print("Starting logger...");
+		try {
+			log = new Logger();
+		} catch (IOException e) {
+			System.out.println();
+			System.out.println("Unable to start logger.");
+			e.printStackTrace();
+			return;
+		}
+		System.out.println("Done");
 		
 		System.out.println("Server started successfully!");
 		
@@ -60,7 +75,7 @@ public class Server {
 			try {
 				newClient = new Client(Server.so.accept());
 				clients.add(newClient);
-				channels[0].add(newClient);
+				channels.get(0).add(newClient);
 				wideBroadcast(new Message(newClient.username + " has connected."));
 			} catch (IllegalArgumentException ex) {
 				
@@ -75,11 +90,10 @@ public class Server {
 	}
 	
 	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)) {
-					return channels[i];
-				}
+		for (int i = 0; i < channels.size(); i++) {
+			if (channels.get(i).name.equals(name)) {
+				return channels.get(i);
+			}
 		}
 		return null;
 	}
@@ -113,6 +127,8 @@ public class Server {
 		for (int i = 0; i < clients.size(); i++)
 			clients.get(i).disconnect();
 		
+		log.close();
+		
 		System.exit(0);
 	}
 	
@@ -139,7 +155,6 @@ public class Server {
 		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();
@@ -152,7 +167,6 @@ public class Server {
 			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();