FrameContainers should expose a Connection.

Anywhere that doesn't just work with a Connection, cast back to a Server for
now. These can be tidied up later.

Change-Id: I02a54b0bcfaef08d5757cc015c356f9779ec0371
Depends-On: Id55c3611173be7ed79fae8f9e976996d713b8646
Reviewed-on: http://gerrit.dmdirc.com/2950
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/Channel.java

@@ -27,6 +27,7 @@ import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.ChannelCommandParser;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.NicklistListener;
 import com.dmdirc.interfaces.TopicChangeListener;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
@@ -72,7 +73,6 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
     private ChannelInfo channelInfo;
 
     /** The server this channel is on. */
-    @Getter
     private Server server;
 
     /** The tabcompleter used for this channel. */
@@ -641,4 +641,10 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
     public void removeTopicChangeListener(final TopicChangeListener listener) {
         listenerList.remove(TopicChangeListener.class, listener);
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public Connection getConnection() {
+        return server;
+    }
 }

src/com/dmdirc/ChannelEventHandler.java

@@ -68,7 +68,7 @@ public class ChannelEventHandler extends EventHandler implements
     /** {@inheritDoc} */
     @Override
     protected Connection getConnection() {
-        return owner.getServer();
+        return owner.getConnection();
     }
 
     /**
@@ -78,7 +78,7 @@ public class ChannelEventHandler extends EventHandler implements
      * @return True if the client is ourself, false otherwise.
      */
     protected boolean isMyself(final ChannelClientInfo client) {
-        return client.getClient().equals(owner.getServer().getParser().getLocalClient());
+        return client.getClient().equals(owner.getConnection().getParser().getLocalClient());
     }
 
     /** {@inheritDoc} */
@@ -258,7 +258,7 @@ public class ChannelEventHandler extends EventHandler implements
 
         if (owner.doNotification(date, "channelCTCP", CoreActionType.CHANNEL_CTCP,
                 client, type, message)) {
-            owner.getServer().sendCTCPReply(client.getClient().getNickname(),
+            owner.getConnection().sendCTCPReply(client.getClient().getNickname(),
                     type, message);
         }
     }

src/com/dmdirc/CustomWindow.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc;
 
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.core.components.WindowComponent;
 
@@ -75,8 +76,8 @@ public class CustomWindow extends FrameContainer {
 
     /** {@inheritDoc} */
     @Override
-    public Server getServer() {
-        return getParent() == null ? null : getParent().getServer();
+    public Connection getConnection() {
+        return getParent() == null ? null : getParent().getConnection();
     }
 
 }

src/com/dmdirc/FrameContainer.java

@@ -24,6 +24,7 @@ package com.dmdirc;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.FrameCloseListener;
 import com.dmdirc.interfaces.FrameComponentChangeListener;
 import com.dmdirc.interfaces.FrameInfoListener;
@@ -309,11 +310,11 @@ public abstract class FrameContainer {
     }
 
     /**
-     * Returns the server instance associated with this container.
+     * Returns the connection that this container is associated with.
      *
-     * @return the associated server connection
+     * @return the associated connection, or {@code null}.
      */
-    public abstract Server getServer();
+    public abstract Connection getConnection();
 
     /**
      * Sets the icon to be used by this frame container.
@@ -344,7 +345,7 @@ public abstract class FrameContainer {
     public Styliser getStyliser() {
         synchronized (styliserSync) {
             if (styliser == null) {
-                styliser = new Styliser(getServer(), getConfigManager());
+                styliser = new Styliser(getConnection(), getConfigManager());
             }
             return styliser;
         }

src/com/dmdirc/GlobalWindow.java

@@ -26,6 +26,7 @@ import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.messages.MessageSinkManager;
@@ -94,7 +95,7 @@ public class GlobalWindow extends WritableFrameContainer {
 
     /** {@inheritDoc} */
     @Override
-    public Server getServer() {
+    public Connection getConnection() {
         return null;
     }
 

src/com/dmdirc/Query.java

@@ -27,6 +27,7 @@ import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.QueryCommandParser;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.messages.MessageSinkManager;
@@ -313,13 +314,9 @@ public class Query extends MessageTarget implements PrivateActionListener,
         }
     }
 
-    /**
-     * Returns the Server associated with this query.
-     *
-     * @return associated Server
-     */
+    /** {@inheritDoc} */
     @Override
