UI changes to cope with non-static Styliser

Change-Id: Ibd3ed7eb66077c6bef0744c6f9a8c3e6b5f1961c
Reviewed-on: http://gerrit.dmdirc.com/527
Automatic-Compile: Gregory Holmes <greboid@dmdirc.com>
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>

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

@@ -225,7 +225,7 @@ public class TopicBar extends JComponent implements ActionListener,
         }
         topicText.setText("");
         if (channel.getCurrentTopic() != null) {
-            Styliser.addStyledString((StyledDocument) topicText.getDocument(),
+            channel.getStyliser().addStyledString((StyledDocument) topicText.getDocument(),
                     new String[]{Styliser.CODE_HEXCOLOUR + ColourManager.getHex(
                         foregroundColour) + channel.getCurrentTopic().getTopic(),},
                     as);

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

@@ -76,7 +76,7 @@ public class TopicHistoryPane extends JPanel implements ListSelectionListener {
         scrollPane.getVerticalScrollBar().setUnitIncrement(15);
 
         for (Topic topic : topics) {
-            topicHistory.getModel().addRow(new Object[]{new TopicLabel(topic),});
+            topicHistory.getModel().addRow(new Object[]{new TopicLabel(channel, topic),});
         }
         topicHistory.getSelectionModel().setSelectionInterval(0, 0);
 

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

@@ -23,14 +23,14 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.channelsetting;
 
+import com.dmdirc.Channel;
 import com.dmdirc.Topic;
 import com.dmdirc.addons.ui_swing.components.text.OldTextLabel;
-import com.dmdirc.ui.messages.Styliser;
-import java.awt.Color;
 
+import java.awt.Color;
 import java.util.Date;
-import javax.swing.JEditorPane;
 
+import javax.swing.JEditorPane;
 import javax.swing.JPanel;
 import javax.swing.JSeparator;
 import javax.swing.UIManager;
@@ -54,6 +54,8 @@ public class TopicLabel extends JPanel {
     private static final long serialVersionUID = 1;
     /** Topic this label represents. */
     private final Topic topic;
+    /** The channel to which this label belongs. */
+    private final Channel channel;
     /** Topic field. */
     private JEditorPane pane;
     /** Empty Attrib set. */
@@ -62,13 +64,18 @@ public class TopicLabel extends JPanel {
     /**
      * Instantiates a new topic label based on the specified topic.
      *
+     * @param channel The channel to which this label belongs
      * @param topic Specified topic
+     * @since 0.6.3
      */
-    public TopicLabel(final Topic topic) {
+    public TopicLabel(final Channel channel, final Topic topic) {
         if (topic == null) {
             throw new IllegalArgumentException();
         }
+        
         this.topic = topic;
+        this.channel = channel;
+
         super.setBackground(UIManager.getColor("Table.background"));
         super.setForeground(UIManager.getColor("Table.foreground"));
 
@@ -109,7 +116,7 @@ public class TopicLabel extends JPanel {
         setLayout(new MigLayout("fill, ins 0, debug", "[]0[]", "[]0[]"));
 
         if (!topic.getTopic().isEmpty()) {
-            Styliser.addStyledString((StyledDocument) pane.getDocument(),
+            channel.getStyliser().addStyledString((StyledDocument) pane.getDocument(),
                     new String[]{topic.getTopic(),},
                     as);
             add(pane, "wmax 450, grow, push, wrap, gapleft 5, gapleft 5");

src/com/dmdirc/addons/ui_swing/textpane/IRCDocument.java

@@ -22,18 +22,18 @@
 
 package com.dmdirc.addons.ui_swing.textpane;
 
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.util.RollingList;
-import java.awt.Font;
 
+import java.awt.Font;
 import java.io.Serializable;
 import java.text.AttributedCharacterIterator;
 import java.text.AttributedString;
 import java.util.ArrayList;
 import java.util.List;
-import javax.swing.UIManager;
 
+import javax.swing.UIManager;
 import javax.swing.event.EventListenerList;
 
 /**
@@ -55,8 +55,8 @@ public final class IRCDocument implements Serializable, ConfigChangeListener {
     private RollingList<Line> cachedLines;
     /** Cached attributed strings. */
     private RollingList<AttributedString> cachedStrings;
-    /** Configuration manager. */
-    private ConfigManager config;
+    /** Container that owns this document. */
+    private final FrameContainer container;
     /** Font size. */
     private int fontSize;
     /** Font name. */
@@ -65,20 +65,22 @@ public final class IRCDocument implements Serializable, ConfigChangeListener {
     /** 
      * Creates a new instance of IRCDocument.
      * 
-     * @param config Document's config manager
+     * @param container The container that owns this document
+     * @since 0.6.3
      */
-    public IRCDocument(final ConfigManager config) {
-        this.config = config;
+    public IRCDocument(final FrameContainer container) {
+        this.container = container;
+
         lines = new ArrayList<Line>();
         listeners = new EventListenerList();
 
         cachedLines = new RollingList<Line>(50);
         cachedStrings = new RollingList<AttributedString>(50);
 
-        setCachedSettings();
+        container.getConfigManager().addChangeListener("ui", "textPaneFontSize", this);
+        container.getConfigManager().addChangeListener("ui", "textPaneFontName", this);
 
-        config.addChangeListener("ui", "textPaneFontSize", this);
-        config.addChangeListener("ui", "textPaneFontName", this);
+        setCachedSettings();
     }
 
     /**
@@ -112,7 +114,7 @@ public final class IRCDocument implements Serializable, ConfigChangeListener {
      */
     public void addText(final String[] text) {
         synchronized (lines) {
-            lines.add(new Line(text, fontSize, fontName));
+            lines.add(new Line(container.getStyliser(), text, fontSize, fontName));
             fireLineAdded(lines.indexOf(text));
         }
     }
@@ -125,7 +127,7 @@ public final class IRCDocument implements Serializable, ConfigChangeListener {
      */
     public void addText(final String[] text, final int lineHeight) {
         synchronized (lines) {
-            lines.add(new Line(text, lineHeight, fontName));
+            lines.add(new Line(container.getStyliser(), text, lineHeight, fontName));
             fireLineAdded(lines.indexOf(text));
         }
     }
@@ -139,7 +141,7 @@ public final class IRCDocument implements Serializable, ConfigChangeListener {
         synchronized (lines) {
             final int start = lines.size();
             for (String[] string : text) {
-                lines.add(new Line(string, fontSize, fontName));
+                lines.add(new Line(container.getStyliser(), string, fontSize, fontName));
             }
             fireLinesAdded(start, text.size());
         }
@@ -158,7 +160,7 @@ public final class IRCDocument implements Serializable, ConfigChangeListener {
             for (int i = 0; i < text.size(); i++) {
                 final String[] string = text.get(i);
                 final int lineHeight = lineHeights.get(i);
-                lines.add(new Line(string, lineHeight, fontName));
+                lines.add(new Line(container.getStyliser(), string, lineHeight, fontName));
             }
             fireLinesAdded(start, text.size());
         }
@@ -339,13 +341,13 @@ public final class IRCDocument implements Serializable, ConfigChangeListener {
 
     private void setCachedSettings() {
         final Font defaultFont = UIManager.getFont("TextPane.font");
-        if (config.hasOptionString("ui", "textPaneFontName")) {
-            fontName = config.getOption("ui", "textPaneFontName");
+        if (container.getConfigManager().hasOptionString("ui", "textPaneFontName")) {
+            fontName = container.getConfigManager().getOption("ui", "textPaneFontName");
         } else {
             fontName = defaultFont.getName();
         }
-        if (config.hasOptionString("ui", "textPaneFontSize")) {
-            fontSize = config.getOptionInt("ui", "textPaneFontSize");
+        if (container.getConfigManager().hasOptionString("ui", "textPaneFontSize")) {
+            fontSize = container.getConfigManager().getOptionInt("ui", "textPaneFontSize");
         } else {
             fontSize = defaultFont.getSize();
         }

src/com/dmdirc/addons/ui_swing/textpane/Line.java

@@ -36,18 +36,21 @@ import java.util.Arrays;
 class Line {
 
     private final String[] lineParts;
+    private final Styliser styliser;
     private int fontSize;
     private String fontName;
 
     /**
      * Creates a new line with a specified height.
      *
+     * @param styliser The styliser to use to style this line
      * @param lineParts Parts of the line
      * @param fontSize The height for this line
-     * @param fontName
+     * @param fontName The name of the font to use for this line
      */
-    public Line(final String[] lineParts, final int fontSize,
-            final String fontName) {
+    public Line(final Styliser styliser, final String[] lineParts,
+            final int fontSize, final String fontName) {
+        this.styliser = styliser;
         this.lineParts = lineParts;
         this.fontName = fontName;
         this.fontSize = fontSize;
@@ -136,7 +139,7 @@ class Line {
      * @return AttributedString representing the specified StyledDocument
      */
     public AttributedString getStyled() {
-        final ExtendedAttributedString string = Utils.getAttributedString(lineParts,
+        final ExtendedAttributedString string = Utils.getAttributedString(styliser, lineParts,
                 fontName, fontSize);
         fontSize = string.getMaxLineHeight();
         return string.getAttributedString();

src/com/dmdirc/addons/ui_swing/textpane/TextPane.java

@@ -73,7 +73,7 @@ public final class TextPane extends JComponent implements AdjustmentListener,
         this.frame = frame;
         
         setUI(new TextPaneUI());
-        document = new IRCDocument(frame.getConfigManager());
+        document = new IRCDocument(frame.getContainer());
         frame.getConfigManager().addChangeListener("ui", "textPaneFontName",
                 document);
         frame.getConfigManager().addChangeListener("ui", "textPaneFontSize",