Fix various deprecated uses.

Change-Id: I0bb97a8946d1c217de82fe2a9b8f35b7d49eae06

src/com/dmdirc/Channel.java

@@ -550,6 +550,7 @@ public class Channel extends MessageTarget implements GroupChat {
     }
 
     @Override
+    @Deprecated
     @Nonnull
     public Connection getConnection() {
         return server;

src/com/dmdirc/CustomWindow.java

@@ -65,6 +65,7 @@ public class CustomWindow extends FrameContainer {
     }
 
     @Override
+    @Deprecated
     public Connection getConnection() {
         return getOptionalConnection().orElse(null);
     }

src/com/dmdirc/GlobalWindow.java

@@ -64,6 +64,7 @@ public class GlobalWindow extends FrameContainer {
     }
 
     @Override
+    @Deprecated
     public Connection getConnection() {
         return null;
     }

src/com/dmdirc/Query.java

@@ -288,6 +288,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
 
     @Nonnull
     @Override
+    @Deprecated
     public Connection getConnection() {
         return server;
     }

src/com/dmdirc/Raw.java

@@ -114,6 +114,7 @@ public class Raw extends FrameContainer implements DataInListener, DataOutListen
     }
 
     @Nonnull
+    @Deprecated
     @Override
     public Connection getConnection() {
         return server;

src/com/dmdirc/Server.java

@@ -1039,6 +1039,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
     }
 
     @Nonnull
