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 74221d4..7fd4cc9 100644 (file)
--- a/src/net/pterodactylus/jsite/core/NodeManager.java
+++ b/src/net/pterodactylus/jsite/core/NodeManager.java
@@ -67,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>());
@@ -105,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);
        }
 
        /**
@@ -115,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);
        }
 
        //
@@ -285,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;
        }
 
@@ -305,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);
                }
        }
 
@@ -325,13 +325,13 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener {
                        FcpClient fcpClient = new FcpClient(clientName, node.getHostname(), node.getPort());
                        fcpClient.connect();
                        nodeClients.put(node, fcpClient);
-                       nodeListenerSupport.fireNodeConnected(node);
+                       nodeListenerManager.fireNodeConnected(node);
                } catch (UnknownHostException uhe1) {
-                       nodeListenerSupport.fireNodeConnectionFailed(node, uhe1);
+                       nodeListenerManager.fireNodeConnectionFailed(node, uhe1);
                } catch (IOException ioe1) {
-                       nodeListenerSupport.fireNodeConnectionFailed(node, ioe1);
+                       nodeListenerManager.fireNodeConnectionFailed(node, ioe1);
                } catch (FcpException fe1) {
-                       nodeListenerSupport.fireNodeConnectionFailed(node, fe1);
+                       nodeListenerManager.fireNodeConnectionFailed(node, fe1);
                }
        }
 
@@ -343,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);
        }
 
        /**