Import fixing!

Change-Id: Ia90cb759b0777cf8d30eb6bfe30a5bece0105d24
Reviewed-on: http://gerrit.dmdirc.com/2281
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/BasicServerFactory.java

@@ -24,6 +24,7 @@ package com.dmdirc;
 
 import com.dmdirc.config.Identity;
 import com.dmdirc.interfaces.ServerFactory;
+
 import java.net.URI;
 
 /**

src/com/dmdirc/FrameContainer.java

@@ -36,8 +36,8 @@ import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.Formatter;
 import com.dmdirc.ui.messages.IRCDocument;
 import com.dmdirc.ui.messages.Styliser;
-
 import com.dmdirc.util.collections.ListenerList;
+
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;

src/com/dmdirc/Main.java

@@ -29,6 +29,7 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
+import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.logger.DMDircExceptionHandler;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -38,7 +39,6 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.Service;
 import com.dmdirc.plugins.ServiceProvider;
 import com.dmdirc.ui.WarningDialog;
-import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.Version;
@@ -165,7 +165,7 @@ public final class Main {
                 ActionManager.getActionManager().triggerEvent(
                         CoreActionType.CLIENT_CLOSED, null);
                 ServerManager.getServerManager().disconnectAll("Unexpected shutdown");
-                IdentityManager.save();
+                IdentityManager.getIdentityManager().saveAll();
             }
         }, "Shutdown thread"));
     }

src/com/dmdirc/Server.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc;
 
-import com.dmdirc.interfaces.Connection;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.wrappers.AliasWrapper;
@@ -34,6 +33,7 @@ import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.AwayStateListener;
 import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.InviteListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -1487,13 +1487,13 @@ public class Server extends WritableFrameContainer
     /** {@inheritDoc} */
     @Override
     public Identity getServerIdentity() {
-        return IdentityManager.getServerConfig(parser.getServerName());
+        return IdentityManager.getIdentityManager().createServerConfig(parser.getServerName());
     }
 
     /** {@inheritDoc} */
     @Override
     public Identity getNetworkIdentity() {
-        return IdentityManager.getNetworkConfig(getNetwork());
+        return IdentityManager.getIdentityManager().createNetworkConfig(getNetwork());
     }
 
     // </editor-fold>

src/com/dmdirc/WritableFrameContainer.java

@@ -23,9 +23,9 @@
 package com.dmdirc;
 
 import com.dmdirc.actions.ActionManager;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.parser.common.CompositionState;
 import com.dmdirc.ui.input.TabCompleter;

src/com/dmdirc/actions/Action.java

@@ -22,13 +22,13 @@
 
 package com.dmdirc.actions;
 
-import com.dmdirc.interfaces.actions.ActionComparison;
-import com.dmdirc.interfaces.actions.ActionComponent;
-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.ConfigChangeListener;
+import com.dmdirc.interfaces.actions.ActionComparison;
+import com.dmdirc.interfaces.actions.ActionComponent;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.updater.Version;

src/com/dmdirc/actions/ActionManager.java

@@ -22,19 +22,19 @@
 
 package com.dmdirc.actions;
 
-import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.Main;
 import com.dmdirc.Precondition;
-import com.dmdirc.interfaces.actions.ActionComparison;
-import com.dmdirc.interfaces.actions.ActionComponent;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.actions.internal.WhoisNumericFormatter;
 import com.dmdirc.actions.wrappers.AliasWrapper;
 import com.dmdirc.actions.wrappers.PerformWrapper;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.interfaces.IdentityController;
+import com.dmdirc.interfaces.actions.ActionComparison;
+import com.dmdirc.interfaces.actions.ActionComponent;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.updater.components.ActionGroupComponent;

src/com/dmdirc/actions/ActionModel.java

@@ -25,9 +25,9 @@ package com.dmdirc.actions;
 import com.dmdirc.Precondition;
 import com.dmdirc.ServerManager;
 import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
+import com.dmdirc.interfaces.actions.ActionType;
 
 import java.util.ArrayList;
 import java.util.Arrays;

src/com/dmdirc/actions/ActionSubstitutor.java

@@ -26,11 +26,11 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Precondition;
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
-import com.dmdirc.interfaces.actions.ActionComponent;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.actions.ActionComponent;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.ui.Window;
 
 import java.util.Arrays;

src/com/dmdirc/actions/CoreActionComponent.java

@@ -26,13 +26,13 @@ import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
-import com.dmdirc.interfaces.actions.ActionComponent;
 import com.dmdirc.config.Identity;
+import com.dmdirc.interfaces.actions.ActionComponent;
+import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.messages.Styliser;
 

src/com/dmdirc/actions/CoreActionType.java

@@ -22,8 +22,6 @@
 
 package com.dmdirc.actions;
 
