Browse Source

Give the NickColourPlugin a ColourManager.

Change-Id: Icf1a71d9827fbbb947d7c3ba9bd5d26e4bc513f9
Reviewed-on: http://gerrit.dmdirc.com/2774
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager
tags/0.8
Chris Smith 10 years ago
parent
commit
fb671d2ef7
1 changed files with 6 additions and 4 deletions
  1. 6
    4
      src/com/dmdirc/addons/nickcolours/NickColourPlugin.java

+ 6
- 4
src/com/dmdirc/addons/nickcolours/NickColourPlugin.java View File

@@ -74,6 +74,8 @@ public class NickColourPlugin extends BasePlugin implements ActionListener, Conf
74 74
     private final PluginInfo pluginInfo;
75 75
     /** Controller to read settings from. */
76 76
     private final IdentityController identityController;
77
+    /** Manager to parse colours with. */
78
+    private final ColourManager colourManager;
77 79
 
78 80
     /** {@inheritDoc} */
79 81
     @Override
@@ -115,7 +117,7 @@ public class NickColourPlugin extends BasePlugin implements ActionListener, Conf
115 117
                 toLowerCase("*:" + client.getClient().getNickname());
116 118
 
117 119
         if (useowncolour && client.getClient().equals(myself)) {
118
-            final Colour color = ColourManager.parseColour(owncolour);
120
+            final Colour color = colourManager.getColourFromString(owncolour, null);
119 121
             putColour(map, color, color);
120 122
         } else if (userandomcolour) {
121 123
             putColour(map, getColour(client.getClient().getNickname()), getColour(client.
@@ -136,10 +138,10 @@ public class NickColourPlugin extends BasePlugin implements ActionListener, Conf
136 138
             Colour nickColor = null;
137 139
 
138 140
             if (parts[0] != null) {
139
-                textColor = ColourManager.parseColour(parts[0], null);
141
+                textColor = colourManager.getColourFromString(parts[0], null);
140 142
             }
141 143
             if (parts[1] != null) {
142
-                nickColor = ColourManager.parseColour(parts[1], null);
144
+                nickColor = colourManager.getColourFromString(parts[1], null);
143 145
             }
144 146
 
145 147
             putColour(map, textColor, nickColor);
@@ -180,7 +182,7 @@ public class NickColourPlugin extends BasePlugin implements ActionListener, Conf
180 182
 
181 183
         count %= randColours.length;
182 184
 
183
-        return ColourManager.parseColour(randColours[count]);
185
+        return colourManager.getColourFromString(randColours[count], null);
184 186
     }
185 187
 
186 188
     /**

Loading…
Cancel
Save