Remove more usages of Server.

This adds a sendLine method to Connection, which is a bit icky,
but is useful when the end-user is supplying lines to pass
directly to the underlying connection.

src/com/dmdirc/FrameContainerComparator.java

@@ -22,6 +22,9 @@
 
 package com.dmdirc;
 
+import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.GroupChat;
+
 import java.io.Serializable;
 import java.util.Comparator;
 
@@ -108,11 +111,11 @@ public class FrameContainerComparator implements Comparator<FrameContainer>, Ser
     private static int getPosition(final FrameContainer item) {
         if (item instanceof GlobalWindow) {
             return 0;
-        } else if (item instanceof Server) {
+        } else if (item instanceof Connection) {
             return 1;
         } else if (item instanceof Raw) {
             return 2;
-        } else if (item instanceof Channel) {
+        } else if (item instanceof GroupChat) {
             return 3;
         } else if (item instanceof Query) {
             return 4;

src/com/dmdirc/commandparser/parsers/ChannelCommandParser.java

@@ -25,7 +25,6 @@ package com.dmdirc.commandparser.parsers;
 import com.dmdirc.Channel;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -51,13 +50,13 @@ public class ChannelCommandParser extends ChatCommandParser {
     /**
      * Creates a new instance of ChannelCommandParser.
      *
-     * @param server            The server this parser's query belongs to
+     * @param owner            The container this parser's query belongs to
      * @param commandController The controller to load commands from.
      * @param eventBus          Event bus to post events on
      */
-    public ChannelCommandParser(final Server server, final CommandController commandController,
+    public ChannelCommandParser(final FrameContainer owner, final CommandController commandController,
             final DMDircMBassador eventBus) {
-        super(server, commandController, eventBus);
+        super(owner, commandController, eventBus);
     }
 
     @Override

src/com/dmdirc/commandparser/parsers/ChatCommandParser.java

@@ -25,7 +25,6 @@ package com.dmdirc.commandparser.parsers;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.MessageTarget;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -51,14 +50,14 @@ public class ChatCommandParser extends ServerCommandParser {
     /**
      * Creates a new chat command parser that belongs to a child of the specified server.
      *
-     * @param server            The server which owns this parser's container
+     * @param owner             The container which owns this parser's container
      * @param commandController The controller to load commands from.
      * @param eventBus          Event but to post events on
      */
-    public ChatCommandParser(final Server server, final CommandController commandController,
+    public ChatCommandParser(final FrameContainer owner, final CommandController commandController,
             final DMDircMBassador eventBus) {
-        super(server.getConfigManager(), commandController, eventBus);
-        super.setOwner(server);
+        super(owner.getConfigManager(), commandController, eventBus);
+        super.setOwner(owner);
     }
 
     @Override

src/com/dmdirc/commandparser/parsers/CommandParser.java

@@ -24,7 +24,6 @@ package com.dmdirc.commandparser.parsers;
 
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandInfoPair;
@@ -216,7 +215,7 @@ public abstract class CommandParser implements Serializable {
 
                     if (actCommand != null && actCommand.getValue() instanceof ExternalCommand) {
                         ((ExternalCommand) actCommand.getValue()).execute(
-                                origin, (Server) server, channel, silent,
+                                origin, server, channel, silent,
                                 new CommandArguments(commandManager, newCommandString));
                     }
                 }

src/com/dmdirc/commandparser/parsers/QueryCommandParser.java

@@ -25,7 +25,6 @@ package com.dmdirc.commandparser.parsers;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -52,13 +51,13 @@ public class QueryCommandParser extends ChatCommandParser {
     /**
      * Creates a new instance of QueryCommandParser.
      *
-     * @param server            The server this parser's query belongs to
+     * @param owner            The container this parser's query belongs to
      * @param commandController The controller to load commands from.
      * @param eventBus          Event bus to post events on
      */
-    public QueryCommandParser(final Server server, final CommandController commandController,
+    public QueryCommandParser(final FrameContainer owner, final CommandController commandController,
             final DMDircMBassador eventBus) {
-        super(server, commandController, eventBus);
+        super(owner, commandController, eventBus);
     }
 
     @Override

src/com/dmdirc/commandparser/parsers/ServerCommandParser.java

@@ -24,7 +24,6 @@ package com.dmdirc.commandparser.parsers;
 
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -33,6 +32,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import javax.annotation.Nonnull;
@@ -61,12 +61,12 @@ public class ServerCommandParser extends GlobalCommandParser {
     /**
      * The server instance that this parser is attached to.
      */
-    private Server server;
+    private Connection server;
 
     @Override
     public void setOwner(final FrameContainer owner) {
-        if (server == null && owner instanceof Server) {
-            server = (Server) owner;
+        if (server == null && owner instanceof Connection) {
+            server = (Connection) owner;
         }
 
         super.setOwner(owner);

src/com/dmdirc/interfaces/Connection.java

@@ -496,4 +496,11 @@ public interface Connection {
      */
     FrameContainer getWindowModel();
 
+    /**
+     * Sends a raw line to the underlying connection.
+     *
+     * @param line The line to be sent
+     */
+    void sendLine(String line);
+
 }

test/com/dmdirc/commandparser/commands/channel/ModeTest.java

@@ -24,11 +24,11 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 
@@ -50,14 +50,14 @@ public class ModeTest {
     @Mock private CommandController controller;
     @Mock private ChannelInfo channelinfo;
     @Mock private Channel channel;
-    @Mock private Server server;
+    @Mock private Connection connection;
     @Mock private Parser parser;
     private Mode command;
 
     @Before
     public void setUp() throws InvalidIdentityFileException {
-        when(channel.getConnection()).thenReturn(Optional.of(server));
-        when(server.getParser()).thenReturn(Optional.of(parser));
+        when(channel.getConnection()).thenReturn(Optional.of(connection));
+        when(connection.getParser()).thenReturn(Optional.of(parser));
         when(channel.getChannelInfo()).thenReturn(channelinfo);
         when(channelinfo.getModes()).thenReturn("my mode string!");
         when(channelinfo.toString()).thenReturn("#chan");
@@ -83,7 +83,7 @@ public class ModeTest {
 
     @Test
     public void testExternalWithArgs() {
-        command.execute(origin, server, "#chan", false,
+        command.execute(origin, connection, "#chan", false,
                 new CommandArguments(controller, "/mode +hello -bye"));
 
         verify(parser).sendRawMessage("MODE #chan +hello -bye");
@@ -91,7 +91,7 @@ public class ModeTest {
 
     @Test
     public void testExternalWithoutArgs() {
-        command.execute(origin, server, "#chan", false,
+        command.execute(origin, connection, "#chan", false,
                 new CommandArguments(controller, "/mode"));
 
         verify(parser).sendRawMessage("MODE #chan");

test/com/dmdirc/commandparser/commands/channel/NamesTest.java

@@ -23,11 +23,11 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 
@@ -48,15 +48,15 @@ public class NamesTest {
     @Mock private CommandController controller;
     @Mock private ChannelInfo channelinfo;
     @Mock private Channel channel;
-    @Mock private Server server;
+    @Mock private Connection connection;
     @Mock private Parser parser;
 
     private Names command;
 
     @Before
     public void setUp() throws InvalidIdentityFileException {
-        when(channel.getConnection()).thenReturn(Optional.of(server));
-        when(server.getParser()).thenReturn(Optional.of(parser));
+        when(channel.getConnection()).thenReturn(Optional.of(connection));
+        when(connection.getParser()).thenReturn(Optional.of(parser));
         when(channel.getChannelInfo()).thenReturn(channelinfo);
         when(channelinfo.getName()).thenReturn("#chan");
 
@@ -73,7 +73,7 @@ public class NamesTest {
 
     @Test
     public void testExternal() {
-        command.execute(null, server, "#chan", false,
+        command.execute(null, connection, "#chan", false,
                 new CommandArguments(controller, "/names #chan"));
 
         verify(parser).sendRawMessage("NAMES #chan");

test/com/dmdirc/commandparser/commands/server/ChangeServerTest.java

@@ -22,11 +22,11 @@
 package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.util.URIParser;
 
@@ -53,19 +53,19 @@ public class ChangeServerTest {
     @Mock private CommandController controller;
     @Mock private FrameContainer tiw;
     @Mock private Profile profile;
-    @Mock private Server server;
+    @Mock private Connection connection;
     private ChangeServer command;
 
     @Before
     public void setUp() {
-        when(server.getProfile()).thenReturn(profile);
+        when(connection.getProfile()).thenReturn(profile);
         command = new ChangeServer(controller, new URIParser());
     }
 
     @Test
     public void testUsageNoArgs() {
         command.execute(tiw, new CommandArguments(controller, "/server"),
-                new ServerCommandContext(null, ChangeServer.INFO, server));
+                new ServerCommandContext(null, ChangeServer.INFO, connection));
 
         verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
@@ -73,7 +73,7 @@ public class ChangeServerTest {
     @Test
     public void testInvalidPort() {
         command.execute(tiw, new CommandArguments(controller, "/server foo:abc"),
-                new ServerCommandContext(null, ChangeServer.INFO, server));
+                new ServerCommandContext(null, ChangeServer.INFO, connection));
 
         verify(tiw).addLine(eq("commandError"), anyString());
     }
@@ -81,7 +81,7 @@ public class ChangeServerTest {
     @Test
     public void testOutOfRangePort1() {
         command.execute(tiw, new CommandArguments(controller, "/server foo:0"),
-                new ServerCommandContext(null, ChangeServer.INFO, server));
+                new ServerCommandContext(null, ChangeServer.INFO, connection));
 
         verify(tiw).addLine(eq("commandError"), anyString());
     }
@@ -89,7 +89,7 @@ public class ChangeServerTest {
     @Test
     public void testOutOfRangePort2() {
         command.execute(tiw, new CommandArguments(controller, "/server foo:65537"),
-                new ServerCommandContext(null, ChangeServer.INFO, server));
+                new ServerCommandContext(null, ChangeServer.INFO, connection));
 
         verify(tiw).addLine(eq("commandError"), anyString());
     }
@@ -97,25 +97,25 @@ public class ChangeServerTest {
     @Test
     public void testExecuteBasic() throws URISyntaxException {
         command.execute(tiw, new CommandArguments(controller, "/server foo:1234"),
-                new ServerCommandContext(null, ChangeServer.INFO, server));
+                new ServerCommandContext(null, ChangeServer.INFO, connection));
 
-        verify(server).connect(eq(new URI("irc://foo:1234")), same(profile));
+        verify(connection).connect(eq(new URI("irc://foo:1234")), same(profile));
     }
 
     @Test
     public void testExecuteNoPort() throws URISyntaxException {
         command.execute(tiw, new CommandArguments(controller, "/server foo"),
-                new ServerCommandContext(null, ChangeServer.INFO, server));
+                new ServerCommandContext(null, ChangeServer.INFO, connection));
 
-        verify(server).connect(eq(new URI("irc://foo")), same(profile));
+        verify(connection).connect(eq(new URI("irc://foo")), same(profile));
     }
 
     @Test
     public void testExecuteComplex() throws URISyntaxException {
         command.execute(tiw, new CommandArguments(controller, "/server foo:+1234 password"),
-                new ServerCommandContext(null, ChangeServer.INFO, server));
+                new ServerCommandContext(null, ChangeServer.INFO, connection));
 
-        verify(server).connect(eq(new URI("ircs://password@foo:1234")), same(profile));
+        verify(connection).connect(eq(new URI("ircs://password@foo:1234")), same(profile));
     }
 
 }

test/com/dmdirc/ui/messages/IntelligentLinkingTest.java

@@ -22,7 +22,7 @@
 package com.dmdirc.ui.messages;
 
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.Server;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import java.util.Arrays;
@@ -49,10 +49,10 @@ public class IntelligentLinkingTest {
         this.expected = expected;
 
         final AggregateConfigProvider manager = mock(AggregateConfigProvider.class);
-        final Server server = mock(Server.class);
-        when(server.getChannelPrefixes()).thenReturn("#&+");
+        final Connection connection = mock(Connection.class);
+        when(connection.getChannelPrefixes()).thenReturn("#&+");
 
-        styliser = new Styliser(server, manager, new ColourManager(manager,
+        styliser = new Styliser(connection, manager, new ColourManager(manager,
                 mock(DMDircMBassador.class)));
     }