Allow styliser formatting in treeview.

Fixes issue CLIENT-24

Depends-On: Ia561f2b92cc4f007f7fefb24a28231fff927bc36
Change-Id: I9ca03e2fdc16f8a4c5b3c34a8304fa46555dc061
Reviewed-on: http://gerrit.dmdirc.com/1695
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>

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

@@ -81,7 +81,7 @@ public class ImageButton extends JButton {
         setContentAreaFilled(false);
         setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         setMargin(new Insets(0, 0, 0, 0));
-        setPreferredSize(new Dimension(16, 0));
+        setPreferredSize(new Dimension(16, 16));
         setActionCommand(actionCommand);
     }
 

src/com/dmdirc/addons/ui_swing/framemanager/tree/NodeLabel.java

@@ -23,22 +23,32 @@
 package com.dmdirc.addons.ui_swing.framemanager.tree;
 
 import com.dmdirc.FrameContainer;
+import com.dmdirc.addons.ui_swing.components.ImageButton;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.NotificationListener;
 import com.dmdirc.interfaces.SelectionListener;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.ui.messages.Styliser;
 
 import java.awt.Color;
 import java.awt.Dimension;
+import java.awt.Font;
+
 import javax.swing.BorderFactory;
-import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextPane;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.text.DefaultStyledDocument;
+import javax.swing.text.StyledDocument;
 
 import net.miginfocom.layout.PlatformDefaults;
+import net.miginfocom.swing.MigLayout;
 
 /**
  * Node label.
  */
-public class NodeLabel extends JLabel implements SelectionListener,
+public class NodeLabel extends JPanel implements SelectionListener,
         NotificationListener, FrameInfoListener {
 
     /**
@@ -55,6 +65,13 @@ public class NodeLabel extends JLabel implements SelectionListener,
     private Color notificationColour;
     /** Are we the selected window? */
     private boolean selected;
+    /** Node icon. */
+    private final ImageButton icon = new ImageButton("", IconManager
+            .getIconManager().getIcon("icon"));
+    /** Text label. */
+    private final JTextPane text = new JTextPane(new DefaultStyledDocument());
+    /** Current styled text. */
+    private String currentText = "";
 
     /**
      * Instantiates a new node label.
@@ -77,11 +94,17 @@ public class NodeLabel extends JLabel implements SelectionListener,
             return;
         }
 
-        setText(window.toString());
+        icon.setIcon(IconManager.getIconManager().getIcon(window.getIcon()));
+        text.setText(window.toString());
+        text.setBorder(null);
+
+        setLayout(new MigLayout("ins 0"));
+        add(icon, "left");
+        add(text, "left, grow, pushx");
 
 
-        setToolTipText(null);
-        setIcon(IconManager.getIconManager().getIcon(window.getIcon()));
+        icon.setToolTipText(null);
+        text.setToolTipText(null);
         setBorder(BorderFactory.createEmptyBorder(1, 0, 2, 0));
 
         setPreferredSize(new Dimension(100000, getFont().getSize()
@@ -122,7 +145,7 @@ public class NodeLabel extends JLabel implements SelectionListener,
     @Override
     public void iconChanged(final FrameContainer<?> window, final String icon) {
         if (equals(window)) {
-            setIcon(IconManager.getIconManager().getIcon(icon));
+            this.icon.setIcon(IconManager.getIconManager().getIcon(icon));
         }
     }
 
@@ -130,7 +153,7 @@ public class NodeLabel extends JLabel implements SelectionListener,
     @Override
     public void nameChanged(final FrameContainer<?> window, final String name) {
         if (equals(window)) {
-            setText(name);
+            text.setText(name);
         }
     }
 
@@ -197,4 +220,91 @@ public class NodeLabel extends JLabel implements SelectionListener,
         return window.hashCode();
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public Font getFont() {
+        return UIManager.getFont("TextPane.font");
+    }
+
+    /**
+     * Sets the foreground colour for this label.
+     *
+     * @param colour New foreground colour
+     */
+    @Override
+    public void setForeground(final Color colour) {
+        if (text != null) {
+            text.setForeground(colour);
+        }
+    }
+
+    /**
+     * Sets the background colour for this label.
+     *
+     * @param colour New background colour
+     */
+    @Override
+    public void setBackground(final Color colour) {
+        if (text != null) {
+            text.setBackground(colour);
+        }
+    }
+
+    /**
+     * Sets the font for this label.
+     *
+     * @param font New font
+     */
+    @Override
+    public void setFont(final Font font) {
+        if (text != null) {
+            text.setFont(font);
+        }
+    }
+
+    /**
+     * Sets the opacity of this label.
+     *
+     * @param opacity Desired opacity
+     */
+    @Override
+    public void setOpaque(final boolean opacity) {
+        if (text != null) {
+            text.setOpaque(opacity);
+        }
+    }
+
+    /**
+     * Sets the text and style in this label.
+     *
+     * @param styliser Styliser to use to style text
+     * @param styledText Styled text string to use
+     */
+    public void setStyledText(final Styliser styliser,
+            final String styledText) {
+        if (currentText.equals(styledText)) {
+            return;
+        }
+        text.setText("");
+        currentText = styledText;
+        styliser.addStyledString((StyledDocument) text.getDocument(),
+                new String[] {styledText, });
+    }
+
+    /**
+     * Sets the styles for the text in this label.
+     *
+     * @param styliser Styliser to use
+     * @param newText Style to set
+     */
+    public void setTextStyle(final Styliser styliser, final String newText) {
+        if (currentText.equals(newText + window.toString())) {
+            return;
+        }
+        text.setText("");
+        currentText = newText + window.toString();
+        styliser.addStyledString((StyledDocument) text.getDocument(),
+                new String[] {newText, window.toString(), });
+    }
+
 }

