[Archive-access-cvs] SF.net SVN: archive-access:[2474] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/replay/ TransparentReplayRenderer.java

[<bra...@us...>]

Revision: 2474
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2474&view=rev
Author:   bradtofel
Date:     2008-07-22 01:46:25 +0000 (Tue, 22 Jul 2008)

Log Message:
-----------
REFACTOR/INTERFACE: ReplayRenderer no longer ISA HttpHeaderProcessor, now one is passed as a constructor, allowing this to be used for Proxy and binary ArchivalUrl/DomainPrefix.

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/TransparentReplayRenderer.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/TransparentReplayRenderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/TransparentReplayRenderer.java	2008-07-22 01:45:01 UTC (rev 2473)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/TransparentReplayRenderer.java	2008-07-22 01:46:25 UTC (rev 2474)
@@ -48,10 +48,12 @@
  * @author brad
  * @version $Date$, $Revision$
  */
-public class TransparentReplayRenderer implements ReplayRenderer, HttpHeaderProcessor {
-
+public class TransparentReplayRenderer implements ReplayRenderer {
+	private HttpHeaderProcessor httpHeaderProcessor;
 	private final static int BUFFER_SIZE = 4096;
-	
+	public TransparentReplayRenderer(HttpHeaderProcessor httpHeaderProcessor) {
+		this.httpHeaderProcessor = httpHeaderProcessor;
+	}
 	/* (non-Javadoc)
 	 * @see org.archive.wayback.ReplayRenderer#renderResource(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, org.archive.wayback.core.WaybackRequest, org.archive.wayback.core.SearchResult, org.archive.wayback.core.Resource, org.archive.wayback.ResultURIConverter, org.archive.wayback.core.SearchResults)
 	 */
@@ -64,7 +66,7 @@
 		HttpHeaderOperation.copyHTTPMessageHeader(resource, httpResponse);
 		
 		Map<String,String> headers = HttpHeaderOperation.processHeaders(
-				resource, result, uriConverter, this);
+				resource, result, uriConverter, httpHeaderProcessor);
 
 		HttpHeaderOperation.sendHeaders(headers, httpResponse);
 
@@ -75,14 +77,4 @@
 			os.write(buffer, 0, r);
 		}
 	}
-
-	/* (non-Javadoc)
-	 * @see org.archive.wayback.replay.HeaderFilter#filter(java.util.Map, java.lang.String, java.lang.String, org.archive.wayback.ResultURIConverter, org.archive.wayback.core.SearchResult)
-	 */
-	public void filter(Map<String, String> output, String key, String value,
-			ResultURIConverter uriConverter, CaptureSearchResult result) {
-
-		// copy all HTTP headers, as-is.
-		output.put(key, value);
-	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.