Fix some singleton references.

Change-Id: I3246495eb2e40231177d4ae14faec70252409ec2
Reviewed-on: http://gerrit.dmdirc.com/2728
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/Server.java

@@ -29,11 +29,11 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.Identity;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.AwayStateListener;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.IdentityFactory;
 import com.dmdirc.interfaces.InviteListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -109,10 +109,10 @@ public class Server extends WritableFrameContainer
     // <editor-fold defaultstate="collapsed" desc="Instance">
 
     /** Open channels that currently exist on the server. */
-    private final Map<String, Channel> channels = new ConcurrentSkipListMap<String, Channel>();
+    private final Map<String, Channel> channels = new ConcurrentSkipListMap<>();
 
     /** Open query windows on the server. */
-    private final Map<String, Query> queries = new ConcurrentSkipListMap<String, Query>();
+    private final Map<String, Query> queries = new ConcurrentSkipListMap<>();
 
     /** The Parser instance handling this server. */
     private Parser parser;
@@ -163,10 +163,10 @@ public class Server extends WritableFrameContainer
     private final ServerEventHandler eventHandler = new ServerEventHandler(this);
 
     /** A list of outstanding invites. */
-    private final List<Invite> invites = new ArrayList<Invite>();
+    private final List<Invite> invites = new ArrayList<>();
 
     /** A set of channels we want to join without focusing. */
-    private final Set<String> backgroundChannels = new HashSet<String>();
+    private final Set<String> backgroundChannels = new HashSet<>();
 
     /** Our ignore list. */
     private final IgnoreList ignoreList = new IgnoreList();
@@ -183,6 +183,9 @@ public class Server extends WritableFrameContainer
     /** ServerManager that created us. */
     private final ServerManager manager;
 
+    /** Factory to use to create new identities. */
+    private final IdentityFactory identityFactory;
+
     // </editor-fold>
 
     // </editor-fold>
@@ -201,6 +204,7 @@ public class Server extends WritableFrameContainer
      * @param windowManager The window manager to register this server with.
      * @param aliasWrapper The actions wrapper to retrieve aliases from.
      * @param commandController The controller to use to retrieve commands.
+     * @param identityFactory The factory to use to create identities.
      * @param uri The address of the server to connect to
      * @param profile The profile to use
      */
@@ -212,6 +216,7 @@ public class Server extends WritableFrameContainer
             final WindowManager windowManager,
             final AliasWrapper aliasWrapper,
             final CommandController commandController,
