reformat

[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 079e367..56910ae 100644 (file)
--- a/src/net/pterodactylus/jsite/core/NodeManager.java
+++ b/src/net/pterodactylus/jsite/core/NodeManager.java
@@ -49,7 +49,6 @@ import net.pterodactylus.util.logging.Logging;
  * TODO
  * 
  * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
- * @version $Id$
  */
 public class NodeManager implements Iterable<Node>, PropertyChangeListener, HighLevelClientListener {
 
@@ -121,7 +120,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
         *            The node that was added.
         */
        private void fireNodeAdded(Node node) {
-               for (NodeListener nodeListener: nodeListeners) {
+               for (NodeListener nodeListener : nodeListeners) {
                        nodeListener.nodeAdded(node);
                }
        }
@@ -133,7 +132,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
         *            The node that was removed
         */
        private void fireNodeRemoved(Node node) {
-               for (NodeListener nodeListener: nodeListeners) {
+               for (NodeListener nodeListener : nodeListeners) {
                        nodeListener.nodeRemoved(node);
                }
        }
@@ -145,7 +144,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
         *            The node that is now connected
         */
        private void fireNodeConnected(Node node) {
-               for (NodeListener nodeListener: nodeListeners) {
+               for (NodeListener nodeListener : nodeListeners) {
                        nodeListener.nodeConnected(node);
                }
        }
@@ -159,7 +158,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
         *            The cause of the failure
         */
        private void fireNodeConnectionFailed(Node node, Throwable cause) {
-               for (NodeListener nodeListener: nodeListeners) {
+               for (NodeListener nodeListener : nodeListeners) {
                        nodeListener.nodeConnectionFailed(node, cause);
                }
        }
@@ -174,7 +173,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
         *            if there was no exception
         */
        private void fireNodeDisconnected(Node node, Throwable throwable) {
-               for (NodeListener nodeListener: nodeListeners) {
+               for (NodeListener nodeListener : nodeListeners) {
                        nodeListener.nodeDisconnected(node, throwable);
                }
        }
@@ -271,7 +270,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
                logger.fine("loaded " + loadedNodes.size() + " nodes from config");
                synchronized (syncObject) {
                        nodes.clear();
-                       for (Node node: loadedNodes) {
+                       for (Node node : loadedNodes) {
                                addNode(node);
                        }
                }
@@ -292,7 +291,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
                }
                Properties nodeProperties = new Properties();
                int nodeIndex = -1;
-               for (Node node: nodes) {
+               for (Node node : nodes) {
                        String nodePrefix = "nodes." + ++nodeIndex;
                        nodeProperties.setProperty(nodePrefix + ".name", node.getName());
                        nodeProperties.setProperty(nodePrefix + ".hostname", node.getHostname());
@@ -347,6 +346,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
                        if (nodeClients.containsKey(node)) {
                                disconnect(node);
                        }
+                       nodes.remove(node);
                        node.removePropertyChangeListener(this);
                        fireNodeRemoved(node);
                }