Use events for showconfig in all remaining plugins.

mediasource_vlc/src/com/dmdirc/addons/mediasource_vlc/VlcManager.java

@@ -0,0 +1,308 @@
+package com.dmdirc.addons.mediasource_vlc;
+
+import com.dmdirc.addons.nowplaying.MediaSource;
+import com.dmdirc.addons.nowplaying.MediaSourceState;
+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.interfaces.config.IdentityController;
+import com.dmdirc.plugins.PluginDomain;
+import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.util.io.Downloader;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import net.engio.mbassy.listener.Handler;
+
+/**
+ * Retrieves information from VLC using its HTTP interface.
+ */
+public class VlcManager implements MediaSource {
+
+    /** The information obtained from VLC. */
+    private final Map<String, String> information = new HashMap<>();
+    /** This plugin's plugin info. */
+    private final PluginInfo pluginInfo;
+    /** The identity controller to read settings from. */
+    private final IdentityController identityController;
+    /** Downloader to download files. */
+    private final Downloader downloader;
+
+    @Inject
+    public VlcManager(
+            @PluginDomain(VlcMediaSourcePlugin.class) final PluginInfo pluginInfo,
+            final IdentityController identityController) {
+        this.pluginInfo = pluginInfo;
+        this.identityController = identityController;
+        this.downloader = new Downloader();
+    }
+
+    @Override
+    public MediaSourceState getState() {
+        if (fetchInformation()) {
+            final String output = information.get("state");
+            if (output.equalsIgnoreCase("stop")) {
+                return MediaSourceState.STOPPED;
+            } else if (output.equalsIgnoreCase("playing")) {
+                return MediaSourceState.PLAYING;
+            } else if (output.equalsIgnoreCase("paused")) {
+                return MediaSourceState.PAUSED;
+            } else {
+                return MediaSourceState.NOTKNOWN;
+            }
+        } else {
+            return MediaSourceState.CLOSED;
+        }
+    }
+
+    @Override
+    public String getAppName() {
+        return "VLC";
+    }
+
+    @Override
+    public String getArtist() {
+        return information.containsKey("artist") ? information.get("artist") : getFallbackArtist();
+    }
+
+    /**
+     * Retrieves the fallback artist (parsed from the file name).
+     *
+     * @return The fallback artist
+     */
+    private String getFallbackArtist() {
+        String result = "unknown";
+
+        if (information.containsKey("playlist_current")) {
+            try {
+                final int item = Integer.parseInt(information.get(
+                        "playlist_current"));
+                String[] bits = information.get("playlist_item_" + item).split(
+                        (File.separatorChar == '\\' ? "\\\\" : File.separator));
+                result = bits[bits.length - 1];
+                bits = result.split("-");
+                if (bits.length > 1) {
+                    result = bits[0];
+                } else {
+                    // Whole filename is the title, so no artist is known.
+                    result = "unknown";
+                }
+            } catch (NumberFormatException nfe) {
+                // DO nothing
+            }
+        }
+
+        return result;
+    }
+
+    @Override
+    public String getTitle() {
+        return information.containsKey("title") ? information.get("title")
+                : getFallbackTitle();
+    }
+
+    /**
+     * Retrieves the fallback title (parsed from the file name).
+     *
+     * @return The fallback title
+     */
+    private String getFallbackTitle() {
+        String result = "unknown";
+
+        // Title is unknown, lets guess using the filename
+        if (information.containsKey("playlist_current")) {
+            try {
+                final int item = Integer.parseInt(information.get(
+                        "playlist_current"));
+                result = information.get("playlist_item_" + item);
+
+                final int sepIndex = result.lastIndexOf(File.separatorChar);
+                final int extIndex = result.lastIndexOf('.');
+                result = result.substring(sepIndex,
+                        extIndex > sepIndex ? extIndex : result.length());
+
+                final int offset = result.indexOf('-');
+                if (offset > -1) {
+                    result = result.substring(offset + 1).trim();
+                }
+            } catch (NumberFormatException nfe) {
+                // Do nothing
+            }
+        }
+
+        return result;
+    }
+
+    @Override
+    public String getAlbum() {
+        return information.containsKey("album/movie/show title")
+                ? information.get("album/movie/show title") : "unknown";
+    }
+
+    @Override
+    public String getLength() {
+        // This is just seconds, could do with formatting.
+        return information.containsKey("length") ? information.get("length")
+                : "unknown";
+    }
+
+    @Override
+    public String getTime() {
+        // This is just seconds, could do with formatting.
+        return information.containsKey("time") ? information.get("time")
+                : "unknown";
+    }
+
+    @Override
+    public String getFormat() {
+        return information.containsKey("codec") ? information.get("codec")
+                : "unknown";
+    }
+
+    @Override
+    public String getBitrate() {
+        return information.containsKey("bitrate") ? information.get("bitrate")
+                : "unknown";
+    }
+
+    @Handler
+    public void showConfig(final ClientPrefsOpenedEvent event) {
+        final PreferencesDialogModel manager = event.getModel();
+        final PreferencesCategory general = new PluginPreferencesCategory(
+                pluginInfo, "VLC Media Source",
+                "", "category-vlc");
+
+        final PreferencesSetting setting = new PreferencesSetting(
+                PreferencesType.LABEL, pluginInfo.getDomain(), "", "Instructions",
+                "Instructions", manager.getConfigManager(), manager.getIdentity());
+        setting.setValue("<html><p>"
+                + "The VLC media source requires that VLC's web interface is"
+                + " enabled. To do this, follow the steps below:</p>"
+                + "<ol style='margin-left: 20px; padding-left: 0px;'>"
+                + "<li>Open VLC's preferences dialog (found in the 'Tools' "
+                + "menu)"
+                + "<li>Set the 'Show settings' option to 'All'"
+                + "<li>Expand the 'Interface' category by clicking on the plus "
+                + "sign next to it"
+                + "<li>Select the 'Main interfaces' category"
+                + "<li>Check the box next to 'HTTP remote control interface'"
+                + "<li>Expand the 'Main interfaces' category"
+                + "<li>Select the 'HTTP' category"
+                + "<li>In the 'Host address' field, enter 'localhost:8082'"
+                + "<li>In the 'Source directory' field enter the path to VLC's"
+                + " http directory<ul style='margin-left: 5px; padding-left: "
+                + "0px; list-style-type: none;'>"
+                + "<li style='padding-bottom: 5px'>For Linux users this may be "
+                + "/usr/share/vlc/http/"
+                + "<li>For Windows users this will be under the main VLC "
+                + "directory, e.g. C:\\Program Files\\VLC\\http</ul><li>Click "
+                + "'Save'<li>Restart VLC</ol></html>");
+        general.addSetting(setting);
+        general.addSetting(new PreferencesSetting(PreferencesType.TEXT,
+                pluginInfo.getDomain(), "host", "Hostname and port",
+                "The host and port that VLC listens on for web connections",
+                manager.getConfigManager(), manager.getIdentity()));
+
+        manager.getCategory("Plugins").addSubCategory(general);
+    }
+
+    /**
+     * Attempts to fetch information from VLC's web interface.
+     *
+     * @return True on success, false otherwise
+     */
+    private boolean fetchInformation() {
+        information.clear();
+        final List<String> res;
+        final List<String> res2;
+
+        try {
+            final String host = identityController.getGlobalConfiguration()
+                    .getOption(pluginInfo.getDomain(), "host");
+            res = downloader.getPage("http://" + host + "/old/info.html");
+            res2 = downloader.getPage("http://" + host + "/old/");
+            parseInformation(res, res2);
+            return true;
+        } catch (IOException ex) {
+            return false;
+        }
+    }
+
+    /**
+     * Parses the information from the two pages obtained from VLC's web interface.
+     *
+     * @param res  The first page of VLC info (/old/info.html)
+     * @param res2 The second page of VLC info (/old/)
+     */
+    protected void parseInformation(final List<String> res,
+            final List<String> res2) {
+        for (String line : res) {
+            final String tline = line.trim();
+
+            if (tline.startsWith("<li>")) {
+                final int colon = tline.indexOf(':');
+                final String key = tline.substring(5, colon).trim()
+                        .toLowerCase();
+                final String value = tline.substring(colon + 1, tline.length()
+                        - 5).trim();
+
+                information.put(key, value);
+            }
+        }
+
+        boolean isPlaylist = false;
+        boolean isCurrent = false;
+        boolean isItem = false;
+        int playlistItem = 0;
+        for (String line : res2) {
+            final String tline = line.trim();
+
+            if (isPlaylist) {
+                if (tline.startsWith("</ul>")) {
+                    isPlaylist = false;
+                    information.put("playlist_items", Integer.toString(
+                            playlistItem));
+                } else if (tline.equalsIgnoreCase("<strong>")) {
+                    isCurrent = true;
+                } else if (tline.equalsIgnoreCase("</strong>")) {
+                    isCurrent = false;
+                } else if (tline.startsWith("<a href=\"?control=play&amp")) {
+                    isItem = true;
+                } else if (isItem) {
+                    String itemname = tline;
+                    if (itemname.endsWith("</a>")) {
+                        itemname = itemname.substring(0, itemname.length() - 4);
+                    }
+                    if (!itemname.isEmpty()) {
+                        if (isCurrent) {
+                            information.put("playlist_current", Integer
+                                    .toString(playlistItem));
+                        }
+                        information.put("playlist_item_" + Integer.toString(
+                                playlistItem++), itemname);
+                    }
+                    isItem = false;
+                }
+            } else if (tline.equalsIgnoreCase("<!-- Playlist -->")) {
+                isPlaylist = true;
+            } else if (tline.startsWith("State:")) {
+                information.put("state", tline.substring(6, tline.indexOf('<'))
+                        .trim());
+            } else if (tline.startsWith("got_")) {
+                final int equals = tline.indexOf('=');
+
+                information.put(tline.substring(4, equals).trim(),
+                        tline.substring(equals + 1, tline.length() - 1).trim());
+            }
+        }
+    }
+}

