Merge pull request #619 from csmith/tidying

Disable numeric formatting, remove dead code.

src/com/dmdirc/Channel.java

@@ -49,7 +49,6 @@ import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.Styliser;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.util.colours.Colour;
 import com.dmdirc.util.colours.ColourUtils;
 
@@ -101,14 +100,12 @@ public class Channel extends FrameContainer implements GroupChat {
      * @param newChannelInfo      The parser's channel object that corresponds to this channel
      * @param configMigrator      The config migrator which provides the config for this channel.
      * @param tabCompleterFactory The factory to use to create tab completers.
-     * @param messageSinkManager  The sink manager to use to despatch messages.
      */
     public Channel(
             final Connection connection,
             final ChannelInfo newChannelInfo,
             final ConfigProviderMigrator configMigrator,
             final TabCompleterFactory tabCompleterFactory,
-            final MessageSinkManager messageSinkManager,
             final BackBufferFactory backBufferFactory,
             final GroupChatUserManager groupChatUserManager) {
         super(connection.getWindowModel(), "channel-inactive",
@@ -119,7 +116,6 @@ public class Channel extends FrameContainer implements GroupChat {
                 tabCompleterFactory.getTabCompleter(connection.getWindowModel().getTabCompleter(),
                         configMigrator.getConfigProvider(), CommandType.TYPE_CHANNEL,
                         CommandType.TYPE_CHAT),
-                messageSinkManager,
                 connection.getWindowModel().getEventBus(),
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
                         WindowComponent.INPUTFIELD.getIdentifier(),

src/com/dmdirc/ChannelFactory.java

@@ -31,7 +31,6 @@ import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.messages.BackBufferFactory;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -44,7 +43,6 @@ public class ChannelFactory {
 
     private final TabCompleterFactory tabCompleterFactory;
     private final CommandController commandController;
-    private final MessageSinkManager messageSinkManager;
     private final DMDircMBassador eventBus;
     private final BackBufferFactory backBufferFactory;
     private final GroupChatUserManager groupChatUserManager;
@@ -52,12 +50,11 @@ public class ChannelFactory {
 
     @Inject
     public ChannelFactory(final TabCompleterFactory tabCompleterFactory,
-            final CommandController commandController, final MessageSinkManager messageSinkManager,
+            final CommandController commandController,
             final DMDircMBassador eventBus, final BackBufferFactory backBufferFactory,
             final GroupChatUserManager groupChatUserManager, final WindowManager windowManager) {
         this.tabCompleterFactory = tabCompleterFactory;
         this.commandController = commandController;
-        this.messageSinkManager = messageSinkManager;
         this.eventBus = eventBus;
         this.backBufferFactory = backBufferFactory;
         this.groupChatUserManager = groupChatUserManager;
@@ -68,7 +65,7 @@ public class ChannelFactory {
             final ChannelInfo channelInfo,
             final ConfigProviderMigrator configMigrator) {
         final Channel channel = new Channel(connection, channelInfo, configMigrator,
-                tabCompleterFactory, messageSinkManager, backBufferFactory, groupChatUserManager);
+                tabCompleterFactory, backBufferFactory, groupChatUserManager);
         channel.setCommandParser(new ChannelCommandParser(connection.getWindowModel(),
                 commandController, eventBus, channel));
         windowManager.addWindow(connection.getWindowModel(), channel);

src/com/dmdirc/ClientModule.java

@@ -42,7 +42,6 @@ import com.dmdirc.plugins.PluginModule;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 import com.dmdirc.ui.messages.UiMessagesModule;
-import com.dmdirc.ui.messages.sink.MessagesModule;
 import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.updater.UpdaterModule;
 import com.dmdirc.util.LoggingExecutorService;
@@ -71,7 +70,6 @@ import dagger.Provides;
                 CommandLineOptionsModule.class,
                 CommandModule.class,
                 ConfigModule.class,
-                MessagesModule.class,
                 PluginModule.class,
                 ProfilesModule.class,
                 UiMessagesModule.class,

src/com/dmdirc/FrameContainer.java

@@ -40,7 +40,6 @@ import com.dmdirc.ui.messages.BackBuffer;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.Formatter;
 import com.dmdirc.ui.messages.UnreadStatusManager;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.util.ChildEventBusManager;
 import com.dmdirc.util.collections.ListenerList;
 
@@ -95,12 +94,6 @@ public abstract class FrameContainer implements WindowModel {
     /** The back buffer for this container. */
     private BackBuffer backBuffer;
 
-    /**
-     * The manager to use to dispatch messages to sinks.
-     * <p>
-     * Only defined if this container is {@link #writable}.
-     */
-    private final Optional<MessageSinkManager> messageSinkManager;
     /**
      * The tab completer to use.
      * <p>
@@ -134,7 +127,6 @@ public abstract class FrameContainer implements WindowModel {
         this.components = new HashSet<>(components);
         this.writable = false;
         this.tabCompleter = Optional.empty();
-        this.messageSinkManager = Optional.empty();
         this.backBufferFactory = backBufferFactory;
 
         eventBusManager = new ChildEventBusManager(eventBus);
@@ -158,7 +150,6 @@ public abstract class FrameContainer implements WindowModel {
             final AggregateConfigProvider config,
             final BackBufferFactory backBufferFactory,
             final TabCompleter tabCompleter,
-            final MessageSinkManager messageSinkManager,
             final DMDircMBassador eventBus,
             final Collection<String> components) {
         this.parent = Optional.ofNullable(parent);
@@ -168,7 +159,6 @@ public abstract class FrameContainer implements WindowModel {
         this.components = new HashSet<>(components);
         this.writable = true;
         this.tabCompleter = Optional.of(tabCompleter);
-        this.messageSinkManager = Optional.of(messageSinkManager);
         this.backBufferFactory = backBufferFactory;
 
         eventBusManager = new ChildEventBusManager(eventBus);
@@ -406,20 +396,6 @@ public abstract class FrameContainer implements WindowModel {
         return lines;
     }
 
-    /**
-     * Handles general server notifications (i.e., ones not tied to a specific window). The user can
-     * select where the notifications should go in their config.
-     *
-     * @param date        The date/time at which the event occurred
-     * @param messageType The type of message that is being sent
-     * @param args        The arguments for the message
-     */
-    @Deprecated
-    public void handleNotification(final Date date, final String messageType, final Object... args) {
-        checkState(writable);
-        messageSinkManager.get().dispatchMessage(this, date, messageType, args);
-    }
-
     /**
      * Sets the composition state for the local user for this chat.
      *

src/com/dmdirc/GlobalWindow.java

@@ -33,7 +33,6 @@ import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.messages.BackBufferFactory;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
 
 import java.util.Arrays;
 import java.util.Optional;
@@ -54,11 +53,9 @@ public class GlobalWindow extends FrameContainer {
     @Inject
     public GlobalWindow(@GlobalConfig final AggregateConfigProvider config,
             final GlobalCommandParser parser, final TabCompleterFactory tabCompleterFactory,
-            final MessageSinkManager messageSinkManager,
             final DMDircMBassador eventBus, final BackBufferFactory backBufferFactory) {
         super(null, "icon", "Global", "(Global)", config, backBufferFactory,
-                tabCompleterFactory.getTabCompleter(config, CommandType.TYPE_GLOBAL),
-                messageSinkManager, eventBus,
+                tabCompleterFactory.getTabCompleter(config, CommandType.TYPE_GLOBAL), eventBus,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
                         WindowComponent.INPUTFIELD.getIdentifier()));
         initBackBuffer();

src/com/dmdirc/Query.java

@@ -47,7 +47,6 @@ import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.messages.BackBufferFactory;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
 
 import java.awt.Toolkit;
 import java.util.Arrays;
@@ -71,7 +70,6 @@ public class Query extends FrameContainer implements PrivateChat {
             final Connection connection,
             final User user,
             final TabCompleterFactory tabCompleterFactory,
-            final MessageSinkManager messageSinkManager,
             final BackBufferFactory backBufferFactory) {
         super(connection.getWindowModel(), "query",
                 user.getNickname(),
@@ -81,7 +79,6 @@ public class Query extends FrameContainer implements PrivateChat {
                 tabCompleterFactory.getTabCompleter(connection.getWindowModel().getTabCompleter(),
                         connection.getWindowModel().getConfigManager(),
                         CommandType.TYPE_QUERY, CommandType.TYPE_CHAT),
-                messageSinkManager,
                 connection.getWindowModel().getEventBus(),
                 Arrays.asList(
                         WindowComponent.TEXTAREA.getIdentifier(),

src/com/dmdirc/QueryFactory.java

@@ -30,7 +30,6 @@ import com.dmdirc.interfaces.User;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.messages.BackBufferFactory;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -43,24 +42,23 @@ public class QueryFactory {
 
     private final TabCompleterFactory tabCompleterFactory;
     private final CommandController commandController;
-    private final MessageSinkManager messageSinkManager;
     private final BackBufferFactory backBufferFactory;
     private final WindowManager windowManager;
 
     @Inject
-    public QueryFactory(final TabCompleterFactory tabCompleterFactory,
-            final CommandController commandController, final MessageSinkManager messageSinkManager,
-            final BackBufferFactory backBufferFactory, final WindowManager windowManager) {
+    public QueryFactory(
+            final TabCompleterFactory tabCompleterFactory,
+            final CommandController commandController,
+            final BackBufferFactory backBufferFactory,
+            final WindowManager windowManager) {
         this.tabCompleterFactory = tabCompleterFactory;
         this.commandController = commandController;
-        this.messageSinkManager = messageSinkManager;
         this.backBufferFactory = backBufferFactory;
         this.windowManager = windowManager;
     }
 
     public Query getQuery(final Connection connection, final User user) {
-        final Query query = new Query(connection, user, tabCompleterFactory,
-                messageSinkManager, backBufferFactory);
+        final Query query = new Query(connection, user, tabCompleterFactory, backBufferFactory);
         query.setCommandParser(new QueryCommandParser(connection.getWindowModel(),
                 commandController, connection.getWindowModel().getEventBus(), query));
         windowManager.addWindow(connection.getWindowModel(), query);

src/com/dmdirc/Server.java

@@ -57,7 +57,6 @@ import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.Formatter;
 import com.dmdirc.ui.messages.HighlightManager;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
 
 import java.net.NoRouteToHostException;
 import java.net.SocketException;
@@ -178,7 +177,6 @@ public class Server extends FrameContainer implements Connection {
             final ParserFactory parserFactory,
             final TabCompleterFactory tabCompleterFactory,
             final IdentityFactory identityFactory,
-            final MessageSinkManager messageSinkManager,
             final QueryFactory queryFactory,
             final DMDircMBassador eventBus,
             final MessageEncoderFactory messageEncoderFactory,
@@ -196,7 +194,6 @@ public class Server extends FrameContainer implements Connection {
                 backBufferFactory,
                 tabCompleterFactory.getTabCompleter(configMigrator.getConfigProvider(),
                         CommandType.TYPE_SERVER, CommandType.TYPE_GLOBAL),
-                messageSinkManager,
                 eventBus,
                 Arrays.asList(
                         WindowComponent.TEXTAREA.getIdentifier(),

src/com/dmdirc/ServerEventHandler.java

@@ -86,9 +86,6 @@ import com.dmdirc.parser.events.WallDesyncEvent;
 import com.dmdirc.parser.events.WallopEvent;
 import com.dmdirc.parser.events.WalluserEvent;
 import com.dmdirc.ui.StatusMessage;
-import com.dmdirc.util.EventUtils;
-
-import com.google.common.base.Strings;
 
 import java.util.List;
 import java.util.Optional;
@@ -245,20 +242,7 @@ public class ServerEventHandler extends EventHandler {
 
     @Handler
     public void onNumeric(final NumericEvent event) {
-        final String sansIrcd = "numeric_" + Strings
-                .padStart(String.valueOf(event.getNumeric()), 3, '0');
-        String target = "";
-
-        if (owner.getConfigManager().hasOptionString("formatter", sansIrcd)) {
-            target = sansIrcd;
-        } else if (owner.getConfigManager().hasOptionString("formatter", "numeric_unknown")) {
-            target = "numeric_unknown";
-        }
-
-        final ServerNumericEvent coreEvent = new ServerNumericEvent(owner, event.getNumeric(),
-                event.getToken());
-        final String format = EventUtils.postDisplayable(eventBus, coreEvent, target);
-        owner.handleNotification(event.getDate(), format, (Object[]) event.getToken());
+        eventBus.publishAsync(new ServerNumericEvent(owner, event.getNumeric(), event.getToken()));
     }
 
     @Handler

src/com/dmdirc/ServerFactoryImpl.java

@@ -30,7 +30,6 @@ import com.dmdirc.interfaces.config.ConfigProviderMigrator;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.messages.BackBufferFactory;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
 
 import java.net.URI;
 import java.util.concurrent.ScheduledExecutorService;
@@ -48,7 +47,6 @@ public class ServerFactoryImpl {
     private final ParserFactory parserFactory;
     private final TabCompleterFactory tabCompleterFactory;
     private final IdentityFactory identityFactory;
-    private final MessageSinkManager messageSinkManager;
     private final Provider<QueryFactory> queryFactory;
     private final Provider<CommandController> commandController;
     private final DMDircMBassador eventBus;
@@ -63,7 +61,6 @@ public class ServerFactoryImpl {
             final ParserFactory parserFactory,
             final TabCompleterFactory tabCompleterFactory,
             final IdentityFactory identityFactory,
-            final MessageSinkManager messageSinkManager,
             final Provider<QueryFactory> queryFactory,
             final Provider<CommandController> commandController,
             final DMDircMBassador eventBus,
@@ -75,7 +72,6 @@ public class ServerFactoryImpl {
         this.parserFactory = parserFactory;
         this.tabCompleterFactory = tabCompleterFactory;
         this.identityFactory = identityFactory;
-        this.messageSinkManager = messageSinkManager;
         this.queryFactory = queryFactory;
         this.commandController = commandController;
         this.eventBus = eventBus;
@@ -92,10 +88,9 @@ public class ServerFactoryImpl {
             final URI uri,
             final Profile profile) {
         final Server server = new Server(configMigrator, parserFactory,
-                tabCompleterFactory, identityFactory, messageSinkManager,
-                queryFactory.get(), eventBus, messageEncoderFactory, userSettings,
-                groupChatManagerFactory, executorService, uri, profile, backBufferFactory,
-                userManager);
+                tabCompleterFactory, identityFactory, queryFactory.get(), eventBus,
+                messageEncoderFactory, userSettings, groupChatManagerFactory, executorService,
+                uri, profile, backBufferFactory, userManager);
         server.setCommandParser(new ServerCommandParser(server.getConfigManager(),
                 commandController.get(), eventBus, server));
         return server;

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

@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.ui.messages.sink;
-
-import com.dmdirc.interfaces.WindowModel;
-
-import java.util.Date;
-import java.util.regex.Pattern;
-
-import javax.inject.Inject;
-
-/**
- * A message sink which adds the message to all of the container's server's children.
- */
-@Deprecated
-public class AllMessageSink implements MessageSink {
-
-    /** The pattern to use to match this sink. */
-    private static final Pattern PATTERN = Pattern.compile("all");
-
-    @Inject
-    public AllMessageSink() {
-    }
-
-    @Override
-    public Pattern getPattern() {
-        return PATTERN;
-    }
-
-    @Override
-    public void handleMessage(final MessageSinkManager dispatcher,
-            final WindowModel source,
-            final String[] patternMatches, final Date date,
-            final String messageType, final Object... args) {
-        source.getConnection().get().addLineToAll(messageType, date, args);
-    }
-
-}

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

@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.ui.messages.sink;
-
-import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.GroupChat;
-import com.dmdirc.interfaces.WindowModel;
-
-import java.util.Date;
-import java.util.Optional;
-import java.util.regex.Pattern;
-
-import javax.inject.Inject;
-
-/**
- * A message sink which adds the message to a named channel. An optional fallback may be specified
- * for use if the channel does not exist. If no fallback is specified and the channel does not
- * exist, the message is dispatched to the source.
- */
-@Deprecated
-public class ChannelMessageSink implements MessageSink {
-
-    /** The pattern to use to match this sink. */
-    private static final Pattern PATTERN = Pattern.compile("channel:(.*?)(?:\\s(.*))?");
-
-    @Inject
-    public ChannelMessageSink() {
-    }
-
-    @Override
-    public Pattern getPattern() {
-        return PATTERN;
-    }
-
-    @Override
-    public void handleMessage(final MessageSinkManager dispatcher,
-            final WindowModel source,
-            final String[] patternMatches, final Date date,
-            final String messageType, final Object... args) {
-        final String channelName = String.format(patternMatches[0], args);
-        final Connection connection = source.getConnection().get();
-        final Optional<GroupChat> channel = connection.getGroupChatManager()
-                .getChannel(channelName);
-
-        if (channel.isPresent()) {
-            channel.get().getWindowModel().addLine(messageType, date, args);
-        } else {
-            if (patternMatches[1] == null) {
-                // No fallback specified
-                source.addLine(messageType, date, args);
-            } else {
-                // They specified a fallback
-                dispatcher.dispatchMessage(source, date, messageType, patternMatches[1], args);
-            }
-        }
-    }
-
-}

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

@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.ui.messages.sink;
-
-import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.GroupChat;
-import com.dmdirc.interfaces.User;
-import com.dmdirc.interfaces.WindowModel;
-
-import java.util.Date;
-import java.util.regex.Pattern;
-
-import javax.inject.Inject;
-
-/**
- * A message sink which adds the message to all channels the local user has in common with a
- * specified remote user. An optional fallback may be specified for use if there are no common
- * channels with the user. If no fallback is specified and there are no common channels, the message
- * is dispatched to the source.
- */
-@Deprecated
-public class CommonChannelsMessageSink implements MessageSink {
-
-    /** The pattern to use to match this sink. */
-    private static final Pattern PATTERN = Pattern.compile("comchans:(.*?)(?:\\s(.*))?");
-
-    @Inject
-    public CommonChannelsMessageSink() {
-    }
-
-    @Override
-    public Pattern getPattern() {
-        return PATTERN;
-    }
-
-    @Override
-    public void handleMessage(final MessageSinkManager dispatcher,
-            final WindowModel source,
-            final String[] patternMatches, final Date date,
-            final String messageType, final Object... args) {
-        final String username = String.format(patternMatches[0], args);
-        final Connection connection = source.getConnection().get();
-        final User user = connection.getUser(username);
-        boolean found = false;
-
-        for (GroupChat channel : connection.getGroupChatManager().getChannels()) {
-            if (channel.getUser(user).isPresent()) {
-                channel.getWindowModel().addLine(messageType, date, args);
-                found = true;
-            }
-        }
-
-        if (!found) {
-            if (patternMatches[1] == null) {
-                // No fallback specified
-                source.addLine(messageType, date, args);
-            } else {
-                // They specified a fallback
-                dispatcher.dispatchMessage(source, date, messageType, patternMatches[1], args);
-            }
-        }
-    }
-
-}

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

@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.ui.messages.sink;
-
-import com.dmdirc.CustomWindow;
-import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.ui.WindowManager;
-import com.dmdirc.ui.messages.BackBufferFactory;
-
-import java.util.Date;
-import java.util.regex.Pattern;
-
-import javax.inject.Inject;
-
-/**
- * A message sink which adds the message to a custom window, creating it if necessary.
- */
-@Deprecated
-public class CustomWindowMessageSink implements MessageSink {
-
-    /** The pattern to use to match this sink. */
-    private static final Pattern PATTERN = Pattern.compile("window:(.*)");
-    /** Window management. */
-    private final WindowManager windowManager;
-    /** Back buffer Factory. */
-    private final BackBufferFactory backBufferFactory;
-
-    /**
-     * Creates a new custom window message sink.
-     */
-    @Inject
-    public CustomWindowMessageSink(
-            final WindowManager windowManager,
-            final BackBufferFactory backBufferFactory) {
-        this.windowManager = windowManager;
-        this.backBufferFactory = backBufferFactory;
-    }
-
-    @Override
-    public Pattern getPattern() {
-        return PATTERN;
-    }
-
-    @Override
-    public void handleMessage(final MessageSinkManager dispatcher,
-            final WindowModel source,
-            final String[] patternMatches, final Date date,
-            final String messageType, final Object... args) {
-        final WindowModel connectionContainer =
-                source.getConnection().get().getWindowModel();
-        WindowModel targetWindow = windowManager
-                .findCustomWindow(connectionContainer, patternMatches[0]);
-
-        if (targetWindow == null) {
-            targetWindow = new CustomWindow(patternMatches[0], patternMatches[0],
-                    connectionContainer, backBufferFactory);
-            windowManager.addWindow(connectionContainer, targetWindow);
-        }
-
-        targetWindow.addLine(messageType, date, args);
-    }
-
-}

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

@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.ui.messages.sink;
-
-import com.dmdirc.interfaces.WindowModel;
-
-import java.util.Date;
-import java.util.regex.Pattern;
-
-import javax.inject.Inject;
-
-/**
- * A message sink which allows the message to be forked into multiple other sinks.
- */
-@Deprecated
-public class ForkMessageSink implements MessageSink {
-
-    /** The pattern to use to match this sink. */
-    private static final Pattern PATTERN = Pattern.compile("fork:(.*)");
-
-    @Inject
-    public ForkMessageSink() {
-    }
-
-    @Override
-    public Pattern getPattern() {
-        return PATTERN;
-    }
-
-    @Override
-    public void handleMessage(final MessageSinkManager dispatcher,
-            final WindowModel source,
-            final String[] patternMatches, final Date date,
-            final String messageType, final Object... args) {
-        for (String target : patternMatches[0].split("\\|")) {
-            dispatcher.dispatchMessage(source, date, target, args);
-        }
-    }
-
-}

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

@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.ui.messages.sink;
-
-import com.dmdirc.interfaces.WindowModel;
-
-import java.util.Date;
-import java.util.regex.Pattern;
-
-import javax.inject.Inject;
-
-/**
- * A message sink which changes the format of the message and then re-dispatches it.
- */
-@Deprecated
-public class FormatMessageSink implements MessageSink {
-
-    /** The pattern to use to match this sink. */
-    private static final Pattern PATTERN = Pattern.compile("format:(.*?):(.*)");
-
-    @Inject
-    public FormatMessageSink() {
-    }
-
-    @Override
-    public Pattern getPattern() {
-        return PATTERN;
-    }
-
-    @Override
-    public void handleMessage(final MessageSinkManager dispatcher,
-            final WindowModel source,
-            final String[] patternMatches, final Date date,
-            final String messageType, final Object... args) {
-        dispatcher.dispatchMessage(source, date, patternMatches[0], patternMatches[1], args);
-    }
-
-}

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

@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.ui.messages.sink;
-
-import com.dmdirc.interfaces.WindowModel;
-
-import java.util.Date;
-import java.util.regex.Pattern;
-
-import javax.inject.Inject;
-
-/**
- * A message sink which changes the sink to the value of a named configuration setting to allow
- * grouping of sinks.
- */
-@Deprecated
-public class GroupMessageSink implements MessageSink {
-
-    /** The pattern to use to match this sink. */
-    private static final Pattern PATTERN = Pattern.compile("group:(.*)");
-
-    @Inject
-    public GroupMessageSink() {
-    }
-
-    @Override
-    public Pattern getPattern() {
-        return PATTERN;
-    }
-
-    @Override
-    public void handleMessage(final MessageSinkManager dispatcher,
-            final WindowModel source,
-            final String[] patternMatches, final Date date,
-            final String messageType, final Object... args) {
-        final String target;
-        if (source.getConfigManager().hasOptionString(MessageSinkManager.CONFIG_DOMAIN,
-                patternMatches[0])) {
-            target = source.getConfigManager().getOption(MessageSinkManager.CONFIG_DOMAIN,
-                    patternMatches[0]);
-        } else {
-            target = MessageSinkManager.DEFAULT_SINK;
-        }
-
-        dispatcher.dispatchMessage(source, date, messageType, target, args);
-    }
-
-}

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

@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.ui.messages.sink;
-
-import com.dmdirc.interfaces.WindowModel;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.regex.Pattern;
-
-import javax.inject.Inject;
-
-/**
- * A message sink which adds the message to the window where a command matching the provided regex
- * was most recently executed. If no such window is found, falls back to the source.
- */
-@Deprecated
-public class LastCommandMessageSink implements MessageSink {
-
-    /** The pattern to use to match this sink. */
-    private static final Pattern PATTERN = Pattern.compile("lastcommand:(.*)");
-
-    @Inject
-    public LastCommandMessageSink() {
-    }
-
-    @Override
-    public Pattern getPattern() {
-        return PATTERN;
-    }
-
-    @Override
-    public void handleMessage(final MessageSinkManager dispatcher,
-            final WindowModel source,
-            final String[] patternMatches, final Date date,
-            final String messageType, final Object... args) {
-        final Object[] escapedargs = new Object[args.length];
-
-        for (int i = 0; i < args.length; i++) {
-            escapedargs[i] = "\\Q" + args[i] + "\\E";
-        }
-
-        final String command = String.format(patternMatches[0], escapedargs);
-
-        WindowModel best = source;
-
-        final Collection<WindowModel> containers = new ArrayList<>();
-
-        final WindowModel connectionContainer = source.getConnection().get().getWindowModel();
-        containers.add(connectionContainer);
-        containers.addAll(connectionContainer.getChildren());
-
-        long besttime = 0;
-        for (WindowModel container : containers) {
-            if (!container.isWritable()) {
-                continue;
-            }
-
-            final long time = container.getCommandParser().getCommandTime(command);
-            if (time > besttime) {
-                besttime = time;
-                best = container;
-            }
-        }
-
-        best.addLine(messageType, date, args);
-    }
-
-}

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

@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.ui.messages.sink;
-
-import com.dmdirc.interfaces.WindowModel;
-
-import java.util.Date;
-import java.util.regex.Pattern;
-
-/**
- * Represents a possible destination (sink) for a generic DMDirc message.
- */
-@Deprecated
-public interface MessageSink {
-
-    /**
-     * Returns a regular expression pattern that can be used to determine if this sink matches a
-     * given configuration entry. If the pattern contains groups, the values of the matched groups
-     * are passed into the handleMessage method.
-     *
-     * @return Pattern to matches a config entry
-     */
-    Pattern getPattern();
-
-    /**
-     * Handles a message which has been directed to this sink.
-     *
-     * @param dispatcher     The manager that is dispatching the message
-     * @param source         The original source of the message
-     * @param patternMatches An array of groups matched from this sink's pattern
-     * @param date           The date at which the message occurred
-     * @param messageType    The type of the message (used for formatting)
-     * @param args           The message arguments
-     */
-    void handleMessage(final MessageSinkManager dispatcher,
-            final WindowModel source,
-            final String[] patternMatches, final Date date,
-            final String messageType, final Object... args);
-
-}

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

@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.ui.messages.sink;
-
-import com.dmdirc.interfaces.WindowModel;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.regex.Matcher;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static com.dmdirc.util.LogUtils.USER_ERROR;
-
-/**
- * Manages message sinks and facilitates dispatching of messages to sinks.
- */
-@Deprecated
-public class MessageSinkManager {
-
-    private static final Logger LOG = LoggerFactory.getLogger(MessageSinkManager.class);
-    /** The configuration domain to use for looking up default sinks. */
-    public static final String CONFIG_DOMAIN = "notifications";
-    /** The default sink to use if none is specified or in case of error. */
-    public static final String DEFAULT_SINK = "self";
-    /** A list of known sinks. */
-    private final Collection<MessageSink> sinks = new ArrayList<>();
-
-    /**
-     * Adds a new sink to the list of known sinks.
-     *
-     * @param sink The sink to be added
-     */
-    public void addSink(final MessageSink sink) {
-        sinks.add(sink);
-    }
-
-    /**
-     * Removes an existing sink from the list of known sinks.
-     *
-     * @param sink The sink to be removed
-     */
-    public void removeSink(final MessageSink sink) {
-        sinks.remove(sink);
-    }
-
-    /**
-     * Dispatches a message to the appropriate sink. This method will attempt to select an
-     * appropriate target sink from the user's configuration.
-     *
-     * @param source      The source of the message
-     * @param date        The date at which the message occurred
-     * @param messageType The type (or 'format') of the message
-     * @param args        The message arguments
-     */
-    public void dispatchMessage(final WindowModel source, final Date date,
-            final String messageType, final Object... args) {
-        final String target;
-        if (source.getConfigManager().hasOptionString(CONFIG_DOMAIN, messageType)) {
-            target = source.getConfigManager().getOption(CONFIG_DOMAIN, messageType);
-        } else {
-            target = DEFAULT_SINK;
-        }
-
-        dispatchMessage(source, date, messageType, target, args);
-    }
-
-    /**
-     * Dispatches a message to the appropriate sink.
-     *
-     * @param source      The source of the message
-     * @param date        The date at which the message occurred
-     * @param messageType The type (or 'format') of the message
-     * @param targetSink  The textual representation of the destination sink
-     * @param args        The message arguments
-     */
-    public void dispatchMessage(final WindowModel source, final Date date,
-            final String messageType, final String targetSink, final Object... args) {
-        for (MessageSink sink : sinks) {
-            final Matcher matcher = sink.getPattern().matcher(targetSink);
-
-            if (matcher.matches()) {
-                final String[] matches = new String[matcher.groupCount()];
-
-                for (int i = 0; i < matcher.groupCount(); i++) {
-                    matches[i] = matcher.group(i + 1);
-                }
-
-                sink.handleMessage(this, source, matches, date, messageType, args);
-                return;
-            }
-        }
-
-        // None of the sinks matched :(
-        LOG.warn(USER_ERROR, "Invalid target message sink for type {}: {}", messageType, targetSink);
-
-        if (!DEFAULT_SINK.equals(targetSink)) {
-            dispatchMessage(source, date, messageType, DEFAULT_SINK, args);
-        }
-    }
-
-}

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

@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.ui.messages.sink;
-
-import com.dmdirc.DMDircMBassador;
-
-import java.util.Set;
-
-import javax.inject.Singleton;
-
-import dagger.Module;
-import dagger.Provides;
-
-/**
- * Module for dependency injecting the {@link MessageSinkManager} and its default sinks.
- */
-@Deprecated
-@Module(library = true, complete = false)
-public class MessagesModule {
-
-    @Provides
-    @Singleton
-    public MessageSinkManager getMessageSinkManager(final DMDircMBassador eventBus,
-            final Set<MessageSink> defaultSinks) {
-        final MessageSinkManager messageSinkManager = new MessageSinkManager();
-        defaultSinks.forEach(messageSinkManager::addSink);
-        return messageSinkManager;
-    }
-
-    @Provides(type = Provides.Type.SET)
-    public MessageSink getAllMessageSink(final AllMessageSink sink) {
-        return sink;
-    }
-
-    @Provides(type = Provides.Type.SET)
-    public MessageSink getChannelMessageSink(final ChannelMessageSink sink) {
-        return sink;
-    }
-
-    @Provides(type = Provides.Type.SET)
-    public MessageSink getCommonChannelsMessageSink(final CommonChannelsMessageSink sink) {
-        return sink;
-    }
-
-    @Provides(type = Provides.Type.SET)
-    public MessageSink getCustomWindowMessageSink(final CustomWindowMessageSink sink) {
-        return sink;
-    }
-
-    @Provides(type = Provides.Type.SET)
-    public MessageSink getForkMessageSink(final ForkMessageSink sink) {
-        return sink;
-    }
-
-    @Provides(type = Provides.Type.SET)
-    public MessageSink getFormatMessageSink(final FormatMessageSink sink) {
-        return sink;
-    }
-
-    @Provides(type = Provides.Type.SET)
-    public MessageSink getGroupMessageSink(final GroupMessageSink sink) {
-        return sink;
-    }
-
-    @Provides(type = Provides.Type.SET)
-    public MessageSink getLastCommandMessageSink(final LastCommandMessageSink sink) {
-        return sink;
-    }
-
-    @Provides(type = Provides.Type.SET)
-    public MessageSink getNullMessageSink(final NullMessageSink sink) {
-        return sink;
-    }
-
-    @Provides(type = Provides.Type.SET)
-    public MessageSink getSelfMessageSink(final SelfMessageSink sink) {
-        return sink;
-    }
-
-    @Provides(type = Provides.Type.SET)
-    public MessageSink getServerMessageSink(final ServerMessageSink sink) {
-        return sink;
-    }
-
-    @Provides(type = Provides.Type.SET)
-    public MessageSink getStatusBarMessageSink(final StatusBarMessageSink sink) {
-        return sink;
-    }
-
-}

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

@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.ui.messages.sink;
-
-import com.dmdirc.interfaces.WindowModel;
-
-import java.util.Date;
-import java.util.regex.Pattern;
-
-import javax.inject.Inject;
-
-/**
- * A message sink which does nothing with the message.
- */
-@Deprecated
-public class NullMessageSink implements MessageSink {
-
-    /** The pattern to use to match this sink. */
-    private static final Pattern PATTERN = Pattern.compile("none");
-
-    @Inject
-    public NullMessageSink() {
-    }
-
-    @Override
-    public Pattern getPattern() {
-        return PATTERN;
-    }
-
-    @Override
-    public void handleMessage(final MessageSinkManager dispatcher,
-            final WindowModel source,
-            final String[] patternMatches, final Date date,
-            final String messageType, final Object... args) {
-        // Do nothing
-    }
-
-}

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

@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.ui.messages.sink;
-
-import com.dmdirc.interfaces.WindowModel;
-
-import java.util.Date;
-import java.util.regex.Pattern;
-
-import javax.inject.Inject;
-
-/**
- * A message sink which adds the message to the container that dispatched it.
- */
-@Deprecated
-public class SelfMessageSink implements MessageSink {
-
-    /** The pattern to use to match this sink. */
-    private static final Pattern PATTERN = Pattern.compile("self");
-
-    @Inject
-    public SelfMessageSink() {
-    }
-
-    @Override
-    public Pattern getPattern() {
-        return PATTERN;
-    }
-
-    @Override
-    public void handleMessage(final MessageSinkManager dispatcher,
-            final WindowModel source,
-            final String[] patternMatches, final Date date,
-            final String messageType, final Object... args) {
-        source.addLine(messageType, date, args);
-    }
-
-}

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

@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.ui.messages.sink;
-
-import com.dmdirc.interfaces.WindowModel;
-
-import java.util.Date;
-import java.util.regex.Pattern;
-
-import javax.inject.Inject;
-
-/**
- * A message sink which adds the message to the container's server.
- */
-@Deprecated
-public class ServerMessageSink implements MessageSink {
-
-    /** The pattern to use to match this sink. */
-    private static final Pattern PATTERN = Pattern.compile("server");
-
-    @Inject
-    public ServerMessageSink() {
-    }
-
-    @Override
-    public Pattern getPattern() {
-        return PATTERN;
-    }
-
-    @Override
-    public void handleMessage(final MessageSinkManager dispatcher,
-            final WindowModel source,
-            final String[] patternMatches, final Date date,
-            final String messageType, final Object... args) {
-        source.getConnection().get().getWindowModel().addLine(messageType, date, args);
-    }
-
-}

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

@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.ui.messages.sink;
-
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.events.StatusBarMessageEvent;
-import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.ui.StatusMessage;
-import com.dmdirc.ui.messages.Formatter;
-
-import java.util.Date;
-import java.util.regex.Pattern;
-
-import javax.inject.Inject;
-
-/**
- * A message sink which adds the message to the status bar.
- */
-@Deprecated
-public class StatusBarMessageSink implements MessageSink {
-
-    /** The pattern to use to match this sink. */
-    private static final Pattern PATTERN = Pattern.compile("statusbar");
-    /** The event bus to post status messages to. */
-    private final DMDircMBassador eventBus;
-
-    /**
-     * Creates a new instance of {@link StatusBarMessageSink}.
-     *
-     * @param eventBus The event bus to post status messages to
-     */
-    @Inject
-    public StatusBarMessageSink(final DMDircMBassador eventBus) {
-        this.eventBus = eventBus;
-    }
-
-    @Override
-    public Pattern getPattern() {
-        return PATTERN;
-    }
-
-    @Override
-    public void handleMessage(final MessageSinkManager dispatcher,
-            final WindowModel source,
-            final String[] patternMatches, final Date date,
-            final String messageType, final Object... args) {
-        final String message = Formatter.formatMessage(source.getConfigManager(),
-                messageType, args);
-        eventBus.publishAsync(new StatusBarMessageEvent(new StatusMessage(message,
-                source.getConfigManager())));
-    }
-
-}

test/com/dmdirc/WritableFrameContainerTest.java

@@ -28,7 +28,6 @@ import com.dmdirc.harness.TestWritableFrameContainer;
 import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.messages.BackBufferFactory;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
 
 import java.util.Arrays;
 
@@ -48,7 +47,6 @@ public class WritableFrameContainerTest {
     @Mock private AggregateConfigProvider acp;
     @Mock private ConfigBinder configBinder;
     @Mock private ConnectionManager connectionManager;
-    @Mock private MessageSinkManager messageSinkManager;
     @Mock private DMDircMBassador eventBus;
     @Mock private BackBufferFactory backBufferFactory;
     @Mock private Provider<GlobalWindow> globalWindowProvider;
@@ -66,7 +64,7 @@ public class WritableFrameContainerTest {
     @Test
     public void testGetNumLines() {
         final FrameContainer container10 = new TestWritableFrameContainer(10, acp, commands,
-                messageSinkManager, eventBus, backBufferFactory);
+                eventBus, backBufferFactory);
 
         final int res0a = container10.getNumLines("");
         final int res0b = container10.getNumLines("\r");
@@ -96,7 +94,7 @@ public class WritableFrameContainerTest {
     @Test
     public void testSplitLine() {
         final FrameContainer container10 = new TestWritableFrameContainer(10, acp, commands,
-                messageSinkManager, eventBus, backBufferFactory);
+                eventBus, backBufferFactory);
         final String[][][] tests = new String[][][]{
             {{""}, {""}},
             {{"0123456789"}, {"0123456789"}},

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -30,7 +30,6 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.messages.BackBufferFactory;
-import com.dmdirc.ui.messages.sink.MessageSinkManager;
 
 import java.util.Collections;
 import java.util.Optional;
@@ -41,12 +40,10 @@ public class TestWritableFrameContainer extends FrameContainer {
 
     public TestWritableFrameContainer(final int lineLength,
             final AggregateConfigProvider cm, final CommandManager commandManager,
-            final MessageSinkManager messageSinkManager,
             final DMDircMBassador eventBus,
             final BackBufferFactory backBufferFactory) {
         super(null, "raw", "Raw", "(Raw)", cm, backBufferFactory,
                 new TabCompleter(cm),
-                messageSinkManager,
                 eventBus,
                 Collections.<String>emptySet());