Inject StatusBarManager and MessageSinkManager.

Pass the MSM into Main so it actually gets created, as the few
places that refer to it aren't being inflated by dagger yet.

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

src/com/dmdirc/ClientModule.java

@@ -33,8 +33,10 @@ import com.dmdirc.interfaces.IdentityController;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.WarningDialog;
+import com.dmdirc.ui.core.components.StatusBarManager;
 
 import java.awt.GraphicsEnvironment;
 import java.io.File;
@@ -133,6 +135,34 @@ public class ClientModule {
         return controller;
     }
 
+    /**
+     * Provides a status bar manager.
+     *
+     * @return The status bar manager the client should use.
+     */
+    @Provides
+    @Singleton
+    public StatusBarManager getStatusBarManager() {
+        final StatusBarManager manager = new StatusBarManager();
+        StatusBarManager.setStatusBarManager(manager);
+        return manager;
+    }
+
+    /**
+     * Gets the message sink manager for the client.
+     *
+     * @param statusBarManager The status bar manager to use for status bar sinks.
+     * @return The message sink manager the client should use.
+     */
+    @Provides
+    @Singleton
+    public MessageSinkManager getMessageSinkManager(final StatusBarManager statusBarManager) {
+        final MessageSinkManager messageSinkManager = new MessageSinkManager();
+        MessageSinkManager.setManager(messageSinkManager);
+        messageSinkManager.loadDefaultSinks(statusBarManager);
+        return messageSinkManager;
+    }
+
     /**
      * Called when the global config cannot be loaded due to an error. This
      * method informs the user of the problem and installs a new default config

src/com/dmdirc/Main.java

@@ -111,6 +111,7 @@ public class Main implements LifecycleController {
      * @param pluginManager The plugin manager the client will use.
      * @param commandManager The command manager the client will use.
      * @param commandLoader The command loader to use to initialise the command manager.
+     * @param messageSinkManager Unused for now - TODO: remove me when it's injected somewhere sensible.
      * @param configDir The base configuration directory to use.
      */
     @Inject
