X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fcore%2FCoreImpl.java;h=2b795ed69171045c8fd8e0431d3a11d48dfd2d93;hb=52608018e26c1d6bffc3c8561cae9500c141a636;hp=9073655a007ce5468aef8f0ff22c372a862816c4;hpb=1b87930e43eb7d14068a21ed0b488f28cc6ce49b;p=jSite2.git diff --git a/src/net/pterodactylus/jsite/core/CoreImpl.java b/src/net/pterodactylus/jsite/core/CoreImpl.java index 9073655..2b795ed 100644 --- a/src/net/pterodactylus/jsite/core/CoreImpl.java +++ b/src/net/pterodactylus/jsite/core/CoreImpl.java @@ -21,21 +21,30 @@ package net.pterodactylus.jsite.core; 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.jsite.project.Project; -import net.pterodactylus.jsite.project.ProjectManager; +import net.pterodactylus.util.logging.Logging; /** * The core of jSite. - * + * * @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()); - /** The core listeners. */ - private final List coreListeners = new ArrayList(); + /** The core listener support. */ + private final CoreListenerSupport coreListenerSupport = new CoreListenerSupport(); + + /** Thread pool. */ + @SuppressWarnings("unused") + private Executor threadPool = Executors.newCachedThreadPool(); /** The project manager. */ private ProjectManager projectManager; @@ -43,11 +52,6 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** The node manager. */ private NodeManager nodeManager; - /** The request manager. */ - /* TODO - remove */ - @SuppressWarnings("unused") - private RequestManager requestManager; - // // LISTENER MANAGEMENT // @@ -56,250 +60,16 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * {@inheritDoc} */ public void addCoreListener(CoreListener coreListener) { - coreListeners.add(coreListener); + logger.log(Level.FINEST, "adding core listener: " + coreListener); + coreListenerSupport.addListener(coreListener); } /** * {@inheritDoc} */ public void removeCoreListener(CoreListener coreListener) { - coreListeners.remove(coreListener); - } - - /** - * Notifies all listeners that the projects were loaded successfully. - * - * @param directory - * The directory the projects were loaded from - */ - private void fireLoadingProjectsDone(String directory) { - for (CoreListener coreListener: coreListeners) { - coreListener.loadingProjectsDone(directory); - } - } - - /** - * Notifies all core listeners that loading the projects from the given - * directory has failed. - * - * @param directory - * The directory the projects were tried to load from - * @param throwable - * The exception that occured when loading projects - */ - private void fireLoadingProjectsFailed(String directory, Throwable throwable) { - for (CoreListener coreListener: coreListeners) { - coreListener.loadingProjectsFailed(directory, throwable); - } - } - - /** - * Notifies all listeners that the projects were successfully saved. - * - * @param directory - * The directory the projects were saved to - */ - private void fireSavingProjectsDone(String directory) { - for (CoreListener coreListener: coreListeners) { - coreListener.savingProjectsDone(directory); - } - } - - /** - * Notifies all listeners that the projects could not be saved. - * - * @param directory - * The directory the projects were to be saved to - * @param throwable - * The exception that occured when saving the projects - */ - private void fireSavingProjectsFailed(String 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) { - 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) { - 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) { - 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) { - coreListener.loadingNodesDone(directory); - } - } - - /** - * Notifies all listeners that loading the nodes has failed. - * - * @param directory - * The directory the nodes were loaded from - * @param throwable - * The exception that occured while loading the nodes - */ - private void fireLoadingNodesFailed(String directory, Throwable throwable) { - for (CoreListener coreListener: coreListeners) { - coreListener.loadingNodesFailed(directory, throwable); - } - } - - /** - * Notifies all listeners that the nodes were saved successfully. - * - * @param directory - * The directory the nodes were saved to - */ - private void fireSavingNodesDone(String directory) { - for (CoreListener coreListener: coreListeners) { - coreListener.savingNodesDone(directory); - } - } - - /** - * Notifies all listeners that saving the nodes has failed. - * - * @param directory - * The directory the nodes were saved to - * @param throwable - * The exception that occured while saving the nodes - */ - private void fireSavingNodesFailed(String directory, Throwable throwable) { - for (CoreListener coreListener: coreListeners) { - coreListener.savingProjectsFailed(directory, throwable); - } - } - - /** - * Notifies all core listeners that the core has loaded and is ready to run. - */ - private void fireCoreLoaded() { - for (CoreListener coreListener: coreListeners) { - coreListener.coreLoaded(); - } - } - - /** - * Notifies all listeners that the core was stopped. - */ - private void fireCoreStopped() { - for (CoreListener coreListener: coreListeners) { - coreListener.coreStopped(); - } - } - - /** - * Notifies all listeners that a node was added to the core. - * - * @param node - * The node that was added - */ - private void fireNodeAdded(Node node) { - for (CoreListener coreListener: coreListeners) { - coreListener.nodeAdded(node); - } - } - - /** - * Notifies all listeners that a node was removed from the core. - * - * @param node - * The node that was removed - */ - private void fireNodeRemoved(Node node) { - for (CoreListener coreListener: coreListeners) { - coreListener.nodeRemoved(node); - } - } - - /** - * Notifies all listeners that a connection to the given node is now being - * established. - * - * @param node - * The node that is being connected to - */ - private void fireNodeConnecting(Node node) { - for (CoreListener coreListener: coreListeners) { - coreListener.nodeConnecting(node); - } - } - - /** - * Notifies all listeners that the given node is now connected. - * - * @param node - * The node that is now connected - */ - private void fireNodeConnected(Node node) { - for (CoreListener coreListener: coreListeners) { - coreListener.nodeConnected(node); - } - } - - /** - * Notifies all listeners that a connection to a node has failed. - * - * @param node - * The node that could not be connected - * @param cause - * The cause of the failure - */ - private void fireNodeConnectionFailed(Node node, Throwable cause) { - for (CoreListener coreListener: coreListeners) { - coreListener.nodeConnectionFailed(node, cause); - } - } - - /** - * Notifies all listeners that the given node was disconnected. - * - * @param node - * The node that is now disconnected - * @param throwable - * The exception that caused the disconnect, or null - * if there was no exception - */ - private void fireNodeDisconnected(Node node, Throwable throwable) { - for (CoreListener coreListener: coreListeners) { - coreListener.nodeDisconnected(node, throwable); - } + logger.log(Level.FINEST, "removing core listener: " + coreListener); + coreListenerSupport.removeListener(coreListener); } // @@ -308,7 +78,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * Returns the project manager. - * + * * @return The project manager */ public ProjectManager getProjectManager() { @@ -317,7 +87,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * Sets the project manager to use. - * + * * @param projectManager * The project manager to use */ @@ -327,7 +97,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * Returns the node manager. - * + * * @return The node manager */ public NodeManager getNodeManager() { @@ -336,7 +106,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * Sets the node manager to use. - * + * * @param nodeManager * The node manager to use */ @@ -345,16 +115,6 @@ public class CoreImpl implements Core, NodeListener, RequestListener { } /** - * Sets the request manager to use. - * - * @param requestManager - * The request manager to use - */ - public void setRequestManager(RequestManager requestManager) { - this.requestManager = requestManager; - } - - /** * {@inheritDoc} */ public List getNodes() { @@ -365,7 +125,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * {@inheritDoc} */ public boolean isNodeConnected(Node node) { - return nodeManager.hasNode(node); + return nodeManager.isNodeConnected(node); } /** @@ -383,44 +143,47 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * {@inheritDoc} */ public void start() { + logger.log(Level.INFO, "starting core…"); try { - projectManager.load(); - fireLoadingProjectsDone(projectManager.getDirectory()); + nodeManager.load(); + coreListenerSupport.fireLoadingNodesDone(nodeManager.getDirectory()); } catch (IOException ioe1) { - fireLoadingProjectsFailed(projectManager.getDirectory(), ioe1); + coreListenerSupport.fireLoadingNodesFailed(nodeManager.getDirectory(), ioe1); } try { - nodeManager.load(); - fireLoadingNodesDone(nodeManager.getDirectory()); + projectManager.load(); + coreListenerSupport.fireLoadingProjectsDone(projectManager.getDirectory()); } catch (IOException ioe1) { - fireLoadingNodesFailed(nodeManager.getDirectory(), ioe1); + coreListenerSupport.fireLoadingProjectsFailed(projectManager.getDirectory(), ioe1); } - fireCoreLoaded(); + coreListenerSupport.fireCoreLoaded(); } /** * {@inheritDoc} */ public void stop() { + logger.log(Level.INFO, "stopping core…"); try { projectManager.save(); - fireSavingProjectsDone(projectManager.getDirectory()); + coreListenerSupport.fireSavingProjectsDone(projectManager.getDirectory()); } catch (IOException ioe1) { - fireSavingProjectsFailed(projectManager.getDirectory(), ioe1); + coreListenerSupport.fireSavingProjectsFailed(projectManager.getDirectory(), ioe1); } try { nodeManager.save(); - fireSavingNodesDone(nodeManager.getDirectory()); + coreListenerSupport.fireSavingNodesDone(nodeManager.getDirectory()); } catch (IOException ioe1) { - fireSavingNodesFailed(nodeManager.getDirectory(), ioe1); + coreListenerSupport.fireSavingNodesFailed(nodeManager.getDirectory(), ioe1); } - fireCoreStopped(); + coreListenerSupport.fireCoreStopped(); } /** * {@inheritDoc} */ public boolean addNode(Node node) throws UnknownHostException { + logger.log(Level.FINEST, "addNode(node=" + node + ")"); return nodeManager.addNode(node); } @@ -428,6 +191,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * {@inheritDoc} */ public void removeNode(Node node) { + logger.log(Level.FINEST, "removeNode(node=" + node + ")"); nodeManager.removeNode(node); } @@ -435,7 +199,8 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * {@inheritDoc} */ public void connectToNode(Node node) { - fireNodeConnecting(node); + logger.log(Level.FINEST, "connectToNode(node=" + node + ")"); + coreListenerSupport.fireNodeConnecting(node); nodeManager.connect(node); } @@ -443,6 +208,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * {@inheritDoc} */ public void disconnectFromNode(Node node) { + logger.log(Level.FINEST, "disconnectFromNode(node=" + node + ")"); nodeManager.disconnect(node); } @@ -450,26 +216,36 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * {@inheritDoc} */ public void createProject() throws IOException, JSiteException { + logger.log(Level.FINEST, "createProject()"); Project newProject = projectManager.createProject(); - fireProjectAdded(newProject); + coreListenerSupport.fireProjectAdded(newProject); + } + + /** + * {@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); - fireProjectCloned(project, projectClone); + coreListenerSupport.fireProjectCloned(project, projectClone); } - + /** * {@inheritDoc} */ public void removeProject(Project project) { + logger.log(Level.FINEST, "removeProject(project=" + project + ")"); projectManager.removeProject(project); - fireProjectRemoved(project); + coreListenerSupport.fireProjectRemoved(project); } - + // // PRIVATE METHODS // @@ -479,6 +255,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { */ @SuppressWarnings("unused") private void loadConfig() { + logger.log(Level.FINEST, "loadConfig()"); /* TODO */ } @@ -487,6 +264,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { */ @SuppressWarnings("unused") private void saveConfig() { + logger.log(Level.FINEST, "saveConfig()"); /* TODO */ } @@ -498,75 +276,35 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * {@inheritDoc} */ public void nodeAdded(Node node) { - fireNodeAdded(node); + coreListenerSupport.fireNodeAdded(node); } /** * {@inheritDoc} */ public void nodeRemoved(Node node) { - fireNodeRemoved(node); + coreListenerSupport.fireNodeRemoved(node); } /** * {@inheritDoc} */ public void nodeConnected(Node node) { - fireNodeConnected(node); + coreListenerSupport.fireNodeConnected(node); } /** * {@inheritDoc} */ public void nodeConnectionFailed(Node node, Throwable cause) { - fireNodeConnectionFailed(node, cause); + coreListenerSupport.fireNodeConnectionFailed(node, cause); } /** * {@inheritDoc} */ public void nodeDisconnected(Node node, Throwable throwable) { - 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 */ + coreListenerSupport.fireNodeDisconnected(node, throwable); } }