X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fcore%2FRequestManager.java;h=ac9d588b5526a44802187bfd52668073b0a7d4a9;hb=708d0d9f54df2f6c02f31c75555a029ec8702614;hp=f2aa23f6aa1d69bdcad39987a82e89592c1d6427;hpb=7ccb1fcb746198ee1417bb2f92c846132bf6bc96;p=jSite2.git

diff --git a/src/net/pterodactylus/jsite/core/RequestManager.java b/src/net/pterodactylus/jsite/core/RequestManager.java
index f2aa23f..ac9d588 100644
--- a/src/net/pterodactylus/jsite/core/RequestManager.java
+++ b/src/net/pterodactylus/jsite/core/RequestManager.java
@@ -22,15 +22,11 @@ package net.pterodactylus.jsite.core;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
-import java.util.logging.Level;
+import java.util.Map;
 import java.util.logging.Logger;
 
-import net.pterodactylus.fcp.highlevel.HighLevelCallback;
-import net.pterodactylus.fcp.highlevel.HighLevelCallbackListener;
-import net.pterodactylus.fcp.highlevel.HighLevelClient;
-import net.pterodactylus.fcp.highlevel.RequestListResult;
-import net.pterodactylus.fcp.highlevel.RequestResult;
 import net.pterodactylus.util.logging.Logging;
 
 /**
@@ -38,9 +34,8 @@ import net.pterodactylus.util.logging.Logging;
  * The request manager is added to the {@link NodeManager} as a
  * {@link NodeListener} so that it can fire request-removed events in case a
  * node is disconnected.
- * 
+ *
  * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
- * @version $Id$
  */
 public class RequestManager implements NodeListener {
 
@@ -53,13 +48,16 @@ public class RequestManager implements NodeListener {
 	/** The node manager. */
 	private NodeManager nodeManager;
 
+	/** Request lists for all nodes. */
+	private Map<Node, Map<String, Request>> nodeRequests = Collections.synchronizedMap(new HashMap<Node, Map<String, Request>>());
+
 	//
 	// EVENT MANAGEMENT
 	//
 
 	/**
 	 * Adds a request listener.
-	 * 
+	 *
 	 * @param requestListener
 	 *            The request listener to add
 	 */
@@ -69,7 +67,7 @@ public class RequestManager implements NodeListener {
 
 	/**
 	 * Removes a request listener.
-	 * 
+	 *
 	 * @param requestListener
 	 *            The request listener to remove
 	 */
@@ -79,15 +77,65 @@ public class RequestManager implements NodeListener {
 
 	/**
 	 * Notifies all listeners that a request was added.
-	 * 
-	 * @param node
-	 *            The node that added the request
+	 *
 	 * @param request
 	 *            The request that was added
 	 */
-	private void fireRequestAdded(Node node, Request request) {
-		for (RequestListener requestListener: requestListeners) {
-			requestListener.requestAdded(node, request);
+	private void fireRequestAdded(Request request) {
+		for (RequestListener requestListener : requestListeners) {
+			requestListener.requestAdded(request);
+		}
+	}
+
+	/**
+	 * Notifies all listeners that a request progressed.
+	 *
+	 * @param request
+	 *            The request
+	 */
+	private void fireRequestProgressed(Request request) {
+		for (RequestListener requestListener : requestListeners) {
+			requestListener.requestProgressed(request);
+		}
+	}
+
+	/**
+	 * Notifies all listeners that a request was removed.
+	 *
+	 * @param request
+	 *            The request that was removed
+	 */
+	private void fireRequestRemoved(Request request) {
+		for (RequestListener requestListener : requestListeners) {
+			requestListener.requestRemoved(request);
+		}
+	}
+
+	/**
+	 * Notifies all listeners that a request has finished.
+	 *
+	 * @see RequestListener#requestFinished(Request)
+	 * @param request
+	 *            The request that has finished
+	 */
+	private void fireRequestFinished(Request request) {
+		for (RequestListener requestListener : requestListeners) {
+			requestListener.requestFinished(request);
+		}
+	}
+
+	/**
+	 * Notifies all listeners that a request has generated a URI.
+	 *
+	 * @see RequestListener#requestGeneratedURI(Request, String)
+	 * @param request
+	 *            The request that has generated a URI
+	 * @param uri
+	 *            The generated URI
+	 */
+	private void fireRequestGeneratedURI(Request request, String uri) {
+		for (RequestListener requestListener : requestListeners) {
+			requestListener.requestGeneratedURI(request, uri);
 		}
 	}
 
@@ -97,7 +145,7 @@ public class RequestManager implements NodeListener {
 
 	/**
 	 * Sets the node manager to use.
-	 * 
+	 *
 	 * @param nodeManager
 	 *            The node manager
 	 */
@@ -109,44 +157,22 @@ public class RequestManager implements NodeListener {
 	// ACTIONS
 	//
 
+	//
+	// PRIVATE ACTIONS
+	//
+
 	/**
 	 * Requests a list of all running requests from a node. This method will
 	 * block until the request has been sent!
-	 * 
+	 *
 	 * @param node
 	 *            The node to get all requests for
 	 * @throws IOException
 	 *             if an I/O error occurs while communicating with the node
+	 * @throws JSiteException
+	 *             if there is a problem with the node
 	 */
-	public void getRequests(final Node node) throws IOException {
-		HighLevelClient highLevelClient = nodeManager.borrowHighLevelClient(node);
-		if (highLevelClient == null) {
-			logger.log(Level.WARNING, "no client for node: " + node);
-			return;
-		}
-		try {
-			HighLevelCallback<RequestListResult> requestListCallback = highLevelClient.getRequests();
-			requestListCallback.addHighLevelCallbackListener(new HighLevelCallbackListener<RequestListResult>() {
-
-				@SuppressWarnings("synthetic-access")
-				public void gotResult(HighLevelCallback<RequestListResult> highLevelCallback) {
-					RequestListResult requestListResult;
-					try {
-						requestListResult = highLevelCallback.getResult();
-					} catch (InterruptedException e) {
-						logger.log(Level.SEVERE, "getResult() blocked and was interrupted");
-						return;
-					}
-					for (RequestResult requestResult: requestListResult) {
-						Request request = new Request(requestResult.getIdentifier());
-						/* TODO - fill request */
-						fireRequestAdded(node, request);
-					}
-				}
-			});
-		} finally {
-			nodeManager.returnHighLevelClient(highLevelClient);
-		}
+	private void getRequests(final Node node) throws IOException, JSiteException {
 	}
 
 	//
@@ -156,15 +182,41 @@ public class RequestManager implements NodeListener {
 	/**
 	 * {@inheritDoc}
 	 */
+	public void nodeAdded(Node node) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void nodeRemoved(Node node) {
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
 	public void nodeConnected(Node node) {
-		/* TODO - get all requests. */
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void nodeConnectionFailed(Node node, Throwable cause) {
+		/* we don't care about this. */
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	public void nodeDisconnected(Node node, Throwable throwable) {
-		/* TODO - remove all requests. */
+		Map<String, Request> identifierRequests = nodeRequests.get(node);
+		if (identifierRequests == null) {
+			logger.warning("got node without request map: " + node);
+			return;
+		}
+		for (Request request : identifierRequests.values()) {
+			fireRequestRemoved(request);
+		}
+		identifierRequests.clear();
 	}
 
 }