@@ -122,6 +123,7 @@ public class Main implements LifecycleController {
             final PluginManager pluginManager,
             final CommandManager commandManager,
             final CommandLoader commandLoader,
+            final MessageSinkManager messageSinkManager,
             @Directory(DirectoryType.BASE) final String configDir) {
         this.identityManager = identityManager;
         this.serverManager = serverManager;
@@ -162,8 +164,6 @@ public class Main implements LifecycleController {
     public void init() {
         UpdateChecker.init(this);
 
-        MessageSinkManager.getManager().loadDefaultSinks();
-
         pluginManager.refreshPlugins();
         checkBundledPlugins(pluginManager, identityManager.getGlobalConfiguration());
 

src/com/dmdirc/messages/MessageSinkManager.java

@@ -25,6 +25,7 @@ package com.dmdirc.messages;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.core.components.StatusBarManager;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -37,7 +38,7 @@ import java.util.regex.Matcher;
 public class MessageSinkManager {
 
     /** A singleton instance of the manager. */
-    private static final MessageSinkManager INSTANCE = new MessageSinkManager();
+    private static MessageSinkManager instance;
 
     /** The configuration domain to use for looking up default sinks. */
     public static final String CONFIG_DOMAIN = "notifications";
@@ -46,7 +47,7 @@ public class MessageSinkManager {
     public static final String DEFAULT_SINK = "self";
 
     /** A list of known sinks. */
-    private final List<MessageSink> sinks = new ArrayList<MessageSink>();
+    private final List<MessageSink> sinks = new ArrayList<>();
 
     /**
      * Adds a new sink to the list of known sinks.
@@ -125,8 +126,10 @@ public class MessageSinkManager {
 
     /**
      * Loads the default message sinks into this manager.
+     *
+     * @param statusBarManager The status bar manager to give to status-bar related sinks.
      */
-    public void loadDefaultSinks() {
+    public void loadDefaultSinks(final StatusBarManager statusBarManager) {
         addSink(new AllMessageSink());
         addSink(new ChannelMessageSink());
         addSink(new CommonChanelsMessageSink());
@@ -138,7 +141,7 @@ public class MessageSinkManager {
         addSink(new NullMessageSink());
         addSink(new SelfMessageSink());
         addSink(new ServerMessageSink());
-        addSink(new StatusBarMessageSink());
+        addSink(new StatusBarMessageSink(statusBarManager));
     }
 
     /**
@@ -147,7 +150,16 @@ public class MessageSinkManager {
      * @return A singleton manager instance
      */
     public static MessageSinkManager getManager() {
-        return INSTANCE;
+        return instance;
+    }
+
+    /**
+     * Sets the singleton instance of the sink manager.
+     *
+     * @param manager The new singleton manager instance.
+     */
+    public static void setManager(final MessageSinkManager manager) {
+        instance = manager;
     }
 
 }

src/com/dmdirc/messages/StatusBarMessageSink.java

@@ -38,6 +38,18 @@ public class StatusBarMessageSink implements MessageSink {
     /** The pattern to use to match this sink. */
     private static final Pattern PATTERN = Pattern.compile("statusbar");
 
+    /** The status bar manager to add messages to. */
+    private final StatusBarManager statusBarManager;
+
+    /**
+     * Creates a new instance of {@link StatusBarMessageSink}.
+     *
+     * @param statusBarManager The status bar manager to add messages to.
+     */
+    public StatusBarMessageSink(final StatusBarManager statusBarManager) {
+        this.statusBarManager = statusBarManager;
+    }
+
     /** {@inheritDoc} */
     @Override
     public Pattern getPattern() {
@@ -52,8 +64,7 @@ public class StatusBarMessageSink implements MessageSink {
             final String messageType, final Object... args) {
         final String message = Formatter.formatMessage(source.getConfigManager(),
                 messageType, args);
-        StatusBarManager.getStatusBarManager().setMessage(
-                new StatusMessage(message, source.getConfigManager()));
+        statusBarManager.setMessage(new StatusMessage(message, source.getConfigManager()));
     }
 
 }

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

@@ -37,10 +37,10 @@ import java.util.concurrent.CopyOnWriteArraySet;
 public class StatusBarManager implements StatusBar {
 
     /** A singleton instance of the manager. */
-    private static final StatusBarManager INSTANCE = new StatusBarManager();
+    private static StatusBarManager instance;
 
     /** A collection of known status bars. */
-    private final Collection<StatusBar> statusBars = new CopyOnWriteArraySet<StatusBar>();
+    private final Collection<StatusBar> statusBars = new CopyOnWriteArraySet<>();
 
     /**
      * Registers a new status bar with the manager. All requests to
@@ -100,7 +100,16 @@ public class StatusBarManager implements StatusBar {
      * @return A singleton instance of the status bar manager.
      */
     public static StatusBarManager getStatusBarManager() {
-        return INSTANCE;
+        return instance;
+    }
+
+    /**
+     * Sets the singleton instance of the status bar manager.
+     *
+     * @param manager The manager to use as a singleton instance.
+     */
+    public static void setStatusBarManager(final StatusBarManager manager) {
+        instance = manager;
     }
 
 }

test/com/dmdirc/TestMain.java

@@ -33,7 +33,7 @@ public class TestMain extends Main {
             final CommandManager commandManager,
             final String configDir) {
         super(identityManager, serverManager, actionManager, commandLineParser,
-                pluginManager, commandManager, null, configDir);
+                pluginManager, commandManager, null, null, configDir);
         this.identityManager = identityManager;
         this.serverManager = serverManager;
         this.actionManager = actionManager;

test/com/dmdirc/ui/WindowManagerTest.java

@@ -34,6 +34,7 @@ import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.harness.TestWritableFrameContainer;
 import com.dmdirc.interfaces.ui.FrameListener;
 import com.dmdirc.interfaces.ui.Window;
+import com.dmdirc.ui.core.components.StatusBarManager;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -50,6 +51,7 @@ public class WindowManagerTest {
 
     @Mock private ConfigManager cm;
     @Mock private ServerManager serverManager;
+    @Mock private StatusBarManager statusBarManager;
     private CommandManager commands;
 
     @Before
@@ -59,6 +61,7 @@ public class WindowManagerTest {
         when(cm.getBinder()).thenReturn(binder);
         commands = new CommandManager(serverManager);
         commands.initialise(cm);
+        StatusBarManager.setStatusBarManager(statusBarManager);
     }
 
     @Test

test/com/dmdirc/ui/core/components/StatusBarManagerTest.java

@@ -34,7 +34,7 @@ public class StatusBarManagerTest {
     @Test
     public void testRegisterStatusBar() {
         final StatusBar sb = mock(StatusBar.class);
-        StatusBarManager instance = StatusBarManager.getStatusBarManager();
+        StatusBarManager instance = new StatusBarManager();
         instance.registerStatusBar(sb);
         instance.clearMessage();
         verify(sb).clearMessage();
@@ -43,7 +43,7 @@ public class StatusBarManagerTest {
     @Test
     public void testUnregisterStatusBar() {
         final StatusBar sb = mock(StatusBar.class);
-        StatusBarManager instance = StatusBarManager.getStatusBarManager();
+        StatusBarManager instance = new StatusBarManager();
         instance.registerStatusBar(sb);
         instance.unregisterStatusBar(sb);
         instance.clearMessage();
@@ -54,7 +54,7 @@ public class StatusBarManagerTest {
     public void testSetMessage() {
         final StatusMessage message = mock(StatusMessage.class);
         final StatusBar sb = mock(StatusBar.class);
-        StatusBarManager instance = StatusBarManager.getStatusBarManager();
+        StatusBarManager instance = new StatusBarManager();
         instance.registerStatusBar(sb);
         instance.setMessage(message);
         verify(sb).setMessage(message);
@@ -63,7 +63,7 @@ public class StatusBarManagerTest {
     @Test
     public void testClearMessage() {
         final StatusBar sb = mock(StatusBar.class);
-        StatusBarManager instance = StatusBarManager.getStatusBarManager();
+        StatusBarManager instance = new StatusBarManager();
         instance.registerStatusBar(sb);
         instance.clearMessage();
         verify(sb).clearMessage();
@@ -73,7 +73,7 @@ public class StatusBarManagerTest {
     public void testAddComponent() {
         final StatusBarComponent comp = mock(StatusBarComponent.class);
         final StatusBar sb = mock(StatusBar.class);
-        StatusBarManager instance = StatusBarManager.getStatusBarManager();
+        StatusBarManager instance = new StatusBarManager();
         instance.registerStatusBar(sb);
         instance.addComponent(comp);
         verify(sb).addComponent(comp);
@@ -83,7 +83,7 @@ public class StatusBarManagerTest {
     public void testRemoveComponent() {
         final StatusBarComponent comp = mock(StatusBarComponent.class);
         final StatusBar sb = mock(StatusBar.class);
-        StatusBarManager instance = StatusBarManager.getStatusBarManager();
+        StatusBarManager instance = new StatusBarManager();
         instance.registerStatusBar(sb);
         instance.removeComponent(comp);
         verify(sb).removeComponent(comp);