Rename getOptionalConnection() to getConnection().

contactlist/src/com/dmdirc/addons/contactlist/ContactListListener.java

@@ -85,7 +85,7 @@ public class ContactListListener implements NicklistListener {
 
     @Override
     public void clientAdded(final ChannelClientInfo client) {
-        final Query query = groupChat.getOptionalConnection().get()
+        final Query query = groupChat.getConnection().get()
                 .getQuery(client.getClient().getNickname(), false);
 
         query.setIcon("query-" + client.getClient().getAwayState().name().toLowerCase());

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

@@ -84,7 +84,7 @@ public abstract class DCCFrameContainer extends FrameContainer {
     }
 
     @Override
-    public Optional<Connection> getOptionalConnection() {
+    public Optional<Connection> getConnection() {
         return Optional.empty();
     }
 

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

@@ -92,7 +92,7 @@ public class PlaceholderContainer extends FrameContainer {
     }
 
     @Override
-    public Optional<Connection> getOptionalConnection() {
+    public Optional<Connection> getConnection() {
         return Optional.empty();
     }
 

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

@@ -353,7 +353,7 @@ public class TransferContainer extends FrameContainer implements
     }
 
     @Override
-    public Optional<Connection> getOptionalConnection() {
+    public Optional<Connection> getConnection() {
         return Optional.empty();
     }
 

debug/src/com/dmdirc/addons/debug/commands/ServerInfo.java

@@ -62,7 +62,7 @@ public class ServerInfo extends DebugCommand {
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final Optional<Connection> optionalConnection = origin.getOptionalConnection();
+        final Optional<Connection> optionalConnection = origin.getConnection();
         if (optionalConnection.isPresent()) {
             final Connection connection = optionalConnection.get();
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Server name: "

debug/src/com/dmdirc/addons/debug/commands/ServerState.java

@@ -62,7 +62,7 @@ public class ServerState extends DebugCommand {
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final Optional<Connection> optionalConnection = origin.getOptionalConnection();
+        final Optional<Connection> optionalConnection = origin.getConnection();
         if (optionalConnection.isPresent()) {
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
                     optionalConnection.get().getStatus().getTransitionHistory());

debug/src/com/dmdirc/addons/debug/commands/ShowRaw.java

@@ -63,7 +63,7 @@ public class ShowRaw extends DebugCommand {
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final Optional<Connection> connection = origin.getOptionalConnection();
+        final Optional<Connection> connection = origin.getConnection();
         if (connection.isPresent()) {
             connection.get().addRaw();
         } else {

lagdisplay/src/com/dmdirc/addons/lagdisplay/LagDisplayManager.java

@@ -163,7 +163,7 @@ public class LagDisplayManager implements ConfigChangeListener {
     public void selectionChanged(final SwingWindowSelectedEvent event) {
         if (event.getWindow().isPresent()) {
             final Optional<Connection> connection = event.getWindow().get().getContainer()
-                    .getOptionalConnection();
+                    .getConnection();
             if (connection.isPresent() && connection.get().getState() != ServerState.CONNECTED) {
                 panel.getComponent().setText("Not connected");
             } else {
@@ -295,7 +295,7 @@ public class LagDisplayManager implements ConfigChangeListener {
 
     private boolean isActiveWindow(final Connection connection) {
         return activeFrameManager.getActiveFrame().map(TextFrame::getContainer)
-                .flatMap(FrameContainer::getOptionalConnection)
+                .flatMap(FrameContainer::getConnection)
                 .filter(connection::equals).isPresent();
     }
 

lagdisplay/src/com/dmdirc/addons/lagdisplay/PingHistoryPanel.java

@@ -66,7 +66,7 @@ public class PingHistoryPanel extends JPanel {
         this.manager = manager;
         if (activeFrameManager.getActiveFrame().isPresent()) {
             history = manager.getHistory(activeFrameManager.getActiveFrame().get().getContainer()
-                    .getOptionalConnection().orElse(null));
+                    .getConnection().orElse(null));
         } else {
             history = manager.getHistory(null);
         }

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

@@ -69,8 +69,8 @@ public class HistoryWindow extends FrameContainer {
     }
 
     @Override
-    public Optional<Connection> getOptionalConnection() {
-        return getParent().flatMap(FrameContainer::getOptionalConnection);
+    public Optional<Connection> getConnection() {
+        return getParent().flatMap(FrameContainer::getConnection);
     }
 
 }

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

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

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

@@ -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().getOptionalConnection().get().getNetwork();
+        final String network = event.getChannel().getConnection().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().getOptionalConnection().get().getNetwork();
+        final String network = event.getChannel().getConnection().get().getNetwork();
         colourClient(network, event.getClient());
     }
 

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

@@ -66,7 +66,7 @@ public class DebugWindow extends FrameContainer {
     }
 
     @Override
-    public Optional<Connection> getOptionalConnection() {
+    public Optional<Connection> getConnection() {
         return Optional.of(connection);
     }
 

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

@@ -99,8 +99,8 @@ public class FakeWriteableFrameContainer extends FrameContainer {
     }
 
     @Override
-    public Optional<Connection> getOptionalConnection() {
-        return target.getOptionalConnection();
+    public Optional<Connection> getConnection() {
+        return target.getConnection();
     }
 
 }

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

@@ -74,7 +74,7 @@ public class RedirectCommandTest {
 
     @Before
     public void setup() {
-        when(frameContainer.getOptionalConnection()).thenReturn(Optional.empty());
+        when(frameContainer.getConnection()).thenReturn(Optional.empty());
         when(commandController.getCommandChar()).thenReturn('/');
         when(commandController.getSilenceChar()).thenReturn('.');
         when(inputWindow.getContainer()).thenReturn(frameContainer);

ui_swing/src/com/dmdirc/addons/ui_swing/SwingLinkHandler.java

@@ -61,7 +61,7 @@ public class SwingLinkHandler {
     @Handler
     public void handleChannelClick(final LinkChannelClickedEvent event) {
         final FrameContainer container = event.getWindow().getContainer();
-        container.getOptionalConnection()
+        container.getConnection()
                 .ifPresent(c -> c.join(new ChannelJoinRequest(event.getTarget())));
     }
 
@@ -73,7 +73,7 @@ public class SwingLinkHandler {
     @Handler
     public void handleNicknameClick(final LinkNicknameClickedEvent event) {
         final FrameContainer container = event.getWindow().getContainer();
-        container.getOptionalConnection().ifPresent(c ->
+        container.getConnection().ifPresent(c ->
                 eventBus.publishAsync(new SwingActiveWindowChangeRequestEvent(Optional.ofNullable(
                         windowFactory.getSwingWindow(c.getQuery(event.getTarget()))))));
     }

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

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

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

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

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

@@ -118,7 +118,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
         eventBus.subscribe(this);
 
         identity = identityFactory.createChannelConfig(
-                owner.getOptionalConnection().get().getNetwork(),
+                owner.getConnection().get().getNetwork(),
                 owner.getChannelInfo().getName());
     }
 
@@ -214,7 +214,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
 
     @Override
     public void addCustomPopupItems(final JPopupMenu popupMenu) {
-        if (channel.getOptionalConnection().get().getState() == ServerState.CONNECTED) {
+        if (channel.getConnection().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().getOptionalConnection().get().getState() == ServerState.CONNECTED) {
+        if (getContainer().getConnection().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.getOptionalConnection().get());
+                dialogProvider.get(), container.getConnection().get());
         eventBus.subscribe(frame);
         return frame;
     }

ui_swing/src/com/dmdirc/addons/ui_swing/components/menubar/ChannelMenu.java

@@ -130,14 +130,14 @@ public class ChannelMenu extends JMenu implements MenuListener {
 
     private void doJoinChannel(final String text) {
         activeFrameManager.getActiveFrame()
-                .ifPresent(f -> f.getContainer().getOptionalConnection()
+                .ifPresent(f -> f.getContainer().getConnection()
                         .ifPresent(c -> c.join(new ChannelJoinRequest(text))));
     }
 
     @Override
     public final void menuSelected(final MenuEvent e) {
         final Optional<ServerState> activeConnectionState = activeFrameManager.getActiveFrame()
-                .map(TextFrame::getContainer).flatMap(FrameContainer::getOptionalConnection)
+                .map(TextFrame::getContainer).flatMap(FrameContainer::getConnection)
                 .map(Connection::getState);
         final boolean connected = activeConnectionState.equals(Optional.of(ServerState.CONNECTED));
 

ui_swing/src/com/dmdirc/addons/ui_swing/components/menubar/ServerMenu.java

@@ -104,7 +104,7 @@ public class ServerMenu extends JMenu implements MenuListener {
         disconnect.setMnemonic('d');
         disconnect.addActionListener(e -> activeFrameManager.getActiveFrame()
                 .map(TextFrame::getContainer)
-                .flatMap(FrameContainer::getOptionalConnection)
+                .flatMap(FrameContainer::getConnection)
                 .ifPresent(Connection::disconnect));
         add(disconnect);
 
@@ -112,7 +112,7 @@ public class ServerMenu extends JMenu implements MenuListener {
         ssd.setMnemonic('s');
         ssd.setText("Server settings");
         ssd.addActionListener(e -> activeFrameManager.getActiveFrame()
-                .ifPresent(f -> f.getContainer().getOptionalConnection()
+                .ifPresent(f -> f.getContainer().getConnection()
                         .ifPresent(ssdProvider::displayOrRequestFocus)));
         add(ssd);
 
@@ -128,7 +128,7 @@ public class ServerMenu extends JMenu implements MenuListener {
     @Override
     public final void menuSelected(final MenuEvent e) {
         final Optional<ServerState> activeConnectionState = activeFrameManager.getActiveFrame()
-                .map(TextFrame::getContainer).flatMap(FrameContainer::getOptionalConnection)
+                .map(TextFrame::getContainer).flatMap(FrameContainer::getConnection)
                 .map(Connection::getState);
         final boolean connected = activeConnectionState.equals(Optional.of(ServerState.CONNECTED));
 

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

ui_swing/src/com/dmdirc/addons/ui_swing/components/statusbar/InviteLabel.java

@@ -189,7 +189,7 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements InviteLi
     @Handler(invocation = EdtHandlerInvocation.class)
     public void selectionChanged(final SwingWindowSelectedEvent event) {
         if (event.getWindow().isPresent()) {
-            activeConnection = event.getWindow().get().getContainer().getOptionalConnection();
+            activeConnection = event.getWindow().get().getContainer().getConnection();
         } else {
             activeConnection = null;
         }

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channellist/ChannelListDialog.java

@@ -57,9 +57,9 @@ public class ChannelListDialog extends StandardDialog implements ActionListener
         total = new JLabel("No results.");
         if (activeFrameManager.getActiveFrame().isPresent()
                 && activeFrameManager.getActiveFrame().get().getContainer()
-                .getOptionalConnection().isPresent()) {
+                .getConnection().isPresent()) {
             list = new ChannelListPanel(activeFrameManager.getActiveFrame().get()
-                    .getContainer().getOptionalConnection().get(), total);
+                    .getContainer().getConnection().get(), total);
         } else {
             list = new JPanel();
         }

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

@@ -137,7 +137,7 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
         }
         listModesPanel = new JScrollPane();
         listModesPanels = new ArrayList<>();
-        listModesArray = channel.getOptionalConnection().get().getParser()
+        listModesArray = channel.getConnection().get().getParser()
                 .getListChannelModes().toCharArray();
         existingListItems = new MapList<>();
         listModesMenu = new JComboBox<>(new DefaultComboBoxModel<>());
@@ -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.getOptionalConnection().get().getParser().
+        final int maxModes = channel.getConnection().get().getParser().
                 getMaxListModes(listModesArray[selected]);
 
         if (maxModes == -1) {

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

@@ -135,7 +135,7 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
         this.colourManagerFactory = colourManagerFactory;
 
         identity = identityFactory.createChannelConfig(
-                channel.getOptionalConnection().get().getNetwork(),
+                channel.getConnection().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.getOptionalConnection().get().getParser().getMaxTopicLength();
+        topicLengthMax = channel.getConnection().get().getParser().getMaxTopicLength();
         this.channelWindow = channelWindow;
         this.eventBus = eventBus;
 

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

@@ -194,7 +194,7 @@ public class WindowStatusManager implements ConfigChangeListener {
     private String updateStatusQuery(final Query frame) {
         final StringBuilder textString = new StringBuilder();
         textString.append(frame.getHost());
-        final Optional<Connection> connection = frame.getOptionalConnection();
+        final Optional<Connection> connection = frame.getConnection();
         if (showname && connection.isPresent()) {
             final ClientInfo client = connection.get().getParser().getClient(frame.getHost());
             final String realname = client.getRealname();