DI the NMA plugin.

Change-Id: If70b7f3232c5cb29887b6e9c75d02e7eb0e4ec4b
Reviewed-on: http://gerrit.dmdirc.com/3199
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

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

@@ -29,9 +29,12 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.plugins.PluginDomain;
 
 import java.io.IOException;
 
+import javax.inject.Inject;
+
 import org.slf4j.LoggerFactory;
 
 /**
@@ -48,18 +51,18 @@ public class NotifyMyAndroidCommand extends Command {
             + " - Sends notification to NotifyMyAndroid",
             CommandType.TYPE_GLOBAL);
     /** The configuration domain to retrieve settings from. */
-    private String configDomain;
+    private final String configDomain;
 
     /**
      * Creates a new instance of this command.
      *
      * @param controller The controller to use for command information.
+     * @param configDomain This plugin's settings domain
      */
-    public NotifyMyAndroidCommand(final CommandController controller) {
+    @Inject
+    public NotifyMyAndroidCommand(final CommandController controller,
+            @PluginDomain(NotifyMyAndroidPlugin.class) final String configDomain) {
         super(controller);
-    }
-
-    public void setConfigDomain(final String configDomain) {
         this.configDomain = configDomain;
     }
 

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

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2006-2014 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.ClientModule;
+import com.dmdirc.plugins.PluginDomain;
+import com.dmdirc.plugins.PluginInfo;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module(injects = NotifyMyAndroidCommand.class, addsTo = ClientModule.class)
+public class NotifyMyAndroidModule {
+
+    private final PluginInfo pluginInfo;
+
+    public NotifyMyAndroidModule(final PluginInfo pluginInfo) {
+        this.pluginInfo = pluginInfo;
+    }
+
+    @Provides
+    @PluginDomain(NotifyMyAndroidPlugin.class)
+    public String getSettingsDomain() {
+        return pluginInfo.getDomain();
+    }
+
+}

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

@@ -27,44 +27,34 @@ 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.CommandController;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
+import dagger.ObjectGraph;
+
 /**
  * Plugin to allow pushing notifications to NotifyMyAndroid.
  */
 public class NotifyMyAndroidPlugin extends BaseCommandPlugin {
 
-    /** The command to register. */
-    private final NotifyMyAndroidCommand command;
     /** Our info object. */
     private final PluginInfo pluginInfo;
 
     /**
      * Creates a new instance of the {@link NotifyMyAndroidPlugin}.
      *
-     * @param pluginInfo        The plugin info object for this plugin.
-     * @param commandController Command controller to register commands
+     * @param pluginInfo The plugin info object for this plugin.
      */
-    public NotifyMyAndroidPlugin(final PluginInfo pluginInfo,
-            final CommandController commandController) {
-        super(commandController);
-
-        command = new NotifyMyAndroidCommand(commandController);
-        registerCommand(command, NotifyMyAndroidCommand.INFO);
-
+    public NotifyMyAndroidPlugin(final PluginInfo pluginInfo) {
         this.pluginInfo = pluginInfo;
     }
 
-    /** {@inheritDoc} */
     @Override
-    public void setDomain(final String newDomain) {
-        super.setDomain(newDomain);
-        command.setConfigDomain(newDomain);
+    public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
+        super.load(pluginInfo, graph);
+        setObjectGraph(graph.plus(new NotifyMyAndroidModule(pluginInfo)));
     }
 
-    /** {@inheritDoc} */
     @Override
     public void showConfig(final PreferencesDialogModel manager) {
         final PreferencesCategory category = new PluginPreferencesCategory(