X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fcore%2FCoreImpl.java;h=65ea70f9cae733f150d7f418d1da66cef06ba258;hb=ec486cbd31c74a793931db92aca02b964aa83b93;hp=1e52659e1d2ee6cb6c0dd9b73a9c8d82d096cc97;hpb=a5baf05c30ac53df2e1f6b481eb183a2cff53ef5;p=jSite2.git

diff --git a/src/net/pterodactylus/jsite/core/CoreImpl.java b/src/net/pterodactylus/jsite/core/CoreImpl.java
index 1e52659..65ea70f 100644
--- a/src/net/pterodactylus/jsite/core/CoreImpl.java
+++ b/src/net/pterodactylus/jsite/core/CoreImpl.java
@@ -34,7 +34,7 @@ import net.pterodactylus.util.logging.Logging;
  *
  * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
  */
-public class CoreImpl implements Core, NodeListener, RequestListener {
+public class CoreImpl implements Core, NodeListener {
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(CoreImpl.class.getName());
@@ -43,6 +43,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 	private final CoreListenerSupport coreListenerSupport = new CoreListenerSupport();
 
 	/** Thread pool. */
+	@SuppressWarnings("unused")
 	private Executor threadPool = Executors.newCachedThreadPool();
 
 	/** The project manager. */
@@ -52,8 +53,6 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 	private NodeManager nodeManager;
 
 	/** The request manager. */
-	/* TODO - remove */
-	@SuppressWarnings("unused")
 	private RequestManager requestManager;
 
 	//
@@ -81,13 +80,6 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 	//
 
 	/**
-	 * {@inheritDoc}
-	 */
-	public Executor getThreadPool() {
-		return threadPool;
-	}
-
-	/**
 	 * Returns the project manager.
 	 *
 	 * @return The project manager
@@ -126,10 +118,10 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 	}
 
 	/**
-	 * Sets the request manager to use.
+	 * Sets the request manager.
 	 *
 	 * @param requestManager
-	 *            The request manager to use
+	 *            The request manager
 	 */
 	public void setRequestManager(RequestManager requestManager) {
 		this.requestManager = requestManager;
@@ -146,7 +138,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 	 * {@inheritDoc}
 	 */
 	public boolean isNodeConnected(Node node) {
-		return nodeManager.hasNode(node);
+		return nodeManager.isNodeConnected(node);
 	}
 
 	/**
@@ -165,6 +157,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 	 */
 	public void start() {
 		logger.log(Level.INFO, "starting core…");
+		loadConfig();
 		try {
 			nodeManager.load();
 			coreListenerSupport.fireLoadingNodesDone(nodeManager.getDirectory());
@@ -185,6 +178,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 	 */
 	public void stop() {
 		logger.log(Level.INFO, "stopping core…");
+		saveConfig();
 		try {
 			projectManager.save();
 			coreListenerSupport.fireSavingProjectsDone(projectManager.getDirectory());
@@ -245,6 +239,13 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 	/**
 	 * {@inheritDoc}
 	 */
+	public void insertProject(Node node, Project project) {
+		logger.log(Level.FINEST, "insertProject(node=" + node + ", project=" + project + ")");
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
 	public void cloneProject(Project project) {
 		logger.log(Level.FINEST, "cloneProject(project=" + project + ")");
 		Project projectClone = projectManager.cloneProject(project);
@@ -267,7 +268,6 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 	/**
 	 * Loads the configuration.
 	 */
-	@SuppressWarnings("unused")
 	private void loadConfig() {
 		logger.log(Level.FINEST, "loadConfig()");
 		/* TODO */
@@ -276,7 +276,6 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 	/**
 	 * Saves the configuration.
 	 */
-	@SuppressWarnings("unused")
 	private void saveConfig() {
 		logger.log(Level.FINEST, "saveConfig()");
 		/* TODO */
@@ -321,44 +320,4 @@ public class CoreImpl implements Core, NodeListener, RequestListener {
 		coreListenerSupport.fireNodeDisconnected(node, throwable);
 	}
 
-	//
-	// INTERFACE RequestListener
-	//
-
-	/**
-	 * {@inheritDoc}
-	 */
-	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#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 */
-	}
-
 }