Switch more plugins to use events for showconfig.

ui_swing/src/com/dmdirc/addons/ui_swing/SwingController.java

@@ -29,7 +29,6 @@ import com.dmdirc.addons.ui_swing.commands.PopOutCommand;
 import com.dmdirc.addons.ui_swing.commands.ServerSettings;
 import com.dmdirc.addons.ui_swing.framemanager.FrameManagerProvider;
 import com.dmdirc.addons.ui_swing.injection.SwingModule;
-import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.plugins.Exported;
 import com.dmdirc.plugins.PluginInfo;
@@ -51,8 +50,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     private final PluginInfo pluginInfo;
     /** The manager we're using for dependencies. */
     private SwingManager swingManager;
-    /** This plugin's settings domain. */
-    private final String domain;
 
     /**
      * Instantiates a new SwingController.
@@ -61,14 +58,13 @@ public class SwingController extends BaseCommandPlugin implements UIController {
      */
     public SwingController(final PluginInfo pluginInfo) {
         this.pluginInfo = pluginInfo;
-        this.domain = pluginInfo.getDomain();
     }
 
     @Override
     public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
         super.load(pluginInfo, graph);
 
-        setObjectGraph(graph.plus(new SwingModule(this, pluginInfo.getDomain())));
+        setObjectGraph(graph.plus(new SwingModule(this, pluginInfo, pluginInfo.getDomain())));
         getObjectGraph().validate();
         swingManager = getObjectGraph().get(SwingManager.class);
 
@@ -102,13 +98,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         super.onUnload();
     }
 
-    @Override
-    public void showConfig(final PreferencesDialogModel manager) {
-        manager.getCategory("GUI").addSubCategory(
-                new SwingPreferencesModel(pluginInfo, domain, manager.getConfigManager(),
-                        manager.getIdentity()).getSwingUICategory());
-    }
-
     /**
      * Returns the version of this swing UI.
      *

ui_swing/src/com/dmdirc/addons/ui_swing/SwingManager.java

@@ -31,9 +31,12 @@ import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.framemanager.ctrltab.CtrlTabWindowManager;
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeFrameManagerProvider;
 import com.dmdirc.addons.ui_swing.wizard.firstrun.FirstRunWizardExecutor;
+import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.events.FeedbackNagEvent;
 import com.dmdirc.events.FirstRunEvent;
 import com.dmdirc.events.UnknownURLEvent;
+import com.dmdirc.plugins.PluginDomain;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.WindowManager;
 
 import java.awt.Window;
@@ -80,6 +83,8 @@ public class SwingManager {
     private MainFrame mainFrame;
     /** Swing UI initialiser. */
     private final SwingUIInitialiser uiInitialiser;
+    private final PluginInfo pluginInfo;
+    private final String domain;
 
     /**
      * Creates a new instance of {@link SwingManager}.
@@ -116,7 +121,9 @@ public class SwingManager {
             final SwingEventBus swingEventBus,
             final TreeFrameManagerProvider treeProvider,
             final Provider<SwingWindowManager> swingWindowManager,
-            final SwingUIInitialiser uiInitialiser) {
+            final SwingUIInitialiser uiInitialiser,
+            final PluginInfo pluginInfo,
+            @PluginDomain(SwingController.class)final String domain) {
         this.windowFactory = windowFactory;
         this.windowManager = windowManager;
         this.menuBar = menuBar;
@@ -132,6 +139,8 @@ public class SwingManager {
         this.treeProvider = treeProvider;
         this.swingWindowManager = swingWindowManager;
         this.uiInitialiser = uiInitialiser;
+        this.pluginInfo = pluginInfo;
+        this.domain = domain;
     }
 
     /**
@@ -208,4 +217,11 @@ public class SwingManager {
         UIUtilities.invokeLater(feedbackNagProvider::get);
     }
 
+    @Handler
+    public void showConfig(final ClientPrefsOpenedEvent event) {
+        event.getModel().getCategory("GUI").addSubCategory(
+                new SwingPreferencesModel(pluginInfo, domain, event.getModel().getConfigManager(),
+                        event.getModel().getIdentity()).getSwingUICategory());
+    }
+
 }

ui_swing/src/com/dmdirc/addons/ui_swing/injection/SwingModule.java

@@ -59,6 +59,7 @@ import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.ServiceLocator;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.addons.ui_swing.components.IconManager;
@@ -89,15 +90,17 @@ import dagger.Provides;
             ServerSettings.class,
             ChannelSettings.class
         })
+@SuppressWarnings("TypeMayBeWeakened")
 public class SwingModule {
 
-    /** The controller to return to clients. */
     private final SwingController controller;
-    /** The domain for plugin settings. */
+    private final PluginInfo pluginInfo;
     private final String domain;
 
-    public SwingModule(final SwingController controller, final String domain) {
+    public SwingModule(final SwingController controller, final PluginInfo pluginInfo,
+            final String domain) {
         this.controller = controller;
+        this.pluginInfo = pluginInfo;
         this.domain = domain;
     }
 
@@ -213,4 +216,9 @@ public class SwingModule {
         return provider.getFrameManager();
     }
 
+    @Provides
+    public PluginInfo getPluginInfo() {
+        return pluginInfo;
+    }
+
 }

