Use @PluginDomain in a few places.

Change-Id: Iac7e1032d07efacf95d8179b09fd352ba0d6c558
Reviewed-on: http://gerrit.dmdirc.com/3186
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/addons/ui_swing/components/MDIBar.java

@@ -25,12 +25,13 @@ package com.dmdirc.addons.ui_swing.components;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SelectionListener;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.SwingWindowListener;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.addons.ui_swing.injection.SwingModule.SwingSettingsDomain;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.IconManager;
 
 import java.awt.event.ActionEvent;
@@ -82,7 +83,7 @@ public class MDIBar extends JPanel implements SwingWindowListener,
     public MDIBar(
             @GlobalConfig final AggregateConfigProvider globalConfig,
             @GlobalConfig final IconManager iconManager,
-            @SwingSettingsDomain final String domain,
+            @PluginDomain(SwingController.class) final String domain,
             final SwingWindowFactory windowFactory,
             final MainFrame mainFrame) {
         super();

src/com/dmdirc/addons/ui_swing/components/TopicBar.java

@@ -34,11 +34,11 @@ import com.dmdirc.addons.ui_swing.components.frames.ChannelFrame;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
 import com.dmdirc.addons.ui_swing.components.inputfields.TextPaneInputField;
 import com.dmdirc.addons.ui_swing.components.text.WrapEditorKit;
-import com.dmdirc.addons.ui_swing.injection.SwingModule.SwingSettingsDomain;
 import com.dmdirc.interfaces.TopicChangeListener;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.parser.common.ChannelJoinRequest;
+import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.core.util.URLHandler;
@@ -133,7 +133,7 @@ public class TopicBar extends JComponent implements ActionListener,
     public TopicBar(
             final MainFrame parentWindow,
             @SuppressWarnings("qualifiers") @GlobalConfig final AggregateConfigProvider globalConfig,
-            @SuppressWarnings("qualifiers") @SwingSettingsDomain final String domain,
+            @SuppressWarnings("qualifiers") @PluginDomain(SwingController.class) final String domain,
             final ColourManager colourManager,
             final PluginManager pluginManager,
             final SwingWindowFactory windowFactory,
@@ -193,31 +193,31 @@ public class TopicBar extends JComponent implements ActionListener,
                 "enterButton");
         topicText.getActionMap().put("enterButton", new AbstractAction(
                 "enterButton") {
-            /**
-             * A version number for this class. It should be changed whenever the class structure is
-             * changed (or anything else that would prevent serialized objects being unserialized
-             * with the new class).
-             */
-            private static final long serialVersionUID = 1;
-
-            /** {@inheritDoc} */
-            @Override
-            public void actionPerformed(final ActionEvent e) {
-                commitTopicEdit();
-            }
-        });
+                    /**
+                     * A version number for this class. It should be changed whenever the class
+                     * structure is changed (or anything else that would prevent serialized objects
+                     * being unserialized with the new class).
+                     */
+                    private static final long serialVersionUID = 1;
+
+                    /** {@inheritDoc} */
+                    @Override
+                    public void actionPerformed(final ActionEvent e) {
+                        commitTopicEdit();
+                    }
+                });
         topicText.getInputMap().put(KeyStroke.getKeyStroke("ESCAPE"),
                 "escapeButton");
         topicText.getActionMap().put("escapeButton", new AbstractAction(
                 "escapeButton") {
-            private static final long serialVersionUID = 1;
+                    private static final long serialVersionUID = 1;
 
-            /** {@inheritDoc} */
-            @Override
-            public void actionPerformed(final ActionEvent e) {
-                cancelTopicEdit();
-            }
-        });
+                    /** {@inheritDoc} */
+                    @Override
+                    public void actionPerformed(final ActionEvent e) {
+                        cancelTopicEdit();
+                    }
+                });
         topicText.addHyperlinkListener(this);
         topicText.addMouseListener(this);
         topicText.getDocument().addDocumentListener(this);
@@ -253,8 +253,8 @@ public class TopicBar extends JComponent implements ActionListener,
                     channel.getStyliser().addStyledString(
                             (StyledDocument) topicText.getDocument(),
                             new String[]{Styliser.CODE_HEXCOLOUR
-                        + UIUtilities.getHex(foregroundColour)
-                        + channel.getCurrentTopic().getTopic(),},
+                                + UIUtilities.getHex(foregroundColour)
+                                + channel.getCurrentTopic().getTopic(),},
                             as);
                 }
                 topicText.setCaretPosition(0);
@@ -378,14 +378,14 @@ public class TopicBar extends JComponent implements ActionListener,
     private void setColours() {
         backgroundColour = UIUtilities.convertColour(
                 colourManager.getColourFromString(
-                channel.getConfigManager().getOptionString(
-                "ui", "inputbackgroundcolour",
-                "ui", "backgroundcolour"), null));
+                        channel.getConfigManager().getOptionString(
+                                "ui", "inputbackgroundcolour",
+                                "ui", "backgroundcolour"), null));
         foregroundColour = UIUtilities.convertColour(
                 colourManager.getColourFromString(
-                channel.getConfigManager().getOptionString(
-                "ui", "inputforegroundcolour",
-                "ui", "foregroundcolour"), null));
+                        channel.getConfigManager().getOptionString(
+                                "ui", "inputforegroundcolour",
+                                "ui", "foregroundcolour"), null));
         setBackground(backgroundColour);
         setForeground(foregroundColour);
         setDisabledTextColour(foregroundColour);

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

@@ -46,6 +46,7 @@ import com.dmdirc.config.prefs.PreferencesDialogModel;
 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.PluginManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.WindowManager;
