Merge pull request #361 from greboid/dev4

Some more work on the channel who plugin.

channelwho/src/com/dmdirc/addons/channelwho/ChannelWhoManager.java

@@ -27,7 +27,9 @@ import com.dmdirc.events.ServerConnectingEvent;
 import com.dmdirc.events.ServerDisconnectedEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.ConnectionManager;
-import com.dmdirc.plugins.PluginDomain;
+
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.inject.Inject;
 
@@ -38,16 +40,20 @@ import net.engio.mbassy.listener.Handler;
  */
 public class ChannelWhoManager {
 
+    private final ConnectionHandlerFactory connectionHandlerFactory;
     private final ConnectionManager connectionManager;
     private final DMDircMBassador eventBus;
+    private final Map<Connection, ConnectionHandler> connectionHandlers;
 
     @Inject
     public ChannelWhoManager(
-            @PluginDomain(ChannelWhoPlugin.class) final String domain,
+            final ConnectionHandlerFactory connectionHandlerFactory,
             final ConnectionManager connectionManager,
             final DMDircMBassador eventBus) {
+        this.connectionHandlerFactory = connectionHandlerFactory;
         this.connectionManager = connectionManager;
         this.eventBus = eventBus;
+        connectionHandlers = new HashMap<>();
     }
 
     public void load() {
@@ -61,11 +67,14 @@ public class ChannelWhoManager {
     }
 
     private void addConnectionHandler(final Connection connection) {
-        // TODO: Create a handler class which will monitor settings + handle timers.
+        connectionHandlers.computeIfAbsent(connection, connectionHandlerFactory::get);
     }
 
     private void removeConnectionHandler(final Connection connection) {
-        // TODO: Remove handlers
+        final ConnectionHandler connectionHandler = connectionHandlers.remove(connection);
+        if (connectionHandler != null) {
+            connectionHandler.unload();
+        }
     }
 
     @Handler

channelwho/src/com/dmdirc/addons/channelwho/ConnectionHandler.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2006-2015 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.channelwho;
+
+import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.GroupChat;
+
+/**
+ * Responsible for managing timers and settings required to who any {@link GroupChat}s on a
+ * {@link Connection} as specified by the user.
+ */
+public class ConnectionHandler {
+
+    private final Connection connection;
+    private final String domain;
+
+    public ConnectionHandler(final Connection connection, final String domain) {
+        this.connection = connection;
+        this.domain = domain;
+    }
+
+    public void load() {
+        connection.getWindowModel().getEventBus().subscribe(this);
+    }
+
+    public void unload() {
+        connection.getWindowModel().getEventBus().unsubscribe(this);
+    }
+}

channelwho/src/com/dmdirc/addons/channelwho/ConnectionHandlerFactory.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2006-2015 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.channelwho;
+
+import com.dmdirc.interfaces.Connection;
+import com.dmdirc.plugins.PluginDomain;
+
+import javax.inject.Inject;
+
+/**
+ * Factory for creating {@link ConnectionHandler}s.
+ */
+public class ConnectionHandlerFactory {
+
+    private final String domain;
+
+    @Inject
+    public ConnectionHandlerFactory(@PluginDomain(ChannelWhoPlugin.class) final String domain) {
+        this.domain = domain;
+    }
+
+    public ConnectionHandler get(final Connection connection) {
+        final ConnectionHandler handler = new ConnectionHandler(connection, domain);
+        handler.load();
+        return handler;
+    }
+}

channelwho/test/com/dmdirc/addons/channelwho/ChannelWhoManagerTest.java

@@ -34,6 +34,7 @@ import org.mockito.runners.MockitoJUnitRunner;
 @RunWith(MockitoJUnitRunner.class)
 public class ChannelWhoManagerTest {
 
+    @Mock private ConnectionHandlerFactory connectionHandlerFactory;
     @Mock private ConnectionManager connectionManager;
     @Mock private DMDircMBassador eventBus;
 
@@ -41,7 +42,7 @@ public class ChannelWhoManagerTest {
 
     @Before
     public void setUp() throws Exception {
-        instance = new ChannelWhoManager("test", connectionManager, eventBus);
+        instance = new ChannelWhoManager(connectionHandlerFactory, connectionManager, eventBus);
     }
 
     @Test