X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fcore%2FCoreImpl.java;h=d0e78b96d7c1d08769653db46045dfb3e985f3a7;hb=dcab7505473d0a4f779b4199eba4e201c4923df6;hp=3e96b108d8046598443a0dd8dd676da31a7a9be8;hpb=7a6a3c1c08be242d176b141f261e25b16fee84aa;p=jSite2.git

diff --git a/src/net/pterodactylus/jsite/core/CoreImpl.java b/src/net/pterodactylus/jsite/core/CoreImpl.java
index 3e96b10..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 {
 
@@ -265,42 +267,6 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 		}
 	}
 
-	/**
-	 * Notifies all listeners that a request was added to a node.
-	 * 
-	 * @param request
-	 *            The request that was added
-	 */
-	private void fireRequestAdded(Request request) {
-		for (CoreListener coreListener: coreListeners) {
-			coreListener.requestAdded(request);
-		}
-	}
-
-	/**
-	 * Notifies all listeners that a request progressed.
-	 * 
-	 * @param request
-	 *            The request
-	 */
-	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.requestRemoved(request);
-		}
-	}
-
 	//
 	// ACCESSORS
 	//
@@ -367,6 +333,13 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 		return nodeManager.hasNode(node);
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	public List<Project> getProjects() {
+		return projectManager.getProjects();
+	}
+
 	//
 	// ACTIONS
 	//
@@ -441,13 +414,8 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 	/**
 	 * {@inheritDoc}
 	 */
-	public Project createProject(String projectName) throws IOException, NoNodeException {
-		Project project = new Project();
-		project.setName(projectName);
-		String[] keyPair = nodeManager.generateKeyPair();
-		project.setPrivateKey(keyPair[0]);
-		project.setPublicKey(keyPair[1]);
-		return project;
+	public Project createProject() throws IOException, JSiteException {
+		return projectManager.createProject();
 	}
 
 	//
@@ -517,21 +485,36 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 	 * {@inheritDoc}
 	 */
 	public void requestAdded(Request request) {
-		fireRequestAdded(request);
+		/* TODO - find project and process request */
 	}
 
 	/**
 	 * @see net.pterodactylus.jsite.core.RequestListener#requestProgressed(Request)
 	 */
 	public void requestProgressed(Request request) {
-		fireRequestProgressed(request);
+		/* TODO - find project and process request */
 	}
 
 	/**
 	 * @see net.pterodactylus.jsite.core.RequestListener#requestRemoved(net.pterodactylus.jsite.core.Request)
 	 */
 	public void requestRemoved(Request request) {
-		fireRequestRemoved(request);
+		/* TODO - find project and process request */
+	}
+
+	/**
+	 * @see net.pterodactylus.jsite.core.RequestListener#requestGeneratedURI(net.pterodactylus.jsite.core.Request,
+	 *      java.lang.String)
+	 */
+	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 */
 	}
 
 }