-import com.dmdirc.interfaces.actions.ActionMetaType;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.actions.metatypes.ActionEvents;
 import com.dmdirc.actions.metatypes.ChannelEvents;
 import com.dmdirc.actions.metatypes.ClientEvents;
@@ -31,6 +29,8 @@ import com.dmdirc.actions.metatypes.LinkEvents;
 import com.dmdirc.actions.metatypes.PluginEvents;
 import com.dmdirc.actions.metatypes.QueryEvents;
 import com.dmdirc.actions.metatypes.ServerEvents;
+import com.dmdirc.interfaces.actions.ActionMetaType;
+import com.dmdirc.interfaces.actions.ActionType;
 
 /**
  * An enumeration of actions that are raised by the core.

src/com/dmdirc/actions/internal/WhoisNumericFormatter.java

@@ -25,9 +25,9 @@ package com.dmdirc.actions.internal;
 import com.dmdirc.Server;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.config.Identity;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.actions.ActionType;
 
 import java.util.HashMap;
 import java.util.Map;

src/com/dmdirc/actions/metatypes/ClientEvents.java

@@ -23,12 +23,12 @@
 package com.dmdirc.actions.metatypes;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.interfaces.actions.ActionMetaType;
 import com.dmdirc.commandparser.PopupMenu;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
+import com.dmdirc.interfaces.actions.ActionMetaType;
 
 import javax.swing.KeyStroke;
 import javax.swing.text.StyledDocument;

src/com/dmdirc/commandparser/commands/chat/Me.java

@@ -24,8 +24,8 @@ package com.dmdirc.commandparser.commands.chat;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.MessageTarget;
-import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;

src/com/dmdirc/commandparser/commands/global/SaveConfig.java

@@ -47,7 +47,7 @@ public final class SaveConfig extends Command implements IntelligentCommand {
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        IdentityManager.save();
+        IdentityManager.getIdentityManager().saveAll();
 
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Configuration file saved.");
     }

src/com/dmdirc/commandparser/commands/server/JoinChannelCommand.java

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -36,6 +35,7 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.messages.Styliser;

src/com/dmdirc/commandparser/commands/server/Message.java

@@ -24,8 +24,8 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
-import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;

src/com/dmdirc/commandparser/commands/server/OpenQuery.java

@@ -25,8 +25,8 @@ package com.dmdirc.commandparser.commands.server;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
-import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandManager;

src/com/dmdirc/config/ConfigManager.java

@@ -413,7 +413,8 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
             }
         }
 
-        final List<Identity> newSources = IdentityManager.getSources(this);
+        final List<Identity> newSources = IdentityManager.getIdentityManager()
+                .getIdentitiesForManager(this);
         for (Identity identity : newSources) {
             LOGGER.fine("Testing new identity: " + identity);
             checkIdentity(identity);

src/com/dmdirc/config/Identity.java

@@ -26,9 +26,9 @@ import com.dmdirc.Main;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.util.collections.WeakList;
 import com.dmdirc.util.io.ConfigFile;
 import com.dmdirc.util.io.InvalidConfigFileException;
-import com.dmdirc.util.collections.WeakList;
 import com.dmdirc.util.validators.Validator;
 
 import java.io.File;

src/com/dmdirc/config/IdentityManager.java

@@ -22,17 +22,17 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.interfaces.IdentityFactory;
-import com.dmdirc.interfaces.IdentityController;
 import com.dmdirc.Main;
 import com.dmdirc.Precondition;
+import com.dmdirc.interfaces.IdentityController;
+import com.dmdirc.interfaces.IdentityFactory;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.updater.Version;
-import com.dmdirc.util.io.ConfigFile;
-import com.dmdirc.util.io.InvalidConfigFileException;
 import com.dmdirc.util.collections.MapList;
 import com.dmdirc.util.collections.WeakMapList;
+import com.dmdirc.util.io.ConfigFile;
+import com.dmdirc.util.io.InvalidConfigFileException;
 import com.dmdirc.util.resourcemanager.ResourceManager;
 
 import java.io.File;

src/com/dmdirc/interfaces/NotificationListener.java

@@ -23,8 +23,8 @@
 package com.dmdirc.interfaces;
 
 import com.dmdirc.FrameContainer;
-
 import com.dmdirc.ui.Colour;
+
 import java.util.EventListener;
 
 /**

src/com/dmdirc/interfaces/ServerFactory.java

@@ -24,6 +24,7 @@ package com.dmdirc.interfaces;
 
 import com.dmdirc.Server;
 import com.dmdirc.config.Identity;
+
 import java.net.URI;
 
 /**

src/com/dmdirc/plugins/PluginManager.java

@@ -25,10 +25,10 @@ package com.dmdirc.plugins;
 import com.dmdirc.Main;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.updater.components.PluginComponent;

src/com/dmdirc/ui/WindowManager.java

@@ -25,9 +25,9 @@ package com.dmdirc.ui;
 import com.dmdirc.CustomWindow;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Precondition;
+import com.dmdirc.interfaces.ui.FrameListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.interfaces.ui.FrameListener;
 import com.dmdirc.util.collections.ListenerList;
 
 import java.util.Collection;

src/com/dmdirc/ui/core/components/StatusBarManager.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.ui.core.components;
 
-import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.interfaces.ui.StatusBar;
 import com.dmdirc.interfaces.ui.StatusBarComponent;
+import com.dmdirc.ui.StatusMessage;
 
 import java.util.Collection;
 import java.util.concurrent.CopyOnWriteArraySet;

src/com/dmdirc/ui/input/InputHandler.java

@@ -33,12 +33,12 @@ import com.dmdirc.commandparser.commands.ValidatingCommand;
 import com.dmdirc.commandparser.commands.WrappableCommand;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.ui.InputField;
+import com.dmdirc.interfaces.ui.InputValidationListener;
 import com.dmdirc.parser.common.CompositionState;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.tabstyles.TabCompletionResult;
 import com.dmdirc.ui.input.tabstyles.TabCompletionStyle;
-import com.dmdirc.interfaces.ui.InputField;
-import com.dmdirc.interfaces.ui.InputValidationListener;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.collections.ListenerList;
 import com.dmdirc.util.collections.RollingList;

src/com/dmdirc/updater/Update.java

@@ -25,9 +25,9 @@ package com.dmdirc.updater;
 import com.dmdirc.Main;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.util.collections.WeakList;
 import com.dmdirc.util.io.DownloadListener;
 import com.dmdirc.util.io.Downloader;
-import com.dmdirc.util.collections.WeakList;
 
 import java.io.IOException;
 import java.util.List;

src/com/dmdirc/updater/UpdateChecker.java

@@ -30,8 +30,8 @@ import com.dmdirc.logger.Logger;
 import com.dmdirc.updater.components.ClientComponent;
 import com.dmdirc.updater.components.DefaultsComponent;
 import com.dmdirc.updater.components.ModeAliasesComponent;
-import com.dmdirc.util.io.Downloader;
 import com.dmdirc.util.collections.ListenerList;
+import com.dmdirc.util.io.Downloader;
 
 import java.io.IOException;
 import java.net.MalformedURLException;

test/com/dmdirc/DummyTest.java

@@ -23,6 +23,7 @@
 package com.dmdirc;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class DummyTest {

test/com/dmdirc/InviteTest.java

@@ -26,8 +26,8 @@ import java.util.Date;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
-import static org.junit.Assert.*;
 
+import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
 public class InviteTest {
@@ -35,7 +35,7 @@ public class InviteTest {
     private static Server server;
     private static Invite test;
     private static long ts;
-    
+
     @BeforeClass
     public static void setUp() throws Exception {
         server = mock(Server.class);

test/com/dmdirc/ServerStatusTest.java

@@ -23,9 +23,10 @@
 package com.dmdirc;
 
 import com.dmdirc.parser.interfaces.Parser;
+
 import org.junit.Test;
-import static org.junit.Assert.*;
 
+import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
 public class ServerStatusTest {

test/com/dmdirc/TopicTest.java

@@ -23,6 +23,7 @@
 package com.dmdirc;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class TopicTest {
@@ -42,13 +43,13 @@ public class TopicTest {
     @Test
     public void testGetTopic() {
         final Topic test = new Topic("abc", "123!456@789", 1);
-        assertEquals("abc", test.getTopic());        
+        assertEquals("abc", test.getTopic());
     }
 
     @Test
     public void testToString() {
         final Topic test = new Topic("abc", "123!456@789", 1);
-        assertEquals("abc", test.toString());        
+        assertEquals("abc", test.toString());
     }
 
 }

test/com/dmdirc/actions/ActionComparisonNamesTest.java

@@ -23,11 +23,14 @@
 package com.dmdirc.actions;
 
 import com.dmdirc.interfaces.actions.ActionComparison;
+
 import java.util.LinkedList;
 import java.util.List;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+
 import static org.junit.Assert.*;
 
 @RunWith(Parameterized.class)

test/com/dmdirc/actions/ActionGroupTest.java

@@ -23,7 +23,9 @@ package com.dmdirc.actions;
 
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.updater.Version;
+
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
@@ -33,7 +35,7 @@ public class ActionGroupTest {
     public void testGetAuthor() {
         ActionGroup instance = new ActionGroup("moo");
         instance.setAuthor("foo");
-        
+
         String expResult = "foo";
         String result = instance.getAuthor();
         assertEquals(expResult, result);
@@ -43,7 +45,7 @@ public class ActionGroupTest {
     public void testGetDescription() {
         ActionGroup instance = new ActionGroup("bar");
         instance.setDescription("Tra-la-la-la-la");
-                
+
         String expResult = "Tra-la-la-la-la";
         String result = instance.getDescription();
         assertEquals(expResult, result);
@@ -52,7 +54,7 @@ public class ActionGroupTest {
     @Test
     public void testGetName() {
         ActionGroup instance = new ActionGroup("foobar");
-        
+
         String expResult = "foobar";
         String result = instance.getName();
         assertEquals(expResult, result);
@@ -61,9 +63,9 @@ public class ActionGroupTest {
     @Test
     public void testGetSettings() {
         ActionGroup instance = new ActionGroup("foo");
-        
+
         assertTrue(instance.getSettings().isEmpty());
-        
+
         instance.getSettings().put("", mock(PreferencesSetting.class));
         assertEquals(1, instance.getSettings().size());
     }
@@ -72,7 +74,7 @@ public class ActionGroupTest {
     public void testGetVersion() {
         ActionGroup instance = new ActionGroup("vtest");
         instance.setVersion(new Version(73));
-        
+
         Version expResult = new Version(73);
         Version result = instance.getVersion();
         assertEquals(expResult, result);
@@ -82,12 +84,12 @@ public class ActionGroupTest {
     public void testGetComponent() {
         ActionGroup instance = new ActionGroup("zzz");
         instance.setComponent(69);
-        
+
         int expResult = 69;
         int result = instance.getComponent();
         assertEquals(expResult, result);
     }
-    
+
     @Test
     public void testClear() {
         ActionGroup instance = new ActionGroup("zzz");
@@ -96,7 +98,7 @@ public class ActionGroupTest {
         instance.clear();
         assertEquals(0, instance.size());
     }
-    
+
     @Test
     public void testRemove() {
         ActionGroup instance = new ActionGroup("zzz");
@@ -113,8 +115,8 @@ public class ActionGroupTest {
         assertTrue(instance.contains(null));
         instance.remove(null);
         assertFalse(instance.contains(null));
-    }    
-    
+    }
+
     @Test
     public void testIsDelible() {
         assertTrue(new ActionGroup("foo").isDelible());

test/com/dmdirc/actions/ActionSubstitutorTest.java

@@ -40,7 +40,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 @RunWith(Parameterized.class)

test/com/dmdirc/actions/ActionTypeComparatorTest.java

@@ -22,6 +22,7 @@
 package com.dmdirc.actions;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class ActionTypeComparatorTest {
@@ -29,7 +30,7 @@ public class ActionTypeComparatorTest {
     @Test
     public void testCompare() {
         final ActionTypeComparator atc = new ActionTypeComparator();
-        
+
         assertTrue(atc.compare(CoreActionType.CHANNEL_ACTION, CoreActionType.QUERY_ACTION) < 0);
         assertTrue(atc.compare(CoreActionType.CHANNEL_ACTION, CoreActionType.CHANNEL_ACTION) == 0);
         assertTrue(atc.compare(CoreActionType.QUERY_ACTION, CoreActionType.CHANNEL_ACTION) > 0);

test/com/dmdirc/actions/ConditionTreeEvaluatorTest.java

@@ -28,6 +28,7 @@ import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+
 import static org.junit.Assert.*;
 
 @RunWith(Parameterized.class)

test/com/dmdirc/actions/ConditionTreeParserTest.java

@@ -28,6 +28,7 @@ import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+
 import static org.junit.Assert.*;
 
 @RunWith(Parameterized.class)

test/com/dmdirc/actions/ConditionTreeTest.java

@@ -23,86 +23,87 @@
 package com.dmdirc.actions;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class ConditionTreeTest {
-        
+
     @Test
     public void testGetNumArgs() {
         final String target = "((0&1&2)|3)&(!4)";
         final ConditionTree tree = ConditionTree.parseString(target);
         assertNotNull(tree);
-        
+
         assertEquals(4, tree.getMaximumArgument());
-        
+
         final String target2 = "";
         assertEquals(0, ConditionTree.parseString(target2).getMaximumArgument());
     }
-    
+
     @Test
     public void testCreateConjunction() {
         final String expected = "(((0&1)&2)&3)";
         final ConditionTree tree = ConditionTree.createConjunction(4);
-        
+
         assertNotNull(tree);
         assertEquals(expected, tree.toString());
     }
-    
+
     @Test
     public void testCreateDisjunction() {
         final String expected = "(((0|1)|2)|3)";
         final ConditionTree tree = ConditionTree.createDisjunction(4);
-        
+
         assertNotNull(tree);
         assertEquals(expected, tree.toString());
     }
-    
+
     @Test
     public void testMismatchedBrackets() {
         final ConditionTree tree = ConditionTree.parseString("(0");
-        
+
         assertNull(tree);
     }
-    
+
     @Test
     public void testMismatchedBrackets2() {
         final ConditionTree tree = ConditionTree.parseString("0)");
-        
+
         assertNull(tree);
-    }    
-    
+    }
+
     @Test
     public void testMissingUnaryArg() {
         final ConditionTree tree = ConditionTree.parseString("!");
-        
+
         assertNull(tree);
     }
-    
+
     @Test
     public void testGarbageUnaryArg() {
         final ConditionTree tree = ConditionTree.parseString("!xy");
-        
+
         assertNull(tree);
-    }    
-    
+    }
+
     @Test
     public void testMissingBinaryArg() {
         final ConditionTree tree = ConditionTree.parseString("0|");
-        
+
         assertNull(tree);
     }
-    
+
     @Test
     public void testMissingBinaryArg2() {
         final ConditionTree tree = ConditionTree.parseString("0|!");
-        
+
         assertNull(tree);
-    }        
-    
+    }
+
     @Test
     public void testNonExistantOp() {
         final ConditionTree tree = ConditionTree.parseString("0/1");
-        
+
         assertNull(tree);
     }
 
@@ -112,18 +113,18 @@ public class ConditionTreeTest {
 
         assertNull(tree);
     }
-    
+
     @Test
     public void testNoopEvaluation() {
         final ConditionTree tree = ConditionTree.parseString("");
-        
+
         assertTrue(tree.evaluate(new boolean[]{true, false, true}));
-    }   
-    
+    }
+
     @Test
     public void testBracketedUnary() {
         final ConditionTree tree = ConditionTree.parseString("(+)");
-        
+
         assertNull(tree);
     }
 
@@ -145,5 +146,5 @@ public class ConditionTreeTest {
         assertFalse(tree1.equals(tree2));
         assertFalse(tree2.equals(tree1));
     }
-    
+
 }

test/com/dmdirc/actions/CoreActionComparisonTest.java

@@ -22,6 +22,7 @@
 package com.dmdirc.actions;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class CoreActionComparisonTest {
@@ -91,7 +92,7 @@ public class CoreActionComparisonTest {
         assertTrue(CoreActionComparison.STRING_NCONTAINS.test("hello", "h.{8}o"));
         assertTrue(CoreActionComparison.STRING_NCONTAINS.test("hello", "?!!?!{}"));
     }
-    
+
     @Test
     public void testBoolIs() {
         assertEquals(Boolean.class, CoreActionComparison.BOOL_IS.appliesTo());
@@ -101,6 +102,6 @@ public class CoreActionComparisonTest {
         assertTrue(CoreActionComparison.BOOL_IS.test(Boolean.FALSE, "false"));
         assertFalse(CoreActionComparison.BOOL_IS.test(Boolean.FALSE, "true"));
         assertFalse(CoreActionComparison.BOOL_IS.test(Boolean.TRUE, "false"));
-    }    
+    }
 
 }

test/com/dmdirc/actions/CoreActionTypeTest.java

@@ -22,7 +22,9 @@
 package com.dmdirc.actions;
 
 import com.dmdirc.actions.metatypes.PluginEvents;
+
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class CoreActionTypeTest {
@@ -31,7 +33,7 @@ public class CoreActionTypeTest {
     public void testGetName() {
         assertEquals("Plugin loaded", CoreActionType.PLUGIN_LOADED.getName());
     }
-    
+
     @Test
     public void testMetaType() {
         assertEquals(PluginEvents.PLUGIN_EVENT, CoreActionType.PLUGIN_LOADED.getType());

test/com/dmdirc/actions/StringComponentsTest.java

@@ -24,14 +24,16 @@ package com.dmdirc.actions;
 
 import java.util.Arrays;
 import java.util.List;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+
 import static org.junit.Assert.*;
 
 @RunWith(Parameterized.class)
 public class StringComponentsTest {
-    
+
     private String string1, string2;
 
     public StringComponentsTest(final String string1, final String string2) {
@@ -44,30 +46,30 @@ public class StringComponentsTest {
         assertEquals(string1.equalsIgnoreCase(string2),
                 CoreActionComparison.STRING_EQUALS.test(string1, string2));
     }
-    
+
     @Test
     public void testNotEquals() {
         assertEquals(!string1.equalsIgnoreCase(string2),
                 CoreActionComparison.STRING_NEQUALS.test(string1, string2));
     }
-    
+
     @Test
     public void testStartsWith() {
         assertEquals(string1.startsWith(string2),
                 CoreActionComparison.STRING_STARTSWITH.test(string1, string2));
     }
-    
+
     @Test
     public void testContains() {
         assertEquals(string1.indexOf(string2) != -1,
                 CoreActionComparison.STRING_CONTAINS.test(string1, string2));
     }
-    
+
     @Test
     public void testNotContains() {
         assertEquals(string1.indexOf(string2) == -1,
                 CoreActionComparison.STRING_NCONTAINS.test(string1, string2));
-    }    
+    }
 
     @Parameterized.Parameters
     public static List<Object[]> data() {

test/com/dmdirc/actions/metatypes/ActionEventsTest.java

@@ -22,7 +22,9 @@
 package com.dmdirc.actions.metatypes;
 
 import com.dmdirc.interfaces.actions.ActionMetaType;
+
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class ActionEventsTest {

test/com/dmdirc/actions/metatypes/ChannelEventsTest.java

@@ -22,6 +22,7 @@
 package com.dmdirc.actions.metatypes;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class ChannelEventsTest {

test/com/dmdirc/actions/metatypes/ClientEventsTest.java

@@ -22,6 +22,7 @@
 package com.dmdirc.actions.metatypes;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class ClientEventsTest {

test/com/dmdirc/actions/metatypes/LinkEventsTest.java

@@ -22,7 +22,9 @@
 package com.dmdirc.actions.metatypes;
 
 import com.dmdirc.interfaces.actions.ActionMetaType;
+
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class LinkEventsTest {

test/com/dmdirc/actions/metatypes/PluginEventsTest.java

@@ -22,6 +22,7 @@
 package com.dmdirc.actions.metatypes;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class PluginEventsTest {

test/com/dmdirc/actions/metatypes/QueryEventsTest.java

@@ -22,6 +22,7 @@
 package com.dmdirc.actions.metatypes;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class QueryEventsTest {

test/com/dmdirc/actions/metatypes/ServerEventsTest.java

@@ -22,6 +22,7 @@
 package com.dmdirc.actions.metatypes;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class ServerEventsTest {

test/com/dmdirc/actions/validators/ConditionRuleValidatorTest.java

@@ -23,7 +23,9 @@
 package com.dmdirc.actions.validators;
 
 import com.dmdirc.util.validators.ValidationResponse;
+
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class ConditionRuleValidatorTest {

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

@@ -23,7 +23,9 @@
 package com.dmdirc.actions.wrappers;
 
 import java.util.Arrays;
+
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class AliasTest {
@@ -31,7 +33,7 @@ public class AliasTest {
     @Test
     public void testBasics() {
         final Alias alias = new Alias("testing");
-        
+
         assertEquals("testing", alias.getCommand());
         assertEquals("testing-Any", alias.getName());
         assertTrue(Arrays.equals(new String[]{""}, alias.getResponse()));

test/com/dmdirc/commandparser/PopupMenuItemTest.java

@@ -22,10 +22,11 @@
 
 package com.dmdirc.commandparser;
 
-
 import com.dmdirc.interfaces.CommandController;
+
 import org.junit.Before;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 

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

@@ -35,7 +35,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 @RunWith(Parameterized.class)
 public class HelpTest {

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

@@ -34,6 +34,7 @@ import com.dmdirc.parser.interfaces.ClientInfo;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 public class BanTest {

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

@@ -34,6 +34,7 @@ import com.dmdirc.parser.irc.IRCChannelInfo;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 public class KickReasonTest {

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

@@ -36,7 +36,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
 import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.*;
 
 @RunWith(Parameterized.class)
 public class CommandFlagHandlerTest {

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

@@ -29,6 +29,7 @@ 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 IfpluginTest {

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

@@ -36,6 +36,7 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 public class NewServerTest {

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

@@ -35,6 +35,7 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 public class ChangeServerTest {

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

@@ -21,13 +21,14 @@
  */
 package com.dmdirc.commandparser.parsers;
 
