Tidy PluginInfo setting.

nickcolours/src/com/dmdirc/addons/nickcolours/NickColourManager.java

@@ -78,8 +78,7 @@ public class NickColourManager {
     /** Event bus to subscribe to events on . */
     private final DMDircMBassador eventBus;
     /** The plugin's info. */
-    // TODO: Should probably make this final and introduce a factory to create NickColourManagers.
-    private PluginInfo pluginInfo;
+    private final PluginInfo pluginInfo;
     /** "Random" colours to use to colour nicknames. */
     private String[] randColours = {
         "E90E7F", "8E55E9", "B30E0E", "18B33C", "58ADB3", "9E54B3", "B39875", "3176B3",};
@@ -94,12 +93,14 @@ public class NickColourManager {
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final IconManager iconManager,
             @MainWindow final Provider<Window> mainWindowProvider,
+            final PluginInfo pluginInfo,
             final DMDircMBassador eventBus) {
         this.domain = domain;
         this.globalConfig = globalConfig;
         this.colourManager = colourManager;
         this.iconManager = iconManager;
         this.mainWindowProvider = mainWindowProvider;
+        this.pluginInfo = pluginInfo;
         this.eventBus = eventBus;
         configBinder = globalConfig.getBinder().withDefaultDomain(domain);
     }
@@ -277,10 +278,6 @@ public class NickColourManager {
         randColours = value.toArray(new String[value.size()]);
     }
 
-    public void setPluginInfo(final PluginInfo pluginInfo) {
-        this.pluginInfo = pluginInfo;
-    }
-
     @Handler
     public void handlePrefsOpened(final ClientPrefsOpenedEvent event) {
         final PreferencesCategory general = new PluginPreferencesCategory(

nickcolours/src/com/dmdirc/addons/nickcolours/NickColourModule.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.nickcolours;
 
 import com.dmdirc.addons.ui_swing.injection.SwingModule;
 import com.dmdirc.plugins.PluginDomain;
+import com.dmdirc.plugins.PluginInfo;
 
 import dagger.Module;
 import dagger.Provides;
@@ -34,10 +35,13 @@ import dagger.Provides;
 @Module(injects = NickColourManager.class, addsTo = SwingModule.class)
 public class NickColourModule {
 
+    /** This plugin's plugin info. */
+    private final PluginInfo pluginInfo;
     /** The domain for plugin settings. */
     private final String domain;
 
-    public NickColourModule(final String domain) {
+    public NickColourModule(final PluginInfo pluginInfo, final String domain) {
+        this.pluginInfo = pluginInfo;
         this.domain = domain;
     }
 
@@ -52,4 +56,9 @@ public class NickColourModule {
         return domain;
     }
 
+    @Provides
+    public PluginInfo getPluginInfo() {
+        return pluginInfo;
+    }
+
 }

nickcolours/src/com/dmdirc/addons/nickcolours/NickColourPlugin.java

@@ -39,9 +39,8 @@ public class NickColourPlugin extends BasePlugin {
     public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
         super.load(pluginInfo, graph);
 
-        setObjectGraph(graph.plus(new NickColourModule(pluginInfo.getDomain())));
+        setObjectGraph(graph.plus(new NickColourModule(pluginInfo, pluginInfo.getDomain())));
         nickColourManager = getObjectGraph().get(NickColourManager.class);
-        nickColourManager.setPluginInfo(pluginInfo);
     }
 
     @Override