Merge branch 'master' of https://github.com/DMDirc/DMDirc

res/com/dmdirc/config/defaults/default/defaults

@@ -182,8 +182,6 @@ treeview:
   foregroundcolour=false:0
 
 channel:
-  splitusermodes=false
-  hideduplicatemodes=false
   showmodeprefix=true
   topichistorysize=10
   encoding=UTF-8

res/com/dmdirc/ui/messages/format.yml

@@ -8,6 +8,42 @@ ServerCtcpEvent:
 ServerCtcpReplyEvent:
   format: "-!- CTCP {{type}} reply from {{user.nickname}}: {{content}}."
   colour: 4
+ServerDisconnectedEvent:
+  format: "-!- You have been disconnected from the server."
+  colour: 2
+ServerConnectErrorEvent:
+  format: "Error connecting: {{message}}"
+  colour: 2
+ServerReconnectScheduledEvent:
+  format: "Reconnecting in {{seconds}} seconds..."
+  colour: 2
+ServerStonedEvent:
+  format: "-!- Disconnected from a non-responsive server."
+  colour: 2
+ServerMotdStartEvent:
+  format: "{{message}}"
+  colour: 10
+ServerMotdLineEvent:
+  format: "{{message}}"
+  colour: 10
+ServerMotdEndEvent:
+  format: "{{message}}"
+  colour: 10
+ServerAwayEvent:
+  format: "You are now marked as away ({{reason}})."
+  colour: 14
+ServerBackEvent:
+  format: "You are no longer marked as away."
+  colour: 14
+
+################## Server messaging events #########################################################
+
+ServerNoticeEvent:
+  format: "-{{user.nickname}}- {{message}}"
+  colour: 5
+ServerServerNoticeEvent:
+  format: "-{{user.nickname}}- {{message}}"
+  colour: 5
 
 ################## Channel join/part/quit events ###################################################
 
@@ -127,11 +163,8 @@ CommandOutputEvent:
   format: "{{message}}"
 
 ################## TODO ############################################################################
-#  channelSplitUserMode_default=3* %1$s%2$s sets mode %9$s on %6$s.
 #  channelNoModes=3* There are no channel modes for %2$s.
 #  channelModeDiscovered=3* Channel modes for %2$s are: %1$s.
-#  privateNotice=5-%1$s- %4$s
-#  serverNotice=5-%1$s- %4$s
 #  userModeChanged=3* %1$s sets user mode: %4$s.
 #  userNoModes=3* No user modes.
 #  userModeDiscovered=3* User modes are: %4$s.
@@ -142,23 +175,12 @@ CommandOutputEvent:
 #  selfCTCP=4->- [%1$s] %2$s
 #  selfNotice=5>%1$s> %2$s
 #  selfMessage=>[%1$s]> %2$s
-#  connectError=2Error connecting: %2$s
-#  connectRetry=2Reconnecting in %2$u...
 #  serverConnecting=Connecting to %1$s:%2$s...
-#  back=14You are no longer marked as away.
 #  serverDisconnectInProgress=A disconnection attempt is in progress, please wait...
 #  serverConnectInProgress=A connection attempt is in progress, please wait...
 #  authNotice=5-AUTH- %1$s
-#  away=14You are now marked as away (%1$s14).
 #  rawCommand=10>>> %1$s
 #  unknownCommand=14Unknown command %1$s.
-#  socketClosed=2-!- You have been disconnected from the server.
-#  stonedServer=2-!- Disconnected from a non-responsive server.
-#  motdStart=10%1$s
-#  motdLine=10%1$s
-#  motdEnd=10%1$s
-#  rawIn=<< %1$s
-#  rawOut=>> %1$s
 #  commandOutput=%1$s
 #  actionTooLong=Warning: action too long to be sent
 #  tabCompletion=14Multiple possibilities: %1$s

src/com/dmdirc/Channel.java

