Daggerify the active window plugin.

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

src/com/dmdirc/addons/activewindow/ActiveCommand.java

@@ -36,6 +36,8 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 
+import javax.inject.Inject;
+
 /**
  * Executes another command as if it were executed in the active window.
  */
@@ -55,6 +57,7 @@ public class ActiveCommand extends Command implements IntelligentCommand {
      * @param controller The controller to use for command information.
      * @param mainFrame Parent MainFrame
      */
+    @Inject
     public ActiveCommand(final CommandController controller, final MainFrame mainFrame) {
         super(controller);
 

src/com/dmdirc/addons/activewindow/ActiveWindowManager.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2006-2013 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.activewindow;
+
+import com.dmdirc.messages.MessageSinkManager;
+
+import javax.inject.Inject;
+
+/**
+ * Manages the active window sink.
+ */
+public class ActiveWindowManager {
+
+    /** The message sink to register and unregister. */
+    private final ActiveWindowMessageSink sink;
+
+    /** The manager to add and remove the sink from. */
+    private final MessageSinkManager sinkManager;
+
+    /**
+     * Creates a new instance of {@link ActiveWindowManager}.
+     *
+     * @param sinkManager The manager to add and remove sinks from.
+     * @param sink The sink to be added and removed.
+     */
+    @Inject
+    public ActiveWindowManager(
+            final MessageSinkManager sinkManager,
+            final ActiveWindowMessageSink sink) {
+        this.sink = sink;
+        this.sinkManager = sinkManager;
+    }
+
+    /**
+     * Registers the sink with the manager.
+     */
+    public void register() {
+        sinkManager.addSink(sink);
+    }
+
+    /**
+     * Unregisters the sink from the manager.
+     */
+    public void unregister() {
+        sinkManager.removeSink(sink);
+    }
+
+}

src/com/dmdirc/addons/activewindow/ActiveWindowMessageSink.java

@@ -31,6 +31,8 @@ import com.dmdirc.messages.MessageSinkManager;
 import java.util.Date;
 import java.util.regex.Pattern;
 
+import javax.inject.Inject;
+
 /**
  * A message sink which passes messages onto the active swing window.
  */
@@ -47,6 +49,7 @@ public class ActiveWindowMessageSink implements MessageSink {
      *
      * @param mainFrame The mainframe to use to retrieve active windows
      */
+    @Inject
     public ActiveWindowMessageSink(final MainFrame mainFrame) {
         this.mainFrame = mainFrame;
     }

src/com/dmdirc/addons/activewindow/ActiveWindowModule.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2006-2013 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.activewindow;
+
+import com.dmdirc.addons.ui_swing.SwingModule;
+
+import dagger.Module;
+
+/**
+ * DI module for the active window plugin.
+ */
+@Module(injects={ActiveWindowManager.class, ActiveCommand.class}, addsTo = SwingModule.class)
+public class ActiveWindowModule {
+
+}

src/com/dmdirc/addons/activewindow/ActiveWindowPlugin.java

@@ -22,54 +22,40 @@
 
 package com.dmdirc.addons.activewindow;
 
-import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.messages.MessageSinkManager;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 
+import dagger.ObjectGraph;
+
 /** Plugin to provide an active window command to the Swing UI. */
 public class ActiveWindowPlugin extends BaseCommandPlugin {
 
-    /** The message sink to register and unregister. */
-    private final ActiveWindowMessageSink sink;
-
-    /** The manager to add and remove the sink from. */
-    private final MessageSinkManager sinkManager;
+    /** Manager to use for the active window sink. */
+    private ActiveWindowManager activeWindowManager;
 
-    /**
-     * Creates a new instance of this plugin.
-     *
-     * @param controller The controller to use to find active windows
-     * @param commandController Command controller to register commands
-     * @param sinkManager The manager to add sinks to
-     */
-    public ActiveWindowPlugin(
-            final SwingController controller,
-            final CommandController commandController,
-            final MessageSinkManager sinkManager) {
-        super(commandController);
-
-        this.sinkManager = sinkManager;
+    /** {@inheritDoc} */
+    @Override
+    public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
+        super.load(pluginInfo, graph);
 
-        sink = new ActiveWindowMessageSink(controller.getMainFrame());
+        setObjectGraph(graph.plus(new ActiveWindowModule()));
+        registerCommand(ActiveCommand.class, ActiveCommand.INFO);
 
-        registerCommand(new ActiveCommand(commandController, controller.getMainFrame()),
-                ActiveCommand.INFO);
+        activeWindowManager = getObjectGraph().get(ActiveWindowManager.class);
     }
 
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
         super.onLoad();
-
-        sinkManager.addSink(sink);
+        activeWindowManager.register();
     }
 
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
         super.onUnload();
-
-        sinkManager.removeSink(sink);
+        activeWindowManager.unregister();
     }
+
 }