More deprecation fixes

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

nbproject/project.properties

@@ -10,6 +10,7 @@ auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=
 auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none
 auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.allowConvertToStarImport=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.countForUsingStaticStarImport=1
 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.importGroupsOrder=com.dmdirc;java;javax;org;*;static *
 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.separateStaticImports=true
 endorsed.classpath=

src/com/dmdirc/Main.java

@@ -108,12 +108,12 @@ public final class Main {
         // Enable finer debugging for specific components like so:
         //java.util.logging.Logger.getLogger("com.dmdirc.plugins").setLevel(Level.ALL);
 
-        IdentityManager.loadVersion();
+        IdentityManager.getIdentityManager().loadVersionIdentity();
 
         final CommandLineParser clp = new CommandLineParser(args);
 
         try {
-            IdentityManager.load();
+            IdentityManager.getIdentityManager().initialise();
         } catch (InvalidIdentityFileException iife) {
             handleInvalidConfigFile();
         }
@@ -231,7 +231,7 @@ public final class Main {
 
         if (configFile.renameTo(newConfigFile)) {
             try {
-                IdentityManager.load();
+                IdentityManager.getIdentityManager().initialise();
             } catch (InvalidIdentityFileException iife2) {
                 // This shouldn't happen!
                 Logger.appError(ErrorLevel.FATAL, "Unable to load global config", iife2);

test/com/dmdirc/ServerManagerTest.java

@@ -23,21 +23,21 @@
 package com.dmdirc;
 
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.addons.ui_dummy.DummyController;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.plugins.PluginManager;
 
 import org.junit.After;
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
 public class ServerManagerTest {
-        
+
     @BeforeClass
     public static void setUp() throws Exception {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
         Main.ensureExists(PluginManager.getPluginManager(), "tabcompletion");
     }
 
@@ -47,28 +47,28 @@ public class ServerManagerTest {
             ServerManager.getServerManager().unregisterServer(server);
         }
     }
-    
+
     @Test
     public void testGetServerManager() {
         final ServerManager resultA = ServerManager.getServerManager();
         final ServerManager resultB = ServerManager.getServerManager();
-        
+
         assertNotNull(resultA);
         assertTrue(resultA instanceof ServerManager);
         assertEquals(resultA, resultB);
     }
-    
+
     @Test
     public void testRegisterServer() {
         final Server server = mock(Server.class);
-        
+
         final ServerManager instance = ServerManager.getServerManager();
 
         instance.registerServer(server);
-        
+
         assertEquals(1, instance.numServers());
     }
-    
+
     @Test
     public void testUnregisterServer() {
         final Server server = mock(Server.class);
@@ -77,44 +77,44 @@ public class ServerManagerTest {
 
         instance.registerServer(server);
         instance.unregisterServer(server);
-        
+
         assertEquals(0, instance.numServers());
     }
-    
+
     @Test
     public void testNumServers() {
         final ServerManager instance = ServerManager.getServerManager();
-        
+
         assertEquals(instance.getServers().size(), instance.numServers());
-        
+
         final Server server = mock(Server.class);
 
         instance.registerServer(server);
-        
+
         assertEquals(instance.getServers().size(), instance.numServers());
-        
+
         instance.unregisterServer(server);
-        
+
         assertEquals(instance.getServers().size(), instance.numServers());
     }
-        
+
     @Test
     public void testGetServerByAddress() {
         final Server serverA = mock(Server.class);
         final Server serverB = mock(Server.class);
         when(serverA.getAddress()).thenReturn("255.255.255.255");
         when(serverB.getAddress()).thenReturn("255.255.255.254");
-        
+
         final ServerManager sm = ServerManager.getServerManager();
 
         sm.registerServer(serverA);
         sm.registerServer(serverB);
-        
+
         assertEquals(serverA, sm.getServersByAddress("255.255.255.255").get(0));
         assertEquals(serverB, sm.getServersByAddress("255.255.255.254").get(0));
         assertEquals(0, sm.getServersByAddress("255.255.255.253").size());
-    }    
-    
+    }
+
     @Test
     public void testGetServerByNetwork() throws InterruptedException {
         final Server serverA = mock(Server.class);
@@ -124,20 +124,20 @@ public class ServerManagerTest {
         when(serverA.isNetwork("Net1")).thenReturn(true);
         when(serverB.isNetwork("Net2")).thenReturn(true);
         when(serverC.isNetwork("Net2")).thenReturn(true);
-        
+
         final ServerManager sm = ServerManager.getServerManager();
 
         sm.registerServer(serverA);
         sm.registerServer(serverB);
         sm.registerServer(serverC);
-        
+
         assertEquals(1, sm.getServersByNetwork("Net1").size());
         assertEquals(serverA, sm.getServersByNetwork("Net1").get(0));
-        
+
         assertEquals(2, sm.getServersByNetwork("Net2").size());
         assertEquals(serverB, sm.getServersByNetwork("Net2").get(0));
         assertEquals(serverC, sm.getServersByNetwork("Net2").get(1));
-        
+
         assertEquals(0, sm.getServersByNetwork("Net3").size());
     }
 
@@ -210,5 +210,5 @@ public class ServerManagerTest {
 
         assertEquals(3, ServerManager.getServerManager().numServers());
     }
-    
+
 }

test/com/dmdirc/ServerTest.java

@@ -25,8 +25,10 @@ package com.dmdirc;
 import com.dmdirc.config.IdentityManager;
 
 import java.net.URI;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class ServerTest {
@@ -36,7 +38,7 @@ public class ServerTest {
     @BeforeClass
     public static void setUp() throws Exception {
         Main.extractCorePlugins("tabcompletion_");
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
         server = new Server(new URI("irc-test://255.255.255.255"),
                 IdentityManager.getCustomIdentities("profile").get(0));
         server.connect();

test/com/dmdirc/WritableFrameContainerTest.java

@@ -25,18 +25,19 @@ package com.dmdirc;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.harness.TestWritableFrameContainer;
-import com.dmdirc.interfaces.ui.InputWindow;
 
 import java.util.Arrays;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class WritableFrameContainerTest {
 
     @BeforeClass
     public static void setupClass() throws InvalidIdentityFileException {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
     }
 
     @Test

test/com/dmdirc/actions/ActionComponentChainTest.java

@@ -27,13 +27,14 @@ import com.dmdirc.config.IdentityManager;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class ActionComponentChainTest {
 
     @BeforeClass
     public static void setUp() throws Exception {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
         ActionManager.getActionManager().initialise();
     }
 

test/com/dmdirc/actions/ActionConditionTest.java

@@ -26,13 +26,14 @@ import com.dmdirc.config.IdentityManager;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class ActionConditionTest {
 
     @BeforeClass
     public static void setUp() throws Exception {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
         ActionManager.getActionManager().initialise();
     }
 
@@ -91,7 +92,7 @@ public class ActionConditionTest {
         ac.setArg(0);
         assertEquals(0, ac.getArg());
     }
-    
+
     @Test
     public void testToString() {
         final ActionCondition ac1 = new ActionCondition("foobarbaz",
@@ -113,11 +114,11 @@ public class ActionConditionTest {
         assertFalse(ac1.equals(null));
         assertFalse(ac1.equals("foo"));
         assertEquals(ac1.hashCode(), ac2.hashCode());
-        
+
         ac2.setStarget("bar");
         assertFalse(ac2.equals(ac1));
         assertFalse(ac1.equals(ac2));
-        
+
         ac2.setStarget("foobarbaz");
         ac2.setComponent(CoreActionComponent.STRING_STRING);
         ac2.setArg(1);

test/com/dmdirc/actions/ActionManagerTest.java

@@ -21,21 +21,23 @@
  */
 package com.dmdirc.actions;
 
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.config.IdentityManager;
-import java.io.File;
+import com.dmdirc.interfaces.actions.ActionType;
 
+import java.io.File;
 import java.util.ArrayList;
+
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class ActionManagerTest {
 
     @BeforeClass
     public static void setUpClass() throws Exception {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
         ActionManager.getActionManager().initialise();
         ActionManager.getActionManager().loadUserActions();
 

test/com/dmdirc/actions/ActionModelTest.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.actions;
 
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
+import com.dmdirc.interfaces.actions.ActionType;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -32,13 +32,14 @@ import java.util.List;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class ActionModelTest {
 
     @BeforeClass
     public static void setUpClass() throws InvalidIdentityFileException {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
     }
 
     @Test

test/com/dmdirc/actions/ActionSubstitutorTest.java

@@ -39,14 +39,15 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import static org.junit.Assert.*;
+
+import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.*;
 
 @RunWith(Parameterized.class)
 public class ActionSubstitutorTest {
 
     private static final Map<String, String> SETTINGS = new HashMap<String, String>();
-    
+
     private final String input, expected;
     private final Channel channel;
     private final ActionSubstitutor substitutor;
@@ -54,7 +55,7 @@ public class ActionSubstitutorTest {
 
     @BeforeClass
     public static void setup() throws InvalidIdentityFileException {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
         ActionManager.getActionManager().initialise();
 
         SETTINGS.put("alpha", "A");
@@ -69,7 +70,7 @@ public class ActionSubstitutorTest {
         this.expected = expected;
 
         this.channel = mock(Channel.class);
-        
+
         final ConfigManager manager = mock(ConfigManager.class);
         final Server server = mock(Server.class);
 
@@ -122,7 +123,7 @@ public class ActionSubstitutorTest {
             // ---- Combinations -----------------------------------------------
             {"${1}${2.STRING_LENGTH}$alpha", "128A"},
             {"$alpha$4${SERVER_MYAWAYREASON}", "Afourth_word_herefoo"},
-            
+
             // -- New behaviour ------------------------------------------------
             // ---- Config subs ------------------------------------------------
             {"${alpha}", "A"},

test/com/dmdirc/actions/ActionTest.java

@@ -21,11 +21,10 @@
  */
 package com.dmdirc.actions;
 
-import com.dmdirc.interfaces.actions.ActionType;
-
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.util.io.ConfigFile;
 import com.dmdirc.util.io.InvalidConfigFileException;
 
@@ -34,16 +33,16 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class ActionTest {
 
     @BeforeClass
     public static void setUp() throws Exception {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
         ActionManager.getActionManager().initialise();
     }
 

test/com/dmdirc/actions/wrappers/AliasWrapperTest.java

@@ -27,22 +27,23 @@ import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.CoreActionComparison;
 import com.dmdirc.actions.CoreActionComponent;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
+import com.dmdirc.interfaces.actions.ActionType;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class AliasWrapperTest {
 
     @BeforeClass
     public static void setupClass() throws InvalidIdentityFileException {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
     }
 
     @Test

test/com/dmdirc/commandparser/CommandArgumentsTest.java

@@ -22,20 +22,21 @@
 
 package com.dmdirc.commandparser;
 
-import java.util.Arrays;
-
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 
+import java.util.Arrays;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class CommandArgumentsTest {
 
     @BeforeClass
     public static void beforeClass() throws InvalidIdentityFileException {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
     }
 
     /** Ensures the ctor which takes a collection builds the 'line' property. */

test/com/dmdirc/commandparser/commands/HelpTest.java

@@ -29,18 +29,20 @@ import com.dmdirc.config.InvalidIdentityFileException;
 
 import java.util.LinkedList;
 import java.util.List;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import static org.junit.Assert.*;
+
+import static org.junit.Assert.assertTrue;
 
 @RunWith(Parameterized.class)
 public class HelpTest {
 
     @BeforeClass
     public static void setUpClass() throws Exception {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
     }
 
     private CommandInfo info;

test/com/dmdirc/commandparser/commands/channel/BanTest.java

@@ -22,24 +22,25 @@
 
 package com.dmdirc.commandparser.commands.channel;
 
-import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import static org.mockito.Mockito.*;
 
 public class BanTest {
 
     @BeforeClass
     public static void setUpClass() throws Exception {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
     }
 
     private final Ban command = new Ban();

test/com/dmdirc/commandparser/commands/channel/KickReasonTest.java

@@ -24,22 +24,23 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.config.ConfigManager;
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.parser.irc.IRCChannelClientInfo;
 import com.dmdirc.parser.irc.IRCChannelInfo;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import static org.mockito.Mockito.*;
 
 public class KickReasonTest {
 
     @BeforeClass
     public static void setUpClass() throws Exception {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
     }
 
     private final KickReason command = new KickReason();

test/com/dmdirc/commandparser/commands/channel/ModeTest.java

@@ -33,8 +33,8 @@ import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
 
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
+
 import static org.mockito.Mockito.*;
 
 public class ModeTest {
@@ -45,11 +45,6 @@ public class ModeTest {
     private Server server;
     private IRCParser parser;
 
-    @BeforeClass
-    public static void setUpClass() throws InvalidIdentityFileException {
-        IdentityManager.load();
-    }
-
     @Before
     public void setUp() throws InvalidIdentityFileException {
         IdentityManager.load();

test/com/dmdirc/commandparser/commands/channel/NamesTest.java

@@ -32,8 +32,8 @@ import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.parser.irc.IRCParser;
 
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
+
 import static org.mockito.Mockito.*;
 
 public class NamesTest {
@@ -44,14 +44,9 @@ public class NamesTest {
     private Server server;
     private IRCParser parser;
 
-    @BeforeClass
-    public static void setUpClass() throws InvalidIdentityFileException {
-        IdentityManager.load();
-    }
-
     @Before
     public void setUp() throws InvalidIdentityFileException {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
 
         parser = mock(IRCParser.class);
         server = mock(Server.class);

test/com/dmdirc/commandparser/commands/channel/PartTest.java

@@ -31,8 +31,8 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
+
 import static org.mockito.Mockito.*;
 
 public class PartTest {
@@ -42,14 +42,9 @@ public class PartTest {
     private FrameContainer origin;
     private ConfigManager manager;
 
-    @BeforeClass
-    public static void setUpClass() throws InvalidIdentityFileException {
-        IdentityManager.load();
-    }
-
     @Before
     public void setUp() throws InvalidIdentityFileException {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
 
         channel = mock(Channel.class);
         origin = mock(FrameContainer.class);

test/com/dmdirc/commandparser/commands/channel/SetNickColourTest.java

@@ -26,10 +26,12 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.config.IdentityManager;
-import org.junit.Before;
 
+import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+
+import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 public class SetNickColourTest {
@@ -38,7 +40,7 @@ public class SetNickColourTest {
 
     @BeforeClass
     public static void setUpClass() throws Exception {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
     }
 
     @Before

test/com/dmdirc/commandparser/commands/chat/MeTest.java

@@ -26,10 +26,12 @@ import com.dmdirc.MessageTarget;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.config.IdentityManager;
-import org.junit.Before;
 
+import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+
+import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 public class MeTest {
@@ -39,7 +41,7 @@ public class MeTest {
 
     @BeforeClass
     public static void setUpClass() throws Exception {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
     }
 
     @Before

test/com/dmdirc/commandparser/commands/flags/CommandFlagHandlerTest.java

@@ -21,23 +21,26 @@
  */
 package com.dmdirc.commandparser.commands.flags;
 
-import com.dmdirc.config.InvalidIdentityFileException;
-import java.util.Map;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.config.InvalidIdentityFileException;
+
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+
 import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
 
 @RunWith(Parameterized.class)
 public class CommandFlagHandlerTest {
-    
+
     private static final CommandFlag noArgsFlag1 = new CommandFlag("noargs1");
     private static final CommandFlag noArgsFlag2 = new CommandFlag("noargs2", false);
     private static final CommandFlag noArgsFlag3 = new CommandFlag("noargs3");
@@ -47,35 +50,35 @@ public class CommandFlagHandlerTest {
     private static final CommandFlag defArgsFlag1 = new CommandFlag("defargs1", true, 0, 1);
     private static final CommandFlag defArgsFlag2 = new CommandFlag("defargs2", true, 0, 2);
     private final CommandFlagHandler handler;
-    
+
     private final String input;
     private final CommandFlag[] flags;
     private final int[] offsets;
-    
+
     @BeforeClass
     public static void setupClass() throws InvalidIdentityFileException {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
     }
-    
+
     public CommandFlagHandlerTest(String input, CommandFlag[] flags, int[] offsets) {
         noArgsFlag3.addEnabled(noArgsFlag4);
         noArgsFlag3.addDisabled(noArgsFlag1);
 
         handler = new CommandFlagHandler(noArgsFlag1, noArgsFlag2, noArgsFlag3,
                 noArgsFlag4, immArgsFlag1, immArgsFlag2, defArgsFlag1, defArgsFlag2);
-        
+
         this.input = input;
         this.flags = flags;
         this.offsets = offsets;
     }
-    
+
     @Test
     public void testParse() {
         final FrameContainer container = mock(FrameContainer.class);
-        
+
         final Map<CommandFlag, Integer> results
                 = handler.parse(container, new CommandArguments(input));
-        
+
         if (flags == null) {
             assertNull("Command should fail: " + input, results);
         } else {
@@ -137,6 +140,6 @@ public class CommandFlagHandlerTest {
         };
 
         return Arrays.asList(tests);
-    }    
+    }
 
 }

test/com/dmdirc/commandparser/commands/global/AliasCommandTest.java

@@ -28,6 +28,8 @@ import com.dmdirc.config.IdentityManager;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
+
+import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 public class AliasCommandTest {
@@ -36,7 +38,7 @@ public class AliasCommandTest {
 
     @BeforeClass
     public static void setUpClass() throws Exception {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
     }
 
     @Test

test/com/dmdirc/commandparser/commands/global/IfpluginTest.java

@@ -28,6 +28,7 @@ import com.dmdirc.config.IdentityManager;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import static org.mockito.Mockito.*;
 
 public class IfpluginTest {
@@ -36,7 +37,7 @@ public class IfpluginTest {
 
     @BeforeClass
     public static void setUpClass() throws Exception {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
     }
 
     @Test

test/com/dmdirc/commandparser/commands/global/NewServerTest.java

@@ -21,26 +21,28 @@
  */
 package com.dmdirc.commandparser.commands.global;
 
-import com.dmdirc.Server;
-import com.dmdirc.config.Identity;
-import java.net.URI;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ServerFactory;
+
+import java.net.URI;
 import java.net.URISyntaxException;
 
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import static org.mockito.Mockito.*;
 
 public class NewServerTest {
 
     @BeforeClass
     public static void setUpClass() throws Exception {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
     }
 
     private FrameContainer container;

test/com/dmdirc/commandparser/commands/server/ChangeServerTest.java

@@ -30,9 +30,11 @@ import com.dmdirc.config.IdentityManager;
 
 import java.net.URI;
 import java.net.URISyntaxException;
+
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import static org.mockito.Mockito.*;
 
 public class ChangeServerTest {
@@ -44,7 +46,7 @@ public class ChangeServerTest {
 
     @BeforeClass
     public static void setUpClass() throws Exception {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
     }
 
     @Before

test/com/dmdirc/commandparser/parsers/GlobalCommandParserTest.java

@@ -23,24 +23,26 @@
 package com.dmdirc.commandparser.parsers;
 
 import com.dmdirc.config.IdentityManager;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
-import static org.junit.Assert.*;
+
+import static org.junit.Assert.assertSame;
 
 public class GlobalCommandParserTest {
-    
+
     @BeforeClass
     public static void setUp() throws Exception {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
     }
 
     @Test
     public void testGetGlobalCommandParser() {
         final GlobalCommandParser p1 = GlobalCommandParser.getGlobalCommandParser();
-        
+
         final GlobalCommandParser p2 = GlobalCommandParser.getGlobalCommandParser();
-        
+
         assertSame(p1, p2);
     }
-    
+
 }

test/com/dmdirc/config/CipherUtilsTest.java

@@ -23,29 +23,31 @@
 package com.dmdirc.config;
 
 import com.dmdirc.harness.TestCipherUtils;
+
 import org.junit.Before;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class CipherUtilsTest {
-    
+
     @Before
     public void setUp() throws Exception {
-        IdentityManager.load();
-    }    
+        IdentityManager.getIdentityManager().initialise();
+    }
 
     @Test
     public void testEncryptDecrypt() {
         final String source = "DMDirc unit test {}!";
         final CipherUtils utils = new TestCipherUtils();
-        
+
         final String encrypted = utils.encrypt(source);
         assertNotNull(encrypted);
-        
+
         final String decrypted = utils.decrypt(encrypted);
         assertNotNull(decrypted);
-        
+
         assertEquals(source, decrypted);
     }
-    
+
 }

test/com/dmdirc/config/prefs/PreferencesManagerTest.java

@@ -21,30 +21,27 @@
  */
 package com.dmdirc.config.prefs;
 
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.Main;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ActionListener;
-
 import com.dmdirc.plugins.PluginManager;
-import com.dmdirc.interfaces.ui.UIController;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
 public class PreferencesManagerTest {
 
-    private static UIController controller;
-
     @BeforeClass
     public static void setUp() throws Exception {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
         Main.extractCorePlugins("ui_");
         PluginManager.getPluginManager();
-        controller = mock(UIController.class);
     }
 
     @Test
@@ -106,7 +103,7 @@ public class PreferencesManagerTest {
     public void testGetCategory() {
         ConfigManager cm = mock(ConfigManager.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
-        
+
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null, null, null, cm, null);
         assertNull(pm.getCategory("unittest123"));
     }

test/com/dmdirc/config/prefs/PreferencesSettingTest.java

@@ -40,7 +40,7 @@ public class PreferencesSettingTest {
 
     @BeforeClass
     public static void setUp() throws Exception {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
     }
 
     @Test(expected=IllegalArgumentException.class)

test/com/dmdirc/config/validators/URLProtocolValidatorTest.java

@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2006-2011 DMDirc Developers
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -28,18 +28,18 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 
 public class URLProtocolValidatorTest {
-    
+
     @Test
     public void testValidate() throws InvalidIdentityFileException {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
         IdentityManager.getConfigIdentity().setOption("protocol", "unit-test-1", "BROWSER");
-        
+
         final URLProtocolValidator validator = new URLProtocolValidator();
         assertTrue(validator.validate(null).isFailure());
         assertTrue(validator.validate("").isFailure());
         assertTrue(validator.validate("unit-test-1").isFailure());
         assertFalse(validator.validate("unit-test-2").isFailure());
-        
+
         IdentityManager.getConfigIdentity().unsetOption("protocol", "unit-test-1");
     }
 

test/com/dmdirc/logger/DMDircExceptionHandlerTest.java

@@ -22,25 +22,27 @@
 package com.dmdirc.logger;
 
 import com.dmdirc.config.IdentityManager;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
-import static org.junit.Assert.*;
+
+import static org.junit.Assert.assertEquals;
 
 public class DMDircExceptionHandlerTest {
 
     @BeforeClass
     public static void setUpClass() throws Exception {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
     }
 
     @Test
     public void testUncaughtException() {
         final DMDircExceptionHandler eh = new DMDircExceptionHandler();
-        
+
         final int initial = ErrorManager.getErrorManager().getErrorCount();
-        
+
         eh.uncaughtException(null, new Exception());
-        
+
         assertEquals(initial + 1, ErrorManager.getErrorManager().getErrorCount());
     }
 

test/com/dmdirc/logger/ProgramErrorTest.java

@@ -23,17 +23,20 @@ package com.dmdirc.logger;
 
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
+
 import java.util.Arrays;
 import java.util.Date;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class ProgramErrorTest {
-    
+
     @BeforeClass
     public static void setup() throws InvalidIdentityFileException {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
     }
 
     @Test
@@ -169,7 +172,7 @@ public class ProgramErrorTest {
         pe.setReportStatus(ErrorReportStatus.ERROR);
         assertEquals(ErrorReportStatus.ERROR, pe.getReportStatus());
     }
-    
+
     @Test
     public void testFixedStatus() {
         final ProgramError pe = new ProgramError(1, ErrorLevel.HIGH, "moo",
@@ -182,14 +185,14 @@ public class ProgramErrorTest {
         pe.setFixedStatus(ErrorFixedStatus.INVALID);
         assertEquals(ErrorFixedStatus.INVALID, pe.getFixedStatus());
     }
-    
+
     @Test
     public void testToString() {
         final ProgramError pe = new ProgramError(1, ErrorLevel.HIGH, "moo",
                 new String[0], new Date());
         assertTrue(pe.toString().indexOf("moo") > -1);
     }
-    
+
     @Test
     public void testEquals() {
         final ProgramError pe1 = new ProgramError(10, ErrorLevel.LOW, "moo",
@@ -202,20 +205,20 @@ public class ProgramErrorTest {
                 new String[0], new Date());
         final ProgramError pe5 = new ProgramError(10, ErrorLevel.LOW, "moo",
                 new String[]{"Hello"}, new Date());
-        
+
         assertFalse(pe1.equals(null));
         assertFalse(pe1.equals("moo"));
-        
+
         assertTrue(pe1.equals(pe2));
         assertTrue(pe1.equals(pe1));
         assertTrue(pe2.equals(pe1));
-        
+
         assertFalse(pe1.equals(pe3));
         assertFalse(pe1.equals(pe4));
         assertFalse(pe1.equals(pe5));
         assertFalse(pe4.equals(pe5));
         assertFalse(pe4.equals(pe3));
-        
+
         assertEquals(pe1.hashCode(), pe2.hashCode());
         assertEquals(pe1.hashCode(), pe1.hashCode());
     }

test/com/dmdirc/ui/WindowManagerTest.java

@@ -22,22 +22,23 @@
 package com.dmdirc.ui;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.harness.TestWritableFrameContainer;
 import com.dmdirc.addons.ui_dummy.DummyInputWindow;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
+import com.dmdirc.harness.TestWritableFrameContainer;
 import com.dmdirc.interfaces.ui.FrameListener;
 import com.dmdirc.interfaces.ui.Window;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import static org.mockito.Mockito.*;
 
 public class WindowManagerTest {
 
     @BeforeClass
     public static void setupClass() throws InvalidIdentityFileException {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
     }
 
     @Test

test/com/dmdirc/ui/messages/ColourManagerTest.java

@@ -22,18 +22,19 @@
 
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.ui.Colour;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.ui.Colour;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class ColourManagerTest {
 
     @BeforeClass
     public static void setUp() throws Exception {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
     }
 
     @Test

test/com/dmdirc/ui/messages/IntelligentLinkingTest.java

@@ -26,21 +26,24 @@ import com.dmdirc.Server;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
+
 import java.util.Arrays;
 import java.util.List;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
 @RunWith(Parameterized.class)
 public class IntelligentLinkingTest {
-    
+
     private final String input, expected;
     private final Styliser styliser;
-    
+
     public IntelligentLinkingTest(String input, String expected) {
         this.input = input;
         this.expected = expected;
@@ -51,15 +54,15 @@ public class IntelligentLinkingTest {
         when(server.getChannelPrefixes()).thenReturn("#&+");
         when(container.getServer()).thenReturn(server);
         when(container.getConfigManager()).thenReturn(manager);
-        
+
         styliser = new Styliser(container);
     }
-    
+
     @BeforeClass
     public static void setUp() throws InvalidIdentityFileException {
-        IdentityManager.load();
-    }    
-    
+        IdentityManager.getIdentityManager().initialise();
+    }
+
     @Test
     public void testLink() throws InterruptedException {
         assertEquals(expected, styliser.doLinks(input)
@@ -117,6 +120,6 @@ public class IntelligentLinkingTest {
         };
 
         return Arrays.asList(tests);
-    }    
+    }
 
 }

test/com/dmdirc/ui/messages/StyliserStylesTest.java

@@ -27,17 +27,21 @@ import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.ui.core.util.Utils;
+
 import java.awt.Color;
 import java.awt.font.TextAttribute;
 import java.text.AttributedCharacterIterator;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+
 import javax.swing.text.DefaultStyledDocument;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
@@ -53,14 +57,14 @@ public class StyliserStylesTest {
 
     @BeforeClass
     public static void setUp() throws InvalidIdentityFileException {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
     }
-        
+
     @Test
     public void testStyle() {
         assertEquals(output, style(input));
     }
-    
+
     protected static String style(final String input) {
         final DefaultStyledDocument doc = new DefaultStyledDocument();
         final StringBuilder builder = new StringBuilder();
@@ -74,36 +78,36 @@ public class StyliserStylesTest {
         final AttributedCharacterIterator aci = Utils.getAttributedString(styliser,
                 new String[]{input, }, "dialog", 12).
                 getAttributedString().getIterator();
-         
+
         Map<AttributedCharacterIterator.Attribute, Object> map = null;
         char chr = aci.current();
-        
+
         while (aci.getIndex() < aci.getEndIndex()) {
-            if (!aci.getAttributes().equals(map)) {                
+            if (!aci.getAttributes().equals(map)) {
                 style(aci.getAttributes(), builder);
                 map = aci.getAttributes();
             }
-            
+
             builder.append(chr);
             chr = aci.next();
         }
-        
+
         return builder.toString();
     }
-    
+
     protected static void style(final Map<AttributedCharacterIterator.Attribute, Object> map,
-            final StringBuilder builder) {                    
+            final StringBuilder builder) {
         builder.append('<');
-        
+
         String[] entries = new String[9];
-        
+
         for (Map.Entry<AttributedCharacterIterator.Attribute, Object> entry : map.entrySet()) {
-        
+
             if (entry.getKey().equals(TextAttribute.FOREGROUND)) {
                 entries[0] = "color=" + toColour(entry.getValue());
             } else if (entry.getKey().equals(TextAttribute.BACKGROUND)) {
                 entries[1] = "background=" + toColour(entry.getValue());
-            } else if (entry.getKey().equals(TextAttribute.WEIGHT)) { 
+            } else if (entry.getKey().equals(TextAttribute.WEIGHT)) {
                 entries[2] = "bold";
             } else if (entry.getKey().equals(TextAttribute.FAMILY)
                     && entry.getValue().equals("monospaced")) {
@@ -120,7 +124,7 @@ public class StyliserStylesTest {
                 entries[8] = "nickname";
             }
         }
-        
+
         int count = 0;
         for (String entry : entries) {
             if (entry != null) {
@@ -129,20 +133,20 @@ public class StyliserStylesTest {
                 count++;
             }
         }
-        
+
         if (count > 0) {
             builder.deleteCharAt(builder.length() - 1);
         }
         builder.append('>');
     }
-    
+
     protected static String toColour(final Object object) {
         final Color colour = (Color) object;
-        
+
         return colour.getRed() + "," + colour.getGreen() + ","
                 + colour.getBlue();
     }
-    
+
     @Parameterized.Parameters
     public static List<String[]> data() {
         final String[][] tests = {
@@ -197,6 +201,6 @@ public class StyliserStylesTest {
         };
 
         return Arrays.asList(tests);
-    } 
+    }
 
 }

test/com/dmdirc/ui/messages/StyliserTest.java

@@ -26,9 +26,12 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
+
 import java.util.Enumeration;
+
 import org.junit.Before;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
@@ -36,7 +39,7 @@ public class StyliserTest {
 
     @Before
     public void setUp() throws InvalidIdentityFileException {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
     }
 
     @Test

test/com/dmdirc/updater/UpdateTest.java

@@ -24,20 +24,22 @@ package com.dmdirc.updater;
 
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.updater.components.ClientComponent;
+
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class UpdateTest {
 
     @BeforeClass
     public static void setUpClass() throws Exception {
-        IdentityManager.load();
+        IdentityManager.getIdentityManager().initialise();
     }
-    
+
     private static final String SUBJECT = "outofdate client channel date version url";
-    
+
     private Update update;
 
     @Before
@@ -60,5 +62,5 @@ public class UpdateTest {
     public void testGetUrl() {
         assertEquals("url", update.getUrl());
     }
-    
+
 }