mediasource_vlc/src/com/dmdirc/addons/mediasource_vlc/VlcMediaSourcePlugin.java

@@ -22,302 +22,23 @@
 
 package com.dmdirc.addons.mediasource_vlc;
 
-import com.dmdirc.addons.nowplaying.MediaSource;
-import com.dmdirc.addons.nowplaying.MediaSourceState;
-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.interfaces.config.IdentityController;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BasePlugin;
-import com.dmdirc.util.io.Downloader;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import dagger.ObjectGraph;
 
 /**
  * Retrieves information from VLC using its HTTP interface.
  */
-public class VlcMediaSourcePlugin extends BasePlugin implements MediaSource {
+public class VlcMediaSourcePlugin extends BasePlugin {
 
-    /** The information obtained from VLC. */
-    private final Map<String, String> information = new HashMap<>();
-    /** This plugin's plugin info. */
-    private final PluginInfo pluginInfo;
-    /** The identity controller to read settings from. */
-    private final IdentityController identityController;
-    /** Downloader to download files. */
-    private final Downloader downloader;
-
-    public VlcMediaSourcePlugin(final PluginInfo pluginInfo,
-            final IdentityController identityController) {
-        this.pluginInfo = pluginInfo;
-        this.identityController = identityController;
-        this.downloader = new Downloader();
-    }
-
-    @Override
-    public MediaSourceState getState() {
-        if (fetchInformation()) {
-            final String output = information.get("state");
-            if (output.equalsIgnoreCase("stop")) {
-                return MediaSourceState.STOPPED;
-            } else if (output.equalsIgnoreCase("playing")) {
-                return MediaSourceState.PLAYING;
-            } else if (output.equalsIgnoreCase("paused")) {
-                return MediaSourceState.PAUSED;
-            } else {
-                return MediaSourceState.NOTKNOWN;
-            }
-        } else {
-            return MediaSourceState.CLOSED;
-        }
-    }
-
-    @Override
-    public String getAppName() {
-        return "VLC";
-    }
-
-    @Override
-    public String getArtist() {
-        return information.containsKey("artist") ? information.get("artist") : getFallbackArtist();
-    }
-
-    /**
-     * Retrieves the fallback artist (parsed from the file name).
-     *
-     * @return The fallback artist
-     */
-    private String getFallbackArtist() {
-        String result = "unknown";
-
-        if (information.containsKey("playlist_current")) {
-            try {
-                final int item = Integer.parseInt(information.get(
-                        "playlist_current"));
-                String[] bits = information.get("playlist_item_" + item).split(
-                        (File.separatorChar == '\\' ? "\\\\" : File.separator));
-                result = bits[bits.length - 1];
-                bits = result.split("-");
-                if (bits.length > 1) {
-                    result = bits[0];
-                } else {
-                    // Whole filename is the title, so no artist is known.
-                    result = "unknown";
-                }
-            } catch (NumberFormatException nfe) {
-                // DO nothing
-            }
-        }
-
-        return result;
-    }
+    private VlcManager vlcManager;
 
     @Override
-    public String getTitle() {
-        return information.containsKey("title") ? information.get("title")
-                : getFallbackTitle();
-    }
-
-    /**
-     * Retrieves the fallback title (parsed from the file name).
-     *
-     * @return The fallback title
-     */
-    private String getFallbackTitle() {
-        String result = "unknown";
-
-        // Title is unknown, lets guess using the filename
-        if (information.containsKey("playlist_current")) {
-            try {
-                final int item = Integer.parseInt(information.get(
-                        "playlist_current"));
-                result = information.get("playlist_item_" + item);
-
-                final int sepIndex = result.lastIndexOf(File.separatorChar);
-                final int extIndex = result.lastIndexOf('.');
-                result = result.substring(sepIndex,
-                        extIndex > sepIndex ? extIndex : result.length());
-
-                final int offset = result.indexOf('-');
-                if (offset > -1) {
-                    result = result.substring(offset + 1).trim();
-                }
-            } catch (NumberFormatException nfe) {
-                // Do nothing
-            }
-        }
+    public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
+        super.load(pluginInfo, graph);
 
-        return result;
-    }
-
-    @Override
-    public String getAlbum() {
-        return information.containsKey("album/movie/show title")
-                ? information.get("album/movie/show title") : "unknown";
-    }
-
-    @Override
-    public String getLength() {
-        // This is just seconds, could do with formatting.
-        return information.containsKey("length") ? information.get("length")
-                : "unknown";
+        setObjectGraph(graph.plus(new VlcModule(pluginInfo)));
+        vlcManager = getObjectGraph().get(VlcManager.class);
     }
-
-    @Override
-    public String getTime() {
-        // This is just seconds, could do with formatting.
-        return information.containsKey("time") ? information.get("time")
-                : "unknown";
-    }
-
-    @Override
-    public String getFormat() {
-        return information.containsKey("codec") ? information.get("codec")
-                : "unknown";
-    }
-
-    @Override
-    public String getBitrate() {
-        return information.containsKey("bitrate") ? information.get("bitrate")
-                : "unknown";
-    }
-
-    @Override
-    public void showConfig(final PreferencesDialogModel manager) {
-        final PreferencesCategory general = new PluginPreferencesCategory(
-                pluginInfo, "VLC Media Source",
-                "", "category-vlc");
-
-        final PreferencesSetting setting = new PreferencesSetting(
-                PreferencesType.LABEL, pluginInfo.getDomain(), "", "Instructions",
-                "Instructions", manager.getConfigManager(), manager.getIdentity());
-        setting.setValue("<html><p>"
-                + "The VLC media source requires that VLC's web interface is"
-                + " enabled. To do this, follow the steps below:</p>"
-                + "<ol style='margin-left: 20px; padding-left: 0px;'>"
-                + "<li>Open VLC's preferences dialog (found in the 'Tools' "
-                + "menu)"
-                + "<li>Set the 'Show settings' option to 'All'"
-                + "<li>Expand the 'Interface' category by clicking on the plus "
-                + "sign next to it"
-                + "<li>Select the 'Main interfaces' category"
-                + "<li>Check the box next to 'HTTP remote control interface'"
-                + "<li>Expand the 'Main interfaces' category"
-                + "<li>Select the 'HTTP' category"
-                + "<li>In the 'Host address' field, enter 'localhost:8082'"
-                + "<li>In the 'Source directory' field enter the path to VLC's"
-                + " http directory<ul style='margin-left: 5px; padding-left: "
-                + "0px; list-style-type: none;'>"
-                + "<li style='padding-bottom: 5px'>For Linux users this may be "
-                + "/usr/share/vlc/http/"
-                + "<li>For Windows users this will be under the main VLC "
-                + "directory, e.g. C:\\Program Files\\VLC\\http</ul><li>Click "
-                + "'Save'<li>Restart VLC</ol></html>");
-        general.addSetting(setting);
-        general.addSetting(new PreferencesSetting(PreferencesType.TEXT,
-                pluginInfo.getDomain(), "host", "Hostname and port",
-                "The host and port that VLC listens on for web connections",
-                manager.getConfigManager(), manager.getIdentity()));
-
-        manager.getCategory("Plugins").addSubCategory(general);
-    }
-
-    /**
-     * Attempts to fetch information from VLC's web interface.
-     *
-     * @return True on success, false otherwise
-     */
-    private boolean fetchInformation() {
-        information.clear();
-        final List<String> res;
-        final List<String> res2;
-
-        try {
-            final String host = identityController.getGlobalConfiguration()
-                    .getOption(pluginInfo.getDomain(), "host");
-            res = downloader.getPage("http://" + host + "/old/info.html");
-            res2 = downloader.getPage("http://" + host + "/old/");
-            parseInformation(res, res2);
-            return true;
-        } catch (IOException ex) {
-            return false;
-        }
-    }
-
-    /**
-     * Parses the information from the two pages obtained from VLC's web interface.
-     *
-     * @param res  The first page of VLC info (/old/info.html)
-     * @param res2 The second page of VLC info (/old/)
-     */
-    protected void parseInformation(final List<String> res,
-            final List<String> res2) {
-        for (String line : res) {
-            final String tline = line.trim();
-
-            if (tline.startsWith("<li>")) {
-                final int colon = tline.indexOf(':');
-                final String key = tline.substring(5, colon).trim()
-                        .toLowerCase();
-                final String value = tline.substring(colon + 1, tline.length()
-                        - 5).trim();
-
-                information.put(key, value);
-            }
-        }
-
-        boolean isPlaylist = false;
-        boolean isCurrent = false;
-        boolean isItem = false;
-        int playlistItem = 0;
-        for (String line : res2) {
-            final String tline = line.trim();
-
-            if (isPlaylist) {
-                if (tline.startsWith("</ul>")) {
-                    isPlaylist = false;
-                    information.put("playlist_items", Integer.toString(
-                            playlistItem));
-                } else if (tline.equalsIgnoreCase("<strong>")) {
-                    isCurrent = true;
-                } else if (tline.equalsIgnoreCase("</strong>")) {
-                    isCurrent = false;
-                } else if (tline.startsWith("<a href=\"?control=play&amp")) {
-                    isItem = true;
-                } else if (isItem) {
-                    String itemname = tline;
-                    if (itemname.endsWith("</a>")) {
-                        itemname = itemname.substring(0, itemname.length() - 4);
-                    }
-                    if (!itemname.isEmpty()) {
-                        if (isCurrent) {
-                            information.put("playlist_current", Integer
-                                    .toString(playlistItem));
-                        }
-                        information.put("playlist_item_" + Integer.toString(
-                                playlistItem++), itemname);
-                    }
-                    isItem = false;
-                }
-            } else if (tline.equalsIgnoreCase("<!-- Playlist -->")) {
-                isPlaylist = true;
-            } else if (tline.startsWith("State:")) {
-                information.put("state", tline.substring(6, tline.indexOf('<'))
-                        .trim());
-            } else if (tline.startsWith("got_")) {
-                final int equals = tline.indexOf('=');
-
-                information.put(tline.substring(4, equals).trim(),
-                        tline.substring(equals + 1, tline.length() - 1).trim());
-            }
-        }
-    }
-
 }

mediasource_vlc/src/com/dmdirc/addons/mediasource_vlc/VlcModule.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2006-2015 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.mediasource_vlc;
+
+import com.dmdirc.ClientModule;
+import com.dmdirc.plugins.PluginDomain;
+import com.dmdirc.plugins.PluginInfo;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module(injects = VlcManager.class, addsTo = ClientModule.class)
+public class VlcModule {
+
+    private final PluginInfo pluginInfo;
+
+    public VlcModule(final PluginInfo pluginInfo) {
+        this.pluginInfo = pluginInfo;
+    }
+
+    @Provides
+    @PluginDomain(VlcMediaSourcePlugin.class)
+    public PluginInfo getPluginInfo() {
+        return pluginInfo;
+    }
+}

nma/src/com/dmdirc/addons/nma/NotifyMyAndroidManager.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2006-2015 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.nma;
+
+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.plugins.PluginDomain;
+import com.dmdirc.plugins.PluginInfo;
+
+import javax.inject.Inject;
+
+import net.engio.mbassy.listener.Handler;
+
+public class NotifyMyAndroidManager {
+
+    private final PluginInfo pluginInfo;
+
+    @Inject
+    public NotifyMyAndroidManager(
+            @PluginDomain(NotifyMyAndroidPlugin.class)final PluginInfo pluginInfo) {
+        this.pluginInfo = pluginInfo;
+    }
+
+    @Handler
+    public void showConfig(final ClientPrefsOpenedEvent event) {
+        final PreferencesDialogModel manager = event.getModel();
+        final PreferencesCategory category = new PluginPreferencesCategory(
+                pluginInfo, "Notify My Android",
+                "General configuration for Notify My Android plugin.");
+
+        category.addSetting(new PreferencesSetting(
+                PreferencesType.TEXT, pluginInfo.getDomain(), "apikey",
+                "API Key", "Comma-separated list of NotifyMyAndroid API keys"
+                + " to be notified when the command is used.",
+                manager.getConfigManager(), manager.getIdentity()));
+        category.addSetting(new PreferencesSetting(
+                PreferencesType.TEXT, pluginInfo.getDomain(), "application",
+                "Application", "Name of the application to report to "
+                + "NotifyMyAndroid",
+                manager.getConfigManager(), manager.getIdentity()));
+
+        manager.getCategory("Plugins").addSubCategory(category);
+    }
+}

nma/src/com/dmdirc/addons/nma/NotifyMyAndroidModule.java

@@ -29,7 +29,8 @@ import com.dmdirc.plugins.PluginInfo;
 import dagger.Module;
 import dagger.Provides;
 
-@Module(injects = NotifyMyAndroidCommand.class, addsTo = ClientModule.class)
+@Module(injects = {NotifyMyAndroidManager.class, NotifyMyAndroidCommand.class},
+        addsTo = ClientModule.class)
 public class NotifyMyAndroidModule {
 
     private final PluginInfo pluginInfo;
@@ -44,4 +45,10 @@ public class NotifyMyAndroidModule {
         return pluginInfo.getDomain();
     }
 
+    @Provides
+    @PluginDomain(NotifyMyAndroidPlugin.class)
+    public PluginInfo getPluginInfo() {
+        return pluginInfo;
+    }
+
 }

nma/src/com/dmdirc/addons/nma/NotifyMyAndroidPlugin.java

@@ -22,11 +22,6 @@
 
 package com.dmdirc.addons.nma;
 
-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.BaseCommandPlugin;
 
@@ -37,42 +32,13 @@ import dagger.ObjectGraph;
  */
 public class NotifyMyAndroidPlugin extends BaseCommandPlugin {
 
-    /** Our info object. */
-    private final PluginInfo pluginInfo;
-
-    /**
-     * Creates a new instance of the {@link NotifyMyAndroidPlugin}.
-     *
-     * @param pluginInfo The plugin info object for this plugin.
-     */
-    public NotifyMyAndroidPlugin(final PluginInfo pluginInfo) {
-        this.pluginInfo = pluginInfo;
-    }
+    private NotifyMyAndroidManager notifyMyAndroidManager;
 
     @Override
     public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
         super.load(pluginInfo, graph);
         setObjectGraph(graph.plus(new NotifyMyAndroidModule(pluginInfo)));
-    }
-
-    @Override
-    public void showConfig(final PreferencesDialogModel manager) {
-        final PreferencesCategory category = new PluginPreferencesCategory(
-                pluginInfo, "Notify My Android",
-                "General configuration for Notify My Android plugin.");
-
-        category.addSetting(new PreferencesSetting(
-                PreferencesType.TEXT, pluginInfo.getDomain(), "apikey",
-                "API Key", "Comma-separated list of NotifyMyAndroid API keys"
-                + " to be notified when the command is used.",
-                manager.getConfigManager(), manager.getIdentity()));
-        category.addSetting(new PreferencesSetting(
-                PreferencesType.TEXT, pluginInfo.getDomain(), "application",
-                "Application", "Name of the application to report to "
-                + "NotifyMyAndroid",
-                manager.getConfigManager(), manager.getIdentity()));
-
-        manager.getCategory("Plugins").addSubCategory(category);
+        notifyMyAndroidManager = getObjectGraph().get(NotifyMyAndroidManager.class);
     }
 
 }

