Use GroupChat in events.

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/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);
     }
 }