Use new InviteManager iface.

Delete the duplicated methods from Connection.

src/com/dmdirc/Channel.java

@@ -231,7 +231,7 @@ public class Channel extends MessageTarget implements GroupChat {
         checkWho();
         setIcon("channel");
 
-        connection.removeInvites(channelInfo.getName());
+        connection.getInviteManager().removeInvites(channelInfo.getName());
     }
 
     /**

src/com/dmdirc/GroupChatManagerImpl.java

@@ -115,7 +115,7 @@ public class GroupChatManagerImpl implements GroupChatManager {
             final Collection<ChannelJoinRequest> pending = new ArrayList<>();
 
             for (ChannelJoinRequest request : requests) {
-                connection.removeInvites(request.getName());
+                connection.getInviteManager().removeInvites(request.getName());
 
                 final String name;
                 if (p.isValidChannelName(request.getName())) {

src/com/dmdirc/Invite.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc;
 
-import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.InviteManager;
 import com.dmdirc.interfaces.User;
 
 import java.util.Date;
@@ -32,8 +32,8 @@ import java.util.Date;
  */
 public class Invite {
 
-    /** The connection this invite was on. */
-    private final Connection connection;
+    /** The manager associated with this invite. */
+    private final InviteManager inviteManager;
     /** The channel this invite is for. */
     private final String channel;
     /** The time this invite was created. */
@@ -44,12 +44,12 @@ public class Invite {
     /**
      * Creates a new instance of Invite.
      *
-     * @param connection The connection that this invite was received on
+     * @param inviteManager The manager that this invite is associated with.
      * @param channel    The channel that this invite is for
      * @param source     The source of this invite
      */
-    public Invite(final Connection connection, final String channel, final User source) {
-        this.connection = connection;
+    public Invite(final InviteManager inviteManager, final String channel, final User source) {
+        this.inviteManager = inviteManager;
         this.channel = channel;
         this.source = source;
         this.timestamp = new Date().getTime();
@@ -76,14 +76,14 @@ public class Invite {
      * Join the channel that belongs to this invite.
      */
     public void accept() {
-        connection.acceptInvites(this);
+        inviteManager.acceptInvites(this);
     }
 
     /**
      * Decline this invite removing it from the invite list.
      */
     public void decline() {
-        connection.removeInvite(this);
+        inviteManager.removeInvite(this);
     }
 
 }

src/com/dmdirc/ServerEventHandler.java

@@ -500,7 +500,7 @@ public class ServerEventHandler extends EventHandler implements
             final String channel) {
         checkParser(parser);
 
-        owner.addInvite(new Invite(owner, channel, owner.getUser(userHost)));
+        owner.getInviteManager().addInvite(new Invite(owner, channel, owner.getUser(userHost)));
         final ServerInviteReceivedEvent event = new ServerInviteReceivedEvent(owner,
                 owner.getUser(userHost), channel);
         final String format = EventUtils.postDisplayable(eventBus, event, "inviteReceived");

src/com/dmdirc/interfaces/Connection.java

@@ -23,7 +23,6 @@
 package com.dmdirc.interfaces;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Invite;
 import com.dmdirc.Query;
 import com.dmdirc.ServerState;
 import com.dmdirc.ServerStatus;
@@ -35,7 +34,6 @@ import com.dmdirc.parser.interfaces.Parser;
 import java.net.URI;
 import java.util.Collection;
 import java.util.Date;
-import java.util.List;
 import java.util.Optional;
 
 import javax.annotation.Nonnull;
@@ -45,29 +43,6 @@ import javax.annotation.Nonnull;
  */
 public interface Connection {
 
-    /**
-     * Attempts to accept the specified invites, and join the corresponding channels.
-     *
-     * @param invites The invites to process
-     *
-     * @since 0.6.4
-     */
-    void acceptInvites(final Invite... invites);
-
-    /**
-     * Attempts to accept all active invites for this server, and join the corresponding channels.
-     *
-     * @since 0.6.4
-     */
-    void acceptInvites();
-
-    /**
-     * Adds an invite to this server, and fires the appropriate listeners.
-     *
-     * @param invite The invite to be added
-     */
-    void addInvite(final Invite invite);
-
     /**
      * Passes the arguments to all frames for this server.
      *
@@ -146,13 +121,6 @@ public interface Connection {
      */
     IgnoreList getIgnoreList();
 
-    /**
-     * Returns the list of invites for this server.
-     *
-     * @return Invite list
-     */
-    List<Invite> getInvites();
-
     /**
      * Retrieves the name of this server's IRCd.
      *
@@ -309,25 +277,6 @@ public interface Connection {
      */
     void reconnect();
 
-    /**
-     * Removes an invite from this server, and fires the appropriate listeners.
-     *
-     * @param invite The invite to be removed
-     */
-    void removeInvite(final Invite invite);
-
-    /**
-     * Removes all invites for the specified channel.
-     *
-     * @param channel The channel to remove invites for
-     */
-    void removeInvites(final String channel);
-
-    /**
-     * Removes all invites for all channels.
-     */
-    void removeInvites();
-
     /**
      * Saves the contents of our ignore list to the network identity.
      */

test/com/dmdirc/InviteTest.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc;
 
+import com.dmdirc.interfaces.InviteManager;
 import com.dmdirc.interfaces.User;
 
 import java.util.Date;
@@ -40,7 +41,7 @@ import static org.mockito.Mockito.verify;
 public class InviteTest {
 
     @Mock
-    private Server server;
+    private InviteManager inviteManager;
     @Mock
     private User user;
     private Invite invite;
@@ -48,7 +49,7 @@ public class InviteTest {
 
     @Before
     public void setUp() {
-        invite = new Invite(server, "#channel", user);
+        invite = new Invite(inviteManager, "#channel", user);
         ts = new Date().getTime();
     }
 
@@ -71,13 +72,13 @@ public class InviteTest {
     @Test
     public void testAccept() {
         invite.accept();
-        verify(server).acceptInvites(invite);
+        verify(inviteManager).acceptInvites(invite);
     }
 
     @Test
     public void testDecline() {
         invite.decline();
-        verify(server).removeInvite(invite);
+        verify(inviteManager).removeInvite(invite);
     }
 
 }