+            final IdentityFactory identityFactory,
             final URI uri,
             final Identity profile) {
         super("server-disconnected",
@@ -225,6 +230,7 @@ public class Server extends WritableFrameContainer
 
         this.manager = manager;
         this.parserFactory = parserFactory;
+        this.identityFactory = identityFactory;
         setConnectionDetails(uri, profile);
 
         manager.registerServer(this);
@@ -517,7 +523,7 @@ public class Server extends WritableFrameContainer
     /** {@inheritDoc} */
     @Override
     public List<String> getChannels() {
-        return new ArrayList<String>(channels.keySet());
+        return new ArrayList<>(channels.keySet());
     }
 
     /** {@inheritDoc} */
@@ -651,7 +657,7 @@ public class Server extends WritableFrameContainer
      * Closes all open channel windows associated with this server.
      */
     private void closeChannels() {
-        for (Channel channel : new ArrayList<Channel>(channels.values())) {
+        for (Channel channel : new ArrayList<>(channels.values())) {
             channel.close();
         }
     }
@@ -669,7 +675,7 @@ public class Server extends WritableFrameContainer
      * Closes all open query windows associated with this server.
      */
     private void closeQueries() {
-        for (Query query : new ArrayList<Query>(queries.values())) {
+        for (Query query : new ArrayList<>(queries.values())) {
             query.close();
         }
     }
@@ -858,7 +864,7 @@ public class Server extends WritableFrameContainer
     public void join(final boolean focus, final ChannelJoinRequest ... requests) {
         synchronized (myStateLock) {
             if (myState.getState() == ServerState.CONNECTED) {
-                final List<ChannelJoinRequest> pending = new ArrayList<ChannelJoinRequest>();
+                final List<ChannelJoinRequest> pending = new ArrayList<>();
 
                 for (ChannelJoinRequest request : requests) {
                     removeInvites(request.getName());
@@ -1453,7 +1459,7 @@ public class Server extends WritableFrameContainer
 
             converter = parser.getStringConverter();
 
-            final List<ChannelJoinRequest> requests = new ArrayList<ChannelJoinRequest>();
+            final List<ChannelJoinRequest> requests = new ArrayList<>();
             if (getConfigManager().getOptionBool(DOMAIN_GENERAL, "rejoinchannels")) {
                 for (Channel chan : channels.values()) {
                     requests.add(new ChannelJoinRequest(chan.getName()));
@@ -1547,13 +1553,13 @@ public class Server extends WritableFrameContainer
     /** {@inheritDoc} */
     @Override
     public Identity getServerIdentity() {
-        return IdentityManager.getIdentityManager().createServerConfig(parser.getServerName());
+        return identityFactory.createServerConfig(parser.getServerName());
     }
 
     /** {@inheritDoc} */
     @Override
     public Identity getNetworkIdentity() {
-        return IdentityManager.getIdentityManager().createNetworkConfig(getNetwork());
+        return identityFactory.createNetworkConfig(getNetwork());
     }
 
     // </editor-fold>
@@ -1580,7 +1586,7 @@ public class Server extends WritableFrameContainer
     @Override
     public void addInvite(final Invite invite) {
         synchronized (invites) {
-            for (Invite oldInvite : new ArrayList<Invite>(invites)) {
+            for (Invite oldInvite : new ArrayList<>(invites)) {
                 if (oldInvite.getChannel().equals(invite.getChannel())) {
                     removeInvite(oldInvite);
                 }
@@ -1619,7 +1625,7 @@ public class Server extends WritableFrameContainer
     /** {@inheritDoc} */
     @Override
     public void removeInvites(final String channel) {
-        for (Invite invite : new ArrayList<Invite>(invites)) {
+        for (Invite invite : new ArrayList<>(invites)) {
             if (invite.getChannel().equals(channel)) {
                 removeInvite(invite);
             }
@@ -1629,7 +1635,7 @@ public class Server extends WritableFrameContainer
     /** {@inheritDoc} */
     @Override
     public void removeInvites() {
-        for (Invite invite : new ArrayList<Invite>(invites)) {
+        for (Invite invite : new ArrayList<>(invites)) {
             removeInvite(invite);
         }
     }

src/com/dmdirc/ServerManager.java

@@ -28,6 +28,7 @@ import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.Identity;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.IdentityController;
+import com.dmdirc.interfaces.IdentityFactory;
 import com.dmdirc.interfaces.ServerFactory;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -64,6 +65,9 @@ public class ServerManager implements ServerFactory {
     /** A provider of {@link CommandController}s to pass to servers. */
     private final Provider<CommandController> commandController;
 
+    /** The identity factory to give to servers. */
+    private final IdentityFactory identityFactory;
+
     /**
      * Creates a new instance of ServerManager.
      *
@@ -75,9 +79,11 @@ public class ServerManager implements ServerFactory {
     public ServerManager(
             final Provider<ParserFactory> parserFactoryProvider,
             final IdentityController identityController,
+            final IdentityFactory identityFactory,
             final Provider<CommandController> commandController) {
         this.parserFactoryProvider = parserFactoryProvider;
         this.identityController = identityController;
+        this.identityFactory = identityFactory;
         this.commandController = commandController;
     }
 
@@ -94,6 +100,7 @@ public class ServerManager implements ServerFactory {
                 WindowManager.getWindowManager(),
                 AliasWrapper.getAliasWrapper(),
                 commandController.get(),
+                identityFactory,
                 uri,
                 profile);
     }

src/com/dmdirc/config/IdentityManager.java

@@ -605,6 +605,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
      *
      * @return A singleton instance of the IdentityManager.
      */
+    @Deprecated
     public static IdentityManager getIdentityManager() {
         return instance;
     }
@@ -614,7 +615,8 @@ public class IdentityManager implements IdentityFactory, IdentityController {
      *
      * @param identityManager The identity manager to use.
      */
-    public static void setIdentityManager(IdentityManager identityManager) {
+    @Deprecated
+    public static void setIdentityManager(final IdentityManager identityManager) {
         instance = identityManager;
     }
 

test/com/dmdirc/ServerManagerTest.java

@@ -24,6 +24,7 @@ package com.dmdirc;
 
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.IdentityController;
+import com.dmdirc.interfaces.IdentityFactory;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 
 import javax.inject.Provider;
@@ -43,6 +44,7 @@ import static org.mockito.Mockito.*;
 public class ServerManagerTest {
 
     @Mock private IdentityController identityController;
+    @Mock private IdentityFactory identityFactory;
     @Mock private Provider<ParserFactory> parserFactoryProvider;
     @Mock private Provider<CommandController> commandControllerProvider;
     private ServerManager serverManager;
@@ -50,7 +52,7 @@ public class ServerManagerTest {
     @Before
     public void setUp() throws Exception {
         serverManager = new ServerManager(parserFactoryProvider,
-                identityController, commandControllerProvider);
+                identityController, identityFactory, commandControllerProvider);
     }
 
     @After

test/com/dmdirc/ServerTest.java

@@ -27,6 +27,7 @@ import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.Identity;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.IdentityFactory;
 import com.dmdirc.ui.WindowManager;
 
 import java.net.URI;
@@ -34,7 +35,6 @@ import java.net.URI;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 
 import static org.mockito.Mockito.*;
@@ -47,6 +47,7 @@ public class ServerTest {
     @Mock private ConfigManager configManager;
     @Mock private CommandParser commandParser;
     @Mock private ParserFactory parserFactory;
+    @Mock private IdentityFactory identityFactory;
     @Mock private WindowManager windowManager;
     @Mock private AliasWrapper aliasWrapper;
     @Mock private CommandController commandController;
@@ -67,6 +68,7 @@ public class ServerTest {
                 windowManager,
                 aliasWrapper,
                 commandController,
+                identityFactory,
                 new URI("irc-test://255.255.255.255"),
                 profile);
     }