notifications/src/com/dmdirc/addons/notifications/NotificationsManager.java

@@ -24,6 +24,11 @@ package com.dmdirc.addons.notifications;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
+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.events.ClientPrefsOpenedEvent;
 import com.dmdirc.events.PluginLoadedEvent;
 import com.dmdirc.events.PluginUnloadedEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -47,6 +52,7 @@ public class NotificationsManager {
     private List<String> order;
     /** This plugin's settings domain. */
     private final String domain;
+    private final PluginInfo pluginInfo;
     /** Global config to read settings from. */
     private final AggregateConfigProvider globalConfig;
     /** Plugin manager. */
@@ -56,9 +62,11 @@ public class NotificationsManager {
 
     @Inject
     public NotificationsManager(@PluginDomain(NotificationsPlugin.class) final String domain,
+            @PluginDomain(NotificationsPlugin.class) final PluginInfo pluginInfo,
             @GlobalConfig final AggregateConfigProvider globalConfig, final DMDircMBassador eventBus,
             final PluginManager pluginManager) {
         this.domain = domain;
+        this.pluginInfo = pluginInfo;
         this.globalConfig = globalConfig;
         this.pluginManager = pluginManager;
         this.eventBus = eventBus;
@@ -182,4 +190,18 @@ public class NotificationsManager {
         return null;
     }
 
+    @Handler
+    public void showConfig(final ClientPrefsOpenedEvent event) {
+        final PreferencesDialogModel manager = event.getModel();
+        final NotificationConfig configPanel = UIUtilities.invokeAndWait(
+                () -> new NotificationConfig(manager.getIdentity(), pluginInfo.getDomain(),
+                        manager.getConfigManager()
+                                .getOptionList(pluginInfo.getDomain(), "methodOrder")));
+
+        final PreferencesCategory category = new PluginPreferencesCategory(
+                pluginInfo, "Notifications", "", "category-notifications",
+                configPanel);
+        manager.getCategory("Plugins").addSubCategory(category);
+    }
+
 }

notifications/src/com/dmdirc/addons/notifications/NotificationsModule.java

@@ -45,4 +45,10 @@ public class NotificationsModule {
         return pluginInfo.getDomain();
     }
 
+    @Provides
+    @PluginDomain(NotificationsPlugin.class)
+    public PluginInfo getPluginInfo() {
+        return pluginInfo;
+    }
+
 }

notifications/src/com/dmdirc/addons/notifications/NotificationsPlugin.java

@@ -22,10 +22,6 @@
 
 package com.dmdirc.addons.notifications;
 
-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.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
@@ -36,21 +32,9 @@ import dagger.ObjectGraph;
  */
 public class NotificationsPlugin extends BaseCommandPlugin {
 
-    /** This plugin's plugin info. */
-    private final PluginInfo pluginInfo;
     /** Notifications manager. */
     private NotificationsManager manager;
 
-    /**
-     * Creates a new instance of this plugin.
-     *
-     * @param pluginInfo This plugin's plugin info
-     */
-    public NotificationsPlugin(final PluginInfo pluginInfo) {
-        this.pluginInfo = pluginInfo;
-
-    }
-
     @Override
     public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
         super.load(pluginInfo, graph);
@@ -71,17 +55,4 @@ public class NotificationsPlugin extends BaseCommandPlugin {
         super.onUnload();
     }
 
-    @Override
-    public void showConfig(final PreferencesDialogModel manager) {
-        final NotificationConfig configPanel = UIUtilities.invokeAndWait(
-                () -> new NotificationConfig(manager.getIdentity(), pluginInfo.getDomain(),
-                        manager.getConfigManager().getOptionList(pluginInfo.getDomain(),
-                                "methodOrder")));
-
-        final PreferencesCategory category = new PluginPreferencesCategory(
-                pluginInfo, "Notifications", "", "category-notifications",
-                configPanel);
-        manager.getCategory("Plugins").addSubCategory(category);
-    }
-
 }

nowplaying/src/com/dmdirc/addons/nowplaying/NowPlayingManager.java

@@ -24,6 +24,11 @@ package com.dmdirc.addons.nowplaying;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
+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.events.ClientPrefsOpenedEvent;
 import com.dmdirc.events.PluginLoadedEvent;
 import com.dmdirc.events.PluginUnloadedEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -49,6 +54,7 @@ public class NowPlayingManager {
     private final AggregateConfigProvider globalConfig;
     /** Event bus to subscribe to events on. */
     private final DMDircMBassador eventBus;
+    private final PluginInfo pluginInfo;
     /** This plugin's settings domain. */
     private final String domain;
     /** The sources that we know of. */
@@ -61,11 +67,13 @@ public class NowPlayingManager {
     @Inject
     public NowPlayingManager(final PluginManager pluginManager, final DMDircMBassador eventBus,
             @GlobalConfig final AggregateConfigProvider globalConfig,
-            @PluginDomain(NowPlayingPlugin.class) final String domain) {
+            @PluginDomain(NowPlayingPlugin.class) final String domain,
+            @PluginDomain(NowPlayingPlugin.class) final PluginInfo pluginInfo) {
         this.pluginManager = pluginManager;
         this.globalConfig = globalConfig;
         this.domain = domain;
         this.eventBus = eventBus;
+        this.pluginInfo = pluginInfo;
     }
 
     /**
@@ -284,4 +292,17 @@ public class NowPlayingManager {
         return res;
     }
 
+    @Handler
+    public void showConfig(final ClientPrefsOpenedEvent event) {
+        final PreferencesDialogModel manager = event.getModel();
+        final ConfigPanel configPanel = UIUtilities.invokeAndWait(
+                () -> new ConfigPanel(this, manager.getConfigManager(),
+                        manager.getIdentity(), domain, getSettings()));
+
+        final PreferencesCategory category = new PluginPreferencesCategory(
+                pluginInfo, "Now Playing",
+                "", "category-nowplaying", configPanel);
+        manager.getCategory("Plugins").addSubCategory(category);
+    }
+
 }

nowplaying/src/com/dmdirc/addons/nowplaying/NowPlayingModule.java

@@ -44,4 +44,10 @@ public class NowPlayingModule {
         return pluginInfo.getDomain();
     }
 
+    @Provides
+    @PluginDomain(NowPlayingPlugin.class)
+    public PluginInfo getPluginInfo() {
+        return pluginInfo;
+    }
+
 }

nowplaying/src/com/dmdirc/addons/nowplaying/NowPlayingPlugin.java

@@ -22,10 +22,6 @@
 
 package com.dmdirc.addons.nowplaying;
 
-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.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
@@ -36,23 +32,9 @@ import dagger.ObjectGraph;
  */
 public class NowPlayingPlugin extends BaseCommandPlugin {
 
-    /** This plugin's plugin info. */
-    private final PluginInfo pluginInfo;
-    /** This plugin's settings domain. */
-    private final String domain;
     /** Now playing manager. */
     private NowPlayingManager nowplayingmanager;
 
-    /**
-     * Creates a new instance of this plugin.
-     *
-     * @param pluginInfo This plugin's plugin info
-     */
-    public NowPlayingPlugin(final PluginInfo pluginInfo) {
-        this.pluginInfo = pluginInfo;
-        this.domain = pluginInfo.getDomain();
-    }
-
     @Override
     public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
         super.load(pluginInfo, graph);
@@ -73,17 +55,4 @@ public class NowPlayingPlugin extends BaseCommandPlugin {
         nowplayingmanager.onUnload();
     }
 
-    @Override
-    public void showConfig(final PreferencesDialogModel manager) {
-        final ConfigPanel configPanel = UIUtilities.invokeAndWait(
-                () -> new ConfigPanel(nowplayingmanager, manager.getConfigManager(),
-                        manager.getIdentity(), domain,
-                        nowplayingmanager.getSettings()));
-
-        final PreferencesCategory category = new PluginPreferencesCategory(
-                pluginInfo, "Now Playing",
-                "", "category-nowplaying", configPanel);
-        manager.getCategory("Plugins").addSubCategory(category);
-    }
-
 }