Support for core control code changes.

debug/src/main/java/com/dmdirc/addons/debug/commands/EventBusViewer.java

@@ -38,7 +38,7 @@ import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.BackBufferFactory;
-import com.dmdirc.ui.messages.Styliser;
+import com.dmdirc.ui.messages.IRCControlCodes;
 
 import java.lang.reflect.Method;
 
@@ -141,17 +141,17 @@ public class EventBusViewer extends DebugCommand {
             }
 
             final StringBuilder output = new StringBuilder();
-            output.append(Styliser.CODE_BOLD)
+            output.append(IRCControlCodes.BOLD)
                     .append(event.getClass().getSimpleName())
-                    .append(Styliser.CODE_BOLD);
+                    .append(IRCControlCodes.BOLD);
 
             for (Method method : event.getClass().getMethods()) {
                 if (method.getName().startsWith("get") && method.getParameterTypes().length == 0) {
                     try {
                         output.append(' ')
-                                .append(Styliser.CODE_UNDERLINE)
+                                .append(IRCControlCodes.UNDERLINE)
                                 .append(method.getName().substring(3))
-                                .append(Styliser.CODE_UNDERLINE)
+                                .append(IRCControlCodes.UNDERLINE)
                                 .append('=')
                                 .append(method.invoke(event));
                     } catch (ReflectiveOperationException ex) {

debug/src/main/java/com/dmdirc/addons/debug/commands/ForceUpdate.java

@@ -31,7 +31,7 @@ import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
-import com.dmdirc.ui.messages.Styliser;
+import com.dmdirc.ui.messages.IRCControlCodes;
 import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.manager.CachingUpdateManager;
 
@@ -95,7 +95,7 @@ public class ForceUpdate extends DebugCommand {
         } else {
             showError(origin, args.isSilent(), "Update checking is "
                     + "currently disabled.  You can enable it by typing:");
-            showError(origin, args.isSilent(), Styliser.CODE_FIXED
+            showError(origin, args.isSilent(), IRCControlCodes.FIXED
                     + "    /set updater enable true");
         }
     }

debug/src/main/java/com/dmdirc/addons/debug/commands/Threads.java

@@ -27,7 +27,7 @@ import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.ui.messages.Styliser;
+import com.dmdirc.ui.messages.IRCControlCodes;
 
 import java.util.Map.Entry;
 
@@ -65,10 +65,10 @@ public class Threads extends DebugCommand {
             final CommandArguments args, final CommandContext context) {
         for (Entry<Thread, StackTraceElement[]> thread
                 : Thread.getAllStackTraces().entrySet()) {
-            showOutput(origin, args.isSilent(), Styliser.CODE_BOLD + thread.getKey().getName());
+            showOutput(origin, args.isSilent(), IRCControlCodes.BOLD + thread.getKey().getName());
 
             for (StackTraceElement element : thread.getValue()) {
-                showOutput(origin, args.isSilent(), Styliser.CODE_FIXED + "    " + element);
+                showOutput(origin, args.isSilent(), IRCControlCodes.FIXED + "    " + element);
             }
         }
     }

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

@@ -59,6 +59,7 @@ import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.BackBufferFactory;
+import com.dmdirc.ui.messages.IRCControlCodes;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.io.ReverseFileReader;
 import com.dmdirc.util.io.StreamUtils;
@@ -447,17 +448,17 @@ public class LoggingManager implements ConfigChangeListener {
             }
 
             if (num >= 0 && num <= 15) {
-                res = String.format("%c%02d%s%1$c", Styliser.CODE_COLOUR, num, line);
+                res = String.format("%c%02d%s%1$c", IRCControlCodes.COLOUR, num, line);
             }
         } else if (colour.length() == 6) {
             try {
                 Color.decode('#' + colour);
-                res = String.format("%c%s%s%1$c", Styliser.CODE_HEXCOLOUR, colour, line);
+                res = String.format("%c%s%s%1$c", IRCControlCodes.COLOUR_HEX, colour, line);
             } catch (NumberFormatException ex) { /* Do Nothing */ }
         }
 
         if (res == null) {
-            res = String.format("%c%02d%s%1$c", Styliser.CODE_COLOUR, 14, line);
+            res = String.format("%c%02d%s%1$c", IRCControlCodes.COLOUR, 14, line);
         }
         return res;
     }

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

@@ -40,7 +40,7 @@ import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManager;
-import com.dmdirc.ui.messages.Styliser;
+import com.dmdirc.ui.messages.IRCControlCodes;
 
 import java.awt.Color;
 import java.awt.Window;
@@ -248,7 +248,7 @@ public class TopicBar extends JComponent implements ActionListener, ConfigChange
         if (topic != null) {
             channel.getWindowModel().getBackBuffer().getStyliser().addStyledString(
                     new StyledDocumentMaker((StyledDocument) topicText.getDocument(), as),
-                    Styliser.CODE_HEXCOLOUR
+                    IRCControlCodes.COLOUR_HEX
                             + UIUtilities.getHex(foregroundColour)
                             + topic.getTopic());
         }

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

@@ -26,6 +26,7 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.ui.messages.IRCControlCodes;
 import com.dmdirc.ui.messages.Styliser;
 
 import java.awt.Color;
@@ -133,9 +134,9 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
 
         final StringBuilder sb = new StringBuilder();
         if (bold) {
-            sb.append(Styliser.CODE_BOLD);
+            sb.append(IRCControlCodes.BOLD);
         }
-        sb.append(Styliser.CODE_HEXCOLOUR);
+        sb.append(IRCControlCodes.COLOUR_HEX);
         sb.append(UIUtilities.getHex(foreground));
         sb.append(',');
         sb.append(UIUtilities.getHex(background));