Remove MessageSinkManager singleton.

Change-Id: Iaafcea914d16f33ce98c331084cd3e9c8fdbbeda
Depends-On: I1cd8a5676beab1f3aba7f62b064dd5b2c2ce0f61
Reviewed-on: http://gerrit.dmdirc.com/2821
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/Channel.java

@@ -31,6 +31,7 @@ import com.dmdirc.config.ConfigManager;
 import com.dmdirc.interfaces.NicklistListener;
 import com.dmdirc.interfaces.TopicChangeListener;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
@@ -101,19 +102,24 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
      * @param newChannelInfo The parser's channel object that corresponds to
      * this channel
      * @param focus Whether or not to focus this channel
+     * @param messageSinkManager The sink manager to use to despatch messages.
      * @param windowManager Window management
      */
-    public Channel(final Server newServer, final ChannelInfo newChannelInfo,
-            final boolean focus, final WindowManager windowManager) {
+    public Channel(
+            final Server newServer,
+            final ChannelInfo newChannelInfo,
+            final boolean focus,
+            final MessageSinkManager messageSinkManager,
+            final WindowManager windowManager) {
         super("channel-inactive", newChannelInfo.getName(),
                 Styliser.stipControlCodes(newChannelInfo.getName()),
                 new ConfigManager(newServer.getProtocol(), newServer.getIrcd(),
                 newServer.getNetwork(), newServer.getAddress(), newChannelInfo.getName()),
-                new ChannelCommandParser(newServer),
+                new ChannelCommandParser(newServer), messageSinkManager, windowManager,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
-                WindowComponent.INPUTFIELD.getIdentifier(),
-                WindowComponent.TOPICBAR.getIdentifier(),
-                        WindowComponent.USERLIST.getIdentifier()), windowManager);
+                    WindowComponent.INPUTFIELD.getIdentifier(),
+                    WindowComponent.TOPICBAR.getIdentifier(),
+                    WindowComponent.USERLIST.getIdentifier()));
 
         channelInfo = newChannelInfo;
         server = newServer;

src/com/dmdirc/ClientModule.java

@@ -196,7 +196,6 @@ public class ClientModule {
             final StatusBarManager statusBarManager,
             final WindowManager windowManager) {
         final MessageSinkManager messageSinkManager = new MessageSinkManager();
-        MessageSinkManager.setManager(messageSinkManager);
         messageSinkManager.loadDefaultSinks(statusBarManager, windowManager);
         return messageSinkManager;
     }

src/com/dmdirc/GlobalWindow.java

