X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fcore%2FCoreImpl.java;h=2296e225aab75839d4bb7d0223227208b3265bbb;hb=fe1254de274c0e3b74df93d00051e7025d725579;hp=93150f5c0a358ca4a7abce50aa3a66ce154bfc2a;hpb=1e1cd8e1723b579781fb98ee2e1a3e07a1ca402f;p=jSite2.git diff --git a/src/net/pterodactylus/jsite/core/CoreImpl.java b/src/net/pterodactylus/jsite/core/CoreImpl.java index 93150f5..2296e22 100644 --- a/src/net/pterodactylus/jsite/core/CoreImpl.java +++ b/src/net/pterodactylus/jsite/core/CoreImpl.java @@ -23,18 +23,29 @@ import java.io.IOException; import java.net.UnknownHostException; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; +import java.util.logging.Level; +import java.util.logging.Logger; + +import net.pterodactylus.util.logging.Logging; /** * The core of jSite. * * @author David ‘Bombe’ Roden <bombe@freenetproject.org> - * @version $Id$ */ public class CoreImpl implements Core, NodeListener, RequestListener { + /** The logger. */ + private static final Logger logger = Logging.getLogger(CoreImpl.class.getName()); + /** The core listeners. */ private final List coreListeners = new ArrayList(); + /** Thread pool. */ + private Executor threadPool = Executors.newCachedThreadPool(); + /** The project manager. */ private ProjectManager projectManager; @@ -54,6 +65,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * {@inheritDoc} */ public void addCoreListener(CoreListener coreListener) { + logger.log(Level.FINEST, "adding core listener: " + coreListener); coreListeners.add(coreListener); } @@ -61,6 +73,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * {@inheritDoc} */ public void removeCoreListener(CoreListener coreListener) { + logger.log(Level.FINEST, "removing core listener: " + coreListener); coreListeners.remove(coreListener); } @@ -71,7 +84,8 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * The directory the projects were loaded from */ private void fireLoadingProjectsDone(String directory) { - for (CoreListener coreListener: coreListeners) { + logger.log(Level.FINEST, "firing loadingProjectsDone event with [directory=" + directory + "]"); + for (CoreListener coreListener : coreListeners) { coreListener.loadingProjectsDone(directory); } } @@ -86,7 +100,8 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * The exception that occured when loading projects */ private void fireLoadingProjectsFailed(String directory, Throwable throwable) { - for (CoreListener coreListener: coreListeners) { + logger.log(Level.FINEST, "firing loadingProjectsFailed event with [directory=" + directory + ",throwable=" + throwable + "]"); + for (CoreListener coreListener : coreListeners) { coreListener.loadingProjectsFailed(directory, throwable); } } @@ -98,7 +113,8 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * The directory the projects were saved to */ private void fireSavingProjectsDone(String directory) { - for (CoreListener coreListener: coreListeners) { + logger.log(Level.FINEST, "firing savingProjectsDone event with [directory=" + directory + "]"); + for (CoreListener coreListener : coreListeners) { coreListener.savingProjectsDone(directory); } } @@ -112,19 +128,62 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * The exception that occured when saving the projects */ private void fireSavingProjectsFailed(String directory, Throwable throwable) { - for (CoreListener coreListener: coreListeners) { + logger.log(Level.FINEST, "firing savingProjectsFailed event with [directory=" + directory + ",throwable=" + throwable + "]"); + for (CoreListener coreListener : coreListeners) { coreListener.savingProjectsFailed(directory, throwable); } } /** + * Notifies all listeners that a project was added. + * + * @param project + * The project that was added + */ + private void fireProjectAdded(Project project) { + logger.log(Level.FINEST, "firing projectAdded event with [project=" + project + "]"); + for (CoreListener coreListener : coreListeners) { + coreListener.projectAdded(project); + } + } + + /** + * Notifies all listeners that a project was cloned. + * + * @param clonedProject + * The project that was cloned + * @param projectClone + * The clone of the project + */ + private void fireProjectCloned(Project clonedProject, Project projectClone) { + logger.log(Level.FINEST, "firing projectCloned event with [clonedProject=" + clonedProject + ",projectClone=" + projectClone + "]"); + for (CoreListener coreListener : coreListeners) { + coreListener.projectCloned(clonedProject, projectClone); + } + } + + /** + * Notifies all listeners that a project was removed. + * + * @param project + * The project that was removed + */ + private void fireProjectRemoved(Project project) { + logger.log(Level.FINEST, "firing projectRemoved event with [project=" + project + "]"); + for (CoreListener coreListener : coreListeners) { + coreListener.projectRemoved(project); + } + } + + /** * Notifies all listeners that the nodes were successfully loaded. * * @param directory * The directory the nodes were loaded from */ private void fireLoadingNodesDone(String directory) { - for (CoreListener coreListener: coreListeners) { + logger.log(Level.FINEST, "firing loadingNodesDone event with [directory=" + directory + "]"); + for (CoreListener coreListener : coreListeners) { coreListener.loadingNodesDone(directory); } } @@ -138,7 +197,8 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * The exception that occured while loading the nodes */ private void fireLoadingNodesFailed(String directory, Throwable throwable) { - for (CoreListener coreListener: coreListeners) { + logger.log(Level.FINEST, "firing loadingNodesFailed event with [directory=" + directory + ",throwable=" + throwable + "]"); + for (CoreListener coreListener : coreListeners) { coreListener.loadingNodesFailed(directory, throwable); } } @@ -150,7 +210,8 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * The directory the nodes were saved to */ private void fireSavingNodesDone(String directory) { - for (CoreListener coreListener: coreListeners) { + logger.log(Level.FINEST, "firing savingNodesDone event with [directory=" + directory + "]"); + for (CoreListener coreListener : coreListeners) { coreListener.savingNodesDone(directory); } } @@ -164,7 +225,8 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * The exception that occured while saving the nodes */ private void fireSavingNodesFailed(String directory, Throwable throwable) { - for (CoreListener coreListener: coreListeners) { + logger.log(Level.FINEST, "firing savingNodesFailed event with [directory=" + directory + ",throwable=" + throwable + "]"); + for (CoreListener coreListener : coreListeners) { coreListener.savingProjectsFailed(directory, throwable); } } @@ -173,7 +235,8 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * Notifies all core listeners that the core has loaded and is ready to run. */ private void fireCoreLoaded() { - for (CoreListener coreListener: coreListeners) { + logger.log(Level.FINEST, "firing coreLoaded event"); + for (CoreListener coreListener : coreListeners) { coreListener.coreLoaded(); } } @@ -182,7 +245,8 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * Notifies all listeners that the core was stopped. */ private void fireCoreStopped() { - for (CoreListener coreListener: coreListeners) { + logger.log(Level.FINEST, "firing coreStopped event"); + for (CoreListener coreListener : coreListeners) { coreListener.coreStopped(); } } @@ -194,7 +258,8 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * The node that was added */ private void fireNodeAdded(Node node) { - for (CoreListener coreListener: coreListeners) { + logger.log(Level.FINEST, "firing nodeAdded event with [node=" + node + "]"); + for (CoreListener coreListener : coreListeners) { coreListener.nodeAdded(node); } } @@ -206,7 +271,8 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * The node that was removed */ private void fireNodeRemoved(Node node) { - for (CoreListener coreListener: coreListeners) { + logger.log(Level.FINEST, "firing nodeRemoved event with [node=" + node + "]"); + for (CoreListener coreListener : coreListeners) { coreListener.nodeRemoved(node); } } @@ -219,7 +285,8 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * The node that is being connected to */ private void fireNodeConnecting(Node node) { - for (CoreListener coreListener: coreListeners) { + logger.log(Level.FINEST, "firing nodeConnecting event with [node=" + node + "]"); + for (CoreListener coreListener : coreListeners) { coreListener.nodeConnecting(node); } } @@ -231,7 +298,8 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * The node that is now connected */ private void fireNodeConnected(Node node) { - for (CoreListener coreListener: coreListeners) { + logger.log(Level.FINEST, "firing nodeConnected event with [node=" + node + "]"); + for (CoreListener coreListener : coreListeners) { coreListener.nodeConnected(node); } } @@ -245,7 +313,8 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * The cause of the failure */ private void fireNodeConnectionFailed(Node node, Throwable cause) { - for (CoreListener coreListener: coreListeners) { + logger.log(Level.FINEST, "firing nodeConnectionFailed event with [node=" + node + ",cause=" + cause + "]"); + for (CoreListener coreListener : coreListeners) { coreListener.nodeConnectionFailed(node, cause); } } @@ -260,51 +329,23 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * if there was no exception */ private void fireNodeDisconnected(Node node, Throwable throwable) { - for (CoreListener coreListener: coreListeners) { + logger.log(Level.FINEST, "firing nodeDisconnected event with [node=" + node + ",throwable=" + throwable + "]"); + for (CoreListener coreListener : coreListeners) { coreListener.nodeDisconnected(node, throwable); } } - /** - * 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); - } - } + // + // ACCESSORS + // /** - * Notifies all listeners that a request was removed. - * - * @param request - * The request that was removed + * {@inheritDoc} */ - private void fireRequestRemoved(Request request) { - for (CoreListener coreListener: coreListeners) { - coreListener.requestRemoved(request); - } + public Executor getThreadPool() { + return threadPool; } - // - // ACCESSORS - // - /** * Returns the project manager. * @@ -367,6 +408,13 @@ public class CoreImpl implements Core, NodeListener, RequestListener { return nodeManager.hasNode(node); } + /** + * {@inheritDoc} + */ + public List getProjects() { + return projectManager.getProjects(); + } + // // ACTIONS // @@ -375,18 +423,19 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * {@inheritDoc} */ public void start() { - try { - projectManager.load(); - fireLoadingProjectsDone(projectManager.getDirectory()); - } catch (IOException ioe1) { - fireLoadingProjectsFailed(projectManager.getDirectory(), ioe1); - } + logger.log(Level.INFO, "starting core…"); try { nodeManager.load(); fireLoadingNodesDone(nodeManager.getDirectory()); } catch (IOException ioe1) { fireLoadingNodesFailed(nodeManager.getDirectory(), ioe1); } + try { + projectManager.load(); + fireLoadingProjectsDone(projectManager.getDirectory()); + } catch (IOException ioe1) { + fireLoadingProjectsFailed(projectManager.getDirectory(), ioe1); + } fireCoreLoaded(); } @@ -394,6 +443,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * {@inheritDoc} */ public void stop() { + logger.log(Level.INFO, "stopping core…"); try { projectManager.save(); fireSavingProjectsDone(projectManager.getDirectory()); @@ -413,6 +463,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * {@inheritDoc} */ public boolean addNode(Node node) throws UnknownHostException { + logger.log(Level.INFO, "addNode(node=" + node + ")"); return nodeManager.addNode(node); } @@ -420,6 +471,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * {@inheritDoc} */ public void removeNode(Node node) { + logger.log(Level.INFO, "removeNode(node=" + node + ")"); nodeManager.removeNode(node); } @@ -427,6 +479,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * {@inheritDoc} */ public void connectToNode(Node node) { + logger.log(Level.INFO, "connectToNode(node=" + node + ")"); fireNodeConnecting(node); nodeManager.connect(node); } @@ -435,14 +488,35 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * {@inheritDoc} */ public void disconnectFromNode(Node node) { + logger.log(Level.INFO, "disconnectFromNode(node=" + node + ")"); nodeManager.disconnect(node); } /** * {@inheritDoc} */ - public Project createProject() throws IOException, NoNodeException { - return projectManager.createProject(); + public void createProject() throws IOException, JSiteException { + logger.log(Level.INFO, "createProject()"); + Project newProject = projectManager.createProject(); + fireProjectAdded(newProject); + } + + /** + * {@inheritDoc} + */ + public void cloneProject(Project project) { + logger.log(Level.INFO, "cloneProject(project=" + project + ")"); + Project projectClone = projectManager.cloneProject(project); + fireProjectCloned(project, projectClone); + } + + /** + * {@inheritDoc} + */ + public void removeProject(Project project) { + logger.log(Level.INFO, "removeProject(project=" + project + ")"); + projectManager.removeProject(project); + fireProjectRemoved(project); } // @@ -454,6 +528,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { */ @SuppressWarnings("unused") private void loadConfig() { + logger.log(Level.INFO, "loadConfig()"); /* TODO */ } @@ -462,6 +537,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { */ @SuppressWarnings("unused") private void saveConfig() { + logger.log(Level.INFO, "saveConfig()"); /* TODO */ } @@ -512,21 +588,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 */ } }