Tidy up after changes.

src/com/dmdirc/ClientModule.java

@@ -144,7 +144,7 @@ public class ClientModule {
             final DMDircMBassador eventBus,
             final IdentityController controller,
             @Directory(DirectoryType.THEMES) final String directory) {
-        final ThemeManager manager = new ThemeManager(eventBus, controller, directory);
+        final ThemeManager manager = new ThemeManager(controller, directory);
         manager.refreshAndLoadThemes();
         return manager;
     }

src/com/dmdirc/Server.java

@@ -228,7 +228,7 @@ public class Server extends FrameContainer implements Connection {
 
         initBackBuffer();
         this.highlightManager = new HighlightManager(getConfigManager(),
-                new ColourManager(getConfigManager(), getEventBus()));
+                new ColourManager(getConfigManager()));
         highlightManager.init();
         getEventBus().subscribe(highlightManager);
     }

src/com/dmdirc/plugins/PluginModule.java

@@ -58,7 +58,7 @@ public class PluginModule {
                 identityController, updateManager, objectGraph, fileHandler, directory);
         manager.refreshPlugins();
 
-        final CorePluginExtractor extractor = new CorePluginExtractor(manager, directory, eventBus);
+        final CorePluginExtractor extractor = new CorePluginExtractor(manager, directory);
         pluginHelper.checkBundledPlugins(extractor, manager,
                 identityController.getGlobalConfiguration());
 

