Remove getConnection().

src/com/dmdirc/Channel.java

@@ -549,7 +549,6 @@ public class Channel extends MessageTarget implements GroupChat {
         listenerList.remove(TopicChangeListener.class, listener);
     }
 
-    @Override
     @Deprecated
     @Nonnull
     public Connection getConnection() {

src/com/dmdirc/CustomWindow.java

@@ -64,12 +64,6 @@ public class CustomWindow extends FrameContainer {
                 eventBus, Collections.singletonList(WindowComponent.TEXTAREA.getIdentifier()));
     }
 
-    @Override
-    @Deprecated
-    public Connection getConnection() {
-        return getOptionalConnection().orElse(null);
-    }
-
     @Override
     public Optional<Connection> getOptionalConnection() {
         return getParent().flatMap(FrameContainer::getOptionalConnection);

src/com/dmdirc/FrameContainer.java

@@ -344,16 +344,6 @@ public abstract class FrameContainer {
         getBackBuffer().stopAddingEvents();
     }
 
-    /**
-     * Returns the connection that this container is associated with.
-     *
-     * @deprecated Use {@link #getOptionalConnection()}
-     * @return the associated connection, or {@code null}.
-     */
-    @Nullable
-    @Deprecated
-    public abstract Connection getConnection();
-
     /**
      * Returns the connection that this container is associated with.
      *

src/com/dmdirc/GlobalWindow.java

@@ -63,12 +63,6 @@ public class GlobalWindow extends FrameContainer {
                         WindowComponent.INPUTFIELD.getIdentifier()));
     }
 
-    @Override
-    @Deprecated
-    public Connection getConnection() {
-        return null;
-    }
-
     @Override
     public Optional<Connection> getOptionalConnection() {
         return Optional.empty();

src/com/dmdirc/Query.java

@@ -287,7 +287,6 @@ public class Query extends MessageTarget implements PrivateActionListener,
     }
 
     @Nonnull
-    @Override
     @Deprecated
     public Connection getConnection() {
         return server;

src/com/dmdirc/Raw.java

@@ -40,8 +40,6 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.Optional;
 
-import javax.annotation.Nonnull;
-
 /**
  * Handles the raw window (which shows the user raw data being sent and received to/from the
  * server).
@@ -113,13 +111,6 @@ public class Raw extends FrameContainer implements DataInListener, DataOutListen
         addLine("rawOut", data);
     }
 
-    @Nonnull
-    @Deprecated
-    @Override
-    public Connection getConnection() {
-        return server;
-    }
-
     @Override
     public Optional<Connection> getOptionalConnection() {
         return Optional.of(server);

src/com/dmdirc/Server.java

@@ -94,7 +94,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.net.ssl.SSLException;
 import javax.net.ssl.TrustManager;
@@ -1038,13 +1037,6 @@ public class Server extends FrameContainer implements ConfigChangeListener,
         }
     }
 
-    @Nonnull
-    @Deprecated
-    @Override
-    public Connection getConnection() {
-        return this;
-    }
-
     @Override
     public Optional<Connection> getOptionalConnection() {
         return Optional.of(this);

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -68,12 +68,6 @@ public class TestWritableFrameContainer extends FrameContainer {
         return lineLength;
     }
 
-    @Override
-    @Deprecated
-    public Connection getConnection() {
-        return null;
-    }
-
     @Override
     public Optional<Connection> getOptionalConnection() {
         return Optional.empty();