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

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

Revision: 2362
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2362&view=rev
Author:   bradtofel
Date:     2008-07-01 16:31:37 -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/resourceindex/updater/IndexClient.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/updater/LocalResourceIndexUpdater.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/updater/IndexClient.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/updater/IndexClient.java	2008-07-01 23:29:31 UTC (rev 2361)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/updater/IndexClient.java	2008-07-01 23:31:37 UTC (rev 2362)
@@ -38,7 +38,7 @@
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
 import org.apache.commons.httpclient.methods.PutMethod;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
 import org.archive.wayback.resourceindex.cdx.SearchResultToCDXLineAdapter;
 import org.archive.wayback.util.AdaptedIterator;
 import org.archive.wayback.util.Adapter;
@@ -137,7 +137,7 @@
 	 * @throws HttpException
 	 * @throws IOException
 	 */
-	public boolean addSearchResults(String base, Iterator<SearchResult> itr) 
+	public boolean addSearchResults(String base, Iterator<CaptureSearchResult> itr) 
 	throws HttpException, IOException {
 		
 		if(tmpDir == null) {
@@ -155,10 +155,10 @@
 		BufferedOutputStream bos = new BufferedOutputStream(os);
 		PrintWriter pw = new PrintWriter(bos);
 		
-		Adapter<SearchResult,String> adapterSRtoS = 
+		Adapter<CaptureSearchResult,String> adapterSRtoS = 
 			new SearchResultToCDXLineAdapter();
 		Iterator<String> itrS = 
-			new AdaptedIterator<SearchResult,String>(itr,adapterSRtoS);
+			new AdaptedIterator<CaptureSearchResult,String>(itr,adapterSRtoS);
 		
 		while(itrS.hasNext()) {
 			pw.println(itrS.next());

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/updater/LocalResourceIndexUpdater.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/updater/LocalResourceIndexUpdater.java	2008-07-01 23:29:31 UTC (rev 2361)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/updater/LocalResourceIndexUpdater.java	2008-07-01 23:31:37 UTC (rev 2362)
@@ -28,7 +28,7 @@
 import java.io.IOException;
 import java.util.logging.Logger;
 
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
 import org.archive.wayback.exception.ConfigurationException;
 import org.archive.wayback.resourceindex.LocalResourceIndex;
 import org.archive.wayback.resourceindex.cdx.CDXLineToSearchResultAdapter;
@@ -97,8 +97,8 @@
 		boolean added = false;
 		try {
 			FlatFile ffile = new FlatFile(cdxFile.getAbsolutePath());
-			AdaptedIterator<String,SearchResult> searchResultItr = 
-				new AdaptedIterator<String,SearchResult>(
+			AdaptedIterator<String,CaptureSearchResult> searchResultItr = 
+				new AdaptedIterator<String,CaptureSearchResult>(
 						ffile.getSequentialIterator(),
 					new CDXLineToSearchResultAdapter());
 			index.addSearchResults(searchResultItr);


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