* Added action handling for channels

* Implemented all methods of ChannelCommandParser
* Updated abstract ChannelCommand class to include origin

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

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

@@ -39,7 +39,7 @@ import uk.org.ownage.dmdirc.ui.MainFrame;
 public class Channel implements IRCParser.IChannelMessage,
         IRCParser.IChannelGotNames, IRCParser.IChannelTopic,
         IRCParser.IChannelJoin, IRCParser.IChannelPart, IRCParser.IChannelKick,
-        IRCParser.IChannelQuit {
+        IRCParser.IChannelQuit, IRCParser.IChannelAction {
     
     /** The parser's pChannel class */
     private ChannelInfo channelInfo;
@@ -69,6 +69,7 @@ public class Channel implements IRCParser.IChannelMessage,
         server.getParser().addChannelPart(this, channelInfo.getName());
         server.getParser().addChannelQuit(this, channelInfo.getName());
         server.getParser().addChannelKick(this, channelInfo.getName());
+        server.getParser().addChannelAction(this, channelInfo.getName());
         
         updateTitle();
     }
@@ -135,5 +136,15 @@ public class Channel implements IRCParser.IChannelMessage,
         frame.addLine("* "+cChannelClient+" has quit IRC ("+sReason+")");
         frame.removeName(cChannelClient);
     }
+
+    public void onChannelAction(IRCParser tParser, ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sMessage, String sHost) {
+        String source;
+        if (cChannelClient == null) {
+            source = sHost;
+        } else {
+            source = cChannelClient.toString();
+        }
+        frame.addLine("* "+source+" "+sMessage);
+    }
     
 }

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

@@ -30,7 +30,7 @@ import uk.org.ownage.dmdirc.Server;
  * @author chris
  */
 public abstract class ChannelCommand extends Command {
-       
+    
     /** Creates a new instance of ChannelCommand */
     public ChannelCommand() {
         super();
@@ -38,9 +38,10 @@ public abstract class ChannelCommand extends Command {
     
     /**
      * Executes this command
+     * @param origin The window in which the command was typed
      * @param server The server instance that this command is being executed on
      * @param channel The channel instance that this command is being executed on
      * @param args Arguments passed to this command
-     */    
-    public abstract void execute(Server server, Channel channel, String... args);    
+     */
+    public abstract void execute(CommandWindow origin, Server server, Channel channel, String... args);
 }

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

@@ -55,7 +55,8 @@ public class ChannelCommandParser extends CommandParser {
     
     /** Loads the relevant commands into the parser */
     protected void loadCommands() {
-        throw new UnsupportedOperationException("Not implemented yet");
+        CommandManager.loadChannelCommands(this);
+        CommandManager.loadServerCommands(this);
     }
     
     /**
@@ -65,7 +66,11 @@ public class ChannelCommandParser extends CommandParser {
      * @param args The arguments to the command
      */    
     protected void executeCommand(CommandWindow origin, Command command, String... args) {
-        throw new UnsupportedOperationException("Not implemented yet");
+        if (command instanceof ChannelCommand) {
+            ((ChannelCommand) command).execute(origin, server, channel, args);
+        } else {
+            ((ServerCommand) command).execute(origin, server, args);
+        }
     }
     
     /**
@@ -77,7 +82,7 @@ public class ChannelCommandParser extends CommandParser {
      * @param args The arguments passed to the command
      */    
     protected void handleInvalidCommand(CommandWindow origin, String command, String... args) {
-        throw new UnsupportedOperationException("Not implemented yet");
+        origin.addLine("Unknown command: "+command+"/"+(args.length-1));
     }
     
     /**
@@ -87,7 +92,7 @@ public class ChannelCommandParser extends CommandParser {
      * @param line The line input by the user
      */    
     protected void handleNonCommand(CommandWindow origin, String line) {
-        throw new UnsupportedOperationException("Not implemented yet");
+        channel.sendLine(line);
     }
     
 }