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

circle.yml

@@ -37,11 +37,7 @@ dependencies:
 
 test:
   override:
-    - ./gradlew --stacktrace --parallel plugins:jar plugins:test:
-        pwd:
-          ../meta
-  post:
-    - ./gradlew plugins:coveralls:
+    - ./gradlew --stacktrace plugins:jar plugins:test plugins:coveralls:
         pwd:
           ../meta
 

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

logging/src/com/dmdirc/addons/logging/LogFileLocator.java

@@ -27,10 +27,11 @@ import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.events.UserErrorEvent;
+import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.plugins.PluginDomain;
 
 import java.io.File;
@@ -39,6 +40,7 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Optional;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
@@ -103,12 +105,11 @@ public class LogFileLocator {
      *
      * @return the name of the log file to use for this object.
      */
-    public String getLogFile(final ChannelInfo channel) {
+    public String getLogFile(final GroupChat channel) {
         final StringBuffer directory = getLogDirectory();
         final StringBuffer file = new StringBuffer();
-        if (channel.getParser() != null) {
-            addNetworkDir(directory, file, channel.getParser().getNetworkName());
-        }
+        final Optional<String> network = channel.getConnection().map(Connection::getNetwork);
+        network.ifPresent(n -> addNetworkDir(directory, file, n));
         file.append(sanitise(channel.getName().toLowerCase()));
         return getPath(directory, file, channel.getName());
     }

logging/src/com/dmdirc/addons/logging/LoggingManager.java

@@ -260,19 +260,19 @@ public class LoggingManager implements ConfigChangeListener {
 
     @Handler
     public void handleChannelMessage(final BaseChannelMessageEvent event) {
-        final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
+        final String filename = locator.getLogFile(event.getChannel());
         appendLine(filename, "<%s> %s", getDisplayName(event.getClient()), event.getMessage());
     }
 
     @Handler
     public void handleChannelAction(final BaseChannelActionEvent event) {
-        final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
+        final String filename = locator.getLogFile(event.getChannel());
         appendLine(filename, "* %s %s", getDisplayName(event.getClient()), event.getMessage());
     }
 
     @Handler
     public void handleChannelGotTopic(final ChannelGotTopicEvent event) {
-        final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
+        final String filename = locator.getLogFile(event.getChannel());
         final DateFormat timeFormat = new SimpleDateFormat("HH:mm:ss");
         final DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
 
@@ -286,14 +286,14 @@ public class LoggingManager implements ConfigChangeListener {
 
     @Handler
     public void handleChannelTopicChange(final ChannelTopicChangeEvent event) {
-        final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
+        final String filename = locator.getLogFile(event.getChannel());
         appendLine(filename, "*** %s Changed the topic to: %s",
                 event.getTopic().getClient().map(this::getDisplayName).orElse(""), event.getTopic());
     }
 
     @Handler
     public void handleChannelJoin(final ChannelJoinEvent event) {
-        final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
+        final String filename = locator.getLogFile(event.getChannel());
         final GroupChatUser channelClient = event.getClient();
         appendLine(filename, "*** %s (%s) joined the channel", getDisplayName(channelClient),
                 channelClient.getNickname());
@@ -301,7 +301,7 @@ public class LoggingManager implements ConfigChangeListener {
 
     @Handler
     public void handleChannelPart(final ChannelPartEvent event) {
-        final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
+        final String filename = locator.getLogFile(event.getChannel());
         final String message = event.getMessage();
         final GroupChatUser channelClient = event.getClient();
         if (message.isEmpty()) {
@@ -315,7 +315,7 @@ public class LoggingManager implements ConfigChangeListener {
 
     @Handler
     public void handleChannelQuit(final ChannelQuitEvent event) {
-        final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
+        final String filename = locator.getLogFile(event.getChannel());
         final String reason = event.getMessage();
         final GroupChatUser channelClient = event.getClient();
         if (reason.isEmpty()) {
@@ -332,7 +332,7 @@ public class LoggingManager implements ConfigChangeListener {
         final GroupChatUser victim = event.getVictim();
         final GroupChatUser perpetrator = event.getClient();
         final String reason = event.getReason();
-        final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
+        final String filename = locator.getLogFile(event.getChannel());
 
         if (reason.isEmpty()) {
             appendLine(filename, "*** %s was kicked by %s",
@@ -345,14 +345,14 @@ public class LoggingManager implements ConfigChangeListener {
 
     @Handler
     public void handleNickChange(final ChannelNickChangeEvent event) {
-        final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
+        final String filename = locator.getLogFile(event.getChannel());
         appendLine(filename, "*** %s is now %s", getDisplayName(event.getClient(),
                 event.getOldNick()), getDisplayName(event.getClient()));
     }
 
     @Handler
     public void handleModeChange(final ChannelModeChangeEvent event) {
-        final String filename = locator.getLogFile(event.getChannel().getChannelInfo());
+        final String filename = locator.getLogFile(event.getChannel());
         if (event.getClient().getNickname().isEmpty()) {
             appendLine(filename, "*** Channel modes are: %s", event.getModes());
         } else {
@@ -371,7 +371,7 @@ public class LoggingManager implements ConfigChangeListener {
         final String filename = locator.getLogFile(event.getChannel().getName());
 
         if (autobackbuffer) {
-            showBackBuffer(event.getChannel(), filename);
+            showBackBuffer(event.getChannel().getWindowModel(), filename);
         }
 
         synchronized (FORMAT_LOCK) {

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.commands;
 
-import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
 import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
@@ -36,6 +35,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.ui.input.AdditionalTabTargets;
 
 import javax.annotation.Nonnull;
@@ -51,7 +51,7 @@ public class ChannelSettings extends Command implements IntelligentCommand {
     public static final CommandInfo INFO = new BaseCommandInfo("channelsettings",
             "channelsettings - opens the channel settings window", CommandType.TYPE_CHANNEL);
     /** The controller to use to show the settings window. */
-    private final KeyedDialogProvider<Channel, ChannelSettingsDialog> dialogProvider;
+    private final KeyedDialogProvider<GroupChat, ChannelSettingsDialog> dialogProvider;
 
     /**
      * Creates a new instance of the {@link ChannelSettings} command.
@@ -62,7 +62,7 @@ public class ChannelSettings extends Command implements IntelligentCommand {
     @Inject
     public ChannelSettings(
             final CommandController commandController,
-            final KeyedDialogProvider<Channel, ChannelSettingsDialog> dialogProvider) {
+            final KeyedDialogProvider<GroupChat, ChannelSettingsDialog> dialogProvider) {
         super(commandController);
         this.dialogProvider = dialogProvider;
     }
@@ -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

ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/ChannelFrame.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
-import com.dmdirc.Channel;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.EDTInvocation;
@@ -58,7 +57,7 @@ import net.engio.mbassy.listener.Handler;
 import static com.dmdirc.addons.ui_swing.SwingPreconditions.checkOnEDT;
 
 /**
- * The channel frame is the GUI component that represents a channel to the user.
+ * The groupChat frame is the GUI component that represents a groupChat to the user.
  */
 public final class ChannelFrame extends InputTextFrame {
 
@@ -79,9 +78,9 @@ public final class ChannelFrame extends InputTextFrame {
     /** Config to read settings from. */
     private final AggregateConfigProvider globalConfig;
     /** Channel settings dialog provider. */
-    private final KeyedDialogProvider<Channel, ChannelSettingsDialog> dialogProvider;
-    /** Channel instance. */
-    private final Channel channel;
+    private final KeyedDialogProvider<GroupChat, ChannelSettingsDialog> dialogProvider;
+    /** Group chat instance. */
+    private final GroupChat groupChat;
     /** Config binder. */
     private final ConfigBinder binder;
 
@@ -91,33 +90,33 @@ public final class ChannelFrame extends InputTextFrame {
      *
      * @param deps               The dependencies required by text frames.
      * @param inputFieldProvider The provider to use to create a new input field.
-     * @param identityFactory    The factory to use to create a channel identity.
+     * @param identityFactory    The factory to use to create a group chat identity.
      * @param topicBarFactory    The factory to use to create topic bars.
-     * @param owner              The Channel object that owns this frame
+     * @param owner              The group chat object that owns this frame
      * @param domain             The domain to read settings from
-     * @param dialogProvider     The dialog provider to get the channel settings dialog from.
+     * @param dialogProvider     The dialog provider to get the group chat settings dialog from.
      */
     public ChannelFrame(
             final String domain,
             final TextFrameDependencies deps,
             final Provider<SwingInputField> inputFieldProvider,
             final IdentityFactory identityFactory,
-            final KeyedDialogProvider<Channel, ChannelSettingsDialog> dialogProvider,
+            final KeyedDialogProvider<GroupChat, ChannelSettingsDialog> dialogProvider,
             final InputTextFramePasteActionFactory inputTextFramePasteActionFactory,
             final TopicBarFactory topicBarFactory,
-            final Channel owner) {
-        super(deps, inputFieldProvider, inputTextFramePasteActionFactory, owner);
+            final GroupChat owner) {
+        super(deps, inputFieldProvider, inputTextFramePasteActionFactory, owner.getWindowModel());
 
         this.eventBus = deps.eventBus;
         this.globalConfig = deps.globalConfig;
         this.dialogProvider = dialogProvider;
-        this.channel = owner;
+        this.groupChat = owner;
 
         initComponents(topicBarFactory, deps.colourManagerFactory);
         binder = getContainer().getConfigManager().getBinder().withDefaultDomain(domain);
 
         identity = identityFactory.createChannelConfig(owner.getConnection().get().getNetwork(),
-                owner.getChannelInfo().getName());
+                owner.getName());
     }
 
     /**
@@ -142,8 +141,7 @@ public final class ChannelFrame extends InputTextFrame {
 
         nicklist = new NickList(this, getContainer().getConfigManager(), colourManagerFactory);
         settingsMI = new JMenuItem("Settings");
-        settingsMI.addActionListener(l ->
-                dialogProvider.displayOrRequestFocus((Channel) getContainer()));
+        settingsMI.addActionListener(l -> dialogProvider.displayOrRequestFocus(groupChat));
 
         splitPane = new SplitPane(globalConfig, SplitPane.Orientation.HORIZONTAL);
 
@@ -212,7 +210,7 @@ public final class ChannelFrame extends InputTextFrame {
 
     @Override
     public void addCustomPopupItems(final JPopupMenu popupMenu) {
-        if (channel.getConnection().get().getState() == ServerState.CONNECTED) {
+        if (groupChat.getConnection().get().getState() == ServerState.CONNECTED) {
             settingsMI.setEnabled(true);
         } else {
             settingsMI.setEnabled(false);
@@ -228,7 +226,7 @@ public final class ChannelFrame extends InputTextFrame {
     public void windowClosing(final FrameClosingEvent event) {
         saveSplitPanePosition();
         topicBar.close();
-        dialogProvider.dispose(channel);
+        dialogProvider.dispose(groupChat);
         super.windowClosing(event);
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/ChannelFrameFactory.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
-import com.dmdirc.Channel;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.SwingController;
@@ -31,6 +30,7 @@ import com.dmdirc.addons.ui_swing.components.TopicBarFactory;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
 import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.core.components.WindowComponent;
@@ -56,7 +56,7 @@ public class ChannelFrameFactory implements SwingWindowFactory.WindowProvider {
     private final Provider<SwingInputField> inputFieldProvider;
     private final IdentityFactory identityFactory;
     private final InputTextFramePasteActionFactory inputTextFramePasteActionFactory;
-    private final Provider<KeyedDialogProvider<Channel, ChannelSettingsDialog>> dialogProvider;
+    private final Provider<KeyedDialogProvider<GroupChat, ChannelSettingsDialog>> dialogProvider;
     private final TopicBarFactory topicBarFactory;
     private final DMDircMBassador eventBus;
 
@@ -68,7 +68,7 @@ public class ChannelFrameFactory implements SwingWindowFactory.WindowProvider {
             final Provider<SwingInputField> inputFieldProvider,
             final InputTextFramePasteActionFactory inputTextFramePasteActionFactory,
             final IdentityFactory identityFactory,
-            final Provider<KeyedDialogProvider<Channel, ChannelSettingsDialog>> dialogProvider,
+            final Provider<KeyedDialogProvider<GroupChat, ChannelSettingsDialog>> dialogProvider,
             final TopicBarFactory topicBarFactory) {
         this.eventBus = eventBus;
         this.domain = domain;
@@ -84,7 +84,8 @@ public class ChannelFrameFactory implements SwingWindowFactory.WindowProvider {
     public TextFrame getWindow(final FrameContainer container) {
         final ChannelFrame frame = new ChannelFrame(domain, dependencies.get(), inputFieldProvider,
                 identityFactory, dialogProvider.get(), inputTextFramePasteActionFactory,
-                topicBarFactory, (Channel) container);
+                topicBarFactory, (GroupChat) container);
+                // TODO: Can't assume containers are GroupChats...
         eventBus.subscribe(frame);
         return frame;
     }

ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/DesktopWindowFrame.java

@@ -23,11 +23,10 @@
 package com.dmdirc.addons.ui_swing.components.frames;
 
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.events.FrameIconChangedEvent;
 import com.dmdirc.events.FrameTitleChangedEvent;
-import com.dmdirc.addons.ui_swing.components.IconManager;
-
-import java.awt.Point;
+import com.dmdirc.ui.CoreUIUtils;
 
 import javax.swing.JFrame;
 
@@ -46,8 +45,6 @@ public class DesktopWindowFrame extends JFrame {
     /** TextFrame associated with this popout window. */
     private final TextFrame windowWindow;
     private final IconManager iconManager;
-    /** Initial location for popped out window. */
-    private final Point initialLocation;
 
     /**
      * Creates a new instance of DesktopWindowFrame.
@@ -57,7 +54,6 @@ public class DesktopWindowFrame extends JFrame {
     public DesktopWindowFrame(final TextFrame windowWindow, final IconManager iconManager) {
         this.windowWindow = windowWindow;
         this.iconManager = iconManager;
-        initialLocation = windowWindow.getLocationOnScreen();
 
         setLayout(new MigLayout("fill, ins rel"));
         add(windowWindow, "grow");
@@ -71,8 +67,8 @@ public class DesktopWindowFrame extends JFrame {
      */
     public void display() {
         pack();
+        CoreUIUtils.centreWindow(this);
         setVisible(true);
-        setLocation(initialLocation);
     }
 
     @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)

ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java

@@ -182,9 +182,9 @@ public abstract class TextFrame extends JPanel implements Window, TextPaneListen
             popoutFrame.dispose();
             eventBus.unsubscribe(popoutFrame);
             popoutFrame = null;
-            // TODO: This is a horrible hack really.
-            swingEventBus.publishAsync(new SwingActiveWindowChangeRequestEvent(Optional.of(this)));
         }
+        // TODO: This is a horrible hack really.
+        swingEventBus.publishAsync(new SwingActiveWindowChangeRequestEvent(Optional.of(this)));
     }
 
     /**

ui_swing/src/com/dmdirc/addons/ui_swing/components/menubar/ChannelMenu.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.menubar;
 
-import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.MainFrame;
@@ -34,6 +33,7 @@ import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.addons.ui_swing.components.IconManager;
 
@@ -60,7 +60,7 @@ public class ChannelMenu extends JMenu implements MenuListener {
     /** Main frame. */
     private final MainFrame mainFrame;
     /** Dialog provider. */
-    private final KeyedDialogProvider<Channel, ChannelSettingsDialog> dialogProvider;
+    private final KeyedDialogProvider<GroupChat, ChannelSettingsDialog> dialogProvider;
     /** Channel list dialog provider. */
     private final DialogProvider<ChannelListDialog> channelListDialogProvider;
     /** Active frame manager. */
@@ -73,7 +73,7 @@ public class ChannelMenu extends JMenu implements MenuListener {
     @Inject
     public ChannelMenu(
             final ActiveFrameManager activeFrameManager,
-            final KeyedDialogProvider<Channel, ChannelSettingsDialog> dialogProvider,
+            final KeyedDialogProvider<GroupChat, ChannelSettingsDialog> dialogProvider,
             final MainFrame mainFrame,
             final IconManager iconManager,
             final DialogProvider<ChannelListDialog> channelListDialogProvider) {
@@ -121,8 +121,9 @@ public class ChannelMenu extends JMenu implements MenuListener {
 
     private void showChannelSettings() {
         activeFrameManager.getActiveFrame().ifPresent(f -> {
-            if (f.getContainer() instanceof Channel) {
-                dialogProvider.displayOrRequestFocus((Channel) f.getContainer());
+            // TODO: Can't assume containers will be group chats.
+            if (f.getContainer() instanceof GroupChat) {
+                dialogProvider.displayOrRequestFocus((GroupChat) f.getContainer());
             }
         });
     }

ui_swing/src/com/dmdirc/addons/ui_swing/components/modes/ChannelModesPane.java

@@ -22,74 +22,75 @@
 
 package com.dmdirc.addons.ui_swing.components.modes;
 
-import com.dmdirc.Channel;
-import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.addons.ui_swing.components.IconManager;
+import com.dmdirc.interfaces.GroupChat;
+import com.dmdirc.parser.interfaces.Parser;
 
 /** Non list mode panel. */
 public final class ChannelModesPane extends ModesPane {
 
     /** Serial version UID. */
     private static final long serialVersionUID = 1;
-    /** Parent channel. */
-    private final Channel channel;
+    /** Parent group chat. */
+    private final GroupChat groupChat;
 
     /**
      * Creates a new instance of ChannelModesPane.
      *
-     * @param channel Parent channel
+     * @param groupChat Parent group chat
      * @param iconManager The icon manager to use
      */
-    public ChannelModesPane(final Channel channel, final IconManager iconManager) {
-        super(channel.getConfigManager(), iconManager);
+    public ChannelModesPane(final GroupChat groupChat, final IconManager iconManager) {
+        super(groupChat.getWindowModel().getConfigManager(), iconManager);
 
-        this.channel = channel;
+        this.groupChat = groupChat;
         initModesPanel();
     }
 
     @Override
     public boolean hasModeValue(final String mode) {
-        return channel.getWindowModel().getConfigManager().hasOptionString("server", "mode" + mode);
+        return groupChat.getWindowModel().getConfigManager().hasOptionString("server",
+                "mode" + mode);
     }
 
     @Override
     public String getModeValue(final String mode) {
-        return channel.getWindowModel().getConfigManager().getOption("server", "mode" + mode);
+        return groupChat.getWindowModel().getConfigManager().getOption("server", "mode" + mode);
     }
 
     @Override
     public boolean isModeEnabled(final String mode) {
-        return !channel.getWindowModel().getConfigManager().hasOptionString("server",
-                "enablemode" + mode) || channel.getWindowModel().getConfigManager()
+        return !groupChat.getWindowModel().getConfigManager().hasOptionString("server",
+                "enablemode" + mode) || groupChat.getWindowModel().getConfigManager()
                 .getOptionBool("server", "enablemode" + mode);
     }
 
     @Override
     public boolean isModeSettable(final String mode) {
-        return channel.getConnection().get().getParser().get().isUserSettable(mode.toCharArray()
+        return groupChat.getConnection().get().getParser().get().isUserSettable(mode.toCharArray()
                 [0]);
     }
 
     @Override
     public String getAvailableBooleanModes() {
-        return channel.getConnection().get().getParser().get().getBooleanChannelModes();
+        return groupChat.getConnection().get().getParser().get().getBooleanChannelModes();
     }
 
     @Override
     public String getOurBooleanModes() {
-        return channel.getChannelInfo().getModes();
+        return groupChat.getModes();
     }
 
     @Override
     public String getAllParamModes() {
-        final Parser parser = channel.getConnection().get().getParser().get();
+        final Parser parser = groupChat.getConnection().get().getParser().get();
         return parser.getParameterChannelModes()
                 + parser.getDoubleParameterChannelModes();
     }
 
     @Override
     public String getParamModeValue(final String mode) {
-        return channel.getChannelInfo().getMode(mode.charAt(0));
+        return groupChat.getModeValue(mode.charAt(0));
     }
 
     @Override
@@ -101,12 +102,17 @@ public final class ChannelModesPane extends ModesPane {
         } else {
             state = getParamModes().get(mode).getState();
         }
-        channel.getChannelInfo().alterMode(state, mode.charAt(0), parameter);
+
+        if (state) {
+            groupChat.setMode(mode.charAt(0), parameter);
+        } else {
+            groupChat.removeMode(mode.charAt(0), parameter);
+        }
     }
 
     @Override
     public void flushModes() {
-        channel.getChannelInfo().flushModes();
+        groupChat.flushModes();
     }
 
 }

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelListModesPane.java

@@ -22,15 +22,15 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.channelsetting;
 
-import com.dmdirc.Channel;
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.addons.ui_swing.components.renderers.ListModeCellRenderer;
 import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.parser.common.ChannelListModeItem;
-import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.util.collections.MapList;
 import com.dmdirc.util.validators.NotEmptyValidator;
 
@@ -70,8 +70,8 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
 
     /** A version number for this class. */
     private static final long serialVersionUID = 5;
-    /** Channel. */
-    private final Channel channel;
+    /** Group chat. */
+    private final GroupChat groupChat;
     /** Combox box used to switch between list modes. */
     private final JComboBox<String> listModesMenu;
     /** Arraylist of jpanels containing the listmodes. */
@@ -111,33 +111,34 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
      * @param globalConfig The config to read settings from.
      * @param userConfig   The config to write settings to.
      * @param iconManager  The manager to use to retrieve icons for dialogs and validation.
-     * @param channel      Parent channel
+     * @param groupChat    Parent group chat
      * @param parentWindow Parent window
      */
     public ChannelListModesPane(
             final AggregateConfigProvider globalConfig,
             final ConfigProvider userConfig,
             final IconManager iconManager,
-            final Channel channel,
+            final GroupChat groupChat,
             final Window parentWindow) {
 
         this.globalConfig = checkNotNull(globalConfig);
         this.userConfig = checkNotNull(userConfig);
         this.iconManager = checkNotNull(iconManager);
-        this.channel = checkNotNull(channel);
+        this.groupChat = checkNotNull(groupChat);
         this.parentWindow = checkNotNull(parentWindow);
         setOpaque(UIUtilities.getTabbedPaneOpaque());
 
         list = new JList<>();
         nativeRenderer = list.getCellRenderer();
-        if (channel.getConfigManager().getOptionBool("general", "extendedListModes")) {
+        if (groupChat.getWindowModel().getConfigManager()
+                .getOptionBool("general", "extendedListModes")) {
             renderer = new ExtendedListModeCellRenderer();
         } else {
             renderer = new ListModeCellRenderer(nativeRenderer);
         }
         listModesPanel = new JScrollPane();
         listModesPanels = new ArrayList<>();
-        listModesArray = channel.getConnection().get().getParser().get()
+        listModesArray = groupChat.getConnection().get().getParser().get()
                 .getListChannelModes().toCharArray();
         existingListItems = new MapList<>();
         listModesMenu = new JComboBox<>(new DefaultComboBoxModel<>());
@@ -145,8 +146,8 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
         removeListModeButton = new JButton("Remove");
         removeListModeButton.setEnabled(false);
         modeCount = new JLabel();
-        toggle = new JCheckBox("Show extended information",
-                channel.getConfigManager().getOptionBool("general", "extendedListModes"));
+        toggle = new JCheckBox("Show extended information", groupChat.getWindowModel()
+                .getConfigManager().getOptionBool("general", "extendedListModes"));
         toggle.setOpaque(UIUtilities.getTabbedPaneOpaque());
 
         initListModesPanel();
@@ -157,13 +158,13 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
     public void update() {
         existingListItems.clear();
 
-        if (channel.getChannelInfo() == null) {
+        if (!groupChat.isOnChannel()) {
             return;
         }
+
         for (int i = 0; i < listModesArray.length; i++) {
             final char mode = listModesArray[i];
-            final Collection<ChannelListModeItem> listItems = channel
-                    .getChannelInfo().getListMode(mode);
+            final Collection<ChannelListModeItem> listItems = groupChat.getListModeItems(mode);
             if (listItems == null) {
                 continue;
             }
@@ -191,8 +192,9 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
                 getModel();
         for (char mode : listModesArray) {
             String modeText = mode + " list";
-            if (channel.getConfigManager().hasOptionString("server", "mode" + mode)) {
-                modeText = channel.getConfigManager().getOption("server",
+            if (groupChat.getWindowModel().getConfigManager()
+                    .hasOptionString("server", "mode" + mode)) {
+                modeText = groupChat.getWindowModel().getConfigManager().getOption("server",
                         "mode" + mode) + " list [+" + mode + ']';
             }
             model.addElement(modeText);
@@ -236,7 +238,8 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
         removeListModeButton.addActionListener(this);
         listModesMenu.addActionListener(this);
         toggle.addActionListener(this);
-        channel.getConfigManager().addChangeListener("general", "extendedListModes", this);
+        groupChat.getWindowModel().getConfigManager()
+                .addChangeListener("general", "extendedListModes", this);
 
     }
 
@@ -266,15 +269,15 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
             if (currentModes.containsKey(entry.getKey())) {
                 currentModes.remove(entry.getKey());
             } else {
-                channel.getChannelInfo().alterMode(true, entry.getValue(), entry.getKey().getItem());
+                groupChat.setMode(entry.getValue(), entry.getKey().getItem());
             }
         }
 
         for (Entry<ChannelListModeItem, Character> entry : currentModes.entrySet()) {
-            channel.getChannelInfo().alterMode(false, entry.getValue(), entry.getKey().getItem());
+            groupChat.removeMode(entry.getValue(), entry.getKey().getItem());
         }
 
-        channel.getChannelInfo().flushModes();
+        groupChat.flushModes();
         userConfig.setOption("general", "extendedListModes", toggle.isSelected());
     }
 
@@ -282,9 +285,9 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
     private void addListMode() {
         final int selectedIndex = listModesMenu.getSelectedIndex();
         String modeText = String.valueOf(listModesArray[selectedIndex]);
-        if (channel.getConfigManager().hasOptionString("server", "mode"
+        if (groupChat.getWindowModel().getConfigManager().hasOptionString("server", "mode"
                 + listModesArray[selectedIndex])) {
-            modeText = channel.getConfigManager().
+            modeText = groupChat.getWindowModel().getConfigManager().
                     getOption("server", "mode" + listModesArray[selectedIndex]);
         }
         new StandardInputDialog(parentWindow, ModalityType.DOCUMENT_MODAL,
@@ -354,7 +357,7 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
 
         final int selected = listModesMenu.getSelectedIndex();
         final int current = listModesPanels.get(selected).getModel().getSize();
-        final int maxModes = channel.getConnection().get().getParser().get().
+        final int maxModes = groupChat.getConnection().get().getParser().get().
                 getMaxListModes(listModesArray[selected]);
 
         if (maxModes == -1) {

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java

@@ -22,21 +22,21 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.channelsetting;
 
-import com.dmdirc.Channel;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
 import com.dmdirc.addons.ui_swing.components.modes.ChannelModesPane;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.plugins.ServiceManager;
-import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 
@@ -62,7 +62,7 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
     /** Serial version UID. */
     private static final long serialVersionUID = 8;
     /** The channel object that this dialog belongs to. */
-    private final Channel channel;
+    private final GroupChat channel;
     /** Channel identity file. */
     private final ConfigProvider identity;
     /** Channel window. */
@@ -104,7 +104,7 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
      * @param serviceManager     Service manager
      * @param preferencesManager Preferences Manager
      * @param compFactory        Preferences setting component factory
-     * @param channel            The channel object that we're editing settings for
+     * @param groupChat          The group chat object that we're editing settings for
      * @param parentWindow       Parent window
      * @param clipboard          Clipboard to copy and paste from
      * @param commandController  The controller to use to retrieve command information.
@@ -117,7 +117,7 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
             final ServiceManager serviceManager,
             final PreferencesManager preferencesManager,
             final PrefsComponentFactory compFactory,
-            final Channel channel,
+            final GroupChat groupChat,
             final Window parentWindow,
             final Clipboard clipboard,
             final CommandController commandController,
@@ -131,17 +131,16 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
         this.serviceManager = checkNotNull(serviceManager);
         this.preferencesManager = checkNotNull(preferencesManager);
         this.compFactory = checkNotNull(compFactory);
-        this.channel = checkNotNull(channel);
+        this.channel = checkNotNull(groupChat);
         this.clipboard = clipboard;
         this.commandController = checkNotNull(commandController);
         this.eventBus = eventBus;
         this.colourManagerFactory = colourManagerFactory;
         this.iconManager = iconManager;
 
-        identity = identityFactory.createChannelConfig(
-                channel.getConnection().get().getNetwork(),
-                channel.getChannelInfo().getName());
-        channelWindow = (InputWindow) windowFactory.getSwingWindow(channel);
+        identity = identityFactory.createChannelConfig(groupChat.getConnection().get().getNetwork(),
+                groupChat.getName());
+        channelWindow = (InputWindow) windowFactory.getSwingWindow(groupChat.getWindowModel());
 
         initComponents(tabCompleterUtils);
         initListeners();

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/profile/ProfileManagerController.java

@@ -285,6 +285,10 @@ public class ProfileManagerController implements ProfilesDialogModelListener {
         } else {
             selectionModel.setLeadSelectionIndex(-1);
         }
+        addNickname.setEnabled(model.getSelectedProfile().isPresent());
+        editNickname.setEnabled(model.getSelectedProfile().isPresent());
+        addHighlight.setEnabled(model.getSelectedProfile().isPresent());
+        editHighlight.setEnabled(model.getSelectedProfile().isPresent());
         name.setEnabled(model.getSelectedProfile().isPresent());
         name.setText(model.getSelectedProfileName().orElse(""));
         nicknames.setEnabled(model.getSelectedProfile().isPresent());

ui_swing/src/com/dmdirc/addons/ui_swing/injection/DialogModule.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.injection;
 
-import com.dmdirc.Channel;
 import com.dmdirc.ClientModule.UserConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.MainFrame;
@@ -44,6 +43,7 @@ import com.dmdirc.commandparser.auto.AutoCommandManager;
 import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityFactory;
@@ -186,7 +186,7 @@ public class DialogModule {
 
     @Provides
     @Singleton
-    public KeyedDialogProvider<Channel, ChannelSettingsDialog> getChannelSettingsDialogProvider(
+    public KeyedDialogProvider<GroupChat, ChannelSettingsDialog> getChannelSettingsDialogProvider(
             final IdentityFactory identityFactory,
             final SwingWindowFactory windowFactory,
             @UserConfig final ConfigProvider userConfig,
@@ -200,9 +200,9 @@ public class DialogModule {
             final ColourManagerFactory colourManagerFactory,
             final TabCompleterUtils tabCompleterUtils,
             final IconManager iconManager) {
-        return new KeyedDialogProvider<Channel, ChannelSettingsDialog>() {
+        return new KeyedDialogProvider<GroupChat, ChannelSettingsDialog>() {
             @Override
-            protected ChannelSettingsDialog getInstance(final Channel key) {
+            protected ChannelSettingsDialog getInstance(final GroupChat key) {
                 return new ChannelSettingsDialog(identityFactory, windowFactory,
                         userConfig, serviceManager, preferencesManager, compFactory, key,
                         parentWindow, clipboard, commandController, eventBus,