X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fcore%2FCoreImpl.java;h=2b795ed69171045c8fd8e0431d3a11d48dfd2d93;hb=52608018e26c1d6bffc3c8561cae9500c141a636;hp=1e52659e1d2ee6cb6c0dd9b73a9c8d82d096cc97;hpb=a5baf05c30ac53df2e1f6b481eb183a2cff53ef5;p=jSite2.git diff --git a/src/net/pterodactylus/jsite/core/CoreImpl.java b/src/net/pterodactylus/jsite/core/CoreImpl.java index 1e52659..2b795ed 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 { +public class CoreImpl implements Core, NodeListener { /** The logger. */ private static final Logger logger = Logging.getLogger(CoreImpl.class.getName()); @@ -43,6 +43,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { private final CoreListenerSupport coreListenerSupport = new CoreListenerSupport(); /** Thread pool. */ + @SuppressWarnings("unused") private Executor threadPool = Executors.newCachedThreadPool(); /** The project manager. */ @@ -51,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 // @@ -81,13 +77,6 @@ public class CoreImpl implements Core, NodeListener, RequestListener { // /** - * {@inheritDoc} - */ - public Executor getThreadPool() { - return threadPool; - } - - /** * Returns the project manager. * * @return The project manager @@ -126,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() { @@ -146,7 +125,7 @@ public class CoreImpl implements Core, NodeListener, RequestListener { * {@inheritDoc} */ public boolean isNodeConnected(Node node) { - return nodeManager.hasNode(node); + return nodeManager.isNodeConnected(node); } /** @@ -245,6 +224,13 @@ public class CoreImpl implements Core, NodeListener, RequestListener { /** * {@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); @@ -321,44 +307,4 @@ public class CoreImpl implements Core, NodeListener, RequestListener { coreListenerSupport.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 */ - } - }