+    @Deprecated
     @Override
     public Connection getConnection() {
         return this;

src/com/dmdirc/commandparser/aliases/Alias.java

@@ -25,6 +25,7 @@ package com.dmdirc.commandparser.aliases;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
 
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 
 /**
@@ -94,7 +95,7 @@ public class Alias implements CommandInfo {
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this)
+        return MoreObjects.toStringHelper(this)
                 .add("name", name)
                 .add("minargs", minArguments)
                 .add("substitution", substitution)

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

@@ -26,6 +26,8 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.MessageTarget;
 import com.dmdirc.commandparser.CommandInfo;
 
+import java.util.Optional;
+
 /**
  * A command context specific to chat windows.
  *
@@ -45,7 +47,10 @@ public class ChatCommandContext extends ServerCommandContext {
      */
     public ChatCommandContext(final FrameContainer source,
             final CommandInfo commandInfo, final MessageTarget chat) {
-        super(source, commandInfo, chat.getConnection());
+        super(source, commandInfo,
+                Optional.ofNullable(source)
+                        .flatMap(FrameContainer::getOptionalConnection)
+                        .orElse(null));
         this.chat = chat;
     }
 

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

@@ -59,7 +59,7 @@ public class Clear extends Command implements IntelligentCommand {
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        origin.getDocument().clear();
+        origin.getBackBuffer().getDocument().clear();
     }
 
     @Override

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

@@ -36,10 +36,12 @@ import com.dmdirc.commandparser.commands.flags.CommandFlag;
 import com.dmdirc.commandparser.commands.flags.CommandFlagHandler;
 import com.dmdirc.commandparser.commands.flags.CommandFlagResult;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
@@ -138,16 +140,17 @@ public class Echo extends Command implements IntelligentCommand {
                 || (arg == 3 && context.getPreviousArgs().get(2).equals("--target")
                 && context.getPreviousArgs().get(0).equals("--ts"))) {
 
-            final List<FrameContainer> windowList = new ArrayList<>();
-            final Server currentServer = (Server) context.getWindow().getConnection();
+            final Collection<FrameContainer> windowList = new ArrayList<>();
+            final Optional<Connection> connection = context.getWindow().getOptionalConnection();
 
             //Active window's Children
             windowList.addAll(context.getWindow().getChildren());
 
             //Children of Current Window's server
-            if (currentServer != null) {
-                windowList.addAll(currentServer.getChildren());
-            }
+            connection
+                    .map(c -> (Server) c)
+                    .map(Server::getChildren)
+                    .ifPresent(windowList::addAll);
 
             //Global Windows
             windowList.addAll(windowManager.getRootWindows());

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

@@ -34,12 +34,15 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.util.URLBuilder;
 
+import java.util.Optional;
+
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
 
@@ -91,13 +94,14 @@ public class OpenWindow extends Command implements IntelligentCommand {
         FrameContainer parent = null;
 
         if (args.getArguments().length > 0 && "--server".equals(args.getArguments()[0])) {
-            if (origin.getConnection() == null) {
+            final Optional<Connection> connection = origin.getOptionalConnection();
+            if (!connection.isPresent()) {
                 sendLine(origin, args.isSilent(), FORMAT_ERROR,
                         "This window doesn't have an associated server.");
                 return;
             }
 
-            parent = (FrameContainer) origin.getConnection();
+            parent = connection.get().getWindowModel();
             start = 1;
         } else if (args.getArguments().length > 0 && "--child".equals(args.getArguments()[0])) {
             parent = origin;

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

@@ -36,6 +36,7 @@ import com.dmdirc.commandparser.commands.flags.CommandFlag;
 import com.dmdirc.commandparser.commands.flags.CommandFlagHandler;
 import com.dmdirc.commandparser.commands.flags.CommandFlagResult;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
@@ -44,6 +45,7 @@ import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import java.util.List;
+import java.util.Optional;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -112,16 +114,17 @@ public class SetCommand extends Command implements IntelligentCommand {
 
         ConfigProvider identity = identityController.getUserSettings();
         AggregateConfigProvider manager = identityController.getGlobalConfiguration();
+        final Optional<Connection> connection = origin.getOptionalConnection();
 
         if (res.hasFlag(serverFlag)) {
-            if (origin.getConnection() == null) {
+            if (!connection.isPresent()) {
                 sendLine(origin, args.isSilent(), FORMAT_ERROR,
                         "Cannot use --server in this context");
                 return;
             }
 
-            identity = origin.getConnection().getServerIdentity();
-            manager = ((FrameContainer) origin.getConnection()).getConfigManager();
+            identity = connection.get().getServerIdentity();
+            manager = connection.get().getWindowModel().getConfigManager();
         }
 
         if (res.hasFlag(channelFlag)) {
@@ -133,7 +136,7 @@ public class SetCommand extends Command implements IntelligentCommand {
 
             final Channel channel = ((ChannelCommandContext) context).getChannel();
             identity = identityFactory.createChannelConfig(
-                    origin.getConnection().getNetwork(), channel.getName());
+                    connection.get().getNetwork(), channel.getName());
             manager = channel.getConfigManager();
         }
 

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

@@ -185,8 +185,8 @@ public class Ignore extends Command implements IntelligentCommand {
             targets.include(TabCompletionType.CHANNEL_NICK);
             targets.include(TabCompletionType.QUERY_NICK);
         } else if (arg == 1 && "--remove".equals(context.getPreviousArgs().get(0))) {
-            final IgnoreList ignoreList = context.getWindow().getConnection()
-                    .getIgnoreList();
+            final IgnoreList ignoreList = context.getWindow().getOptionalConnection()
+                    .get().getIgnoreList();
             if (ignoreList.canConvert()) {
                 targets.addAll(ignoreList.getSimpleList().stream().collect(Collectors.toList()));
             }

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

@@ -105,7 +105,7 @@ public class JoinChannelCommand extends Command implements IntelligentCommand {
 
     @Handler
     public void handleClientLineAdded(final ClientLineAddedEvent event) {
-        final String[] parts = event.getFrameContainer().getStyliser()
+        final String[] parts = event.getFrameContainer().getBackBuffer().getStyliser()
                 .doLinks(event.getLine())
                 .split(Character.toString(Styliser.CODE_CHANNEL));
 
@@ -119,7 +119,7 @@ public class JoinChannelCommand extends Command implements IntelligentCommand {
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
         final FrameContainer source = context.getWindow();
-        final Connection connection = source.getConnection();
+        final Connection connection = source.getOptionalConnection().get();
         final List<String> results = checkSource(source, true, true);
 
         final AdditionalTabTargets targets = new AdditionalTabTargets().excludeAll();

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

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

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

@@ -89,11 +89,7 @@ public class OpenQuery extends Command implements IntelligentCommand,
             query.sendLine(args.getArgumentsAsString(1), args.getArguments()[0]);
         }
 
-        if (!args.isSilent()) {
-            //TODO how are we going to handle focusing an existing query?
-            //context.getSource().getController().requestWindowFocus(query);
-            return; //NOPMD
-        }
+        // TODO: Focus if the command isn't silent
     }
 
     @Override
@@ -113,7 +109,7 @@ public class OpenQuery extends Command implements IntelligentCommand,
     public int getLineCount(final FrameContainer origin, final CommandArguments arguments) {
         if (arguments.getArguments().length >= 2) {
             final String target = arguments.getArguments()[0];
-            return origin.getConnection().getWindowModel().getNumLines("PRIVMSG "
+            return origin.getOptionalConnection().get().getWindowModel().getNumLines("PRIVMSG "
                     + target + " :" + arguments.getArgumentsAsString(1));
         } else {
             return 1;

src/com/dmdirc/events/ErrorEvent.java

@@ -24,6 +24,7 @@ package com.dmdirc.events;
 
 import com.dmdirc.logger.ErrorLevel;
 
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 
 public abstract class ErrorEvent extends DMDircEvent {
@@ -69,8 +70,9 @@ public abstract class ErrorEvent extends DMDircEvent {
         this.handled = true;
     }
 
+    @Override
     public String toString() {
-        return Objects.toStringHelper(getClass())
+        return MoreObjects.toStringHelper(getClass())
                 .add("Level", getLevel())
                 .add("Message", getMessage())
                 .add("Details", getDetails())

src/com/dmdirc/ui/messages/sink/AllMessageSink.java

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

src/com/dmdirc/ui/messages/sink/ChannelMessageSink.java

@@ -24,6 +24,7 @@ package com.dmdirc.ui.messages.sink;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.Connection;
 
 import java.util.Date;
 import java.util.regex.Pattern;
@@ -57,8 +58,9 @@ public class ChannelMessageSink implements MessageSink {
         final String user = String.format(patternMatches[0], args);
         boolean found = false;
 
-        for (String channelName : source.getConnection().getChannels()) {
-            final Channel channel = source.getConnection().getChannel(channelName);
+        final Connection connection = source.getOptionalConnection().get();
+        for (String channelName : connection.getChannels()) {
+            final Channel channel = connection.getChannel(channelName);
             if (channel.getChannelInfo().getChannelClient(user) != null) {
                 channel.addLine(messageType, date, args);
                 found = true;

src/com/dmdirc/ui/messages/sink/CommonChannelsMessageSink.java

@@ -24,6 +24,7 @@ package com.dmdirc.ui.messages.sink;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.Connection;
 
 import java.util.Date;
 import java.util.regex.Pattern;
@@ -56,10 +57,11 @@ public class CommonChannelsMessageSink implements MessageSink {
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
         final String user = String.format(patternMatches[0], args);
+        final Connection connection = source.getOptionalConnection().get();
         boolean found = false;
 
-        for (String channelName : source.getConnection().getChannels()) {
-            final Channel channel = source.getConnection().getChannel(channelName);
+        for (String channelName : connection.getChannels()) {
+            final Channel channel = connection.getChannel(channelName);
             if (channel.getChannelInfo().getChannelClient(user) != null) {
                 channel.addLine(messageType, date, args);
                 found = true;

src/com/dmdirc/ui/messages/sink/CustomWindowMessageSink.java

@@ -71,13 +71,15 @@ public class CustomWindowMessageSink implements MessageSink {
             final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
+        final FrameContainer connectionContainer = source.getOptionalConnection()
+                .get().getWindowModel();
         FrameContainer targetWindow = windowManager
-                .findCustomWindow((Server) source.getConnection(), patternMatches[0]);
+                .findCustomWindow(connectionContainer, patternMatches[0]);
 
         if (targetWindow == null) {
             targetWindow = new CustomWindow(patternMatches[0], patternMatches[0],
-                    (Server) source.getConnection(), urlBuilder, backBufferFactory);
-            windowManager.addWindow((Server) source.getConnection(), targetWindow);
+                    connectionContainer, urlBuilder, backBufferFactory);
+            windowManager.addWindow(connectionContainer, targetWindow);
         }
 
         targetWindow.addLine(messageType, date, args);

src/com/dmdirc/ui/messages/sink/LastCommandMessageSink.java

@@ -23,11 +23,10 @@
 package com.dmdirc.ui.messages.sink;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
-import java.util.List;
 import java.util.regex.Pattern;
 
 import javax.inject.Inject;
@@ -64,13 +63,15 @@ public class LastCommandMessageSink implements MessageSink {
         final String command = String.format(patternMatches[0], escapedargs);
 
         FrameContainer best = source;
-        long besttime = 0;
 
-        final List<FrameContainer> containers = new ArrayList<>();
+        final Collection<FrameContainer> containers = new ArrayList<>();
 
-        containers.add((Server) source.getConnection());
-        containers.addAll(((Server) source.getConnection()).getChildren());
+        final FrameContainer connectionContainer = source.getOptionalConnection()
+                .get().getWindowModel();
+        containers.add(connectionContainer);
+        containers.addAll(connectionContainer.getChildren());
 
+        long besttime = 0;
         for (FrameContainer container : containers) {
             if (!container.isWritable()) {
                 continue;

src/com/dmdirc/ui/messages/sink/ServerMessageSink.java

@@ -52,7 +52,7 @@ public class ServerMessageSink implements MessageSink {
             final FrameContainer source,
             final String[] patternMatches, final Date date,
             final String messageType, final Object... args) {
-        ((Server) source.getConnection()).addLine(messageType, date, args);
+        source.getOptionalConnection().get().getWindowModel().addLine(messageType, date, args);
     }
 
 }

test/com/dmdirc/actions/ActionSubstitutorTest.java

@@ -75,7 +75,6 @@ public class ActionSubstitutorTest {
 
         final ChannelClientInfo clientInfo = mock(ChannelClientInfo.class);
 
-        when(channel.getConnection()).thenReturn(server);
         when(channel.getOptionalConnection()).thenReturn(Optional.of(server));
         when(channel.getConfigManager()).thenReturn(manager);
         when(server.getState()).thenReturn(ServerState.DISCONNECTED);

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

@@ -31,6 +31,8 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 
+import java.util.Optional;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -75,6 +77,7 @@ public class BanTest {
         when(channelInfo.getChannelClient("user")).thenReturn(ccInfo);
         when(ccInfo.getClient()).thenReturn(clientInfo);
         when(clientInfo.getHostname()).thenReturn("my.host.name");
+        when(container.getOptionalConnection()).thenReturn(Optional.empty());
 
         command.execute(container, new CommandArguments(controller, "/ban user"),
                 new ChannelCommandContext(null, Ban.INFO, channel));
@@ -91,6 +94,7 @@ public class BanTest {
         final Channel channel = mock(Channel.class);
 
         when(channel.getChannelInfo()).thenReturn(channelInfo);
+        when(container.getOptionalConnection()).thenReturn(Optional.empty());
 
         command.execute(container, new CommandArguments(controller, "/ban *!*@my.host.name"),
                 new ChannelCommandContext(null, Ban.INFO, channel));

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

@@ -31,6 +31,8 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 
+import java.util.Optional;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -62,6 +64,9 @@ public class KickReasonTest {
     public void testUsage() {
         final FrameContainer tiw = mock(FrameContainer.class);
         final Channel channel = mock(Channel.class);
+
+        when(tiw.getOptionalConnection()).thenReturn(Optional.empty());
+
         command.execute(tiw, new CommandArguments(controller, "/kick"),
                 new ChannelCommandContext(null, KickReason.INFO, channel));
 
@@ -76,6 +81,7 @@ public class KickReasonTest {
 
         when(channel.getChannelInfo()).thenReturn(channelInfo);
         when(channelInfo.getChannelClient(anyString())).thenReturn(null);
+        when(tiw.getOptionalConnection()).thenReturn(Optional.empty());
 
         command.execute(tiw, new CommandArguments(controller, "/kick user1"),
                 new ChannelCommandContext(null, KickReason.INFO, channel));
@@ -92,6 +98,7 @@ public class KickReasonTest {
 
         when(channel.getChannelInfo()).thenReturn(channelInfo);
         when(channelInfo.getChannelClient("user1")).thenReturn(cci);
+        when(tiw.getOptionalConnection()).thenReturn(Optional.empty());
 
         command.execute(tiw, new CommandArguments(controller, "/kick user1 reason here"),
                 new ChannelCommandContext(null, KickReason.INFO, channel));
@@ -111,6 +118,7 @@ public class KickReasonTest {
         when(channel.getChannelInfo()).thenReturn(channelInfo);
         when(channelInfo.getChannelClient("user1")).thenReturn(cci);
         when(manager.getOption("general", "kickmessage")).thenReturn("reason here");
+        when(tiw.getOptionalConnection()).thenReturn(Optional.empty());
 
         command.execute(tiw, new CommandArguments(controller, "/kick user1"),
                 new ChannelCommandContext(null, KickReason.INFO, channel));

test/com/dmdirc/commandparser/parsers/CommandParserTest.java

@@ -191,7 +191,7 @@ public class CommandParserTest {
 
     @Test
     public void testParseChannelCommandWithArguments() {
-        when(container.getConnection()).thenReturn(connection);
+        when(container.getOptionalConnection()).thenReturn(Optional.of(connection));
         commandParser.parseCommand(container, "/channel #channel1 this is a test");
 
         assertNull(channelCommandParser.nonCommandLine);
@@ -203,7 +203,7 @@ public class CommandParserTest {
 
     @Test
     public void testParseChannelCommandWithoutArguments() {
-        when(container.getConnection()).thenReturn(connection);
+        when(container.getOptionalConnection()).thenReturn(Optional.of(connection));
         commandParser.parseCommand(container, "/channel #channel1");
 
         assertNull(channelCommandParser.nonCommandLine);
@@ -215,7 +215,7 @@ public class CommandParserTest {
 
     @Test
     public void testParseSilencedChannelCommandWithArguments() {
-        when(container.getConnection()).thenReturn(connection);
+        when(container.getOptionalConnection()).thenReturn(Optional.of(connection));
         commandParser.parseCommand(container, "/.channel #channel1 this is a test");
 
         assertNull(channelCommandParser.nonCommandLine);
@@ -227,7 +227,7 @@ public class CommandParserTest {
 
     @Test
     public void testParseSilencedChannelCommandWithoutArguments() {
-        when(container.getConnection()).thenReturn(connection);
+        when(container.getOptionalConnection()).thenReturn(Optional.of(connection));
         commandParser.parseCommand(container, "/.channel #channel1");
 
         assertNull(channelCommandParser.nonCommandLine);

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -69,6 +69,7 @@ public class TestWritableFrameContainer extends FrameContainer {
     }
 
     @Override
+    @Deprecated
     public Connection getConnection() {
         return null;
     }