src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeFrameManager.java

@@ -220,9 +220,8 @@ public final class TreeFrameManager implements FrameManager,
             /** {@inheritDoc} */
             @Override
             public void run() {
-                final TreeViewNode node =
-                        new TreeViewNode(new NodeLabel(window),
-                        window);
+                final NodeLabel label = new NodeLabel(window);
+                final TreeViewNode node = new TreeViewNode(label, window);
                 synchronized (nodes) {
                     nodes.put(window, node);
                 }

src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeViewNode.java

@@ -38,9 +38,9 @@ public class TreeViewNode extends DefaultMutableTreeNode {
      */
     private static final long serialVersionUID = 5;
     /** Node's label. */
-    private NodeLabel label;
+    private final NodeLabel label;
     /** Node's frame container. */
-    private FrameContainer<?> window;
+    private final FrameContainer<?> window;
 
     /**
      * Instantiates a new tree view node.

src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeViewTreeCellRenderer.java

@@ -25,10 +25,11 @@ package com.dmdirc.addons.ui_swing.framemanager.tree;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.ui.messages.Styliser;
 
 import java.awt.Color;
 import java.awt.Component;
-import java.awt.Font;
 
 import javax.swing.JLabel;
 import javax.swing.JTree;
@@ -50,6 +51,8 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
     private final TreeFrameManager manager;
     /** Config manager. */
     private final ConfigManager config;
+    /** Styliser to use. */
+    private final Styliser styliser;
     /** Rollover colours. */
     private Color rolloverColour;
     /** Active bold. */
@@ -68,6 +71,7 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
         this.manager = manager;
 
         config = IdentityManager.getGlobalConfig();
+        styliser = new Styliser(null, config);
 
         setColours();
 
@@ -100,35 +104,40 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
         if (label == null) {
             return new JLabel("Label == null");
         }
-
-        label.setOpaque(false);
-        label.setBackground(tree.getBackground());
-        label.setForeground(tree.getForeground());
+        boolean bold = false;
+        Color background = tree.getBackground();
+        Color foreground = tree.getForeground();
 
         if (label.isRollover()) {
-            label.setOpaque(true);
-            label.setBackground(rolloverColour);
+            background = rolloverColour;
         }
 
         final Color colour = label.getNotificationColour();
         if (colour != null) {
-            label.setForeground(colour);
+            foreground = colour;
         }
 
         if (label.isSelected()) {
-            if (activeBold) {
-                label.setFont(label.getFont().deriveFont(Font.BOLD));
-            } else {
-                label.setFont(label.getFont().deriveFont(Font.PLAIN));
-            }
+            bold = activeBold;
             if (!tree.getBackground().equals(activeBackground)) {
-                label.setOpaque(true);
-                label.setBackground(activeBackground);
+                background = activeBackground;
             }
-            label.setForeground(activeForeground);
+            foreground = activeForeground;
         } else {
-            label.setFont(label.getFont().deriveFont(Font.PLAIN));
+            bold = false;
+        }
+
+        final StringBuilder sb = new StringBuilder();
+        if (bold) {
+            sb.append(Styliser.CODE_BOLD);
         }
+        sb.append(Styliser.CODE_HEXCOLOUR);
+        sb.append(ColourManager.getHex(foreground));
+        sb.append(',');
+        sb.append(ColourManager.getHex(background));
+        label.setBackground(background);
+        label.setOpaque(true);
+        label.setTextStyle(styliser, sb.toString());
 
         return label;
     }