Decouple Server from ServerManager.

SM now listens to frame closing events, so Server doesn't need
to hold on to a reference and inform it that it's closing.

src/com/dmdirc/Server.java

@@ -162,11 +162,9 @@ public class Server extends FrameContainer implements Connection {
     private StringConverter converter = new DefaultStringConverter();
     /** ParserFactory we use for creating parsers. */
     private final ParserFactory parserFactory;
-    /** ServerManager that created us. */
-    private final ServerManager manager;
     /** Factory to use to create new identities. */
     private final IdentityFactory identityFactory;
-    /** Window manager to pas to children. */
+    /** Window manager to pass to children. */
     private final WindowManager windowManager;
     /** The migrator to use to change our config provider. */
     private final ConfigProviderMigrator configMigrator;
@@ -193,7 +191,6 @@ public class Server extends FrameContainer implements Connection {
      * Creates a new server which will connect to the specified URL with the specified profile.
      */
     public Server(
-            final ServerManager manager,
             final ConfigProviderMigrator configMigrator,
             final CommandParser commandParser,
             final ParserFactory parserFactory,
@@ -228,7 +225,6 @@ public class Server extends FrameContainer implements Connection {
                         WindowComponent.INPUTFIELD.getIdentifier(),
                         WindowComponent.CERTIFICATE_VIEWER.getIdentifier()));
 
-        this.manager = manager;
         this.parserFactory = parserFactory;
         this.identityFactory = identityFactory;
         this.windowManager = windowManager;
@@ -885,8 +881,6 @@ public class Server extends FrameContainer implements Connection {
         closeQueries();
         removeInvites();
 
-        manager.unregisterServer(this);
-
         super.close();
     }
 

src/com/dmdirc/ServerFactoryImpl.java

@@ -46,7 +46,6 @@ import javax.inject.Singleton;
 @Singleton
 public class ServerFactoryImpl {
 
-    private final Provider<ServerManager> manager;
     private final ParserFactory parserFactory;
     private final TabCompleterFactory tabCompleterFactory;
     private final IdentityFactory identityFactory;
@@ -63,7 +62,6 @@ public class ServerFactoryImpl {
 
     @Inject
     public ServerFactoryImpl(
-            final Provider<ServerManager> manager,
             final ParserFactory parserFactory,
             final TabCompleterFactory tabCompleterFactory,
             final IdentityFactory identityFactory,
@@ -77,7 +75,6 @@ public class ServerFactoryImpl {
             @ClientModule.UserConfig final ConfigProvider userSettings,
             final BackBufferFactory backBufferFactory,
             final UserManager userManager) {
-        this.manager = manager;
         this.parserFactory = parserFactory;
         this.tabCompleterFactory = tabCompleterFactory;
         this.identityFactory = identityFactory;
@@ -99,7 +96,7 @@ public class ServerFactoryImpl {
             final ScheduledExecutorService executorService,
             final URI uri,
             final Profile profile) {
-        return new Server(manager.get(), configMigrator, commandParser, parserFactory,
+        return new Server(configMigrator, commandParser, parserFactory,
                 tabCompleterFactory, identityFactory, messageSinkManager, windowManager,
                 channelFactory.get(), queryFactory.get(), urlBuilder, eventBus,
                 messageEncoderFactory, userSettings, executorService, uri, profile,

src/com/dmdirc/ServerManager.java

@@ -25,6 +25,7 @@ package com.dmdirc;
 import com.dmdirc.commandparser.parsers.ServerCommandParser;
 import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.config.profiles.ProfileManager;
+import com.dmdirc.events.FrameClosingEvent;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
@@ -51,6 +52,8 @@ import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
 
+import net.engio.mbassy.listener.Handler;
+
 /**
  * The ServerManager maintains a list of all servers, and provides methods to search or iterate over
  * them.
@@ -97,6 +100,7 @@ public class ServerManager implements ConnectionManager {
         this.windowManager = windowManager;
         this.serverFactoryImpl = serverFactory;
         this.eventBus = eventBus;
+        this.eventBus.subscribe(this);
     }
 
     @Override
@@ -122,7 +126,7 @@ public class ServerManager implements ConnectionManager {
      *
      * @param server The server to be registered
      */
-    public void registerServer(final Server server) {
+    void registerServer(final Server server) {
         servers.add(server);
     }
 
@@ -132,7 +136,7 @@ public class ServerManager implements ConnectionManager {
      *
      * @param server The server to be unregistered
      */
-    public void unregisterServer(final Server server) {
+    void unregisterServer(final Server server) {
         servers.remove(server);
     }
 
@@ -219,4 +223,11 @@ public class ServerManager implements ConnectionManager {
         }
     }
 
+    @Handler
+    void handleWindowClosing(final FrameClosingEvent event) {
+        if (event.getContainer() instanceof Server) {
+            unregisterServer((Server) event.getContainer());
+        }
+    }
+
 }

test/com/dmdirc/ServerTest.java

@@ -54,7 +54,6 @@ import static org.mockito.Mockito.when;
 
 public class ServerTest {
 
-    @Mock private ServerManager serverManager;
     @Mock private Profile profile;
     @Mock private AggregateConfigProvider configManager;
     @Mock private ConfigBinder configBinder;
@@ -89,7 +88,6 @@ public class ServerTest {
                 Matchers.<CommandType>anyVararg())).thenReturn(tabCompleter);
 
         server = new Server(
-                serverManager,
                 configMigrator,
                 commandParser,
                 parserFactory,