X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fcore%2FCoreImpl.java;h=cff97c6aa333c144a42aceb21a20f69ff0a1d370;hb=c63257e8cc0ba1a5aca9364b22171abe7279d479;hp=d0e78b96d7c1d08769653db46045dfb3e985f3a7;hpb=cf127faffabd3f07b0acc6de9ea746059d571b56;p=jSite2.git diff --git a/src/net/pterodactylus/jsite/core/CoreImpl.java b/src/net/pterodactylus/jsite/core/CoreImpl.java index d0e78b9..cff97c6 100644 --- a/src/net/pterodactylus/jsite/core/CoreImpl.java +++ b/src/net/pterodactylus/jsite/core/CoreImpl.java @@ -23,20 +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.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 { + /** 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; @@ -56,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); } @@ -63,17 +73,19 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * {@inheritDoc} */ public void removeCoreListener(CoreListener coreListener) { + logger.log(Level.FINEST, "removing core listener: " + 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) { + logger.log(Level.FINEST, "firing loadingProjectsDone event with [directory=" + directory + "]"); + for (CoreListener coreListener : coreListeners) { coreListener.loadingProjectsDone(directory); } } @@ -81,92 +93,140 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * 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) { + logger.log(Level.FINEST, "firing loadingProjectsFailed event with [directory=" + 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) { + logger.log(Level.FINEST, "firing savingProjectsDone event with [directory=" + 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) { + 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); } } /** * 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) { + logger.log(Level.FINEST, "firing loadingNodesFailed event with [directory=" + 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) { + logger.log(Level.FINEST, "firing savingNodesDone event with [directory=" + 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) { + logger.log(Level.FINEST, "firing savingNodesFailed event with [directory=" + directory + ",throwable=" + throwable + "]"); + for (CoreListener coreListener : coreListeners) { coreListener.savingProjectsFailed(directory, throwable); } } @@ -175,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(); } } @@ -184,31 +245,34 @@ 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(); } } /** * 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) { + logger.log(Level.FINEST, "firing nodeAdded event with [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) { + logger.log(Level.FINEST, "firing nodeRemoved event with [node=" + node + "]"); + for (CoreListener coreListener : coreListeners) { coreListener.nodeRemoved(node); } } @@ -216,45 +280,48 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * 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) { + logger.log(Level.FINEST, "firing nodeConnecting event with [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) { + logger.log(Level.FINEST, "firing nodeConnected event with [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) { + logger.log(Level.FINEST, "firing nodeConnectionFailed event with [node=" + node + ",cause=" + 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 @@ -262,7 +329,8 @@ 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); } } @@ -272,8 +340,15 @@ public class CoreImpl implements Core, NodeListener, RequestListener { // /** + * {@inheritDoc} + */ + public Executor getThreadPool() { + return threadPool; + } + + /** * Returns the project manager. - * + * * @return The project manager */ public ProjectManager getProjectManager() { @@ -282,7 +357,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * Sets the project manager to use. - * + * * @param projectManager * The project manager to use */ @@ -292,7 +367,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * Returns the node manager. - * + * * @return The node manager */ public NodeManager getNodeManager() { @@ -301,7 +376,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * Sets the node manager to use. - * + * * @param nodeManager * The node manager to use */ @@ -311,7 +386,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * Sets the request manager to use. - * + * * @param requestManager * The request manager to use */ @@ -348,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(); } @@ -367,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()); @@ -386,6 +463,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * {@inheritDoc} */ public boolean addNode(Node node) throws UnknownHostException { + logger.log(Level.FINEST, "addNode(node=" + node + ")"); return nodeManager.addNode(node); } @@ -393,6 +471,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * {@inheritDoc} */ public void removeNode(Node node) { + logger.log(Level.FINEST, "removeNode(node=" + node + ")"); nodeManager.removeNode(node); } @@ -400,6 +479,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * {@inheritDoc} */ public void connectToNode(Node node) { + logger.log(Level.FINEST, "connectToNode(node=" + node + ")"); fireNodeConnecting(node); nodeManager.connect(node); } @@ -408,14 +488,35 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * {@inheritDoc} */ public void disconnectFromNode(Node node) { + logger.log(Level.FINEST, "disconnectFromNode(node=" + node + ")"); nodeManager.disconnect(node); } /** * {@inheritDoc} */ - public Project createProject() throws IOException, JSiteException { - return projectManager.createProject(); + public void createProject() throws IOException, JSiteException { + logger.log(Level.FINEST, "createProject()"); + Project newProject = projectManager.createProject(); + fireProjectAdded(newProject); + } + + /** + * {@inheritDoc} + */ + public void cloneProject(Project project) { + logger.log(Level.FINEST, "cloneProject(project=" + project + ")"); + Project projectClone = projectManager.cloneProject(project); + fireProjectCloned(project, projectClone); + } + + /** + * {@inheritDoc} + */ + public void removeProject(Project project) { + logger.log(Level.FINEST, "removeProject(project=" + project + ")"); + projectManager.removeProject(project); + fireProjectRemoved(project); } // @@ -427,6 +528,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { */ @SuppressWarnings("unused") private void loadConfig() { + logger.log(Level.FINEST, "loadConfig()"); /* TODO */ } @@ -435,6 +537,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { */ @SuppressWarnings("unused") private void saveConfig() { + logger.log(Level.FINEST, "saveConfig()"); /* TODO */ }