X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fcore%2FCoreImpl.java;h=cff97c6aa333c144a42aceb21a20f69ff0a1d370;hb=c63257e8cc0ba1a5aca9364b22171abe7279d479;hp=8f26a673c69c455eea60d74a2ec686e289f80abb;hpb=e1e349bae97feb779fc692eb03c2fea0e0e612c9;p=jSite2.git diff --git a/src/net/pterodactylus/jsite/core/CoreImpl.java b/src/net/pterodactylus/jsite/core/CoreImpl.java index 8f26a67..cff97c6 100644 --- a/src/net/pterodactylus/jsite/core/CoreImpl.java +++ b/src/net/pterodactylus/jsite/core/CoreImpl.java @@ -25,17 +25,21 @@ 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.core.project.Project; -import net.pterodactylus.jsite.core.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(); @@ -61,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); } @@ -68,16 +73,18 @@ 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) { + logger.log(Level.FINEST, "firing loadingProjectsDone event with [directory=" + directory + "]"); for (CoreListener coreListener : coreListeners) { coreListener.loadingProjectsDone(directory); } @@ -86,13 +93,14 @@ 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) { + logger.log(Level.FINEST, "firing loadingProjectsFailed event with [directory=" + directory + ",throwable=" + throwable + "]"); for (CoreListener coreListener : coreListeners) { coreListener.loadingProjectsFailed(directory, throwable); } @@ -100,11 +108,12 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * Notifies all listeners that the projects were successfully saved. - * + * * @param directory * The directory the projects were saved to */ private void fireSavingProjectsDone(String directory) { + logger.log(Level.FINEST, "firing savingProjectsDone event with [directory=" + directory + "]"); for (CoreListener coreListener : coreListeners) { coreListener.savingProjectsDone(directory); } @@ -112,13 +121,14 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * 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) { + logger.log(Level.FINEST, "firing savingProjectsFailed event with [directory=" + directory + ",throwable=" + throwable + "]"); for (CoreListener coreListener : coreListeners) { coreListener.savingProjectsFailed(directory, throwable); } @@ -126,11 +136,12 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * 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); } @@ -138,13 +149,14 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * 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); } @@ -152,11 +164,12 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * 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); } @@ -164,11 +177,12 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * Notifies all listeners that the nodes were successfully loaded. - * + * * @param directory * The directory the nodes were loaded from */ private void fireLoadingNodesDone(String directory) { + logger.log(Level.FINEST, "firing loadingNodesDone event with [directory=" + directory + "]"); for (CoreListener coreListener : coreListeners) { coreListener.loadingNodesDone(directory); } @@ -176,13 +190,14 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * 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) { + logger.log(Level.FINEST, "firing loadingNodesFailed event with [directory=" + directory + ",throwable=" + throwable + "]"); for (CoreListener coreListener : coreListeners) { coreListener.loadingNodesFailed(directory, throwable); } @@ -190,11 +205,12 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * Notifies all listeners that the nodes were saved successfully. - * + * * @param directory * The directory the nodes were saved to */ private void fireSavingNodesDone(String directory) { + logger.log(Level.FINEST, "firing savingNodesDone event with [directory=" + directory + "]"); for (CoreListener coreListener : coreListeners) { coreListener.savingNodesDone(directory); } @@ -202,13 +218,14 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * 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) { + logger.log(Level.FINEST, "firing savingNodesFailed event with [directory=" + directory + ",throwable=" + throwable + "]"); for (CoreListener coreListener : coreListeners) { coreListener.savingProjectsFailed(directory, throwable); } @@ -218,6 +235,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * Notifies all core listeners that the core has loaded and is ready to run. */ private void fireCoreLoaded() { + logger.log(Level.FINEST, "firing coreLoaded event"); for (CoreListener coreListener : coreListeners) { coreListener.coreLoaded(); } @@ -227,6 +245,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * Notifies all listeners that the core was stopped. */ private void fireCoreStopped() { + logger.log(Level.FINEST, "firing coreStopped event"); for (CoreListener coreListener : coreListeners) { coreListener.coreStopped(); } @@ -234,11 +253,12 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * Notifies all listeners that a node was added to the core. - * + * * @param node * The node that was added */ private void fireNodeAdded(Node node) { + logger.log(Level.FINEST, "firing nodeAdded event with [node=" + node + "]"); for (CoreListener coreListener : coreListeners) { coreListener.nodeAdded(node); } @@ -246,11 +266,12 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * Notifies all listeners that a node was removed from the core. - * + * * @param node * The node that was removed */ private void fireNodeRemoved(Node node) { + logger.log(Level.FINEST, "firing nodeRemoved event with [node=" + node + "]"); for (CoreListener coreListener : coreListeners) { coreListener.nodeRemoved(node); } @@ -259,11 +280,12 @@ 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) { + logger.log(Level.FINEST, "firing nodeConnecting event with [node=" + node + "]"); for (CoreListener coreListener : coreListeners) { coreListener.nodeConnecting(node); } @@ -271,11 +293,12 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * Notifies all listeners that the given node is now connected. - * + * * @param node * The node that is now connected */ private void fireNodeConnected(Node node) { + logger.log(Level.FINEST, "firing nodeConnected event with [node=" + node + "]"); for (CoreListener coreListener : coreListeners) { coreListener.nodeConnected(node); } @@ -283,13 +306,14 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * 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) { + logger.log(Level.FINEST, "firing nodeConnectionFailed event with [node=" + node + ",cause=" + cause + "]"); for (CoreListener coreListener : coreListeners) { coreListener.nodeConnectionFailed(node, cause); } @@ -297,7 +321,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * Notifies all listeners that the given node was disconnected. - * + * * @param node * The node that is now disconnected * @param throwable @@ -305,6 +329,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * if there was no exception */ private void fireNodeDisconnected(Node node, Throwable throwable) { + logger.log(Level.FINEST, "firing nodeDisconnected event with [node=" + node + ",throwable=" + throwable + "]"); for (CoreListener coreListener : coreListeners) { coreListener.nodeDisconnected(node, throwable); } @@ -323,7 +348,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * Returns the project manager. - * + * * @return The project manager */ public ProjectManager getProjectManager() { @@ -332,7 +357,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * Sets the project manager to use. - * + * * @param projectManager * The project manager to use */ @@ -342,7 +367,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * Returns the node manager. - * + * * @return The node manager */ public NodeManager getNodeManager() { @@ -351,7 +376,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * Sets the node manager to use. - * + * * @param nodeManager * The node manager to use */ @@ -361,7 +386,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * Sets the request manager to use. - * + * * @param requestManager * The request manager to use */ @@ -398,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(); } @@ -417,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()); @@ -436,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); } @@ -443,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); } @@ -450,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); } @@ -458,6 +488,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * {@inheritDoc} */ public void disconnectFromNode(Node node) { + logger.log(Level.FINEST, "disconnectFromNode(node=" + node + ")"); nodeManager.disconnect(node); } @@ -465,6 +496,7 @@ 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); } @@ -473,6 +505,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * {@inheritDoc} */ public void cloneProject(Project project) { + logger.log(Level.FINEST, "cloneProject(project=" + project + ")"); Project projectClone = projectManager.cloneProject(project); fireProjectCloned(project, projectClone); } @@ -481,6 +514,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * {@inheritDoc} */ public void removeProject(Project project) { + logger.log(Level.FINEST, "removeProject(project=" + project + ")"); projectManager.removeProject(project); fireProjectRemoved(project); } @@ -494,6 +528,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { */ @SuppressWarnings("unused") private void loadConfig() { + logger.log(Level.FINEST, "loadConfig()"); /* TODO */ } @@ -502,6 +537,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { */ @SuppressWarnings("unused") private void saveConfig() { + logger.log(Level.FINEST, "saveConfig()"); /* TODO */ }