@@ -86,9 +86,6 @@ public class Channel extends FrameContainer implements GroupChat {
     private final GroupChatUserManager groupChatUserManager;
     /** Whether we're in this channel or not. */
     private boolean isOnChannel;
-    /** Whether we should send WHO requests for this channel. */
-    @ConfigBinding(domain = "channel", key = "sendwho")
-    private volatile boolean sendWho;
     /** Whether we should show mode prefixes in text. */
     @ConfigBinding(domain = "channel", key = "showmodeprefix")
     private volatile boolean showModePrefix;
@@ -229,7 +226,6 @@ public class Channel extends FrameContainer implements GroupChat {
         final User me = connection.getLocalUser().get();
         getEventBus().publishAsync(new ChannelSelfJoinEvent(this, me));
 
-        checkWho();
         setIcon("channel");
 
         connection.getInviteManager().removeInvites(channelInfo.getName());
@@ -299,15 +295,6 @@ public class Channel extends FrameContainer implements GroupChat {
         getEventBus().publish(new ChannelClosedEvent(this));
     }
 
-    /**
-     * Called every {general.whotime} seconds to check if the channel needs to send a who request.
-     */
-    public void checkWho() {
-        if (isOnChannel && sendWho) {
-            channelInfo.sendWho();
-        }
-    }
-
     /**
      * Adds a ChannelClient to this Channel.
      *

src/com/dmdirc/ChannelEventHandler.java

@@ -45,7 +45,6 @@ import com.dmdirc.events.ChannelTopicChangeEvent;
 import com.dmdirc.events.ChannelTopicUnsetEvent;
 import com.dmdirc.events.ChannelUserAwayEvent;
 import com.dmdirc.events.ChannelUserBackEvent;
-import com.dmdirc.events.ChannelUserModeChangeEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.common.AwayState;
 import com.dmdirc.parser.common.CallbackManager;
@@ -64,12 +63,10 @@ import com.dmdirc.parser.interfaces.callbacks.ChannelModeChangeListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelModeNoticeListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelNamesListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelNickChangeListener;
-import com.dmdirc.parser.interfaces.callbacks.ChannelNonUserModeChangeListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelNoticeListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelPartListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelQuitListener;
 import com.dmdirc.parser.interfaces.callbacks.ChannelTopicListener;
-import com.dmdirc.parser.interfaces.callbacks.ChannelUserModeChangeListener;
 import com.dmdirc.parser.interfaces.callbacks.OtherAwayStateListener;
 import com.dmdirc.util.EventUtils;
 
@@ -88,10 +85,8 @@ public class ChannelEventHandler extends EventHandler implements
         ChannelMessageListener, ChannelNamesListener, ChannelTopicListener,
         ChannelJoinListener, ChannelPartListener, ChannelKickListener,
         ChannelQuitListener, ChannelActionListener, ChannelNickChangeListener,
-        ChannelModeChangeListener, ChannelUserModeChangeListener,
-        ChannelCtcpListener, OtherAwayStateListener, ChannelNoticeListener,
-        ChannelNonUserModeChangeListener, ChannelModeNoticeListener,
-        ChannelListModeListener {
+        ChannelModeChangeListener, ChannelCtcpListener, OtherAwayStateListener,
+        ChannelNoticeListener, ChannelModeNoticeListener, ChannelListModeListener {
 
     /** The channel that owns this event handler. */
     private final Channel owner;
@@ -279,48 +274,23 @@ public class ChannelEventHandler extends EventHandler implements
             final String modes) {
         checkParser(parser);
 
-        if (!owner.getConfigManager().getOptionBool("channel", "splitusermodes")
-                || !owner.getConfigManager().getOptionBool("channel", "hideduplicatemodes")) {
-            if (host.isEmpty()) {
-                final ChannelModesDiscoveredEvent event = new ChannelModesDiscoveredEvent(
-                        date.getTime(), owner, modes.length() <= 1 ? "" : modes);
-                final String format = EventUtils.postDisplayable(eventBus, event,
-                        modes.length() <= 1 ? "channelNoModes" : "channelModeDiscovered");
-                owner.doNotification(date, format, modes.length() <= 1 ? "" : modes);
-            } else if (isMyself(client)) {
-                eventBus.publishAsync(new ChannelSelfModeChangeEvent(date.getTime(), owner,
-                        groupChatUserManager.getUserFromClient(client, owner), modes));
-            } else {
-                eventBus.publishAsync(new ChannelModeChangeEvent(date.getTime(), owner,
-                        groupChatUserManager.getUserFromClient(client, owner), modes));
-            }
+        if (host.isEmpty()) {
+            final ChannelModesDiscoveredEvent event = new ChannelModesDiscoveredEvent(
+                    date.getTime(), owner, modes.length() <= 1 ? "" : modes);
+            final String format = EventUtils.postDisplayable(eventBus, event,
+                    modes.length() <= 1 ? "channelNoModes" : "channelModeDiscovered");
+            owner.doNotification(date, format, modes.length() <= 1 ? "" : modes);
+        } else if (isMyself(client)) {
+            eventBus.publishAsync(new ChannelSelfModeChangeEvent(date.getTime(), owner,
+                    groupChatUserManager.getUserFromClient(client, owner), modes));
+        } else {
+            eventBus.publishAsync(new ChannelModeChangeEvent(date.getTime(), owner,
+                    groupChatUserManager.getUserFromClient(client, owner), modes));
         }
 
         owner.refreshClients();
     }
 
-    @Override
-    public void onChannelUserModeChanged(final Parser parser, final Date date,
-            final ChannelInfo channel, final ChannelClientInfo targetClient,
-            final ChannelClientInfo client, final String host, final String mode) {
-        checkParser(parser);
-
-        if (owner.getConfigManager().getOptionBool("channel", "splitusermodes")) {
-            String format = "channelSplitUserMode_" + mode;
-
-            if (!owner.getConfigManager().hasOptionString("formatter", format)) {
-                format = "channelSplitUserMode_default";
-            }
-
-            final ChannelUserModeChangeEvent event = new ChannelUserModeChangeEvent(date.getTime(),
-                    owner, groupChatUserManager.getUserFromClient(client, owner),
-                    groupChatUserManager.getUserFromClient(targetClient, owner), mode);
-            final String result = EventUtils.postDisplayable(eventBus, event, format);
-            owner.doNotification(date, result, groupChatUserManager.getUserFromClient(client, owner),
-                    groupChatUserManager.getUserFromClient(targetClient, owner), mode);
-        }
-    }
-
     @Override
     public void onChannelCTCP(final Parser parser, final Date date,
             final ChannelInfo channel, final ChannelClientInfo client,
@@ -359,32 +329,6 @@ public class ChannelEventHandler extends EventHandler implements
                 groupChatUserManager.getUserFromClient(client, owner), message));
     }
 