@@ -56,7 +57,6 @@ import com.dmdirc.util.URLBuilder;
 import java.util.concurrent.Callable;
 
 import javax.inject.Provider;
-import javax.inject.Qualifier;
 import javax.inject.Singleton;
 
 import dagger.Module;
@@ -69,18 +69,15 @@ import dagger.Provides;
         addsTo = ClientModule.class,
         includes = DialogModule.class,
         injects = {
-    SwingManager.class,
-    PopInCommand.class,
-    PopOutCommand.class,
-    Input.class,
-    ServerSettings.class,
-    ChannelSettings.class
-})
+            SwingManager.class,
+            PopInCommand.class,
+            PopOutCommand.class,
+            Input.class,
+            ServerSettings.class,
+            ChannelSettings.class
+        })
 public class SwingModule {
 
-    @Qualifier
-    public @interface SwingSettingsDomain {
-    }
     /** The controller to return to clients. */
     private final SwingController controller;
     /** The domain for plugin settings. */
@@ -104,7 +101,7 @@ public class SwingModule {
      * @return The settings domain for the swing plugin.
      */
     @Provides
-    @SwingSettingsDomain
+    @PluginDomain(SwingController.class)
     public String getSettingsDomain() {
         return domain;
     }

src/com/dmdirc/addons/ui_swing/textpane/TextPane.java

@@ -22,11 +22,12 @@
 
 package com.dmdirc.addons.ui_swing.textpane;
 
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.addons.ui_swing.injection.SwingModule.SwingSettingsDomain;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.ui.Window;
+import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.messages.IRCDocument;
 import com.dmdirc.ui.messages.IRCDocumentListener;
 import com.dmdirc.ui.messages.LinePosition;
@@ -97,7 +98,7 @@ public final class TextPane extends JComponent implements MouseWheelListener,
      * @param frame        Parent Frame
      */
     public TextPane(
-            @SuppressWarnings("qualifiers") @SwingSettingsDomain final String configDomain,
+            @SuppressWarnings("qualifiers") @PluginDomain(SwingController.class) final String configDomain,
             final URLBuilder urlBuilder,
             @Unbound final TextFrame frame) {
         super();
@@ -429,7 +430,7 @@ public final class TextPane extends JComponent implements MouseWheelListener,
         if (getSelectedText() != null && !getSelectedText().isEmpty()) {
             Toolkit.getDefaultToolkit().getSystemClipboard().setContents(
                     new StringSelection(getSelectedText(
-                    copyControlCharacters)), null);
+                                    copyControlCharacters)), null);
         }
     }
 

src/com/dmdirc/addons/ui_web/WebInterfaceModule.java

@@ -23,12 +23,12 @@
 package com.dmdirc.addons.ui_web;
 
 import com.dmdirc.ClientModule;
+import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.util.resourcemanager.ResourceManager;
 
 import java.io.IOException;
 
-import javax.inject.Qualifier;
 import javax.inject.Singleton;
 
 import dagger.Module;
@@ -43,12 +43,8 @@ public class WebInterfaceModule {
         this.pluginInfo = pluginInfo;
     }
 
-    @Qualifier
-    public @interface WebUIDomain {
-    };
-
     @Provides
-    @WebUIDomain
+    @PluginDomain(WebInterfacePlugin.class)
     public String getSettingsDomain() {
         return pluginInfo.getDomain();
     }

src/com/dmdirc/addons/ui_web/WebInterfaceUI.java

@@ -25,11 +25,11 @@ package com.dmdirc.addons.ui_web;
 import com.dmdirc.Channel;
 import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
-import com.dmdirc.addons.ui_web.WebInterfaceModule.WebUIDomain;
 import com.dmdirc.addons.ui_web.uicomponents.WebStatusBar;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.interfaces.ui.Window;
+import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
@@ -71,7 +71,7 @@ public class WebInterfaceUI implements UIController {
      */
     @Inject
     public WebInterfaceUI(
-            @WebUIDomain final String domain,
+            @PluginDomain(WebInterfacePlugin.class) final String domain,
             final IdentityController identityController,
             final ServerManager serverManager,
             final PluginManager pluginManager,

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

@@ -30,13 +30,13 @@ import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
-import com.dmdirc.addons.windowstatus.WindowStatusModule.WindowStatusDomain;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.plugins.PluginDomain;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -69,7 +69,7 @@ public class WindowStatusManager implements ConfigChangeListener, SelectionListe
     @Inject
     public WindowStatusManager(final MainFrame mainFrame, final SwingStatusBar statusBar,
             final IdentityController identityController,
-            @WindowStatusDomain final String domain) {
+            @PluginDomain(WindowStatusPlugin.class) final String domain) {
         this.domain = domain;
         this.mainFrame = mainFrame;
         this.statusBar = statusBar;

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

@@ -23,10 +23,9 @@
 package com.dmdirc.addons.windowstatus;
 
 import com.dmdirc.addons.ui_swing.injection.SwingModule;
+import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
 
-import javax.inject.Qualifier;
-
 import dagger.Module;
 import dagger.Provides;
 
@@ -36,9 +35,6 @@ import dagger.Provides;
 @Module(injects = {WindowStatusManager.class}, addsTo = SwingModule.class)
 public class WindowStatusModule {
 
-    @Qualifier
-    public @interface WindowStatusDomain {
-    };
     /** The plugin's plugin info. */
     private final PluginInfo pluginInfo;
 
@@ -52,7 +48,7 @@ public class WindowStatusModule {
      * @return The settings domain for the plugin.
      */
     @Provides
-    @WindowStatusDomain
+    @PluginDomain(WindowStatusPlugin.class)
     public String getSettingsDomain() {
         return pluginInfo.getDomain();
     }