X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fcore%2FNode.java;h=3d35b4727189f31fd7ed94e06423880ea5725fba;hb=c63257e8cc0ba1a5aca9364b22171abe7279d479;hp=7751225fd167b75a48da6cdfaa8311ca8931c6e1;hpb=7f9181af9d0a8d419186b982060ec62f0f326493;p=jSite2.git

diff --git a/src/net/pterodactylus/jsite/core/Node.java b/src/net/pterodactylus/jsite/core/Node.java
index 7751225..3d35b47 100644
--- a/src/net/pterodactylus/jsite/core/Node.java
+++ b/src/net/pterodactylus/jsite/core/Node.java
@@ -19,23 +19,19 @@
 
 package net.pterodactylus.jsite.core;
 
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+
+import net.pterodactylus.jsite.util.IdGenerator;
+import net.pterodactylus.util.beans.AbstractBean;
+import net.pterodactylus.util.number.Hex;
 
 /**
  * Container for a Freenet node. A Node is capable of notifying
  * {@link PropertyChangeListener}s if any of the contained properties change.
- * 
+ *
  * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
- * @version $Id$
  */
-public class Node {
-
-	/** Property change listeners. */
-	private final List<PropertyChangeListener> propertyChangeListeners = Collections.synchronizedList(new ArrayList<PropertyChangeListener>());
+public class Node extends AbstractBean {
 
 	/** Name of the “name” property. */
 	public static final String PROPERTY_NAME = "name";
@@ -46,6 +42,9 @@ public class Node {
 	/** Name of the “port” property. */
 	public static final String PROPERTY_PORT = "port";
 
+	/** Internal ID. */
+	private String id;
+
 	/** The name of the node. */
 	private String name;
 
@@ -55,55 +54,39 @@ public class Node {
 	/** The port number of the node. */
 	private int port;
 
-	//
-	// EVENT MANAGEMENT
-	//
-
 	/**
-	 * Adds a property change listener.
-	 * 
-	 * @param propertyChangeListener
-	 *            The property change listener to add
+	 * Creates a new node.
 	 */
-	public void addPropertyChangeListener(PropertyChangeListener propertyChangeListener) {
-		propertyChangeListeners.add(propertyChangeListener);
+	public Node() {
+		id = Hex.toHex(IdGenerator.generateId());
 	}
 
 	/**
-	 * Removes a property change listener.
-	 * 
-	 * @param propertyChangeListener
-	 *            The property change listener to remove
+	 * Returns the internal ID of the node.
+	 *
+	 * @return The internal ID of the node
 	 */
-	public void removePropertyChangeListener(PropertyChangeListener propertyChangeListener) {
-		propertyChangeListeners.remove(propertyChangeListener);
+	String getId() {
+		return id;
 	}
 
 	/**
-	 * Notifies all listeners that a property has changed.
-	 * 
-	 * @param property
-	 *            The name of the property
-	 * @param oldValue
-	 *            The old value of the property
-	 * @param newValue
-	 *            The new value of the property
+	 * Sets the internal ID of the node.
+	 *
+	 * @param id
+	 *            The internal ID of the node
 	 */
-	private void firePropertyChange(String property, Object oldValue, Object newValue) {
-		PropertyChangeEvent propertyChangeEvent = new PropertyChangeEvent(this, property, oldValue, newValue);
-		for (PropertyChangeListener propertyChangeListener: propertyChangeListeners) {
-			propertyChangeListener.propertyChange(propertyChangeEvent);
+	void setId(String id) {
+		if (id == null) {
+			this.id = Hex.toHex(IdGenerator.generateId());
+		} else {
+			this.id = id;
 		}
-
 	}
 
-	//
-	// ACCESSORS
-	//
-
 	/**
 	 * Returns the user-given name of the node.
-	 * 
+	 *
 	 * @return The name of the node
 	 */
 	public String getName() {
@@ -112,21 +95,19 @@ public class Node {
 
 	/**
 	 * Sets the user-given name of the node.
-	 * 
+	 *
 	 * @param name
 	 *            The name of the node
 	 */
 	public void setName(String name) {
 		String oldName = this.name;
 		this.name = name;
-		if (((oldName != null) && (name == null)) || ((oldName == null) && (name != null)) || ((name != null) && !name.equals(oldName))) {
-			firePropertyChange(PROPERTY_NAME, oldName, name);
-		}
+		fireIfPropertyChanged(PROPERTY_NAME, oldName, name);
 	}
 
 	/**
 	 * Returns the hostname of the node.
-	 * 
+	 *
 	 * @return The hostname of the node
 	 */
 	public String getHostname() {
@@ -135,21 +116,19 @@ public class Node {
 
 	/**
 	 * Sets the hostname of the node.
-	 * 
+	 *
 	 * @param hostname
 	 *            The hostname of the node
 	 */
 	public void setHostname(String hostname) {
 		String oldHostname = this.hostname;
 		this.hostname = hostname;
-		if (((oldHostname != null) && (hostname == null)) || ((oldHostname == null) && (hostname != null)) || ((hostname != null) && !hostname.equals(oldHostname))) {
-			firePropertyChange(PROPERTY_HOSTNAME, oldHostname, hostname);
-		}
+		fireIfPropertyChanged(PROPERTY_HOSTNAME, oldHostname, hostname);
 	}
 
 	/**
 	 * Returns the port number of the node.
-	 * 
+	 *
 	 * @return The port number of the node
 	 */
 	public int getPort() {
@@ -158,16 +137,14 @@ public class Node {
 
 	/**
 	 * Sets the port number of the node.
-	 * 
+	 *
 	 * @param port
 	 *            The port number of the node
 	 */
 	public void setPort(int port) {
 		int oldPort = this.port;
 		this.port = port;
-		if (oldPort != port) {
-			firePropertyChange(PROPERTY_PORT, oldPort, port);
-		}
+		fireIfPropertyChanged(PROPERTY_PORT, oldPort, port);
 	}
 
 	/**
@@ -175,7 +152,7 @@ public class Node {
 	 */
 	@Override
 	public String toString() {
-		return name + " (" + hostname + ((port == 9481) ? ("") : (":" + port)) + ")";
+		return getClass().getName() + "[name=" + name + ",hostname=" + hostname + ",port=" + port + "]";
 	}
 
 }