Add getOptionalConnection

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

@@ -33,6 +33,7 @@ import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
 import java.util.Collection;
+import java.util.Optional;
 
 import javax.annotation.Nullable;
 
@@ -87,6 +88,11 @@ public abstract class DCCFrameContainer extends FrameContainer {
         return null;
     }
 
+    @Override
+    public Optional<Connection> getOptionalConnection() { //NOPMD - server will always be null
+        return Optional.empty();
+    }
+
     /**
      * Is the window closing?
      *

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

@@ -33,6 +33,7 @@ import com.dmdirc.util.URLBuilder;
 import java.awt.Dialog.ModalityType;
 import java.awt.Window;
 import java.util.Collections;
+import java.util.Optional;
 
 /**
  * Creates a placeholder DCC Frame.
@@ -95,6 +96,11 @@ public class PlaceholderContainer extends FrameContainer {
         return null;
     }
 
+    @Override
+    public Optional<Connection> getOptionalConnection() {
+        return Optional.empty();
+    }
+
     @Override
     public void removeChild(final FrameContainer child) {
         super.removeChild(child);

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

@@ -41,6 +41,7 @@ import java.awt.Desktop;
 import java.io.File;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.Optional;
 
 import javax.swing.JOptionPane;
 
@@ -369,4 +370,9 @@ public class TransferContainer extends FrameContainer implements
         return null;
     }
 
+    @Override
+    public Optional<Connection> getOptionalConnection() {
+        return Optional.empty();
+    }
+
 }

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

@@ -81,4 +81,10 @@ public class HistoryWindow extends FrameContainer {
         return parent.isPresent() ? parent.get().getConnection() : null;
     }
 
+    @Override
+    public Optional<Connection> getOptionalConnection() {
+        final Optional<FrameContainer> parent = getParent();
+        return Optional.ofNullable(parent.isPresent() ? parent.get().getConnection() : null);
+    }
+
 }

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

@@ -32,6 +32,7 @@ import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.util.URLBuilder;
 
 import java.util.Arrays;
+import java.util.Optional;
 
 /**
  * This class is used to show the parser debug in a window
@@ -81,6 +82,11 @@ public class DebugWindow extends FrameContainer {
         return connection;
     }
 
+    @Override
+    public Optional<Connection> getOptionalConnection() {
+        return Optional.of(connection);
+    }
+
     /**
      * Set the parser to null to stop us holding onto parsers when the server connection is closed.
      */

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

@@ -32,6 +32,7 @@ import com.dmdirc.util.URLBuilder;
 
 import java.util.Collections;
 import java.util.Date;
+import java.util.Optional;
 
 /**
  * Implements a fake input window, which sends echoed text to the specified chat window instead.
@@ -107,4 +108,9 @@ public class FakeWriteableFrameContainer extends FrameContainer {
         return target.getConnection();
     }
 
+    @Override
+    public Optional<Connection> getOptionalConnection() {
+        return Optional.of(target.getConnection());
+    }
+
 }