X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fcore%2FNodeManager.java;h=9cdc60d55a57ad593d0406d4d9abc4eaf21275c3;hb=f8ec8ae7e1c3b69ddac1cc58201803e052bd720e;hp=f032570c02a97cb9306f09405365c42ebb1cd06a;hpb=c63257e8cc0ba1a5aca9364b22171abe7279d479;p=jSite2.git diff --git a/src/net/pterodactylus/jsite/core/NodeManager.java b/src/net/pterodactylus/jsite/core/NodeManager.java index f032570..9cdc60d 100644 --- a/src/net/pterodactylus/jsite/core/NodeManager.java +++ b/src/net/pterodactylus/jsite/core/NodeManager.java @@ -66,20 +66,23 @@ public class NodeManager implements Iterable, PropertyChangeListener, High /** Object used for synchronization. */ private final Object syncObject = new Object(); - /** Node listeners. */ - private List nodeListeners = Collections.synchronizedList(new ArrayList()); + /** Node listener support. */ + private final NodeListenerSupport nodeListenerSupport = new NodeListenerSupport(); /** All nodes. */ - private List nodes = Collections.synchronizedList(new ArrayList()); + private final List nodes = Collections.synchronizedList(new ArrayList()); /** Map from node ID to node. */ - private Map idNodes = Collections.synchronizedMap(new HashMap()); + private final Map idNodes = Collections.synchronizedMap(new HashMap()); /** All FCP connections. */ - private Map nodeClients = Collections.synchronizedMap(new HashMap()); + private final Map nodeClients = Collections.synchronizedMap(new HashMap()); /** Maps nodes to high-level clients. */ - private Map clientNodes = Collections.synchronizedMap(new HashMap()); + private final Map clientNodes = Collections.synchronizedMap(new HashMap()); + + /** Collection of currently connected nodes. */ + private final Set connectedNodes = Collections.synchronizedSet(new HashSet()); /** * Creates a new FCP collector. @@ -105,7 +108,7 @@ public class NodeManager implements Iterable, PropertyChangeListener, High * The listener to add */ public void addNodeListener(NodeListener nodeListener) { - nodeListeners.add(nodeListener); + nodeListenerSupport.addListener(nodeListener); } /** @@ -115,77 +118,7 @@ public class NodeManager implements Iterable, PropertyChangeListener, High * The listener to remove */ public void removeNodeListener(NodeListener nodeListener) { - nodeListeners.remove(nodeListener); - } - - /** - * Notifies all listeners that a node was added. - * - * @param node - * The node that was added. - */ - private void fireNodeAdded(Node node) { - logger.log(Level.FINEST, "firing nodeAdded event with [node=" + node + "]"); - for (NodeListener nodeListener : nodeListeners) { - nodeListener.nodeAdded(node); - } - } - - /** - * Notifies all listeners that a node was removed. - * - * @param node - * The node that was removed - */ - private void fireNodeRemoved(Node node) { - logger.log(Level.FINEST, "firing nodeRemoved event with [node=" + node + "]"); - for (NodeListener nodeListener : nodeListeners) { - nodeListener.nodeRemoved(node); - } - } - - /** - * Notifies all listeners that the given node was connected. - * - * @param node - * The node that is now connected - */ - private void fireNodeConnected(Node node) { - logger.log(Level.FINEST, "firing nodeConnected event with [node=" + node + "]"); - for (NodeListener nodeListener : nodeListeners) { - nodeListener.nodeConnected(node); - } - } - - /** - * Notifies all listeners that a connection to a node has failed. - * - * @param node - * The node that could not be connected - * @param cause - * The cause of the failure - */ - private void fireNodeConnectionFailed(Node node, Throwable cause) { - logger.log(Level.FINEST, "firing nodeConnectionFailed event with [node=" + node + ",cause=" + cause + "]"); - for (NodeListener nodeListener : nodeListeners) { - nodeListener.nodeConnectionFailed(node, cause); - } - } - - /** - * Notifies all listeners that the given node was disconnected. - * - * @param node - * The node that is now disconnected - * @param throwable - * The exception that caused the disconnect, or null - * if there was no exception - */ - private void fireNodeDisconnected(Node node, Throwable throwable) { - logger.log(Level.FINEST, "firing nodeDisconnected event with [node=" + node + ",throwable=" + throwable + "]"); - for (NodeListener nodeListener : nodeListeners) { - nodeListener.nodeDisconnected(node, throwable); - } + nodeListenerSupport.removeListener(nodeListener); } // @@ -331,8 +264,8 @@ public class NodeManager implements Iterable, PropertyChangeListener, High * @see #connect(Node) * @param node * The node to connect to - * @return true if the node was added, false - * if the node was not added because it was already known + * @return true if the node was added, false if + * the node was not added because it was already known */ public boolean addNode(Node node) { logger.log(Level.FINEST, "addNode(node=" + node + ")"); @@ -347,7 +280,7 @@ public class NodeManager implements Iterable, PropertyChangeListener, High clientNodes.put(highLevelClient, node); nodeClients.put(node, highLevelClient); highLevelClient.addHighLevelClientListener(this); - fireNodeAdded(node); + nodeListenerSupport.fireNodeAdded(node); return true; } @@ -370,7 +303,7 @@ public class NodeManager implements Iterable, PropertyChangeListener, High nodes.remove(node); idNodes.remove(node.getId()); node.removePropertyChangeListener(this); - fireNodeRemoved(node); + nodeListenerSupport.fireNodeRemoved(node); } } @@ -391,9 +324,9 @@ public class NodeManager implements Iterable, PropertyChangeListener, High try { highLevelClient.connect(node.getHostname(), node.getPort()); } catch (UnknownHostException uhe1) { - fireNodeConnectionFailed(node, uhe1); + nodeListenerSupport.fireNodeConnectionFailed(node, uhe1); } catch (IOException ioe1) { - fireNodeConnectionFailed(node, ioe1); + nodeListenerSupport.fireNodeConnectionFailed(node, ioe1); } } @@ -452,8 +385,8 @@ public class NodeManager implements Iterable, PropertyChangeListener, High * * @param id * The ID of the node - * @return The node with the given ID, or null if no such - * node was found + * @return The node with the given ID, or null if no such node + * was found */ Node getNode(String id) { return idNodes.get(id); @@ -505,7 +438,7 @@ public class NodeManager implements Iterable, PropertyChangeListener, High logger.log(Level.WARNING, "got event for unknown client"); return; } - fireNodeConnected(node); + nodeListenerSupport.fireNodeConnected(node); } /** @@ -519,7 +452,7 @@ public class NodeManager implements Iterable, PropertyChangeListener, High logger.log(Level.WARNING, "got event for unknown client"); return; } - fireNodeDisconnected(node, throwable); + nodeListenerSupport.fireNodeDisconnected(node, throwable); } } @@ -546,9 +479,9 @@ public class NodeManager implements Iterable, PropertyChangeListener, High try { highLevelClient.connect(node.getHostname(), node.getPort()); } catch (UnknownHostException uhe1) { - fireNodeConnectionFailed(node, uhe1); + nodeListenerSupport.fireNodeConnectionFailed(node, uhe1); } catch (IOException ioe1) { - fireNodeConnectionFailed(node, ioe1); + nodeListenerSupport.fireNodeConnectionFailed(node, ioe1); } } }