@@ -31,6 +31,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.IdentityController;
+import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleter;
@@ -62,14 +63,18 @@ public class GlobalWindow extends WritableFrameContainer {
      *
      * @param config The ConfigManager to retrieve settings from.
      * @param parser The command parser to use to parse input.
-     * @param windowManager Window management
+     * @param windowManager The window manager.
+     * @param messageSinkManager The sink manager to use to despatch messages.
      */
-    public GlobalWindow(final AggregateConfigProvider config, final CommandParser parser,
-            final WindowManager windowManager) {
-        super("icon", "Global", "(Global)",
-                config, parser,
-                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
-                        WindowComponent.INPUTFIELD.getIdentifier()), windowManager);
+    public GlobalWindow(
+            final AggregateConfigProvider config,
+            final CommandParser parser,
+            final WindowManager windowManager,
+            final MessageSinkManager messageSinkManager) {
+        super("icon", "Global", "(Global)", config, parser, messageSinkManager, windowManager,
+                Arrays.asList(
+                        WindowComponent.TEXTAREA.getIdentifier(),
+                        WindowComponent.INPUTFIELD.getIdentifier()));
 
         tabCompleter = new TabCompleter(config);
         tabCompleter.addEntries(TabCompletionType.COMMAND,
@@ -124,6 +129,8 @@ public class GlobalWindow extends WritableFrameContainer {
         private final Provider<CommandController> commandControllerProvider;
         /** The provider to use to retrieve a window manager. */
         private final Provider<WindowManager> windowManagerProvider;
+        /** The provider to use to retrieve message sink managers. */
+        private final Provider<MessageSinkManager> messageSinkManagerProvider;
 
         /**
          * Creates a new instance of {@link GlobalWindowManager}.
@@ -131,15 +138,18 @@ public class GlobalWindow extends WritableFrameContainer {
          * @param identityController Controller to retrieve global configuration from.
          * @param commandControllerProvider The provider to use to retrieve a command controller.
          * @param windowManagerProvider The provider to use to retrieve a window manager.
+         * @param messageSinkManagerProvider The provider to use to retrieve a sink manager.
          */
         @Inject
         public GlobalWindowManager(
                 final IdentityController identityController,
                 final Provider<CommandController> commandControllerProvider,
-                final Provider<WindowManager> windowManagerProvider) {
+                final Provider<WindowManager> windowManagerProvider,
+                final Provider<MessageSinkManager> messageSinkManagerProvider) {
             this.globalConfig = identityController.getGlobalConfiguration();
             this.commandControllerProvider = commandControllerProvider;
             this.windowManagerProvider = windowManagerProvider;
+            this.messageSinkManagerProvider = messageSinkManagerProvider;
         }
 
         /** {@inheritDoc} */
@@ -166,7 +176,7 @@ public class GlobalWindow extends WritableFrameContainer {
                     if (globalWindow == null) {
                         globalWindow = new GlobalWindow(globalConfig,
                                 new GlobalCommandParser(globalConfig, commandControllerProvider.get()),
-                                windowManagerProvider.get());
+                                windowManagerProvider.get(), messageSinkManagerProvider.get());
                     }
                 } else {
                     if (globalWindow != null) {

src/com/dmdirc/MessageTarget.java

@@ -24,6 +24,7 @@ package com.dmdirc;
 
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.WindowManager;
 
 import java.util.Collection;
@@ -42,15 +43,16 @@ public abstract class MessageTarget extends WritableFrameContainer {
      * @param title The title of this target
      * @param config The config manager to use for this target
      * @param parser The command parser for this container
+     * @param messageSinkManager The sink manager to use to despatch messages.
      * @param components The UI components that this frame requires
      * @param windowManager Window manager
      * @since 0.6.4
      */
     public MessageTarget(final String icon, final String name,
             final String title, final AggregateConfigProvider config,
-            final CommandParser parser, final Collection<String> components,
-            final WindowManager windowManager) {
-        super(icon, name, title, config, parser, components, windowManager);
+            final CommandParser parser, final MessageSinkManager messageSinkManager,
+            final WindowManager windowManager, final Collection<String> components) {
+        super(icon, name, title, config, parser, messageSinkManager, windowManager, components);
     }
 
     /**

src/com/dmdirc/Query.java

@@ -29,6 +29,7 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.QueryCommandParser;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.parser.common.CallbackManager;
 import com.dmdirc.parser.common.CallbackNotFoundException;
 import com.dmdirc.parser.common.CompositionState;
@@ -67,32 +68,25 @@ public class Query extends MessageTarget implements PrivateActionListener,
     /** The tab completer for the query window. */
     private final TabCompleter tabCompleter;
 
-    /**
-     * Creates a new instance of Query.
-     *
-     * @param newHost host of the remove client
-     * @param newServer The server object that this Query belongs to
-     * @param windowManager Window management
-     */
-    public Query(final Server newServer, final String newHost, final WindowManager windowManager) {
-        this(newServer, newHost, false, windowManager);
-    }
-
     /**
      * Creates a new instance of Query.
      *
      * @param newHost host of the remove client
      * @param newServer The server object that this Query belongs to
      * @param focus Should we focus the query on open?
+     * @param messageSinkManager The sink manager to use to despatch messages.
      * @param windowManager Window management
      */
     public Query(final Server newServer, final String newHost,
-            final boolean focus, final WindowManager windowManager) {
+            final boolean focus, final MessageSinkManager messageSinkManager,
+            final WindowManager windowManager) {
         super("query", newServer.parseHostmask(newHost)[0],
                 newServer.parseHostmask(newHost)[0],
                 newServer.getConfigManager(), new QueryCommandParser(newServer),
-                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
-                        WindowComponent.INPUTFIELD.getIdentifier()), windowManager);
+                messageSinkManager, windowManager,
+                Arrays.asList(
+                        WindowComponent.TEXTAREA.getIdentifier(),
+                        WindowComponent.INPUTFIELD.getIdentifier()));
 
         this.server = newServer;
         this.host = newHost;

src/com/dmdirc/Raw.java

@@ -25,6 +25,7 @@ package com.dmdirc;
 import com.dmdirc.commandparser.parsers.ServerCommandParser;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.parser.common.CallbackNotFoundException;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.DataInListener;
@@ -50,13 +51,17 @@ public class Raw extends WritableFrameContainer
      * Creates a new instance of Raw.
      *
      * @param newServer the server to monitor
+     * @param messageSinkManager The sink manager to use to despatch messages.
      * @param windowManager Window management
      */
-    public Raw(final Server newServer, final WindowManager windowManager) {
+    public Raw(final Server newServer, final MessageSinkManager messageSinkManager,
+            final WindowManager windowManager) {
         super("raw", "Raw", "(Raw log)", newServer.getConfigManager(),
                 new ServerCommandParser(newServer.getConfigManager()),
-                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
-                        WindowComponent.INPUTFIELD.getIdentifier()), windowManager);
+                messageSinkManager, windowManager,
+                Arrays.asList(
+                    WindowComponent.TEXTAREA.getIdentifier(),
+                    WindowComponent.INPUTFIELD.getIdentifier()));
 
         this.server = newServer;
 

src/com/dmdirc/Server.java

@@ -36,6 +36,7 @@ import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.parser.common.DefaultStringConverter;
 import com.dmdirc.parser.common.IgnoreList;
@@ -186,6 +187,9 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
     /** Factory to use to create new identities. */
     private final IdentityFactory identityFactory;
 
+    /** The sink manager to use to despatch messages. */
+    private final MessageSinkManager messageSinkManager;
+
     /** Window manager to pas to children. */
     private final WindowManager windowManager;
 
@@ -207,6 +211,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
      * @param tabCompleterFactory The factory to use for tab completers.
      * @param commandController The controller to use to retrieve commands.
      * @param identityFactory The factory to use to create identities.
+     * @param messageSinkManager The sink manager to use to despatch messages.
      * @param windowManager Window Manager
      * @param uri The address of the server to connect to
      * @param profile The profile to use
@@ -219,6 +224,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
             final TabCompleterFactory tabCompleterFactory,
             final CommandController commandController,
             final IdentityFactory identityFactory,
+            final MessageSinkManager messageSinkManager,
             final WindowManager windowManager,
             final URI uri,
             final ConfigProvider profile) {
@@ -227,13 +233,17 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
                 getHost(uri),
                 configManager,
                 commandParser,
-                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
-                WindowComponent.INPUTFIELD.getIdentifier(),
-                        WindowComponent.CERTIFICATE_VIEWER.getIdentifier()), windowManager);
+                messageSinkManager,
+                windowManager,
+                Arrays.asList(
+                    WindowComponent.TEXTAREA.getIdentifier(),
+                    WindowComponent.INPUTFIELD.getIdentifier(),
+                    WindowComponent.CERTIFICATE_VIEWER.getIdentifier()));
 
         this.manager = manager;
         this.parserFactory = parserFactory;
         this.identityFactory = identityFactory;
+        this.messageSinkManager = messageSinkManager;
         this.windowManager = windowManager;
         setConnectionDetails(uri, profile);
 
@@ -548,7 +558,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         final String lnick = converter.toLowerCase(nick);
 
         if (!queries.containsKey(lnick)) {
-            final Query newQuery = new Query(this, host, focus, windowManager);
+            final Query newQuery = new Query(this, host, focus, messageSinkManager, windowManager);
 
             tabCompleter.addEntry(TabCompletionType.QUERY_NICK, nick);
             queries.put(lnick, newQuery);
@@ -584,7 +594,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
     @Override
     public void addRaw() {
         if (raw == null) {
-            raw = new Raw(this, windowManager);
+            raw = new Raw(this, messageSinkManager, windowManager);
 
             try {
                 parserLock.readLock().lock();
@@ -640,7 +650,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
             getChannel(chan.getName()).setChannelInfo(chan);
             getChannel(chan.getName()).selfJoin();
         } else {
-            final Channel newChan = new Channel(this, chan, focus, windowManager);
+            final Channel newChan = new Channel(this, chan, focus, messageSinkManager, windowManager);
 
             tabCompleter.addEntry(TabCompletionType.CHANNEL, chan.getName());
             channels.put(converter.toLowerCase(chan.getName()), newChan);

src/com/dmdirc/ServerManager.java

@@ -31,6 +31,7 @@ import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleterFactory;
@@ -65,6 +66,9 @@ public class ServerManager implements ServerFactory {
     /** A provider of {@link CommandController}s to pass to servers. */
     private final Provider<CommandController> commandController;
 
+    /** A provider of {@link MessageSinkManager}s to pass to servers. */
+    private final Provider<MessageSinkManager> messageSinkManager;
+
     /** The identity factory to give to servers. */
     private final IdentityFactory identityFactory;
 
@@ -82,6 +86,7 @@ public class ServerManager implements ServerFactory {
      * @param identityFactory The factory to use to create new identities.
      * @param commandController A provider of {@link CommandController}s to pass to servers.
      * @param tabCompleterFactory Factory to use for tab completers.
+     * @param messageSinkManager A provider of sink managers to use to despatch messages.
      * @param windowManager Window manager to add new servers to.
      */
     @Inject
@@ -91,12 +96,14 @@ public class ServerManager implements ServerFactory {
             final IdentityFactory identityFactory,
             final Provider<CommandController> commandController,
             final TabCompleterFactory tabCompleterFactory,
+            final Provider<MessageSinkManager> messageSinkManager,
             final WindowManager windowManager) {
         this.parserFactoryProvider = parserFactoryProvider;
         this.identityController = identityController;
         this.identityFactory = identityFactory;
         this.commandController = commandController;
         this.tabCompleterFactory = tabCompleterFactory;
+        this.messageSinkManager = messageSinkManager;
         this.windowManager = windowManager;
     }
 
@@ -113,6 +120,7 @@ public class ServerManager implements ServerFactory {
                 tabCompleterFactory,
                 commandController.get(),
                 identityFactory,
+                messageSinkManager.get(),
                 windowManager,
                 uri,
                 profile);

src/com/dmdirc/WritableFrameContainer.java

@@ -52,6 +52,9 @@ public abstract class WritableFrameContainer extends FrameContainer {
     /** The command parser used for commands in this container. */
     protected final CommandParser commandParser;
 
+    /** The manager to use to despatch messages to sinks. */
+    private final MessageSinkManager messageSinkManager;
+
     /**
      * Creates a new WritableFrameContainer.
      *
@@ -60,17 +63,24 @@ public abstract class WritableFrameContainer extends FrameContainer {
      * @param title The title of this container
      * @param config The config manager for this container
      * @param parser The command parser for this container
+     * @param messageSinkManager The sink manager to use to despatch messages
      * @param components The UI components that this frame requires
      * @param windowManager For window management
      * @since 0.6.4
      */
-    public WritableFrameContainer(final String icon, final String name,
-            final String title, final AggregateConfigProvider config,
-            final CommandParser parser, final Collection<String> components,
-            final WindowManager windowManager) {
+    public WritableFrameContainer(
+            final String icon,
+            final String name,
+            final String title,
+            final AggregateConfigProvider config,
+            final CommandParser parser,
+            final MessageSinkManager messageSinkManager,
+            final WindowManager windowManager,
+            final Collection<String> components) {
         super(icon, name, title, config, components, windowManager);
 
         this.commandParser = parser;
+        this.messageSinkManager = messageSinkManager;
         parser.setOwner(this);
     }
 
@@ -254,7 +264,7 @@ public abstract class WritableFrameContainer extends FrameContainer {
      * @param args The arguments for the message
      */
     public void handleNotification(final Date date, final String messageType, final Object... args) {
-        MessageSinkManager.getManager().despatchMessage(this, date, messageType, args);
+        messageSinkManager.despatchMessage(this, date, messageType, args);
     }
 
     /**

src/com/dmdirc/messages/MessageSinkManager.java

@@ -38,9 +38,6 @@ import java.util.regex.Matcher;
  */
 public class MessageSinkManager {
 
-    /** A singleton instance of the manager. */
-    private static MessageSinkManager instance;
-
     /** The configuration domain to use for looking up default sinks. */
     public static final String CONFIG_DOMAIN = "notifications";
 
@@ -148,22 +145,4 @@ public class MessageSinkManager {
         addSink(new StatusBarMessageSink(statusBarManager));
     }
 
-    /**
-     * Retrieves a singleton instance of the sink manager.
-     *
-     * @return A singleton manager instance
-     */
-    public static MessageSinkManager getManager() {
-        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;
-    }
-
 }

test/com/dmdirc/ServerManagerTest.java

@@ -25,6 +25,7 @@ package com.dmdirc;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.config.IdentityFactory;
+import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleterFactory;
@@ -49,6 +50,7 @@ public class ServerManagerTest {
     @Mock private IdentityFactory identityFactory;
     @Mock private Provider<ParserFactory> parserFactoryProvider;
     @Mock private Provider<CommandController> commandControllerProvider;
+    @Mock private Provider<MessageSinkManager> messageSinkManager;
     @Mock private TabCompleterFactory tabCompleterFactory;
     @Mock private WindowManager windowManager;
     private ServerManager serverManager;
@@ -56,7 +58,8 @@ public class ServerManagerTest {
     @Before
     public void setUp() throws Exception {
         serverManager = new ServerManager(parserFactoryProvider, identityController,
-                identityFactory, commandControllerProvider, tabCompleterFactory, windowManager);
+                identityFactory, commandControllerProvider, tabCompleterFactory,
+                messageSinkManager, windowManager);
     }
 
     @After

test/com/dmdirc/ServerTest.java

@@ -27,6 +27,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityFactory;
+import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleterFactory;
 
@@ -51,6 +52,7 @@ public class ServerTest {
     @Mock private IdentityFactory identityFactory;
     @Mock private TabCompleterFactory tabCompleterFactory;
     @Mock private CommandController commandController;
+    @Mock private MessageSinkManager messageSinkManager;
     @Mock private WindowManager windowManager;
 
     private Server server;
@@ -69,6 +71,7 @@ public class ServerTest {
                 tabCompleterFactory,
                 commandController,
                 identityFactory,
+                messageSinkManager,
                 windowManager,
                 new URI("irc-test://255.255.255.255"),
                 profile);

test/com/dmdirc/WritableFrameContainerTest.java

@@ -26,6 +26,7 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.ConfigBinder;
 import com.dmdirc.harness.TestWritableFrameContainer;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.WindowManager;
 
 import java.util.Arrays;
@@ -43,6 +44,7 @@ public class WritableFrameContainerTest {
     @Mock private AggregateConfigProvider acp;
     @Mock private ServerManager serverManager;
     @Mock private WindowManager windowManager;
+    @Mock private MessageSinkManager messageSinkManager;
     private CommandManager commands;
 
     @Before
@@ -59,7 +61,7 @@ public class WritableFrameContainerTest {
     @Test
     public void testGetNumLines() {
         final WritableFrameContainer container10
-                = new TestWritableFrameContainer(10, acp, commands, windowManager);
+                = new TestWritableFrameContainer(10, acp, commands, messageSinkManager, windowManager);
 
         final int res0a = container10.getNumLines("");
         final int res0b = container10.getNumLines("\r");
@@ -89,7 +91,7 @@ public class WritableFrameContainerTest {
     @Test
     public void testSplitLine() {
         final WritableFrameContainer container10
-                = new TestWritableFrameContainer(10, acp, commands, windowManager);
+                = new TestWritableFrameContainer(10, acp, commands, messageSinkManager, windowManager);
         final String[][][] tests = new String[][][]{
             {{""}, {""}},
             {{"0123456789"}, {"0123456789"}},

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -27,6 +27,7 @@ import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleter;
 
@@ -38,10 +39,10 @@ public class TestWritableFrameContainer extends WritableFrameContainer {
 
     public TestWritableFrameContainer(final int lineLength,
             final AggregateConfigProvider cm, final CommandManager commandManager,
-            final WindowManager windowManager) {
+            final MessageSinkManager messageSinkManager, final WindowManager windowManager) {
         super("raw", "Raw", "(Raw)", cm,
-                new GlobalCommandParser(cm, commandManager),
-                Collections.<String>emptySet(), windowManager);
+                new GlobalCommandParser(cm, commandManager), messageSinkManager, windowManager,
+                Collections.<String>emptySet());
 
         this.lineLength = lineLength;
     }