Rename node listener manager.

[jSite2.git] / src / net / pterodactylus / jsite / core / NodeManager.java

diff --git a/src/net/pterodactylus/jsite/core/NodeManager.java b/src/net/pterodactylus/jsite/core/NodeManager.java
index 8745cba..7fd4cc9 100644 (file)
--- a/src/net/pterodactylus/jsite/core/NodeManager.java
+++ b/src/net/pterodactylus/jsite/core/NodeManager.java
@@ -27,6 +27,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -39,6 +40,8 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.pterodactylus.fcp.highlevel.FcpClient;
+import net.pterodactylus.fcp.highlevel.FcpException;
 import net.pterodactylus.jsite.util.IdGenerator;
 import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.logging.Logging;
@@ -64,7 +67,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener {
        private final Object syncObject = new Object();
 
        /** Node listener support. */
-       private final NodeListenerSupport nodeListenerSupport = new NodeListenerSupport();
+       private final NodeListenerSupport nodeListenerManager = new NodeListenerSupport();
 
        /** All nodes. */
        private final List<Node> nodes = Collections.synchronizedList(new ArrayList<Node>());
@@ -72,6 +75,9 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener {
        /** Map from node ID to node. */
        private final Map<String, Node> idNodes = Collections.synchronizedMap(new HashMap<String, Node>());
 
+       /** Map from node to client. */
+       private final Map<Node, FcpClient> nodeClients = Collections.synchronizedMap(new HashMap<Node, FcpClient>());
+
        /** Collection of currently connected nodes. */
        private final Set<Node> connectedNodes = Collections.synchronizedSet(new HashSet<Node>());
 
@@ -99,7 +105,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener {
         *            The listener to add
         */
        public void addNodeListener(NodeListener nodeListener) {
-               nodeListenerSupport.addListener(nodeListener);
+               nodeListenerManager.addListener(nodeListener);
        }
 
        /**
@@ -109,7 +115,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener {
         *            The listener to remove
         */
        public void removeNodeListener(NodeListener nodeListener) {
-               nodeListenerSupport.removeListener(nodeListener);
+               nodeListenerManager.removeListener(nodeListener);
        }
 
        //
@@ -279,7 +285,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener {
                node.addPropertyChangeListener(this);
                nodes.add(node);
                idNodes.put(node.getId(), node);
-               nodeListenerSupport.fireNodeAdded(node);
+               nodeListenerManager.fireNodeAdded(node);
                return true;
        }
 
@@ -299,7 +305,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener {
                        nodes.remove(node);
                        idNodes.remove(node.getId());
                        node.removePropertyChangeListener(this);
-                       nodeListenerSupport.fireNodeRemoved(node);
+                       nodeListenerManager.fireNodeRemoved(node);
                }
        }
 
@@ -311,6 +317,22 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener {
         */
        public void connect(Node node) {
                logger.log(Level.FINEST, "connect(node=" + node + ")");
+               if (!nodes.contains(node)) {
+                       logger.log(Level.WARNING, "Was told to connect to node (" + node + ") I don’t know about!");
+                       return;
+               }
+               try {
+                       FcpClient fcpClient = new FcpClient(clientName, node.getHostname(), node.getPort());
+                       fcpClient.connect();
+                       nodeClients.put(node, fcpClient);
+                       nodeListenerManager.fireNodeConnected(node);
+               } catch (UnknownHostException uhe1) {
+                       nodeListenerManager.fireNodeConnectionFailed(node, uhe1);
+               } catch (IOException ioe1) {
+                       nodeListenerManager.fireNodeConnectionFailed(node, ioe1);
+               } catch (FcpException fe1) {
+                       nodeListenerManager.fireNodeConnectionFailed(node, fe1);
+               }
        }
 
        /**
@@ -321,6 +343,17 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener {
         */
        public void disconnect(Node node) {
                logger.log(Level.FINEST, "disconnect(node=" + node + ")");
+               if (!nodes.contains(node)) {
+                       logger.log(Level.WARNING, "Was told to disconnect from a node (" + node + ") I don’t know about!");
+                       return;
+               }
+               FcpClient fcpClient = nodeClients.get(node);
+               if (fcpClient == null) {
+                       logger.log(Level.WARNING, "No FCP client for node (" + node + ")!");
+                       return;
+               }
+               fcpClient.disconnect();
+               nodeListenerManager.fireNodeDisconnected(node, null);
        }
 
        /**