DI the OS X integration plugin.

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

src/com/dmdirc/addons/osx_integration/DockBounceCommand.java

@@ -31,6 +31,8 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 
+import javax.inject.Inject;
+
 /**
  * A command to bounce the icon in the OSX dock.
  */
@@ -54,6 +56,7 @@ public class DockBounceCommand extends Command {
      * @param controller The controller to use for command information.
      * @param apple      The UI wrapper for Apple-specific things
      */
+    @Inject
     public DockBounceCommand(final CommandController controller, final Apple apple) {
         super(controller);
         this.apple = apple;

src/com/dmdirc/addons/osx_integration/OsxIntegrationModule.java

@@ -0,0 +1,40 @@
+/*
+ * 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.osx_integration;
+
+import com.dmdirc.addons.ui_swing.Apple;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.injection.SwingModule;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module(injects = DockBounceCommand.class, addsTo = SwingModule.class)
+public class OsxIntegrationModule {
+
+    @Provides
+    public Apple getApple(final SwingController controller) {
+        return controller.getApple();
+    }
+
+}

src/com/dmdirc/addons/osx_integration/OsxIntegrationPlugin.java

@@ -22,26 +22,21 @@
 
 package com.dmdirc.addons.osx_integration;
 
-import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
+import dagger.ObjectGraph;
+
 /**
  * A plugin which provides extra commands that integrate with the OS X environment.
  */
 public class OsxIntegrationPlugin extends BaseCommandPlugin {
 
-    /**
-     * Creates an instance of {@link OsxIntegrationPlugin}.
-     *
-     * @param controller        The Swing UI which runs on the OS X environment
-     * @param commandController Command controller to register commands
-     */
-    public OsxIntegrationPlugin(final SwingController controller,
-            final CommandController commandController) {
-        super(commandController);
-        registerCommand(new DockBounceCommand(commandController, controller.getApple()),
-                DockBounceCommand.INFO);
+    @Override
+    public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
+        super.load(pluginInfo, graph);
+        setObjectGraph(graph.plus(new OsxIntegrationModule()));
+        registerCommand(DockBounceCommand.class, DockBounceCommand.INFO);
     }
 
 }