Change some Channels to GroupChats.

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.logging;
 
-import com.dmdirc.Channel;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
@@ -45,6 +44,7 @@ import com.dmdirc.events.ChannelTopicChangeEvent;
 import com.dmdirc.events.QueryClosedEvent;
 import com.dmdirc.events.QueryOpenedEvent;
 import com.dmdirc.events.UserErrorEvent;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.User;
@@ -571,7 +571,7 @@ public class LoggingManager implements ConfigChangeListener {
     protected boolean showHistory(final FrameContainer target) {
         final String descriptor;
 
-        if (target instanceof Channel) {
+        if (target instanceof GroupChat) {
             descriptor = target.getName();
         } else if (target instanceof Query) {
             descriptor = ((PrivateChat) target).getNickname();

tabcompletion_mirc/src/com/dmdirc/addons/tabcompletion_mirc/MircStyle.java

@@ -22,16 +22,16 @@
 
 package com.dmdirc.addons.tabcompletion_mirc;
 
-import com.google.common.collect.Lists;
-
-import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompletionMatches;
 import com.dmdirc.ui.input.tabstyles.TabCompletionResult;
 import com.dmdirc.ui.input.tabstyles.TabCompletionStyle;
 
+import com.google.common.collect.Lists;
+
 import java.awt.Toolkit;
 import java.util.Collections;
 import java.util.List;
@@ -82,10 +82,10 @@ public class MircStyle implements TabCompletionStyle {
             } else {
                 Collections.sort(results, String.CASE_INSENSITIVE_ORDER);
 
-                if (!word.isEmpty() && window instanceof Channel
-                        && ((Channel) window)
-                        .getChannelInfo().getName().startsWith(word)) {
-                    target = ((Channel) window).getChannelInfo().getName();
+                if (!word.isEmpty()
+                        && window instanceof GroupChat
+                        && window.getName().startsWith(word)) {
+                    target = window.getName();
                 } else {
                     target = results.get(0);
                 }

ui_swing/src/com/dmdirc/addons/ui_swing/components/NickList.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components;
 
-import com.dmdirc.Channel;
 import com.dmdirc.addons.ui_swing.EDTInvocation;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -35,6 +34,7 @@ import com.dmdirc.events.NickListClientAddedEvent;
 import com.dmdirc.events.NickListClientRemovedEvent;
 import com.dmdirc.events.NickListClientsChangedEvent;
 import com.dmdirc.events.NickListUpdatedEvent;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.messages.ColourManager;
@@ -96,7 +96,7 @@ public class NickList extends JScrollPane implements MouseListener {
         setPreferredSize(new Dimension(splitPanePosition, 0));
         setMinimumSize(new Dimension(75, 0));
 
-        nicklistModel.replace(((Channel) frame.getContainer()).getUsers());
+        nicklistModel.replace(((GroupChat) frame.getContainer()).getUsers());
         frame.getContainer().getEventBus().subscribe(this);
         config.getBinder().bind(this, NickList.class);
     }

ui_swing/src/com/dmdirc/addons/ui_swing/components/TopicBar.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components;
 
-import com.dmdirc.Channel;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.Topic;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
@@ -36,6 +35,7 @@ import com.dmdirc.addons.ui_swing.textpane.StyledDocumentMaker;
 import com.dmdirc.events.ChannelTopicChangeEvent;
 import com.dmdirc.events.ChannelTopicUnsetEvent;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.plugins.PluginManager;
@@ -91,7 +91,7 @@ public class TopicBar extends JComponent implements ActionListener, ConfigChange
     /** The window this topic bar is for. */
     private final ChannelFrame window;
     /** Associated channel. */
-    private final Channel channel;
+    private final GroupChat channel;
     /** the maximum length allowed for a topic. */
     private final int topicLengthMax;
     /** The config domain to read settings from. */
@@ -134,7 +134,7 @@ public class TopicBar extends JComponent implements ActionListener, ConfigChange
             final PluginManager pluginManager,
             final Clipboard clipboard,
             final CommandController commandController,
-            final Channel channel,
+            final GroupChat channel,
             final ChannelFrame window,
             final IconManager iconManager,
             final TabCompleterUtils tabCompleterUtils,
@@ -161,10 +161,11 @@ public class TopicBar extends JComponent implements ActionListener, ConfigChange
                 iconManager.getIcon("close-active"));
 
         final SwingInputHandler handler = new SwingInputHandler(
-                pluginManager, topicText, commandController, channel.getCommandParser(),
-                channel, tabCompleterUtils, channel.getEventBus());
+                pluginManager, topicText, commandController,
+                channel.getWindowModel().getCommandParser(),
+                channel.getWindowModel(), tabCompleterUtils, channel.getEventBus());
         handler.setTypes(true, false, true, false);
-        handler.setTabCompleter(channel.getTabCompleter());
+        handler.setTabCompleter(channel.getWindowModel().getTabCompleter());
 
         final JScrollPane sp = new JScrollPane(topicText);
         sp.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
@@ -238,13 +239,13 @@ public class TopicBar extends JComponent implements ActionListener, ConfigChange
         topicChanged(event.getChannel(), null);
     }
 
-    private void topicChanged(final Channel channel, final Topic topic) {
+    private void topicChanged(final GroupChat channel, final Topic topic) {
         if (topicText.isEditable()) {
             return;
         }
         topicText.setText("");
         if (topic != null) {
-            channel.getBackBuffer().getStyliser().addStyledString(
+            channel.getWindowModel().getBackBuffer().getStyliser().addStyledString(
                     new StyledDocumentMaker((StyledDocument) topicText.getDocument(), as),
                     Styliser.CODE_HEXCOLOUR
                             + UIUtilities.getHex(foregroundColour)
@@ -342,13 +343,12 @@ public class TopicBar extends JComponent implements ActionListener, ConfigChange
      */
     private void setColours() {
         backgroundColour = UIUtilities.convertColour(
-                colourManager.getColourFromString(
-                        channel.getConfigManager().getOptionString(
-                                "ui", "inputbackgroundcolour",
-                                "ui", "backgroundcolour"), null));
+                colourManager.getColourFromString(channel.getWindowModel().getConfigManager()
+                                .getOptionString("ui", "inputbackgroundcolour", "ui",
+                                        "backgroundcolour"), null));
         foregroundColour = UIUtilities.convertColour(
                 colourManager.getColourFromString(
-                        channel.getConfigManager().getOptionString(
+                        channel.getWindowModel().getConfigManager().getOptionString(
                                 "ui", "inputforegroundcolour",
                                 "ui", "foregroundcolour"), null));
         setBackground(backgroundColour);
@@ -433,9 +433,12 @@ public class TopicBar extends JComponent implements ActionListener, ConfigChange
     }
 
     private void updateOptions() {
-        showFull = channel.getConfigManager().getOptionBool(domain, "showfulltopic");
-        hideEmpty = channel.getConfigManager().getOptionBool(domain, "hideEmptyTopicBar");
-        showBar = channel.getConfigManager().getOptionBool(domain, "showtopicbar");
+        showFull = channel.getWindowModel().getConfigManager()
+                .getOptionBool(domain, "showfulltopic");
+        hideEmpty = channel.getWindowModel().getConfigManager()
+                .getOptionBool(domain, "hideEmptyTopicBar");
+        showBar = channel.getWindowModel().getConfigManager()
+                .getOptionBool(domain, "showtopicbar");
     }
 
     /**

ui_swing/src/com/dmdirc/addons/ui_swing/components/TopicBarFactory.java

@@ -22,12 +22,12 @@
 
 package com.dmdirc.addons.ui_swing.components;
 
-import com.dmdirc.Channel;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.frames.ChannelFrame;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginManager;
@@ -83,11 +83,11 @@ public class TopicBarFactory {
     }
 
     public TopicBar getTopicBar(
-            final Channel channel,
+            final GroupChat channel,
             final ChannelFrame window,
             final IconManager iconManager) {
         return new TopicBar(parentWindow.get(), globalConfig, domain,
-                colourManagerFactory.getColourManager(channel.getConfigManager()),
+                colourManagerFactory.getColourManager(channel.getWindowModel().getConfigManager()),
                 pluginManager, clipboard, commandController, channel, window, iconManager,
                 tabCompleterUtils, eventBus);
     }