Fix more deprecations.

dcc/src/com/dmdirc/addons/dcc/DCCFrameContainer.java

@@ -84,6 +84,7 @@ public abstract class DCCFrameContainer extends FrameContainer {
     }
 
     @Override
+    @Deprecated
     public Connection getConnection() { //NOPMD - server will always be null
         return null;
     }

dcc/src/com/dmdirc/addons/dcc/PlaceholderContainer.java

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

dcc/src/com/dmdirc/addons/dcc/TransferContainer.java

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

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

@@ -71,6 +71,7 @@ public class DebugWindow extends FrameContainer {
      * @return the associated server connection
      */
     @Override
+    @Deprecated
     public Connection getConnection() {
         return connection;
     }

redirect/src/com/dmdirc/addons/redirect/FakeWriteableFrameContainer.java

@@ -99,6 +99,7 @@ public class FakeWriteableFrameContainer extends FrameContainer {
     }
 
     @Override
+    @Deprecated
     public Connection getConnection() {
         return target.getConnection();
     }

redirect/test/com/dmdirc/addons/redirect/RedirectCommandTest.java

@@ -39,6 +39,8 @@ import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.util.URLBuilder;
 
+import java.util.Optional;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -72,6 +74,7 @@ public class RedirectCommandTest {
 
     @Before
     public void setup() {
+        when(frameContainer.getOptionalConnection()).thenReturn(Optional.empty());
         when(commandController.getCommandChar()).thenReturn('/');
         when(commandController.getSilenceChar()).thenReturn('.');
         when(inputWindow.getContainer()).thenReturn(frameContainer);

ui_swing/src/com/dmdirc/addons/ui_swing/commands/ServerSettings.java

@@ -69,7 +69,8 @@ public class ServerSettings extends Command implements IntelligentCommand {
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        dialogProvider.displayOrRequestFocus(context.getSource().getConnection());
+        dialogProvider.displayOrRequestFocus(
+                context.getSource().getOptionalConnection().orElse(null));
     }
 
     @Override

ui_swing/src/com/dmdirc/addons/ui_swing/components/AwayLabel.java

@@ -63,10 +63,10 @@ public class AwayLabel extends JLabel implements ConfigChangeListener,
         setVisible(false);
         useAwayIndicator = container.getConfigManager().getOptionBool("ui", AWAY_INDICATOR);
 
-        if (container.getConnection() != null) {
-            setVisible(container.getConnection().isAway());
-            container.getConnection().addAwayStateListener(this);
-        }
+        container.getOptionalConnection().ifPresent(c -> {
+            setVisible(c.isAway());
+            c.addAwayStateListener(this);
+        });
     }
 
     @Override
@@ -98,8 +98,8 @@ public class AwayLabel extends JLabel implements ConfigChangeListener,
 
     @Handler
     public void windowClosing(final FrameClosingEvent event) {
-        if (event.getContainer().equals(container) && container.getConnection() != null) {
-            container.getConnection().removeAwayStateListener(this);
+        if (event.getContainer().equals(container)) {
+            container.getOptionalConnection().ifPresent(c -> c.removeAwayStateListener(this));
         }
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/components/TopicBar.java

@@ -231,7 +231,7 @@ public class TopicBar extends JComponent implements ActionListener, ConfigChange
             }
             topicText.setText("");
             if (topic != null) {
-            channel.getStyliser().addStyledString(
+            channel.getBackBuffer().getStyliser().addStyledString(
                     (StyledDocument) topicText.getDocument(),
                     new String[]{Styliser.CODE_HEXCOLOUR
                         + UIUtilities.getHex(foregroundColour)

ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/ChannelFrame.java

@@ -117,7 +117,8 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
 
         eventBus.subscribe(this);
 
-        identity = identityFactory.createChannelConfig(owner.getConnection().getNetwork(),
+        identity = identityFactory.createChannelConfig(
+                owner.getOptionalConnection().get().getNetwork(),
                 owner.getChannelInfo().getName());
     }
 
@@ -213,7 +214,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
 
     @Override
     public void addCustomPopupItems(final JPopupMenu popupMenu) {
-        if (channel.getConnection().getState() == ServerState.CONNECTED) {
+        if (channel.getOptionalConnection().get().getState() == ServerState.CONNECTED) {
             settingsMI.setEnabled(true);
         } else {
             settingsMI.setEnabled(false);

ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/ServerFrame.java

@@ -143,7 +143,7 @@ public final class ServerFrame extends InputTextFrame implements
 
     @Override
     public void addCustomPopupItems(final JPopupMenu popupMenu) {
-        if (getContainer().getConnection().getState() == ServerState.CONNECTED) {
+        if (getContainer().getOptionalConnection().get().getState() == ServerState.CONNECTED) {
             settingsMI.setEnabled(true);
         } else {
             settingsMI.setEnabled(false);

ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/ServerFrameFactory.java

@@ -67,7 +67,7 @@ public class ServerFrameFactory implements SwingWindowFactory.WindowProvider {
     @Override
     public TextFrame getWindow(final FrameContainer container) {
         final ServerFrame frame =  new ServerFrame(dependencies.get(), inputFieldProvider,
-                dialogProvider.get(), container.getConnection());
+                dialogProvider.get(), container.getOptionalConnection().get());
         eventBus.subscribe(frame);
         return frame;
     }

ui_swing/src/com/dmdirc/addons/ui_swing/components/modes/ChannelModesPane.java

@@ -64,13 +64,13 @@ public final class ChannelModesPane extends ModesPane {
 
     @Override
     public boolean isModeSettable(final String mode) {
-        return channel.getConnection().getParser().isUserSettable(
+        return channel.getOptionalConnection().get().getParser().isUserSettable(
                 mode.toCharArray()[0]);
     }
 
     @Override
     public String getAvailableBooleanModes() {
-        return channel.getConnection().getParser().getBooleanChannelModes();
+        return channel.getOptionalConnection().get().getParser().getBooleanChannelModes();
     }
 
     @Override
@@ -80,7 +80,7 @@ public final class ChannelModesPane extends ModesPane {
 
     @Override
     public String getAllParamModes() {
-        final Parser parser = channel.getConnection().getParser();
+        final Parser parser = channel.getOptionalConnection().get().getParser();
         return parser.getParameterChannelModes()
                 + parser.getDoubleParameterChannelModes();
     }

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelListModesPane.java

@@ -137,8 +137,8 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
         }
         listModesPanel = new JScrollPane();
         listModesPanels = new ArrayList<>();
-        listModesArray = channel.getConnection().getParser().getListChannelModes().
-                toCharArray();
+        listModesArray = channel.getOptionalConnection().get().getParser()
+                .getListChannelModes().toCharArray();
         existingListItems = new MapList<>();
         listModesMenu = new JComboBox<>(new DefaultComboBoxModel<>());
         addListModeButton = new JButton("Add");
@@ -355,7 +355,7 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
 
         final int selected = listModesMenu.getSelectedIndex();
         final int current = listModesPanels.get(selected).getModel().getSize();
-        final int maxModes = channel.getConnection().getParser().
+        final int maxModes = channel.getOptionalConnection().get().getParser().
                 getMaxListModes(listModesArray[selected]);
 
         if (maxModes == -1) {

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java

@@ -134,7 +134,8 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
         this.eventBus = eventBus;
         this.colourManagerFactory = colourManagerFactory;
 
-        identity = identityFactory.createChannelConfig(channel.getConnection().getNetwork(),
+        identity = identityFactory.createChannelConfig(
+                channel.getOptionalConnection().get().getNetwork(),
                 channel.getChannelInfo().getName());
         channelWindow = (InputWindow) windowFactory.getSwingWindow(channel);
 

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicDisplayPane.java

@@ -101,7 +101,7 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
         this.clipboard = clipboard;
         this.channel = channel;
         this.parent = parent;
-        topicLengthMax = channel.getConnection().getParser().getMaxTopicLength();
+        topicLengthMax = channel.getOptionalConnection().get().getParser().getMaxTopicLength();
         this.channelWindow = channelWindow;
         this.eventBus = eventBus;
 

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicLabel.java

@@ -121,7 +121,7 @@ public class TopicLabel extends JPanel {
         setLayout(new MigLayout("fill, ins 0, debug", "[]0[]", "[]0[]"));
 
         if (!topic.getTopic().isEmpty()) {
-            channel.getStyliser().addStyledString(
+            channel.getBackBuffer().getStyliser().addStyledString(
                     (StyledDocument) pane.getDocument(),
                     new String[]{topic.getTopic(),}, as);
             add(pane, "wmax 450, grow, push, wrap, gapleft 5, gapleft 5");

ui_swing/src/com/dmdirc/addons/ui_swing/textpane/TextPane.java

@@ -106,7 +106,7 @@ public final class TextPane extends JComponent implements MouseWheelListener,
         this.clipboard = clipboard;
 
         setUI(new TextPaneUI());
-        document = frame.getContainer().getDocument();
+        document = frame.getContainer().getBackBuffer().getDocument();
         newLineIndicator = new JLabel("", SwingConstants.CENTER);
         newLineIndicator.setBackground(Color.RED);
         newLineIndicator.setForeground(Color.WHITE);