Tidy up.

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

@@ -89,7 +89,7 @@ public abstract class DCCFrameContainer extends FrameContainer {
     }
 
     @Override
-    public Optional<Connection> getOptionalConnection() { //NOPMD - server will always be null
+    public Optional<Connection> getOptionalConnection() {
         return Optional.empty();
     }
 

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

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

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

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