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

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

Revision: 2367
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2367&view=rev
Author:   bradtofel
Date:     2008-07-01 16:38:20 -0700 (Tue, 01 Jul 2008)

Log Message:
-----------
REFACTOR: SearchResult => (Url|Capture)SearchResult

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/QueryRenderer.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/ReplayDispatcher.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/ReplayRenderer.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/ResourceStore.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/QueryRenderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/QueryRenderer.java	2008-07-01 23:36:18 UTC (rev 2366)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/QueryRenderer.java	2008-07-01 23:38:20 UTC (rev 2367)
@@ -30,7 +30,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.archive.wayback.core.SearchResults;
+import org.archive.wayback.core.CaptureSearchResults;
+import org.archive.wayback.core.UrlSearchResults;
 import org.archive.wayback.core.WaybackRequest;
 
 /**
@@ -52,9 +53,9 @@
 	 * @throws ServletException
 	 * @throws IOException
 	 */
-	public void renderUrlResults(HttpServletRequest httpRequest,
+	public void renderCaptureResults(HttpServletRequest httpRequest,
 			HttpServletResponse httpResponse, WaybackRequest wbRequest,
-			SearchResults results, ResultURIConverter uriConverter)
+			CaptureSearchResults results, ResultURIConverter uriConverter)
 			throws ServletException, IOException;
 
 	/** Show the SearchResults of the request which may have resulted in 
@@ -69,9 +70,9 @@
 	 * @throws ServletException
 	 * @throws IOException
 	 */
-	public void renderUrlPrefixResults(HttpServletRequest httpRequest,
+	public void renderUrlResults(HttpServletRequest httpRequest,
 			HttpServletResponse response, WaybackRequest wbRequest,
-			SearchResults results, ResultURIConverter uriConverter)
+			UrlSearchResults results, ResultURIConverter uriConverter)
 			throws ServletException, IOException;
 
 }

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/ReplayDispatcher.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/ReplayDispatcher.java	2008-07-01 23:36:18 UTC (rev 2366)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/ReplayDispatcher.java	2008-07-01 23:38:20 UTC (rev 2367)
@@ -25,7 +25,7 @@
 package org.archive.wayback;
 
 import org.archive.wayback.core.Resource;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
 import org.archive.wayback.core.WaybackRequest;
 
 /**
@@ -45,5 +45,5 @@
 	 * @return the correct ReplayRenderer for the Resource
 	 */
 	public ReplayRenderer getRenderer(WaybackRequest wbRequest,
-			SearchResult result, Resource resource);
+			CaptureSearchResult result, Resource resource);
 }

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/ReplayRenderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/ReplayRenderer.java	2008-07-01 23:36:18 UTC (rev 2366)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/ReplayRenderer.java	2008-07-01 23:38:20 UTC (rev 2367)
@@ -31,8 +31,8 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.archive.wayback.core.Resource;
-import org.archive.wayback.core.SearchResult;
-import org.archive.wayback.core.SearchResults;
+import org.archive.wayback.core.CaptureSearchResult;
+import org.archive.wayback.core.CaptureSearchResults;
 import org.archive.wayback.core.WaybackRequest;
 import org.archive.wayback.exception.WaybackException;
 
@@ -50,11 +50,11 @@
 	 * @param httpRequest the HttpServletRequest
 	 * @param httpResponse the HttpServletResponse
 	 * @param wbRequest the WaybackRequest that returned the results
-	 * @param result actual SearchResult that maps to resource to replay
+	 * @param result actual CaptureSearchResult that maps to resource to replay
 	 * @param resource resource to replay
 	 * @param uriConverter the URI converter to use to translate matching
 	 *                      results into replayable URLs
-	 * @param results all SearchResults that were returned from the 
+	 * @param results all CaptureSearchResults that were returned from the 
 	 * 						ResourceIndex, probably including other capture
 	 * 						dates of the same URL.
 	 * @throws ServletException
@@ -63,7 +63,7 @@
 	 */
 	public void renderResource(HttpServletRequest httpRequest,
 			HttpServletResponse httpResponse, WaybackRequest wbRequest,
-			SearchResult result, Resource resource, 
-			ResultURIConverter uriConverter, SearchResults results)
+			CaptureSearchResult result, Resource resource, 
+			ResultURIConverter uriConverter, CaptureSearchResults results)
 	throws ServletException, IOException, WaybackException;
 }

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/ResourceStore.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/ResourceStore.java	2008-07-01 23:36:18 UTC (rev 2366)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/ResourceStore.java	2008-07-01 23:38:20 UTC (rev 2367)
@@ -26,7 +26,7 @@
 import java.io.IOException;
 
 import org.archive.wayback.core.Resource;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
 import org.archive.wayback.exception.ResourceNotAvailableException;
 
 /**
@@ -44,7 +44,7 @@
 	 * @throws IOException
 	 * @throws ResourceNotAvailableException 
 	 */
-	public Resource retrieveResource(SearchResult result) throws IOException, 
+	public Resource retrieveResource(CaptureSearchResult result) throws IOException, 
 		ResourceNotAvailableException;
 
 	public void shutdown() throws IOException;


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