X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fcore%2FCoreImpl.java;h=eae7b3a083237a9c6d30befe95bcfa72d43a1446;hb=6261532c85b45139e7b5c6c1c8425b5fea2ef018;hp=682199e0cbf6689d805080d3ff1f3860507f46c5;hpb=fa2475af2c06ae03a4338a3fc1e327dc1970faf4;p=jSite2.git

diff --git a/src/net/pterodactylus/jsite/core/CoreImpl.java b/src/net/pterodactylus/jsite/core/CoreImpl.java
index 682199e..eae7b3a 100644
--- a/src/net/pterodactylus/jsite/core/CoreImpl.java
+++ b/src/net/pterodactylus/jsite/core/CoreImpl.java
@@ -237,6 +237,20 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 	}
 
 	/**
+	 * 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) {
+		for (CoreListener coreListener: coreListeners) {
+			coreListener.nodeConnectionFailed(node, cause);
+		}
+	}
+
+	/**
 	 * Notifies all listeners that the given node was disconnected.
 	 * 
 	 * @param node
@@ -254,41 +268,36 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 	/**
 	 * Notifies all listeners that a request was added to a node.
 	 * 
-	 * @param node
-	 *            The node the request was added to
 	 * @param request
 	 *            The request that was added
 	 */
-	private void fireRequestAdded(Node node, Request request) {
+	private void fireRequestAdded(Request request) {
 		for (CoreListener coreListener: coreListeners) {
-			coreListener.requestAdded(node, request);
+			coreListener.requestAdded(request);
 		}
 	}
 
 	/**
 	 * Notifies all listeners that a request progressed.
 	 * 
-	 * @param node
-	 *            The node that runs the request
 	 * @param request
 	 *            The request
-	 * @param totalBlocks
-	 *            The total number of blocks
-	 * @param requiredBlocks
-	 *            The number of required blocks
-	 * @param successfulBlocks
-	 *            The number of successful blocks
-	 * @param failedBlocks
-	 *            The number of failed blocks
-	 * @param fatallyFailedBlocks
-	 *            The number of fatally failed blocks
-	 * @param finalizedTotal
-	 *            <code>true</code> if the total number of blocks in final,
-	 *            <code>false</code> otherwise
-	 */
-	private void fireRequestProgressed(Node node, Request request, int totalBlocks, int requiredBlocks, int successfulBlocks, int failedBlocks, int fatallyFailedBlocks, boolean finalizedTotal) {
+	 */
+	private void fireRequestProgressed(Request request) {
+		for (CoreListener coreListener: coreListeners) {
+			coreListener.requestProgressed(request);
+		}
+	}
+
+	/**
+	 * Notifies all listeners that a request was removed.
+	 * 
+	 * @param request
+	 *            The request that was removed
+	 */
+	private void fireRequestRemoved(Request request) {
 		for (CoreListener coreListener: coreListeners) {
-			coreListener.requestProgressed(request, totalBlocks, requiredBlocks, successfulBlocks, failedBlocks, fatallyFailedBlocks, finalizedTotal);
+			coreListener.requestRemoved(request);
 		}
 	}
 
@@ -403,9 +412,8 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 	/**
 	 * {@inheritDoc}
 	 */
-	public void addNode(Node node) throws UnknownHostException {
-		nodeManager.addNode(node);
-		fireNodeAdded(node);
+	public boolean addNode(Node node) throws UnknownHostException {
+		return nodeManager.addNode(node);
 	}
 
 	/**
@@ -413,7 +421,6 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 	 */
 	public void removeNode(Node node) {
 		nodeManager.removeNode(node);
-		fireNodeRemoved(node);
 	}
 
 	/**
@@ -431,6 +438,21 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 		nodeManager.disconnect(node);
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	public Project addProject(String projectName) throws IOException {
+		Project project = new Project();
+		project.setName(projectName);
+		String[] keyPair = nodeManager.generateKeyPair();
+		if (keyPair == null) {
+			return null;
+		}
+		project.setPrivateKey(keyPair[0]);
+		project.setPublicKey(keyPair[1]);
+		return project;
+	}
+
 	//
 	// PRIVATE METHODS
 	//
@@ -479,6 +501,13 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 	/**
 	 * {@inheritDoc}
 	 */
+	public void nodeConnectionFailed(Node node, Throwable cause) {
+		fireNodeConnectionFailed(node, cause);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
 	public void nodeDisconnected(Node node, Throwable throwable) {
 		fireNodeDisconnected(node, throwable);
 	}
@@ -490,16 +519,22 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 	/**
 	 * {@inheritDoc}
 	 */
-	public void requestAdded(Node node, Request request) {
-		fireRequestAdded(node, request);
+	public void requestAdded(Request request) {
+		fireRequestAdded(request);
 	}
 
 	/**
-	 * @see net.pterodactylus.jsite.core.RequestListener#requestProgressed(net.pterodactylus.jsite.core.Node,
-	 *      net.pterodactylus.jsite.core.Request, int, int, int, int, int,
-	 *      boolean)
+	 * @see net.pterodactylus.jsite.core.RequestListener#requestProgressed(Request)
 	 */
-	public void requestProgressed(Node node, Request request, int totalBlocks, int requiredBlocks, int successfulBlocks, int failedBlocks, int fatallyFailedBlocks, boolean finalizedTotal) {
-    	fireRequestProgressed(node, request, totalBlocks, requiredBlocks, successfulBlocks, failedBlocks, fatallyFailedBlocks, finalizedTotal);
-    }
+	public void requestProgressed(Request request) {
+		fireRequestProgressed(request);
+	}
+
+	/**
+	 * @see net.pterodactylus.jsite.core.RequestListener#requestRemoved(net.pterodactylus.jsite.core.Request)
+	 */
+	public void requestRemoved(Request request) {
+		fireRequestRemoved(request);
+	}
+
 }