X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fcore%2FCoreImpl.java;h=d0e78b96d7c1d08769653db46045dfb3e985f3a7;hb=2357d27038c4dc266052fd9a07dad5eb24d8760d;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..d0e78b9 100644
--- a/src/net/pterodactylus/jsite/core/CoreImpl.java
+++ b/src/net/pterodactylus/jsite/core/CoreImpl.java
@@ -24,11 +24,13 @@ import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.List;
 
+import net.pterodactylus.jsite.project.Project;
+import net.pterodactylus.jsite.project.ProjectManager;
+
 /**
  * The core of jSite.
  * 
  * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
- * @version $Id$
  */
 public class CoreImpl implements Core, NodeListener, RequestListener {
 
@@ -237,58 +239,31 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 	}
 
 	/**
-	 * Notifies all listeners that the given node was disconnected.
+	 * Notifies all listeners that a connection to a node has failed.
 	 * 
 	 * @param node
-	 *            The node that is now disconnected
-	 * @param throwable
-	 *            The exception that caused the disconnect, or <code>null</code>
-	 *            if there was no exception
+	 *            The node that could not be connected
+	 * @param cause
+	 *            The cause of the failure
 	 */
-	private void fireNodeDisconnected(Node node, Throwable throwable) {
+	private void fireNodeConnectionFailed(Node node, Throwable cause) {
 		for (CoreListener coreListener: coreListeners) {
-			coreListener.nodeDisconnected(node, throwable);
+			coreListener.nodeConnectionFailed(node, cause);
 		}
 	}
 
 	/**
-	 * Notifies all listeners that a request was added to a node.
+	 * Notifies all listeners that the given node was disconnected.
 	 * 
 	 * @param node
-	 *            The node the request was added to
-	 * @param request
-	 *            The request that was added
+	 *            The node that is now disconnected
+	 * @param throwable
+	 *            The exception that caused the disconnect, or <code>null</code>
+	 *            if there was no exception
 	 */
-	private void fireRequestAdded(Node node, Request request) {
-		for (CoreListener coreListener: coreListeners) {
-			coreListener.requestAdded(node, 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 fireNodeDisconnected(Node node, Throwable throwable) {
 		for (CoreListener coreListener: coreListeners) {
-			coreListener.requestProgressed(request, totalBlocks, requiredBlocks, successfulBlocks, failedBlocks, fatallyFailedBlocks, finalizedTotal);
+			coreListener.nodeDisconnected(node, throwable);
 		}
 	}
 
@@ -358,6 +333,13 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 		return nodeManager.hasNode(node);
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	public List<Project> getProjects() {
+		return projectManager.getProjects();
+	}
+
 	//
 	// ACTIONS
 	//
@@ -403,9 +385,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 +394,6 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 	 */
 	public void removeNode(Node node) {
 		nodeManager.removeNode(node);
-		fireNodeRemoved(node);
 	}
 
 	/**
@@ -431,6 +411,13 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 		nodeManager.disconnect(node);
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	public Project createProject() throws IOException, JSiteException {
+		return projectManager.createProject();
+	}
+
 	//
 	// PRIVATE METHODS
 	//
@@ -479,6 +466,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 +484,37 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 	/**
 	 * {@inheritDoc}
 	 */
-	public void requestAdded(Node node, Request request) {
-		fireRequestAdded(node, request);
+	public void requestAdded(Request request) {
+		/* TODO - find project and process request */
+	}
+
+	/**
+	 * @see net.pterodactylus.jsite.core.RequestListener#requestProgressed(Request)
+	 */
+	public void requestProgressed(Request request) {
+		/* TODO - find project and process request */
+	}
+
+	/**
+	 * @see net.pterodactylus.jsite.core.RequestListener#requestRemoved(net.pterodactylus.jsite.core.Request)
+	 */
+	public void requestRemoved(Request request) {
+		/* TODO - find project and process 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#requestGeneratedURI(net.pterodactylus.jsite.core.Request,
+	 *      java.lang.String)
 	 */
-	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 requestGeneratedURI(Request request, String uri) {
+		/* TODO - find project and process request */
+	}
+
+	/**
+	 * @see net.pterodactylus.jsite.core.RequestListener#requestFinished(net.pterodactylus.jsite.core.Request)
+	 */
+	public void requestFinished(Request request) {
+		/* TODO - find project and process request */
+	}
+
 }