Merge pull request #282 from csmith/master

Make the nick colour plugin use events for prefs.

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

@@ -25,10 +25,17 @@ package com.dmdirc.addons.nickcolours;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.EDTInvocation;
+import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.config.ConfigBinder;
 import com.dmdirc.config.ConfigBinding;
+import com.dmdirc.config.prefs.PluginPreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesSetting;
+import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.events.ChannelGotNamesEvent;
 import com.dmdirc.events.ChannelJoinEvent;
+import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.User;
@@ -36,14 +43,18 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
 import com.dmdirc.parser.interfaces.StringConverter;
 import com.dmdirc.plugins.PluginDomain;
+import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.util.colours.Colour;
 
+import java.awt.Window;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
 import javax.inject.Inject;
+import javax.inject.Provider;
 import javax.inject.Singleton;
 
 import net.engio.mbassy.listener.Handler;
@@ -62,8 +73,12 @@ public class NickColourManager {
     private final ConfigBinder configBinder;
     /** Plugin's setting domain. */
     private final String domain;
+    private final IconManager iconManager;
+    private final Provider<Window> mainWindowProvider;
     /** Event bus to subscribe to events on . */
     private final DMDircMBassador eventBus;
+    /** The plugin's info. */
+    private final PluginInfo pluginInfo;
     /** "Random" colours to use to colour nicknames. */
     private String[] randColours = {
         "E90E7F", "8E55E9", "B30E0E", "18B33C", "58ADB3", "9E54B3", "B39875", "3176B3",};
@@ -72,13 +87,20 @@ public class NickColourManager {
     private boolean userandomcolour;
 
     @Inject
-    public NickColourManager(@GlobalConfig final ColourManager colourManager,
+    public NickColourManager(
+            @GlobalConfig final ColourManager colourManager,
             @PluginDomain(NickColourPlugin.class) final String domain,
             @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);
     }
@@ -255,4 +277,35 @@ public class NickColourManager {
     public void handleRandomColours(final List<String> value) {
         randColours = value.toArray(new String[value.size()]);
     }
+
+    @Handler
+    public void handlePrefsOpened(final ClientPrefsOpenedEvent event) {
+        final PreferencesCategory general = new PluginPreferencesCategory(
+                pluginInfo, "Nick Colours",
+                "General configuration for NickColour plugin.");
+        final PreferencesCategory colours = new PluginPreferencesCategory(
+                pluginInfo, "Colours",
+                "Set colours for specific nicknames.", UIUtilities.invokeAndWait(
+                () -> new NickColourPanel(mainWindowProvider.get(), iconManager, colourManager,
+                        event.getModel().getIdentity(), event.getModel().getConfigManager(),
+                        pluginInfo.getDomain()
+                )));
+
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                pluginInfo.getDomain(), "userandomcolour", "Use random colour",
+                "Use a pseudo-random colour for each person?",
+                event.getModel().getConfigManager(), event.getModel().getIdentity()));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                pluginInfo.getDomain(), "useowncolour", "Use colour for own nick",
+                "Always use the same colour for our own nickname?",
+                event.getModel().getConfigManager(), event.getModel().getIdentity()));
+        general.addSetting(new PreferencesSetting(PreferencesType.COLOUR, pluginInfo.getDomain(),
+                "owncolour", "Colour to use for own nick",
+                "Colour used for our own nickname, if above setting is enabled.",
+                event.getModel().getConfigManager(), event.getModel().getIdentity()));
+
+        general.addSubCategory(colours);
+        event.getModel().getCategory("Plugins").addSubCategory(general);
+    }
+
 }

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

@@ -22,19 +22,8 @@
 
 package com.dmdirc.addons.nickcolours;
 
-import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.config.prefs.PluginPreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesDialogModel;
-import com.dmdirc.config.prefs.PreferencesSetting;
-import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BasePlugin;
-import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.messages.ColourManager;
-
-import java.awt.Window;
 
 import dagger.ObjectGraph;
 
@@ -43,31 +32,14 @@ import dagger.ObjectGraph;
  */
 public class NickColourPlugin extends BasePlugin {
 
-    /** Plugin info. */
-    private final PluginInfo pluginInfo;
-    /** Main window that will own any dialogs. */
-    private final Window mainWindow;
-    /** Icon manager. */
-    private final IconManager iconManager;
-    /** Colour manager. */
-    private final ColourManager colourManager;
     /** Nick colour manager. */
     private NickColourManager nickColourManager;
 
-    public NickColourPlugin(final PluginInfo pluginInfo, final SwingController controller,
-            final IconManager iconManager,
-            final ColourManager colourManager) {
-        this.pluginInfo = pluginInfo;
-        this.mainWindow = controller.getMainFrame();
-        this.iconManager = iconManager;
-        this.colourManager = colourManager;
-    }
-
     @Override
     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);
     }
 
@@ -83,33 +55,4 @@ public class NickColourPlugin extends BasePlugin {
         nickColourManager.onUnload();
     }
 
-    @Override
-    public void showConfig(final PreferencesDialogModel manager) {
-        final PreferencesCategory general = new PluginPreferencesCategory(
-                pluginInfo, "Nick Colours",
-                "General configuration for NickColour plugin.");
-        final PreferencesCategory colours = new PluginPreferencesCategory(
-                pluginInfo, "Colours",
-                "Set colours for specific nicknames.", UIUtilities.invokeAndWait(
-                () -> new NickColourPanel(mainWindow, iconManager, colourManager,
-                        manager.getIdentity(), manager.getConfigManager(),
-                        pluginInfo.getDomain())));
-
-        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                pluginInfo.getDomain(), "userandomcolour", "Use random colour",
-                "Use a pseudo-random colour for each person?",
-                manager.getConfigManager(), manager.getIdentity()));
-        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                pluginInfo.getDomain(), "useowncolour", "Use colour for own nick",
-                "Always use the same colour for our own nickname?",
-                manager.getConfigManager(), manager.getIdentity()));
-        general.addSetting(new PreferencesSetting(PreferencesType.COLOUR, pluginInfo.getDomain(),
-                "owncolour", "Colour to use for own nick",
-                "Colour used for our own nickname, if above setting is "
-                + "enabled.", manager.getConfigManager(), manager.getIdentity()));
-
-        general.addSubCategory(colours);
-        manager.getCategory("Plugins").addSubCategory(general);
-    }
-
 }