DI the session lock plugin.

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

src/com/dmdirc/addons/sessionlock/SessionLock.java

@@ -22,72 +22,36 @@
 
 package com.dmdirc.addons.sessionlock;
 
-import com.dmdirc.actions.ActionManager;
+import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BasePlugin;
 
-import com.greboid.lock.LockAdapter;
-import com.greboid.lock.LockListener;
+import dagger.ObjectGraph;
 
 /**
  * Plugin that detects Session lock/unlock events.
  */
-public class SessionLock extends BasePlugin implements LockListener {
+public class SessionLock extends BasePlugin {
 
-    /**
-     * Have we registered our actions?
-     */
-    private static boolean registered;
-    /**
-     * Lock Adapter to detect session events.
-     */
-    private LockAdapter lockAdapter;
-    /**
-     * Action manager.
-     */
-    private final ActionManager actionManager;
+    /** Handles session lock events and registers action types. */
+    private SessionLockManager manager;
 
-    /**
-     * Creates a new session lock plugin.
-     *
-     * @param actionManager Action manager
-     */
-    public SessionLock(final ActionManager actionManager) {
-        this.actionManager = actionManager;
+    @Override
+    public void load(final PluginInfo pluginInfo, final ObjectGraph graph) {
+        super.load(pluginInfo, graph);
+        setObjectGraph(graph.plus(new SessionLockModule()));
+        manager = getObjectGraph().get(SessionLockManager.class);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onLoad() {
         super.onLoad();
-
-        if (!registered) {
-            actionManager.registerTypes(SessionLockActionType.values());
-            registered = true;
-        }
-
-        lockAdapter = new LockAdapter();
-        lockAdapter.addLockListener(this);
+        manager.load();
     }
 
-    /** {@inheritDoc} */
     @Override
     public void onUnload() {
         super.onUnload();
-
-        lockAdapter.removeLockListener(this);
-        lockAdapter = null;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void locked() {
-        actionManager.triggerEvent(SessionLockActionType.SESSION_LOCK, null);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void unlocked() {
-        actionManager.triggerEvent(SessionLockActionType.SESSION_UNLOCK, null);
+        manager.unload();
     }
 
 }

src/com/dmdirc/addons/sessionlock/SessionLockManager.java

@@ -0,0 +1,77 @@
+/*
+ * 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.sessionlock;
+
+import com.dmdirc.actions.ActionManager;
+
+import javax.inject.Inject;
+
+import com.greboid.lock.LockAdapter;
+import com.greboid.lock.LockListener;
+
+public class SessionLockManager implements LockListener {
+
+    /** Action manager. */
+    private final ActionManager actionManager;
+    /** Have we registered our actions? */
+    private static boolean registered;
+    /** Lock Adapter to detect session events. */
+    private LockAdapter lockAdapter;
+
+    @Inject
+    public SessionLockManager(final ActionManager actionManager) {
+        this.actionManager = actionManager;
+    }
+
+    /**
+     * Loads the manager, registering action types and the lock adapter.
+     */
+    public void load() {
+        if (!registered) {
+            actionManager.registerTypes(SessionLockActionType.values());
+            registered = true;
+        }
+
+        lockAdapter = new LockAdapter();
+        lockAdapter.addLockListener(this);
+    }
+
+    /**
+     * Unloads the plugin, removing lock adapter, action types remain.
+     */
+    public void unload() {
+        lockAdapter.removeLockListener(this);
+        lockAdapter = null;
+    }
+
+    @Override
+    public void locked() {
+        actionManager.triggerEvent(SessionLockActionType.SESSION_LOCK, null);
+    }
+
+    @Override
+    public void unlocked() {
+        actionManager.triggerEvent(SessionLockActionType.SESSION_UNLOCK, null);
+    }
+
+}

src/com/dmdirc/addons/sessionlock/SessionLockModule.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.sessionlock;
+
+import com.dmdirc.ClientModule;
+
+import dagger.Module;
+
+@Module(injects = SessionLockManager.class, addsTo = ClientModule.class)
+public class SessionLockModule {
+
+}