Use @PluginDomain everywhere else.

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

src/com/dmdirc/addons/lagdisplay/LagDisplayManager.java

@@ -27,7 +27,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.ServerState;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.addons.lagdisplay.LagDisplayModule.LagDisplaySettingsDomain;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
@@ -37,6 +36,7 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.util.collections.RollingList;
 
 import java.util.Date;
@@ -82,7 +82,7 @@ public class LagDisplayManager implements ActionListener, ConfigChangeListener,
             final MainFrame mainFrame,
             final SwingStatusBar statusBar,
             final Provider<LagDisplayPanel> panelProvider,
-            @LagDisplaySettingsDomain final String domain,
+            @PluginDomain(LagDisplayPlugin.class) final String domain,
             @GlobalConfig final AggregateConfigProvider globalConfig) {
         this.mainFrame = mainFrame;
         this.statusBar = statusBar;

src/com/dmdirc/addons/lagdisplay/LagDisplayModule.java

@@ -23,8 +23,7 @@
 package com.dmdirc.addons.lagdisplay;
 
 import com.dmdirc.addons.ui_swing.injection.SwingModule;
-
-import javax.inject.Qualifier;
+import com.dmdirc.plugins.PluginDomain;
 
 import dagger.Module;
 import dagger.Provides;
@@ -38,16 +37,12 @@ public class LagDisplayModule {
     /** The domain for plugin settings. */
     private final String domain;
 
-    @Qualifier
-    public static @interface LagDisplaySettingsDomain {
-    }
-
     public LagDisplayModule(final String domain) {
         this.domain = domain;
     }
 
     @Provides
-    @LagDisplaySettingsDomain
+    @PluginDomain(LagDisplayPlugin.class)
     public String getDomain() {
         return domain;
     }

src/com/dmdirc/addons/logging/LoggingManager.java

@@ -27,7 +27,6 @@ import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.addons.logging.LoggingModule.LoggingDomain;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
@@ -41,6 +40,7 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.URLBuilder;
@@ -114,7 +114,7 @@ public class LoggingManager implements ActionListener, ConfigChangeListener {
 
     @Inject
     public LoggingManager(
-            @LoggingDomain final String domain,
+            @PluginDomain(LoggingPlugin.class) final String domain,
             final ActionController actionController,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final WindowManager windowManager,

src/com/dmdirc/addons/logging/LoggingModule.java

@@ -29,11 +29,10 @@ import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.plugins.PluginDomain;
 
 import java.io.File;
 
-import javax.inject.Qualifier;
-
 import dagger.Module;
 import dagger.Provides;
 
@@ -43,10 +42,6 @@ import dagger.Provides;
 @Module(addsTo = ClientModule.class, injects = {LoggingManager.class, LoggingCommand.class})
 public class LoggingModule {
 
-    @Qualifier
-    public @interface LoggingDomain {
-    }
-
     public static final String LOGS_DIRECTORY = "logs";
 
     private final String domain;
@@ -56,7 +51,7 @@ public class LoggingModule {
     }
 
     @Provides
-    @LoggingDomain
+    @PluginDomain(LoggingPlugin.class)
     public String getDomain() {
         return domain;
     }
@@ -67,7 +62,7 @@ public class LoggingModule {
             @UserConfig final ConfigProvider userConfig,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             @Directory(DirectoryType.BASE) final String baseDirectory,
-            @LoggingDomain final String domain) {
+            @PluginDomain(LoggingPlugin.class) final String domain) {
         if (!userConfig.hasOptionString(domain, "general.directory")) {
             userConfig.setOption(domain, "general.directory",
                     baseDirectory + "logs" + File.separator);

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

@@ -36,6 +36,7 @@ import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.messages.ColourManager;
 
@@ -69,7 +70,7 @@ public class NickColourManager implements ActionListener, ConfigChangeListener {
 
     @Inject
     public NickColourManager(final ColourManager colourManager,
-            @NickColourModule.NickColourSettingsDomain final String domain,
+            @PluginDomain(NickColourPlugin.class) final String domain,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             @UserConfig final ConfigProvider userConfig) {
         this.domain = domain;

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

@@ -23,8 +23,7 @@
 package com.dmdirc.addons.nickcolours;
 
 import com.dmdirc.addons.ui_swing.injection.SwingModule;
-
-import javax.inject.Qualifier;
+import com.dmdirc.plugins.PluginDomain;
 
 import dagger.Module;
 import dagger.Provides;
@@ -38,10 +37,6 @@ public class NickColourModule {
     /** The domain for plugin settings. */
     private final String domain;
 
-    @Qualifier
-    public static @interface NickColourSettingsDomain {
-    }
-
     public NickColourModule(final String domain) {
         this.domain = domain;
     }
@@ -52,7 +47,7 @@ public class NickColourModule {
      * @return The settings domain for the swing plugin.
      */
     @Provides
-    @NickColourSettingsDomain
+    @PluginDomain(NickColourPlugin.class)
     public String getSettingsDomain() {
         return domain;
     }