Minor tidying

Change-Id: Ibcb8c43c3d9fcd18d80e087e951c2466bf717898
Reviewed-on: http://gerrit.dmdirc.com/3824
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

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

@@ -22,19 +22,17 @@
 
 package com.dmdirc.addons.contactlist;
 
-import com.dmdirc.Channel;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.Query;
 import com.dmdirc.events.ChannelUserAwayEvent;
 import com.dmdirc.events.ChannelUserBackEvent;
 import com.dmdirc.events.FrameClosingEvent;
+import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.NicklistListener;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 
 import java.util.Collection;
 
-import javax.inject.Inject;
-
 import net.engio.mbassy.listener.Handler;
 
 /**
@@ -42,27 +40,26 @@ import net.engio.mbassy.listener.Handler;
  */
 public class ContactListListener implements NicklistListener {
 
-    /** The channel this listener is for. */
-    private final Channel channel;
+    /** The group chat this listener is for. */
+    private final GroupChat groupChat;
     /** Event bus to register listeners with. */
     private final DMDircMBassador eventBus;
 
     /**
-     * Creates a new ContactListListener for the specified channel.
+     * Creates a new ContactListListener for the specified group chat.
      *
-     * @param channel The channel to show a contact list for
+     * @param groupChat The group chat to show a contact list for
      */
-    @Inject
-    public ContactListListener(final Channel channel) {
-        this.channel = channel;
-        this.eventBus = channel.getEventBus();
+    public ContactListListener(final GroupChat groupChat) {
+        this.groupChat = groupChat;
+        this.eventBus = groupChat.getEventBus();
     }
 
     /**
      * Adds all necessary listeners for this contact list listener to function.
      */
     public void addListeners() {
-        channel.addNicklistListener(this);
+        groupChat.addNicklistListener(this);
         eventBus.subscribe(this);
     }
 
@@ -70,7 +67,7 @@ public class ContactListListener implements NicklistListener {
      * Removes the listeners added by {@link #addListeners()}.
      */
     public void removeListeners() {
-        channel.removeNicklistListener(this);
+        groupChat.removeNicklistListener(this);
         eventBus.unsubscribe(this);
     }
 
@@ -88,7 +85,7 @@ public class ContactListListener implements NicklistListener {
 
     @Override
     public void clientAdded(final ChannelClientInfo client) {
-        final Query query = channel.getConnection().
+        final Query query = groupChat.getConnection().
                 getQuery(client.getClient().getNickname(), false);
 
         query.setIcon("query-" + client.getClient().getAwayState().name().toLowerCase());

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

@@ -56,10 +56,11 @@ import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JScrollPane;
 import javax.swing.KeyStroke;
+import javax.swing.ScrollPaneConstants;
 import javax.swing.SwingUtilities;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import javax.swing.text.DefaultStyledDocument;
+import javax.swing.text.AbstractDocument;
 import javax.swing.text.SimpleAttributeSet;
 import javax.swing.text.StyleConstants;
 import javax.swing.text.StyledDocument;
@@ -141,7 +142,7 @@ public class TopicBar extends JComponent implements ActionListener, ConfigChange
         updateOptions();
         errorIcon = new JLabel(iconManager.getIcon("input-error"));
         topicText.setEditorKit(new WrapEditorKit(showFull, channel.getEventBus(), window));
-        ((DefaultStyledDocument) topicText.getDocument()).setDocumentFilter(
+        ((AbstractDocument) topicText.getDocument()).setDocumentFilter(
                 new NewlinesDocumentFilter());
 
         topicText.getActionMap().put("paste-from-clipboard",
@@ -160,8 +161,8 @@ public class TopicBar extends JComponent implements ActionListener, ConfigChange
         handler.setTabCompleter(channel.getTabCompleter());
 
         final JScrollPane sp = new JScrollPane(topicText);
-        sp.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-        sp.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_NEVER);
+        sp.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+        sp.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER);
 
         setLayout(new MigLayout("fillx, ins 0, hidemode 3"));
         add(sp, "growx, pushx");
@@ -367,7 +368,7 @@ public class TopicBar extends JComponent implements ActionListener, ConfigChange
      */
     private void applyAttributes() {
         setAttributes();
-        ((DefaultStyledDocument) topicText.getDocument())
+        ((StyledDocument) topicText.getDocument())
                 .setCharacterAttributes(0, Integer.MAX_VALUE, as, true);
     }
 
@@ -445,7 +446,7 @@ public class TopicBar extends JComponent implements ActionListener, ConfigChange
         cancelTopicEdit();
         if ("showfulltopic".equals(key)) {
             topicText.setEditorKit(new WrapEditorKit(showFull, channel.getEventBus(), window));
-            ((DefaultStyledDocument) topicText.getDocument()).setDocumentFilter(
+            ((AbstractDocument) topicText.getDocument()).setDocumentFilter(
                     new NewlinesDocumentFilter());
             topicChanged(channel, null);
         }

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

@@ -48,7 +48,6 @@ import java.awt.event.ActionListener;
 import javax.inject.Provider;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
-import javax.swing.JSplitPane;
 
 import net.miginfocom.swing.MigLayout;
 
@@ -120,24 +119,6 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
                 owner.getChannelInfo().getName());
     }
 
-    /**
-     * Retrieves this channel frame's nicklist component.
-     *
-     * @return This channel's nicklist
-     */
-    public NickList getNickList() {
-        return nicklist;
-    }
-
-    /**
-     * Returns the topic bar for this channel frame.
-     *
-     * @return Topic bar or null if none exists
-     */
-    public TopicBar getTopicBar() {
-        return topicBar;
-    }
-
     /**
      * Initialises the components in this frame.
      *
@@ -182,15 +163,6 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
         }
     }
 
-    /**
-     * Returns the splitpane.
-     *
-     * @return nicklist JSplitPane
-     */
-    public JSplitPane getSplitPane() {
-        return splitPane;
-    }
-
     @Override
     public void configChanged(final String domain, final String key) {
         super.configChanged(domain, key);
@@ -258,7 +230,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
 
     @Override
     public void addCustomPopupItems(final JPopupMenu popupMenu) {
-        if (getContainer().getConnection().getState().equals(ServerState.CONNECTED)) {
+        if (channel.getConnection().getState() == ServerState.CONNECTED) {
             settingsMI.setEnabled(true);
         } else {
             settingsMI.setEnabled(false);