瀏覽代碼

Support for core control code changes.

pull/491/head
Chris Smith 7 年之前
父節點
當前提交
64813eda91

+ 5
- 5
debug/src/main/java/com/dmdirc/addons/debug/commands/EventBusViewer.java 查看文件

@@ -38,7 +38,7 @@ import com.dmdirc.interfaces.WindowModel;
38 38
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
39 39
 import com.dmdirc.ui.WindowManager;
40 40
 import com.dmdirc.ui.messages.BackBufferFactory;
41
-import com.dmdirc.ui.messages.Styliser;
41
+import com.dmdirc.ui.messages.IRCControlCodes;
42 42
 
43 43
 import java.lang.reflect.Method;
44 44
 
@@ -141,17 +141,17 @@ public class EventBusViewer extends DebugCommand {
141 141
             }
142 142
 
143 143
             final StringBuilder output = new StringBuilder();
144
-            output.append(Styliser.CODE_BOLD)
144
+            output.append(IRCControlCodes.BOLD)
145 145
                     .append(event.getClass().getSimpleName())
146
-                    .append(Styliser.CODE_BOLD);
146
+                    .append(IRCControlCodes.BOLD);
147 147
 
148 148
             for (Method method : event.getClass().getMethods()) {
149 149
                 if (method.getName().startsWith("get") && method.getParameterTypes().length == 0) {
150 150
                     try {
151 151
                         output.append(' ')
152
-                                .append(Styliser.CODE_UNDERLINE)
152
+                                .append(IRCControlCodes.UNDERLINE)
153 153
                                 .append(method.getName().substring(3))
154
-                                .append(Styliser.CODE_UNDERLINE)
154
+                                .append(IRCControlCodes.UNDERLINE)
155 155
                                 .append('=')
156 156
                                 .append(method.invoke(event));
157 157
                     } catch (ReflectiveOperationException ex) {

+ 2
- 2
debug/src/main/java/com/dmdirc/addons/debug/commands/ForceUpdate.java 查看文件

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

+ 3
- 3
debug/src/main/java/com/dmdirc/addons/debug/commands/Threads.java 查看文件

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

+ 4
- 3
logging/src/main/java/com/dmdirc/addons/logging/LoggingManager.java 查看文件

@@ -59,6 +59,7 @@ import com.dmdirc.plugins.PluginDomain;
59 59
 import com.dmdirc.plugins.PluginInfo;
60 60
 import com.dmdirc.ui.WindowManager;
61 61
 import com.dmdirc.ui.messages.BackBufferFactory;
62
+import com.dmdirc.ui.messages.IRCControlCodes;
62 63
 import com.dmdirc.ui.messages.Styliser;
63 64
 import com.dmdirc.util.io.ReverseFileReader;
64 65
 import com.dmdirc.util.io.StreamUtils;
@@ -447,17 +448,17 @@ public class LoggingManager implements ConfigChangeListener {
447 448
             }
448 449
 
449 450
             if (num >= 0 && num <= 15) {
450
-                res = String.format("%c%02d%s%1$c", Styliser.CODE_COLOUR, num, line);
451
+                res = String.format("%c%02d%s%1$c", IRCControlCodes.COLOUR, num, line);
451 452
             }
452 453
         } else if (colour.length() == 6) {
453 454
             try {
454 455
                 Color.decode('#' + colour);
455
-                res = String.format("%c%s%s%1$c", Styliser.CODE_HEXCOLOUR, colour, line);
456
+                res = String.format("%c%s%s%1$c", IRCControlCodes.COLOUR_HEX, colour, line);
456 457
             } catch (NumberFormatException ex) { /* Do Nothing */ }
457 458
         }
458 459
 
459 460
         if (res == null) {
460
-            res = String.format("%c%02d%s%1$c", Styliser.CODE_COLOUR, 14, line);
461
+            res = String.format("%c%02d%s%1$c", IRCControlCodes.COLOUR, 14, line);
461 462
         }
462 463
         return res;
463 464
     }

+ 2
- 2
ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/TopicBar.java 查看文件

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

+ 3
- 2
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;
26 26
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
27 27
 import com.dmdirc.interfaces.config.ConfigChangeListener;
28 28
 import com.dmdirc.ui.messages.ColourManager;
29
+import com.dmdirc.ui.messages.IRCControlCodes;
29 30
 import com.dmdirc.ui.messages.Styliser;
30 31
 
31 32
 import java.awt.Color;
@@ -133,9 +134,9 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
133 134
 
134 135
         final StringBuilder sb = new StringBuilder();
135 136
         if (bold) {
136
-            sb.append(Styliser.CODE_BOLD);
137
+            sb.append(IRCControlCodes.BOLD);
137 138
         }
138
-        sb.append(Styliser.CODE_HEXCOLOUR);
139
+        sb.append(IRCControlCodes.COLOUR_HEX);
139 140
         sb.append(UIUtilities.getHex(foreground));
140 141
         sb.append(',');
141 142
         sb.append(UIUtilities.getHex(background));

Loading…
取消
儲存