Tidy up some more getConnection calls.

logging/src/com/dmdirc/addons/logging/HistoryWindow.java

@@ -76,13 +76,14 @@ public class HistoryWindow extends FrameContainer {
     }
 
     @Override
+    @Deprecated
     public Connection getConnection() {
         return getParent().map(FrameContainer::getConnection).orElse(null);
     }
 
     @Override
     public Optional<Connection> getOptionalConnection() {
-        return getParent().map(FrameContainer::getConnection);
+        return getParent().flatMap(FrameContainer::getOptionalConnection);
     }
 
 }

logging/src/com/dmdirc/addons/logging/LoggingManager.java

@@ -218,7 +218,7 @@ public class LoggingManager implements ConfigChangeListener {
 
     @Handler
     public void handleQueryOpened(final QueryOpenedEvent event) {
-        final Parser parser = event.getQuery().getConnection().getParser();
+        final Parser parser = event.getQuery().getOptionalConnection().get().getParser();
         final ClientInfo client = parser.getClient(event.getQuery().getHost());
         final String filename = getLogFile(client);
         if (autobackbuffer) {
@@ -234,7 +234,7 @@ public class LoggingManager implements ConfigChangeListener {
 
     @Handler
     public void handleQueryClosed(final QueryClosedEvent event) {
-        final Parser parser = event.getQuery().getConnection().getParser();
+        final Parser parser = event.getQuery().getOptionalConnection().get().getParser();
         final ClientInfo client = parser.getClient(event.getQuery().getHost());
         final String filename = getLogFile(client);
 
@@ -764,7 +764,7 @@ public class LoggingManager implements ConfigChangeListener {
         if (target instanceof Channel) {
             descriptor = target.getName();
         } else if (target instanceof Query) {
-            final Parser parser = target.getConnection().getParser();
+            final Parser parser = target.getOptionalConnection().get().getParser();
             descriptor = parser.getClient(((PrivateChat) target).getHost()).getNickname();
         } else {
             // Unknown component

nickcolours/src/com/dmdirc/addons/nickcolours/NickColourManager.java

@@ -60,7 +60,7 @@ public class NickColourManager implements ConfigChangeListener {
     /** Event bus to subscribe to events on . */
     private final DMDircMBassador eventBus;
     /** "Random" colours to use to colour nicknames. */
-    private String[] randColours = new String[]{
+    private String[] randColours = {
         "E90E7F", "8E55E9", "B30E0E", "18B33C", "58ADB3", "9E54B3", "B39875", "3176B3",};
     private boolean useowncolour;
     private String owncolour;
@@ -81,7 +81,7 @@ public class NickColourManager implements ConfigChangeListener {
     @Handler
     public void handleChannelNames(final ChannelGotnamesEvent event) {
         final ChannelInfo chanInfo = event.getChannel().getChannelInfo();
-        final String network = event.getChannel().getConnection().getNetwork();
+        final String network = event.getChannel().getOptionalConnection().get().getNetwork();
 
         for (ChannelClientInfo client : chanInfo.getChannelClients()) {
             colourClient(network, client);
@@ -90,7 +90,7 @@ public class NickColourManager implements ConfigChangeListener {
 
     @Handler
     public void handleChannelJoin(final ChannelJoinEvent event) {
-        final String network = event.getChannel().getConnection().getNetwork();
+        final String network = event.getChannel().getOptionalConnection().get().getNetwork();
         colourClient(network, event.getClient());
     }
 

parserdebug/src/com/dmdirc/addons/parserdebug/ParserDebugCommand.java

@@ -31,6 +31,7 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 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.parser.interfaces.Parser;
 
 import javax.annotation.Nonnull;
@@ -76,7 +77,8 @@ public final class ParserDebugCommand extends Command {
             final CommandContext context) {
         final boolean isSilent = commandArgs.isSilent();
 
-        final Parser parser = ((ServerCommandContext) context).getConnection().getParser();
+        final Connection connection = ((ServerCommandContext) context).getConnection();
+        final Parser parser = connection.getParser();
 
         if (parser == null) {
             sendLine(origin, isSilent, FORMAT_ERROR, "Unable to get a parser for this window.");
@@ -89,7 +91,7 @@ public final class ParserDebugCommand extends Command {
                 sendLine(origin, isSilent, FORMAT_ERROR, "Removing callback failed");
             }
         } else {
-            if (parserDebugManager.addParser(parser, origin.getConnection())) {
+            if (parserDebugManager.addParser(parser, connection)) {
                 sendLine(origin, isSilent, FORMAT_OUTPUT, "Adding callback ok");
             } else {
                 sendLine(origin, isSilent, FORMAT_ERROR, "Adding callback failed");

windowstatus/src/com/dmdirc/addons/windowstatus/WindowStatusManager.java

@@ -41,6 +41,8 @@ import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.plugins.PluginDomain;
 
+import java.util.Optional;
+
 import javax.inject.Inject;
 
 import net.engio.mbassy.listener.Handler;
@@ -192,9 +194,9 @@ public class WindowStatusManager implements ConfigChangeListener {
     private String updateStatusQuery(final Query frame) {
         final StringBuilder textString = new StringBuilder();
         textString.append(frame.getHost());
-        if (showname && frame.getConnection().getParser() != null) {
-            final ClientInfo client = frame.getConnection().getParser()
-                    .getClient(frame.getHost());
+        final Optional<Connection> connection = frame.getOptionalConnection();
+        if (showname && connection.isPresent()) {
+            final ClientInfo client = connection.get().getParser().getClient(frame.getHost());
             final String realname = client.getRealname();
             if (realname != null && !realname.isEmpty()) {
                 textString.append(" - ");