windowstatus/src/com/dmdirc/addons/windowstatus/WindowStatusManager.java

@@ -33,6 +33,12 @@ import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 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.PreferencesDialogModel;
+import com.dmdirc.config.prefs.PreferencesSetting;
+import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.events.StatusBarComponentAddedEvent;
 import com.dmdirc.events.StatusBarComponentRemovedEvent;
 import com.dmdirc.interfaces.Connection;
@@ -41,6 +47,7 @@ import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.plugins.PluginDomain;
+import com.dmdirc.plugins.PluginInfo;
 
 import javax.inject.Inject;
 
@@ -53,6 +60,7 @@ public class WindowStatusManager {
 
     /** Active frame manager. */
     private final ActiveFrameManager activeFrameManager;
+    private final PluginInfo pluginInfo;
     /** Config to read settings from. */
     private final ConfigBinder configBinder;
     /** The event bus to post events to. */
@@ -73,8 +81,10 @@ public class WindowStatusManager {
             @GlobalConfig final AggregateConfigProvider config,
             @PluginDomain(WindowStatusPlugin.class) final String domain,
             final DMDircMBassador eventBus,
-            final SwingEventBus swingEventBus) {
+            final SwingEventBus swingEventBus,
+            final PluginInfo pluginInfo) {
         this.activeFrameManager = activeFrameManager;
+        this.pluginInfo = pluginInfo;
         this.configBinder = config.getBinder().withDefaultDomain(domain);
         this.eventBus = eventBus;
         this.swingEventBus = swingEventBus;
@@ -204,4 +214,27 @@ public class WindowStatusManager {
         nonePrefix = value;
         updateStatus();
     }
+
+    @Handler
+    public void showConfig(final ClientPrefsOpenedEvent event) {
+        final PreferencesDialogModel manager = event.getModel();
+        final PreferencesCategory category = new PluginPreferencesCategory(
+                pluginInfo, "Window status", "");
+
+        category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                pluginInfo.getDomain(), "channel.shownone", "Show 'none' count",
+                "Should the count for users with no state be shown?",
+                manager.getConfigManager(), manager.getIdentity()));
+        category.addSetting(new PreferencesSetting(PreferencesType.TEXT,
+                pluginInfo.getDomain(), "channel.noneprefix", "'None' count prefix",
+                "The Prefix to use when showing the 'none' count",
+                manager.getConfigManager(), manager.getIdentity()));
+        category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
+                pluginInfo.getDomain(), "client.showname", "Show real name",
+                "Should the realname for clients be shown if known?",
+                manager.getConfigManager(), manager.getIdentity()));
+
+        manager.getCategory("Plugins").addSubCategory(category);
+    }
+
 }

windowstatus/src/com/dmdirc/addons/windowstatus/WindowStatusModule.java

@@ -53,4 +53,9 @@ public class WindowStatusModule {
         return pluginInfo.getDomain();
     }
 
+    @Provides
+    public PluginInfo getPluginInfo() {
+        return pluginInfo;
+    }
+
 }

windowstatus/src/com/dmdirc/addons/windowstatus/WindowStatusPlugin.java

@@ -22,11 +22,6 @@
 
 package com.dmdirc.addons.windowstatus;
 
-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;
 
@@ -37,15 +32,9 @@ import dagger.ObjectGraph;
  */
 public class WindowStatusPlugin extends BasePlugin {
 
-    /** Plugin info. */
-    private final PluginInfo pluginInfo;
     /** Nick colour manager. */
     private WindowStatusManager windowStatusManager;
 
-    public WindowStatusPlugin(final PluginInfo pluginInfo) {
-        this.pluginInfo = pluginInfo;
-    }
-
     @Override
     public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
         super.load(pluginInfo, graph);
@@ -65,25 +54,4 @@ public class WindowStatusPlugin extends BasePlugin {
         windowStatusManager.onUnload();
     }
 
-    @Override
-    public void showConfig(final PreferencesDialogModel manager) {
-        final PreferencesCategory category = new PluginPreferencesCategory(
-                pluginInfo, "Window status", "");
-
-        category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                pluginInfo.getDomain(), "channel.shownone", "Show 'none' count",
-                "Should the count for users with no state be shown?",
-                manager.getConfigManager(), manager.getIdentity()));
-        category.addSetting(new PreferencesSetting(PreferencesType.TEXT,
-                pluginInfo.getDomain(), "channel.noneprefix", "'None' count prefix",
-                "The Prefix to use when showing the 'none' count",
-                manager.getConfigManager(), manager.getIdentity()));
-        category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                pluginInfo.getDomain(), "client.showname", "Show real name",
-                "Should the realname for clients be shown if known?",
-                manager.getConfigManager(), manager.getIdentity()));
-
-        manager.getCategory("Plugins").addSubCategory(category);
-    }
-
 }