src/com/dmdirc/ui/messages/ColourManagerFactory.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import javax.inject.Inject;
@@ -34,15 +33,12 @@ import javax.inject.Singleton;
 @Singleton
 public class ColourManagerFactory {
 
-    private final DMDircMBassador eventBus;
-
     @Inject
-    public ColourManagerFactory(final DMDircMBassador eventBus) {
-        this.eventBus = eventBus;
+    public ColourManagerFactory() {
     }
 
     public ColourManager getColourManager(final AggregateConfigProvider configManager) {
-        return new ColourManager(configManager, eventBus);
+        return new ColourManager(configManager);
     }
 
 }

src/com/dmdirc/ui/messages/UnreadStatusManager.java

@@ -56,7 +56,7 @@ public class UnreadStatusManager {
     public UnreadStatusManager(final WindowModel container) {
         this.container = container;
         this.eventBus = container.getEventBus();
-        this.colourManager = new ColourManager(container.getConfigManager(), eventBus);
+        this.colourManager = new ColourManager(container.getConfigManager());
     }
 
     @Handler

src/com/dmdirc/ui/messages/sink/MessagesModule.java

@@ -41,7 +41,7 @@ public class MessagesModule {
     @Singleton
     public MessageSinkManager getMessageSinkManager(final DMDircMBassador eventBus,
             final Set<MessageSink> defaultSinks) {
-        final MessageSinkManager messageSinkManager = new MessageSinkManager(eventBus);
+        final MessageSinkManager messageSinkManager = new MessageSinkManager();
         defaultSinks.forEach(messageSinkManager::addSink);
         return messageSinkManager;
     }

src/com/dmdirc/updater/UpdaterModule.java

@@ -107,7 +107,7 @@ public class UpdaterModule {
             final DMDircUpdateManager updateManager,
             final IdentityController identityController,
             final DMDircMBassador eventBus) {
-        UpdateChecker.init(updateManager, identityController, eventBus);
+        UpdateChecker.init(updateManager, identityController);
 
         commandLineParser.getLauncherVersion().ifPresent(version ->
                 LauncherComponent.setLauncherInfo(updateManager, version));

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

@@ -57,7 +57,7 @@ public class ColourManagerTest {
 
     @Before
     public void setup() {
-        manager = new ColourManager(configManager, eventBus);
+        manager = new ColourManager(configManager);
         verify(configManager).addChangeListener(anyString(), configListener.capture());
     }
 

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

@@ -48,7 +48,7 @@ public class EventPropertyManagerTest {
 
     @Before
     public void setUp() {
-        manager = new EventPropertyManager(eventBus);
+        manager = new EventPropertyManager();
     }
 
     @Test

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

@@ -55,8 +55,7 @@ public class IntelligentLinkingTest {
         when(connection.getGroupChatManager()).thenReturn(groupChatManager);
         when(groupChatManager.getChannelPrefixes()).thenReturn("#&+");
 
-        styliser = new Styliser(connection, manager, new ColourManager(manager,
-                mock(DMDircMBassador.class)));
+        styliser = new Styliser(connection, manager, new ColourManager(manager));
     }
 
     @Test

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

@@ -68,8 +68,7 @@ public class StyliserStylesTest {
 
         final AggregateConfigProvider manager = mock(AggregateConfigProvider.class);
 
-        final Styliser styliser = new Styliser(null, manager, new ColourManager(manager,
-                mock(DMDircMBassador.class)));
+        final Styliser styliser = new Styliser(null, manager, new ColourManager(manager));
         styliser.addStyledString(null, input);  // TODO...
         final AttributedCharacterIterator aci = null; // TODO...
 

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

@@ -88,8 +88,7 @@ public class StyliserTest {
         final String input2 = "abcdefghi";
 
         final AggregateConfigProvider manager = mock(AggregateConfigProvider.class);
-        final Styliser styliser = new Styliser(null, manager, new ColourManager(manager,
-                mock(DMDircMBassador.class)));
+        final Styliser styliser = new Styliser(null, manager, new ColourManager(manager));
 
         for (int i = 0; i < input2.length(); i++) {
             // TODO...

test/com/dmdirc/util/URLBuilderTest.java

@@ -72,49 +72,49 @@ public class URLBuilderTest {
     @Test
     public void testGetUrlForFileWithoutFilePrefix() throws MalformedURLException {
         final URLBuilder urlBuilder
-                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider);
         Assert.assertEquals(new URL("file://test"), urlBuilder.getUrlForFile("test"));
     }
 
     @Test
     public void testGetUrlForFileWithFilePrefix() throws MalformedURLException {
         final URLBuilder urlBuilder
-                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider);
         Assert.assertEquals(new URL("file://test"), urlBuilder.getUrlForFile("file://test"));
     }
 
     @Test
     public void testGetUrlInvalid() throws MalformedURLException {
         final URLBuilder urlBuilder
-                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider);
         Assert.assertNull(urlBuilder.getUrlForFile("file://[test"));
     }
 
     @Test
     public void testGetUrlForJarFile() throws MalformedURLException {
         final URLBuilder urlBuilder
-                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider);
         Assert.assertEquals(new URL("jar:file:/jarFile!/test"), urlBuilder.getUrlForJarFile("jarFile", "test"));
     }
 
     @Test
     public void testGetUrlForJarFileInvalud() throws MalformedURLException {
         final URLBuilder urlBuilder
-                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider);
         Assert.assertNull(urlBuilder.getUrlForJarFile("[jarFile", "test"));
     }
 
     @Test
     public void testGetUrlForDMDircResourceNonExistant() {
         final URLBuilder urlBuilder
-                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider);
         Assert.assertNull(urlBuilder.getUrlForDMDircResource("test12345678"));
     }
 
     @Test
     public void testGetUrlForDMDircResource() throws MalformedURLException {
         final URLBuilder urlBuilder
-                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider);
         final URL url = urlBuilder.getUrlForDMDircResource("com/dmdirc/Main.class");
         Assert.assertTrue("file".equals(url.getProtocol()) || "jar".equals(url.getProtocol()));
         Assert.assertTrue(url.getFile().endsWith("com/dmdirc/Main.class"));
@@ -123,21 +123,21 @@ public class URLBuilderTest {
     @Test
     public void testGetUrlForThemeResource() throws MalformedURLException {
         final URLBuilder urlBuilder
-                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider);
         Assert.assertEquals(new URL("jar:file:/themes/testTheme.zip!/testFile"), urlBuilder.getUrlForThemeResource("testTheme", "testFile"));
     }
 
     @Test
     public void testGetUrlForPluginResource() throws MalformedURLException {
         final URLBuilder urlBuilder
-                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider);
         Assert.assertEquals(new URL("jar:file:/testPlugin!/testFile"), urlBuilder.getUrlForPluginResource("testPlugin", "testFile"));
     }
 
     @Test
     public void testGetUrlDMDirc() {
         final URLBuilder urlBuilder
-                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider);
         final URL url = urlBuilder.getUrl("dmdirc://com/dmdirc/Main.class");
         Assert.assertTrue("file".equals(url.getProtocol()) || "jar".equals(url.getProtocol()));
         Assert.assertTrue(url.getFile().endsWith("com/dmdirc/Main.class"));
@@ -146,84 +146,84 @@ public class URLBuilderTest {
     @Test
     public void testGetUrlJar() throws MalformedURLException {
         final URLBuilder urlBuilder
-                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider);
         Assert.assertEquals(new URL("jar:file:/jarFile!/testFile"), urlBuilder.getUrl("jar://jarFile:testFile"));
     }
 
     @Test
     public void testGetUrlJarWithoutFile() throws MalformedURLException {
         final URLBuilder urlBuilder
-                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider);
         Assert.assertNull(urlBuilder.getUrl("jar://jarFile"));
     }
 
     @Test
     public void testGetUrlZip() throws MalformedURLException {
         final URLBuilder urlBuilder
-                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider);
         Assert.assertEquals(new URL("jar:file:/zipFile!/testFile"), urlBuilder.getUrl("zip://zipFile:testFile"));
     }
 
     @Test
     public void testGetUrlZipWithoutFile() throws MalformedURLException {
         final URLBuilder urlBuilder
-                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider);
         Assert.assertNull(urlBuilder.getUrl("zip://zipFile"));
     }
 
     @Test
     public void testGetUrlPlugin() throws MalformedURLException {
         final URLBuilder urlBuilder
-                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider);
         Assert.assertEquals(new URL("jar:file:/testPlugin!/testFile"), urlBuilder.getUrl("plugin://pluginFile:testFile"));
     }
 
     @Test
     public void testGetUrlPluginWithoutFile() throws MalformedURLException {
         final URLBuilder urlBuilder
-                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider);
         Assert.assertNull(urlBuilder.getUrl("plugin://pluginFile"));
     }
 
     @Test
     public void testGetUrlTheme() throws MalformedURLException {
         final URLBuilder urlBuilder
-                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider);
         Assert.assertEquals(new URL("jar:file:/themes/themeFile.zip!/testFile"), urlBuilder.getUrl("theme://themeFile:testFile"));
     }
 
     @Test
     public void testGetUrlThemeWithoutFile() throws MalformedURLException {
         final URLBuilder urlBuilder
-                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider);
         Assert.assertNull(urlBuilder.getUrl("theme://themeFile"));
     }
 
     @Test
     public void testGetUrlHTTP() throws MalformedURLException {
         final URLBuilder urlBuilder
-                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider);
         Assert.assertEquals(new URL("http://testDomain"), urlBuilder.getUrl("http://testDomain"));
     }
 
     @Test
     public void testGetUrlHTTPInvalid() throws MalformedURLException {
         final URLBuilder urlBuilder
-                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider);
         Assert.assertNull(urlBuilder.getUrl("http://[testDomain"));
     }
 
     @Test
     public void testGetUrlFileWithPrefix() throws MalformedURLException {
         final URLBuilder urlBuilder
-                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider);
         Assert.assertEquals(new URL("file://testFile"), urlBuilder.getUrl("file://testFile"));
     }
 
     @Test
     public void testGetUrlFileWithoutPrefix() throws MalformedURLException {
         final URLBuilder urlBuilder
-                = new URLBuilder(pluginManagerProvider, themeManagerProvider, eventBus);
+                = new URLBuilder(pluginManagerProvider, themeManagerProvider);
         Assert.assertEquals(new URL("file://testFile"), urlBuilder.getUrl("testFile"));
     }
 }