DI the DNS Plugin (and fix DCOP)

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

src/com/dmdirc/addons/dcop/DcopCommand.java

@@ -33,6 +33,8 @@ import com.dmdirc.interfaces.CommandController;
 
 import java.util.List;
 
+import javax.inject.Inject;
+
 /**
  * The dcop command retrieves information from a dcop application.
  */
@@ -48,6 +50,7 @@ public class DcopCommand extends Command {
      *
      * @param controller The controller to use for command information.
      */
+    @Inject
     public DcopCommand(final CommandController controller) {
         super(controller);
     }

src/com/dmdirc/addons/dns/DNSCommand.java

@@ -34,6 +34,8 @@ import com.dmdirc.interfaces.CommandController;
 import java.util.Timer;
 import java.util.TimerTask;
 
+import javax.inject.Inject;
+
 /**
  * Performs DNS lookups for nicknames, hostnames or IPs.
  */
@@ -49,6 +51,7 @@ public class DNSCommand extends Command {
      *
      * @param controller The controller to use for command information.
      */
+    @Inject
     public DNSCommand(final CommandController controller) {
         super(controller);
     }

src/com/dmdirc/addons/dns/DNSModule.java

@@ -0,0 +1,32 @@
+/*
+ * 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.dns;
+
+import com.dmdirc.ClientModule;
+
+import dagger.Module;
+
+@Module(injects = DNSCommand.class, addsTo = ClientModule.class)
+public class DNSModule {
+
+}

src/com/dmdirc/addons/dns/DNSPlugin.java

@@ -22,28 +22,28 @@
 
 package com.dmdirc.addons.dns;
 
-import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.addons.debug.DebugModule;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import dagger.ObjectGraph;
+
 /**
  * DNS plugin.
  */
 public final class DNSPlugin extends BaseCommandPlugin {
 
-    /**
-     * Creates a new instance of this plugin.
-     *
-     * @param commandController Command controller to register commands
-     */
-    public DNSPlugin(final CommandController commandController) {
-        super(commandController);
-        registerCommand(new DNSCommand(commandController), DNSCommand.INFO);
+    @Override
+    public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
+        super.load(pluginInfo, graph);
+
+        setObjectGraph(graph.plus(new DebugModule()));
+        registerCommand(DNSCommand.class, DNSCommand.INFO);
     }
 
     /**