More updates to the command parser classes.

Command instances are no longer singletons per se, but the CommandManager handles creating and storing a single instance.
The server frame now uses a server command parser.

git-svn-id: http://svn.dmdirc.com/trunk@139 00569f92-eb28-0410-84fd-f71c24880f

src/uk/org/ownage/dmdirc/Server.java

@@ -23,6 +23,7 @@
 package uk.org.ownage.dmdirc;
 
 import java.util.Hashtable;
+import uk.org.ownage.dmdirc.commandparser.ServerCommandParser;
 import uk.org.ownage.dmdirc.parser.ChannelInfo;
 import uk.org.ownage.dmdirc.parser.ServerInfo;
 import uk.org.ownage.dmdirc.ui.MainFrame;
@@ -104,6 +105,10 @@ public class Server {
     public IRCParser getParser() {
         return parser;
     }
+    
+    public void addLine(String line) {
+        frame.addLine(line);
+    }
 
     private void addChannel(ChannelInfo chan) {
         channels.put(chan.getName(), new Channel(this, chan));

src/uk/org/ownage/dmdirc/commandparser/ChannelCommand.java

@@ -36,5 +36,5 @@ public abstract class ChannelCommand extends Command {
         super();
     }
     
-    public abstract void Execute(Server server, Channel channel, String... args);    
+    public abstract void execute(Server server, Channel channel, String... args);    
 }

src/uk/org/ownage/dmdirc/commandparser/ChannelCommandParser.java

@@ -42,7 +42,7 @@ public class ChannelCommandParser extends CommandParser {
         this.channel = channel;
     }
 
-    protected void LoadCommands() {
+    protected void loadCommands() {
         throw new UnsupportedOperationException("Not implemented yet");
     }
 

src/uk/org/ownage/dmdirc/commandparser/Command.java

@@ -30,8 +30,6 @@ import uk.org.ownage.dmdirc.Server;
  */
 public abstract class Command {
     
-    protected static Command instance;
-    
     protected String name;
     protected int arity = 0;
     protected boolean polyadic;
@@ -58,8 +56,4 @@ public abstract class Command {
         return name+" "+arguments+" - "+description;
     }
     
-    public static Command getInstance() {
-        return instance;
-    }
-    
 }

src/uk/org/ownage/dmdirc/commandparser/CommandManager.java

@@ -22,18 +22,31 @@
 
 package uk.org.ownage.dmdirc.commandparser;
 
+import java.util.Vector;
+import uk.org.ownage.dmdirc.commandparser.commands.*;
+
 /**
  *
  * @author chris
  */
 public class CommandManager {
+    
+    private static Vector<Command> serverCommands;
            
     public static void loadChannelCommands(CommandParser parser) {
         throw new UnsupportedOperationException("Not implemented yet");        
     }
     
     public static void loadServerCommands(CommandParser parser) {
-        throw new UnsupportedOperationException("Not implemented yet");        
+        if (serverCommands == null) {
+            serverCommands = new Vector<Command>(0,1);
+
+            serverCommands.add(new Test());
+        }
+
+        for (Command com : serverCommands) {
+            parser.registerCommand(com);
+        }
     }    
     
 }

src/uk/org/ownage/dmdirc/commandparser/CommandParser.java

@@ -36,10 +36,11 @@ abstract public class CommandParser {
     /** Creates a new instance of CommandParser */
     public CommandParser() {
         commands = new Hashtable<String,Command>();
+        loadCommands();
     }
     
     /** Loads the relevant commands into the parser */
-    protected abstract void LoadCommands();
+    protected abstract void loadCommands();
     
     public void registerCommand(Command command) {
         commands.put(command.getSignature(), command);
@@ -52,7 +53,7 @@ abstract public class CommandParser {
             
             assert(args.length > 0);
             
-            String command = args[0];
+            String command = args[0].substring(1);
             
             String signature = command+"/"+(args.length-1);
             

src/uk/org/ownage/dmdirc/commandparser/ServerCommand.java

@@ -36,5 +36,5 @@ public abstract class ServerCommand extends Command {
         super();
     }
     
-    public abstract void Execute(Server server, String... args);
+    public abstract void execute(Server server, String... args);
 }

src/uk/org/ownage/dmdirc/commandparser/ServerCommandParser.java

@@ -39,20 +39,20 @@ public class ServerCommandParser extends CommandParser {
         this.server = server;
     }
 
-    protected void LoadCommands() {
-        throw new UnsupportedOperationException("Not implemented yet");
+    protected void loadCommands() {
+        CommandManager.loadServerCommands(this);
     }
 
     protected void executeCommand(Command command, String... args) {
-        throw new UnsupportedOperationException("Not implemented yet");
+        ((ServerCommand)command).execute(server, args);
     }
 
     protected void handleInvalidCommand(String command, String... args) {
-        throw new UnsupportedOperationException("Not implemented yet");
+        server.addLine("Unknown command: "+command+"/"+(args.length-1));
     }
 
     protected void handleNonCommand(String line) {
-        throw new UnsupportedOperationException("Not implemented yet");
+        server.getParser().sendLine(line);
     }
     
 }

src/uk/org/ownage/dmdirc/commandparser/commands/Test.java

@@ -32,8 +32,6 @@ import uk.org.ownage.dmdirc.commandparser.ServerCommand;
  */
 public class Test extends ServerCommand {
     
-    protected static Command instance = new Test();
-    
     /** Creates a new instance of Test */
     public Test() {
         description = "a test command";
@@ -44,8 +42,8 @@ public class Test extends ServerCommand {
         show = true;
     }
 
-    public void Execute(Server server, String... args) {
-        throw new UnsupportedOperationException("Not implemented yet");
+    public void execute(Server server, String... args) {
+        server.addLine(server.getParser().getSvnInfo());
     }
     
 }

src/uk/org/ownage/dmdirc/ui/ServerFrame.java

@@ -35,6 +35,7 @@ import javax.swing.JComponent;
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
 import javax.swing.plaf.basic.BasicInternalFrameUI;
+import uk.org.ownage.dmdirc.commandparser.ServerCommandParser;
 
 /**
  * The ServerFrame is the MDI window that shows server messages to the user
@@ -55,6 +56,8 @@ public class ServerFrame extends javax.swing.JInternalFrame {
      **/
     private Dimension titlebarSize;
     
+    private ServerCommandParser commandParser;
+    
     /**
      * Creates new form ServerFrame
      * @param parent The server instance that owns this frame
@@ -68,9 +71,11 @@ public class ServerFrame extends javax.swing.JInternalFrame {
         
         this.parent = parent;
         
+        commandParser = new ServerCommandParser(parent);
+        
         jTextField1.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent actionEvent) {
-                ServerFrame.this.parent.getParser().sendLine(jTextField1.getText());
+                ServerFrame.this.commandParser.parseCommand(jTextField1.getText());
                 jTextField1.setText("");
             }
         });