DI Conditional execute plugin.

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

src/com/dmdirc/addons/calc/CalcModule.java

@@ -22,14 +22,14 @@
 
 package com.dmdirc.addons.calc;
 
-import com.dmdirc.addons.ui_swing.injection.SwingModule;
+import com.dmdirc.ClientModule;
 
 import dagger.Module;
 
 /**
  * DI Module for the calc plugin.
  */
-@Module(injects={CalcCommand.class}, addsTo = SwingModule.class)
+@Module(injects={CalcCommand.class}, addsTo = ClientModule.class)
 public class CalcModule {
 
 }

src/com/dmdirc/addons/conditional_execute/ConditionalExecuteCommand.java

@@ -34,6 +34,8 @@ import com.dmdirc.interfaces.CommandController;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.inject.Inject;
+
 /**
  * The ConditionalExecute command allows the user to conditionally execute a
  * command based on external and pre-determined conditions.
@@ -52,6 +54,7 @@ public class ConditionalExecuteCommand extends Command {
      *
      * @param controller The controller to use for command information.
      */
+    @Inject
     public ConditionalExecuteCommand(final CommandController controller) {
         super(controller);
     }

src/com/dmdirc/addons/conditional_execute/ConditionalExecuteModule.java

@@ -0,0 +1,35 @@
+/*
+ * 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.conditional_execute;
+
+import com.dmdirc.ClientModule;
+
+import dagger.Module;
+
+/**
+ * DI for the conditional execute plugin.
+ */
+@Module(injects={ConditionalExecuteCommand.class}, addsTo = ClientModule.class)
+public class ConditionalExecuteModule {
+
+}

src/com/dmdirc/addons/conditional_execute/ConditionalExecutePlugin.java

@@ -22,22 +22,21 @@
 
 package com.dmdirc.addons.conditional_execute;
 
-import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
+import dagger.ObjectGraph;
+
 /**
  * The ConditionalExecute plugin allows the user to run commands only if
  * external conditions have been met.
  */
 public final class ConditionalExecutePlugin extends BaseCommandPlugin {
 
-    /**
-     * Creates a new instance of this plugin.
-     *
-     * @param commandController Command controller to register commands
-     */
-    public ConditionalExecutePlugin(final CommandController commandController) {
-        super(commandController);
-        registerCommand(new ConditionalExecuteCommand(commandController), ConditionalExecuteCommand.INFO);
+    @Override
+    public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
+        super.load(pluginInfo, graph);
+        setObjectGraph(graph.plus(new ConditionalExecuteModule()));
+        registerCommand(ConditionalExecuteCommand.class, ConditionalExecuteCommand.INFO);
     }
 }