Styliser no longer takes a context (that was a stupid idea!)

Channel now marks up nicknames

git-svn-id: http://svn.dmdirc.com/trunk@2453 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/Channel.java

@@ -695,13 +695,14 @@ public final class Channel extends MessageTarget implements
     private String[] getDetails(final ChannelClientInfo client) {
         if (client == null) {
             // WTF?
-            Logger.appError(ErrorLevel.HIGH, "Channel.getDetails called with null ChannelClientInfo",
+            Logger.appError(ErrorLevel.HIGH,
+                    "Channel.getDetails called with null ChannelClientInfo",
                     new UnsupportedOperationException());
             return new String[]{"null", "null", "nullity.dmdirc.com"};
         }
         
         final String[] res = new String[3];
-        res[0] = client.getNickname();
+        res[0] = Styliser.CODE_NICKNAME + client.getNickname() + Styliser.CODE_NICKNAME;
         res[1] = client.getClient().getIdent();
         res[2] = client.getClient().getHost();
         

src/com/dmdirc/ui/messages/Styliser.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.config.ConfigChangeListener;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.logger.ErrorLevel;
@@ -101,12 +100,15 @@ public final class Styliser {
     private static final String URL_CHANNEL = "(?i)(?<![^\\s])([#&]" + RESERVED_CHARS + "+)";
     
     /** Whether or not we should style links. */
-    private static boolean styleLinks = IdentityManager.getGlobalConfig().getOptionBool("ui", "stylelinks");
+    private static boolean styleLinks
+            = IdentityManager.getGlobalConfig().getOptionBool("ui", "stylelinks");
     
     static {
-        IdentityManager.getGlobalConfig().addChangeListener("ui", "stylelinks",new ConfigChangeListener() {
+        IdentityManager.getGlobalConfig().addChangeListener("ui", "stylelinks",
+                new ConfigChangeListener() {
             public void configChanged(final String domain, final String key) {
-                Styliser.styleLinks = IdentityManager.getGlobalConfig().getOptionBool("ui", "stylelinks");
+                Styliser.styleLinks
+                        = IdentityManager.getGlobalConfig().getOptionBool("ui", "stylelinks");
             }
         });
     }
@@ -119,11 +121,10 @@ public final class Styliser {
      * Stylises the specified string.
      *
      * @param strings The line to be stylised
-     * @param context The context of the string to be styled
      *
      * @return StyledDocument for the inputted strings
      */
-    public static StyledDocument getStyledString(final String[] strings, final FrameContainer context) {
+    public static StyledDocument getStyledString(final String[] strings) {
         final StyledDocument styledDoc = new DefaultStyledDocument();
         
         for (int i = 0; i < strings.length; i++) {
@@ -289,7 +290,8 @@ public final class Styliser {
             toggleLink(attribs);
             
             if (attribs.getAttribute(IRCTextAttribute.HYPERLINK) == null) {
-                attribs.addAttribute(IRCTextAttribute.HYPERLINK, readUntilControl(string.substring(1)));
+                attribs.addAttribute(IRCTextAttribute.HYPERLINK,
+                        readUntilControl(string.substring(1)));
             } else {
                 attribs.removeAttribute(IRCTextAttribute.HYPERLINK);
             }
@@ -299,7 +301,8 @@ public final class Styliser {
         // Channel links
         if (string.charAt(0) == CODE_CHANNEL) {
             if (attribs.getAttribute(IRCTextAttribute.CHANNEL) == null) {
-                attribs.addAttribute(IRCTextAttribute.CHANNEL, readUntilControl(string.substring(1)));
+                attribs.addAttribute(IRCTextAttribute.CHANNEL,
+                        readUntilControl(string.substring(1)));
             } else {
                 attribs.removeAttribute(IRCTextAttribute.CHANNEL);
             }
@@ -310,7 +313,8 @@ public final class Styliser {
         // Nickname links
         if (string.charAt(0) == CODE_NICKNAME) {
             if (attribs.getAttribute(IRCTextAttribute.NICKNAME) == null) {
-                attribs.addAttribute(IRCTextAttribute.NICKNAME, readUntilControl(string.substring(1)));
+                attribs.addAttribute(IRCTextAttribute.NICKNAME,
+                        readUntilControl(string.substring(1)));
             } else {
                 attribs.removeAttribute(IRCTextAttribute.NICKNAME);
             }
@@ -389,7 +393,8 @@ public final class Styliser {
                     count++;
                     setBackground(attribs, string.substring(count, count + 6).toUpperCase());
                     if (isStart) {
-                        setDefaultBackground(attribs, string.substring(count, count + 6).toUpperCase());
+                        setDefaultBackground(attribs, 
+                                string.substring(count, count + 6).toUpperCase());
                     }
                     count += 6;
                 }

src/com/dmdirc/ui/swing/textpane/TextPane.java

@@ -143,7 +143,7 @@ public final class TextPane extends JComponent implements AdjustmentListener,
      */
     public void addStyledString(final String[] strings) {
         final AttributedString text = styledDocumentToAttributedString(
-                Styliser.getStyledString(strings, frame));
+                Styliser.getStyledString(strings));
         
         if (text.getIterator().getEndIndex() == 0) {
             addText(new AttributedString("\n"));