X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fcore%2FCoreImpl.java;h=9c009516ca63b162e3252be8b5f8e7d3eb6f3db7;hb=31f3998456da059cb3e60228fbdf290f239504b6;hp=bc62a0bbe0ddc056322cd4bf1bc1416bdea9ac04;hpb=2fcb1508592451a972b45bef42f86db998d9be6f;p=jSite2.git

diff --git a/src/net/pterodactylus/jsite/core/CoreImpl.java b/src/net/pterodactylus/jsite/core/CoreImpl.java
index bc62a0b..9c00951 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, InsertListener {
+public class CoreImpl implements Core, NodeListener, RequestListener {
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(CoreImpl.class.getName());
@@ -43,6 +43,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener, InsertList
 	private final CoreListenerSupport coreListenerSupport = new CoreListenerSupport();
 
 	/** Thread pool. */
+	@SuppressWarnings("unused")
 	private Executor threadPool = Executors.newCachedThreadPool();
 
 	/** The project manager. */
@@ -52,13 +53,8 @@ public class CoreImpl implements Core, NodeListener, RequestListener, InsertList
 	private NodeManager nodeManager;
 
 	/** The request manager. */
-	/* TODO - remove */
-	@SuppressWarnings("unused")
 	private RequestManager requestManager;
 
-	/** The insert manager. */
-	private InsertManager insertManager;
-
 	//
 	// LISTENER MANAGEMENT
 	//
@@ -84,13 +80,6 @@ public class CoreImpl implements Core, NodeListener, RequestListener, InsertList
 	//
 
 	/**
-	 * {@inheritDoc}
-	 */
-	public Executor getThreadPool() {
-		return threadPool;
-	}
-
-	/**
 	 * Returns the project manager.
 	 *
 	 * @return The project manager
@@ -129,26 +118,16 @@ public class CoreImpl implements Core, NodeListener, RequestListener, InsertList
 	}
 
 	/**
-	 * 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;
 	}
 
 	/**
-	 * Sets the insert manager to use.
-	 *
-	 * @param insertManager
-	 *            The insert manager to use
-	 */
-	public void setInsertManager(InsertManager insertManager) {
-		this.insertManager = insertManager;
-	}
-
-	/**
 	 * {@inheritDoc}
 	 */
 	public List<Node> getNodes() {
@@ -178,6 +157,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener, InsertList
 	 */
 	public void start() {
 		logger.log(Level.INFO, "starting core…");
+		loadConfig();
 		try {
 			nodeManager.load();
 			coreListenerSupport.fireLoadingNodesDone(nodeManager.getDirectory());
@@ -198,6 +178,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener, InsertList
 	 */
 	public void stop() {
 		logger.log(Level.INFO, "stopping core…");
+		saveConfig();
 		try {
 			projectManager.save();
 			coreListenerSupport.fireSavingProjectsDone(projectManager.getDirectory());
@@ -260,7 +241,6 @@ public class CoreImpl implements Core, NodeListener, RequestListener, InsertList
 	 */
 	public void insertProject(Node node, Project project) {
 		logger.log(Level.FINEST, "insertProject(node=" + node + ", project=" + project + ")");
-		insertManager.insertProject(project, node);
 	}
 
 	/**
@@ -288,7 +268,6 @@ public class CoreImpl implements Core, NodeListener, RequestListener, InsertList
 	/**
 	 * Loads the configuration.
 	 */
-	@SuppressWarnings("unused")
 	private void loadConfig() {
 		logger.log(Level.FINEST, "loadConfig()");
 		/* TODO */
@@ -297,7 +276,6 @@ public class CoreImpl implements Core, NodeListener, RequestListener, InsertList
 	/**
 	 * Saves the configuration.
 	 */
-	@SuppressWarnings("unused")
 	private void saveConfig() {
 		logger.log(Level.FINEST, "saveConfig()");
 		/* TODO */
@@ -350,81 +328,6 @@ public class CoreImpl implements Core, NodeListener, RequestListener, InsertList
 	 * {@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 */
-	}
-
-	//
-	// INTERFACE InsertListener
-	//
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void insertAdded(Insert insert) {
-		/* TODO */
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void insertRemoved(Insert insert) {
-		/* TODO */
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void insertStarted(Insert insert) {
-		/* TODO */
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void insertProgressed(Insert insert) {
-		/* TODO */
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void insertGeneratedURI(Insert insert, String uri) {
-		/* TODO */
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public void insertFinished(Insert insert) {
 		/* TODO */
 	}