-    @Override
-    public void onChannelNonUserModeChanged(final Parser parser, final Date date,
-            final ChannelInfo channel, final ChannelClientInfo client,
-            final String host, final String modes) {
-        checkParser(parser);
-
-        if (owner.getConfigManager().getOptionBool("channel", "splitusermodes")
-                && owner.getConfigManager().getOptionBool("channel", "hideduplicatemodes")) {
-            if (host.isEmpty()) {
-                final ChannelModesDiscoveredEvent event = new ChannelModesDiscoveredEvent(
-                        date.getTime(), owner, modes.length() <= 1 ? "" : modes);
-                final String format = EventUtils.postDisplayable(eventBus, event,
-                        modes.length() <= 1 ? "channelNoModes" : "channelModeDiscovered");
-                owner.doNotification(date, format, modes.length() <= 1 ? "" : modes);
-            } else if (isMyself(client)) {
-                eventBus.publishAsync(new ChannelSelfModeChangeEvent(date.getTime(), owner,
-                        groupChatUserManager.getUserFromClient(client, owner), modes));
-            } else {
-                eventBus.publishAsync(new ChannelModeChangeEvent(date.getTime(), owner,
-                        groupChatUserManager.getUserFromClient(client, owner), modes));
-            }
-        }
-
-        owner.refreshClients();
-    }
-
     @Override
     public void onChannelModeNotice(final Parser parser, final Date date,
             final ChannelInfo channel, final char prefix,

src/com/dmdirc/Server.java

@@ -30,6 +30,7 @@ import com.dmdirc.events.ServerConnectErrorEvent;
 import com.dmdirc.events.ServerConnectedEvent;
 import com.dmdirc.events.ServerConnectingEvent;
 import com.dmdirc.events.ServerDisconnectedEvent;
+import com.dmdirc.events.ServerReconnectScheduledEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChatManager;
 import com.dmdirc.interfaces.InviteManager;
@@ -439,7 +440,7 @@ public class Server extends FrameContainer implements Connection {
             final int delay = Math.max(1000,
                     getConfigManager().getOptionInt(DOMAIN_GENERAL, "reconnectdelay"));
 
-            handleNotification("connectRetry", getAddress(), delay / 1000);
+            getEventBus().publishAsync(new ServerReconnectScheduledEvent(this, delay / 1000));
 
             reconnectTimerFuture = executorService.schedule(() -> {
                 synchronized (myStateLock) {
@@ -850,8 +851,6 @@ public class Server extends FrameContainer implements Connection {
             return;
         }
 
-        handleNotification("socketClosed", getAddress());
-
         getEventBus().publish(new ServerDisconnectedEvent(this));
 
         eventHandler.unregisterCallbacks();
@@ -956,8 +955,6 @@ public class Server extends FrameContainer implements Connection {
 
             getEventBus().publish(new ServerConnectErrorEvent(this, description));
 
-            handleNotification("connectError", getAddress(), description);
-
             if (getConfigManager().getOptionBool(DOMAIN_GENERAL, "reconnectonconnectfailure")) {
                 doDelayedReconnect();
             }

src/com/dmdirc/ServerEventHandler.java

@@ -42,6 +42,7 @@ import com.dmdirc.events.ServerNoticeEvent;
 import com.dmdirc.events.ServerNumericEvent;
 import com.dmdirc.events.ServerPingSentEvent;
 import com.dmdirc.events.ServerServerNoticeEvent;
+import com.dmdirc.events.ServerStonedEvent;
 import com.dmdirc.events.ServerUnknownActionEvent;
 import com.dmdirc.events.ServerUnknownMessageEvent;
 import com.dmdirc.events.ServerUnknownNoticeEvent;
@@ -184,9 +185,9 @@ public class ServerEventHandler extends EventHandler implements
         }
     }
 
+    @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
     @Override
     public void onErrorInfo(final Parser parser, final Date date, final ParserError errorInfo) {
-        final ErrorLevel errorLevel = ErrorLevel.UNKNOWN;
 
         final StringBuilder errorString = new StringBuilder();
         errorString.append("Parser exception.\n\n");
@@ -205,6 +206,7 @@ public class ServerEventHandler extends EventHandler implements
         final Exception ex = errorInfo.isException() ? errorInfo.getException()
                 : new Exception(errorString.toString()); // NOPMD
 
+        final ErrorLevel errorLevel = ErrorLevel.UNKNOWN;
         if (errorInfo.isUserError()) {
             eventBus.publishAsync(new UserErrorEvent(errorLevel, ex, errorInfo.getData(), ""));
         } else {
@@ -229,7 +231,6 @@ public class ServerEventHandler extends EventHandler implements
     public void onPrivateCTCPReply(final Parser parser, final Date date, final String type,
             final String message, final String host) {
         checkParser(parser);
-
         eventBus.publish(new ServerCtcpReplyEvent(owner, owner.getUser(host), type, message));
     }
 
@@ -244,50 +245,34 @@ public class ServerEventHandler extends EventHandler implements
     public void onPrivateNotice(final Parser parser, final Date date,
             final String message, final String host) {
         checkParser(parser);
-
-        final ServerNoticeEvent event = new ServerNoticeEvent(owner, owner.getLocalUser().get(),
-                message);
-        final String format = EventUtils.postDisplayable(eventBus, event, "privateNotice");
-        owner.doNotification(format, owner.getUser(host), message);
+        eventBus.publishAsync(new ServerNoticeEvent(owner, owner.getLocalUser().get(), message));
     }
 
     @Override
     public void onServerNotice(final Parser parser, final Date date,
             final String message, final String host) {
         checkParser(parser);
-
-        final ServerServerNoticeEvent event = new ServerServerNoticeEvent(owner,
-                owner.getLocalUser().get(), message);
-        final String format = EventUtils.postDisplayable(eventBus, event, "serverNotice");
-        owner.doNotification(format, owner.getUser(host), message);
+        eventBus.publishAsync(new ServerServerNoticeEvent(owner, owner.getLocalUser().get(),
+                message));
     }
 
     @Override
     public void onMOTDStart(final Parser parser, final Date date, final String data) {
         checkParser(parser);
-
-        final ServerMotdStartEvent event = new ServerMotdStartEvent(owner, data);
-        final String format = EventUtils.postDisplayable(eventBus, event, "motdStart");
-        owner.doNotification(format, data);
+        eventBus.publishAsync(new ServerMotdStartEvent(owner, data));
     }
 
     @Override
     public void onMOTDLine(final Parser parser, final Date date, final String data) {
         checkParser(parser);
-
-        final ServerMotdLineEvent event = new ServerMotdLineEvent(owner, data);
-        final String format = EventUtils.postDisplayable(eventBus, event, "motdLine");
-        owner.doNotification(format, data);
+        eventBus.publishAsync(new ServerMotdLineEvent(owner, data));
     }
 
     @Override
     public void onMOTDEnd(final Parser parser, final Date date,
             final boolean noMOTD, final String data) {
         checkParser(parser);
-
-        final ServerMotdEndEvent event = new ServerMotdEndEvent(owner, data);
-        final String format = EventUtils.postDisplayable(eventBus, event, "motdEnd");
-        owner.doNotification(format, data);
+        eventBus.publishAsync(new ServerMotdEndEvent(owner, data));
     }
 
     @Override
@@ -331,7 +316,7 @@ public class ServerEventHandler extends EventHandler implements
         if (parser.getPingTime()
                 >= owner.getConfigManager().getOptionInt("server", "pingtimeout")) {
             LOG.warn("Server appears to be stoned, reconnecting");
-            owner.handleNotification("stonedServer", owner.getAddress());
+            eventBus.publishAsync(new ServerStonedEvent(owner));
             owner.reconnect();
         }
     }
@@ -339,14 +324,12 @@ public class ServerEventHandler extends EventHandler implements
     @Override
     public void onPingSent(final Parser parser, final Date date) {
         checkParser(parser);
-
         eventBus.publishAsync(new ServerPingSentEvent(owner));
     }
 
     @Override
     public void onPingSuccess(final Parser parser, final Date date) {
         checkParser(parser);
-
         eventBus.publishAsync(new ServerGotPingEvent(owner,
                 owner.getParser().get().getServerLatency()));
     }
@@ -359,13 +342,9 @@ public class ServerEventHandler extends EventHandler implements
         owner.updateAwayState(currentState == AwayState.AWAY ? Optional.of(reason) : Optional.empty());
 
         if (currentState == AwayState.AWAY) {
-            final ServerAwayEvent event = new ServerAwayEvent(owner, reason);
-            final String format = EventUtils.postDisplayable(eventBus, event, "away");
-            owner.doNotification(format, reason);
+            eventBus.publishAsync(new ServerAwayEvent(owner, reason));
         } else if (oldState != AwayState.UNKNOWN) {
-            final ServerBackEvent event = new ServerBackEvent(owner);
-            final String format = EventUtils.postDisplayable(eventBus, event, "back");
-            owner.doNotification(format);
+            eventBus.publishAsync(new ServerBackEvent(owner));
         }
     }
 

src/com/dmdirc/commandparser/CommandManager.java

@@ -34,7 +34,9 @@ import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompletionType;
-import com.dmdirc.util.collections.MapList;
+
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
 
 import java.util.HashMap;
 import java.util.List;
@@ -52,7 +54,7 @@ public class CommandManager implements CommandController {
     /** A list of commands that have been instantiated. */
     private final Map<CommandInfo, Command> commands = new HashMap<>();
     /** A list of command parsers that have been instantiated. */
-    private final MapList<CommandType, CommandParser> parsers = new MapList<>();
+    private final Multimap<CommandType, CommandParser> parsers = ArrayListMultimap.create();
     /** The manager to use to iterate servers. */
     private final ConnectionManager connectionManager;
     /** Provider to use to retrieve the global window. */
@@ -220,7 +222,7 @@ public class CommandManager implements CommandController {
                     parser.registerCommand(pair.getValue(), pair.getKey());
                 }
 
-                parsers.add(type, parser);
+                parsers.put(type, parser);
             }
         }
     }

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

@@ -38,7 +38,9 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.messages.Styliser;
-import com.dmdirc.util.collections.MapList;
+
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -64,7 +66,7 @@ public class JoinChannelCommand extends Command implements IntelligentCommand {
             CommandType.TYPE_SERVER);
     /** A map of channel name mentions. */
     @GuardedBy("mentionsLock")
-    private final MapList<FrameContainer, String> mentions = new MapList<>();
+    private final Multimap<FrameContainer, String> mentions = ArrayListMultimap.create();
     /** Lock to synchronise on when accessing mentions. */
     private final Object mentionsLock = new Object();
 
@@ -117,7 +119,7 @@ public class JoinChannelCommand extends Command implements IntelligentCommand {
         synchronized (mentionsLock) {
             for (int i = 1; i < parts.length; i += 2) {
                 // All of the odd parts of the array are channel names
-                mentions.add(event.getFrameContainer(), parts[i]);
+                mentions.put(event.getFrameContainer(), parts[i]);
             }
         }
     }

src/com/dmdirc/config/ConfigBinder.java

@@ -28,7 +28,9 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.util.collections.MapList;
+
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
 
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Executable;
@@ -48,7 +50,7 @@ import javax.annotation.Nonnull;
 public class ConfigBinder {
 
     /** A map of instances to created listeners. */
-    private final MapList<Object, ConfigChangeListener> listeners = new MapList<>();
+    private final Multimap<Object, ConfigChangeListener> listeners = ArrayListMultimap.create();
     /** The default domain to use. */
     private final Optional<String> defaultDomain;
     /** The configuration manager to use to retrieve settings. */
@@ -219,7 +221,7 @@ public class ConfigBinder {
     private void addListeners(final Object instance,
             final Collection<ConfigChangeListener> newListeners) {
         synchronized (listeners) {
-            listeners.add(instance, newListeners);
+            listeners.putAll(instance, newListeners);
         }
     }
 
@@ -230,8 +232,8 @@ public class ConfigBinder {
      */
     public void unbind(final Object instance) {
         synchronized (listeners) {
-            listeners.safeGet(instance).forEach(manager::removeListener);
-            listeners.remove(instance);
+            listeners.get(instance).forEach(manager::removeListener);
+            listeners.removeAll(instance);
         }
     }
 

src/com/dmdirc/config/ConfigFileBackedConfigProvider.java

@@ -27,15 +27,14 @@ import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.util.collections.WeakList;
 import com.dmdirc.util.io.ConfigFile;
 import com.dmdirc.util.io.InvalidConfigFileException;
 import com.dmdirc.util.validators.Validator;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.ref.WeakReference;
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -44,6 +43,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.annotation.Nullable;
 
@@ -70,7 +70,8 @@ public class ConfigFileBackedConfigProvider implements ConfigProvider {
     /** The global config manager. */
     protected ConfigManager globalConfig;
     /** The config change listeners for this source. */
-    protected final List<ConfigChangeListener> listeners = new WeakList<>();
+    protected final List<WeakReference<ConfigChangeListener>> listeners =
+            new CopyOnWriteArrayList<>();
     /** The event bus to post error events to. */
     private final DMDircMBassador eventBus;
     /** Whether this identity needs to be saved. */
@@ -274,9 +275,10 @@ public class ConfigFileBackedConfigProvider implements ConfigProvider {
      * @since 0.6.3m1
      */
     private void fireSettingChange(final String domain, final String key) {
-        for (ConfigChangeListener listener : new ArrayList<>(listeners)) {
-            listener.configChanged(domain, key);
-        }
+        listeners.stream()
+                .map(WeakReference::get)
+                .filter(Objects::nonNull)
+                .forEach(l -> l.configChanged(domain, key));
     }
 
     @Override
@@ -518,12 +520,15 @@ public class ConfigFileBackedConfigProvider implements ConfigProvider {
 
     @Override
     public void addListener(final ConfigChangeListener listener) {
-        listeners.add(listener);
+        listeners.add(new WeakReference<>(listener));
     }
 
     @Override
     public void removeListener(final ConfigChangeListener listener) {
-        listeners.remove(listener);
+        listeners.stream().filter(w -> {
+            final ConfigChangeListener target = w.get();
+            return target == null || target.equals(listener);
+        }).forEach(listeners::remove);
     }
 
     /**

src/com/dmdirc/config/ConfigManager.java

@@ -29,9 +29,11 @@ import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProviderListener;
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
 import com.dmdirc.util.ClientInfo;
-import com.dmdirc.util.collections.MapList;
 import com.dmdirc.util.validators.Validator;
 
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -59,7 +61,7 @@ class ConfigManager implements ConfigChangeListener, ConfigProviderListener,
     /** A list of sources for this config manager. */
     private final List<ConfigProvider> sources = new ArrayList<>();
     /** The listeners registered for this manager. */
-    private final MapList<String, ConfigChangeListener> listeners = new MapList<>();
+    private final Multimap<String, ConfigChangeListener> listeners = ArrayListMultimap.create();
     /** The config binder to use for this manager. */
     private final ConfigBinder binder;
     /** The manager to use to fetch global state. */
@@ -433,7 +435,8 @@ class ConfigManager implements ConfigChangeListener, ConfigProviderListener,
     @Override
     public void removeListener(final ConfigChangeListener listener) {
         synchronized (listeners) {
-            listeners.removeFromAll(listener);
+            final Iterable<String> keys = new HashSet<>(listeners.keySet());
+            keys.forEach(k -> listeners.remove(k, listener));
         }
     }
 
@@ -446,7 +449,7 @@ class ConfigManager implements ConfigChangeListener, ConfigProviderListener,
     private void addListener(final String key,
             final ConfigChangeListener listener) {
         synchronized (listeners) {
-            listeners.add(key, listener);
+            listeners.put(key, listener);
         }
     }
 

src/com/dmdirc/config/IdentityManager.java

@@ -34,13 +34,15 @@ import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.util.ClientInfo;
-import com.dmdirc.util.collections.MapList;
-import com.dmdirc.util.collections.WeakMapList;
 import com.dmdirc.util.io.ConfigFile;
 import com.dmdirc.util.io.FileUtils;
 import com.dmdirc.util.io.InvalidConfigFileException;
 
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
+
 import java.io.IOException;
+import java.lang.ref.WeakReference;
 import java.net.URISyntaxException;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
@@ -49,9 +51,9 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
@@ -80,7 +82,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
      * Standard identities are inserted with a <code>null</code> key, custom identities use their
      * custom type as the key.
      */
-    private final MapList<String, ConfigProvider> identities = new MapList<>();
+    private final Multimap<String, ConfigProvider> identities = ArrayListMultimap.create();
     /** Map of paths to corresponding config providers, to facilitate reloading. */
     private final Map<Path, ConfigProvider> configProvidersByPath = new ConcurrentHashMap<>();
     /** The event bus to post events to. */
@@ -91,7 +93,8 @@ public class IdentityManager implements IdentityFactory, IdentityController {
      * Listeners for standard identities are inserted with a <code>null</code> key, listeners for a
      * specific custom type use their type as the key.
      */
-    private final MapList<String, ConfigProviderListener> listeners = new WeakMapList<>();
+    private final Multimap<String, WeakReference<ConfigProviderListener>> listeners =
+            ArrayListMultimap.create();
     /** Client info objecty. */
     private final ClientInfo clientInfo;
     /** The identity file used for the global config. */
@@ -283,13 +286,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
      * @since 0.6.4
      */
     private Iterable<ConfigProvider> getAllIdentities() {
-        final Collection<ConfigProvider> res = new LinkedHashSet<>();
-
-        for (Map.Entry<String, List<ConfigProvider>> entry : identities.entrySet()) {
-            res.addAll(entry.getValue());
-        }
-
-        return res;
+        return identities.values();
     }
 
     /**
@@ -372,20 +369,21 @@ public class IdentityManager implements IdentityFactory, IdentityController {
 
         final String target = getGroup(identity);
 
-        if (identities.containsValue(target, identity)) {
+        if (identities.containsEntry(target, identity)) {
             removeConfigProvider(identity);
         }
 
         synchronized (identities) {
-            identities.add(target, identity);
+            identities.put(target, identity);
         }
 
         LOG.debug("Adding identity: {} (group: {})", new Object[]{identity, target});
 
         synchronized (listeners) {
-            for (ConfigProviderListener listener : listeners.safeGet(target)) {
-                listener.configProviderAdded(identity);
-            }
+            listeners.get(target).stream()
+                    .map(WeakReference::get)
+                    .filter(Objects::nonNull)
+                    .forEach(l -> l.configProviderAdded(identity));
         }
     }
 
@@ -395,7 +393,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
 
         final String group = getGroup(identity);
 
-        checkArgument(identities.containsValue(group, identity));
+        checkArgument(identities.containsEntry(group, identity));
 
         Path path = null;
         for (Map.Entry<Path, ConfigProvider> entry : configProvidersByPath.entrySet()) {
@@ -413,9 +411,10 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         }
 
         synchronized (listeners) {
-            for (ConfigProviderListener listener : listeners.safeGet(group)) {
-                listener.configProviderRemoved(identity);
-            }
+            listeners.get(group).stream()
+                    .map(WeakReference::get)
+                    .filter(Objects::nonNull)
+                    .forEach(l -> l.configProviderRemoved(identity));
         }
     }
 
@@ -426,7 +425,12 @@ public class IdentityManager implements IdentityFactory, IdentityController {
 
     @Override
     public void unregisterIdentityListener(final ConfigProviderListener listener) {
-        listeners.removeFromAll(listener);
+        synchronized (listeners) {
+            listeners.entries().stream().filter(e -> {
+                final ConfigProviderListener value = e.getValue().get();
+                return value == null || value.equals(listener);
+            }).forEach(e -> listeners.remove(e.getKey(), e.getValue()));
+        }
     }
 
     @Override
@@ -434,13 +438,13 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         checkNotNull(listener);
 
         synchronized (listeners) {
-            listeners.add(type, listener);
+            listeners.put(type, new WeakReference<>(listener));
         }
     }
 
     @Override
-    public List<ConfigProvider> getProvidersByType(final String type) {
-        return Collections.unmodifiableList(identities.safeGet(type));
+    public Collection<ConfigProvider> getProvidersByType(final String type) {
+        return Collections.unmodifiableCollection(identities.get(type));
     }
 
     /**
@@ -455,7 +459,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         final List<ConfigProvider> sources = new ArrayList<>();
 
         synchronized (identities) {
-            sources.addAll(identities.safeGet(null).stream()
+            sources.addAll(identities.get(null).stream()
                     .filter(manager::identityApplies)
                     .collect(Collectors.toList()));
         }
@@ -491,7 +495,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         final String myTarget = (channel + '@' + network).toLowerCase();
 
         synchronized (identities) {
-            for (ConfigProvider identity : identities.safeGet(null)) {
+            for (ConfigProvider identity : identities.get(null)) {
                 if (identity.getTarget().getType() == ConfigTarget.TYPE.CHANNEL
                         && identity.getTarget().getData().equalsIgnoreCase(myTarget)) {
                     return identity;
@@ -516,7 +520,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         final String myTarget = network.toLowerCase();
 
         synchronized (identities) {
-            for (ConfigProvider identity : identities.safeGet(null)) {
+            for (ConfigProvider identity : identities.get(null)) {
                 if (identity.getTarget().getType() == ConfigTarget.TYPE.NETWORK
                         && identity.getTarget().getData().equalsIgnoreCase(myTarget)) {
                     return identity;
@@ -541,7 +545,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         final String myTarget = server.toLowerCase();
 
         synchronized (identities) {
-            for (ConfigProvider identity : identities.safeGet(null)) {
+            for (ConfigProvider identity : identities.get(null)) {
                 if (identity.getTarget().getType() == ConfigTarget.TYPE.SERVER
                         && identity.getTarget().getData().equalsIgnoreCase(myTarget)) {
                     return identity;

src/com/dmdirc/config/prefs/PreferencesDialogModel.java

@@ -185,10 +185,6 @@ public class PreferencesDialogModel {
                 "ui", "confirmQuit", "Confirm quit",
                 "Show a confirmation message when you try to close the client",
                 configManager, identity));
-        category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                "channel", "splitusermodes", "Split user modes",
-                "Show individual mode lines for each mode change that affects"
-                + " a user (e.g. op, devoice)", configManager, identity));
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "channel", "showmodeprefix", "Show mode prefix",
                 "Prefix users' names with their mode (e.g. @) in channels",

src/com/dmdirc/config/prefs/PreferencesManager.java

@@ -143,11 +143,6 @@ public class PreferencesManager {
                 "These settings are specific to this channel on this network,"
                 + " any settings specified here will overwrite global settings");
 
-        category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                "channel", "splitusermodes", "Split user modes",
-                "Show individual mode lines for each mode change that affects"
-                + " a user (e.g. op, devoice)",
-                manager, identity));
         category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "channel", "showmodeprefix", "Show mode prefix",
                 "Prefix users' names with their mode (e.g. @) in channels",

src/com/dmdirc/events/DisplayProperty.java

@@ -27,11 +27,16 @@ import com.dmdirc.util.colours.Colour;
 /**
  * Describes a property that may be set on a {@link DisplayableEvent} to affect its display.
  */
-public final class DisplayProperty<T> {
+@SuppressWarnings("UnusedDeclaration") // Generic type used for compile-time validation only
+public interface DisplayProperty<T> {
 
     /** The foreground colour of text relating to the event. */
-    public static final DisplayProperty<Colour> FOREGROUND_COLOUR = new DisplayProperty<>();
+    DisplayProperty<Colour> FOREGROUND_COLOUR = new DisplayPropertyImpl<>();
     /** The background colour of text relating to the event. */
-    public static final DisplayProperty<Colour> BACKGROUND_COLOUR = new DisplayProperty<>();
+    DisplayProperty<Colour> BACKGROUND_COLOUR = new DisplayPropertyImpl<>();
+    /** Whether to suppress display of the event. */
+    DisplayProperty<Void> DO_NOT_DISPLAY = new DisplayPropertyImpl<>();
+
+    final class DisplayPropertyImpl<T> implements DisplayProperty<T> {}
 
 }

src/com/dmdirc/events/ServerDisconnectedEvent.java

@@ -27,7 +27,7 @@ import com.dmdirc.interfaces.Connection;
 /**
  * Fire when a server disconnects.
  */
-public class ServerDisconnectedEvent extends ServerEvent {
+public class ServerDisconnectedEvent extends ServerDisplayableEvent {
 
     public ServerDisconnectedEvent(final Connection connection) {
         super(connection);

src/com/dmdirc/events/ServerReconnectScheduledEvent.java

@@ -0,0 +1,43 @@
+/*
+ * 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.events;
+
+import com.dmdirc.interfaces.Connection;
+
+/**
+ * Event raised when a reconnection attempt has been scheduled.
+ */
+public class ServerReconnectScheduledEvent extends ServerDisplayableEvent {
+
+    private final int seconds;
+
+    public ServerReconnectScheduledEvent(final Connection connection, final int seconds) {
+        super(connection);
+        this.seconds = seconds;
+    }
+
+    public int getSeconds() {
+        return seconds;
+    }
+
+}

src/com/dmdirc/events/ServerStonedEvent.java

@@ -0,0 +1,36 @@
+/*
+ * 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.events;
+
+import com.dmdirc.interfaces.Connection;
+
+/**
+ * Event raised when a server appears to be 'stoned' (i.e., non-responsive).
+ */
+public class ServerStonedEvent extends ServerDisplayableEvent {
+
+    public ServerStonedEvent(final Connection connection) {
+        super(connection);
+    }
+
+}

src/com/dmdirc/interfaces/config/IdentityController.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.interfaces.config;
 
-import java.util.List;
+import java.util.Collection;
 
 /**
  * Defines the interface implemented by the object in charge of DMDirc's identities.
@@ -68,7 +68,7 @@ public interface IdentityController {
      *
      * @since 0.6.4
      */
-    List<ConfigProvider> getProvidersByType(String type);
+    Collection<ConfigProvider> getProvidersByType(String type);
 
     /**
      * Loads user-defined identity files.

src/com/dmdirc/plugins/PluginManager.java

@@ -29,7 +29,9 @@ import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.updater.components.PluginComponent;
 import com.dmdirc.updater.manager.UpdateManager;
-import com.dmdirc.util.collections.MapList;
+
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
 
 import java.io.File;
 import java.net.MalformedURLException;
@@ -366,7 +368,7 @@ public class PluginManager {
             }
         }
 
-        final MapList<String, String> newServices = new MapList<>();
+        final Multimap<String, String> newServices = ArrayListMultimap.create();
         final Map<String, PluginMetaData> newPluginsByName = new HashMap<>();
         final Map<String, PluginMetaData> newPluginsByPath = new HashMap<>();
 
@@ -389,13 +391,13 @@ public class PluginManager {
 
                     for (String service : targetMetaData.getServices()) {
                         final String[] parts = service.split(" ", 2);
-                        newServices.add(parts[1], parts[0]);
+                        newServices.put(parts[1], parts[0]);
                     }
 
                     for (String export : targetMetaData.getExports()) {
                         final String[] parts = export.split(" ");
                         final String name = parts.length > 4 ? parts[4] : parts[0];
-                        newServices.add("export", name);
+                        newServices.put("export", name);
                     }
                 }
             } catch (MalformedURLException mue) {

src/com/dmdirc/plugins/PluginMetaDataValidator.java

@@ -23,7 +23,8 @@
 package com.dmdirc.plugins;
 
 import com.dmdirc.updater.Version;
-import com.dmdirc.util.collections.MapList;
+
+import com.google.common.collect.Multimap;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -62,7 +63,7 @@ public class PluginMetaDataValidator {
      * @return A collection of errors that occurred (if any)
      */
     public Collection<String> validate(final Map<String, PluginMetaData> plugins,
-            final MapList<String, String> services) {
+            final Multimap<String, String> services) {
         errors.clear();
 
         checkMetaData();
@@ -100,7 +101,7 @@ public class PluginMetaDataValidator {
      * @param services A map of known services
      */
     protected void checkRequirements(final Map<String, PluginMetaData> plugins,
-            final MapList<String, String> services) {
+            final Multimap<String, String> services) {
         checkOS(metadata.getRequirements().get("os"), System.getProperty("os.name"), System.
                 getProperty("os.version"), System.getProperty("os.arch"));
         checkFiles(metadata.getRequirements().get("files"));
@@ -114,7 +115,7 @@ public class PluginMetaDataValidator {
      * @param knownServices A map of known services
      * @param services      Required services
      */
-    private void checkServices(final MapList<String, String> knownServices,
+    private void checkServices(final Multimap<String, String> knownServices,
             final Collection<String> services) {
         if (services == null || services.isEmpty()) {
             return;
@@ -127,7 +128,7 @@ public class PluginMetaDataValidator {
 
             if (!knownServices.containsKey(type)
                     || !"any".equalsIgnoreCase(name)
-                    && !knownServices.containsValue(type, name)) {
+                    && !knownServices.containsEntry(type, name)) {
                 errors.add("Service " + name + " of type " + type
                         + " not available");
             }

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

@@ -24,9 +24,10 @@ package com.dmdirc.ui.input;
 
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.util.collections.MapList;
 
-import java.util.List;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
+
 import java.util.Locale;
 import java.util.Map;
 
@@ -47,7 +48,7 @@ public class TabCompleter {
     /** The controller to use to retrieve command information. */
     private final CommandController commandController;
     /** The entries in this completer. */
-    private final MapList<TabCompletionType, String> entries = new MapList<>();
+    private final Multimap<TabCompletionType, String> entries = ArrayListMultimap.create();
 
     /**
      * Creates a new instance of {@link TabCompleter}.
@@ -91,7 +92,7 @@ public class TabCompleter {
             final AdditionalTabTargets additionals) {
         final TabCompletionMatches result = new TabCompletionMatches();
 
-        final MapList<TabCompletionType, String> targets = new MapList<>(entries);
+        final Multimap<TabCompletionType, String> targets = ArrayListMultimap.create(entries);
 
         final boolean caseSensitive = configManager.getOptionBool("tabcompletion", "casesensitive");
         final boolean allowEmpty = configManager.getOptionBool("tabcompletion", "allowempty");
@@ -101,26 +102,25 @@ public class TabCompleter {
         }
 
         if (additionals != null) {
-            targets.safeGet(TabCompletionType.ADDITIONAL).addAll(additionals);
+            targets.putAll(TabCompletionType.ADDITIONAL, additionals);
         }
 
-        for (Map.Entry<TabCompletionType, List<String>> typeEntry : targets.entrySet()) {
-            if (additionals != null && !additionals.shouldInclude(typeEntry.getKey())) {
+        for (Map.Entry<TabCompletionType, String> entry : targets.entries()) {
+            // TODO: This can probably be replaced with a stream + filter chain
+            if (additionals != null && !additionals.shouldInclude(entry.getKey())) {
                 // If we're not including this type, skip to the next.
                 continue;
             }
 
-            for (String entry : typeEntry.getValue()) {
-                // Skip over duplicates
-                if (result.hasResult(entry)) {
-                    continue;
-                }
-
-                if (caseSensitive && entry.startsWith(partial)
-                        || !caseSensitive && entry.toLowerCase(Locale.getDefault())
-                                .startsWith(partial.toLowerCase(Locale.getDefault()))) {
-                    result.addResult(entry);
-                }
+            // Skip over duplicates
+            if (result.hasResult(entry.getValue())) {
+                continue;
+            }
+
+            if (caseSensitive && entry.getValue().startsWith(partial)
+                    || !caseSensitive && entry.getValue().toLowerCase(Locale.getDefault())
+                            .startsWith(partial.toLowerCase(Locale.getDefault()))) {
+                result.addResult(entry.getValue());
             }
         }
 
@@ -142,7 +142,7 @@ public class TabCompleter {
      * @param entry The new entry to be added
      */
     public void addEntry(final TabCompletionType type, final String entry) {
-        entries.add(type, entry);
+        entries.put(type, entry);
 
         if (type == TabCompletionType.COMMAND && entry.length() > 1
                 && entry.charAt(0) == commandController.getCommandChar()
@@ -193,7 +193,7 @@ public class TabCompleter {
      * @param type The type of entry to clear
      */
     public void clear(final TabCompletionType type) {
-        entries.clear(type);
+        entries.removeAll(type);
     }
 
 }

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

@@ -24,7 +24,9 @@ package com.dmdirc.ui.messages;
 
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.events.DisplayableEvent;
+import com.dmdirc.util.EventUtils;
 
 import net.engio.mbassy.listener.Handler;
 
@@ -72,19 +74,30 @@ public class BackBuffer {
      *
      * @param event The event to be displayed.
      */
-    @Handler
-    public void handleDisplayableEvent(final DisplayableEvent event) {
-        if (event.getSource().equals(owner)) {
+    @Handler(priority = EventUtils.PRIORITY_DISPLAYABLE_EVENT_HANDLER)
+    private void handleDisplayableEvent(final DisplayableEvent event) {
+        if (shouldDisplay(event)) {
             formatter.format(event).map(s -> s.split("\n")).ifPresent(
                     t -> {
                         for (String line : t) {
                             document.addText(event.getTimestamp(), event
-                                            .getDisplayProperties(), line);
+                                    .getDisplayProperties(), line);
                         }
                     });
         }
     }
 
+    /**
+     * Determines if the specified event should be displayed in this backbuffer.
+     *
+     * @param event The event to check
+     * @return True if the event should be displayed, false otherwise.
+     */
+    private boolean shouldDisplay(final DisplayableEvent event) {
+        return event.getSource().equals(owner)
+                && !event.getDisplayProperty(DisplayProperty.DO_NOT_DISPLAY).isPresent();
+    }
+
     public IRCDocument getDocument() {
         return document;
     }

test/com/dmdirc/config/IdentityManagerTest.java

@@ -33,7 +33,7 @@ import java.io.IOException;
 import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.List;
+import java.util.Collection;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -95,9 +95,9 @@ public class IdentityManagerTest {
                 baseDirectory, identitiesDirectory, eventBus, clientInfo);
         identityManager.initialise();
 
-        final List<ConfigProvider> profiles = identityManager.getProvidersByType("profile");
+        final Collection<ConfigProvider> profiles = identityManager.getProvidersByType("profile");
         assertEquals(1, profiles.size());
-        assertEquals("New Profile", profiles.get(0).getName());
+        assertEquals("New Profile", profiles.stream().findAny().get().getName());
     }
 
 }