-    public Server getServer() {
+    public Connection getConnection() {
         return server;
     }
 
@@ -371,7 +368,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
     /** {@inheritDoc} */
     @Override
     public void setCompositionState(final CompositionState state) {
-        getServer().getParser().setCompositionState(host, state);
+        getConnection().getParser().setCompositionState(host, state);
     }
 
 }

src/com/dmdirc/Raw.java

@@ -24,6 +24,7 @@ package com.dmdirc;
 
 import com.dmdirc.commandparser.parsers.ServerCommandParser;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.messages.MessageSinkManager;
@@ -122,7 +123,7 @@ public class Raw extends WritableFrameContainer
 
     /** {@inheritDoc} */
     @Override
-    public Server getServer() {
+    public Connection getConnection() {
         return server;
     }
 

src/com/dmdirc/Server.java

@@ -1163,7 +1163,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
 
     /** {@inheritDoc} */
     @Override
-    public Server getServer() {
+    public Connection getConnection() {
         return this;
     }
 

src/com/dmdirc/actions/ActionSubstitutor.java

@@ -282,13 +282,13 @@ public class ActionSubstitutor {
         }
 
         if (hasFrameContainer() && serverMatcher.matches()) {
-            final Connection server = ((FrameContainer) args[0]).getServer();
+            final Connection connection = ((FrameContainer) args[0]).getConnection();
 
-            if (server != null) {
+            if (connection != null) {
                 try {
                     final ActionComponentChain chain = new ActionComponentChain(
                         Connection.class, substitution, actionController);
-                    return escape(checkConnection(chain, args, server));
+                    return escape(checkConnection(chain, args, connection));
                 } catch (IllegalArgumentException ex) {
                     return ERR_ILLEGAL_COMPONENT;
                 }
@@ -314,7 +314,7 @@ public class ActionSubstitutor {
     protected String checkConnection(final ActionComponentChain chain,
             final Object[] args, final Object argument) {
         if ((chain.requiresConnection() && args[0] instanceof FrameContainer
-                    && ((FrameContainer) args[0]).getServer().getState()
+                    && ((FrameContainer) args[0]).getConnection().getState()
                     == ServerState.CONNECTED) || !chain.requiresConnection()) {
             final Object res = chain.get(argument);
             return res == null ? ERR_NULL_CHAIN : res.toString();

src/com/dmdirc/actions/CoreActionComponent.java

@@ -548,8 +548,9 @@ public enum CoreActionComponent implements ActionComponent {
     WINDOW_SERVER {
         /** {@inheritDoc} */
         @Override
-        public Object get(final Object arg) { return ((Window) arg)
-                .getContainer().getServer(); }
+        public Object get(final Object arg) {
+            return ((Window) arg).getContainer().getConnection();
+        }
         /** {@inheritDoc} */
         @Override
         public Class<?> appliesTo() { return Window.class; }

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

@@ -74,7 +74,7 @@ public class Mode extends Command implements IntelligentCommand,
         if (args.getArguments().length == 0) {
             sendLine(origin, args.isSilent(), "channelModeDiscovered", cChannel.getModes(), cChannel);
         } else {
-            channel.getServer().getParser().sendRawMessage("MODE "
+            channel.getConnection().getParser().sendRawMessage("MODE "
                     + cChannel + " " + args.getArgumentsAsString());
         }
     }

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

@@ -67,7 +67,7 @@ public class Names extends Command implements IntelligentCommand,
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final Channel channel = ((ChannelCommandContext) context).getChannel();
-        channel.getServer().getParser().sendRawMessage("NAMES "
+        channel.getConnection().getParser().sendRawMessage("NAMES "
                 + channel.getChannelInfo().getName());
     }
 

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

@@ -71,7 +71,7 @@ public class ShowTopic extends Command implements ExternalCommand {
             if (cChannel.getTopic().isEmpty()) {
                 sendLine(origin, args.isSilent(), "channelNoTopic", cChannel);
             } else {
-                final String[] parts = channel.getServer().parseHostmask(cChannel.getTopicSetter());
+                final String[] parts = channel.getConnection().parseHostmask(cChannel.getTopicSetter());
 
                 sendLine(origin, args.isSilent(), "channelTopicDiscovered",
                         "", parts[0], parts[1], parts[2], cChannel.getTopic(),

src/com/dmdirc/commandparser/commands/chat/Me.java

@@ -76,14 +76,14 @@ public class Me extends Command implements ValidatingCommand {
     public ValidationResponse validateArguments(
             final WritableFrameContainer origin,
             final CommandArguments arguments) {
-        if (origin.getServer() == null
-                || origin.getServer().getParser() == null) {
+        if (origin.getConnection() == null
+                || origin.getConnection().getParser() == null) {
             return new ValidationResponse();
         }
 
         final int length = 2 + arguments.getArgumentsAsString().length();
 
-        if (origin.getServer().getParser().getMaxLength("PRIVMSG",
+        if (origin.getConnection().getParser().getMaxLength("PRIVMSG",
                 origin.getName()) <= length) {
             return new ValidationResponse("Too long");
         } else {

src/com/dmdirc/commandparser/commands/context/ChatCommandContext.java

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.context;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.MessageTarget;
+import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandInfo;
 
 /**
@@ -45,7 +46,7 @@ public class ChatCommandContext extends ServerCommandContext {
      */
     public ChatCommandContext(final FrameContainer source,
             final CommandInfo commandInfo, final MessageTarget chat) {
-        super(source, commandInfo, chat.getServer());
+        super(source, commandInfo, (Server) chat.getConnection());
         this.chat = chat;
     }
 

src/com/dmdirc/commandparser/commands/global/Echo.java

@@ -138,7 +138,7 @@ public class Echo extends Command implements IntelligentCommand {
                 && context.getPreviousArgs().get(0).equals("--ts"))) {
 
             final List<FrameContainer> windowList = new ArrayList<>();
-            final Server currentServer = context.getWindow().getServer();
+            final Server currentServer = (Server) context.getWindow().getConnection();
 
             //Active window's Children
             windowList.addAll(context.getWindow().getChildren());

src/com/dmdirc/commandparser/commands/global/OpenWindow.java

@@ -25,6 +25,7 @@ package com.dmdirc.commandparser.commands.global;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.CustomWindow;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.Server;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -82,13 +83,13 @@ public class OpenWindow extends Command implements IntelligentCommand {
         FrameContainer parent = null;
 
         if (args.getArguments().length > 0 && "--server".equals(args.getArguments()[0])) {
-            if (origin.getServer() == null) {
+            if (origin.getConnection() == null) {
                 sendLine(origin, args.isSilent(), FORMAT_ERROR,
                         "This window doesn't have an associated server.");
                 return;
             }
 
-            parent = origin.getServer();
+            parent = (Server) origin.getConnection();
             start = 1;
         } else if (args.getArguments().length > 0 && "--child".equals(args.getArguments()[0])) {
             parent = origin;

src/com/dmdirc/commandparser/commands/global/SetCommand.java

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.global;
 
 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;
@@ -114,14 +115,14 @@ public class SetCommand extends Command implements IntelligentCommand {
         AggregateConfigProvider manager = identityController.getGlobalConfiguration();
 
         if (res.hasFlag(serverFlag)) {
-            if (origin.getServer() == null) {
+            if (origin.getConnection() == null) {
                 sendLine(origin, args.isSilent(), FORMAT_ERROR,
                         "Cannot use --server in this context");
                 return;
             }
 
-            identity = origin.getServer().getServerIdentity();
-            manager = origin.getServer().getConfigManager();
+            identity = origin.getConnection().getServerIdentity();
+            manager = ((Server) origin.getConnection()).getConfigManager();
         }
 
         if (res.hasFlag(channelFlag)) {
@@ -133,7 +134,7 @@ public class SetCommand extends Command implements IntelligentCommand {
 
             final Channel channel = ((ChannelCommandContext) context).getChannel();
             identity = identityFactory.createChannelConfig(
-                    origin.getServer().getNetwork(), channel.getName());
+                    origin.getConnection().getNetwork(), channel.getName());
             manager = channel.getConfigManager();
         }
 

src/com/dmdirc/commandparser/commands/server/Ignore.java

@@ -180,7 +180,7 @@ public class Ignore extends Command implements IntelligentCommand {
             targets.include(TabCompletionType.CHANNEL_NICK);
             targets.include(TabCompletionType.QUERY_NICK);
         } else if (arg == 1 && context.getPreviousArgs().get(0).equals("--remove")) {
-            final IgnoreList ignoreList = context.getWindow().getServer()
+            final IgnoreList ignoreList = context.getWindow().getConnection()
                 .getIgnoreList();
             if (ignoreList.canConvert()) {
                 for (String entry : ignoreList.getSimpleList()) {

src/com/dmdirc/commandparser/commands/server/JoinChannelCommand.java

@@ -36,6 +36,7 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -122,7 +123,7 @@ public class JoinChannelCommand extends Command implements
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
         final FrameContainer source = context.getWindow();
-        final Server server = source.getServer();
+        final Connection connection = source.getConnection();
         final List<String> results = checkSource(source, true, true);
 
         final AdditionalTabTargets targets = new AdditionalTabTargets().excludeAll();
@@ -143,13 +144,13 @@ public class JoinChannelCommand extends Command implements
         if (!showExisting) {
             for (String result : results) {
                 // Only tab complete channels we're not already on
-                if (!server.hasChannel(result)) {
+                if (!connection.hasChannel(result)) {
                     targets.add(prefix + result);
                 }
             }
         }
 
-        for (char chPrefix : server.getChannelPrefixes().toCharArray()) {
+        for (char chPrefix : connection.getChannelPrefixes().toCharArray()) {
             // Let them tab complete the prefixes as well
             targets.add(prefix + chPrefix);
         }

src/com/dmdirc/commandparser/commands/server/Message.java

@@ -120,7 +120,7 @@ public class Message extends Command implements IntelligentCommand,
             final CommandArguments arguments) {
         if (arguments.getArguments().length >= 2) {
             final String target = arguments.getArguments()[0];
-            return origin.getServer().getNumLines("PRIVMSG "
+            return ((Server) origin.getConnection()).getNumLines("PRIVMSG "
                     + target + " :" + arguments.getArgumentsAsString(1));
         } else {
             return 1;

src/com/dmdirc/commandparser/commands/server/OpenQuery.java

@@ -117,7 +117,7 @@ public class OpenQuery extends Command implements IntelligentCommand,
             final CommandArguments arguments) {
         if (arguments.getArguments().length >= 2) {
             final String target = arguments.getArguments()[0];
-            return origin.getServer().getNumLines("PRIVMSG "
+            return ((Server) origin.getConnection()).getNumLines("PRIVMSG "
                     + target + " :" + arguments.getArgumentsAsString(1));
         } else {
             return 1;

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

@@ -35,6 +35,7 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.commandparser.commands.PreviousCommand;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.util.collections.RollingList;
 
@@ -178,12 +179,12 @@ public abstract class CommandParser implements Serializable {
         final String[] cargs = args.getArguments();
 
         if (cargs.length == 0 || !parseChannel || origin == null
-                || origin.getServer() == null
+                || origin.getConnection() == null
                 || !commandManager.isChannelCommand(command)) {
             return false;
         }
 
-        final Server server = origin.getServer();
+        final Connection server = origin.getConnection();
         final String[] parts = cargs[0].split(",");
         boolean someValid = false;
         for (String part : parts) {
@@ -207,7 +208,7 @@ public abstract class CommandParser implements Serializable {
 
                     if (actCommand != null && actCommand.getValue() instanceof ExternalCommand) {
                         ((ExternalCommand) actCommand.getValue()).execute(
-                                origin, server, channel, silent,
+                                origin, (Server) server, channel, silent,
                                 new CommandArguments(commandManager, args.getCommandName()
                                 + " " + args.getWordsAsString(2)));
                     }

src/com/dmdirc/messages/AllMessageSink.java

@@ -48,7 +48,7 @@ public class AllMessageSink implements MessageSink {
             final WritableFrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
-        source.getServer().addLineToAll(messageType, date, args);
+        source.getConnection().addLineToAll(messageType, date, args);
     }
 
 }

src/com/dmdirc/messages/ChannelMessageSink.java

@@ -54,8 +54,8 @@ public class ChannelMessageSink implements MessageSink {
         final String user = String.format(patternMatches[0], args);
         boolean found = false;
 
-        for (String channelName : source.getServer().getChannels()) {
-            final Channel channel = source.getServer().getChannel(channelName);
+        for (String channelName : source.getConnection().getChannels()) {
+            final Channel channel = source.getConnection().getChannel(channelName);
             if (channel.getChannelInfo().getChannelClient(user) != null) {
                 channel.addLine(messageType, date, args);
                 found = true;

src/com/dmdirc/messages/CommonChanelsMessageSink.java

@@ -55,8 +55,8 @@ public class CommonChanelsMessageSink implements MessageSink {
         final String user = String.format(patternMatches[0], args);
         boolean found = false;
 
-        for (String channelName : source.getServer().getChannels()) {
-            final Channel channel = source.getServer().getChannel(channelName);
+        for (String channelName : source.getConnection().getChannels()) {
+            final Channel channel = source.getConnection().getChannel(channelName);
             if (channel.getChannelInfo().getChannelClient(user) != null) {
                 channel.addLine(messageType, date, args);
                 found = true;

src/com/dmdirc/messages/CustomWindowMessageSink.java

@@ -24,6 +24,7 @@ package com.dmdirc.messages;
 
 import com.dmdirc.CustomWindow;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.ui.WindowManager;
 
@@ -62,12 +63,13 @@ public class CustomWindowMessageSink implements MessageSink {
             final WritableFrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
-        FrameContainer targetWindow = windowManager.findCustomWindow(source.getServer(), patternMatches[0]);
+        FrameContainer targetWindow = windowManager
+                .findCustomWindow((Server) source.getConnection(), patternMatches[0]);
 
         if (targetWindow == null) {
             targetWindow = new CustomWindow(patternMatches[0],
-                    patternMatches[0], source.getServer());
-            windowManager.addWindow(source.getServer(), targetWindow);
+                    patternMatches[0], (Server) source.getConnection());
+            windowManager.addWindow((Server) source.getConnection(), targetWindow);
         }
 
         targetWindow.addLine(messageType, date, args);

src/com/dmdirc/messages/LastCommandMessageSink.java

@@ -23,6 +23,7 @@
 package com.dmdirc.messages;
 
 import com.dmdirc.FrameContainer;
+import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
 
 import java.util.ArrayList;
@@ -65,8 +66,8 @@ public class LastCommandMessageSink implements MessageSink {
 
         final List<FrameContainer> containers = new ArrayList<>();
 
-        containers.add(source.getServer());
-        containers.addAll(source.getServer().getChildren());
+        containers.add((Server) source.getConnection());
+        containers.addAll(((Server) source.getConnection()).getChildren());
 
         for (FrameContainer container : containers) {
             if (!(container instanceof WritableFrameContainer)) {

src/com/dmdirc/messages/ServerMessageSink.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.messages;
 
+import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
 
 import java.util.Date;
@@ -47,7 +48,7 @@ public class ServerMessageSink implements MessageSink {
             final WritableFrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
-        source.getServer().addLine(messageType, date, args);
+        ((Server) source.getConnection()).addLine(messageType, date, args);
     }
 
 }

test/com/dmdirc/actions/ActionSubstitutorTest.java

@@ -74,7 +74,7 @@ public class ActionSubstitutorTest {
 
         final ChannelClientInfo clientInfo = mock(ChannelClientInfo.class);
 
-        when(channel.getServer()).thenReturn(server);
+        when(channel.getConnection()).thenReturn(server);
         when(channel.getConfigManager()).thenReturn(manager);
         when(server.getState()).thenReturn(ServerState.DISCONNECTED);
         when(server.getAwayMessage()).thenReturn("foo");

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

@@ -53,7 +53,7 @@ public class ModeTest {
 
     @Before
     public void setUp() throws InvalidIdentityFileException {
-        when(channel.getServer()).thenReturn(server);
+        when(channel.getConnection()).thenReturn(server);
         when(server.getParser()).thenReturn(parser);
         when(channel.getChannelInfo()).thenReturn(channelinfo);
         when(channelinfo.getModes()).thenReturn("my mode string!");

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

@@ -52,7 +52,7 @@ public class NamesTest {
 
     @Before
     public void setUp() throws InvalidIdentityFileException {
-        when(channel.getServer()).thenReturn(server);
+        when(channel.getConnection()).thenReturn(server);
         when(server.getParser()).thenReturn(parser);
         when(channel.getChannelInfo()).thenReturn(channelinfo);
         when(channelinfo.getName()).thenReturn("#chan");

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -22,11 +22,11 @@
 
 package com.dmdirc.harness;
 
-import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.input.TabCompleter;
@@ -70,7 +70,7 @@ public class TestWritableFrameContainer extends WritableFrameContainer {
     }
 
     @Override
-    public Server getServer() {
+    public Connection getConnection() {
         return null;
     }