Change to Connection in ExternalCommands.

src/com/dmdirc/commandparser/commands/ExternalCommand.java

@@ -23,8 +23,8 @@
 package com.dmdirc.commandparser.commands;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.interfaces.Connection;
 
 /**
  * An external command is a channel command that can be executed from outside of the channel.
@@ -35,14 +35,12 @@ public interface ExternalCommand {
      * Executes the command externally.
      *
      * @param origin   The window in which the command was typed
-     * @param server   The server instance that this command is being executed on
+     * @param connection The connection the command is being executed on.
      * @param channel  The name of the channel the command is being executed for
      * @param isSilent Whether this command is silenced or not
      * @param args     Arguments passed to this command
-     *
-     * @since 0.6.3m1
      */
-    void execute(FrameContainer origin, Server server, String channel,
+    void execute(FrameContainer origin, Connection connection, String channel,
             boolean isSilent, CommandArguments args);
 
 }

src/com/dmdirc/commandparser/commands/channel/Invite.java

@@ -24,7 +24,6 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -35,6 +34,7 @@ import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 
 import javax.annotation.Nonnull;
@@ -78,13 +78,13 @@ public class Invite extends Command implements ExternalCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin, final Server server,
+    public void execute(final FrameContainer origin, final Connection connection,
             final String channel, final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length < 1) {
             sendLine(origin, isSilent, FORMAT_ERROR,
                     "Insufficient arguments: must specify user");
         } else {
-            server.getParser().get().sendInvite(channel, args.getArgumentsAsString());
+            connection.getParser().get().sendInvite(channel, args.getArgumentsAsString());
         }
     }
 

src/com/dmdirc/commandparser/commands/channel/Mode.java

@@ -24,7 +24,6 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -36,6 +35,7 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -80,12 +80,12 @@ public class Mode extends Command implements IntelligentCommand,
     }
 
     @Override
-    public void execute(final FrameContainer origin, final Server server,
+    public void execute(final FrameContainer origin, final Connection connection,
             final String channel, final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 0) {
-            server.getParser().get().sendRawMessage("MODE " + channel);
+            connection.getParser().get().sendRawMessage("MODE " + channel);
         } else {
-            server.getParser().get().sendRawMessage("MODE " + channel + " " + args.getArgumentsAsString());
+            connection.getParser().get().sendRawMessage("MODE " + channel + ' ' + args.getArgumentsAsString());
         }
     }
 

src/com/dmdirc/commandparser/commands/channel/Names.java

@@ -24,7 +24,6 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -36,6 +35,7 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import javax.annotation.Nonnull;
@@ -72,9 +72,9 @@ public class Names extends Command implements IntelligentCommand,
     }
 
     @Override
-    public void execute(final FrameContainer origin, final Server server,
+    public void execute(final FrameContainer origin, final Connection connection,
             final String channel, final boolean isSilent, final CommandArguments args) {
-        server.getParser().get().sendRawMessage("NAMES " + channel);
+        connection.getParser().get().sendRawMessage("NAMES " + channel);
     }
 
     @Override

src/com/dmdirc/commandparser/commands/channel/ShowTopic.java

@@ -24,7 +24,6 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -35,6 +34,7 @@ import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 
 import javax.annotation.Nonnull;
@@ -84,12 +84,12 @@ public class ShowTopic extends Command implements ExternalCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin, final Server server,
+    public void execute(final FrameContainer origin, final Connection connection,
             final String channel, final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 0) {
-            server.getParser().get().sendRawMessage("TOPIC " + channel);
+            connection.getParser().get().sendRawMessage("TOPIC " + channel);
         } else {
-            server.getParser().get().sendRawMessage("TOPIC " + channel + " :" + args.
+            connection.getParser().get().sendRawMessage("TOPIC " + channel + " :" + args.
                     getArgumentsAsString());
         }
     }