* Added method to Channel to get the Server it's associated with

* Channel frames now have instances of a channel command parser
* Implemented CommandManager.loadChannelCommands

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

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

@@ -146,5 +146,9 @@ public class Channel implements IRCParser.IChannelMessage,
         }
         frame.addLine("* "+source+" "+sMessage);
     }
+
+    public Server getServer() {
+        return server;
+    }
     
 }

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

@@ -34,16 +34,27 @@ import uk.org.ownage.dmdirc.commandparser.commands.server.*;
 public class CommandManager {
     
     /**
-     * The commands that have been instansiated
+     * The server commands that have been instansiated
      */
     private static Vector<Command> serverCommands;
-           
+    /**
+     * The channel commands that have been instansiated
+     */
+    private static Vector<Command> channelCommands;
+    
     /**
      * Loads all channel commands into the specified parser
      * @param parser The parser to load commands into
      */
     public static void loadChannelCommands(CommandParser parser) {
-        throw new UnsupportedOperationException("Not implemented yet");        
+        if (channelCommands == null) {
+            channelCommands = new Vector<Command>(0,1);
+            
+        }
+        
+        for (Command com : channelCommands) {
+            parser.registerCommand(com);
+        }
     }
     
     /**
@@ -53,17 +64,23 @@ public class CommandManager {
     public static void loadServerCommands(CommandParser parser) {
         if (serverCommands == null) {
             serverCommands = new Vector<Command>(0,1);
-
+            
             serverCommands.add(new Test());
             serverCommands.add(new Quit());
             serverCommands.add(new QuitDefault());
         }
-
+        
         for (Command com : serverCommands) {
             parser.registerCommand(com);
         }
-    }    
+    }
     
+    /**
+     * Retrieves the server command identified by the specified signature
+     * @param signature The signature to look for
+     * @return A server command with a matching signature, or null if none
+     * were found.
+     */
     public static ServerCommand getServerCommad(String signature) {
         if (serverCommands == null) {
             return null;
@@ -73,7 +90,7 @@ public class CommandManager {
             if (com.getSignature().equals(signature)) {
                 return (ServerCommand) com;
             }
-        }        
+        }
         
         return null;
     }

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

@@ -35,6 +35,7 @@ import javax.swing.plaf.basic.BasicInternalFrameUI;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.StyledDocument;
 import uk.org.ownage.dmdirc.Channel;
+import uk.org.ownage.dmdirc.commandparser.ChannelCommandParser;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
 import uk.org.ownage.dmdirc.logger.ErrorLevel;
 import uk.org.ownage.dmdirc.logger.Logger;
@@ -66,6 +67,8 @@ public class ChannelFrame extends javax.swing.JInternalFrame implements CommandW
      */
     private JScrollBar scrollBar;
     
+    private ChannelCommandParser commandParser;
+    
     /** Creates new form ChannelFrame */
     public ChannelFrame(Channel parent) {
         this.parent = parent;
@@ -77,12 +80,14 @@ public class ChannelFrame extends javax.swing.JInternalFrame implements CommandW
         setVisible(true);
         setResizable(true);
         
+        commandParser = new ChannelCommandParser(parent.getServer(), parent);
+        
         scrollBar = jScrollPane1.getVerticalScrollBar();
         
         jTextField1.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent actionEvent) {
                 try {
-                    ChannelFrame.this.parent.sendLine(jTextField1.getText());
+                    ChannelFrame.this.commandParser.parseCommand(ChannelFrame.this, jTextField1.getText());
                 } catch (Exception e) {
                     Logger.error(ErrorLevel.ERROR, e);
                 }