Merge pull request #337 from csmith/master

Changes to channel commands done in core.

contactlist/src/com/dmdirc/addons/contactlist/ContactListCommand.java

@@ -62,9 +62,9 @@ public class ContactListCommand extends Command implements IntelligentCommand {
             final CommandArguments args, final CommandContext context) {
         final ChannelCommandContext chanContext = (ChannelCommandContext) context;
 
-        final ContactListListener listener = new ContactListListener(chanContext.getChannel());
+        final ContactListListener listener = new ContactListListener(chanContext.getGroupChat());
         listener.addListeners();
-        chanContext.getChannel().getUsers().forEach(listener::clientAdded);
+        chanContext.getGroupChat().getUsers().forEach(listener::clientAdded);
     }
 
     @Override

ui_swing/src/com/dmdirc/addons/ui_swing/commands/ChannelSettings.java

@@ -70,7 +70,7 @@ public class ChannelSettings extends Command implements IntelligentCommand {
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        dialogProvider.displayOrRequestFocus(((ChannelCommandContext) context).getChannel());
+        dialogProvider.displayOrRequestFocus(((ChannelCommandContext) context).getGroupChat());
     }
 
     @Override