-import com.dmdirc.harness.TestCommandParser;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.global.Echo;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.harness.TestCommandParser;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class CommandParserTest {

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

@@ -27,7 +27,7 @@ import com.dmdirc.config.IdentityManager;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import static org.junit.Assert.assertSame;
+import static org.junit.Assert.*;
 
 public class GlobalCommandParserTest {
 

test/com/dmdirc/config/ConfigManagerTest.java

@@ -25,7 +25,9 @@ import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.util.validators.PermissiveValidator;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
+import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 public class ConfigManagerTest {

test/com/dmdirc/config/ConfigSourceTest.java

@@ -22,24 +22,26 @@
 package com.dmdirc.config;
 
 import com.dmdirc.harness.TestConfigSource;
+
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class ConfigSourceTest {
-    
-    private final TestConfigSource s = new TestConfigSource(); 
-    
+
+    private final TestConfigSource s = new TestConfigSource();
+
     @Test
     public void testGetBoolean() {
         assertTrue(s.getOptionBool("true", "true"));
         assertFalse(s.getOptionBool("true", "false"));
     }
-    
+
     @Test
     public void testGetInt() {
         assertEquals(42, s.getOptionInt("true", "42").intValue());
     }
-    
+
     @Test
     public void testGetList() {
         assertTrue(s.getOptionList("false", "moo").isEmpty());

test/com/dmdirc/config/ConfigTargetTest.java

@@ -23,6 +23,7 @@
 package com.dmdirc.config;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class ConfigTargetTest {
@@ -174,7 +175,7 @@ public class ConfigTargetTest {
         assertFalse(t5.equals(t3));
         assertFalse(t5.equals(t4));
         assertTrue(t5.equals(t5));
-        
+
         assertEquals(t1.hashCode(), t5.hashCode());
     }
 

test/com/dmdirc/config/IdentityManagerTest.java

@@ -22,10 +22,11 @@
 
 package com.dmdirc.config;
 
-import static org.junit.Assert.assertTrue;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.*;
+
 public class IdentityManagerTest {
 
     @Before

test/com/dmdirc/config/IdentityTest.java

@@ -31,7 +31,9 @@ import java.util.Map;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
+import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 public class IdentityTest {

test/com/dmdirc/config/InvalidIdentityFileExceptionTest.java

@@ -23,6 +23,7 @@
 package com.dmdirc.config;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class InvalidIdentityFileExceptionTest {
@@ -30,13 +31,13 @@ public class InvalidIdentityFileExceptionTest {
     @Test
     public void testMessage() {
         final InvalidIdentityFileException ex = new InvalidIdentityFileException("message here");
-        
+
         assertEquals("message here", ex.getMessage());
     }
-    
+
     @Test
     public void testEmpty() {
         assertTrue(new InvalidIdentityFileException() instanceof Exception);
     }
-    
+
 }

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

@@ -21,11 +21,12 @@
  */
 package com.dmdirc.config.prefs;
 
-import com.dmdirc.plugins.PluginMetaData;
 import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.plugins.PluginMetaData;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 

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

@@ -22,8 +22,11 @@
 package com.dmdirc.config.prefs;
 
 import java.util.List;
+
 import org.junit.Test;
+
 import static org.junit.Assert.*;
+import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 public class PreferencesCategoryTest {

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

@@ -33,6 +33,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
+import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 public class PreferencesManagerTest {

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

@@ -24,7 +24,9 @@ package com.dmdirc.config.validators;
 
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
+
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class URLProtocolValidatorTest {

test/com/dmdirc/harness/TestCommandParser.java

@@ -25,10 +25,10 @@ package com.dmdirc.harness;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
-import com.dmdirc.commandparser.parsers.*;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.parsers.*;
 
 public class TestCommandParser extends CommandParser {
     private static final long serialVersionUID = 7073002401375438532L;

test/com/dmdirc/harness/TestConfigManagerMap.java

@@ -24,6 +24,7 @@ package com.dmdirc.harness;
 
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.util.validators.Validator;
+
 import java.util.HashMap;
 import java.util.Map;
 

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -28,7 +28,7 @@ import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.input.TabCompleter;
-import com.dmdirc.interfaces.ui.InputWindow;
+
 import java.util.Collections;
 
 public class TestWritableFrameContainer extends WritableFrameContainer {

test/com/dmdirc/logger/DMDircExceptionHandlerTest.java

@@ -26,7 +26,7 @@ import com.dmdirc.config.IdentityManager;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 public class DMDircExceptionHandlerTest {
 

test/com/dmdirc/logger/ErrorFixedStatusTest.java

@@ -22,6 +22,7 @@
 package com.dmdirc.logger;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class ErrorFixedStatusTest {

test/com/dmdirc/logger/ErrorLevelTest.java

@@ -22,6 +22,7 @@
 package com.dmdirc.logger;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class ErrorLevelTest {
@@ -74,7 +75,7 @@ public class ErrorLevelTest {
         assertFalse(ErrorLevel.FATAL.moreImportant(ErrorLevel.UNKNOWN));
         assertFalse(ErrorLevel.FATAL.moreImportant(null));
     }
-    
+
     @Test
     public void testMoreImportantUnknown() {
         assertTrue(ErrorLevel.UNKNOWN.moreImportant(ErrorLevel.MEDIUM));
@@ -83,6 +84,6 @@ public class ErrorLevelTest {
         assertTrue(ErrorLevel.UNKNOWN.moreImportant(ErrorLevel.LOW));
         assertFalse(ErrorLevel.UNKNOWN.moreImportant(ErrorLevel.UNKNOWN));
         assertFalse(ErrorLevel.UNKNOWN.moreImportant(null));
-    }    
+    }
 
 }

test/com/dmdirc/logger/ErrorReportStatusTest.java

@@ -22,6 +22,7 @@
 package com.dmdirc.logger;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class ErrorReportStatusTest {

test/com/dmdirc/logger/NullOutputStreamTest.java

@@ -22,8 +22,11 @@
 package com.dmdirc.logger;
 
 import com.dmdirc.util.io.StreamUtils;
+
 import java.io.IOException;
+
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class NullOutputStreamTest {
@@ -31,7 +34,7 @@ public class NullOutputStreamTest {
     @Test
     public void testWrite() {
         boolean exception = false;
-        
+
         final NullOutputStream os = new NullOutputStream();
 
         try {
@@ -41,7 +44,7 @@ public class NullOutputStreamTest {
         } finally {
             StreamUtils.close(os);
         }
-        
+
         assertFalse(exception);
     }
 

test/com/dmdirc/ui/WindowManagerTest.java

@@ -32,6 +32,7 @@ import com.dmdirc.interfaces.ui.Window;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 public class WindowManagerTest {

test/com/dmdirc/ui/core/util/URLHandlerTest.java

@@ -27,10 +27,11 @@ import java.net.URI;
 import java.net.URISyntaxException;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class URLHandlerTest {
-    
+
     @Test
     public void testSubstituteParams() throws MalformedURLException, URISyntaxException {
         final Object[][] tests = new Object[][]{

test/com/dmdirc/ui/input/tabstyles/TabCompletionResultTest.java

@@ -22,6 +22,7 @@
 package com.dmdirc.ui.input.tabstyles;
 
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class TabCompletionResultTest {
@@ -29,7 +30,7 @@ public class TabCompletionResultTest {
     @Test
     public void testConstructor() {
         final TabCompletionResult tcr = new TabCompletionResult("text", 1337);
-                
+
         assertEquals("text", tcr.getText());
         assertEquals(1337, tcr.getPosition());
     }

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

@@ -22,13 +22,15 @@
 package com.dmdirc.ui.messages;
 
 import com.dmdirc.harness.TestConfigManagerOptionToggle;
+
 import org.junit.Test;
+
 import static org.junit.Assert.*;
 
 public class FormatterTest {
-    
+
     private final TestConfigManagerOptionToggle mcm = new TestConfigManagerOptionToggle();
-    
+
     @Test
     public void testBasicFormats() {
         assertEquals("Hello!", Formatter.formatMessage(mcm, "1%1$s", "Hello!"));
@@ -40,14 +42,14 @@ public class FormatterTest {
         assertTrue(Formatter.formatMessage(mcm, "1%1$Z", "Hello!")
                 .toLowerCase().indexOf("invalid format string") > -1);
     }
-    
+
     @Test
     public void testCasting() {
         assertEquals("H", Formatter.formatMessage(mcm, "1%1$c", "Hello!"));
         assertEquals("10", Formatter.formatMessage(mcm, "1%1$d", "10"));
         assertEquals("111999", Formatter.formatMessage(mcm, "1%1$s", "111999"));
     }
-    
+
     @Test
     public void testCaching() {
         assertEquals("H", Formatter.formatMessage(mcm, "1%1$C", "Hello!"));
@@ -55,7 +57,7 @@ public class FormatterTest {
         assertEquals("HELLO!", Formatter.formatMessage(mcm, "1%1$S", "Hello!", 123, null));
         assertEquals("HELLO!", Formatter.formatMessage(mcm, "1%1$S", "Hello!"));
     }
-    
+
     @Test
     public void testFormatDuration() {
         assertEquals("1 minute, 1 second", Formatter.formatMessage(mcm, "1%1$u", "61"));

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

@@ -22,13 +22,13 @@
 
 package com.dmdirc.ui.messages;
 
-
 import java.util.Arrays;
 import java.util.List;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+
 import static org.junit.Assert.*;
 
 @RunWith(Parameterized.class)
@@ -43,12 +43,12 @@ public class StyliserIndicesTest {
         this.end = end;
         this.output = output;
     }
-       
+
     @Test
     public void testStyle() {
         assertEquals(output, Styliser.getStyledText(input, start, end));
     }
-    
+
     @Parameterized.Parameters
     public static List<Object[]> data() {
         final Object[][] tests = {
@@ -70,6 +70,6 @@ public class StyliserIndicesTest {
         };
 
         return Arrays.asList(tests);
-    } 
+    }
 
 }

test/com/dmdirc/updater/VersionTest.java

@@ -24,9 +24,11 @@ package com.dmdirc.updater;
 
 import java.util.Arrays;
 import java.util.List;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+
 import static org.junit.Assert.*;
 
 @RunWith(Parameterized.class)