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

src/com/dmdirc/Channel.java

@@ -275,8 +275,8 @@ public class Channel extends FrameContainer implements GroupChat {
 
         // Needs to be published synchronously so that nicklists are cleared before the parser
         // is disconnected (which happens synchronously after this method returns).
-        getEventBus().publish(new NickListClientsChangedEvent(this,
-                Collections.<GroupChatUser>emptyList()));
+        getEventBus().publish(
+                new NickListClientsChangedEvent(this, Collections.<GroupChatUser>emptyList()));
     }
 
     @Override
@@ -327,8 +327,7 @@ public class Channel extends FrameContainer implements GroupChat {
     public void removeClient(final GroupChatUser client) {
         getEventBus().publishAsync(new NickListClientRemovedEvent(this, client));
 
-        getTabCompleter().removeEntry(TabCompletionType.CHANNEL_NICK,
-                client.getNickname());
+        getTabCompleter().removeEntry(TabCompletionType.CHANNEL_NICK, client.getNickname());
 
         if (client.getUser().equals(connection.getLocalUser().orElse(null))) {
             resetWindow();
@@ -361,10 +360,7 @@ public class Channel extends FrameContainer implements GroupChat {
         refreshClients();
     }
 
-    /**
-     * Refreshes the list of clients stored by this channel. Should be called when (visible) user
-     * modes or nicknames change.
-     */
+    @Override
     public void refreshClients() {
         if (!isOnChannel) {
             return;

src/com/dmdirc/GroupChatManagerImpl.java

@@ -218,7 +218,7 @@ public class GroupChatManagerImpl implements GroupChatManager {
 
     @Handler
     void handleChannelClosing(final ChannelClosedEvent event) {
-        final Channel channel = event.getChannel();
+        final GroupChat channel = event.getChannel();
         connection.getWindowModel().getTabCompleter()
                 .removeEntry(TabCompletionType.CHANNEL, channel.getName());
         channels.remove(channel.getName());

src/com/dmdirc/commandparser/commands/channel/Ban.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.commands.channel;
 
-import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
@@ -33,6 +32,7 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -63,7 +63,7 @@ public class Ban extends Command implements IntelligentCommand {
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final Channel channel = ((ChannelCommandContext) context).getChannel();
+        final GroupChat channel = ((ChannelCommandContext) context).getGroupChat();
 
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), INFO.getName(), INFO.getHelp());
@@ -79,8 +79,8 @@ public class Ban extends Command implements IntelligentCommand {
             host = "*!*@" + hostname;
         }
 
-        channel.getChannelInfo().alterMode(true, 'b', host);
-        channel.getChannelInfo().flushModes();
+        channel.setMode('b', host);
+        channel.flushModes();
     }
 
     @Override

src/com/dmdirc/commandparser/commands/channel/Cycle.java

@@ -61,7 +61,7 @@ public class Cycle extends Command {
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final GroupChat channel = ((ChannelCommandContext) context).getChannel();
+        final GroupChat channel = ((ChannelCommandContext) context).getGroupChat();
         channel.part(args.getArguments().length > 0 ? args.getArgumentsAsString()
                 : origin.getConfigManager().getOption("general", "cyclemessage"));
         channel.join();

src/com/dmdirc/commandparser/commands/channel/Invite.java

@@ -69,7 +69,7 @@ public class Invite extends Command implements ExternalCommand {
             sendLine(origin, args.isSilent(), FORMAT_ERROR,
                     "Insufficient arguments: must specify user");
         } else {
-            final GroupChat groupChat = ((ChannelCommandContext) context).getChannel();
+            final GroupChat groupChat = ((ChannelCommandContext) context).getGroupChat();
             groupChat.getConnection().flatMap(Connection::getParser)
                     .ifPresent(p -> p.sendInvite(groupChat.getName(), args.getArgumentsAsString()));
         }

src/com/dmdirc/commandparser/commands/channel/KickReason.java

@@ -68,7 +68,7 @@ public class KickReason extends Command implements IntelligentCommand {
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final GroupChat groupChat = ((ChannelCommandContext) context).getChannel();
+        final GroupChat groupChat = ((ChannelCommandContext) context).getGroupChat();
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), "kick", "<user> [reason]");
             return;

src/com/dmdirc/commandparser/commands/channel/Mode.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.commands.channel;
 
-import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
@@ -36,7 +35,7 @@ import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
@@ -68,14 +67,13 @@ public class Mode extends Command implements IntelligentCommand,
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final Channel channel = ((ChannelCommandContext) context).getChannel();
-        final ChannelInfo cChannel = channel.getChannelInfo();
+        final GroupChat channel = ((ChannelCommandContext) context).getGroupChat();
 
         if (args.getArguments().length == 0) {
-            sendLine(origin, args.isSilent(), "channelModeDiscovered", cChannel.getModes(), cChannel);
+            sendLine(origin, args.isSilent(), "channelModeDiscovered", channel.getModes(), channel);
         } else {
             channel.getConnection().get().getParser().get().sendRawMessage("MODE "
-                    + cChannel + " " + args.getArgumentsAsString());
+                    + channel.getName() + ' ' + args.getArgumentsAsString());
         }
     }
 

src/com/dmdirc/commandparser/commands/channel/Names.java

@@ -66,7 +66,7 @@ public class Names extends Command implements IntelligentCommand,
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final GroupChat channel = ((ChannelCommandContext) context).getChannel();
+        final GroupChat channel = ((ChannelCommandContext) context).getGroupChat();
         channel.getConnection().get().getParser().get().sendRawMessage("NAMES "
                 + channel.getName());
     }

src/com/dmdirc/commandparser/commands/channel/Part.java

@@ -61,7 +61,7 @@ public class Part extends Command {
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final GroupChat channel = ((ChannelCommandContext) context).getChannel();
+        final GroupChat channel = ((ChannelCommandContext) context).getGroupChat();
         channel.part(args.getArguments().length > 0 ? args.getArgumentsAsString()
                 : origin.getConfigManager().getOption("general", "partmessage"));
         channel.getWindowModel().close();

src/com/dmdirc/commandparser/commands/channel/SetNickColour.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.commands.channel;
 
-import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
@@ -34,6 +33,7 @@ import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
@@ -73,7 +73,7 @@ public class SetNickColour extends Command implements IntelligentCommand {
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final Channel channel = ((ChannelCommandContext) context).getChannel();
+        final GroupChat channel = ((ChannelCommandContext) context).getGroupChat();
 
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), INFO.getName(), INFO.getHelp());

src/com/dmdirc/commandparser/commands/channel/ShowTopic.java

@@ -67,7 +67,7 @@ public class ShowTopic extends Command implements ExternalCommand {
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final GroupChat channel = ((ChannelCommandContext) context).getChannel();
+        final GroupChat channel = ((ChannelCommandContext) context).getGroupChat();
         if (args.getArguments().length == 0) {
             final Optional<Topic> topic = channel.getCurrentTopic();
             if (topic.isPresent()) {

src/com/dmdirc/commandparser/commands/context/ChannelCommandContext.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.commandparser.commands.context;
 
-import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.interfaces.GroupChat;
 
 /**
  * A specialised {@link CommandContext} for commands executed in channels.
@@ -33,29 +33,29 @@ import com.dmdirc.commandparser.CommandInfo;
  */
 public class ChannelCommandContext extends ChatCommandContext {
 
-    /** The channel associated with the command. */
-    private final Channel channel;
+    /** The group chat associated with the command. */
+    private final GroupChat groupChat;
 
     /**
-     * Creates a new channel command context.
+     * Creates a new group chat command context.
      *
      * @param source      The source of the command
      * @param commandInfo The command info object which associated the command with the input
-     * @param channel     The channel associated with the command
+     * @param groupChat  The group chat associated with the command
      */
     public ChannelCommandContext(final FrameContainer source,
-            final CommandInfo commandInfo, final Channel channel) {
-        super(source, commandInfo, channel);
-        this.channel = channel;
+            final CommandInfo commandInfo, final GroupChat groupChat) {
+        super(source, commandInfo, groupChat);
+        this.groupChat = groupChat;
     }
 
     /**
-     * Retrieves the channel associated with this context.
+     * Retrieves the group chat associated with this context.
      *
-     * @return This context's channel
+     * @return This context's group chat
      */
-    public Channel getChannel() {
-        return channel;
+    public GroupChat getGroupChat() {
+        return groupChat;
     }
 
 }

src/com/dmdirc/commandparser/commands/global/SetCommand.java

@@ -134,7 +134,7 @@ public class SetCommand extends Command implements IntelligentCommand {
                 return;
             }
 
-            final GroupChat groupChat = ((ChannelCommandContext) context).getChannel();
+            final GroupChat groupChat = ((ChannelCommandContext) context).getGroupChat();
             identity = identityFactory.createChannelConfig(connection.get().getNetwork(),
                     groupChat.getName());
             manager = groupChat.getWindowModel().getConfigManager();

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

@@ -46,6 +46,7 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 
 import javax.annotation.Nonnull;
+import javax.annotation.concurrent.GuardedBy;
 import javax.inject.Inject;
 
 import net.engio.mbassy.listener.Handler;
@@ -62,7 +63,10 @@ public class JoinChannelCommand extends Command implements IntelligentCommand {
             "join <channel [key]>[,channel [key]...] - joins the specified channel(s)",
             CommandType.TYPE_SERVER);
     /** A map of channel name mentions. */
+    @GuardedBy("mentionsLock")
     private final MapList<FrameContainer, String> mentions = new MapList<>();
+    /** Lock to synchronise on when accessing mentions. */
+    private final Object mentionsLock = new Object();
 
     /**
      * Creates a new instance of the join channel command.
@@ -110,9 +114,11 @@ public class JoinChannelCommand extends Command implements IntelligentCommand {
                 .doLinks(event.getLine())
                 .split(Character.toString(Styliser.CODE_CHANNEL));
 
-        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]);
+        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]);
+            }
         }
     }
 
@@ -170,8 +176,10 @@ public class JoinChannelCommand extends Command implements IntelligentCommand {
         final List<String> results = new ArrayList<>();
 
         // Check the window itself
-        if (mentions.containsKey(source)) {
-            results.addAll(mentions.get(source));
+        synchronized (mentionsLock) {
+            if (mentions.containsKey(source)) {
+                results.addAll(mentions.get(source));
+            }
         }
 
         // Check the parent window

src/com/dmdirc/commandparser/parsers/ChannelCommandParser.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.parsers;
 
-import com.dmdirc.Channel;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
@@ -32,6 +31,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.GroupChat;
 
 import javax.annotation.Nonnull;
 
@@ -42,10 +42,8 @@ public class ChannelCommandParser extends ChatCommandParser {
 
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
-    /**
-     * The channel instance that this parser is attached to.
-     */
-    private Channel channel;
+    /** The group chat instance that this parser is attached to. */
+    private GroupChat groupChat;
 
     /**
      * Creates a new instance of ChannelCommandParser.
@@ -54,15 +52,17 @@ public class ChannelCommandParser extends ChatCommandParser {
      * @param commandController The controller to load commands from.
      * @param eventBus          Event bus to post events on
      */
-    public ChannelCommandParser(final FrameContainer owner, final CommandController commandController,
+    public ChannelCommandParser(final FrameContainer owner,
+            final CommandController commandController,
             final DMDircMBassador eventBus) {
         super(owner, commandController, eventBus);
     }
 
     @Override
     public void setOwner(final FrameContainer owner) {
-        if (channel == null) {
-            channel = (Channel) owner;
+        if (groupChat == null) {
+            // TODO: Can't assume that framecontainers may be group chats.
+            groupChat = (GroupChat) owner;
         }
 
         super.setOwner(owner);
@@ -80,7 +80,7 @@ public class ChannelCommandParser extends ChatCommandParser {
             final CommandInfo commandInfo,
             final Command command,
             final CommandArguments args) {
-        return new ChannelCommandContext(origin, commandInfo, channel);
+        return new ChannelCommandContext(origin, commandInfo, groupChat);
     }
 
     @Override

src/com/dmdirc/events/BaseChannelActionEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -30,12 +30,12 @@ import com.dmdirc.interfaces.GroupChatUser;
  */
 public class BaseChannelActionEvent extends BaseChannelTextEvent {
 
-    public BaseChannelActionEvent(final long timestamp, final Channel channel,
+    public BaseChannelActionEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser client, final String message) {
         super(timestamp, channel, client, message);
     }
 
-    public BaseChannelActionEvent(final Channel channel, final GroupChatUser client,
+    public BaseChannelActionEvent(final GroupChat channel, final GroupChatUser client,
             final String message) {
         super(channel, client, message);
     }

src/com/dmdirc/events/BaseChannelMessageEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -30,12 +30,12 @@ import com.dmdirc.interfaces.GroupChatUser;
  */
 public class BaseChannelMessageEvent extends BaseChannelTextEvent {
 
-    public BaseChannelMessageEvent(final long timestamp, final Channel channel,
+    public BaseChannelMessageEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser client, final String message) {
         super(timestamp, channel, client, message);
     }
 
-    public BaseChannelMessageEvent(final Channel channel, final GroupChatUser client,
+    public BaseChannelMessageEvent(final GroupChat channel, final GroupChatUser client,
             final String message) {
         super(channel, client, message);
     }

src/com/dmdirc/events/BaseChannelTextEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -33,14 +33,14 @@ public class BaseChannelTextEvent extends ChannelDisplayableEvent {
     private final GroupChatUser client;
     private final String message;
 
-    public BaseChannelTextEvent(final long timestamp, final Channel channel,
+    public BaseChannelTextEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser client, final String message) {
         super(timestamp, channel);
         this.client = client;
         this.message = message;
     }
 
-    public BaseChannelTextEvent(final Channel channel,
+    public BaseChannelTextEvent(final GroupChat channel,
             final GroupChatUser client, final String message) {
         super(channel);
         this.client = client;

src/com/dmdirc/events/ChannelActionEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -30,12 +30,12 @@ import com.dmdirc.interfaces.GroupChatUser;
  */
 public class ChannelActionEvent extends BaseChannelActionEvent {
 
-    public ChannelActionEvent(final long timestamp, final Channel channel,
+    public ChannelActionEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser client, final String message) {
         super(timestamp, channel, client, message);
     }
 
-    public ChannelActionEvent(final Channel channel, final GroupChatUser client,
+    public ChannelActionEvent(final GroupChat channel, final GroupChatUser client,
             final String message) {
         super(channel, client, message);
     }

src/com/dmdirc/events/ChannelClosedEvent.java

@@ -22,14 +22,14 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 
 /**
  * Event raised when a channel is closed.
  */
 public class ChannelClosedEvent extends ChannelDisplayableEvent {
 
-    public ChannelClosedEvent(final Channel channel) {
+    public ChannelClosedEvent(final GroupChat channel) {
         super(channel);
     }
 

src/com/dmdirc/events/ChannelCtcpEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -35,7 +35,7 @@ public class ChannelCtcpEvent extends ChannelDisplayableEvent {
     private final String message;
     private boolean handled;
 
-    public ChannelCtcpEvent(final long timestamp, final Channel channel,
+    public ChannelCtcpEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser client, final String type, final String message) {
         super(timestamp, channel);
         this.client = client;
@@ -43,7 +43,7 @@ public class ChannelCtcpEvent extends ChannelDisplayableEvent {
         this.message = message;
     }
 
-    public ChannelCtcpEvent(final Channel channel, final GroupChatUser client,
+    public ChannelCtcpEvent(final GroupChat channel, final GroupChatUser client,
             final String type, final String message) {
         super(channel);
         this.client = client;

src/com/dmdirc/events/ChannelDisplayableEvent.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.GroupChat;
 
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
@@ -38,11 +38,11 @@ public abstract class ChannelDisplayableEvent extends ChannelEvent implements Di
     /** The properties associated with this event. */
     private final DisplayPropertyMap properties = new DisplayPropertyMap();
 
-    public ChannelDisplayableEvent(final long timestamp, final Channel channel) {
+    public ChannelDisplayableEvent(final long timestamp, final GroupChat channel) {
         super(timestamp, channel);
     }
 
-    public ChannelDisplayableEvent(final Channel channel) {
+    public ChannelDisplayableEvent(final GroupChat channel) {
         super(channel);
     }
 
@@ -73,7 +73,7 @@ public abstract class ChannelDisplayableEvent extends ChannelEvent implements Di
 
     @Override
     public FrameContainer getSource() {
-        return getChannel();
+        return getChannel().getWindowModel();
     }
 
 }

src/com/dmdirc/events/ChannelDisplayableUserEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -30,12 +30,12 @@ import com.dmdirc.interfaces.GroupChatUser;
  */
 public abstract class ChannelDisplayableUserEvent extends ChannelUserEvent {
 
-    public ChannelDisplayableUserEvent(final long timestamp, final Channel channel,
+    public ChannelDisplayableUserEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser user) {
         super(timestamp, channel, user);
     }
 
-    public ChannelDisplayableUserEvent(final Channel channel, final GroupChatUser user) {
+    public ChannelDisplayableUserEvent(final GroupChat channel, final GroupChatUser user) {
         super(channel, user);
     }
 

src/com/dmdirc/events/ChannelEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -31,20 +31,20 @@ import static com.google.common.base.Preconditions.checkNotNull;
  */
 public abstract class ChannelEvent extends DMDircEvent {
 
-    /** The channel that this event occurred on. */
-    private final Channel channel;
+    /** The group chat that this event occurred on. */
+    private final GroupChat groupChat;
 
-    public ChannelEvent(final long timestamp, final Channel channel) {
+    public ChannelEvent(final long timestamp, final GroupChat groupChat) {
         super(timestamp);
-        this.channel = checkNotNull(channel);
+        this.groupChat = checkNotNull(groupChat);
     }
 
-    public ChannelEvent(final Channel channel) {
-        this.channel = checkNotNull(channel);
+    public ChannelEvent(final GroupChat groupChat) {
+        this.groupChat = checkNotNull(groupChat);
     }
 
-    public Channel getChannel() {
-        return channel;
+    public GroupChat getChannel() {
+        return groupChat;
     }
 
 }

src/com/dmdirc/events/ChannelGotNamesEvent.java

@@ -22,18 +22,18 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 
 /**
  * Fired when a channel names event is received.
  */
 public class ChannelGotNamesEvent extends ChannelEvent {
 
-    public ChannelGotNamesEvent(final long timestamp, final Channel channel) {
+    public ChannelGotNamesEvent(final long timestamp, final GroupChat channel) {
         super(timestamp, channel);
     }
 
-    public ChannelGotNamesEvent(final Channel channel) {
+    public ChannelGotNamesEvent(final GroupChat channel) {
         super(channel);
     }
 

src/com/dmdirc/events/ChannelGotTopicEvent.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
 import com.dmdirc.Topic;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.User;
 
 /**
@@ -34,14 +34,14 @@ public class ChannelGotTopicEvent extends ChannelDisplayableEvent {
     private final Topic topic;
     private final User user;
 
-    public ChannelGotTopicEvent(final long timestamp, final Channel channel, final Topic topic,
+    public ChannelGotTopicEvent(final long timestamp, final GroupChat channel, final Topic topic,
             final User user) {
         super(timestamp, channel);
         this.topic = topic;
         this.user = user;
     }
 
-    public ChannelGotTopicEvent(final Channel channel, final Topic topic, final User user) {
+    public ChannelGotTopicEvent(final GroupChat channel, final Topic topic, final User user) {
         super(channel);
         this.topic = topic;
         this.user = user;

src/com/dmdirc/events/ChannelJoinEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -32,13 +32,13 @@ public class ChannelJoinEvent extends ChannelDisplayableEvent {
 
     private final GroupChatUser client;
 
-    public ChannelJoinEvent(final long timestamp, final Channel channel,
+    public ChannelJoinEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser client) {
         super(timestamp, channel);
         this.client = client;
     }
 
-    public ChannelJoinEvent(final Channel channel, final GroupChatUser client) {
+    public ChannelJoinEvent(final GroupChat channel, final GroupChatUser client) {
         super(channel);
         this.client = client;
     }

src/com/dmdirc/events/ChannelKickEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -34,7 +34,7 @@ public class ChannelKickEvent extends ChannelDisplayableEvent {
     private final GroupChatUser victim;
     private final String reason;
 
-    public ChannelKickEvent(final long timestamp, final Channel channel,
+    public ChannelKickEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser client, final GroupChatUser victim, final String reason) {
         super(timestamp, channel);
         this.client = client;
@@ -42,7 +42,7 @@ public class ChannelKickEvent extends ChannelDisplayableEvent {
         this.reason = reason;
     }
 
-    public ChannelKickEvent(final Channel channel,
+    public ChannelKickEvent(final GroupChat channel,
             final GroupChatUser client, final GroupChatUser victim, final String reason) {
         super(channel);
         this.client = client;

src/com/dmdirc/events/ChannelListModesRetrievedEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 
 /**
  * Fired when channel list modes are retrieved.
@@ -31,13 +31,13 @@ public class ChannelListModesRetrievedEvent extends ChannelDisplayableEvent {
 
     private final char mode;
 
-    public ChannelListModesRetrievedEvent(final long timestamp, final Channel channel,
+    public ChannelListModesRetrievedEvent(final long timestamp, final GroupChat channel,
             final char mode) {
         super(timestamp, channel);
         this.mode = mode;
     }
 
-    public ChannelListModesRetrievedEvent(final Channel channel, final char mode) {
+    public ChannelListModesRetrievedEvent(final GroupChat channel, final char mode) {
         super(channel);
         this.mode = mode;
     }

src/com/dmdirc/events/ChannelMessageEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -30,12 +30,12 @@ import com.dmdirc.interfaces.GroupChatUser;
  */
 public class ChannelMessageEvent extends BaseChannelMessageEvent {
 
-    public ChannelMessageEvent(final long timestamp, final Channel channel,
+    public ChannelMessageEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser client, final String message) {
         super(timestamp, channel, client, message);
     }
 
-    public ChannelMessageEvent(final Channel channel, final GroupChatUser client,
+    public ChannelMessageEvent(final GroupChat channel, final GroupChatUser client,
             final String message) {
         super(channel, client, message);
     }

src/com/dmdirc/events/ChannelModeChangeEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -33,14 +33,14 @@ public class ChannelModeChangeEvent extends ChannelDisplayableEvent {
     private final GroupChatUser client;
     private final String modes;
 
-    public ChannelModeChangeEvent(final long timestamp, final Channel channel,
+    public ChannelModeChangeEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser client, final String modes) {
         super(timestamp, channel);
         this.client = client;
         this.modes = modes;
     }
 
-    public ChannelModeChangeEvent(final Channel channel, final GroupChatUser client,
+    public ChannelModeChangeEvent(final GroupChat channel, final GroupChatUser client,
             final String modes) {
         super(channel);
         this.client = client;

src/com/dmdirc/events/ChannelModeNoticeEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -34,7 +34,7 @@ public class ChannelModeNoticeEvent extends ChannelDisplayableEvent {
     private final String prefix;
     private final String message;
 
-    public ChannelModeNoticeEvent(final long timestamp, final Channel channel,
+    public ChannelModeNoticeEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser client, final String prefix, final String message) {
         super(timestamp, channel);
         this.client = client;
@@ -42,7 +42,7 @@ public class ChannelModeNoticeEvent extends ChannelDisplayableEvent {
         this.message = message;
     }
 
-    public ChannelModeNoticeEvent(final Channel channel, final GroupChatUser client,
+    public ChannelModeNoticeEvent(final GroupChat channel, final GroupChatUser client,
             final String prefix, final String message) {
         super(channel);
         this.client = client;

src/com/dmdirc/events/ChannelModesDiscoveredEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 
 /**
  * Fired when channel modes are discovered.
@@ -31,13 +31,13 @@ public class ChannelModesDiscoveredEvent extends ChannelDisplayableEvent {
 
     private final String modes;
 
-    public ChannelModesDiscoveredEvent(final long timestamp, final Channel channel,
+    public ChannelModesDiscoveredEvent(final long timestamp, final GroupChat channel,
             final String modes) {
         super(timestamp, channel);
         this.modes = modes;
     }
 
-    public ChannelModesDiscoveredEvent(final Channel channel, final String modes) {
+    public ChannelModesDiscoveredEvent(final GroupChat channel, final String modes) {
         super(channel);
         this.modes = modes;
     }

src/com/dmdirc/events/ChannelNickChangeEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -33,14 +33,14 @@ public class ChannelNickChangeEvent extends ChannelDisplayableEvent {
     private final GroupChatUser client;
     private final String oldNick;
 
-    public ChannelNickChangeEvent(final long timestamp, final Channel channel,
+    public ChannelNickChangeEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser client, final String oldNick) {
         super(timestamp, channel);
         this.client = client;
         this.oldNick = oldNick;
     }
 
-    public ChannelNickChangeEvent(final Channel channel, final GroupChatUser client,
+    public ChannelNickChangeEvent(final GroupChat channel, final GroupChatUser client,
             final String oldNick) {
         super(channel);
         this.client = client;

src/com/dmdirc/events/ChannelNoTopicEvent.java

@@ -22,18 +22,18 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 
 /**
  * Fired when a topic is unset on a channel.
  */
 public class ChannelNoTopicEvent extends ChannelDisplayableEvent {
 
-    public ChannelNoTopicEvent(final long timestamp, final Channel channel) {
+    public ChannelNoTopicEvent(final long timestamp, final GroupChat channel) {
         super(timestamp, channel);
     }
 
-    public ChannelNoTopicEvent(final Channel channel) {
+    public ChannelNoTopicEvent(final GroupChat channel) {
         super(channel);
     }
 

src/com/dmdirc/events/ChannelNoticeEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -30,12 +30,12 @@ import com.dmdirc.interfaces.GroupChatUser;
  */
 public class ChannelNoticeEvent extends BaseChannelTextEvent {
 
-    public ChannelNoticeEvent(final long timestamp, final Channel channel,
+    public ChannelNoticeEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser client, final String message) {
         super(timestamp, channel, client, message);
     }
 
-    public ChannelNoticeEvent(final Channel channel, final GroupChatUser client,
+    public ChannelNoticeEvent(final GroupChat channel, final GroupChatUser client,
             final String message) {
         super(channel, client, message);
     }

src/com/dmdirc/events/ChannelOpenedEvent.java

@@ -22,14 +22,14 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 
 /**
  * Event raised when a channel is opened.
  */
 public class ChannelOpenedEvent extends ChannelDisplayableEvent {
 
-    public ChannelOpenedEvent(final Channel channel) {
+    public ChannelOpenedEvent(final GroupChat channel) {
         super(channel);
     }
 

src/com/dmdirc/events/ChannelPartEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -33,14 +33,14 @@ public class ChannelPartEvent extends ChannelDisplayableEvent {
     private final GroupChatUser client;
     private final String message;
 
-    public ChannelPartEvent(final long timestamp, final Channel channel,
+    public ChannelPartEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser client, final String message) {
         super(timestamp, channel);
         this.client = client;
         this.message = message;
     }
 
-    public ChannelPartEvent(final Channel channel, final GroupChatUser client,
+    public ChannelPartEvent(final GroupChat channel, final GroupChatUser client,
             final String message) {
         super(channel);
         this.client = client;

src/com/dmdirc/events/ChannelQuitEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -33,14 +33,14 @@ public class ChannelQuitEvent extends ChannelDisplayableEvent {
     private final GroupChatUser client;
     private final String message;
 
-    public ChannelQuitEvent(final long timestamp, final Channel channel,
+    public ChannelQuitEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser client, final String message) {
         super(timestamp, channel);
         this.client = client;
         this.message = message;
     }
 
-    public ChannelQuitEvent(final Channel channel, final GroupChatUser client,
+    public ChannelQuitEvent(final GroupChat channel, final GroupChatUser client,
             final String message) {
         super(channel);
         this.client = client;

src/com/dmdirc/events/ChannelSelfActionEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -30,12 +30,12 @@ import com.dmdirc.interfaces.GroupChatUser;
  */
 public class ChannelSelfActionEvent extends BaseChannelActionEvent {
 
-    public ChannelSelfActionEvent(final long timestamp, final Channel channel,
+    public ChannelSelfActionEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser client, final String message) {
         super(timestamp, channel, client, message);
     }
 
-    public ChannelSelfActionEvent(final Channel channel, final GroupChatUser client,
+    public ChannelSelfActionEvent(final GroupChat channel, final GroupChatUser client,
             final String message) {
         super(channel, client, message);
     }

src/com/dmdirc/events/ChannelSelfJoinEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.User;
 
 /**
@@ -32,13 +32,13 @@ public class ChannelSelfJoinEvent extends ChannelDisplayableEvent {
 
     private final User client;
 
-    public ChannelSelfJoinEvent(final long timestamp, final Channel channel,
+    public ChannelSelfJoinEvent(final long timestamp, final GroupChat channel,
             final User client) {
         super(timestamp, channel);
         this.client = client;
     }
 
-    public ChannelSelfJoinEvent(final Channel channel, final User client) {
+    public ChannelSelfJoinEvent(final GroupChat channel, final User client) {
         super(channel);
         this.client = client;
     }

src/com/dmdirc/events/ChannelSelfMessageEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -30,12 +30,12 @@ import com.dmdirc.interfaces.GroupChatUser;
  */
 public class ChannelSelfMessageEvent extends BaseChannelMessageEvent {
 
-    public ChannelSelfMessageEvent(final long timestamp, final Channel channel,
+    public ChannelSelfMessageEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser client, final String message) {
         super(timestamp, channel, client, message);
     }
 
-    public ChannelSelfMessageEvent(final Channel channel, final GroupChatUser client,
+    public ChannelSelfMessageEvent(final GroupChat channel, final GroupChatUser client,
             final String message) {
         super(channel, client, message);
     }

src/com/dmdirc/events/ChannelSelfModeChangeEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -30,12 +30,12 @@ import com.dmdirc.interfaces.GroupChatUser;
  */
 public class ChannelSelfModeChangeEvent extends ChannelModeChangeEvent {
 
-    public ChannelSelfModeChangeEvent(final long timestamp, final Channel channel,
+    public ChannelSelfModeChangeEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser client, final String modes) {
         super(timestamp, channel, client, modes);
     }
 
-    public ChannelSelfModeChangeEvent(final Channel channel, final GroupChatUser client,
+    public ChannelSelfModeChangeEvent(final GroupChat channel, final GroupChatUser client,
             final String modes) {
         super(channel, client, modes);
     }

src/com/dmdirc/events/ChannelSelfNickChangeEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -33,14 +33,14 @@ public class ChannelSelfNickChangeEvent extends ChannelDisplayableEvent {
     private final GroupChatUser client;
     private final String oldNick;
 
-    public ChannelSelfNickChangeEvent(final long timestamp, final Channel channel,
+    public ChannelSelfNickChangeEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser client, final String oldNick) {
         super(timestamp, channel);
         this.client = client;
         this.oldNick = oldNick;
     }
 
-    public ChannelSelfNickChangeEvent(final Channel channel, final GroupChatUser client,
+    public ChannelSelfNickChangeEvent(final GroupChat channel, final GroupChatUser client,
             final String oldNick) {
         super(channel);
         this.client = client;

src/com/dmdirc/events/ChannelSelfPartEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -33,14 +33,14 @@ public class ChannelSelfPartEvent extends ChannelDisplayableEvent {
     private final GroupChatUser client;
     private final String message;
 
-    public ChannelSelfPartEvent(final long timestamp, final Channel channel,
+    public ChannelSelfPartEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser client, final String message) {
         super(timestamp, channel);
         this.client = client;
         this.message = message;
     }
 
-    public ChannelSelfPartEvent(final Channel channel, final GroupChatUser client,
+    public ChannelSelfPartEvent(final GroupChat channel, final GroupChatUser client,
             final String message) {
         super(channel);
         this.client = client;

src/com/dmdirc/events/ChannelTopicChangeEvent.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
 import com.dmdirc.Topic;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -34,14 +34,14 @@ public class ChannelTopicChangeEvent extends ChannelDisplayableEvent {
     private final Topic topic;
     private final GroupChatUser user;
 
-    public ChannelTopicChangeEvent(final long timestamp, final Channel channel,
+    public ChannelTopicChangeEvent(final long timestamp, final GroupChat channel,
             final Topic topic, final GroupChatUser user) {
         super(timestamp, channel);
         this.topic = topic;
         this.user = user;
     }
 
-    public ChannelTopicChangeEvent(final Channel channel, final Topic topic,
+    public ChannelTopicChangeEvent(final GroupChat channel, final Topic topic,
             final GroupChatUser user) {
         super(channel);
         this.topic = topic;

src/com/dmdirc/events/ChannelTopicUnsetEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -32,13 +32,13 @@ public class ChannelTopicUnsetEvent extends ChannelDisplayableEvent {
 
     private final GroupChatUser client;
 
-    public ChannelTopicUnsetEvent(final long timestamp, final Channel channel,
+    public ChannelTopicUnsetEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser client) {
         super(timestamp, channel);
         this.client = client;
     }
 
-    public ChannelTopicUnsetEvent(final Channel channel, final GroupChatUser client) {
+    public ChannelTopicUnsetEvent(final GroupChat channel, final GroupChatUser client) {
         super(channel);
         this.client = client;
     }

src/com/dmdirc/events/ChannelUserAwayEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -30,12 +30,12 @@ import com.dmdirc.interfaces.GroupChatUser;
  */
 public class ChannelUserAwayEvent extends ChannelUserEvent {
 
-    public ChannelUserAwayEvent(final long timestamp, final Channel channel,
+    public ChannelUserAwayEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser user) {
         super(timestamp, channel, user);
     }
 
-    public ChannelUserAwayEvent(final Channel channel, final GroupChatUser user) {
+    public ChannelUserAwayEvent(final GroupChat channel, final GroupChatUser user) {
         super(channel, user);
     }
 

src/com/dmdirc/events/ChannelUserBackEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -30,12 +30,12 @@ import com.dmdirc.interfaces.GroupChatUser;
  */
 public class ChannelUserBackEvent extends ChannelUserEvent {
 
-    public ChannelUserBackEvent(final long timestamp, final Channel channel,
+    public ChannelUserBackEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser user) {
         super(timestamp, channel, user);
     }
 
-    public ChannelUserBackEvent(final Channel channel, final GroupChatUser user) {
+    public ChannelUserBackEvent(final GroupChat channel, final GroupChatUser user) {
         super(channel, user);
     }
 

src/com/dmdirc/events/ChannelUserEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -32,13 +32,13 @@ public abstract class ChannelUserEvent extends ChannelDisplayableEvent {
 
     private final GroupChatUser user;
 
-    public ChannelUserEvent(final long timestamp, final Channel channel,
+    public ChannelUserEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser user) {
         super(timestamp, channel);
         this.user = user;
     }
 
-    public ChannelUserEvent(final Channel channel, final GroupChatUser user) {
+    public ChannelUserEvent(final GroupChat channel, final GroupChatUser user) {
         super(channel);
         this.user = user;
     }

src/com/dmdirc/events/ChannelUserModeChangeEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -34,7 +34,7 @@ public class ChannelUserModeChangeEvent extends ChannelDisplayableEvent {
     private final GroupChatUser victim;
     private final String modes;
 
-    public ChannelUserModeChangeEvent(final long timestamp, final Channel channel,
+    public ChannelUserModeChangeEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser user, final GroupChatUser victim, final String modes) {
         super(timestamp, channel);
         this.user = user;
@@ -42,7 +42,7 @@ public class ChannelUserModeChangeEvent extends ChannelDisplayableEvent {
         this.modes = modes;
     }
 
-    public ChannelUserModeChangeEvent(final Channel channel, final GroupChatUser user,
+    public ChannelUserModeChangeEvent(final GroupChat channel, final GroupChatUser user,
             final GroupChatUser victim, final String modes) {
         super(channel);
         this.user = user;

src/com/dmdirc/events/ClientInfoRequestEvent.java

@@ -25,6 +25,7 @@ package com.dmdirc.events;
 import com.dmdirc.ui.core.about.InfoItem;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -43,7 +44,7 @@ public class ClientInfoRequestEvent extends DMDircEvent {
         Collections.addAll(this.newItems, newItems);
     }
 
-    public List<InfoItem> getNewInfoItems() {
+    public Collection<InfoItem> getNewInfoItems() {
         return Collections.unmodifiableList(newItems);
     }
 }

src/com/dmdirc/events/NickListClientAddedEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -32,13 +32,13 @@ public class NickListClientAddedEvent extends NickListEvent {
 
     private final GroupChatUser user;
 
-    public NickListClientAddedEvent(final long timestamp, final Channel channel,
+    public NickListClientAddedEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser user) {
         super(timestamp, channel);
         this.user = user;
     }
 
-    public NickListClientAddedEvent(final Channel channel, final GroupChatUser user) {
+    public NickListClientAddedEvent(final GroupChat channel, final GroupChatUser user) {
         super(channel);
         this.user = user;
     }

src/com/dmdirc/events/NickListClientRemovedEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 /**
@@ -32,13 +32,13 @@ public class NickListClientRemovedEvent extends NickListEvent {
 
     private final GroupChatUser user;
 
-    public NickListClientRemovedEvent(final long timestamp, final Channel channel,
+    public NickListClientRemovedEvent(final long timestamp, final GroupChat channel,
             final GroupChatUser user) {
         super(timestamp, channel);
         this.user = user;
     }
 
-    public NickListClientRemovedEvent(final Channel channel, final GroupChatUser user) {
+    public NickListClientRemovedEvent(final GroupChat channel, final GroupChatUser user) {
         super(channel);
         this.user = user;
     }

src/com/dmdirc/events/NickListClientsChangedEvent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 
 import com.google.common.collect.Lists;
@@ -37,13 +37,13 @@ public class NickListClientsChangedEvent extends NickListEvent {
 
     private final Collection<GroupChatUser> users;
 
-    public NickListClientsChangedEvent(final long timestamp, final Channel channel,
+    public NickListClientsChangedEvent(final long timestamp, final GroupChat channel,
             final Iterable<GroupChatUser> users) {
         super(timestamp, channel);
         this.users = Lists.newArrayList(users);
     }
 
-    public NickListClientsChangedEvent(final Channel channel,
+    public NickListClientsChangedEvent(final GroupChat channel,
             final Iterable<GroupChatUser> users) {
         super(channel);
         this.users = Lists.newArrayList(users);

src/com/dmdirc/events/NickListEvent.java

@@ -1,6 +1,5 @@
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
 import com.dmdirc.interfaces.GroupChat;
 
 /**
@@ -8,11 +7,11 @@ import com.dmdirc.interfaces.GroupChat;
  */
 public abstract class NickListEvent extends ChannelEvent {
 
-    public NickListEvent(final long timestamp, final Channel channel) {
+    public NickListEvent(final long timestamp, final GroupChat channel) {
         super(timestamp, channel);
     }
 
-    public NickListEvent(final Channel channel) {
+    public NickListEvent(final GroupChat channel) {
         super(channel);
     }
 }

src/com/dmdirc/events/NickListUpdatedEvent.java

@@ -22,18 +22,18 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.Channel;
+import com.dmdirc.interfaces.GroupChat;
 
 /**
  * Fired when the properties of the users in a list changes.
  */
 public class NickListUpdatedEvent extends NickListEvent {
 
-    public NickListUpdatedEvent(final long timestamp, final Channel channel) {
+    public NickListUpdatedEvent(final long timestamp, final GroupChat channel) {
         super(timestamp, channel);
     }
 
-    public NickListUpdatedEvent(final Channel channel) {
+    public NickListUpdatedEvent(final GroupChat channel) {
         super(channel);
     }
 }

src/com/dmdirc/interfaces/GroupChat.java

@@ -58,6 +58,13 @@ public interface GroupChat extends Chat {
      */
     int getMaxTopicLength();
 
+    /**
+     * Refreshes the list of clients stored by this channel. Should be called when (visible) user
+     * modes or nicknames change.
+     */
+    // TODO: Should probably not need this.
+    void refreshClients();
+
     /**
      * Retrieve the topics that have been seen on this channel.
      *

test/com/dmdirc/commandparser/aliases/AliasLoaderTest.java

@@ -0,0 +1,98 @@
+/*
+ * 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.commandparser.aliases;
+
+import com.google.common.collect.Sets;
+
+import java.util.Set;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import static org.mockito.Matchers.anySetOf;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class AliasLoaderTest {
+
+    @Mock private AliasManager aliasManager;
+    @Mock private AliasStore aliasStore;
+    @Mock private Alias alias1;
+    @Mock private Alias alias2;
+    @Mock private Alias alias3;
+
+    private Set<Alias> aliases;
+    private AliasLoader loader;
+
+    @Before
+    public void setup() {
+        loader = new AliasLoader(aliasManager, aliasStore);
+        aliases = Sets.newHashSet(alias1, alias2, alias3);
+    }
+
+    @Test
+    public void testLoadPreservesDirtyState() {
+        when(aliasManager.isDirty()).thenReturn(true);
+        when(aliasStore.readAliases()).thenReturn(aliases);
+        loader.load();
+        verify(aliasManager).setDirty(true);
+    }
+
+    @Test
+    public void testLoadAddsEachAlias() {
+        when(aliasStore.readAliases()).thenReturn(aliases);
+        loader.load();
+        verify(aliasManager).addAlias(alias1);
+        verify(aliasManager).addAlias(alias2);
+        verify(aliasManager).addAlias(alias3);
+    }
+
+    @Test
+    public void testSaveDoesNotWriteIfManagerNotDirty() {
+        when(aliasManager.isDirty()).thenReturn(false);
+        loader.save();
+        verify(aliasStore, never()).writeAliases(anySetOf(Alias.class));
+    }
+
+    @Test
+    public void testSaveSetsDirtyToFalse() {
+        when(aliasManager.isDirty()).thenReturn(true);
+        when(aliasManager.getAliases()).thenReturn(aliases);
+        loader.save();
+        verify(aliasManager).setDirty(false);
+    }
+
+    @Test
+    public void testSaveSavesAliases() {
+        when(aliasManager.isDirty()).thenReturn(true);
+        when(aliasManager.getAliases()).thenReturn(aliases);
+        loader.save();
+        verify(aliasStore).writeAliases(aliases);
+    }
+
+}

test/com/dmdirc/commandparser/aliases/DefaultAliasInstallerTest.java

@@ -0,0 +1,101 @@
+/*
+ * 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.commandparser.aliases;
+
+import com.dmdirc.DMDircMBassador;
+import com.dmdirc.events.AppErrorEvent;
+
+import com.google.common.jimfs.Configuration;
+import com.google.common.jimfs.Jimfs;
+
+import java.io.IOException;
+import java.nio.file.FileSystem;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import static java.nio.file.attribute.PosixFilePermissions.asFileAttribute;
+import static java.nio.file.attribute.PosixFilePermissions.fromString;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.isA;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+@RunWith(MockitoJUnitRunner.class)
+public class DefaultAliasInstallerTest {
+
+    @Mock private DMDircMBassador eventBus;
+
+    private FileSystem fs;
+    private Path path;
+
+    private DefaultAliasInstaller installer;
+
+    @Before
+    public void setup() {
+        fs = Jimfs.newFileSystem(Configuration.unix().toBuilder()
+                .setAttributeViews("posix").build());
+        path = fs.getPath("aliases.yml");
+
+        installer = new DefaultAliasInstaller(path, eventBus);
+    }
+
+    @After
+    public void tearDown() throws IOException {
+        fs.close();
+    }
+
+    @Test
+    public void testNeedsMigrationIfFileDoesntExist() {
+        assertTrue(installer.needsMigration());
+    }
+
+    @Test
+    public void testNeedsMigrationIfFileExist() throws IOException {
+        Files.createFile(path);
+        assertFalse(installer.needsMigration());
+    }
+
+    @Test
+    public void testCopiesDefaultAliases() throws IOException {
+        installer.migrate();
+        assertTrue(Files.exists(path));
+        verify(eventBus, never()).publish(any());
+    }
+
+    @Test
+    public void testRaisesErrorIfCannotCopyDefaultAliases() throws IOException {
+        Files.createFile(path, asFileAttribute(fromString("r--r--r--")));
+        installer.migrate();
+        verify(eventBus).publish(isA(AppErrorEvent.class));
+    }
+
+}

test/com/dmdirc/commandparser/commands/channel/BanTest.java

@@ -30,7 +30,6 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.User;
-import com.dmdirc.parser.interfaces.ChannelInfo;
 
 import java.util.Optional;
 
@@ -56,12 +55,10 @@ public class BanTest {
     @Mock private Channel channel;
     @Mock private CommandController controller;
     @Mock private FrameContainer container;
-    @Mock private ChannelInfo channelInfo;
     private Ban command;
 
     @Before
     public void setup() {
-        when(channel.getChannelInfo()).thenReturn(channelInfo);
         when(channel.getConnection()).thenReturn(Optional.of(connection));
         when(connection.getUser("user")).thenReturn(user1);
         when(connection.getUser("*!*@my.host.name")).thenReturn(user2);
@@ -87,8 +84,8 @@ public class BanTest {
         command.execute(container, new CommandArguments(controller, "/ban user"),
                 new ChannelCommandContext(null, Ban.INFO, channel));
 
-        verify(channelInfo).alterMode(true, 'b', "*!*@HOSTNAME");
-        verify(channelInfo).flushModes();
+        verify(channel).setMode('b', "*!*@HOSTNAME");
+        verify(channel).flushModes();
     }
 
     /** Tests that the ban command works if given a mask not a username. */
@@ -97,7 +94,7 @@ public class BanTest {
         command.execute(container, new CommandArguments(controller, "/ban *!*@my.host.name"),
                 new ChannelCommandContext(null, Ban.INFO, channel));
 
-        verify(channelInfo).alterMode(true, 'b', "*!*@my.host.name");
-        verify(channelInfo).flushModes();
+        verify(channel).setMode('b', "*!*@my.host.name");
+        verify(channel).flushModes();
     }
 }

test/com/dmdirc/commandparser/commands/channel/ModeTest.java

@@ -29,7 +29,6 @@ import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.Optional;
@@ -48,7 +47,6 @@ public class ModeTest {
 
     @Mock private FrameContainer origin;
     @Mock private CommandController controller;
-    @Mock private ChannelInfo channelinfo;
     @Mock private Channel channel;
     @Mock private Connection connection;
     @Mock private Parser parser;
@@ -58,9 +56,8 @@ public class ModeTest {
     public void setUp() throws InvalidIdentityFileException {
         when(channel.getConnection()).thenReturn(Optional.of(connection));
         when(connection.getParser()).thenReturn(Optional.of(parser));
-        when(channel.getChannelInfo()).thenReturn(channelinfo);
-        when(channelinfo.getModes()).thenReturn("my mode string!");
-        when(channelinfo.toString()).thenReturn("#chan");
+        when(channel.getModes()).thenReturn("my mode string!");
+        when(channel.getName()).thenReturn("#chan");
 
         command = new Mode(controller);
     }
@@ -70,7 +67,7 @@ public class ModeTest {
         command.execute(origin, new CommandArguments(controller, "/mode"),
                 new ChannelCommandContext(null, Mode.INFO, channel));
 
-        verify(origin).addLine("channelModeDiscovered", "my mode string!", channelinfo);
+        verify(origin).addLine("channelModeDiscovered", "my mode string!", channel);
     }
 
     @Test